diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/leap/common/events/events_pb2.py | 136 |
2 files changed, 71 insertions, 71 deletions
diff --git a/debian/changelog b/debian/changelog index 20f0576..7a26298 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +leap-common (0.3.0.1) unstable; urgency=low + + * Regenerate events_pb2.py with protobuf 2.4.1 + + -- Micah Anderson <micah@debian.org> Thu, 15 Aug 2013 10:11:43 -0400 + leap-common (0.3.0) unstable; urgency=low * Update to 0.3.0 diff --git a/src/leap/common/events/events_pb2.py b/src/leap/common/events/events_pb2.py index 274514c..e25c7da 100644 --- a/src/leap/common/events/events_pb2.py +++ b/src/leap/common/events/events_pb2.py @@ -1,76 +1,74 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: events.proto -from google.protobuf.internal import enum_type_wrapper -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 service as _service +from google.protobuf import descriptor +from google.protobuf import message +from google.protobuf import reflection +from google.protobuf import service from google.protobuf import service_reflection from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) -DESCRIPTOR = _descriptor.FileDescriptor( +DESCRIPTOR = descriptor.FileDescriptor( name='events.proto', package='leap.common.events', serialized_pb='\n\x0c\x65vents.proto\x12\x12leap.common.events\"\x97\x01\n\rSignalRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0f\n\x07\x63ontent\x18\x02 \x02(\t\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\x12\x12\n\nenc_method\x18\x05 \x01(\t\x12\x16\n\x0e\x65rror_occurred\x18\x06 \x01(\x08\"j\n\x0fRegisterRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0c\n\x04port\x18\x02 \x02(\x05\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\"l\n\x11UnregisterRequest\x12(\n\x05\x65vent\x18\x01 \x02(\x0e\x32\x19.leap.common.events.Event\x12\x0c\n\x04port\x18\x02 \x02(\x05\x12\x12\n\nmac_method\x18\x03 \x02(\t\x12\x0b\n\x03mac\x18\x04 \x02(\x0c\"\r\n\x0bPingRequest\"\x82\x01\n\rEventResponse\x12\x38\n\x06status\x18\x01 \x02(\x0e\x32(.leap.common.events.EventResponse.Status\x12\x0e\n\x06result\x18\x02 \x01(\t\"\'\n\x06Status\x12\x06\n\x02OK\x10\x01\x12\n\n\x06UNAUTH\x10\x02\x12\t\n\x05\x45RROR\x10\x03*\xe7\x02\n\x05\x45vent\x12\x15\n\x11\x43LIENT_SESSION_ID\x10\x01\x12\x0e\n\nCLIENT_UID\x10\x02\x12\x19\n\x15SOLEDAD_CREATING_KEYS\x10\x03\x12\x1e\n\x1aSOLEDAD_DONE_CREATING_KEYS\x10\x04\x12\x1a\n\x16SOLEDAD_UPLOADING_KEYS\x10\x05\x12\x1f\n\x1bSOLEDAD_DONE_UPLOADING_KEYS\x10\x06\x12\x1c\n\x18SOLEDAD_DOWNLOADING_KEYS\x10\x07\x12!\n\x1dSOLEDAD_DONE_DOWNLOADING_KEYS\x10\x08\x12\x1c\n\x18SOLEDAD_NEW_DATA_TO_SYNC\x10\t\x12\x1a\n\x16SOLEDAD_DONE_DATA_SYNC\x10\n\x12\x17\n\x13UPDATER_NEW_UPDATES\x10\x0b\x12\x19\n\x15UPDATER_DONE_UPDATING\x10\x0c\x12\x10\n\x0cRAISE_WINDOW\x10\r2\xdd\x02\n\x13\x45ventsServerService\x12J\n\x04ping\x12\x1f.leap.common.events.PingRequest\x1a!.leap.common.events.EventResponse\x12R\n\x08register\x12#.leap.common.events.RegisterRequest\x1a!.leap.common.events.EventResponse\x12V\n\nunregister\x12%.leap.common.events.UnregisterRequest\x1a!.leap.common.events.EventResponse\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponse2\xb1\x01\n\x13\x45ventsClientService\x12J\n\x04ping\x12\x1f.leap.common.events.PingRequest\x1a!.leap.common.events.EventResponse\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponseB\x03\x90\x01\x01') -_EVENT = _descriptor.EnumDescriptor( +_EVENT = descriptor.EnumDescriptor( name='Event', full_name='leap.common.events.Event', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='CLIENT_SESSION_ID', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='CLIENT_UID', index=1, number=2, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SOLEDAD_CREATING_KEYS', index=2, number=3, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SOLEDAD_DONE_CREATING_KEYS', index=3, number=4, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SOLEDAD_UPLOADING_KEYS', index=4, number=5, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SOLEDAD_DONE_UPLOADING_KEYS', index=5, number=6, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SOLEDAD_DOWNLOADING_KEYS', index=6, number=7, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SOLEDAD_DONE_DOWNLOADING_KEYS', index=7, number=8, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SOLEDAD_NEW_DATA_TO_SYNC', index=8, number=9, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SOLEDAD_DONE_DATA_SYNC', index=9, number=10, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='UPDATER_NEW_UPDATES', index=10, number=11, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='UPDATER_DONE_UPDATING', index=11, number=12, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='RAISE_WINDOW', index=12, number=13, options=None, type=None), @@ -81,7 +79,7 @@ _EVENT = _descriptor.EnumDescriptor( serialized_end=916, ) -Event = enum_type_wrapper.EnumTypeWrapper(_EVENT) + CLIENT_SESSION_ID = 1 CLIENT_UID = 2 SOLEDAD_CREATING_KEYS = 3 @@ -97,21 +95,21 @@ UPDATER_DONE_UPDATING = 12 RAISE_WINDOW = 13 -_EVENTRESPONSE_STATUS = _descriptor.EnumDescriptor( +_EVENTRESPONSE_STATUS = descriptor.EnumDescriptor( name='Status', full_name='leap.common.events.EventResponse.Status', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='OK', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='UNAUTH', index=1, number=2, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='ERROR', index=2, number=3, options=None, type=None), @@ -123,49 +121,49 @@ _EVENTRESPONSE_STATUS = _descriptor.EnumDescriptor( ) -_SIGNALREQUEST = _descriptor.Descriptor( +_SIGNALREQUEST = descriptor.Descriptor( name='SignalRequest', full_name='leap.common.events.SignalRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='event', full_name='leap.common.events.SignalRequest.event', index=0, number=1, type=14, cpp_type=8, label=2, has_default_value=False, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='content', full_name='leap.common.events.SignalRequest.content', index=1, number=2, type=9, cpp_type=9, label=2, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='mac_method', full_name='leap.common.events.SignalRequest.mac_method', index=2, number=3, type=9, cpp_type=9, label=2, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='mac', full_name='leap.common.events.SignalRequest.mac', index=3, number=4, type=12, cpp_type=9, label=2, has_default_value=False, default_value="", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='enc_method', full_name='leap.common.events.SignalRequest.enc_method', index=4, number=5, type=9, cpp_type=9, label=1, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='error_occurred', full_name='leap.common.events.SignalRequest.error_occurred', index=5, number=6, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, @@ -186,35 +184,35 @@ _SIGNALREQUEST = _descriptor.Descriptor( ) -_REGISTERREQUEST = _descriptor.Descriptor( +_REGISTERREQUEST = descriptor.Descriptor( name='RegisterRequest', full_name='leap.common.events.RegisterRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='event', full_name='leap.common.events.RegisterRequest.event', index=0, number=1, type=14, cpp_type=8, label=2, has_default_value=False, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='port', full_name='leap.common.events.RegisterRequest.port', index=1, number=2, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='mac_method', full_name='leap.common.events.RegisterRequest.mac_method', index=2, number=3, type=9, cpp_type=9, label=2, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='mac', full_name='leap.common.events.RegisterRequest.mac', index=3, number=4, type=12, cpp_type=9, label=2, has_default_value=False, default_value="", @@ -235,35 +233,35 @@ _REGISTERREQUEST = _descriptor.Descriptor( ) -_UNREGISTERREQUEST = _descriptor.Descriptor( +_UNREGISTERREQUEST = descriptor.Descriptor( name='UnregisterRequest', full_name='leap.common.events.UnregisterRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='event', full_name='leap.common.events.UnregisterRequest.event', index=0, number=1, type=14, cpp_type=8, label=2, has_default_value=False, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='port', full_name='leap.common.events.UnregisterRequest.port', index=1, number=2, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='mac_method', full_name='leap.common.events.UnregisterRequest.mac_method', index=2, number=3, type=9, cpp_type=9, label=2, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='mac', full_name='leap.common.events.UnregisterRequest.mac', index=3, number=4, type=12, cpp_type=9, label=2, has_default_value=False, default_value="", @@ -284,7 +282,7 @@ _UNREGISTERREQUEST = _descriptor.Descriptor( ) -_PINGREQUEST = _descriptor.Descriptor( +_PINGREQUEST = descriptor.Descriptor( name='PingRequest', full_name='leap.common.events.PingRequest', filename=None, @@ -305,21 +303,21 @@ _PINGREQUEST = _descriptor.Descriptor( ) -_EVENTRESPONSE = _descriptor.Descriptor( +_EVENTRESPONSE = descriptor.Descriptor( name='EventResponse', full_name='leap.common.events.EventResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='status', full_name='leap.common.events.EventResponse.status', index=0, number=1, type=14, cpp_type=8, label=2, has_default_value=False, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='result', full_name='leap.common.events.EventResponse.result', index=1, number=2, type=9, cpp_type=9, label=1, has_default_value=False, default_value=unicode("", "utf-8"), @@ -352,46 +350,42 @@ DESCRIPTOR.message_types_by_name['PingRequest'] = _PINGREQUEST DESCRIPTOR.message_types_by_name['EventResponse'] = _EVENTRESPONSE -class SignalRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class SignalRequest(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _SIGNALREQUEST # @@protoc_insertion_point(class_scope:leap.common.events.SignalRequest) -class RegisterRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class RegisterRequest(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _REGISTERREQUEST # @@protoc_insertion_point(class_scope:leap.common.events.RegisterRequest) -class UnregisterRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class UnregisterRequest(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _UNREGISTERREQUEST # @@protoc_insertion_point(class_scope:leap.common.events.UnregisterRequest) -class PingRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class PingRequest(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _PINGREQUEST # @@protoc_insertion_point(class_scope:leap.common.events.PingRequest) -class EventResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class EventResponse(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _EVENTRESPONSE # @@protoc_insertion_point(class_scope:leap.common.events.EventResponse) -DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions( - descriptor_pb2.FileOptions(), '\220\001\001') - -_EVENTSSERVERSERVICE = _descriptor.ServiceDescriptor( +_EVENTSSERVERSERVICE = descriptor.ServiceDescriptor( name='EventsServerService', full_name='leap.common.events.EventsServerService', file=DESCRIPTOR, @@ -400,7 +394,7 @@ _EVENTSSERVERSERVICE = _descriptor.ServiceDescriptor( serialized_start=919, serialized_end=1268, methods=[ - _descriptor.MethodDescriptor( + descriptor.MethodDescriptor( name='ping', full_name='leap.common.events.EventsServerService.ping', index=0, @@ -409,7 +403,7 @@ _EVENTSSERVERSERVICE = _descriptor.ServiceDescriptor( output_type=_EVENTRESPONSE, options=None, ), - _descriptor.MethodDescriptor( + descriptor.MethodDescriptor( name='register', full_name='leap.common.events.EventsServerService.register', index=1, @@ -418,7 +412,7 @@ _EVENTSSERVERSERVICE = _descriptor.ServiceDescriptor( output_type=_EVENTRESPONSE, options=None, ), - _descriptor.MethodDescriptor( + descriptor.MethodDescriptor( name='unregister', full_name='leap.common.events.EventsServerService.unregister', index=2, @@ -427,7 +421,7 @@ _EVENTSSERVERSERVICE = _descriptor.ServiceDescriptor( output_type=_EVENTRESPONSE, options=None, ), - _descriptor.MethodDescriptor( + descriptor.MethodDescriptor( name='signal', full_name='leap.common.events.EventsServerService.signal', index=3, @@ -439,7 +433,7 @@ _EVENTSSERVERSERVICE = _descriptor.ServiceDescriptor( ]) -class EventsServerService(_service.Service): +class EventsServerService(service.Service): __metaclass__ = service_reflection.GeneratedServiceType DESCRIPTOR = _EVENTSSERVERSERVICE @@ -449,7 +443,7 @@ class EventsServerService_Stub(EventsServerService): DESCRIPTOR = _EVENTSSERVERSERVICE -_EVENTSCLIENTSERVICE = _descriptor.ServiceDescriptor( +_EVENTSCLIENTSERVICE = descriptor.ServiceDescriptor( name='EventsClientService', full_name='leap.common.events.EventsClientService', file=DESCRIPTOR, @@ -458,7 +452,7 @@ _EVENTSCLIENTSERVICE = _descriptor.ServiceDescriptor( serialized_start=1271, serialized_end=1448, methods=[ - _descriptor.MethodDescriptor( + descriptor.MethodDescriptor( name='ping', full_name='leap.common.events.EventsClientService.ping', index=0, @@ -467,7 +461,7 @@ _EVENTSCLIENTSERVICE = _descriptor.ServiceDescriptor( output_type=_EVENTRESPONSE, options=None, ), - _descriptor.MethodDescriptor( + descriptor.MethodDescriptor( name='signal', full_name='leap.common.events.EventsClientService.signal', index=1, @@ -479,7 +473,7 @@ _EVENTSCLIENTSERVICE = _descriptor.ServiceDescriptor( ]) -class EventsClientService(_service.Service): +class EventsClientService(service.Service): __metaclass__ = service_reflection.GeneratedServiceType DESCRIPTOR = _EVENTSCLIENTSERVICE |