changed examples/wireless_overlay.py

diff --git a/examples/wireless_overlay.py b/examples/wireless_overlay.py
index 73e0a68..81a2341 100644 (file)
--- a/examples/wireless_overlay.py
+++ b/examples/wireless_overlay.py
@@ -191,6 +191,8 @@ class WirelessOverlay(object):
         iface.set_attribute_value("label", label_prefix+"iface")
         iface.connector("inet").connect(inet.connector("devs"))
         node.connector("devs").connect(iface.connector("node"))
+        forwarder = pl_desc.create("MulticastForwarder")
+        node.connector("apps").connect(forwarder.connector("node"))
         return node, iface
 
     def add_ns3_in_pl(self, exp_desc, pl_desc, pl_node, pl_iface, root):
@@ -265,6 +267,7 @@ class WirelessOverlay(object):
             netns_desc, netns_node, netns_addr):
         pl_tap = pl_desc.create("TunInterface")
         pl_tap.set_attribute_value("tun_cipher", "PLAIN") 
+        pl_tap.set_attribute_value("multicast", True) 
         #pl_tap.enable_trace("pcap")
         #pl_tap.enable_trace("packets")
         self.add_ip_address(pl_tap, pl_addr, 30)
@@ -356,7 +359,8 @@ class WirelessOverlay(object):
         app.set_attribute_value("command", command)
         app.set_attribute_value("user", self.user)
         app.connector("node").connect(netns_node.connector("apps"))
-        
+
+        """
         # applications
         #target = "{#[%s].addr[0].[Address]#}" % label
         servers = []
@@ -364,6 +368,7 @@ class WirelessOverlay(object):
         net = 0
         target = self.base_addr%2
         port = 5065
+        # vlc -vvv -I dummy /home/alina/repos/nepi/examples/big_buck_bunny_240p_mpeg4.ts --miface-addr '192.168.4.1'  --sout '#udp{dst=239.255.12.42}'
         command = "sleep 2; vlc -I dummy %s --sout '#udp{dst=%s:%d}' vlc://quit" \
             % (self.movie, target, port)
         vlc_server = netns_desc.create("Application")
@@ -372,6 +377,7 @@ class WirelessOverlay(object):
         vlc_server.connector("node").connect(netns_node.connector("apps"))
         servers.append(vlc_server.guid)
 
+        # vlc -vvv -I dummy udp://@239.255.12.42 --sout '#std{access=file,mux=ts,dst=coco.ts}'
         command = "sudo dbus-uuidgen --ensure; vlc -vvv -I dummy udp://@%s:%d --sout '#std{access=file,mux=ts,dst=big_buck_bunny_stream.ts}' "  % (target, port)
         vlc_client = pl_desc.create("Application")
         vlc_client.set_attribute_value("buildDepends", "vlc")
@@ -381,6 +387,7 @@ class WirelessOverlay(object):
         vlc_client.enable_trace("stderr")
         vlc_client.connector("node").connect(pl_node1.connector("apps"))
         clients.append(vlc_client.guid)
+        """
 
         """
         # ROUTES