import os.path
import random
import ipaddr
+import functools
import tunproto
class _CrossIface(object):
- def __init__(self, proto, addr, port):
+ def __init__(self, proto, addr, port, cipher):
self.tun_proto = proto
self.tun_addr = addr
self.tun_port = port
+ self.tun_cipher = cipher
# Cannot access cross peers
self.peer_proto_impl = None
self.__class__.__name__,
( self.tun_proto,
self.tun_addr,
- self.tun_port )
+ self.tun_port,
+ self.tun_cipher )
)
__repr__ = __str__
self.netmask = None
self.up = None
- self.device_name = None
self.mtu = None
self.snat = False
self.txqueuelen = None
self.pointopoint = None
+ self.multicast = False
+ self.bwlimit = None
# Enabled traces
self.capture = False
# These get initialized when the iface is connected to its node
self.node = None
+ # These get initialized when the iface is connected to any filter
+ self.filter_module = None
+ self.multicast_forwarder = None
+
# These get initialized when the iface is configured
self.external_iface = None
# They're part of the TUN standard attribute set
self.tun_port = None
self.tun_addr = None
+ self.tun_cipher = "AES"
# These get initialized when the iface is connected to its peer
self.peer_iface = None
self.peer_addr = None
self.peer_port = None
self.peer_proto_impl = None
+ self._delay_recover = False
# same as peer proto, but for execute-time standard attribute lookups
self.tun_proto = None
if pointopoint:
prefix = 32
- dest, destprefix, nexthop = route
+ dest, destprefix, nexthop, metric = route
myNet = ipaddr.IPNetwork("%s/%d" % (addr, prefix))
gwIp = ipaddr.IPNetwork(nexthop)
if (self.address or self.netprefix or self.netmask) is not None:
raise RuntimeError, "Cannot add more than one address to %s interfaces" % (self._KIND,)
if broadcast:
- raise ValueError, "%s interfaces cannot broadcast in PlanetLab" % (self._KIND,)
+ raise ValueError, "%s interfaces cannot broadcast in PlanetLab (%s)" % (self._KIND,broadcast)
self.address = address
self.netprefix = netprefix
raise RuntimeError, "Unsupported tunnelling protocol: %s" % (self.peer_proto,)
if not self.address or not self.netprefix or not self.netmask:
raise RuntimeError, "Misconfigured %s iface - missing address" % (self._KIND,)
+ if self.filter_module and self.peer_proto not in ('udp','tcp',None):
+ raise RuntimeError, "Miscofnigured TUN: %s - filtered tunnels only work with udp or tcp links" % (self,)
+ if self.tun_cipher != 'PLAIN' and self.peer_proto not in ('udp','tcp',None):
+ raise RuntimeError, "Miscofnigured TUN: %s - ciphered tunnels only work with udp or tcp links" % (self,)
- def _impl_instance(self, home_path, listening):
+ def _impl_instance(self, home_path):
impl = self._PROTO_MAP[self.peer_proto](
- self, self.peer_iface, home_path, self.tun_key, listening)
+ self, self.peer_iface, home_path, self.tun_key)
impl.port = self.tun_port
+ impl.cross_slice = not self.peer_iface or isinstance(self.peer_iface, _CrossIface)
return impl
- def prepare(self, home_path, listening):
- if not self.peer_iface and (self.peer_proto and (listening or (self.peer_addr and self.peer_port))):
+ def recover(self):
+ if self.peer_proto:
+ self.peer_proto_impl = self._impl_instance(
+ self._home_path,
+ False) # no way to know, no need to know
+ self.peer_proto_impl.recover()
+ else:
+ self._delay_recover = True
+
+ def prepare(self, home_path):
+ if not self.peer_iface and (self.peer_proto and self.peer_addr and self.peer_port):
# Ad-hoc peer_iface
self.peer_iface = _CrossIface(
self.peer_proto,
self.peer_addr,
- self.peer_port)
+ self.peer_port,
+ self.peer_cipher)
if self.peer_iface:
if not self.peer_proto_impl:
- self.peer_proto_impl = self._impl_instance(home_path, listening)
- self.peer_proto_impl.prepare()
+ self.peer_proto_impl = self._impl_instance(home_path)
+ if self._delay_recover:
+ self.peer_proto_impl.recover()
- def setup(self):
+ def launch(self):
if self.peer_proto_impl:
- self.peer_proto_impl.setup()
+ self.peer_proto_impl.launch()
def cleanup(self):
if self.peer_proto_impl:
self.peer_proto_impl.destroy()
self.peer_proto_impl = None
- def async_launch_wait(self):
+ def wait(self):
if self.peer_proto_impl:
- self.peer_proto_impl.async_launch_wait()
+ self.peer_proto_impl.wait()
- def sync_trace(self, local_dir, whichtrace):
+ def sync_trace(self, local_dir, whichtrace, tracemap = None):
if self.peer_proto_impl:
- return self.peer_proto_impl.sync_trace(local_dir, whichtrace)
+ return self.peer_proto_impl.sync_trace(local_dir, whichtrace,
+ tracemap)
else:
return None
- def remote_trace_path(self, whichtrace):
+ def remote_trace_path(self, whichtrace, tracemap = None):
if self.peer_proto_impl:
- return self.peer_proto_impl.remote_trace_path(whichtrace)
+ return self.peer_proto_impl.remote_trace_path(whichtrace, tracemap)
else:
return None
+ def remote_trace_name(self, whichtrace):
+ return whichtrace
+
class TapIface(TunIface):
_PROTO_MAP = tunproto.TAP_PROTO_MAP
_KIND = 'TAP'
options = ' '.join(options)
return (scope,options)
+
+ def recover(self):
+ # Rules are safe on their nodes
+ self.configured = True
def configure(self):
# set up rule
return local_path
+class TunFilter(object):
+ _TRACEMAP = {
+ # tracename : (remotename, localname)
+ }
+
+ def __init__(self, api=None):
+ if not api:
+ api = plcapi.PLCAPI()
+ self._api = api
+
+ # Attributes
+ self.module = None
+ self.args = None
+
+ # These get initialised when the filter is connected
+ self.peer_guid = None
+ self.peer_proto = None
+ self.iface_guid = None
+ self.peer = None
+ self.iface = None
+
+ def _get(what, self):
+ wref = self.iface
+ if wref:
+ wref = wref()
+ if wref:
+ return getattr(wref, what)
+ else:
+ return None
+
+ def _set(what, self, val):
+ wref = self.iface
+ if wref:
+ wref = wref()
+ if wref:
+ setattr(wref, what, val)
+
+ tun_proto = property(
+ functools.partial(_get, 'tun_proto'),
+ functools.partial(_set, 'tun_proto') )
+ tun_addr = property(
+ functools.partial(_get, 'tun_addr'),
+ functools.partial(_set, 'tun_addr') )
+ tun_port = property(
+ functools.partial(_get, 'tun_port'),
+ functools.partial(_set, 'tun_port') )
+ tun_key = property(
+ functools.partial(_get, 'tun_key'),
+ functools.partial(_set, 'tun_key') )
+ tun_cipher = property(
+ functools.partial(_get, 'tun_cipher'),
+ functools.partial(_set, 'tun_cipher') )
+
+ del _get
+ del _set
+
+ def remote_trace_path(self, whichtrace):
+ iface = self.iface()
+ if iface is not None:
+ return iface.remote_trace_path(whichtrace, self._TRACEMAP)
+ return None
+
+ def remote_trace_name(self, whichtrace):
+ iface = self.iface()
+ if iface is not None:
+ return iface.remote_trace_name(whichtrace, self._TRACEMAP)
+ return None
+
+ def sync_trace(self, local_dir, whichtrace):
+ iface = self.iface()
+ if iface is not None:
+ return iface.sync_trace(local_dir, whichtrace, self._TRACEMAP)
+ return None
+
+class ClassQueueFilter(TunFilter):
+ _TRACEMAP = {
+ # tracename : (remotename, localname)
+ 'dropped_stats' : ('dropped_stats', 'dropped_stats')
+ }
+
+ def __init__(self, api=None):
+ super(ClassQueueFilter, self).__init__(api)
+ # Attributes
+ self.module = "classqueue.py"
+
+class ToSQueueFilter(TunFilter):
+ def __init__(self, api=None):
+ super(ToSQueueFilter, self).__init__(api)
+ # Attributes
+ self.module = "tosqueue.py"
+
git://git.onelab.eu / nepi.git / blobdiff