From: Tony Mack <tmack@cs.princeton.edu>
Date: Mon, 23 Nov 2009 01:36:21 +0000 (+0000)
Subject: get the correct remote address
X-Git-Tag: sfa-0.9-7~297
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0c6023e62354f978eceebede563568f2ff271013;p=sfa.git

get the correct remote address
---

diff --git a/sfa/util/geniserver.py b/sfa/util/geniserver.py
index 57d97eb6..01c68647 100644
--- a/sfa/util/geniserver.py
+++ b/sfa/util/geniserver.py
@@ -158,12 +158,16 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             # check to see if a subclass implements _dispatch and dispatch
             # using that method if present.
             #response = self.server._marshaled_dispatch(request, getattr(self, '_dispatch', None))
-            # XX TODO: Need to get the real remote address 
-            source = None
-            response = self.api.handle(source, request)
+            # XX TODO: Need to get the real remote address
+            remote_addr = (remote_ip, remote_port) = self.connection.getpeername()
+            self.api.remote_addr = remote_addr
+            #remote_addr = (self.rfile.connection.remote_ip, remote_port)
+            #self.api.remote_addr = remote_addr
+            response = self.api.handle(remote_addr, request)
 
         
         except Exception, fault:
+            raise
             # This should only happen if the module is buggy
             # internal error, report as HTTP server error
             self.send_response(500)