Attachment #1037 for bug #1058

View | Details | Raw Unified | Return to bug 1058
Collapse All | Expand All

(-)a/examples/mpi/nms-p2p-nix-distributed.cc (-1 / +1 lines)

Lines 135-141	Link Here

135

136

  if (nix)

136

  if (nix)

137

138

      stack.SetRoutingHelper (list);

138

      stack.SetRoutingHelper (list); // has effect on the next Install()

139

140

141

  // Create Campus Networks

141

  // Create Campus Networks

(-)a/examples/mpi/simple-distributed.cc (-1 / +1 lines)

Lines 150-156	Link Here

150

151

  if (nix)

151

  if (nix)

152

153

      stack.SetRoutingHelper (list);

153

      stack.SetRoutingHelper (list); // has effect on the next Install()

154

155

156

  stack.InstallAll ();

156

  stack.InstallAll ();

(-)a/examples/routing/aodv.cc (-1 / +1 lines)

Lines 192-198	Link Here

192

  AodvHelper aodv;

192

  AodvHelper aodv;

193

  // you can configure AODV attributes here using aodv.Set(name, value)

193

  // you can configure AODV attributes here using aodv.Set(name, value)

194

  InternetStackHelper stack;

194

  InternetStackHelper stack;

195

  stack.SetRoutingHelper (aodv);

195

  stack.SetRoutingHelper (aodv); // has effect on the next Install()

196

  stack.Install (nodes);

196

  stack.Install (nodes);

197

  Ipv4AddressHelper address;

197

  Ipv4AddressHelper address;

198

  address.SetBase ("10.0.0.0", "255.0.0.0");

198

  address.SetBase ("10.0.0.0", "255.0.0.0");

(-)a/examples/routing/global-injection-slash32.cc (-1 / +1 lines)

Lines 68-74	Link Here

  Ipv4ListRoutingHelper staticonly;

  Ipv4ListRoutingHelper staticonly;

  Ipv4ListRoutingHelper staticRouting;

  Ipv4ListRoutingHelper staticRouting;

  staticonly.Add(staticRouting, 0);

  staticonly.Add(staticRouting, 0);

  internet.SetRoutingHelper(staticonly);

  internet.SetRoutingHelper(staticonly); // has effect on the next Install()

  internet.Install(NodeContainer(nC));

  internet.Install(NodeContainer(nC));

  // We create the channels first without any IP addressing information

  // We create the channels first without any IP addressing information

(-)a/examples/routing/nix-simple.cc (-1 / +1 lines)

Lines 73-79	Link Here

  list.Add (nixRouting, 10);

  list.Add (nixRouting, 10);

  InternetStackHelper stack;

  InternetStackHelper stack;

  stack.SetRoutingHelper (list);

  stack.SetRoutingHelper (list); // has effect on the next Install()

  stack.Install (allNodes);

  stack.Install (allNodes);

  NetDeviceContainer devices12;

  NetDeviceContainer devices12;

(-)a/examples/routing/nms-p2p-nix.cc (-1 / +1 lines)

Lines 117-123	Link Here

117

118

  if (nix)

118

  if (nix)

119

120

      stack.SetRoutingHelper (list);

120

      stack.SetRoutingHelper (list);  // has effect on the next Install()

121

122

123

  // Create Campus Networks

123

  // Create Campus Networks

(-)a/examples/topology-read/topology-example-sim.cc (-1 / +1 lines)

Lines 110-116	Link Here

110

  listRH.Add (staticRouting, 0);

110

  listRH.Add (staticRouting, 0);

111

  listRH.Add (nixRouting, 10);

111

  listRH.Add (nixRouting, 10);

112

113

  stack.SetRoutingHelper (listRH);

113

  stack.SetRoutingHelper (listRH); // has effect on the next Install()

114

  stack.Install (nodes);

114

  stack.Install (nodes);

115

116

  NS_LOG_INFO ("creating ip4 addresses");

116

  NS_LOG_INFO ("creating ip4 addresses");

(-)a/examples/wireless/mixed-wireless.cc (-1 / +1 lines)

Lines 161-167	Link Here

161

  // Add the IPv4 protocol stack to the nodes in our container

161

  // Add the IPv4 protocol stack to the nodes in our container

162

//

162

//

163

  InternetStackHelper internet;

163

  InternetStackHelper internet;

164

  internet.SetRoutingHelper (olsr);

164

  internet.SetRoutingHelper (olsr); // has effect on the next Install()

165

  internet.Install (backbone);

165

  internet.Install (backbone);

166

167

  // re-initialize for non-olsr routing.

167

  // re-initialize for non-olsr routing.

(-)a/examples/wireless/mixed-wireless.py (-1 / +1 lines)

Lines 128-134	Link Here

128

    print "Enabling OLSR routing on all backbone nodes"

128

    print "Enabling OLSR routing on all backbone nodes"

129

    internet = ns3.InternetStackHelper()

129

    internet = ns3.InternetStackHelper()

130

    olsr = ns3.OlsrHelper()

130

    olsr = ns3.OlsrHelper()

131

    internet.SetRoutingHelper(olsr);

131

    internet.SetRoutingHelper(olsr); # has effect on the next Install()

132

    internet.Install(backbone);

132

    internet.Install(backbone);

133

    # re-initialize for non-olsr routing.

133

    # re-initialize for non-olsr routing.

134

    internet.Reset()

134

    internet.Reset()

(-)a/examples/wireless/multirate.cc (-1 / +1 lines)

Lines 382-388	Link Here

382

383

  if (enableRouting)

383

  if (enableRouting)

384

385

      internet.SetRoutingHelper(list);

385

      internet.SetRoutingHelper(list); // has effect on the next Install()

386

387

  internet.Install (c);

387

  internet.Install (c);

388

(-)a/examples/wireless/wifi-simple-adhoc-grid.cc (-1 / +1 lines)

Lines 198-204	Link Here

198

  list.Add (olsr, 10);

198

  list.Add (olsr, 10);

199

200

  InternetStackHelper internet;

200

  InternetStackHelper internet;

201

  internet.SetRoutingHelper (list);

201

  internet.SetRoutingHelper (list); // has effect on the next Install()

202

  internet.Install (c);

202

  internet.Install (c);

203

204

  Ipv4AddressHelper ipv4;

204

  Ipv4AddressHelper ipv4;

(-)a/src/routing/dsdv/examples/dsdv-manet.cc (-1 / +1 lines)

Lines 284-290	Link Here

284

  dsdv.Set ("PeriodicUpdateInterval", TimeValue (Seconds (m_periodicUpdateInterval)));

284

  dsdv.Set ("PeriodicUpdateInterval", TimeValue (Seconds (m_periodicUpdateInterval)));

285

  dsdv.Set ("SettlingTime", TimeValue (Seconds (m_settlingTime)));

285

  dsdv.Set ("SettlingTime", TimeValue (Seconds (m_settlingTime)));

286

  InternetStackHelper stack;

286

  InternetStackHelper stack;

287

  stack.SetRoutingHelper (dsdv);

287

  stack.SetRoutingHelper (dsdv); // has effect on the next Install()

288

  stack.Install (nodes);

288

  stack.Install (nodes);

289

  Ipv4AddressHelper address;

289

  Ipv4AddressHelper address;

290

  address.SetBase ("10.1.1.0", "255.255.255.0");

290

  address.SetBase ("10.1.1.0", "255.255.255.0");

(-)a/src/routing/olsr/examples/olsr-hna.cc (-1 / +1 lines)

Lines 190-196	Link Here

190

  list.Add (olsr, 10);

190

  list.Add (olsr, 10);

191

192

  InternetStackHelper internet_olsr;

192

  InternetStackHelper internet_olsr;

193

  internet_olsr.SetRoutingHelper (list);

193

  internet_olsr.SetRoutingHelper (list); // has effect on the next Install()

194

  internet_olsr.Install (olsrNodes);

194

  internet_olsr.Install (olsrNodes);

195

196

  InternetStackHelper internet_csma;

196

  InternetStackHelper internet_csma;

(-)a/src/routing/olsr/examples/simple-point-to-point-olsr.cc (-1 / +1 lines)

Lines 94-100	Link Here

  list.Add (olsr, 10);

  list.Add (olsr, 10);

  InternetStackHelper internet;

  InternetStackHelper internet;

  internet.SetRoutingHelper (list);

  internet.SetRoutingHelper (list); // has effect on the next Install()

  internet.Install (c);

  internet.Install (c);

100

  // We create the channels first without any IP addressing information

100

  // We create the channels first without any IP addressing information

Return to bug 1058