Pull fix of recording from websockify.

Pull websockify 7f487fdbd.

The reocrd parameter will turn on recording of all messages sent
to and from the client. The record parameter is a file prefix. The
full file-name will be the prefix with an extension '.HANDLER_ID'
based on the handler ID.

utils/websockify

@@ -2,7 +2,7 @@
 
 '''
 A WebSocket to TCP socket proxy with support for "wss://" encryption.
-Copyright 2010 Joel Martin
+Copyright 2011 Joel Martin
 Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
 
 You can make a cert/key with openssl using:
@@ -74,7 +74,7 @@ Traffic Legend:
         WebSocketServer.__init__(self, *args, **kwargs)
 
     def run_wrap_cmd(self):
-        print "Starting '%s'" % " ".join(self.wrap_cmd)
+        print("Starting '%s'" % " ".join(self.wrap_cmd))
         self.wrap_times.append(time.time())
         self.wrap_times.pop(0)
         self.cmd = subprocess.Popen(
@@ -88,14 +88,14 @@ Traffic Legend:
         # Need to call wrapped command after daemonization so we can
         # know when the wrapped command exits
         if self.wrap_cmd:
-            print "  - proxying from %s:%s to '%s' (port %s)\n" % (
+            print("  - proxying from %s:%s to '%s' (port %s)\n" % (
                     self.listen_host, self.listen_port,
-                    " ".join(self.wrap_cmd), self.target_port)
+                    " ".join(self.wrap_cmd), self.target_port))
             self.run_wrap_cmd()
         else:
-            print "  - proxying from %s:%s to %s:%s\n" % (
+            print("  - proxying from %s:%s to %s:%s\n" % (
                     self.listen_host, self.listen_port,
-                    self.target_host, self.target_port)
+                    self.target_host, self.target_port))
 
     def poll(self):
         # If we are wrapping a command, check it's status
@@ -118,7 +118,7 @@ Traffic Legend:
                 if (now - avg) < 10:
                     # 3 times in the last 10 seconds
                     if self.spawn_message:
-                        print "Command respawning too fast"
+                        print("Command respawning too fast")
                         self.spawn_message = False
                 else:
                     self.run_wrap_cmd()
@@ -138,15 +138,6 @@ Traffic Legend:
         Called after a new WebSocket connection has been established.
         """
 
-        self.rec = None
-        if self.record:
-            # Record raw frame data as a JavaScript compatible file
-            fname = "%s.%s" % (self.record,
-                                self.handler_id)
-            self.msg("opening record file: %s" % fname)
-            self.rec = open(fname, 'w+')
-            self.rec.write("var VNC_frame_data = [\n")
-
         # Connect to the target
         self.msg("connecting to: %s:%s" % (
                  self.target_host, self.target_port))
@@ -154,19 +145,17 @@ Traffic Legend:
         tsock.connect((self.target_host, self.target_port))
 
         if self.verbose and not self.daemon:
-            print self.traffic_legend
+            print(self.traffic_legend)
 
         # Start proxying
         try:
             self.do_proxy(tsock)
         except:
             if tsock:
+                tsock.shutdown(socket.SHUT_RDWR)
                 tsock.close()
                 self.vmsg("%s:%s: Target closed" %(
                     self.target_host, self.target_port))
-            if self.rec:
-                self.rec.write("'EOF']\n")
-                self.rec.close()
             raise
 
     def do_proxy(self, target):
@@ -177,11 +166,9 @@ Traffic Legend:
         c_pend = 0
         tqueue = []
         rlist = [self.client, target]
-        tstart = int(time.time()*1000)
 
         while True:
             wlist = []
-            tdelta = int(time.time()*1000) - tstart
 
             if tqueue: wlist.append(target)
             if cqueue or c_pend: wlist.append(self.client)
@@ -212,11 +199,8 @@ Traffic Legend:
             if self.client in outs:
                 # Send queued target data to the client
                 c_pend = self.send_frames(cqueue)
-                cqueue = []
 
-                #if self.rec:
-                #    self.rec.write("%s,\n" %
-                #            repr("{%s{" % tdelta + dat[1:-1]))
+                cqueue = []
 
 
             if self.client in ins:
@@ -224,11 +208,6 @@ Traffic Legend:
                 bufs, closed = self.recv_frames()
                 tqueue.extend(bufs)
 
-                #if self.rec:
-                #    for b in bufs:
-                #        self.rec.write(
-                #                repr("}%s}%s" % (tdelta, b)) + ",\n")
-
                 if closed:
                     # TODO: What about blocking on client socket?
                     self.send_close()