[or-cvs] r21888: {arm} Fix for initializing error when processing family connection (in arm/trunk: . interface)

[Damian Johnson]

Author: atagar
Date: 2010-03-09 15:49:09 +0000 (Tue, 09 Mar 2010)
New Revision: 21888

Modified:
   arm/trunk/ChangeLog
   arm/trunk/interface/connPanel.py
Log:
Fix for initializing error when processing family connections (caught by dun).



Modified: arm/trunk/ChangeLog
===================================================================
--- arm/trunk/ChangeLog	2010-03-09 10:16:41 UTC (rev 21887)
+++ arm/trunk/ChangeLog	2010-03-09 15:49:09 UTC (rev 21888)
@@ -1,6 +1,6 @@
 CHANGE LOG
 
-3/7/10 - version 1.3.4
+3/7/10 - version 1.3.4 (r21852)
 Weekend bugfix bundle.
 
     * added: returned option to reload torrc and added option to issue a sighup

Modified: arm/trunk/interface/connPanel.py
===================================================================
--- arm/trunk/interface/connPanel.py	2010-03-09 10:16:41 UTC (rev 21887)
+++ arm/trunk/interface/connPanel.py	2010-03-09 15:49:09 UTC (rev 21888)
@@ -384,7 +384,7 @@
       for fingerprint in self.family:
         try:
           nsCall = self.conn.get_network_status("id/%s" % fingerprint)
-          if nsCall: familyAddress, familyPort = nsCall[0][6], nsCall[0][7]
+          if nsCall: familyAddress, familyPort = nsCall[0].ip, nsCall[0].orport
           else: raise TorCtl.ErrorReply # network consensus couldn't be fetched
           
           countryCodeQuery = "ip-to-country/%s" % familyAddress