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

[nepi.git] / src / nepi / resources / planetlab / tun.py

diff --git a/src/nepi/resources/planetlab/tun.py b/src/nepi/resources/planetlab/tun.py
index c5d5687..acd20e9 100644 (file)
--- a/src/nepi/resources/planetlab/tun.py
+++ b/src/nepi/resources/planetlab/tun.py
@@ -19,6 +19,7 @@
 
 from nepi.execution.resource import clsinit_copy
 from nepi.resources.planetlab.tap import PlanetlabTap
+from nepi.resources.linux.tap import LinuxTap
 
 import os
 
@@ -30,14 +31,9 @@ class PlanetlabTun(PlanetlabTap):
 
     def __init__(self, ec, guid):
         super(PlanetlabTun, self).__init__(ec, guid)
-        self._home = "tun-%s" % self.guid
-
-    @property
-    def sock_name(self):
-        return os.path.join(self.run_home, "tun.sock")
+        self._vif_prefix = "tun"
+        self._vif_type = "IFF_TUN"
+        self._vif_type_flag = LinuxTap.IFF_TUN
+        self._home = "%s-%s" % (self.vif_prefix, self.guid)
     
-    @property
-    def vif_type(self):
-        return "IFF_TUN"
-