From: Evan Broder <broder@mit.edu>
Date: Sat, 29 Mar 2008 00:31:21 +0000 (-0400)
Subject: Changed VNC proxy to spew to stdout instead of an arbitrary logfile so that it will... 
X-Git-Tag: sipb-xen-vnc-server/1~2
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-vnc-server.git/commitdiff_plain/70b6236aa037ef3fd1c34cfef3454ec092976079?hp=aed8d463bc137322f0807dc3cac41558c19685b2

Changed VNC proxy to spew to stdout instead of an arbitrary logfile so that it will go to the right syslog

svn path=/trunk/packages/sipb-xen-vnc-server/; revision=289
---

diff --git a/code/vncexternalauth.py b/code/vncexternalauth.py
index da676d9..30e89e1 100644
--- a/code/vncexternalauth.py
+++ b/code/vncexternalauth.py
@@ -45,18 +45,15 @@ class VNCAuthOutgoing(protocol.Protocol):
         self.socks.transport.loseConnection()
 
     def dataReceived(self,data):
-        #self.socks.log(self,"R"+data)
         self.socks.write(data)
 
     def write(self,data):
-        #self.socks.log(self,'W'+data)
         self.transport.write(data)
 
 
 class VNCAuth(protocol.Protocol):
     
-    def __init__(self,logging=None,server="localhost"):
-        self.logging=logging
+    def __init__(self,server="localhost"):
         self.server=server
         self.auth=None
     
@@ -175,28 +172,24 @@ class VNCAuth(protocol.Protocol):
         if int(reply / 100)!=2: self.transport.loseConnection()
 
     def write(self,data):
-        #self.log(self,data)
         self.transport.write(data)
 
     def log(self,proto,data):
-        if not self.logging: return
         peer = self.transport.getPeer()
         their_peer = self.otherConn.transport.getPeer()
-        f=open(self.logging,"a")
-        f.write("%s\t%s:%d %s %s:%d\n"%(time.ctime(),
+        print "%s\t%s:%d %s %s:%d\n"%(time.ctime(),
                                         peer.host,peer.port,
                                         ((proto==self and '<') or '>'),
-                                        their_peer.host,their_peer.port))
+                                        their_peer.host,their_peer.port),
         while data:
             p,data=data[:16],data[16:]
-            f.write(string.join(map(lambda x:'%02X'%ord(x),p),' ')+' ')
-            f.write((16-len(p))*3*' ')
+            print string.join(map(lambda x:'%02X'%ord(x),p),' ')+' ',
+            print ((16-len(p))*3*' '),
             for c in p:
-                if len(repr(c))>3: f.write('.')
-                else: f.write(c)
-            f.write('\n')
-        f.write('\n')
-        f.close()
+                if len(repr(c))>3: print '.',
+                else: print c,
+            print ""
+        print ""
 
 
 class VNCAuthFactory(protocol.Factory):
@@ -205,10 +198,9 @@ class VNCAuthFactory(protocol.Factory):
     Constructor accepts one argument, a log file name.
     """
     
-    def __init__(self, log, server):
-        self.logging = log
+    def __init__(self, server):
         self.server = server
     
     def buildProtocol(self, addr):
-        return VNCAuth(self.logging, self.server)
+        return VNCAuth(self.server)
 
diff --git a/code/vncproxy.py b/code/vncproxy.py
index 310b8b5..c40570d 100755
--- a/code/vncproxy.py
+++ b/code/vncproxy.py
@@ -8,6 +8,5 @@ sslContext = ssl.DefaultOpenSSLContextFactory(
 )
 
 if '__main__' == __name__:
-    reactor.listenSSL(10003,vncexternalauth.VNCAuthFactory("./vncauth.log", "localhost"), contextFactory=sslContext)
-    #reactor.listenTCP(10003,vncexternalauth.VNCAuthFactory("./vncauth.log", "localhost"))
+    reactor.listenSSL(10003,vncexternalauth.VNCAuthFactory("localhost"), contextFactory=sslContext)
     reactor.run()