From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 30 May 2011 14:46:20 +0000 (+0200)
Subject: Merging with HEAD
X-Git-Tag: nepi_v2_1~50
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=152fd56d074ae6c2dbbe205bbfacf66fa3dfa63a;p=nepi.git

Merging with HEAD
Fixing a few thingies in tunproto
---

152fd56d074ae6c2dbbe205bbfacf66fa3dfa63a
diff --cc src/nepi/testbeds/planetlab/tunproto.py
index df23a7bd,df23a7bd..0ea63b92
--- a/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)