Merge remote-tracking branch 'drebs/feature/3464_make-smtprelay-emit-signals' into develop

5 files changed, 497 insertions, 434 deletions

diff --git a/changes/feature_3464-make-smtprelay-emit-signals b/changes/feature_3464-make-smtprelay-emit-signals
new file mode 100644
index 0000000..0b7753f
--- /dev/null
+++ b/changes/feature_3464-make-smtprelay-emit-signals
@@ -0,0 +1 @@
+  o Add events for SMTP relay signaling. Closes #3464.
diff --git a/setup.py b/setup.py
index 0db731e..b675675 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ from setuptools import setup, find_packages
 requirements = [
     "jsonschema",
     "pyxdg",
-    'protobuf',
+    'protobuf>=2.4.1',
     'protobuf.socketrpc',
     "PyOpenSSL",
     "python-dateutil",
diff --git a/src/leap/common/events/Makefile b/src/leap/common/events/Makefile
index 4f73dea..5b7e60d 100644
--- a/src/leap/common/events/Makefile
+++ b/src/leap/common/events/Makefile
@@ -25,7 +25,7 @@ all: events_pb2.py
 
 %_pb2.py: %.proto
 	$(PROTOC) --python_out=./ $<
-	autopep8 --in-place --aggressive $@
+#	autopep8 --in-place --aggressive $@
 
 clean:
 	rm -f *_pb2.py
diff --git a/src/leap/common/events/events.proto b/src/leap/common/events/events.proto
index b844f42..3f60210 100644
--- a/src/leap/common/events/events.proto
+++ b/src/leap/common/events/events.proto
@@ -34,6 +34,19 @@ enum Event {
   UPDATER_NEW_UPDATES = 11;
   UPDATER_DONE_UPDATING = 12;
   RAISE_WINDOW = 13;
+  SMTP_SERVICE_STARTED = 14;
+  SMTP_SERVICE_FAILED_TO_START = 15;
+  SMTP_RECIPIENT_ACCEPTED_ENCRYPTED = 16;
+  SMTP_RECIPIENT_ACCEPTED_UNENCRYPTED = 17;
+  SMTP_RECIPIENT_REJECTED = 18;
+  SMTP_START_ENCRYPT_AND_SIGN = 19;
+  SMTP_END_ENCRYPT_AND_SIGN = 20;
+  SMTP_START_SIGN = 21;
+  SMTP_END_SIGN = 22;
+  SMTP_SEND_MESSAGE_START = 23;
+  SMTP_SEND_MESSAGE_SUCCESS = 24;
+  SMTP_SEND_MESSAGE_ERROR = 25;
+  SMTP_CONNECTION_LOST = 26;
 }
 
 
diff --git a/src/leap/common/events/events_pb2.py b/src/leap/common/events/events_pb2.py
index 274514c..ebbd4fc 100644
--- a/src/leap/common/events/events_pb2.py
+++ b/src/leap/common/events/events_pb2.py
@@ -1,87 +1,138 @@
 # 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(
-    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(
-    name='Event',
-    full_name='leap.common.events.Event',
-    filename=None,
-    file=DESCRIPTOR,
-    values=[
-        _descriptor.EnumValueDescriptor(
-            name='CLIENT_SESSION_ID', index=0, number=1,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='CLIENT_UID', index=1, number=2,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='SOLEDAD_CREATING_KEYS', index=2, number=3,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='SOLEDAD_DONE_CREATING_KEYS', index=3, number=4,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='SOLEDAD_UPLOADING_KEYS', index=4, number=5,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='SOLEDAD_DONE_UPLOADING_KEYS', index=5, number=6,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='SOLEDAD_DOWNLOADING_KEYS', index=6, number=7,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='SOLEDAD_DONE_DOWNLOADING_KEYS', index=7, number=8,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='SOLEDAD_NEW_DATA_TO_SYNC', index=8, number=9,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='SOLEDAD_DONE_DATA_SYNC', index=9, number=10,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='UPDATER_NEW_UPDATES', index=10, number=11,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='UPDATER_DONE_UPDATING', index=11, number=12,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='RAISE_WINDOW', index=12, number=13,
-            options=None,
-            type=None),
-    ],
-    containing_type=None,
-    options=None,
-    serialized_start=557,
-    serialized_end=916,
+
+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*\xeb\x05\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\r\x12\x18\n\x14SMTP_SERVICE_STARTED\x10\x0e\x12 \n\x1cSMTP_SERVICE_FAILED_TO_START\x10\x0f\x12%\n!SMTP_RECIPIENT_ACCEPTED_ENCRYPTED\x10\x10\x12\'\n#SMTP_RECIPIENT_ACCEPTED_UNENCRYPTED\x10\x11\x12\x1b\n\x17SMTP_RECIPIENT_REJECTED\x10\x12\x12\x1f\n\x1bSMTP_START_ENCRYPT_AND_SIGN\x10\x13\x12\x1d\n\x19SMTP_END_ENCRYPT_AND_SIGN\x10\x14\x12\x13\n\x0fSMTP_START_SIGN\x10\x15\x12\x11\n\rSMTP_END_SIGN\x10\x16\x12\x1b\n\x17SMTP_SEND_MESSAGE_START\x10\x17\x12\x1d\n\x19SMTP_SEND_MESSAGE_SUCCESS\x10\x18\x12\x1b\n\x17SMTP_SEND_MESSAGE_ERROR\x10\x19\x12\x18\n\x14SMTP_CONNECTION_LOST\x10\x1a\x32\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(
+  name='Event',
+  full_name='leap.common.events.Event',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    descriptor.EnumValueDescriptor(
+      name='CLIENT_SESSION_ID', index=0, number=1,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='CLIENT_UID', index=1, number=2,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SOLEDAD_CREATING_KEYS', index=2, number=3,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SOLEDAD_DONE_CREATING_KEYS', index=3, number=4,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SOLEDAD_UPLOADING_KEYS', index=4, number=5,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SOLEDAD_DONE_UPLOADING_KEYS', index=5, number=6,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SOLEDAD_DOWNLOADING_KEYS', index=6, number=7,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SOLEDAD_DONE_DOWNLOADING_KEYS', index=7, number=8,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SOLEDAD_NEW_DATA_TO_SYNC', index=8, number=9,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SOLEDAD_DONE_DATA_SYNC', index=9, number=10,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='UPDATER_NEW_UPDATES', index=10, number=11,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='UPDATER_DONE_UPDATING', index=11, number=12,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='RAISE_WINDOW', index=12, number=13,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_SERVICE_STARTED', index=13, number=14,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_SERVICE_FAILED_TO_START', index=14, number=15,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_RECIPIENT_ACCEPTED_ENCRYPTED', index=15, number=16,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_RECIPIENT_ACCEPTED_UNENCRYPTED', index=16, number=17,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_RECIPIENT_REJECTED', index=17, number=18,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_START_ENCRYPT_AND_SIGN', index=18, number=19,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_END_ENCRYPT_AND_SIGN', index=19, number=20,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_START_SIGN', index=20, number=21,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_END_SIGN', index=21, number=22,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_SEND_MESSAGE_START', index=22, number=23,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_SEND_MESSAGE_SUCCESS', index=23, number=24,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_SEND_MESSAGE_ERROR', index=24, number=25,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='SMTP_CONNECTION_LOST', index=25, number=26,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=557,
+  serialized_end=1304,
 )
 
-Event = enum_type_wrapper.EnumTypeWrapper(_EVENT)
+
 CLIENT_SESSION_ID = 1
 CLIENT_UID = 2
 SOLEDAD_CREATING_KEYS = 3
@@ -95,397 +146,395 @@ SOLEDAD_DONE_DATA_SYNC = 10
 UPDATER_NEW_UPDATES = 11
 UPDATER_DONE_UPDATING = 12
 RAISE_WINDOW = 13
-
-
-_EVENTRESPONSE_STATUS = _descriptor.EnumDescriptor(
-    name='Status',
-    full_name='leap.common.events.EventResponse.Status',
-    filename=None,
-    file=DESCRIPTOR,
-    values=[
-        _descriptor.EnumValueDescriptor(
-            name='OK', index=0, number=1,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='UNAUTH', index=1, number=2,
-            options=None,
-            type=None),
-        _descriptor.EnumValueDescriptor(
-            name='ERROR', index=2, number=3,
-            options=None,
-            type=None),
-    ],
-    containing_type=None,
-    options=None,
-    serialized_start=515,
-    serialized_end=554,
+SMTP_SERVICE_STARTED = 14
+SMTP_SERVICE_FAILED_TO_START = 15
+SMTP_RECIPIENT_ACCEPTED_ENCRYPTED = 16
+SMTP_RECIPIENT_ACCEPTED_UNENCRYPTED = 17
+SMTP_RECIPIENT_REJECTED = 18
+SMTP_START_ENCRYPT_AND_SIGN = 19
+SMTP_END_ENCRYPT_AND_SIGN = 20
+SMTP_START_SIGN = 21
+SMTP_END_SIGN = 22
+SMTP_SEND_MESSAGE_START = 23
+SMTP_SEND_MESSAGE_SUCCESS = 24
+SMTP_SEND_MESSAGE_ERROR = 25
+SMTP_CONNECTION_LOST = 26
+
+
+_EVENTRESPONSE_STATUS = descriptor.EnumDescriptor(
+  name='Status',
+  full_name='leap.common.events.EventResponse.Status',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    descriptor.EnumValueDescriptor(
+      name='OK', index=0, number=1,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='UNAUTH', index=1, number=2,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='ERROR', index=2, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=515,
+  serialized_end=554,
 )
 
 
-_SIGNALREQUEST = _descriptor.Descriptor(
-    name='SignalRequest',
-    full_name='leap.common.events.SignalRequest',
-    filename=None,
-    file=DESCRIPTOR,
-    containing_type=None,
-    fields=[
-        _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(
-            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(
-            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(
-            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(
-            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(
-            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,
-            message_type=None, enum_type=None, containing_type=None,
-            is_extension=False, extension_scope=None,
-            options=None),
-    ],
-    extensions=[
-    ],
-    nested_types=[],
-    enum_types=[
-    ],
-    options=None,
-    is_extendable=False,
-    extension_ranges=[],
-    serialized_start=37,
-    serialized_end=188,
+_SIGNALREQUEST = descriptor.Descriptor(
+  name='SignalRequest',
+  full_name='leap.common.events.SignalRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    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(
+      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(
+      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(
+      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(
+      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(
+      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,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=37,
+  serialized_end=188,
 )
 
 
-_REGISTERREQUEST = _descriptor.Descriptor(
-    name='RegisterRequest',
-    full_name='leap.common.events.RegisterRequest',
-    filename=None,
-    file=DESCRIPTOR,
-    containing_type=None,
-    fields=[
-        _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(
-            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(
-            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(
-            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="",
-            message_type=None, enum_type=None, containing_type=None,
-            is_extension=False, extension_scope=None,
-            options=None),
-    ],
-    extensions=[
-    ],
-    nested_types=[],
-    enum_types=[
-    ],
-    options=None,
-    is_extendable=False,
-    extension_ranges=[],
-    serialized_start=190,
-    serialized_end=296,
+_REGISTERREQUEST = descriptor.Descriptor(
+  name='RegisterRequest',
+  full_name='leap.common.events.RegisterRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    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(
+      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(
+      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(
+      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="",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=190,
+  serialized_end=296,
 )
 
 
-_UNREGISTERREQUEST = _descriptor.Descriptor(
-    name='UnregisterRequest',
-    full_name='leap.common.events.UnregisterRequest',
-    filename=None,
-    file=DESCRIPTOR,
-    containing_type=None,
-    fields=[
-        _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(
-            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(
-            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(
-            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="",
-            message_type=None, enum_type=None, containing_type=None,
-            is_extension=False, extension_scope=None,
-            options=None),
-    ],
-    extensions=[
-    ],
-    nested_types=[],
-    enum_types=[
-    ],
-    options=None,
-    is_extendable=False,
-    extension_ranges=[],
-    serialized_start=298,
-    serialized_end=406,
+_UNREGISTERREQUEST = descriptor.Descriptor(
+  name='UnregisterRequest',
+  full_name='leap.common.events.UnregisterRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    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(
+      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(
+      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(
+      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="",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=298,
+  serialized_end=406,
 )
 
 
-_PINGREQUEST = _descriptor.Descriptor(
-    name='PingRequest',
-    full_name='leap.common.events.PingRequest',
-    filename=None,
-    file=DESCRIPTOR,
-    containing_type=None,
-    fields=[
-    ],
-    extensions=[
-    ],
-    nested_types=[],
-    enum_types=[
-    ],
-    options=None,
-    is_extendable=False,
-    extension_ranges=[],
-    serialized_start=408,
-    serialized_end=421,
+_PINGREQUEST = descriptor.Descriptor(
+  name='PingRequest',
+  full_name='leap.common.events.PingRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=408,
+  serialized_end=421,
 )
 
 
-_EVENTRESPONSE = _descriptor.Descriptor(
-    name='EventResponse',
-    full_name='leap.common.events.EventResponse',
-    filename=None,
-    file=DESCRIPTOR,
-    containing_type=None,
-    fields=[
-        _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(
-            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"),
-            message_type=None, enum_type=None, containing_type=None,
-            is_extension=False, extension_scope=None,
-            options=None),
-    ],
-    extensions=[
-    ],
-    nested_types=[],
-    enum_types=[
-        _EVENTRESPONSE_STATUS,
-    ],
-    options=None,
-    is_extendable=False,
-    extension_ranges=[],
-    serialized_start=424,
-    serialized_end=554,
+_EVENTRESPONSE = descriptor.Descriptor(
+  name='EventResponse',
+  full_name='leap.common.events.EventResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    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(
+      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"),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _EVENTRESPONSE_STATUS,
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=424,
+  serialized_end=554,
 )
 
 _SIGNALREQUEST.fields_by_name['event'].enum_type = _EVENT
 _REGISTERREQUEST.fields_by_name['event'].enum_type = _EVENT
 _UNREGISTERREQUEST.fields_by_name['event'].enum_type = _EVENT
 _EVENTRESPONSE.fields_by_name['status'].enum_type = _EVENTRESPONSE_STATUS
-_EVENTRESPONSE_STATUS.containing_type = _EVENTRESPONSE
+_EVENTRESPONSE_STATUS.containing_type = _EVENTRESPONSE;
 DESCRIPTOR.message_types_by_name['SignalRequest'] = _SIGNALREQUEST
 DESCRIPTOR.message_types_by_name['RegisterRequest'] = _REGISTERREQUEST
 DESCRIPTOR.message_types_by_name['UnregisterRequest'] = _UNREGISTERREQUEST
 DESCRIPTOR.message_types_by_name['PingRequest'] = _PINGREQUEST
 DESCRIPTOR.message_types_by_name['EventResponse'] = _EVENTRESPONSE
 
-
-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
-    DESCRIPTOR = _REGISTERREQUEST
-
-    # @@protoc_insertion_point(class_scope:leap.common.events.RegisterRequest)
-
-
-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
-    DESCRIPTOR = _PINGREQUEST
-
-    # @@protoc_insertion_point(class_scope:leap.common.events.PingRequest)
-
-
-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(
-    name='EventsServerService',
-    full_name='leap.common.events.EventsServerService',
-    file=DESCRIPTOR,
+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
+  DESCRIPTOR = _REGISTERREQUEST
+  
+  # @@protoc_insertion_point(class_scope:leap.common.events.RegisterRequest)
+
+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
+  DESCRIPTOR = _PINGREQUEST
+  
+  # @@protoc_insertion_point(class_scope:leap.common.events.PingRequest)
+
+class EventResponse(message.Message):
+  __metaclass__ = reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _EVENTRESPONSE
+  
+  # @@protoc_insertion_point(class_scope:leap.common.events.EventResponse)
+
+
+_EVENTSSERVERSERVICE = descriptor.ServiceDescriptor(
+  name='EventsServerService',
+  full_name='leap.common.events.EventsServerService',
+  file=DESCRIPTOR,
+  index=0,
+  options=None,
+  serialized_start=1307,
+  serialized_end=1656,
+  methods=[
+  descriptor.MethodDescriptor(
+    name='ping',
+    full_name='leap.common.events.EventsServerService.ping',
     index=0,
+    containing_service=None,
+    input_type=_PINGREQUEST,
+    output_type=_EVENTRESPONSE,
     options=None,
-    serialized_start=919,
-    serialized_end=1268,
-    methods=[
-        _descriptor.MethodDescriptor(
-            name='ping',
-            full_name='leap.common.events.EventsServerService.ping',
-            index=0,
-            containing_service=None,
-            input_type=_PINGREQUEST,
-            output_type=_EVENTRESPONSE,
-            options=None,
-        ),
-        _descriptor.MethodDescriptor(
-            name='register',
-            full_name='leap.common.events.EventsServerService.register',
-            index=1,
-            containing_service=None,
-            input_type=_REGISTERREQUEST,
-            output_type=_EVENTRESPONSE,
-            options=None,
-        ),
-        _descriptor.MethodDescriptor(
-            name='unregister',
-            full_name='leap.common.events.EventsServerService.unregister',
-            index=2,
-            containing_service=None,
-            input_type=_UNREGISTERREQUEST,
-            output_type=_EVENTRESPONSE,
-            options=None,
-        ),
-        _descriptor.MethodDescriptor(
-            name='signal',
-            full_name='leap.common.events.EventsServerService.signal',
-            index=3,
-            containing_service=None,
-            input_type=_SIGNALREQUEST,
-            output_type=_EVENTRESPONSE,
-            options=None,
-        ),
-    ])
-
-
-class EventsServerService(_service.Service):
-    __metaclass__ = service_reflection.GeneratedServiceType
-    DESCRIPTOR = _EVENTSSERVERSERVICE
-
+  ),
+  descriptor.MethodDescriptor(
+    name='register',
+    full_name='leap.common.events.EventsServerService.register',
+    index=1,
+    containing_service=None,
+    input_type=_REGISTERREQUEST,
+    output_type=_EVENTRESPONSE,
+    options=None,
+  ),
+  descriptor.MethodDescriptor(
+    name='unregister',
+    full_name='leap.common.events.EventsServerService.unregister',
+    index=2,
+    containing_service=None,
+    input_type=_UNREGISTERREQUEST,
+    output_type=_EVENTRESPONSE,
+    options=None,
+  ),
+  descriptor.MethodDescriptor(
+    name='signal',
+    full_name='leap.common.events.EventsServerService.signal',
+    index=3,
+    containing_service=None,
+    input_type=_SIGNALREQUEST,
+    output_type=_EVENTRESPONSE,
+    options=None,
+  ),
+])
 
+class EventsServerService(service.Service):
+  __metaclass__ = service_reflection.GeneratedServiceType
+  DESCRIPTOR = _EVENTSSERVERSERVICE
 class EventsServerService_Stub(EventsServerService):
-    __metaclass__ = service_reflection.GeneratedServiceStubType
-    DESCRIPTOR = _EVENTSSERVERSERVICE
-
-
-_EVENTSCLIENTSERVICE = _descriptor.ServiceDescriptor(
-    name='EventsClientService',
-    full_name='leap.common.events.EventsClientService',
-    file=DESCRIPTOR,
+  __metaclass__ = service_reflection.GeneratedServiceStubType
+  DESCRIPTOR = _EVENTSSERVERSERVICE
+
+
+_EVENTSCLIENTSERVICE = descriptor.ServiceDescriptor(
+  name='EventsClientService',
+  full_name='leap.common.events.EventsClientService',
+  file=DESCRIPTOR,
+  index=1,
+  options=None,
+  serialized_start=1659,
+  serialized_end=1836,
+  methods=[
+  descriptor.MethodDescriptor(
+    name='ping',
+    full_name='leap.common.events.EventsClientService.ping',
+    index=0,
+    containing_service=None,
+    input_type=_PINGREQUEST,
+    output_type=_EVENTRESPONSE,
+    options=None,
+  ),
+  descriptor.MethodDescriptor(
+    name='signal',
+    full_name='leap.common.events.EventsClientService.signal',
     index=1,
+    containing_service=None,
+    input_type=_SIGNALREQUEST,
+    output_type=_EVENTRESPONSE,
     options=None,
-    serialized_start=1271,
-    serialized_end=1448,
-    methods=[
-        _descriptor.MethodDescriptor(
-            name='ping',
-            full_name='leap.common.events.EventsClientService.ping',
-            index=0,
-            containing_service=None,
-            input_type=_PINGREQUEST,
-            output_type=_EVENTRESPONSE,
-            options=None,
-        ),
-        _descriptor.MethodDescriptor(
-            name='signal',
-            full_name='leap.common.events.EventsClientService.signal',
-            index=1,
-            containing_service=None,
-            input_type=_SIGNALREQUEST,
-            output_type=_EVENTRESPONSE,
-            options=None,
-        ),
-    ])
-
-
-class EventsClientService(_service.Service):
-    __metaclass__ = service_reflection.GeneratedServiceType
-    DESCRIPTOR = _EVENTSCLIENTSERVICE
-
+  ),
+])
 
+class EventsClientService(service.Service):
+  __metaclass__ = service_reflection.GeneratedServiceType
+  DESCRIPTOR = _EVENTSCLIENTSERVICE
 class EventsClientService_Stub(EventsClientService):
-    __metaclass__ = service_reflection.GeneratedServiceStubType
-    DESCRIPTOR = _EVENTSCLIENTSERVICE
+  __metaclass__ = service_reflection.GeneratedServiceStubType
+  DESCRIPTOR = _EVENTSCLIENTSERVICE
 
 # @@protoc_insertion_point(module_scope)