git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor changes to examples/ccn_flooding/dce.py
[nepi.git]
/
examples
/
ccn_flooding
/
dce.py
diff --git
a/examples/ccn_flooding/dce.py
b/examples/ccn_flooding/dce.py
index
40c9150
..
3386e79
100644
(file)
--- a/
examples/ccn_flooding/dce.py
+++ b/
examples/ccn_flooding/dce.py
@@
-34,8
+34,6
@@
content_name = "ccnx:/test/bunny.ts"
STOP_TIME = "5000s"
STOP_TIME = "5000s"
-operating_system = "f14"
-
repofile = os.path.join(
os.path.dirname(os.path.realpath(__file__)), "repoFile1.0.8.2")
repofile = os.path.join(
os.path.dirname(os.path.realpath(__file__)), "repoFile1.0.8.2")
@@
-150,6
+148,7
@@
def add_dce_net_iface(ec, nid1, nid2):
prefix = net["prefix"]
dev = ec.register_resource("ns3::PointToPointNetDevice")
prefix = net["prefix"]
dev = ec.register_resource("ns3::PointToPointNetDevice")
+ ec.set(dev,"DataRate", "5Mbps")
ec.set(dev, "ip", ip1)
ec.set(dev, "prefix", prefix)
ec.register_connection(host, dev)
ec.set(dev, "ip", ip1)
ec.set(dev, "prefix", prefix)
ec.register_connection(host, dev)
@@
-196,7
+195,7
@@
def add_dce_edge(ec, nid1, nid2):
p2p1 = add_dce_net_iface(ec, nid1, nid2)
p2p2 = add_dce_net_iface(ec, nid2, nid1)
p2p1 = add_dce_net_iface(ec, nid1, nid2)
p2p2 = add_dce_net_iface(ec, nid2, nid1)
- # Create point to poin
g
link between interfaces
+ # Create point to poin
t
link between interfaces
chan = ec.register_resource("ns3::PointToPointChannel")
ec.set(chan, "Delay", "0ms")
chan = ec.register_resource("ns3::PointToPointChannel")
ec.set(chan, "Delay", "0ms")