Merging with HEAD

Fixing a few thingies in tunproto

diff --cc src/nepi/testbeds/planetlab/tunproto.py
index df23a7b,df23a7b..0ea63b9
--- 1/src/nepi/testbeds/planetlab/tunproto.py
--- 2/src/nepi/testbeds/planetlab/tunproto.py
+++ b/src/nepi/testbeds/planetlab/tunproto.py
@@@ -425,6 -425,6 +425,11 @@@ class TunProtoUDP(TunProtoBase)
      def shutdown(self):
          self.kill()
  
++    def launch(self, check_proto='udp', listen=False, extra_args=None):
++        if extra_args is None:
++            extra_args = ("-u",str(self.port))
++        super(TunProtoUDP, self).launch(check_proto, listen, extra_args)
++
  class TunProtoFD(TunProtoBase):
      def __init__(self, local, peer, home_path, key, listening):
          super(TunProtoFD, self).__init__(local, peer, home_path, key)
@@@ -439,6 -439,6 +444,9 @@@
      def shutdown(self):
          self.kill()
  
++    def launch(self, check_proto='fd', listen=False, extra_args=[]):
++        super(TunProtoFD, self).launch(check_proto, listen, extra_args)
++
  class TunProtoTCP(TunProtoBase):
      def __init__(self, local, peer, home_path, key, listening):
          super(TunProtoTCP, self).__init__(local, peer, home_path, key)
@@@ -466,6 -466,6 +474,11 @@@
      def shutdown(self):
          self.kill()
  
++    def launch(self, check_proto='tcp', listen=None, extra_args=[]):
++        if listen is None:
++            listen = self.listening
++        super(TunProtoTCP, self).launch(check_proto, listen, extra_args)
++
  class TapProtoUDP(TunProtoUDP):
      def __init__(self, local, peer, home_path, key, listening):
          super(TapProtoUDP, self).__init__(local, peer, home_path, key, listening)