From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Sun, 9 Oct 2011 05:45:17 +0000 (+0200)
Subject: Make restreamers listen on all interfaces
X-Git-Tag: nepi-3.0.0~165
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f5773e2064c5e0a8af16a3974228ce4bec04da32;p=nepi.git

Make restreamers listen on all interfaces
---

diff --git a/examples/Multicast/multicast_experiment.py b/examples/Multicast/multicast_experiment.py
index 7b0daae3..b54157ae 100644
--- a/examples/Multicast/multicast_experiment.py
+++ b/examples/Multicast/multicast_experiment.py
@@ -171,11 +171,11 @@ class PlanetLabMulticastOverlay:
         app.set_attribute_value("label","vlc_restreamer_%d" % (node.guid,))
         app.set_attribute_value("command",
             "sudo -S dbus-uuidgen --ensure ; "
-            "while true ; do if "
+            "while true ; do "
             "vlc -vvv -I dummy"
             " udp/ts://@239.255.12.42"
-            " --sout '#std{access=http,mux=ts,dst="+hostname+":8080}'"
-            " ; then break ; else sleep 5 ; fi ; done ")
+            " --sout '#std{access=http,mux=ts,dst=:8080}'"
+            " ; sleep 5 ; done ")
         return app
     
     def add_vlc_dumper(self, pl, node, hostname=None, labelprefix = "vlc_dumper", precmd = "sleep 5 ; "):
@@ -187,11 +187,12 @@ class PlanetLabMulticastOverlay:
         app.set_attribute_value("command",
             precmd+
             "sudo -S dbus-uuidgen --ensure ; "
-            "while true ; do if "
+            "cat /dev/null > {#["+mylabel+"].trace[output].[name]#} ; "
+            "while [[ $(stat -c '%s' {#["+mylabel+"].trace[output].[name]#}) == '0' ]] ; do "
             "vlc -vvv -I dummy"
-            " http://"+hostname+":8080"
+            " http://"+hostname+":8080 vlc://quit"
             " --sout '#std{access=file,mux=ts,dst={#["+mylabel+"].trace[output].[name]#}}'"
-            " ; then break ; else sleep 5 ; fi ; done ")
+            " ; sleep 5 ; done ")
         app.enable_trace("output")
         return app
     
@@ -612,7 +613,7 @@ class PlanetLabMulticastOverlay:
                 prefix = 30)
             
             self.add_vlc_dumper(pl, pl_nodei,
-                hostname = pl_addr2,
+                hostname = pl_addr,
                 labelprefix = "vlc_dumper_ns",
                 precmd = "sleep 15 ; ")
 
diff --git a/src/nepi/testbeds/planetlab/scripts/tun_connect.py b/src/nepi/testbeds/planetlab/scripts/tun_connect.py
index 747b715f..df864af2 100644
--- a/src/nepi/testbeds/planetlab/scripts/tun_connect.py
+++ b/src/nepi/testbeds/planetlab/scripts/tun_connect.py
@@ -730,7 +730,7 @@ try:
                         traceback.print_exc(file=sys.stderr)
                 
                 mcfwd_queue.task_done()
-        mcfwd_thread = threading.Thread(target=mcfwd_thread)
+        mcfwd_thread = threading.Thread(target=mcfwd_thread_fn)
         mcfwd_thread.start()
         
         def accept_packet(packet, direction,