Add compiled proto

bumped version

3 files changed, 189 insertions, 112 deletions

diff --git a/setup.py b/setup.py
index 269d755..c7bdd76 100644
--- a/setup.py
+++ b/setup.py
@@ -42,6 +42,8 @@ dependency_links = [
 
 setup(
     name='leap.common',
+    # If you change version, do it also in
+    # src/leap/common/__init__.py
     version='0.2.1-dev',
     url='https://leap.se/',
     license='GPLv3+',
diff --git a/src/leap/common/__init__.py b/src/leap/common/__init__.py
index 5702ca1..19c43c9 100644
--- a/src/leap/common/__init__.py
+++ b/src/leap/common/__init__.py
@@ -11,9 +11,9 @@ try:
     import pygeoip
     HAS_GEOIP = True
 except ImportError:
-    logger.debug('PyGeoIP not found. Disabled Geo support.')
+    #logger.debug('PyGeoIP not found. Disabled Geo support.')
     HAS_GEOIP = False
 
 __all__ = ["certs", "check", "files", "events"]
 
-__version__ = "0.2.0-dev"
+__version__ = "0.2.1-dev"
diff --git a/src/leap/common/events/events_pb2.py b/src/leap/common/events/events_pb2.py
index 869378a..a4f1df4 100644
--- a/src/leap/common/events/events_pb2.py
+++ b/src/leap/common/events/events_pb2.py
@@ -3,79 +3,80 @@
 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\"\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\xb9\x01\n\x13\x45ventsServerService\x12R\n\x08register\x12#.leap.common.events.RegisterRequest\x1a!.leap.common.events.EventResponse\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponse2h\n\x16\x45ventsComponentService\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponse')
+    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\"\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\xb9\x01\n\x13\x45ventsServerService\x12R\n\x08register\x12#.leap.common.events.RegisterRequest\x1a!.leap.common.events.EventResponse\x12N\n\x06signal\x12!.leap.common.events.SignalRequest\x1a!.leap.common.events.EventResponse2h\n\x16\x45ventsComponentService\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=432,
-  serialized_end=791,
+    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=432,
+    serialized_end=791,
 )
 
 
@@ -95,42 +96,42 @@ 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=390,
-  serialized_end=429,
+    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=390,
+    serialized_end=429,
 )
 
 
 _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,
+    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),
@@ -275,22 +276,96 @@ DESCRIPTOR.message_types_by_name['SignalRequest'] = _SIGNALREQUEST
 DESCRIPTOR.message_types_by_name['RegisterRequest'] = _REGISTERREQUEST
 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)
+    __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)
+    __metaclass__ = reflection.GeneratedProtocolMessageType
+    DESCRIPTOR = _REGISTERREQUEST
+
+    # @@protoc_insertion_point(class_scope:leap.common.events.RegisterRequest)
+
 
 class EventResponse(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _EVENTRESPONSE
-  
-  # @@protoc_insertion_point(class_scope:leap.common.events.EventResponse)
+    __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=794,
+  serialized_end=979,
+  methods=[
+  descriptor.MethodDescriptor(
+    name='register',
+    full_name='leap.common.events.EventsServerService.register',
+    index=0,
+    containing_service=None,
+    input_type=_REGISTERREQUEST,
+    output_type=_EVENTRESPONSE,
+    options=None,
+  ),
+  descriptor.MethodDescriptor(
+    name='signal',
+    full_name='leap.common.events.EventsServerService.signal',
+    index=1,
+    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
+
+
+_EVENTSCOMPONENTSERVICE = descriptor.ServiceDescriptor(
+  name='EventsComponentService',
+  full_name='leap.common.events.EventsComponentService',
+  file=DESCRIPTOR,
+  index=1,
+  options=None,
+  serialized_start=981,
+  serialized_end=1085,
+  methods=[
+  descriptor.MethodDescriptor(
+    name='signal',
+    full_name='leap.common.events.EventsComponentService.signal',
+    index=0,
+    containing_service=None,
+    input_type=_SIGNALREQUEST,
+    output_type=_EVENTRESPONSE,
+    options=None,
+  ),
+])
+
+
+class EventsComponentService(service.Service):
+    __metaclass__ = service_reflection.GeneratedServiceType
+    DESCRIPTOR = _EVENTSCOMPONENTSERVICE
+
+
+class EventsComponentService_Stub(EventsComponentService):
+    __metaclass__ = service_reflection.GeneratedServiceStubType
+    DESCRIPTOR = _EVENTSCOMPONENTSERVICE
 
 # @@protoc_insertion_point(module_scope)