FdNetDevice working with PlanetLab TAPs

[nepi.git] / src / nepi / resources / planetlab / scripts / pl-vif-passfd.py

diff --git a/src/nepi/resources/planetlab/scripts/pl-vif-passfd.py b/src/nepi/resources/planetlab/scripts/pl-vif-passfd.py
index f1f3ce5..6332362 100644 (file)
--- a/src/nepi/resources/planetlab/scripts/pl-vif-passfd.py
+++ b/src/nepi/resources/planetlab/scripts/pl-vif-passfd.py
@@ -21,20 +21,20 @@ def get_options():
 
     (options, args) = parser.parse_args()
        
-    return (options.address, options.fd_socket_name)
+    return (options.address, options.vif_socket)
 
 if __name__ == '__main__':
 
-    (address, socket_name) = get_options()
+    (address, vif_socket) = get_options()
   
     # This script sends a message (PASSFD_MSG) to the process that created 
     # the TUN/TAP device to request that it sens the file descriptor associated
     # to the TUN/TAP to another process. The other process is waiting for
     # the file descriptor on 'address'
     sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    sock.connect(socket_name)
+    sock.connect(vif_socket)
     emsg = base64.b64encode(PASSFD_MSG)
-    eargs = base64.b64encode(address)
+    eargs = address
     encoded = "%s|%s\n" % (emsg, eargs)
     sock.send(encoded)