Serious refactoring of TUN/TAP and tunnel code. Linux udp/gre tunnels not yet functional

[nepi.git] / src / nepi / resources / planetlab / ns3 / tuntapfdlink.py

diff --git a/src/nepi/resources/planetlab/ns3/tun_tap_fd_link.py b/src/nepi/resources/planetlab/ns3/tuntapfdlink.py
similarity index 81%
rename from src/nepi/resources/planetlab/ns3/tun_tap_fd_link.py
rename to src/nepi/resources/planetlab/ns3/tuntapfdlink.py
index 041e6b8..3f264a5 100644 (file)
--- a/src/nepi/resources/planetlab/ns3/tun_tap_fd_link.py
+++ b/src/nepi/resources/planetlab/ns3/tuntapfdlink.py
@@ -18,7 +18,7 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 from nepi.execution.resource import ResourceState, clsinit_copy
-from nepi.resources.linux.ns3.tun_tap_fd_link import LinuxTunTapFdLink
+from nepi.resources.linux.ns3.tuntapfdlink import LinuxTunTapFdLink
 
 import base64
 import fcntl
@@ -77,9 +77,10 @@ class PlanetlabTunTapFdLink(LinuxTunTapFdLink):
 
         # vif-passfd python script
         pl_vif_passfd = os.path.join(os.path.dirname(__file__), 
-                "..",
+                "..", "..",
+                "linux",
                 "scripts",
-                "pl-vif-passfd.py")
+                "linux-tap-passfd.py")
 
         scripts.append(pl_vif_passfd)
         
@@ -90,20 +91,3 @@ class PlanetlabTunTapFdLink(LinuxTunTapFdLink):
                 os.path.join(self.node.src_dir),
                 overwrite = False)
 
-    @property
-    def _start_command(self):
-        address = base64.b64encode(self.send_address)
-
-        command = []
-        # Use pl-vif-passfd.py to send fd from TAP to FdNetDevice
-        command.append("sudo -S")
-        command.append("PYTHONPATH=$PYTHONPATH:${SRC}")
-        command.append("python ${SRC}/pl-vif-passfd.py")
-        command.append("-a %s" % address)
-        command.append("-S %s " % self.tap.sock_name)
-
-        command = " ".join(command)
-        command = self.replace_paths(command)
-
-        return command
-