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

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

diff --git a/src/nepi/resources/linux/tun.py b/src/nepi/resources/linux/tun.py
index 22a5dea..0a44800 100644 (file)
--- a/src/nepi/resources/linux/tun.py
+++ b/src/nepi/resources/linux/tun.py
@@ -29,22 +29,9 @@ class LinuxTun(LinuxTap):
 
     def __init__(self, ec, guid):
         super(LinuxTun, 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"
-
-    @property
-    def vif_type_flag(self):
-        return LinuxTap.IFF_TAP
-
-    @property
-    def vif_prefix(self):
-        return "tun"
-