From 0b05f1708dd8ce3ba984b7bd890a8bd47a1e485d Mon Sep 17 00:00:00 2001 From: Laukik Hase Date: Thu, 26 May 2022 10:33:57 +0530 Subject: [PATCH 1/5] protobuf-c: Update submodule to v1.4.0 --- components/protobuf-c/protobuf-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/protobuf-c/protobuf-c b/components/protobuf-c/protobuf-c index dac1a65fea..f224ab2eeb 160000 --- a/components/protobuf-c/protobuf-c +++ b/components/protobuf-c/protobuf-c @@ -1 +1 @@ -Subproject commit dac1a65feac4ad72f612aab99f487056fbcf5c1a +Subproject commit f224ab2eeb648a818eb20687d7150a285442c907 From 9549f0026fb0267f3bf38ce1fafb1b16914436de Mon Sep 17 00:00:00 2001 From: Laukik Hase Date: Fri, 27 May 2022 09:35:46 +0530 Subject: [PATCH 2/5] protobuf: Fix v4.21.0 (python) compatibility issue - Added auto-generated protobuf files (proto-c and python to pre-commit hook ignore lists --- .pre-commit-config.yaml | 15 ++++++++++++++- tools/ci/sonar_exclude_list.txt | 8 ++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c825d40596..d49ef98280 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,12 +12,16 @@ repos: # 2 - any file matching *test*/*expected* (for host tests, if possible use this naming pattern always) # 3 - any directory named 'testdata' # 4 - IDF monitor test data + # 5 - protobuf auto-generated files exclude: &whitespace_excludes | (?x)^( .+\.(md|rst|map|bin)| .+test.*\/.*expected.*| .+\/testdata\/.+| - .+test_idf_monitor\/tests\/.+ + .+test_idf_monitor\/tests\/.+| + .*_pb2.py| + .*.pb-c.h| + .*.pb-c.c )$ - id: end-of-file-fixer exclude: *whitespace_excludes @@ -35,6 +39,11 @@ repos: hooks: - id: isort name: isort (python) + exclude: > + (?x)^( + .*_pb2.py + )$ + - repo: local hooks: - id: check-executables @@ -95,6 +104,10 @@ repos: additional_dependencies: - 'mypy==0.800' - 'mypy-extensions==0.4.3' + exclude: > + (?x)^( + .*_pb2.py + )$ language: python types: [python] - id: check-tools-files-patterns diff --git a/tools/ci/sonar_exclude_list.txt b/tools/ci/sonar_exclude_list.txt index a91e445f52..bd53c27d8f 100644 --- a/tools/ci/sonar_exclude_list.txt +++ b/tools/ci/sonar_exclude_list.txt @@ -13,3 +13,11 @@ components/freertos/include/freertos/*.h # wpa_supplicant upstream code components/wpa_supplicant/src/** components/wpa_supplicant/include/** + +# Protobuf auto-generated files +components/esp_local_ctrl/proto-c/** +components/esp_local_ctrl/python/** +components/protocomm/proto-c/** +components/protocomm/python/** +components/wifi_provisioning/proto-c/** +components/wifi_provisioning/python/** From 509a423f832ec86490ee8a260a4c5997d7d40b99 Mon Sep 17 00:00:00 2001 From: Laukik Hase Date: Fri, 27 May 2022 09:31:51 +0530 Subject: [PATCH 3/5] protocomm: Regenerated proto-c and python with protobuf compiler v3.21.0 --- components/protocomm/proto-c/constants.pb-c.h | 4 +- components/protocomm/proto-c/sec0.pb-c.h | 30 +- components/protocomm/proto-c/sec1.pb-c.h | 46 +-- components/protocomm/proto-c/session.pb-c.h | 20 +- components/protocomm/python/constants_pb2.py | 86 +---- components/protocomm/python/sec0_pb2.py | 199 +--------- components/protocomm/python/sec1_pb2.py | 342 ++---------------- components/protocomm/python/session_pb2.py | 123 +------ 8 files changed, 112 insertions(+), 738 deletions(-) diff --git a/components/protocomm/proto-c/constants.pb-c.h b/components/protocomm/proto-c/constants.pb-c.h index a6807c9d3c..fb224f8cc3 100644 --- a/components/protocomm/proto-c/constants.pb-c.h +++ b/components/protocomm/proto-c/constants.pb-c.h @@ -10,7 +10,7 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif @@ -21,7 +21,7 @@ PROTOBUF_C__BEGIN_DECLS /* * Allowed values for the status - * of a protocomm instance + * of a protocomm instance */ typedef enum _Status { STATUS__Success = 0, diff --git a/components/protocomm/proto-c/sec0.pb-c.h b/components/protocomm/proto-c/sec0.pb-c.h index 151711fbc9..4cdb8f982e 100644 --- a/components/protocomm/proto-c/sec0.pb-c.h +++ b/components/protocomm/proto-c/sec0.pb-c.h @@ -10,21 +10,21 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif #include "constants.pb-c.h" -typedef struct _S0SessionCmd S0SessionCmd; -typedef struct _S0SessionResp S0SessionResp; -typedef struct _Sec0Payload Sec0Payload; +typedef struct S0SessionCmd S0SessionCmd; +typedef struct S0SessionResp S0SessionResp; +typedef struct Sec0Payload Sec0Payload; /* --- enums --- */ /* - * A message must be of type Cmd or Resp + * A message must be of type Cmd or Resp */ typedef enum _Sec0MsgType { SEC0_MSG_TYPE__S0_Session_Command = 0, @@ -35,9 +35,9 @@ typedef enum _Sec0MsgType { /* --- messages --- */ /* - * Data structure of Session command/request packet + * Data structure of Session command/request packet */ -struct _S0SessionCmd +struct S0SessionCmd { ProtobufCMessage base; }; @@ -47,9 +47,9 @@ struct _S0SessionCmd /* - * Data structure of Session response packet + * Data structure of Session response packet */ -struct _S0SessionResp +struct S0SessionResp { ProtobufCMessage base; Status status; @@ -63,27 +63,27 @@ typedef enum { SEC0_PAYLOAD__PAYLOAD__NOT_SET = 0, SEC0_PAYLOAD__PAYLOAD_SC = 20, SEC0_PAYLOAD__PAYLOAD_SR = 21 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SEC0_PAYLOAD__PAYLOAD) + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SEC0_PAYLOAD__PAYLOAD__CASE) } Sec0Payload__PayloadCase; /* - * Payload structure of session data + * Payload structure of session data */ -struct _Sec0Payload +struct Sec0Payload { ProtobufCMessage base; /* - *!< Type of message + *!< Type of message */ Sec0MsgType msg; Sec0Payload__PayloadCase payload_case; union { /* - *!< Payload data interpreted as Cmd + *!< Payload data interpreted as Cmd */ S0SessionCmd *sc; /* - *!< Payload data interpreted as Resp + *!< Payload data interpreted as Resp */ S0SessionResp *sr; }; diff --git a/components/protocomm/proto-c/sec1.pb-c.h b/components/protocomm/proto-c/sec1.pb-c.h index 8f1ab88747..e14b3468d0 100644 --- a/components/protocomm/proto-c/sec1.pb-c.h +++ b/components/protocomm/proto-c/sec1.pb-c.h @@ -10,23 +10,23 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif #include "constants.pb-c.h" -typedef struct _SessionCmd1 SessionCmd1; -typedef struct _SessionResp1 SessionResp1; -typedef struct _SessionCmd0 SessionCmd0; -typedef struct _SessionResp0 SessionResp0; -typedef struct _Sec1Payload Sec1Payload; +typedef struct SessionCmd1 SessionCmd1; +typedef struct SessionResp1 SessionResp1; +typedef struct SessionCmd0 SessionCmd0; +typedef struct SessionResp0 SessionResp0; +typedef struct Sec1Payload Sec1Payload; /* --- enums --- */ /* - * A message must be of type Cmd0 / Cmd1 / Resp0 / Resp1 + * A message must be of type Cmd0 / Cmd1 / Resp0 / Resp1 */ typedef enum _Sec1MsgType { SEC1_MSG_TYPE__Session_Command0 = 0, @@ -39,9 +39,9 @@ typedef enum _Sec1MsgType { /* --- messages --- */ /* - * Data structure of Session command1 packet + * Data structure of Session command1 packet */ -struct _SessionCmd1 +struct SessionCmd1 { ProtobufCMessage base; ProtobufCBinaryData client_verify_data; @@ -52,9 +52,9 @@ struct _SessionCmd1 /* - * Data structure of Session response1 packet + * Data structure of Session response1 packet */ -struct _SessionResp1 +struct SessionResp1 { ProtobufCMessage base; Status status; @@ -66,9 +66,9 @@ struct _SessionResp1 /* - * Data structure of Session command0 packet + * Data structure of Session command0 packet */ -struct _SessionCmd0 +struct SessionCmd0 { ProtobufCMessage base; ProtobufCBinaryData client_pubkey; @@ -79,9 +79,9 @@ struct _SessionCmd0 /* - * Data structure of Session response0 packet + * Data structure of Session response0 packet */ -struct _SessionResp0 +struct SessionResp0 { ProtobufCMessage base; Status status; @@ -99,35 +99,35 @@ typedef enum { SEC1_PAYLOAD__PAYLOAD_SR0 = 21, SEC1_PAYLOAD__PAYLOAD_SC1 = 22, SEC1_PAYLOAD__PAYLOAD_SR1 = 23 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SEC1_PAYLOAD__PAYLOAD) + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SEC1_PAYLOAD__PAYLOAD__CASE) } Sec1Payload__PayloadCase; /* - * Payload structure of session data + * Payload structure of session data */ -struct _Sec1Payload +struct Sec1Payload { ProtobufCMessage base; /* - *!< Type of message + *!< Type of message */ Sec1MsgType msg; Sec1Payload__PayloadCase payload_case; union { /* - *!< Payload data interpreted as Cmd0 + *!< Payload data interpreted as Cmd0 */ SessionCmd0 *sc0; /* - *!< Payload data interpreted as Resp0 + *!< Payload data interpreted as Resp0 */ SessionResp0 *sr0; /* - *!< Payload data interpreted as Cmd1 + *!< Payload data interpreted as Cmd1 */ SessionCmd1 *sc1; /* - *!< Payload data interpreted as Resp1 + *!< Payload data interpreted as Resp1 */ SessionResp1 *sr1; }; diff --git a/components/protocomm/proto-c/session.pb-c.h b/components/protocomm/proto-c/session.pb-c.h index e4f9dd2e0b..03e3215f0e 100644 --- a/components/protocomm/proto-c/session.pb-c.h +++ b/components/protocomm/proto-c/session.pb-c.h @@ -10,25 +10,25 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif #include "sec0.pb-c.h" #include "sec1.pb-c.h" -typedef struct _SessionData SessionData; +typedef struct SessionData SessionData; /* --- enums --- */ /* * Allowed values for the type of security - * being used in a protocomm session + * being used in a protocomm session */ typedef enum _SecSchemeVersion { /* - *!< Unsecured - plaintext communication + *!< Unsecured - plaintext communication */ SEC_SCHEME_VERSION__SecScheme0 = 0, /* @@ -44,28 +44,28 @@ typedef enum { SESSION_DATA__PROTO__NOT_SET = 0, SESSION_DATA__PROTO_SEC0 = 10, SESSION_DATA__PROTO_SEC1 = 11 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SESSION_DATA__PROTO) + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(SESSION_DATA__PROTO__CASE) } SessionData__ProtoCase; /* * Data structure exchanged when establishing - * secure session between Host and Client + * secure session between Host and Client */ -struct _SessionData +struct SessionData { ProtobufCMessage base; /* - *!< Type of security + *!< Type of security */ SecSchemeVersion sec_ver; SessionData__ProtoCase proto_case; union { /* - *!< Payload data in case of security 0 + *!< Payload data in case of security 0 */ Sec0Payload *sec0; /* - *!< Payload data in case of security 1 + *!< Payload data in case of security 1 */ Sec1Payload *sec1; }; diff --git a/components/protocomm/python/constants_pb2.py b/components/protocomm/python/constants_pb2.py index 3252435d54..100afe5380 100644 --- a/components/protocomm/python/constants_pb2.py +++ b/components/protocomm/python/constants_pb2.py @@ -1,16 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: constants.proto - -import sys - -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pb2 -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import enum_type_wrapper - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,72 +13,13 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor.FileDescriptor( - name='constants.proto', - package='', - syntax='proto3', - serialized_pb=_b('\n\x0f\x63onstants.proto*\x9f\x01\n\x06Status\x12\x0b\n\x07Success\x10\x00\x12\x14\n\x10InvalidSecScheme\x10\x01\x12\x10\n\x0cInvalidProto\x10\x02\x12\x13\n\x0fTooManySessions\x10\x03\x12\x13\n\x0fInvalidArgument\x10\x04\x12\x11\n\rInternalError\x10\x05\x12\x0f\n\x0b\x43ryptoError\x10\x06\x12\x12\n\x0eInvalidSession\x10\x07\x62\x06proto3') -) - -_STATUS = _descriptor.EnumDescriptor( - name='Status', - full_name='Status', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='Success', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='InvalidSecScheme', index=1, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='InvalidProto', index=2, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TooManySessions', index=3, number=3, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='InvalidArgument', index=4, number=4, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='InternalError', index=5, number=5, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='CryptoError', index=6, number=6, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='InvalidSession', index=7, number=7, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=20, - serialized_end=179, -) -_sym_db.RegisterEnumDescriptor(_STATUS) - -Status = enum_type_wrapper.EnumTypeWrapper(_STATUS) -Success = 0 -InvalidSecScheme = 1 -InvalidProto = 2 -TooManySessions = 3 -InvalidArgument = 4 -InternalError = 5 -CryptoError = 6 -InvalidSession = 7 - - -DESCRIPTOR.enum_types_by_name['Status'] = _STATUS -_sym_db.RegisterFileDescriptor(DESCRIPTOR) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0f\x63onstants.proto*\x9f\x01\n\x06Status\x12\x0b\n\x07Success\x10\x00\x12\x14\n\x10InvalidSecScheme\x10\x01\x12\x10\n\x0cInvalidProto\x10\x02\x12\x13\n\x0fTooManySessions\x10\x03\x12\x13\n\x0fInvalidArgument\x10\x04\x12\x11\n\rInternalError\x10\x05\x12\x0f\n\x0b\x43ryptoError\x10\x06\x12\x12\n\x0eInvalidSession\x10\x07\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'constants_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _STATUS._serialized_start=20 + _STATUS._serialized_end=179 # @@protoc_insertion_point(module_scope) diff --git a/components/protocomm/python/sec0_pb2.py b/components/protocomm/python/sec0_pb2.py index 86b190b6a0..02b9ce33b3 100644 --- a/components/protocomm/python/sec0_pb2.py +++ b/components/protocomm/python/sec0_pb2.py @@ -1,16 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: sec0.proto - -import sys - -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pb2 -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import enum_type_wrapper - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,180 +13,20 @@ _sym_db = _symbol_database.Default() import constants_pb2 as constants__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='sec0.proto', - package='', - syntax='proto3', - serialized_pb=_b('\n\nsec0.proto\x1a\x0f\x63onstants.proto\"\x0e\n\x0cS0SessionCmd\"(\n\rS0SessionResp\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"n\n\x0bSec0Payload\x12\x19\n\x03msg\x18\x01 \x01(\x0e\x32\x0c.Sec0MsgType\x12\x1b\n\x02sc\x18\x14 \x01(\x0b\x32\r.S0SessionCmdH\x00\x12\x1c\n\x02sr\x18\x15 \x01(\x0b\x32\x0e.S0SessionRespH\x00\x42\t\n\x07payload*>\n\x0bSec0MsgType\x12\x16\n\x12S0_Session_Command\x10\x00\x12\x17\n\x13S0_Session_Response\x10\x01\x62\x06proto3') - , - dependencies=[constants__pb2.DESCRIPTOR,]) -_SEC0MSGTYPE = _descriptor.EnumDescriptor( - name='Sec0MsgType', - full_name='Sec0MsgType', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='S0_Session_Command', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='S0_Session_Response', index=1, number=1, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=201, - serialized_end=263, -) -_sym_db.RegisterEnumDescriptor(_SEC0MSGTYPE) - -Sec0MsgType = enum_type_wrapper.EnumTypeWrapper(_SEC0MSGTYPE) -S0_Session_Command = 0 -S0_Session_Response = 1 - - - -_S0SESSIONCMD = _descriptor.Descriptor( - name='S0SessionCmd', - full_name='S0SessionCmd', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=31, - serialized_end=45, -) - - -_S0SESSIONRESP = _descriptor.Descriptor( - name='S0SessionResp', - full_name='S0SessionResp', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='S0SessionResp.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=47, - serialized_end=87, -) - - -_SEC0PAYLOAD = _descriptor.Descriptor( - name='Sec0Payload', - full_name='Sec0Payload', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='msg', full_name='Sec0Payload.msg', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sc', full_name='Sec0Payload.sc', index=1, - number=20, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sr', full_name='Sec0Payload.sr', index=2, - number=21, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='payload', full_name='Sec0Payload.payload', - index=0, containing_type=None, fields=[]), - ], - serialized_start=89, - serialized_end=199, -) - -_S0SESSIONRESP.fields_by_name['status'].enum_type = constants__pb2._STATUS -_SEC0PAYLOAD.fields_by_name['msg'].enum_type = _SEC0MSGTYPE -_SEC0PAYLOAD.fields_by_name['sc'].message_type = _S0SESSIONCMD -_SEC0PAYLOAD.fields_by_name['sr'].message_type = _S0SESSIONRESP -_SEC0PAYLOAD.oneofs_by_name['payload'].fields.append( - _SEC0PAYLOAD.fields_by_name['sc']) -_SEC0PAYLOAD.fields_by_name['sc'].containing_oneof = _SEC0PAYLOAD.oneofs_by_name['payload'] -_SEC0PAYLOAD.oneofs_by_name['payload'].fields.append( - _SEC0PAYLOAD.fields_by_name['sr']) -_SEC0PAYLOAD.fields_by_name['sr'].containing_oneof = _SEC0PAYLOAD.oneofs_by_name['payload'] -DESCRIPTOR.message_types_by_name['S0SessionCmd'] = _S0SESSIONCMD -DESCRIPTOR.message_types_by_name['S0SessionResp'] = _S0SESSIONRESP -DESCRIPTOR.message_types_by_name['Sec0Payload'] = _SEC0PAYLOAD -DESCRIPTOR.enum_types_by_name['Sec0MsgType'] = _SEC0MSGTYPE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -S0SessionCmd = _reflection.GeneratedProtocolMessageType('S0SessionCmd', (_message.Message,), dict( - DESCRIPTOR = _S0SESSIONCMD, - __module__ = 'sec0_pb2' - # @@protoc_insertion_point(class_scope:S0SessionCmd) - )) -_sym_db.RegisterMessage(S0SessionCmd) - -S0SessionResp = _reflection.GeneratedProtocolMessageType('S0SessionResp', (_message.Message,), dict( - DESCRIPTOR = _S0SESSIONRESP, - __module__ = 'sec0_pb2' - # @@protoc_insertion_point(class_scope:S0SessionResp) - )) -_sym_db.RegisterMessage(S0SessionResp) - -Sec0Payload = _reflection.GeneratedProtocolMessageType('Sec0Payload', (_message.Message,), dict( - DESCRIPTOR = _SEC0PAYLOAD, - __module__ = 'sec0_pb2' - # @@protoc_insertion_point(class_scope:Sec0Payload) - )) -_sym_db.RegisterMessage(Sec0Payload) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nsec0.proto\x1a\x0f\x63onstants.proto\"\x0e\n\x0cS0SessionCmd\"(\n\rS0SessionResp\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"n\n\x0bSec0Payload\x12\x19\n\x03msg\x18\x01 \x01(\x0e\x32\x0c.Sec0MsgType\x12\x1b\n\x02sc\x18\x14 \x01(\x0b\x32\r.S0SessionCmdH\x00\x12\x1c\n\x02sr\x18\x15 \x01(\x0b\x32\x0e.S0SessionRespH\x00\x42\t\n\x07payload*>\n\x0bSec0MsgType\x12\x16\n\x12S0_Session_Command\x10\x00\x12\x17\n\x13S0_Session_Response\x10\x01\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'sec0_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _SEC0MSGTYPE._serialized_start=201 + _SEC0MSGTYPE._serialized_end=263 + _S0SESSIONCMD._serialized_start=31 + _S0SESSIONCMD._serialized_end=45 + _S0SESSIONRESP._serialized_start=47 + _S0SESSIONRESP._serialized_end=87 + _SEC0PAYLOAD._serialized_start=89 + _SEC0PAYLOAD._serialized_end=199 # @@protoc_insertion_point(module_scope) diff --git a/components/protocomm/python/sec1_pb2.py b/components/protocomm/python/sec1_pb2.py index c9923f7015..a5fac875f4 100644 --- a/components/protocomm/python/sec1_pb2.py +++ b/components/protocomm/python/sec1_pb2.py @@ -1,16 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: sec1.proto - -import sys - -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pb2 -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import enum_type_wrapper - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,319 +13,24 @@ _sym_db = _symbol_database.Default() import constants_pb2 as constants__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='sec1.proto', - package='', - syntax='proto3', - serialized_pb=_b('\n\nsec1.proto\x1a\x0f\x63onstants.proto\")\n\x0bSessionCmd1\x12\x1a\n\x12\x63lient_verify_data\x18\x02 \x01(\x0c\"C\n\x0cSessionResp1\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x1a\n\x12\x64\x65vice_verify_data\x18\x03 \x01(\x0c\"$\n\x0bSessionCmd0\x12\x15\n\rclient_pubkey\x18\x01 \x01(\x0c\"U\n\x0cSessionResp0\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x15\n\rdevice_pubkey\x18\x02 \x01(\x0c\x12\x15\n\rdevice_random\x18\x03 \x01(\x0c\"\xa9\x01\n\x0bSec1Payload\x12\x19\n\x03msg\x18\x01 \x01(\x0e\x32\x0c.Sec1MsgType\x12\x1b\n\x03sc0\x18\x14 \x01(\x0b\x32\x0c.SessionCmd0H\x00\x12\x1c\n\x03sr0\x18\x15 \x01(\x0b\x32\r.SessionResp0H\x00\x12\x1b\n\x03sc1\x18\x16 \x01(\x0b\x32\x0c.SessionCmd1H\x00\x12\x1c\n\x03sr1\x18\x17 \x01(\x0b\x32\r.SessionResp1H\x00\x42\t\n\x07payload*g\n\x0bSec1MsgType\x12\x14\n\x10Session_Command0\x10\x00\x12\x15\n\x11Session_Response0\x10\x01\x12\x14\n\x10Session_Command1\x10\x02\x12\x15\n\x11Session_Response1\x10\x03\x62\x06proto3') - , - dependencies=[constants__pb2.DESCRIPTOR,]) -_SEC1MSGTYPE = _descriptor.EnumDescriptor( - name='Sec1MsgType', - full_name='Sec1MsgType', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='Session_Command0', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='Session_Response0', index=1, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='Session_Command1', index=2, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='Session_Response1', index=3, number=3, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=440, - serialized_end=543, -) -_sym_db.RegisterEnumDescriptor(_SEC1MSGTYPE) - -Sec1MsgType = enum_type_wrapper.EnumTypeWrapper(_SEC1MSGTYPE) -Session_Command0 = 0 -Session_Response0 = 1 -Session_Command1 = 2 -Session_Response1 = 3 - - - -_SESSIONCMD1 = _descriptor.Descriptor( - name='SessionCmd1', - full_name='SessionCmd1', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='client_verify_data', full_name='SessionCmd1.client_verify_data', index=0, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=31, - serialized_end=72, -) - - -_SESSIONRESP1 = _descriptor.Descriptor( - name='SessionResp1', - full_name='SessionResp1', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='SessionResp1.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='device_verify_data', full_name='SessionResp1.device_verify_data', index=1, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=74, - serialized_end=141, -) - - -_SESSIONCMD0 = _descriptor.Descriptor( - name='SessionCmd0', - full_name='SessionCmd0', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='client_pubkey', full_name='SessionCmd0.client_pubkey', index=0, - number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=143, - serialized_end=179, -) - - -_SESSIONRESP0 = _descriptor.Descriptor( - name='SessionResp0', - full_name='SessionResp0', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='SessionResp0.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='device_pubkey', full_name='SessionResp0.device_pubkey', index=1, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='device_random', full_name='SessionResp0.device_random', index=2, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=181, - serialized_end=266, -) - - -_SEC1PAYLOAD = _descriptor.Descriptor( - name='Sec1Payload', - full_name='Sec1Payload', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='msg', full_name='Sec1Payload.msg', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sc0', full_name='Sec1Payload.sc0', index=1, - number=20, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sr0', full_name='Sec1Payload.sr0', index=2, - number=21, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sc1', full_name='Sec1Payload.sc1', index=3, - number=22, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sr1', full_name='Sec1Payload.sr1', index=4, - number=23, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='payload', full_name='Sec1Payload.payload', - index=0, containing_type=None, fields=[]), - ], - serialized_start=269, - serialized_end=438, -) - -_SESSIONRESP1.fields_by_name['status'].enum_type = constants__pb2._STATUS -_SESSIONRESP0.fields_by_name['status'].enum_type = constants__pb2._STATUS -_SEC1PAYLOAD.fields_by_name['msg'].enum_type = _SEC1MSGTYPE -_SEC1PAYLOAD.fields_by_name['sc0'].message_type = _SESSIONCMD0 -_SEC1PAYLOAD.fields_by_name['sr0'].message_type = _SESSIONRESP0 -_SEC1PAYLOAD.fields_by_name['sc1'].message_type = _SESSIONCMD1 -_SEC1PAYLOAD.fields_by_name['sr1'].message_type = _SESSIONRESP1 -_SEC1PAYLOAD.oneofs_by_name['payload'].fields.append( - _SEC1PAYLOAD.fields_by_name['sc0']) -_SEC1PAYLOAD.fields_by_name['sc0'].containing_oneof = _SEC1PAYLOAD.oneofs_by_name['payload'] -_SEC1PAYLOAD.oneofs_by_name['payload'].fields.append( - _SEC1PAYLOAD.fields_by_name['sr0']) -_SEC1PAYLOAD.fields_by_name['sr0'].containing_oneof = _SEC1PAYLOAD.oneofs_by_name['payload'] -_SEC1PAYLOAD.oneofs_by_name['payload'].fields.append( - _SEC1PAYLOAD.fields_by_name['sc1']) -_SEC1PAYLOAD.fields_by_name['sc1'].containing_oneof = _SEC1PAYLOAD.oneofs_by_name['payload'] -_SEC1PAYLOAD.oneofs_by_name['payload'].fields.append( - _SEC1PAYLOAD.fields_by_name['sr1']) -_SEC1PAYLOAD.fields_by_name['sr1'].containing_oneof = _SEC1PAYLOAD.oneofs_by_name['payload'] -DESCRIPTOR.message_types_by_name['SessionCmd1'] = _SESSIONCMD1 -DESCRIPTOR.message_types_by_name['SessionResp1'] = _SESSIONRESP1 -DESCRIPTOR.message_types_by_name['SessionCmd0'] = _SESSIONCMD0 -DESCRIPTOR.message_types_by_name['SessionResp0'] = _SESSIONRESP0 -DESCRIPTOR.message_types_by_name['Sec1Payload'] = _SEC1PAYLOAD -DESCRIPTOR.enum_types_by_name['Sec1MsgType'] = _SEC1MSGTYPE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -SessionCmd1 = _reflection.GeneratedProtocolMessageType('SessionCmd1', (_message.Message,), dict( - DESCRIPTOR = _SESSIONCMD1, - __module__ = 'sec1_pb2' - # @@protoc_insertion_point(class_scope:SessionCmd1) - )) -_sym_db.RegisterMessage(SessionCmd1) - -SessionResp1 = _reflection.GeneratedProtocolMessageType('SessionResp1', (_message.Message,), dict( - DESCRIPTOR = _SESSIONRESP1, - __module__ = 'sec1_pb2' - # @@protoc_insertion_point(class_scope:SessionResp1) - )) -_sym_db.RegisterMessage(SessionResp1) - -SessionCmd0 = _reflection.GeneratedProtocolMessageType('SessionCmd0', (_message.Message,), dict( - DESCRIPTOR = _SESSIONCMD0, - __module__ = 'sec1_pb2' - # @@protoc_insertion_point(class_scope:SessionCmd0) - )) -_sym_db.RegisterMessage(SessionCmd0) - -SessionResp0 = _reflection.GeneratedProtocolMessageType('SessionResp0', (_message.Message,), dict( - DESCRIPTOR = _SESSIONRESP0, - __module__ = 'sec1_pb2' - # @@protoc_insertion_point(class_scope:SessionResp0) - )) -_sym_db.RegisterMessage(SessionResp0) - -Sec1Payload = _reflection.GeneratedProtocolMessageType('Sec1Payload', (_message.Message,), dict( - DESCRIPTOR = _SEC1PAYLOAD, - __module__ = 'sec1_pb2' - # @@protoc_insertion_point(class_scope:Sec1Payload) - )) -_sym_db.RegisterMessage(Sec1Payload) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nsec1.proto\x1a\x0f\x63onstants.proto\")\n\x0bSessionCmd1\x12\x1a\n\x12\x63lient_verify_data\x18\x02 \x01(\x0c\"C\n\x0cSessionResp1\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x1a\n\x12\x64\x65vice_verify_data\x18\x03 \x01(\x0c\"$\n\x0bSessionCmd0\x12\x15\n\rclient_pubkey\x18\x01 \x01(\x0c\"U\n\x0cSessionResp0\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x15\n\rdevice_pubkey\x18\x02 \x01(\x0c\x12\x15\n\rdevice_random\x18\x03 \x01(\x0c\"\xa9\x01\n\x0bSec1Payload\x12\x19\n\x03msg\x18\x01 \x01(\x0e\x32\x0c.Sec1MsgType\x12\x1b\n\x03sc0\x18\x14 \x01(\x0b\x32\x0c.SessionCmd0H\x00\x12\x1c\n\x03sr0\x18\x15 \x01(\x0b\x32\r.SessionResp0H\x00\x12\x1b\n\x03sc1\x18\x16 \x01(\x0b\x32\x0c.SessionCmd1H\x00\x12\x1c\n\x03sr1\x18\x17 \x01(\x0b\x32\r.SessionResp1H\x00\x42\t\n\x07payload*g\n\x0bSec1MsgType\x12\x14\n\x10Session_Command0\x10\x00\x12\x15\n\x11Session_Response0\x10\x01\x12\x14\n\x10Session_Command1\x10\x02\x12\x15\n\x11Session_Response1\x10\x03\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'sec1_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _SEC1MSGTYPE._serialized_start=440 + _SEC1MSGTYPE._serialized_end=543 + _SESSIONCMD1._serialized_start=31 + _SESSIONCMD1._serialized_end=72 + _SESSIONRESP1._serialized_start=74 + _SESSIONRESP1._serialized_end=141 + _SESSIONCMD0._serialized_start=143 + _SESSIONCMD0._serialized_end=179 + _SESSIONRESP0._serialized_start=181 + _SESSIONRESP0._serialized_end=266 + _SEC1PAYLOAD._serialized_start=269 + _SEC1PAYLOAD._serialized_end=438 # @@protoc_insertion_point(module_scope) diff --git a/components/protocomm/python/session_pb2.py b/components/protocomm/python/session_pb2.py index f0bfe572ab..9408ad4a9e 100644 --- a/components/protocomm/python/session_pb2.py +++ b/components/protocomm/python/session_pb2.py @@ -1,16 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: session.proto - -import sys - -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pb2 -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import enum_type_wrapper - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,108 +14,16 @@ _sym_db = _symbol_database.Default() import sec0_pb2 as sec0__pb2 import sec1_pb2 as sec1__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='session.proto', - package='', - syntax='proto3', - serialized_pb=_b('\n\rsession.proto\x1a\nsec0.proto\x1a\nsec1.proto\"v\n\x0bSessionData\x12\"\n\x07sec_ver\x18\x02 \x01(\x0e\x32\x11.SecSchemeVersion\x12\x1c\n\x04sec0\x18\n \x01(\x0b\x32\x0c.Sec0PayloadH\x00\x12\x1c\n\x04sec1\x18\x0b \x01(\x0b\x32\x0c.Sec1PayloadH\x00\x42\x07\n\x05proto*2\n\x10SecSchemeVersion\x12\x0e\n\nSecScheme0\x10\x00\x12\x0e\n\nSecScheme1\x10\x01\x62\x06proto3') - , - dependencies=[sec0__pb2.DESCRIPTOR,sec1__pb2.DESCRIPTOR,]) -_SECSCHEMEVERSION = _descriptor.EnumDescriptor( - name='SecSchemeVersion', - full_name='SecSchemeVersion', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='SecScheme0', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='SecScheme1', index=1, number=1, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=161, - serialized_end=211, -) -_sym_db.RegisterEnumDescriptor(_SECSCHEMEVERSION) - -SecSchemeVersion = enum_type_wrapper.EnumTypeWrapper(_SECSCHEMEVERSION) -SecScheme0 = 0 -SecScheme1 = 1 - - - -_SESSIONDATA = _descriptor.Descriptor( - name='SessionData', - full_name='SessionData', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='sec_ver', full_name='SessionData.sec_ver', index=0, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sec0', full_name='SessionData.sec0', index=1, - number=10, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sec1', full_name='SessionData.sec1', index=2, - number=11, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='proto', full_name='SessionData.proto', - index=0, containing_type=None, fields=[]), - ], - serialized_start=41, - serialized_end=159, -) - -_SESSIONDATA.fields_by_name['sec_ver'].enum_type = _SECSCHEMEVERSION -_SESSIONDATA.fields_by_name['sec0'].message_type = sec0__pb2._SEC0PAYLOAD -_SESSIONDATA.fields_by_name['sec1'].message_type = sec1__pb2._SEC1PAYLOAD -_SESSIONDATA.oneofs_by_name['proto'].fields.append( - _SESSIONDATA.fields_by_name['sec0']) -_SESSIONDATA.fields_by_name['sec0'].containing_oneof = _SESSIONDATA.oneofs_by_name['proto'] -_SESSIONDATA.oneofs_by_name['proto'].fields.append( - _SESSIONDATA.fields_by_name['sec1']) -_SESSIONDATA.fields_by_name['sec1'].containing_oneof = _SESSIONDATA.oneofs_by_name['proto'] -DESCRIPTOR.message_types_by_name['SessionData'] = _SESSIONDATA -DESCRIPTOR.enum_types_by_name['SecSchemeVersion'] = _SECSCHEMEVERSION -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -SessionData = _reflection.GeneratedProtocolMessageType('SessionData', (_message.Message,), dict( - DESCRIPTOR = _SESSIONDATA, - __module__ = 'session_pb2' - # @@protoc_insertion_point(class_scope:SessionData) - )) -_sym_db.RegisterMessage(SessionData) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rsession.proto\x1a\nsec0.proto\x1a\nsec1.proto\"v\n\x0bSessionData\x12\"\n\x07sec_ver\x18\x02 \x01(\x0e\x32\x11.SecSchemeVersion\x12\x1c\n\x04sec0\x18\n \x01(\x0b\x32\x0c.Sec0PayloadH\x00\x12\x1c\n\x04sec1\x18\x0b \x01(\x0b\x32\x0c.Sec1PayloadH\x00\x42\x07\n\x05proto*2\n\x10SecSchemeVersion\x12\x0e\n\nSecScheme0\x10\x00\x12\x0e\n\nSecScheme1\x10\x01\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'session_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _SECSCHEMEVERSION._serialized_start=161 + _SECSCHEMEVERSION._serialized_end=211 + _SESSIONDATA._serialized_start=41 + _SESSIONDATA._serialized_end=159 # @@protoc_insertion_point(module_scope) From 0ca9ad5249d020c3ea3b4240f48e3752da425e09 Mon Sep 17 00:00:00 2001 From: Laukik Hase Date: Thu, 26 May 2022 11:10:12 +0530 Subject: [PATCH 4/5] wifi_provisioning: Regenerated proto-c and python with protobuf compiler v3.21.0 --- .../proto-c/wifi_config.pb-c.h | 34 +- .../proto-c/wifi_constants.pb-c.h | 6 +- .../proto-c/wifi_scan.pb-c.h | 36 +- .../python/wifi_config_pb2.py | 476 +--------------- .../python/wifi_constants_pb2.py | 212 +------ .../wifi_provisioning/python/wifi_scan_pb2.py | 532 +----------------- 6 files changed, 106 insertions(+), 1190 deletions(-) diff --git a/components/wifi_provisioning/proto-c/wifi_config.pb-c.h b/components/wifi_provisioning/proto-c/wifi_config.pb-c.h index 8c6107f421..3e293f23be 100644 --- a/components/wifi_provisioning/proto-c/wifi_config.pb-c.h +++ b/components/wifi_provisioning/proto-c/wifi_config.pb-c.h @@ -10,20 +10,20 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif #include "constants.pb-c.h" #include "wifi_constants.pb-c.h" -typedef struct _CmdGetStatus CmdGetStatus; -typedef struct _RespGetStatus RespGetStatus; -typedef struct _CmdSetConfig CmdSetConfig; -typedef struct _RespSetConfig RespSetConfig; -typedef struct _CmdApplyConfig CmdApplyConfig; -typedef struct _RespApplyConfig RespApplyConfig; -typedef struct _WiFiConfigPayload WiFiConfigPayload; +typedef struct CmdGetStatus CmdGetStatus; +typedef struct RespGetStatus RespGetStatus; +typedef struct CmdSetConfig CmdSetConfig; +typedef struct RespSetConfig RespSetConfig; +typedef struct CmdApplyConfig CmdApplyConfig; +typedef struct RespApplyConfig RespApplyConfig; +typedef struct WiFiConfigPayload WiFiConfigPayload; /* --- enums --- */ @@ -40,7 +40,7 @@ typedef enum _WiFiConfigMsgType { /* --- messages --- */ -struct _CmdGetStatus +struct CmdGetStatus { ProtobufCMessage base; }; @@ -53,10 +53,10 @@ typedef enum { RESP_GET_STATUS__STATE__NOT_SET = 0, RESP_GET_STATUS__STATE_FAIL_REASON = 10, RESP_GET_STATUS__STATE_CONNECTED = 11 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(RESP_GET_STATUS__STATE) + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(RESP_GET_STATUS__STATE__CASE) } RespGetStatus__StateCase; -struct _RespGetStatus +struct RespGetStatus { ProtobufCMessage base; Status status; @@ -72,7 +72,7 @@ struct _RespGetStatus , STATUS__Success, WIFI_STATION_STATE__Connected, RESP_GET_STATUS__STATE__NOT_SET, {0} } -struct _CmdSetConfig +struct CmdSetConfig { ProtobufCMessage base; ProtobufCBinaryData ssid; @@ -85,7 +85,7 @@ struct _CmdSetConfig , {0,NULL}, {0,NULL}, {0,NULL}, 0 } -struct _RespSetConfig +struct RespSetConfig { ProtobufCMessage base; Status status; @@ -95,7 +95,7 @@ struct _RespSetConfig , STATUS__Success } -struct _CmdApplyConfig +struct CmdApplyConfig { ProtobufCMessage base; }; @@ -104,7 +104,7 @@ struct _CmdApplyConfig } -struct _RespApplyConfig +struct RespApplyConfig { ProtobufCMessage base; Status status; @@ -122,10 +122,10 @@ typedef enum { WI_FI_CONFIG_PAYLOAD__PAYLOAD_RESP_SET_CONFIG = 13, WI_FI_CONFIG_PAYLOAD__PAYLOAD_CMD_APPLY_CONFIG = 14, WI_FI_CONFIG_PAYLOAD__PAYLOAD_RESP_APPLY_CONFIG = 15 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WI_FI_CONFIG_PAYLOAD__PAYLOAD) + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WI_FI_CONFIG_PAYLOAD__PAYLOAD__CASE) } WiFiConfigPayload__PayloadCase; -struct _WiFiConfigPayload +struct WiFiConfigPayload { ProtobufCMessage base; WiFiConfigMsgType msg; diff --git a/components/wifi_provisioning/proto-c/wifi_constants.pb-c.h b/components/wifi_provisioning/proto-c/wifi_constants.pb-c.h index 0715505545..516ddc84fc 100644 --- a/components/wifi_provisioning/proto-c/wifi_constants.pb-c.h +++ b/components/wifi_provisioning/proto-c/wifi_constants.pb-c.h @@ -10,12 +10,12 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif -typedef struct _WifiConnectedState WifiConnectedState; +typedef struct WifiConnectedState WifiConnectedState; /* --- enums --- */ @@ -44,7 +44,7 @@ typedef enum _WifiAuthMode { /* --- messages --- */ -struct _WifiConnectedState +struct WifiConnectedState { ProtobufCMessage base; char *ip4_addr; diff --git a/components/wifi_provisioning/proto-c/wifi_scan.pb-c.h b/components/wifi_provisioning/proto-c/wifi_scan.pb-c.h index 9caea2c7cd..dc3975590d 100644 --- a/components/wifi_provisioning/proto-c/wifi_scan.pb-c.h +++ b/components/wifi_provisioning/proto-c/wifi_scan.pb-c.h @@ -10,21 +10,21 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003001 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif #include "constants.pb-c.h" #include "wifi_constants.pb-c.h" -typedef struct _CmdScanStart CmdScanStart; -typedef struct _RespScanStart RespScanStart; -typedef struct _CmdScanStatus CmdScanStatus; -typedef struct _RespScanStatus RespScanStatus; -typedef struct _CmdScanResult CmdScanResult; -typedef struct _WiFiScanResult WiFiScanResult; -typedef struct _RespScanResult RespScanResult; -typedef struct _WiFiScanPayload WiFiScanPayload; +typedef struct CmdScanStart CmdScanStart; +typedef struct RespScanStart RespScanStart; +typedef struct CmdScanStatus CmdScanStatus; +typedef struct RespScanStatus RespScanStatus; +typedef struct CmdScanResult CmdScanResult; +typedef struct WiFiScanResult WiFiScanResult; +typedef struct RespScanResult RespScanResult; +typedef struct WiFiScanPayload WiFiScanPayload; /* --- enums --- */ @@ -41,7 +41,7 @@ typedef enum _WiFiScanMsgType { /* --- messages --- */ -struct _CmdScanStart +struct CmdScanStart { ProtobufCMessage base; protobuf_c_boolean blocking; @@ -54,7 +54,7 @@ struct _CmdScanStart , 0, 0, 0, 0 } -struct _RespScanStart +struct RespScanStart { ProtobufCMessage base; }; @@ -63,7 +63,7 @@ struct _RespScanStart } -struct _CmdScanStatus +struct CmdScanStatus { ProtobufCMessage base; }; @@ -72,7 +72,7 @@ struct _CmdScanStatus } -struct _RespScanStatus +struct RespScanStatus { ProtobufCMessage base; protobuf_c_boolean scan_finished; @@ -83,7 +83,7 @@ struct _RespScanStatus , 0, 0 } -struct _CmdScanResult +struct CmdScanResult { ProtobufCMessage base; uint32_t start_index; @@ -94,7 +94,7 @@ struct _CmdScanResult , 0, 0 } -struct _WiFiScanResult +struct WiFiScanResult { ProtobufCMessage base; ProtobufCBinaryData ssid; @@ -108,7 +108,7 @@ struct _WiFiScanResult , {0,NULL}, 0, 0, {0,NULL}, WIFI_AUTH_MODE__Open } -struct _RespScanResult +struct RespScanResult { ProtobufCMessage base; size_t n_entries; @@ -127,10 +127,10 @@ typedef enum { WI_FI_SCAN_PAYLOAD__PAYLOAD_RESP_SCAN_STATUS = 13, WI_FI_SCAN_PAYLOAD__PAYLOAD_CMD_SCAN_RESULT = 14, WI_FI_SCAN_PAYLOAD__PAYLOAD_RESP_SCAN_RESULT = 15 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WI_FI_SCAN_PAYLOAD__PAYLOAD) + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WI_FI_SCAN_PAYLOAD__PAYLOAD__CASE) } WiFiScanPayload__PayloadCase; -struct _WiFiScanPayload +struct WiFiScanPayload { ProtobufCMessage base; WiFiScanMsgType msg; diff --git a/components/wifi_provisioning/python/wifi_config_pb2.py b/components/wifi_provisioning/python/wifi_config_pb2.py index 1e53d49cdc..3d48ecfb7e 100644 --- a/components/wifi_provisioning/python/wifi_config_pb2.py +++ b/components/wifi_provisioning/python/wifi_config_pb2.py @@ -1,16 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: wifi_config.proto - -import sys - -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pb2 -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import enum_type_wrapper - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,449 +14,28 @@ _sym_db = _symbol_database.Default() import constants_pb2 as constants__pb2 import wifi_constants_pb2 as wifi__constants__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='wifi_config.proto', - package='', - syntax='proto3', - serialized_pb=_b('\n\x11wifi_config.proto\x1a\x0f\x63onstants.proto\x1a\x14wifi_constants.proto\"\x0e\n\x0c\x43mdGetStatus\"\xb2\x01\n\rRespGetStatus\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12$\n\tsta_state\x18\x02 \x01(\x0e\x32\x11.WifiStationState\x12/\n\x0b\x66\x61il_reason\x18\n \x01(\x0e\x32\x18.WifiConnectFailedReasonH\x00\x12(\n\tconnected\x18\x0b \x01(\x0b\x32\x13.WifiConnectedStateH\x00\x42\x07\n\x05state\"P\n\x0c\x43mdSetConfig\x12\x0c\n\x04ssid\x18\x01 \x01(\x0c\x12\x12\n\npassphrase\x18\x02 \x01(\x0c\x12\r\n\x05\x62ssid\x18\x03 \x01(\x0c\x12\x0f\n\x07\x63hannel\x18\x04 \x01(\x05\"(\n\rRespSetConfig\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"\x10\n\x0e\x43mdApplyConfig\"*\n\x0fRespApplyConfig\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"\xc3\x02\n\x11WiFiConfigPayload\x12\x1f\n\x03msg\x18\x01 \x01(\x0e\x32\x12.WiFiConfigMsgType\x12\'\n\x0e\x63md_get_status\x18\n \x01(\x0b\x32\r.CmdGetStatusH\x00\x12)\n\x0fresp_get_status\x18\x0b \x01(\x0b\x32\x0e.RespGetStatusH\x00\x12\'\n\x0e\x63md_set_config\x18\x0c \x01(\x0b\x32\r.CmdSetConfigH\x00\x12)\n\x0fresp_set_config\x18\r \x01(\x0b\x32\x0e.RespSetConfigH\x00\x12+\n\x10\x63md_apply_config\x18\x0e \x01(\x0b\x32\x0f.CmdApplyConfigH\x00\x12-\n\x11resp_apply_config\x18\x0f \x01(\x0b\x32\x10.RespApplyConfigH\x00\x42\t\n\x07payload*\x9e\x01\n\x11WiFiConfigMsgType\x12\x14\n\x10TypeCmdGetStatus\x10\x00\x12\x15\n\x11TypeRespGetStatus\x10\x01\x12\x14\n\x10TypeCmdSetConfig\x10\x02\x12\x15\n\x11TypeRespSetConfig\x10\x03\x12\x16\n\x12TypeCmdApplyConfig\x10\x04\x12\x17\n\x13TypeRespApplyConfig\x10\x05\x62\x06proto3') - , - dependencies=[constants__pb2.DESCRIPTOR,wifi__constants__pb2.DESCRIPTOR,]) -_WIFICONFIGMSGTYPE = _descriptor.EnumDescriptor( - name='WiFiConfigMsgType', - full_name='WiFiConfigMsgType', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='TypeCmdGetStatus', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespGetStatus', index=1, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeCmdSetConfig', index=2, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespSetConfig', index=3, number=3, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeCmdApplyConfig', index=4, number=4, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespApplyConfig', index=5, number=5, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=770, - serialized_end=928, -) -_sym_db.RegisterEnumDescriptor(_WIFICONFIGMSGTYPE) - -WiFiConfigMsgType = enum_type_wrapper.EnumTypeWrapper(_WIFICONFIGMSGTYPE) -TypeCmdGetStatus = 0 -TypeRespGetStatus = 1 -TypeCmdSetConfig = 2 -TypeRespSetConfig = 3 -TypeCmdApplyConfig = 4 -TypeRespApplyConfig = 5 - - - -_CMDGETSTATUS = _descriptor.Descriptor( - name='CmdGetStatus', - full_name='CmdGetStatus', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=60, - serialized_end=74, -) - - -_RESPGETSTATUS = _descriptor.Descriptor( - name='RespGetStatus', - full_name='RespGetStatus', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='RespGetStatus.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='sta_state', full_name='RespGetStatus.sta_state', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='fail_reason', full_name='RespGetStatus.fail_reason', index=2, - number=10, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='connected', full_name='RespGetStatus.connected', index=3, - number=11, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='state', full_name='RespGetStatus.state', - index=0, containing_type=None, fields=[]), - ], - serialized_start=77, - serialized_end=255, -) - - -_CMDSETCONFIG = _descriptor.Descriptor( - name='CmdSetConfig', - full_name='CmdSetConfig', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='ssid', full_name='CmdSetConfig.ssid', index=0, - number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='passphrase', full_name='CmdSetConfig.passphrase', index=1, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='bssid', full_name='CmdSetConfig.bssid', index=2, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='channel', full_name='CmdSetConfig.channel', index=3, - number=4, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=257, - serialized_end=337, -) - - -_RESPSETCONFIG = _descriptor.Descriptor( - name='RespSetConfig', - full_name='RespSetConfig', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='RespSetConfig.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=339, - serialized_end=379, -) - - -_CMDAPPLYCONFIG = _descriptor.Descriptor( - name='CmdApplyConfig', - full_name='CmdApplyConfig', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=381, - serialized_end=397, -) - - -_RESPAPPLYCONFIG = _descriptor.Descriptor( - name='RespApplyConfig', - full_name='RespApplyConfig', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='RespApplyConfig.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=399, - serialized_end=441, -) - - -_WIFICONFIGPAYLOAD = _descriptor.Descriptor( - name='WiFiConfigPayload', - full_name='WiFiConfigPayload', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='msg', full_name='WiFiConfigPayload.msg', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_get_status', full_name='WiFiConfigPayload.cmd_get_status', index=1, - number=10, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_get_status', full_name='WiFiConfigPayload.resp_get_status', index=2, - number=11, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_set_config', full_name='WiFiConfigPayload.cmd_set_config', index=3, - number=12, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_set_config', full_name='WiFiConfigPayload.resp_set_config', index=4, - number=13, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_apply_config', full_name='WiFiConfigPayload.cmd_apply_config', index=5, - number=14, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_apply_config', full_name='WiFiConfigPayload.resp_apply_config', index=6, - number=15, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='payload', full_name='WiFiConfigPayload.payload', - index=0, containing_type=None, fields=[]), - ], - serialized_start=444, - serialized_end=767, -) - -_RESPGETSTATUS.fields_by_name['status'].enum_type = constants__pb2._STATUS -_RESPGETSTATUS.fields_by_name['sta_state'].enum_type = wifi__constants__pb2._WIFISTATIONSTATE -_RESPGETSTATUS.fields_by_name['fail_reason'].enum_type = wifi__constants__pb2._WIFICONNECTFAILEDREASON -_RESPGETSTATUS.fields_by_name['connected'].message_type = wifi__constants__pb2._WIFICONNECTEDSTATE -_RESPGETSTATUS.oneofs_by_name['state'].fields.append( - _RESPGETSTATUS.fields_by_name['fail_reason']) -_RESPGETSTATUS.fields_by_name['fail_reason'].containing_oneof = _RESPGETSTATUS.oneofs_by_name['state'] -_RESPGETSTATUS.oneofs_by_name['state'].fields.append( - _RESPGETSTATUS.fields_by_name['connected']) -_RESPGETSTATUS.fields_by_name['connected'].containing_oneof = _RESPGETSTATUS.oneofs_by_name['state'] -_RESPSETCONFIG.fields_by_name['status'].enum_type = constants__pb2._STATUS -_RESPAPPLYCONFIG.fields_by_name['status'].enum_type = constants__pb2._STATUS -_WIFICONFIGPAYLOAD.fields_by_name['msg'].enum_type = _WIFICONFIGMSGTYPE -_WIFICONFIGPAYLOAD.fields_by_name['cmd_get_status'].message_type = _CMDGETSTATUS -_WIFICONFIGPAYLOAD.fields_by_name['resp_get_status'].message_type = _RESPGETSTATUS -_WIFICONFIGPAYLOAD.fields_by_name['cmd_set_config'].message_type = _CMDSETCONFIG -_WIFICONFIGPAYLOAD.fields_by_name['resp_set_config'].message_type = _RESPSETCONFIG -_WIFICONFIGPAYLOAD.fields_by_name['cmd_apply_config'].message_type = _CMDAPPLYCONFIG -_WIFICONFIGPAYLOAD.fields_by_name['resp_apply_config'].message_type = _RESPAPPLYCONFIG -_WIFICONFIGPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFICONFIGPAYLOAD.fields_by_name['cmd_get_status']) -_WIFICONFIGPAYLOAD.fields_by_name['cmd_get_status'].containing_oneof = _WIFICONFIGPAYLOAD.oneofs_by_name['payload'] -_WIFICONFIGPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFICONFIGPAYLOAD.fields_by_name['resp_get_status']) -_WIFICONFIGPAYLOAD.fields_by_name['resp_get_status'].containing_oneof = _WIFICONFIGPAYLOAD.oneofs_by_name['payload'] -_WIFICONFIGPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFICONFIGPAYLOAD.fields_by_name['cmd_set_config']) -_WIFICONFIGPAYLOAD.fields_by_name['cmd_set_config'].containing_oneof = _WIFICONFIGPAYLOAD.oneofs_by_name['payload'] -_WIFICONFIGPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFICONFIGPAYLOAD.fields_by_name['resp_set_config']) -_WIFICONFIGPAYLOAD.fields_by_name['resp_set_config'].containing_oneof = _WIFICONFIGPAYLOAD.oneofs_by_name['payload'] -_WIFICONFIGPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFICONFIGPAYLOAD.fields_by_name['cmd_apply_config']) -_WIFICONFIGPAYLOAD.fields_by_name['cmd_apply_config'].containing_oneof = _WIFICONFIGPAYLOAD.oneofs_by_name['payload'] -_WIFICONFIGPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFICONFIGPAYLOAD.fields_by_name['resp_apply_config']) -_WIFICONFIGPAYLOAD.fields_by_name['resp_apply_config'].containing_oneof = _WIFICONFIGPAYLOAD.oneofs_by_name['payload'] -DESCRIPTOR.message_types_by_name['CmdGetStatus'] = _CMDGETSTATUS -DESCRIPTOR.message_types_by_name['RespGetStatus'] = _RESPGETSTATUS -DESCRIPTOR.message_types_by_name['CmdSetConfig'] = _CMDSETCONFIG -DESCRIPTOR.message_types_by_name['RespSetConfig'] = _RESPSETCONFIG -DESCRIPTOR.message_types_by_name['CmdApplyConfig'] = _CMDAPPLYCONFIG -DESCRIPTOR.message_types_by_name['RespApplyConfig'] = _RESPAPPLYCONFIG -DESCRIPTOR.message_types_by_name['WiFiConfigPayload'] = _WIFICONFIGPAYLOAD -DESCRIPTOR.enum_types_by_name['WiFiConfigMsgType'] = _WIFICONFIGMSGTYPE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -CmdGetStatus = _reflection.GeneratedProtocolMessageType('CmdGetStatus', (_message.Message,), dict( - DESCRIPTOR = _CMDGETSTATUS, - __module__ = 'wifi_config_pb2' - # @@protoc_insertion_point(class_scope:CmdGetStatus) - )) -_sym_db.RegisterMessage(CmdGetStatus) - -RespGetStatus = _reflection.GeneratedProtocolMessageType('RespGetStatus', (_message.Message,), dict( - DESCRIPTOR = _RESPGETSTATUS, - __module__ = 'wifi_config_pb2' - # @@protoc_insertion_point(class_scope:RespGetStatus) - )) -_sym_db.RegisterMessage(RespGetStatus) - -CmdSetConfig = _reflection.GeneratedProtocolMessageType('CmdSetConfig', (_message.Message,), dict( - DESCRIPTOR = _CMDSETCONFIG, - __module__ = 'wifi_config_pb2' - # @@protoc_insertion_point(class_scope:CmdSetConfig) - )) -_sym_db.RegisterMessage(CmdSetConfig) - -RespSetConfig = _reflection.GeneratedProtocolMessageType('RespSetConfig', (_message.Message,), dict( - DESCRIPTOR = _RESPSETCONFIG, - __module__ = 'wifi_config_pb2' - # @@protoc_insertion_point(class_scope:RespSetConfig) - )) -_sym_db.RegisterMessage(RespSetConfig) - -CmdApplyConfig = _reflection.GeneratedProtocolMessageType('CmdApplyConfig', (_message.Message,), dict( - DESCRIPTOR = _CMDAPPLYCONFIG, - __module__ = 'wifi_config_pb2' - # @@protoc_insertion_point(class_scope:CmdApplyConfig) - )) -_sym_db.RegisterMessage(CmdApplyConfig) - -RespApplyConfig = _reflection.GeneratedProtocolMessageType('RespApplyConfig', (_message.Message,), dict( - DESCRIPTOR = _RESPAPPLYCONFIG, - __module__ = 'wifi_config_pb2' - # @@protoc_insertion_point(class_scope:RespApplyConfig) - )) -_sym_db.RegisterMessage(RespApplyConfig) - -WiFiConfigPayload = _reflection.GeneratedProtocolMessageType('WiFiConfigPayload', (_message.Message,), dict( - DESCRIPTOR = _WIFICONFIGPAYLOAD, - __module__ = 'wifi_config_pb2' - # @@protoc_insertion_point(class_scope:WiFiConfigPayload) - )) -_sym_db.RegisterMessage(WiFiConfigPayload) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x11wifi_config.proto\x1a\x0f\x63onstants.proto\x1a\x14wifi_constants.proto\"\x0e\n\x0c\x43mdGetStatus\"\xb2\x01\n\rRespGetStatus\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12$\n\tsta_state\x18\x02 \x01(\x0e\x32\x11.WifiStationState\x12/\n\x0b\x66\x61il_reason\x18\n \x01(\x0e\x32\x18.WifiConnectFailedReasonH\x00\x12(\n\tconnected\x18\x0b \x01(\x0b\x32\x13.WifiConnectedStateH\x00\x42\x07\n\x05state\"P\n\x0c\x43mdSetConfig\x12\x0c\n\x04ssid\x18\x01 \x01(\x0c\x12\x12\n\npassphrase\x18\x02 \x01(\x0c\x12\r\n\x05\x62ssid\x18\x03 \x01(\x0c\x12\x0f\n\x07\x63hannel\x18\x04 \x01(\x05\"(\n\rRespSetConfig\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"\x10\n\x0e\x43mdApplyConfig\"*\n\x0fRespApplyConfig\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"\xc3\x02\n\x11WiFiConfigPayload\x12\x1f\n\x03msg\x18\x01 \x01(\x0e\x32\x12.WiFiConfigMsgType\x12\'\n\x0e\x63md_get_status\x18\n \x01(\x0b\x32\r.CmdGetStatusH\x00\x12)\n\x0fresp_get_status\x18\x0b \x01(\x0b\x32\x0e.RespGetStatusH\x00\x12\'\n\x0e\x63md_set_config\x18\x0c \x01(\x0b\x32\r.CmdSetConfigH\x00\x12)\n\x0fresp_set_config\x18\r \x01(\x0b\x32\x0e.RespSetConfigH\x00\x12+\n\x10\x63md_apply_config\x18\x0e \x01(\x0b\x32\x0f.CmdApplyConfigH\x00\x12-\n\x11resp_apply_config\x18\x0f \x01(\x0b\x32\x10.RespApplyConfigH\x00\x42\t\n\x07payload*\x9e\x01\n\x11WiFiConfigMsgType\x12\x14\n\x10TypeCmdGetStatus\x10\x00\x12\x15\n\x11TypeRespGetStatus\x10\x01\x12\x14\n\x10TypeCmdSetConfig\x10\x02\x12\x15\n\x11TypeRespSetConfig\x10\x03\x12\x16\n\x12TypeCmdApplyConfig\x10\x04\x12\x17\n\x13TypeRespApplyConfig\x10\x05\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'wifi_config_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _WIFICONFIGMSGTYPE._serialized_start=770 + _WIFICONFIGMSGTYPE._serialized_end=928 + _CMDGETSTATUS._serialized_start=60 + _CMDGETSTATUS._serialized_end=74 + _RESPGETSTATUS._serialized_start=77 + _RESPGETSTATUS._serialized_end=255 + _CMDSETCONFIG._serialized_start=257 + _CMDSETCONFIG._serialized_end=337 + _RESPSETCONFIG._serialized_start=339 + _RESPSETCONFIG._serialized_end=379 + _CMDAPPLYCONFIG._serialized_start=381 + _CMDAPPLYCONFIG._serialized_end=397 + _RESPAPPLYCONFIG._serialized_start=399 + _RESPAPPLYCONFIG._serialized_end=441 + _WIFICONFIGPAYLOAD._serialized_start=444 + _WIFICONFIGPAYLOAD._serialized_end=767 # @@protoc_insertion_point(module_scope) diff --git a/components/wifi_provisioning/python/wifi_constants_pb2.py b/components/wifi_provisioning/python/wifi_constants_pb2.py index e969529811..29f87ed097 100644 --- a/components/wifi_provisioning/python/wifi_constants_pb2.py +++ b/components/wifi_provisioning/python/wifi_constants_pb2.py @@ -1,16 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: wifi_constants.proto - -import sys - -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pb2 -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import enum_type_wrapper - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,192 +13,19 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor.FileDescriptor( - name='wifi_constants.proto', - package='', - syntax='proto3', - serialized_pb=_b('\n\x14wifi_constants.proto\"v\n\x12WifiConnectedState\x12\x10\n\x08ip4_addr\x18\x01 \x01(\t\x12 \n\tauth_mode\x18\x02 \x01(\x0e\x32\r.WifiAuthMode\x12\x0c\n\x04ssid\x18\x03 \x01(\x0c\x12\r\n\x05\x62ssid\x18\x04 \x01(\x0c\x12\x0f\n\x07\x63hannel\x18\x05 \x01(\x05*Y\n\x10WifiStationState\x12\r\n\tConnected\x10\x00\x12\x0e\n\nConnecting\x10\x01\x12\x10\n\x0c\x44isconnected\x10\x02\x12\x14\n\x10\x43onnectionFailed\x10\x03*=\n\x17WifiConnectFailedReason\x12\r\n\tAuthError\x10\x00\x12\x13\n\x0fNetworkNotFound\x10\x01*c\n\x0cWifiAuthMode\x12\x08\n\x04Open\x10\x00\x12\x07\n\x03WEP\x10\x01\x12\x0b\n\x07WPA_PSK\x10\x02\x12\x0c\n\x08WPA2_PSK\x10\x03\x12\x10\n\x0cWPA_WPA2_PSK\x10\x04\x12\x13\n\x0fWPA2_ENTERPRISE\x10\x05\x62\x06proto3') -) - -_WIFISTATIONSTATE = _descriptor.EnumDescriptor( - name='WifiStationState', - full_name='WifiStationState', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='Connected', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='Connecting', index=1, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='Disconnected', index=2, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ConnectionFailed', index=3, number=3, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=144, - serialized_end=233, -) -_sym_db.RegisterEnumDescriptor(_WIFISTATIONSTATE) - -WifiStationState = enum_type_wrapper.EnumTypeWrapper(_WIFISTATIONSTATE) -_WIFICONNECTFAILEDREASON = _descriptor.EnumDescriptor( - name='WifiConnectFailedReason', - full_name='WifiConnectFailedReason', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='AuthError', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NetworkNotFound', index=1, number=1, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=235, - serialized_end=296, -) -_sym_db.RegisterEnumDescriptor(_WIFICONNECTFAILEDREASON) - -WifiConnectFailedReason = enum_type_wrapper.EnumTypeWrapper(_WIFICONNECTFAILEDREASON) -_WIFIAUTHMODE = _descriptor.EnumDescriptor( - name='WifiAuthMode', - full_name='WifiAuthMode', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='Open', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='WEP', index=1, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='WPA_PSK', index=2, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='WPA2_PSK', index=3, number=3, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='WPA_WPA2_PSK', index=4, number=4, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='WPA2_ENTERPRISE', index=5, number=5, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=298, - serialized_end=397, -) -_sym_db.RegisterEnumDescriptor(_WIFIAUTHMODE) - -WifiAuthMode = enum_type_wrapper.EnumTypeWrapper(_WIFIAUTHMODE) -Connected = 0 -Connecting = 1 -Disconnected = 2 -ConnectionFailed = 3 -AuthError = 0 -NetworkNotFound = 1 -Open = 0 -WEP = 1 -WPA_PSK = 2 -WPA2_PSK = 3 -WPA_WPA2_PSK = 4 -WPA2_ENTERPRISE = 5 - - - -_WIFICONNECTEDSTATE = _descriptor.Descriptor( - name='WifiConnectedState', - full_name='WifiConnectedState', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='ip4_addr', full_name='WifiConnectedState.ip4_addr', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b('').decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='auth_mode', full_name='WifiConnectedState.auth_mode', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='ssid', full_name='WifiConnectedState.ssid', index=2, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='bssid', full_name='WifiConnectedState.bssid', index=3, - number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='channel', full_name='WifiConnectedState.channel', index=4, - number=5, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=24, - serialized_end=142, -) - -_WIFICONNECTEDSTATE.fields_by_name['auth_mode'].enum_type = _WIFIAUTHMODE -DESCRIPTOR.message_types_by_name['WifiConnectedState'] = _WIFICONNECTEDSTATE -DESCRIPTOR.enum_types_by_name['WifiStationState'] = _WIFISTATIONSTATE -DESCRIPTOR.enum_types_by_name['WifiConnectFailedReason'] = _WIFICONNECTFAILEDREASON -DESCRIPTOR.enum_types_by_name['WifiAuthMode'] = _WIFIAUTHMODE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -WifiConnectedState = _reflection.GeneratedProtocolMessageType('WifiConnectedState', (_message.Message,), dict( - DESCRIPTOR = _WIFICONNECTEDSTATE, - __module__ = 'wifi_constants_pb2' - # @@protoc_insertion_point(class_scope:WifiConnectedState) - )) -_sym_db.RegisterMessage(WifiConnectedState) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14wifi_constants.proto\"v\n\x12WifiConnectedState\x12\x10\n\x08ip4_addr\x18\x01 \x01(\t\x12 \n\tauth_mode\x18\x02 \x01(\x0e\x32\r.WifiAuthMode\x12\x0c\n\x04ssid\x18\x03 \x01(\x0c\x12\r\n\x05\x62ssid\x18\x04 \x01(\x0c\x12\x0f\n\x07\x63hannel\x18\x05 \x01(\x05*Y\n\x10WifiStationState\x12\r\n\tConnected\x10\x00\x12\x0e\n\nConnecting\x10\x01\x12\x10\n\x0c\x44isconnected\x10\x02\x12\x14\n\x10\x43onnectionFailed\x10\x03*=\n\x17WifiConnectFailedReason\x12\r\n\tAuthError\x10\x00\x12\x13\n\x0fNetworkNotFound\x10\x01*c\n\x0cWifiAuthMode\x12\x08\n\x04Open\x10\x00\x12\x07\n\x03WEP\x10\x01\x12\x0b\n\x07WPA_PSK\x10\x02\x12\x0c\n\x08WPA2_PSK\x10\x03\x12\x10\n\x0cWPA_WPA2_PSK\x10\x04\x12\x13\n\x0fWPA2_ENTERPRISE\x10\x05\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'wifi_constants_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _WIFISTATIONSTATE._serialized_start=144 + _WIFISTATIONSTATE._serialized_end=233 + _WIFICONNECTFAILEDREASON._serialized_start=235 + _WIFICONNECTFAILEDREASON._serialized_end=296 + _WIFIAUTHMODE._serialized_start=298 + _WIFIAUTHMODE._serialized_end=397 + _WIFICONNECTEDSTATE._serialized_start=24 + _WIFICONNECTEDSTATE._serialized_end=142 # @@protoc_insertion_point(module_scope) diff --git a/components/wifi_provisioning/python/wifi_scan_pb2.py b/components/wifi_provisioning/python/wifi_scan_pb2.py index 70838085de..aaf69c60f2 100644 --- a/components/wifi_provisioning/python/wifi_scan_pb2.py +++ b/components/wifi_provisioning/python/wifi_scan_pb2.py @@ -1,16 +1,11 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: wifi_scan.proto - -import sys - -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import enum_type_wrapper - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,505 +14,30 @@ _sym_db = _symbol_database.Default() import constants_pb2 as constants__pb2 import wifi_constants_pb2 as wifi__constants__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='wifi_scan.proto', - package='', - syntax='proto3', - serialized_options=None, - serialized_pb=_b('\n\x0fwifi_scan.proto\x1a\x0f\x63onstants.proto\x1a\x14wifi_constants.proto\"\\\n\x0c\x43mdScanStart\x12\x10\n\x08\x62locking\x18\x01 \x01(\x08\x12\x0f\n\x07passive\x18\x02 \x01(\x08\x12\x16\n\x0egroup_channels\x18\x03 \x01(\r\x12\x11\n\tperiod_ms\x18\x04 \x01(\r\"\x0f\n\rRespScanStart\"\x0f\n\rCmdScanStatus\"=\n\x0eRespScanStatus\x12\x15\n\rscan_finished\x18\x01 \x01(\x08\x12\x14\n\x0cresult_count\x18\x02 \x01(\r\"3\n\rCmdScanResult\x12\x13\n\x0bstart_index\x18\x01 \x01(\r\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"i\n\x0eWiFiScanResult\x12\x0c\n\x04ssid\x18\x01 \x01(\x0c\x12\x0f\n\x07\x63hannel\x18\x02 \x01(\r\x12\x0c\n\x04rssi\x18\x03 \x01(\x05\x12\r\n\x05\x62ssid\x18\x04 \x01(\x0c\x12\x1b\n\x04\x61uth\x18\x05 \x01(\x0e\x32\r.WifiAuthMode\"2\n\x0eRespScanResult\x12 \n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x0f.WiFiScanResult\"\xd8\x02\n\x0fWiFiScanPayload\x12\x1d\n\x03msg\x18\x01 \x01(\x0e\x32\x10.WiFiScanMsgType\x12\x17\n\x06status\x18\x02 \x01(\x0e\x32\x07.Status\x12\'\n\x0e\x63md_scan_start\x18\n \x01(\x0b\x32\r.CmdScanStartH\x00\x12)\n\x0fresp_scan_start\x18\x0b \x01(\x0b\x32\x0e.RespScanStartH\x00\x12)\n\x0f\x63md_scan_status\x18\x0c \x01(\x0b\x32\x0e.CmdScanStatusH\x00\x12+\n\x10resp_scan_status\x18\r \x01(\x0b\x32\x0f.RespScanStatusH\x00\x12)\n\x0f\x63md_scan_result\x18\x0e \x01(\x0b\x32\x0e.CmdScanResultH\x00\x12+\n\x10resp_scan_result\x18\x0f \x01(\x0b\x32\x0f.RespScanResultH\x00\x42\t\n\x07payload*\x9c\x01\n\x0fWiFiScanMsgType\x12\x14\n\x10TypeCmdScanStart\x10\x00\x12\x15\n\x11TypeRespScanStart\x10\x01\x12\x15\n\x11TypeCmdScanStatus\x10\x02\x12\x16\n\x12TypeRespScanStatus\x10\x03\x12\x15\n\x11TypeCmdScanResult\x10\x04\x12\x16\n\x12TypeRespScanResult\x10\x05\x62\x06proto3') - , - dependencies=[constants__pb2.DESCRIPTOR,wifi__constants__pb2.DESCRIPTOR,]) -_WIFISCANMSGTYPE = _descriptor.EnumDescriptor( - name='WiFiScanMsgType', - full_name='WiFiScanMsgType', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='TypeCmdScanStart', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespScanStart', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeCmdScanStatus', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespScanStatus', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeCmdScanResult', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespScanResult', index=5, number=5, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=809, - serialized_end=965, -) -_sym_db.RegisterEnumDescriptor(_WIFISCANMSGTYPE) - -WiFiScanMsgType = enum_type_wrapper.EnumTypeWrapper(_WIFISCANMSGTYPE) -TypeCmdScanStart = 0 -TypeRespScanStart = 1 -TypeCmdScanStatus = 2 -TypeRespScanStatus = 3 -TypeCmdScanResult = 4 -TypeRespScanResult = 5 - - - -_CMDSCANSTART = _descriptor.Descriptor( - name='CmdScanStart', - full_name='CmdScanStart', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='blocking', full_name='CmdScanStart.blocking', index=0, - number=1, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='passive', full_name='CmdScanStart.passive', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='group_channels', full_name='CmdScanStart.group_channels', index=2, - number=3, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='period_ms', full_name='CmdScanStart.period_ms', index=3, - number=4, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=58, - serialized_end=150, -) - - -_RESPSCANSTART = _descriptor.Descriptor( - name='RespScanStart', - full_name='RespScanStart', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=152, - serialized_end=167, -) - - -_CMDSCANSTATUS = _descriptor.Descriptor( - name='CmdScanStatus', - full_name='CmdScanStatus', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=169, - serialized_end=184, -) - - -_RESPSCANSTATUS = _descriptor.Descriptor( - name='RespScanStatus', - full_name='RespScanStatus', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='scan_finished', full_name='RespScanStatus.scan_finished', index=0, - number=1, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='result_count', full_name='RespScanStatus.result_count', index=1, - number=2, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=186, - serialized_end=247, -) - - -_CMDSCANRESULT = _descriptor.Descriptor( - name='CmdScanResult', - full_name='CmdScanResult', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='start_index', full_name='CmdScanResult.start_index', index=0, - number=1, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='count', full_name='CmdScanResult.count', index=1, - number=2, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=249, - serialized_end=300, -) - - -_WIFISCANRESULT = _descriptor.Descriptor( - name='WiFiScanResult', - full_name='WiFiScanResult', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='ssid', full_name='WiFiScanResult.ssid', index=0, - number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='channel', full_name='WiFiScanResult.channel', index=1, - number=2, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='rssi', full_name='WiFiScanResult.rssi', index=2, - number=3, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='bssid', full_name='WiFiScanResult.bssid', index=3, - number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='auth', full_name='WiFiScanResult.auth', index=4, - number=5, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=302, - serialized_end=407, -) - - -_RESPSCANRESULT = _descriptor.Descriptor( - name='RespScanResult', - full_name='RespScanResult', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='entries', full_name='RespScanResult.entries', index=0, - number=1, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=409, - serialized_end=459, -) - - -_WIFISCANPAYLOAD = _descriptor.Descriptor( - name='WiFiScanPayload', - full_name='WiFiScanPayload', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='msg', full_name='WiFiScanPayload.msg', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='status', full_name='WiFiScanPayload.status', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_scan_start', full_name='WiFiScanPayload.cmd_scan_start', index=2, - number=10, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_scan_start', full_name='WiFiScanPayload.resp_scan_start', index=3, - number=11, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_scan_status', full_name='WiFiScanPayload.cmd_scan_status', index=4, - number=12, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_scan_status', full_name='WiFiScanPayload.resp_scan_status', index=5, - number=13, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_scan_result', full_name='WiFiScanPayload.cmd_scan_result', index=6, - number=14, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_scan_result', full_name='WiFiScanPayload.resp_scan_result', index=7, - number=15, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='payload', full_name='WiFiScanPayload.payload', - index=0, containing_type=None, fields=[]), - ], - serialized_start=462, - serialized_end=806, -) - -_WIFISCANRESULT.fields_by_name['auth'].enum_type = wifi__constants__pb2._WIFIAUTHMODE -_RESPSCANRESULT.fields_by_name['entries'].message_type = _WIFISCANRESULT -_WIFISCANPAYLOAD.fields_by_name['msg'].enum_type = _WIFISCANMSGTYPE -_WIFISCANPAYLOAD.fields_by_name['status'].enum_type = constants__pb2._STATUS -_WIFISCANPAYLOAD.fields_by_name['cmd_scan_start'].message_type = _CMDSCANSTART -_WIFISCANPAYLOAD.fields_by_name['resp_scan_start'].message_type = _RESPSCANSTART -_WIFISCANPAYLOAD.fields_by_name['cmd_scan_status'].message_type = _CMDSCANSTATUS -_WIFISCANPAYLOAD.fields_by_name['resp_scan_status'].message_type = _RESPSCANSTATUS -_WIFISCANPAYLOAD.fields_by_name['cmd_scan_result'].message_type = _CMDSCANRESULT -_WIFISCANPAYLOAD.fields_by_name['resp_scan_result'].message_type = _RESPSCANRESULT -_WIFISCANPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFISCANPAYLOAD.fields_by_name['cmd_scan_start']) -_WIFISCANPAYLOAD.fields_by_name['cmd_scan_start'].containing_oneof = _WIFISCANPAYLOAD.oneofs_by_name['payload'] -_WIFISCANPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFISCANPAYLOAD.fields_by_name['resp_scan_start']) -_WIFISCANPAYLOAD.fields_by_name['resp_scan_start'].containing_oneof = _WIFISCANPAYLOAD.oneofs_by_name['payload'] -_WIFISCANPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFISCANPAYLOAD.fields_by_name['cmd_scan_status']) -_WIFISCANPAYLOAD.fields_by_name['cmd_scan_status'].containing_oneof = _WIFISCANPAYLOAD.oneofs_by_name['payload'] -_WIFISCANPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFISCANPAYLOAD.fields_by_name['resp_scan_status']) -_WIFISCANPAYLOAD.fields_by_name['resp_scan_status'].containing_oneof = _WIFISCANPAYLOAD.oneofs_by_name['payload'] -_WIFISCANPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFISCANPAYLOAD.fields_by_name['cmd_scan_result']) -_WIFISCANPAYLOAD.fields_by_name['cmd_scan_result'].containing_oneof = _WIFISCANPAYLOAD.oneofs_by_name['payload'] -_WIFISCANPAYLOAD.oneofs_by_name['payload'].fields.append( - _WIFISCANPAYLOAD.fields_by_name['resp_scan_result']) -_WIFISCANPAYLOAD.fields_by_name['resp_scan_result'].containing_oneof = _WIFISCANPAYLOAD.oneofs_by_name['payload'] -DESCRIPTOR.message_types_by_name['CmdScanStart'] = _CMDSCANSTART -DESCRIPTOR.message_types_by_name['RespScanStart'] = _RESPSCANSTART -DESCRIPTOR.message_types_by_name['CmdScanStatus'] = _CMDSCANSTATUS -DESCRIPTOR.message_types_by_name['RespScanStatus'] = _RESPSCANSTATUS -DESCRIPTOR.message_types_by_name['CmdScanResult'] = _CMDSCANRESULT -DESCRIPTOR.message_types_by_name['WiFiScanResult'] = _WIFISCANRESULT -DESCRIPTOR.message_types_by_name['RespScanResult'] = _RESPSCANRESULT -DESCRIPTOR.message_types_by_name['WiFiScanPayload'] = _WIFISCANPAYLOAD -DESCRIPTOR.enum_types_by_name['WiFiScanMsgType'] = _WIFISCANMSGTYPE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -CmdScanStart = _reflection.GeneratedProtocolMessageType('CmdScanStart', (_message.Message,), dict( - DESCRIPTOR = _CMDSCANSTART, - __module__ = 'wifi_scan_pb2' - # @@protoc_insertion_point(class_scope:CmdScanStart) - )) -_sym_db.RegisterMessage(CmdScanStart) - -RespScanStart = _reflection.GeneratedProtocolMessageType('RespScanStart', (_message.Message,), dict( - DESCRIPTOR = _RESPSCANSTART, - __module__ = 'wifi_scan_pb2' - # @@protoc_insertion_point(class_scope:RespScanStart) - )) -_sym_db.RegisterMessage(RespScanStart) - -CmdScanStatus = _reflection.GeneratedProtocolMessageType('CmdScanStatus', (_message.Message,), dict( - DESCRIPTOR = _CMDSCANSTATUS, - __module__ = 'wifi_scan_pb2' - # @@protoc_insertion_point(class_scope:CmdScanStatus) - )) -_sym_db.RegisterMessage(CmdScanStatus) - -RespScanStatus = _reflection.GeneratedProtocolMessageType('RespScanStatus', (_message.Message,), dict( - DESCRIPTOR = _RESPSCANSTATUS, - __module__ = 'wifi_scan_pb2' - # @@protoc_insertion_point(class_scope:RespScanStatus) - )) -_sym_db.RegisterMessage(RespScanStatus) - -CmdScanResult = _reflection.GeneratedProtocolMessageType('CmdScanResult', (_message.Message,), dict( - DESCRIPTOR = _CMDSCANRESULT, - __module__ = 'wifi_scan_pb2' - # @@protoc_insertion_point(class_scope:CmdScanResult) - )) -_sym_db.RegisterMessage(CmdScanResult) - -WiFiScanResult = _reflection.GeneratedProtocolMessageType('WiFiScanResult', (_message.Message,), dict( - DESCRIPTOR = _WIFISCANRESULT, - __module__ = 'wifi_scan_pb2' - # @@protoc_insertion_point(class_scope:WiFiScanResult) - )) -_sym_db.RegisterMessage(WiFiScanResult) - -RespScanResult = _reflection.GeneratedProtocolMessageType('RespScanResult', (_message.Message,), dict( - DESCRIPTOR = _RESPSCANRESULT, - __module__ = 'wifi_scan_pb2' - # @@protoc_insertion_point(class_scope:RespScanResult) - )) -_sym_db.RegisterMessage(RespScanResult) - -WiFiScanPayload = _reflection.GeneratedProtocolMessageType('WiFiScanPayload', (_message.Message,), dict( - DESCRIPTOR = _WIFISCANPAYLOAD, - __module__ = 'wifi_scan_pb2' - # @@protoc_insertion_point(class_scope:WiFiScanPayload) - )) -_sym_db.RegisterMessage(WiFiScanPayload) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fwifi_scan.proto\x1a\x0f\x63onstants.proto\x1a\x14wifi_constants.proto\"\\\n\x0c\x43mdScanStart\x12\x10\n\x08\x62locking\x18\x01 \x01(\x08\x12\x0f\n\x07passive\x18\x02 \x01(\x08\x12\x16\n\x0egroup_channels\x18\x03 \x01(\r\x12\x11\n\tperiod_ms\x18\x04 \x01(\r\"\x0f\n\rRespScanStart\"\x0f\n\rCmdScanStatus\"=\n\x0eRespScanStatus\x12\x15\n\rscan_finished\x18\x01 \x01(\x08\x12\x14\n\x0cresult_count\x18\x02 \x01(\r\"3\n\rCmdScanResult\x12\x13\n\x0bstart_index\x18\x01 \x01(\r\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"i\n\x0eWiFiScanResult\x12\x0c\n\x04ssid\x18\x01 \x01(\x0c\x12\x0f\n\x07\x63hannel\x18\x02 \x01(\r\x12\x0c\n\x04rssi\x18\x03 \x01(\x05\x12\r\n\x05\x62ssid\x18\x04 \x01(\x0c\x12\x1b\n\x04\x61uth\x18\x05 \x01(\x0e\x32\r.WifiAuthMode\"2\n\x0eRespScanResult\x12 \n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x0f.WiFiScanResult\"\xd8\x02\n\x0fWiFiScanPayload\x12\x1d\n\x03msg\x18\x01 \x01(\x0e\x32\x10.WiFiScanMsgType\x12\x17\n\x06status\x18\x02 \x01(\x0e\x32\x07.Status\x12\'\n\x0e\x63md_scan_start\x18\n \x01(\x0b\x32\r.CmdScanStartH\x00\x12)\n\x0fresp_scan_start\x18\x0b \x01(\x0b\x32\x0e.RespScanStartH\x00\x12)\n\x0f\x63md_scan_status\x18\x0c \x01(\x0b\x32\x0e.CmdScanStatusH\x00\x12+\n\x10resp_scan_status\x18\r \x01(\x0b\x32\x0f.RespScanStatusH\x00\x12)\n\x0f\x63md_scan_result\x18\x0e \x01(\x0b\x32\x0e.CmdScanResultH\x00\x12+\n\x10resp_scan_result\x18\x0f \x01(\x0b\x32\x0f.RespScanResultH\x00\x42\t\n\x07payload*\x9c\x01\n\x0fWiFiScanMsgType\x12\x14\n\x10TypeCmdScanStart\x10\x00\x12\x15\n\x11TypeRespScanStart\x10\x01\x12\x15\n\x11TypeCmdScanStatus\x10\x02\x12\x16\n\x12TypeRespScanStatus\x10\x03\x12\x15\n\x11TypeCmdScanResult\x10\x04\x12\x16\n\x12TypeRespScanResult\x10\x05\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'wifi_scan_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _WIFISCANMSGTYPE._serialized_start=809 + _WIFISCANMSGTYPE._serialized_end=965 + _CMDSCANSTART._serialized_start=58 + _CMDSCANSTART._serialized_end=150 + _RESPSCANSTART._serialized_start=152 + _RESPSCANSTART._serialized_end=167 + _CMDSCANSTATUS._serialized_start=169 + _CMDSCANSTATUS._serialized_end=184 + _RESPSCANSTATUS._serialized_start=186 + _RESPSCANSTATUS._serialized_end=247 + _CMDSCANRESULT._serialized_start=249 + _CMDSCANRESULT._serialized_end=300 + _WIFISCANRESULT._serialized_start=302 + _WIFISCANRESULT._serialized_end=407 + _RESPSCANRESULT._serialized_start=409 + _RESPSCANRESULT._serialized_end=459 + _WIFISCANPAYLOAD._serialized_start=462 + _WIFISCANPAYLOAD._serialized_end=806 # @@protoc_insertion_point(module_scope) From fbf35a487425ba42dbc0f301b61b551d40d9210c Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Thu, 26 May 2022 16:18:33 +0530 Subject: [PATCH 5/5] esp_local_ctrl: Regenerated proto-c and python with protobuf compiler v3.21.0 $protoc --version libprotoc 3.21.0 $ protoc-c --version protobuf-c 1.4.0 --- .../proto-c/esp_local_ctrl.pb-c.c | 2 +- .../proto-c/esp_local_ctrl.pb-c.h | 40 +- .../python/esp_local_ctrl_pb2.py | 562 +----------------- 3 files changed, 49 insertions(+), 555 deletions(-) diff --git a/components/esp_local_ctrl/proto-c/esp_local_ctrl.pb-c.c b/components/esp_local_ctrl/proto-c/esp_local_ctrl.pb-c.c index a6dd76eb2e..932f3a3f14 100644 --- a/components/esp_local_ctrl/proto-c/esp_local_ctrl.pb-c.c +++ b/components/esp_local_ctrl/proto-c/esp_local_ctrl.pb-c.c @@ -582,7 +582,7 @@ static const ProtobufCFieldDescriptor cmd_get_property_values__field_descriptors offsetof(CmdGetPropertyValues, indices), NULL, NULL, - 0, /* flags */ + 0 | PROTOBUF_C_FIELD_FLAG_PACKED, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, }; diff --git a/components/esp_local_ctrl/proto-c/esp_local_ctrl.pb-c.h b/components/esp_local_ctrl/proto-c/esp_local_ctrl.pb-c.h index 1a1723ec48..17ead27ed5 100644 --- a/components/esp_local_ctrl/proto-c/esp_local_ctrl.pb-c.h +++ b/components/esp_local_ctrl/proto-c/esp_local_ctrl.pb-c.h @@ -10,21 +10,21 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003001 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif #include "constants.pb-c.h" -typedef struct _CmdGetPropertyCount CmdGetPropertyCount; -typedef struct _RespGetPropertyCount RespGetPropertyCount; -typedef struct _PropertyInfo PropertyInfo; -typedef struct _CmdGetPropertyValues CmdGetPropertyValues; -typedef struct _RespGetPropertyValues RespGetPropertyValues; -typedef struct _PropertyValue PropertyValue; -typedef struct _CmdSetPropertyValues CmdSetPropertyValues; -typedef struct _RespSetPropertyValues RespSetPropertyValues; -typedef struct _LocalCtrlMessage LocalCtrlMessage; +typedef struct CmdGetPropertyCount CmdGetPropertyCount; +typedef struct RespGetPropertyCount RespGetPropertyCount; +typedef struct PropertyInfo PropertyInfo; +typedef struct CmdGetPropertyValues CmdGetPropertyValues; +typedef struct RespGetPropertyValues RespGetPropertyValues; +typedef struct PropertyValue PropertyValue; +typedef struct CmdSetPropertyValues CmdSetPropertyValues; +typedef struct RespSetPropertyValues RespSetPropertyValues; +typedef struct LocalCtrlMessage LocalCtrlMessage; /* --- enums --- */ @@ -41,7 +41,7 @@ typedef enum _LocalCtrlMsgType { /* --- messages --- */ -struct _CmdGetPropertyCount +struct CmdGetPropertyCount { ProtobufCMessage base; }; @@ -50,7 +50,7 @@ struct _CmdGetPropertyCount } -struct _RespGetPropertyCount +struct RespGetPropertyCount { ProtobufCMessage base; Status status; @@ -61,7 +61,7 @@ struct _RespGetPropertyCount , STATUS__Success, 0 } -struct _PropertyInfo +struct PropertyInfo { ProtobufCMessage base; Status status; @@ -75,7 +75,7 @@ struct _PropertyInfo , STATUS__Success, (char *)protobuf_c_empty_string, 0, 0, {0,NULL} } -struct _CmdGetPropertyValues +struct CmdGetPropertyValues { ProtobufCMessage base; size_t n_indices; @@ -86,7 +86,7 @@ struct _CmdGetPropertyValues , 0,NULL } -struct _RespGetPropertyValues +struct RespGetPropertyValues { ProtobufCMessage base; Status status; @@ -98,7 +98,7 @@ struct _RespGetPropertyValues , STATUS__Success, 0,NULL } -struct _PropertyValue +struct PropertyValue { ProtobufCMessage base; uint32_t index; @@ -109,7 +109,7 @@ struct _PropertyValue , 0, {0,NULL} } -struct _CmdSetPropertyValues +struct CmdSetPropertyValues { ProtobufCMessage base; size_t n_props; @@ -120,7 +120,7 @@ struct _CmdSetPropertyValues , 0,NULL } -struct _RespSetPropertyValues +struct RespSetPropertyValues { ProtobufCMessage base; Status status; @@ -138,10 +138,10 @@ typedef enum { LOCAL_CTRL_MESSAGE__PAYLOAD_RESP_GET_PROP_VALS = 13, LOCAL_CTRL_MESSAGE__PAYLOAD_CMD_SET_PROP_VALS = 14, LOCAL_CTRL_MESSAGE__PAYLOAD_RESP_SET_PROP_VALS = 15 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LOCAL_CTRL_MESSAGE__PAYLOAD) + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LOCAL_CTRL_MESSAGE__PAYLOAD__CASE) } LocalCtrlMessage__PayloadCase; -struct _LocalCtrlMessage +struct LocalCtrlMessage { ProtobufCMessage base; LocalCtrlMsgType msg; diff --git a/components/esp_local_ctrl/python/esp_local_ctrl_pb2.py b/components/esp_local_ctrl/python/esp_local_ctrl_pb2.py index f37cfea7d5..43f41a1012 100644 --- a/components/esp_local_ctrl/python/esp_local_ctrl_pb2.py +++ b/components/esp_local_ctrl/python/esp_local_ctrl_pb2.py @@ -1,16 +1,11 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: esp_local_ctrl.proto - -import sys - -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import enum_type_wrapper - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,533 +13,32 @@ _sym_db = _symbol_database.Default() import constants_pb2 as constants__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='esp_local_ctrl.proto', - package='', - syntax='proto3', - serialized_options=None, - serialized_pb=_b('\n\x14\x65sp_local_ctrl.proto\x1a\x0f\x63onstants.proto\"\x15\n\x13\x43mdGetPropertyCount\">\n\x14RespGetPropertyCount\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"a\n\x0cPropertyInfo\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04type\x18\x03 \x01(\r\x12\r\n\x05\x66lags\x18\x04 \x01(\r\x12\r\n\x05value\x18\x05 \x01(\x0c\"\'\n\x14\x43mdGetPropertyValues\x12\x0f\n\x07indices\x18\x01 \x03(\r\"N\n\x15RespGetPropertyValues\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x1c\n\x05props\x18\x02 \x03(\x0b\x32\r.PropertyInfo\"-\n\rPropertyValue\x12\r\n\x05index\x18\x01 \x01(\r\x12\r\n\x05value\x18\x02 \x01(\x0c\"5\n\x14\x43mdSetPropertyValues\x12\x1d\n\x05props\x18\x01 \x03(\x0b\x32\x0e.PropertyValue\"0\n\x15RespSetPropertyValues\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"\xfb\x02\n\x10LocalCtrlMessage\x12\x1e\n\x03msg\x18\x01 \x01(\x0e\x32\x11.LocalCtrlMsgType\x12\x32\n\x12\x63md_get_prop_count\x18\n \x01(\x0b\x32\x14.CmdGetPropertyCountH\x00\x12\x34\n\x13resp_get_prop_count\x18\x0b \x01(\x0b\x32\x15.RespGetPropertyCountH\x00\x12\x32\n\x11\x63md_get_prop_vals\x18\x0c \x01(\x0b\x32\x15.CmdGetPropertyValuesH\x00\x12\x34\n\x12resp_get_prop_vals\x18\r \x01(\x0b\x32\x16.RespGetPropertyValuesH\x00\x12\x32\n\x11\x63md_set_prop_vals\x18\x0e \x01(\x0b\x32\x15.CmdSetPropertyValuesH\x00\x12\x34\n\x12resp_set_prop_vals\x18\x0f \x01(\x0b\x32\x16.RespSetPropertyValuesH\x00\x42\t\n\x07payload*\xc7\x01\n\x10LocalCtrlMsgType\x12\x1b\n\x17TypeCmdGetPropertyCount\x10\x00\x12\x1c\n\x18TypeRespGetPropertyCount\x10\x01\x12\x1c\n\x18TypeCmdGetPropertyValues\x10\x04\x12\x1d\n\x19TypeRespGetPropertyValues\x10\x05\x12\x1c\n\x18TypeCmdSetPropertyValues\x10\x06\x12\x1d\n\x19TypeRespSetPropertyValues\x10\x07\x62\x06proto3') - , - dependencies=[constants__pb2.DESCRIPTOR,]) -_LOCALCTRLMSGTYPE = _descriptor.EnumDescriptor( - name='LocalCtrlMsgType', - full_name='LocalCtrlMsgType', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='TypeCmdGetPropertyCount', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespGetPropertyCount', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeCmdGetPropertyValues', index=2, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespGetPropertyValues', index=3, number=5, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeCmdSetPropertyValues', index=4, number=6, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TypeRespSetPropertyValues', index=5, number=7, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=883, - serialized_end=1082, -) -_sym_db.RegisterEnumDescriptor(_LOCALCTRLMSGTYPE) - -LocalCtrlMsgType = enum_type_wrapper.EnumTypeWrapper(_LOCALCTRLMSGTYPE) -TypeCmdGetPropertyCount = 0 -TypeRespGetPropertyCount = 1 -TypeCmdGetPropertyValues = 4 -TypeRespGetPropertyValues = 5 -TypeCmdSetPropertyValues = 6 -TypeRespSetPropertyValues = 7 - - - -_CMDGETPROPERTYCOUNT = _descriptor.Descriptor( - name='CmdGetPropertyCount', - full_name='CmdGetPropertyCount', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=41, - serialized_end=62, -) - - -_RESPGETPROPERTYCOUNT = _descriptor.Descriptor( - name='RespGetPropertyCount', - full_name='RespGetPropertyCount', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='RespGetPropertyCount.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='count', full_name='RespGetPropertyCount.count', index=1, - number=2, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=64, - serialized_end=126, -) - - -_PROPERTYINFO = _descriptor.Descriptor( - name='PropertyInfo', - full_name='PropertyInfo', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='PropertyInfo.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='name', full_name='PropertyInfo.name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b('').decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='type', full_name='PropertyInfo.type', index=2, - number=3, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='flags', full_name='PropertyInfo.flags', index=3, - number=4, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='value', full_name='PropertyInfo.value', index=4, - number=5, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=128, - serialized_end=225, -) - - -_CMDGETPROPERTYVALUES = _descriptor.Descriptor( - name='CmdGetPropertyValues', - full_name='CmdGetPropertyValues', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='indices', full_name='CmdGetPropertyValues.indices', index=0, - number=1, type=13, cpp_type=3, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=227, - serialized_end=266, -) - - -_RESPGETPROPERTYVALUES = _descriptor.Descriptor( - name='RespGetPropertyValues', - full_name='RespGetPropertyValues', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='RespGetPropertyValues.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='props', full_name='RespGetPropertyValues.props', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=268, - serialized_end=346, -) - - -_PROPERTYVALUE = _descriptor.Descriptor( - name='PropertyValue', - full_name='PropertyValue', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='index', full_name='PropertyValue.index', index=0, - number=1, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='value', full_name='PropertyValue.value', index=1, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(''), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=348, - serialized_end=393, -) - - -_CMDSETPROPERTYVALUES = _descriptor.Descriptor( - name='CmdSetPropertyValues', - full_name='CmdSetPropertyValues', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='props', full_name='CmdSetPropertyValues.props', index=0, - number=1, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=395, - serialized_end=448, -) - - -_RESPSETPROPERTYVALUES = _descriptor.Descriptor( - name='RespSetPropertyValues', - full_name='RespSetPropertyValues', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='RespSetPropertyValues.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=450, - serialized_end=498, -) - - -_LOCALCTRLMESSAGE = _descriptor.Descriptor( - name='LocalCtrlMessage', - full_name='LocalCtrlMessage', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='msg', full_name='LocalCtrlMessage.msg', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_get_prop_count', full_name='LocalCtrlMessage.cmd_get_prop_count', index=1, - number=10, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_get_prop_count', full_name='LocalCtrlMessage.resp_get_prop_count', index=2, - number=11, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_get_prop_vals', full_name='LocalCtrlMessage.cmd_get_prop_vals', index=3, - number=12, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_get_prop_vals', full_name='LocalCtrlMessage.resp_get_prop_vals', index=4, - number=13, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='cmd_set_prop_vals', full_name='LocalCtrlMessage.cmd_set_prop_vals', index=5, - number=14, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='resp_set_prop_vals', full_name='LocalCtrlMessage.resp_set_prop_vals', index=6, - number=15, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='payload', full_name='LocalCtrlMessage.payload', - index=0, containing_type=None, fields=[]), - ], - serialized_start=501, - serialized_end=880, -) - -_RESPGETPROPERTYCOUNT.fields_by_name['status'].enum_type = constants__pb2._STATUS -_PROPERTYINFO.fields_by_name['status'].enum_type = constants__pb2._STATUS -_RESPGETPROPERTYVALUES.fields_by_name['status'].enum_type = constants__pb2._STATUS -_RESPGETPROPERTYVALUES.fields_by_name['props'].message_type = _PROPERTYINFO -_CMDSETPROPERTYVALUES.fields_by_name['props'].message_type = _PROPERTYVALUE -_RESPSETPROPERTYVALUES.fields_by_name['status'].enum_type = constants__pb2._STATUS -_LOCALCTRLMESSAGE.fields_by_name['msg'].enum_type = _LOCALCTRLMSGTYPE -_LOCALCTRLMESSAGE.fields_by_name['cmd_get_prop_count'].message_type = _CMDGETPROPERTYCOUNT -_LOCALCTRLMESSAGE.fields_by_name['resp_get_prop_count'].message_type = _RESPGETPROPERTYCOUNT -_LOCALCTRLMESSAGE.fields_by_name['cmd_get_prop_vals'].message_type = _CMDGETPROPERTYVALUES -_LOCALCTRLMESSAGE.fields_by_name['resp_get_prop_vals'].message_type = _RESPGETPROPERTYVALUES -_LOCALCTRLMESSAGE.fields_by_name['cmd_set_prop_vals'].message_type = _CMDSETPROPERTYVALUES -_LOCALCTRLMESSAGE.fields_by_name['resp_set_prop_vals'].message_type = _RESPSETPROPERTYVALUES -_LOCALCTRLMESSAGE.oneofs_by_name['payload'].fields.append( - _LOCALCTRLMESSAGE.fields_by_name['cmd_get_prop_count']) -_LOCALCTRLMESSAGE.fields_by_name['cmd_get_prop_count'].containing_oneof = _LOCALCTRLMESSAGE.oneofs_by_name['payload'] -_LOCALCTRLMESSAGE.oneofs_by_name['payload'].fields.append( - _LOCALCTRLMESSAGE.fields_by_name['resp_get_prop_count']) -_LOCALCTRLMESSAGE.fields_by_name['resp_get_prop_count'].containing_oneof = _LOCALCTRLMESSAGE.oneofs_by_name['payload'] -_LOCALCTRLMESSAGE.oneofs_by_name['payload'].fields.append( - _LOCALCTRLMESSAGE.fields_by_name['cmd_get_prop_vals']) -_LOCALCTRLMESSAGE.fields_by_name['cmd_get_prop_vals'].containing_oneof = _LOCALCTRLMESSAGE.oneofs_by_name['payload'] -_LOCALCTRLMESSAGE.oneofs_by_name['payload'].fields.append( - _LOCALCTRLMESSAGE.fields_by_name['resp_get_prop_vals']) -_LOCALCTRLMESSAGE.fields_by_name['resp_get_prop_vals'].containing_oneof = _LOCALCTRLMESSAGE.oneofs_by_name['payload'] -_LOCALCTRLMESSAGE.oneofs_by_name['payload'].fields.append( - _LOCALCTRLMESSAGE.fields_by_name['cmd_set_prop_vals']) -_LOCALCTRLMESSAGE.fields_by_name['cmd_set_prop_vals'].containing_oneof = _LOCALCTRLMESSAGE.oneofs_by_name['payload'] -_LOCALCTRLMESSAGE.oneofs_by_name['payload'].fields.append( - _LOCALCTRLMESSAGE.fields_by_name['resp_set_prop_vals']) -_LOCALCTRLMESSAGE.fields_by_name['resp_set_prop_vals'].containing_oneof = _LOCALCTRLMESSAGE.oneofs_by_name['payload'] -DESCRIPTOR.message_types_by_name['CmdGetPropertyCount'] = _CMDGETPROPERTYCOUNT -DESCRIPTOR.message_types_by_name['RespGetPropertyCount'] = _RESPGETPROPERTYCOUNT -DESCRIPTOR.message_types_by_name['PropertyInfo'] = _PROPERTYINFO -DESCRIPTOR.message_types_by_name['CmdGetPropertyValues'] = _CMDGETPROPERTYVALUES -DESCRIPTOR.message_types_by_name['RespGetPropertyValues'] = _RESPGETPROPERTYVALUES -DESCRIPTOR.message_types_by_name['PropertyValue'] = _PROPERTYVALUE -DESCRIPTOR.message_types_by_name['CmdSetPropertyValues'] = _CMDSETPROPERTYVALUES -DESCRIPTOR.message_types_by_name['RespSetPropertyValues'] = _RESPSETPROPERTYVALUES -DESCRIPTOR.message_types_by_name['LocalCtrlMessage'] = _LOCALCTRLMESSAGE -DESCRIPTOR.enum_types_by_name['LocalCtrlMsgType'] = _LOCALCTRLMSGTYPE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -CmdGetPropertyCount = _reflection.GeneratedProtocolMessageType('CmdGetPropertyCount', (_message.Message,), dict( - DESCRIPTOR = _CMDGETPROPERTYCOUNT, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:CmdGetPropertyCount) - )) -_sym_db.RegisterMessage(CmdGetPropertyCount) - -RespGetPropertyCount = _reflection.GeneratedProtocolMessageType('RespGetPropertyCount', (_message.Message,), dict( - DESCRIPTOR = _RESPGETPROPERTYCOUNT, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:RespGetPropertyCount) - )) -_sym_db.RegisterMessage(RespGetPropertyCount) - -PropertyInfo = _reflection.GeneratedProtocolMessageType('PropertyInfo', (_message.Message,), dict( - DESCRIPTOR = _PROPERTYINFO, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:PropertyInfo) - )) -_sym_db.RegisterMessage(PropertyInfo) - -CmdGetPropertyValues = _reflection.GeneratedProtocolMessageType('CmdGetPropertyValues', (_message.Message,), dict( - DESCRIPTOR = _CMDGETPROPERTYVALUES, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:CmdGetPropertyValues) - )) -_sym_db.RegisterMessage(CmdGetPropertyValues) - -RespGetPropertyValues = _reflection.GeneratedProtocolMessageType('RespGetPropertyValues', (_message.Message,), dict( - DESCRIPTOR = _RESPGETPROPERTYVALUES, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:RespGetPropertyValues) - )) -_sym_db.RegisterMessage(RespGetPropertyValues) - -PropertyValue = _reflection.GeneratedProtocolMessageType('PropertyValue', (_message.Message,), dict( - DESCRIPTOR = _PROPERTYVALUE, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:PropertyValue) - )) -_sym_db.RegisterMessage(PropertyValue) - -CmdSetPropertyValues = _reflection.GeneratedProtocolMessageType('CmdSetPropertyValues', (_message.Message,), dict( - DESCRIPTOR = _CMDSETPROPERTYVALUES, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:CmdSetPropertyValues) - )) -_sym_db.RegisterMessage(CmdSetPropertyValues) - -RespSetPropertyValues = _reflection.GeneratedProtocolMessageType('RespSetPropertyValues', (_message.Message,), dict( - DESCRIPTOR = _RESPSETPROPERTYVALUES, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:RespSetPropertyValues) - )) -_sym_db.RegisterMessage(RespSetPropertyValues) - -LocalCtrlMessage = _reflection.GeneratedProtocolMessageType('LocalCtrlMessage', (_message.Message,), dict( - DESCRIPTOR = _LOCALCTRLMESSAGE, - __module__ = 'esp_local_ctrl_pb2' - # @@protoc_insertion_point(class_scope:LocalCtrlMessage) - )) -_sym_db.RegisterMessage(LocalCtrlMessage) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x65sp_local_ctrl.proto\x1a\x0f\x63onstants.proto\"\x15\n\x13\x43mdGetPropertyCount\">\n\x14RespGetPropertyCount\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"a\n\x0cPropertyInfo\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04type\x18\x03 \x01(\r\x12\r\n\x05\x66lags\x18\x04 \x01(\r\x12\r\n\x05value\x18\x05 \x01(\x0c\"\'\n\x14\x43mdGetPropertyValues\x12\x0f\n\x07indices\x18\x01 \x03(\r\"N\n\x15RespGetPropertyValues\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\x12\x1c\n\x05props\x18\x02 \x03(\x0b\x32\r.PropertyInfo\"-\n\rPropertyValue\x12\r\n\x05index\x18\x01 \x01(\r\x12\r\n\x05value\x18\x02 \x01(\x0c\"5\n\x14\x43mdSetPropertyValues\x12\x1d\n\x05props\x18\x01 \x03(\x0b\x32\x0e.PropertyValue\"0\n\x15RespSetPropertyValues\x12\x17\n\x06status\x18\x01 \x01(\x0e\x32\x07.Status\"\xfb\x02\n\x10LocalCtrlMessage\x12\x1e\n\x03msg\x18\x01 \x01(\x0e\x32\x11.LocalCtrlMsgType\x12\x32\n\x12\x63md_get_prop_count\x18\n \x01(\x0b\x32\x14.CmdGetPropertyCountH\x00\x12\x34\n\x13resp_get_prop_count\x18\x0b \x01(\x0b\x32\x15.RespGetPropertyCountH\x00\x12\x32\n\x11\x63md_get_prop_vals\x18\x0c \x01(\x0b\x32\x15.CmdGetPropertyValuesH\x00\x12\x34\n\x12resp_get_prop_vals\x18\r \x01(\x0b\x32\x16.RespGetPropertyValuesH\x00\x12\x32\n\x11\x63md_set_prop_vals\x18\x0e \x01(\x0b\x32\x15.CmdSetPropertyValuesH\x00\x12\x34\n\x12resp_set_prop_vals\x18\x0f \x01(\x0b\x32\x16.RespSetPropertyValuesH\x00\x42\t\n\x07payload*\xc7\x01\n\x10LocalCtrlMsgType\x12\x1b\n\x17TypeCmdGetPropertyCount\x10\x00\x12\x1c\n\x18TypeRespGetPropertyCount\x10\x01\x12\x1c\n\x18TypeCmdGetPropertyValues\x10\x04\x12\x1d\n\x19TypeRespGetPropertyValues\x10\x05\x12\x1c\n\x18TypeCmdSetPropertyValues\x10\x06\x12\x1d\n\x19TypeRespSetPropertyValues\x10\x07\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'esp_local_ctrl_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _LOCALCTRLMSGTYPE._serialized_start=883 + _LOCALCTRLMSGTYPE._serialized_end=1082 + _CMDGETPROPERTYCOUNT._serialized_start=41 + _CMDGETPROPERTYCOUNT._serialized_end=62 + _RESPGETPROPERTYCOUNT._serialized_start=64 + _RESPGETPROPERTYCOUNT._serialized_end=126 + _PROPERTYINFO._serialized_start=128 + _PROPERTYINFO._serialized_end=225 + _CMDGETPROPERTYVALUES._serialized_start=227 + _CMDGETPROPERTYVALUES._serialized_end=266 + _RESPGETPROPERTYVALUES._serialized_start=268 + _RESPGETPROPERTYVALUES._serialized_end=346 + _PROPERTYVALUE._serialized_start=348 + _PROPERTYVALUE._serialized_end=393 + _CMDSETPROPERTYVALUES._serialized_start=395 + _CMDSETPROPERTYVALUES._serialized_end=448 + _RESPSETPROPERTYVALUES._serialized_start=450 + _RESPSETPROPERTYVALUES._serialized_end=498 + _LOCALCTRLMESSAGE._serialized_start=501 + _LOCALCTRLMESSAGE._serialized_end=880 # @@protoc_insertion_point(module_scope)