[or-cvs] r22820: {arm} Backporting fix for parsing multi-line exit policies to curr (arm/release/interface)

[Damian Johnson]

Author: atagar
Date: 2010-08-07 22:00:08 +0000 (Sat, 07 Aug 2010)
New Revision: 22820

Modified:
   arm/release/interface/connPanel.py
Log:
Backporting fix for parsing multi-line exit policies to current release.



Modified: arm/release/interface/connPanel.py
===================================================================
--- arm/release/interface/connPanel.py	2010-08-07 21:05:02 UTC (rev 22819)
+++ arm/release/interface/connPanel.py	2010-08-07 22:00:08 UTC (rev 22820)
@@ -8,7 +8,7 @@
 from threading import RLock
 from TorCtl import TorCtl
 
-from util import log, connections, hostnames, panel, uiTools
+from util import log, connections, hostnames, panel, torTools, uiTools
 
 # Scrubs private data from any connection that might belong to client or exit
 # traffic. This is a little overly conservative, hiding anything that isn't
@@ -192,8 +192,11 @@
       else: self.family = []
       
       self.isBridge = self.conn.get_option("BridgeRelay")[0][1] == "1"
-      self.exitPolicy = self.conn.get_option("ExitPolicy")[0][1]
       
+      policyEntries = torTools.getConn().getOption("ExitPolicy", multiple=True)
+      self.exitPolicy = ",".join(policyEntries)
+      self.exitPolicy = self.exitPolicy.replace("\\t", " ").replace("\"", "")
+      
       if self.exitPolicy: self.exitPolicy += "," + self.conn.get_info("exit-policy/default")["exit-policy/default"]
       else: self.exitPolicy = self.conn.get_info("exit-policy/default")["exit-policy/default"]