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

(-)a/src/devices/tap-bridge/tap-bridge.cc (-4 / +5 lines)
 Lines 329-334    Link Here 
329
  //
329
  //
330
  std::string path = TapBufferToString((uint8_t *)&un, len);
330
  std::string path = TapBufferToString((uint8_t *)&un, len);
331
  NS_LOG_INFO ("Encoded Unix socket as \"" << path << "\"");
331
  NS_LOG_INFO ("Encoded Unix socket as \"" << path << "\"");
332
333
  Ptr<NetDevice> nd = GetBridgedNetDevice ();
334
  Ptr<Node> n = nd->GetNode ();
335
  Ptr<Ipv4> ipv4 = n->GetObject<Ipv4> ();
336
332
  //
337
  //
333
  // Fork and exec the process to create our socket.  If we're us (the parent)
338
  // Fork and exec the process to create our socket.  If we're us (the parent)
334
  // we wait for the child (the creator) to complete and read the socket it 
339
  // we wait for the child (the creator) to complete and read the socket it 
 Lines 368-377    Link Here 
368
373
369
      bool wantIp = (m_mode == CONFIGURE_LOCAL);
374
      bool wantIp = (m_mode == CONFIGURE_LOCAL);
370
375
371
      Ptr<NetDevice> nd = GetBridgedNetDevice ();
372
      Ptr<Node> n = nd->GetNode ();
373
      Ptr<Ipv4> ipv4 = n->GetObject<Ipv4> ();
374
375
      if (wantIp
376
      if (wantIp
376
            && (ipv4 == 0)
377
            && (ipv4 == 0)
377
            && m_tapIp.IsBroadcast ()
378
            && m_tapIp.IsBroadcast ()

Return to bug 816