*** ns-allinone-3.10/ns-3.10/src/routing/olsr/model/olsr-routing-protocol.cc	2011-01-05 21:02:29.000000000 -0800
--- ns-allinone-3.10-pisa/ns-3.10/src/routing/olsr/model/olsr-routing-protocol.cc	2011-01-11 15:13:53.107685012 -0800
***************
*** 316,332 ****
          continue;
  
        // Create a socket to listen only on this interface
!       Ptr<Socket> socket = Socket::CreateSocket (GetObject<Node> (), 
!                                                  UdpSocketFactory::GetTypeId());
        socket->SetAllowBroadcast (true);
-       InetSocketAddress inetAddr (m_ipv4->GetAddress (i, 0).GetLocal (), OLSR_PORT_NUMBER);
-       socket->SetRecvCallback (MakeCallback (&RoutingProtocol::RecvOlsr,  this));
-       if (socket->Bind (inetAddr))
-         {
-           NS_FATAL_ERROR ("Failed to bind() OLSR socket");
-         }
        m_socketAddresses[socket] = m_ipv4->GetAddress (i, 0);
! 
        canRunOlsr = true;
      }
  
--- 316,328 ----
          continue;
  
        // Create a socket to listen only on this interface
!       Ptr<Socket> socket = Socket::CreateSocket (GetObject<Node> (), UdpSocketFactory::GetTypeId ());
!       socket->SetRecvCallback (MakeCallback (&RoutingProtocol::RecvOlsr, this));
!       socket->BindToNetDevice (m_ipv4->GetNetDevice (i));
!       socket->Bind (InetSocketAddress (m_ipv4->GetAddress (i, 0).GetLocal (), OLSR_PORT_NUMBER));
        socket->SetAllowBroadcast (true);
        m_socketAddresses[socket] = m_ipv4->GetAddress (i, 0);
!       
        canRunOlsr = true;
      }