X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Ftun.py;h=06e30b12d20059f4bab4a83d5b8a479c7ce8048d;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=96317e72bfefea8fca6cf630213dc967ae61cf9d;hpb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;p=nepi.git

diff --git a/src/nepi/resources/linux/tun.py b/src/nepi/resources/linux/tun.py
index 96317e72..06e30b12 100644
--- 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
@@ -26,22 +25,12 @@ import os
 class LinuxTun(LinuxTap):
     _rtype = "linux::Tun"
     _help = "Creates a TUN device on a Linux host"
-    _backend = "linux"
 
     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_prefix(self):
-        return "tun"
-