use print() - import print_function - should be fine for both py2 and py3

[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..06e30b1 100644 (file)
--- a/src/nepi/resources/linux/tun.py
+++ b/src/nepi/resources/linux/tun.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,22 +28,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"
-