diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-06-23 17:13:28 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-06-23 17:13:28 (GMT) |
| commit | db90d4a209587e7d35d36c7d3974b144aeec97c3 (patch) | |
| tree | 1b2a88aa2d7bd7ae18c2d1f353f1de91f7699499 /sugar/p2p | |
| parent | 7e50e0c8a10ddb453aba85cc817574a06c90131b (diff) | |
Use random port for local models, clean up some model code, and don't double-register models when we hear our own announcement
Diffstat (limited to 'sugar/p2p')
| -rw-r--r-- | sugar/p2p/model/LocalModel.py | 3 | ||||
| -rw-r--r-- | sugar/p2p/model/RemoteModel.py | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sugar/p2p/model/LocalModel.py b/sugar/p2p/model/LocalModel.py index f293ef3..21ee9df 100644 --- a/sugar/p2p/model/LocalModel.py +++ b/sugar/p2p/model/LocalModel.py @@ -17,7 +17,6 @@ class ModelRequestHandler(object): class LocalModel(AbstractModel): SERVICE_TYPE = "_olpc_model._tcp" - SERVICE_PORT = 6300 def __init__(self, activity, pservice, service): AbstractModel.__init__(self) @@ -40,7 +39,7 @@ class LocalModel(AbstractModel): def _setup_service(self): service = self._pservice.share_activity(self._activity, stype = LocalModel.SERVICE_TYPE, - address = '', port = LocalModel.SERVICE_PORT) + address = '') self._setup_server(service) # FIXME this is duplicated with StreamReader diff --git a/sugar/p2p/model/RemoteModel.py b/sugar/p2p/model/RemoteModel.py index 00b3cb6..28de2ae 100644 --- a/sugar/p2p/model/RemoteModel.py +++ b/sugar/p2p/model/RemoteModel.py @@ -24,6 +24,5 @@ class RemoteModel(AbstractModel): self._client.set_value(key, value) def _setup_notification_listener(self): - name = self._service.get_name() self._notification = NotificationListener(self._notification_service) self._notification.add_listener(self._notify_model_change) |