From: Brian Warner <warner@lothar.com>
Date: Thu, 8 Mar 2007 22:12:52 +0000 (-0700)
Subject: node.py: switch to using get_local_addresses_async, which is slightly more portable... 
X-Git-Url: https://git.rkrishnan.org/module-simplejson.tests.html?a=commitdiff_plain;h=91e7f092e850f712981e3b1249e0c9a68b3109f4;p=tahoe-lafs%2Ftahoe-lafs.git

node.py: switch to using get_local_addresses_async, which is slightly more portable (most forms of unix)
---

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index da656a19..04cabf9e 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -4,8 +4,7 @@ from twisted.python import log
 from twisted.application import service
 from twisted.internet import defer
 from foolscap import Tub
-from allmydata.util.iputil import get_local_addresses
-from allmydata.util import idlib, observer
+from allmydata.util import idlib, observer, iputil
 
 class Node(service.MultiService):
     # this implements common functionality of both Client nodes and the Queen
@@ -73,7 +72,7 @@ class Node(service.MultiService):
         # note: this class can only be started and stopped once.
         service.MultiService.startService(self)
         d = defer.succeed(None)
-        d.addCallback(lambda res: get_local_addresses())
+        d.addCallback(lambda res: iputil.get_local_addresses_async())
         d.addCallback(self._setup_tub)
         d.addCallback(lambda res: self.tub_ready())
         def _ready(res):