Merge 0777151cd2 into 4e534a804e

utils/websockify

@@ -88,13 +88,10 @@ Traffic Legend:
         # in the form of token: host:port
 
         # Extract the token parameter from url
-        args = parse_qs(urlparse(path)[4]) # 4 is the query from url
-
-        if not args.has_key('token') or not len(args['token']):
+        token = urlparse(path)[4] # 4 is the query from url
+        if not token:
           raise self.EClose("Token not present")
 
-        token = args['token'][0].rstrip('\n')
-
         # target_cfg can be a single config file or directory of
         # config files
         if os.path.isdir(target_cfg):
@@ -103,18 +100,12 @@ Traffic Legend:
         else:
             cfg_files = [target_cfg]
 
-        targets = {}
         for f in cfg_files:
-            for line in [l.strip() for l in file(f).readlines()]:
+            for line in [l.strip() for l in open(f)]:
                 if line and not line.startswith('#'):
-                    ttoken, target = line.split(': ')
-                    targets[ttoken] = target.strip()
-
-        self.vmsg("Target config: %s" % repr(targets))
-
-        if targets.has_key(token):
-            return targets[token].split(':')
-        else:
+                    ftoken, target = line.split(': ')
+                    if ftoken == token:
+                       return target.split(':')
         raise self.EClose("Token '%s' not found" % token)
 
     def do_proxy(self, target):