[or-cvs] r20283: {torflow} Hrmm, the libs are shared between both the Exit and Bw autho (in torflow/trunk/NetworkScanners: . ExitAuthority)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-08-13 16:07:28 -0400 (Thu, 13 Aug 2009)
New Revision: 20283

Added:
   torflow/trunk/NetworkScanners/libs/
Removed:
   torflow/trunk/NetworkScanners/ExitAuthority/libs/
Modified:
   torflow/trunk/NetworkScanners/ExitAuthority/libsoat.py
   torflow/trunk/NetworkScanners/ExitAuthority/soat.py
Log:

Hrmm, the libs are shared between both the Exit and Bw
authorities. Leave them in the NetworkScanners dir.



Modified: torflow/trunk/NetworkScanners/ExitAuthority/libsoat.py
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/libsoat.py	2009-08-13 19:49:51 UTC (rev 20282)
+++ torflow/trunk/NetworkScanners/ExitAuthority/libsoat.py	2009-08-13 20:07:28 UTC (rev 20283)
@@ -13,7 +13,7 @@
 import copy
 import socket
 import struct
-sys.path.append("./libs")
+sys.path.append("../libs")
 from OpenSSL import crypto
 from BeautifulSoup.BeautifulSoup import Tag, SoupStrainer
 
@@ -21,11 +21,11 @@
 from sets import Set
 from soat_config import *
 
-sys.path.append("../")
+sys.path.append("../../")
 from TorCtl.TorUtil import *
 
 # Antlr stuff
-sys.path.append("./libs/jsparser/")
+sys.path.append("../libs/jsparser/")
 import antlr3
 from JavaScriptParser import tokenNames as JSTokenNames
 from JavaScriptLexer import JavaScriptLexer

Modified: torflow/trunk/NetworkScanners/ExitAuthority/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/soat.py	2009-08-13 19:49:51 UTC (rev 20282)
+++ torflow/trunk/NetworkScanners/ExitAuthority/soat.py	2009-08-13 20:07:28 UTC (rev 20283)
@@ -47,10 +47,10 @@
 import threading
 import atexit
 
+sys.path.append("../../")
+
 from libsoat import *
 
-sys.path.append("../")
-
 from TorCtl import TorUtil, TorCtl, PathSupport, ScanSupport
 from TorCtl.TorUtil import meta_port, meta_host, control_port, control_host, tor_port, tor_host
 from TorCtl.TorUtil import *
@@ -61,7 +61,7 @@
 from OpenSSL import *
 
 
-sys.path.append("./libs/")
+sys.path.append("../libs/")
 from BeautifulSoup.BeautifulSoup import SoupStrainer, Tag
 from SocksiPy import socks
 import Pyssh.pyssh