Attachment #2888 for bug #2762

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

(-)a/CHANGES.html (+5 lines)

Lines 130-135	Link Here

130

    <b>Previously, a socket bound to an unicast address received also subnet-directed broadcast packets.

130

    <b>Previously, a socket bound to an unicast address received also subnet-directed broadcast packets.

131

    This is not anymore possible</b>.

131

    This is not anymore possible</b>.

132

</li>

132

</li>

133

<li>You can now Bind as many socket as you want to an address/port, provided that they are bound to different NetDevices.

134

    Moreover, BindToNetDevice does not anymore call Bind. In other terms, Bind and BindToNetDevice can be called

135

    in any order.

136

    However, it is suggested to use BindToNetDevice <i>before</i> Bind in order to avoid conflicts.

137

</li>

133

</ul>

138

</ul>

134

<h2>Changes to build system:</h2>

139

<h2>Changes to build system:</h2>

135

<ul>

140

<ul>




}

bool
Ipv4EndPointDemux::LookupLocal (Ptr<NetDevice> boundNetDevice, Ipv4Address addr, uint16_t port)
{
  NS_LOG_FUNCTION (this << addr << port);
  for (EndPointsI i = m_endPoints.begin (); i != m_endPoints.end (); i++) 
    {
      if ((*i)->GetLocalPort () == port &&
          (*i)->GetLocalAddress () == addr &&
          (*i)->GetBoundNetDevice () == boundNetDevice)
        {
          return true;
        }

}

Ipv4EndPoint *
Ipv4EndPointDemux::Allocate (Ptr<NetDevice> boundNetDevice, uint16_t port)
{
  NS_LOG_FUNCTION (this <<  port << boundNetDevice);

  return Allocate (boundNetDevice, Ipv4Address::GetAny (), port);
}

Ipv4EndPoint *
Ipv4EndPointDemux::Allocate (Ptr<NetDevice> boundNetDevice, Ipv4Address address, uint16_t port)
{
  NS_LOG_FUNCTION (this << address << port << boundNetDevice);
  if (LookupLocal (boundNetDevice, address, port) || LookupLocal (0, address, port))
    {
      NS_LOG_WARN ("Duplicated endpoint.");
      return 0;
    }
  Ipv4EndPoint *endPoint = new Ipv4EndPoint (address, port);

}

Ipv4EndPoint *
Ipv4EndPointDemux::Allocate (Ptr<NetDevice> boundNetDevice,
                             Ipv4Address localAddress, uint16_t localPort,
                             Ipv4Address peerAddress, uint16_t peerPort)
{
  NS_LOG_FUNCTION (this << localAddress << localPort << peerAddress << peerPort << boundNetDevice);
  for (EndPointsI i = m_endPoints.begin (); i != m_endPoints.end (); i++) 
    {
      if ((*i)->GetLocalPort () == localPort &&
          (*i)->GetLocalAddress () == localAddress &&
          (*i)->GetPeerPort () == peerPort &&
          (*i)->GetPeerAddress () == peerAddress &&
          ((*i)->GetBoundNetDevice () == boundNetDevice || (*i)->GetBoundNetDevice () == 0))
        {
          NS_LOG_WARN ("Duplicated endpoint.");
          /* no way we can allocate this end-point. */
          return 0;
        }
    }

    }

  // Here we find the most exact match
  EndPoints retval;
  if (!retval4.empty ()) retval = retval4;
  else if (!retval3.empty ()) retval = retval3;
  else if (!retval2.empty ()) retval = retval2;
  else retval = retval1;

  NS_ABORT_MSG_IF (retval.size () > 1, "Too many endpoints - perhaps you created too many sockets without binding them to different NetDevices.");
  return retval;  // might be empty if no matches
}

Ipv4EndPoint *





  /**
   * \brief Lookup for address and port.
   * \param boundNetDevice Bound NetDevice (if any)
   * \param addr address to test
   * \param port port to test
   * \return true if there is a match in EndPoints, false otherwise
   */
  bool LookupLocal (Ptr<NetDevice> boundNetDevice, Ipv4Address addr, uint16_t port);

  /**
   * \brief lookup for a match with all the parameters.


  /**
   * \brief Allocate a Ipv4EndPoint.
   * \param boundNetDevice Bound NetDevice (if any)
   * \param port local port
   * \return an Ipv4EndPoint instance
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice, uint16_t port);

  /**
   * \brief Allocate a Ipv4EndPoint.
   * \param boundNetDevice Bound NetDevice (if any)
   * \param address local address
   * \param port local port
   * \return an Ipv4EndPoint instance
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice, Ipv4Address address, uint16_t port);

  /**
   * \brief Allocate a Ipv4EndPoint.
   * \param boundNetDevice Bound NetDevice (if any)
   * \param localAddress local address
   * \param localPort local port
   * \param peerAddress peer address
   * \param peerPort peer port
   * \return an Ipv4EndPoint instance
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice,
                          Ipv4Address localAddress, uint16_t localPort,
                          Ipv4Address peerAddress, uint16_t peerPort);
                          uint16_t peerPort);

  /**
   * \brief Remove a end point.




  return false;
}

bool Ipv6EndPointDemux::LookupLocal (Ptr<NetDevice> boundNetDevice, Ipv6Address addr, uint16_t port)
{
  NS_LOG_FUNCTION (this << addr << port);
  for (EndPointsI i = m_endPoints.begin (); i != m_endPoints.end (); i++)
    {
      if ((*i)->GetLocalPort () == port &&
          (*i)->GetLocalAddress () == addr &&
          (*i)->GetBoundNetDevice () == boundNetDevice)
        {
          return true;
        }


Ipv6EndPoint* Ipv6EndPointDemux::Allocate ()
{
  NS_LOG_FUNCTION (this);
  uint16_t port = AllocateEphemeralPort ();
  if (port == 0)
    {

  return endPoint;
}

Ipv6EndPoint* Ipv6EndPointDemux::Allocate (Ptr<NetDevice> boundNetDevice, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << port);

  return Allocate (boundNetDevice, Ipv6Address::GetAny (), port);
}

Ipv6EndPoint* Ipv6EndPointDemux::Allocate (Ptr<NetDevice> boundNetDevice, Ipv6Address address, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << address << port);
  if (LookupLocal (boundNetDevice, address, port) || LookupLocal (0, address, port))
    {
      NS_LOG_WARN ("Duplicated endpoint.");
      return 0;
    }
  Ipv6EndPoint *endPoint = new Ipv6EndPoint (address, port);

  return endPoint;
}

Ipv6EndPoint* Ipv6EndPointDemux::Allocate (Ptr<NetDevice> boundNetDevice,
                                           Ipv6Address localAddress, uint16_t localPort,
                                           Ipv6Address peerAddress, uint16_t peerPort)
{
  NS_LOG_FUNCTION (this << boundNetDevice << localAddress << localPort << peerAddress << peerPort);
  for (EndPointsI i = m_endPoints.begin (); i != m_endPoints.end (); i++)
    {
      if ((*i)->GetLocalPort () == localPort &&
          (*i)->GetLocalAddress () == localAddress &&
          (*i)->GetPeerPort () == peerPort &&
          (*i)->GetPeerAddress () == peerAddress &&
          ((*i)->GetBoundNetDevice () == boundNetDevice || (*i)->GetBoundNetDevice () == 0))
        {
          NS_LOG_WARN ("Duplicated endpoint.");
          /* no way we can allocate this end-point. */
          return 0;
        }
    }


void Ipv6EndPointDemux::DeAllocate (Ipv6EndPoint *endPoint)
{
  NS_LOG_FUNCTION (this);
  for (EndPointsI i = m_endPoints.begin (); i != m_endPoints.end (); i++)
    {
      if (*i == endPoint)

        }
    }

  // Here we find the most exact match
  EndPoints retval;
  if (!retval4.empty ()) retval = retval4;
  else if (!retval3.empty ()) retval = retval3;
  else if (!retval2.empty ()) retval = retval2;
  else retval = retval1;

  NS_ABORT_MSG_IF (retval.size () > 1, "Too many endpoints - perhaps you created too many sockets without binding them to different NetDevices.");
  return retval;  // might be empty if no matches
  if (!retval2.empty ())
    {
      return retval2;
    }
  return retval1;  /* might be empty if no matches */
}

Ipv6EndPoint* Ipv6EndPointDemux::SimpleLookup (Ipv6Address dst, uint16_t dport, Ipv6Address src, uint16_t sport)


uint16_t Ipv6EndPointDemux::AllocateEphemeralPort ()
{
  NS_LOG_FUNCTION (this);
  uint16_t port = m_ephemeral;
  int count = m_portLast - m_portFirst;
  do





  /**
   * \brief Lookup for address and port.
   * \param boundNetDevice Bound NetDevice (if any)
   * \param addr address to test
   * \param port port to test
   * \return true if there is a match in EndPoints, false otherwise
   */
  bool LookupLocal (Ptr<NetDevice> boundNetDevice, Ipv6Address addr, uint16_t port);

  /**
   * \brief lookup for a match with all the parameters.


  /**
   * \brief Allocate a Ipv6EndPoint.
   * \param boundNetDevice Bound NetDevice (if any)
   * \param port local port
   * \return an Ipv6EndPoint instance
   */
  Ipv6EndPoint * Allocate (Ptr<NetDevice> boundNetDevice, uint16_t port);

  /**
   * \brief Allocate a Ipv6EndPoint.
   * \param boundNetDevice Bound NetDevice (if any)
   * \param address local address
   * \param port local port
   * \return an Ipv6EndPoint instance
   */
  Ipv6EndPoint * Allocate (Ptr<NetDevice> boundNetDevice, Ipv6Address address, uint16_t port);

  /**
   * \brief Allocate a Ipv6EndPoint.
   * \param boundNetDevice Bound NetDevice (if any)
   * \param localAddress local address
   * \param localPort local port
   * \param peerAddress peer address
   * \param peerPort peer port
   * \return an Ipv6EndPoint instance
   */
  Ipv6EndPoint * Allocate (Ptr<NetDevice> boundNetDevice,
                           Ipv6Address localAddress, uint16_t localPort,
                           Ipv6Address peerAddress, uint16_t peerPort);

  /**
   * \brief Remove a end point.




Ipv4EndPoint *
TcpL4Protocol::Allocate (void)
{
  NS_LOG_FUNCTION (this);
  return m_endPoints->Allocate ();
}


}

Ipv4EndPoint *
TcpL4Protocol::Allocate (Ptr<NetDevice> boundNetDevice, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << port);
  return m_endPoints->Allocate (boundNetDevice, port);
}

Ipv4EndPoint *
TcpL4Protocol::Allocate (Ptr<NetDevice> boundNetDevice, Ipv4Address address, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << address << port);
  return m_endPoints->Allocate (boundNetDevice, address, port);
}

Ipv4EndPoint *
TcpL4Protocol::Allocate (Ptr<NetDevice> boundNetDevice,
                         Ipv4Address localAddress, uint16_t localPort,
                         Ipv4Address peerAddress, uint16_t peerPort)
{
  NS_LOG_FUNCTION (this << boundNetDevice << localAddress << localPort << peerAddress << peerPort);
  return m_endPoints->Allocate (boundNetDevice,
                                localAddress, localPort,
                                peerAddress, peerPort);
}


Ipv6EndPoint *
TcpL4Protocol::Allocate6 (void)
{
  NS_LOG_FUNCTION (this);
  return m_endPoints6->Allocate ();
}


}

Ipv6EndPoint *
TcpL4Protocol::Allocate6 (Ptr<NetDevice> boundNetDevice, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << port);
  return m_endPoints6->Allocate (boundNetDevice, port);
}

Ipv6EndPoint *
TcpL4Protocol::Allocate6 (Ptr<NetDevice> boundNetDevice, Ipv6Address address, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << address << port);
  return m_endPoints6->Allocate (boundNetDevice, address, port);
}

Ipv6EndPoint *
TcpL4Protocol::Allocate6 (Ptr<NetDevice> boundNetDevice,
                          Ipv6Address localAddress, uint16_t localPort,
                          Ipv6Address peerAddress, uint16_t peerPort)
{
  NS_LOG_FUNCTION (this << boundNetDevice << localAddress << localPort << peerAddress << peerPort);
  return m_endPoints6->Allocate (boundNetDevice,
                                 localAddress, localPort,
                                 peerAddress, peerPort);
}





  Ipv4EndPoint *Allocate (Ipv4Address address);
  /**
   * \brief Allocate an IPv4 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param port port to use
   * \return the Endpoint
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice, uint16_t port);
  /**
   * \brief Allocate an IPv4 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param address address to use
   * \param port port to use
   * \return the Endpoint
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice, Ipv4Address address, uint16_t port);
  /**
   * \brief Allocate an IPv4 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param localAddress local address to use
   * \param localPort local port to use
   * \param peerAddress remote address to use
   * \param peerPort remote port to use
   * \return the Endpoint
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice,
                          Ipv4Address localAddress, uint16_t localPort,
                          Ipv4Address peerAddress, uint16_t peerPort);
  /**
   * \brief Allocate an IPv6 Endpoint

  Ipv6EndPoint *Allocate6 (Ipv6Address address);
  /**
   * \brief Allocate an IPv6 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param port port to use
   * \return the Endpoint
   */
  Ipv6EndPoint *Allocate6 (Ptr<NetDevice> boundNetDevice, uint16_t port);
  /**
   * \brief Allocate an IPv6 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param address address to use
   * \param port port to use
   * \return the Endpoint
   */
  Ipv6EndPoint *Allocate6 (Ptr<NetDevice> boundNetDevice, Ipv6Address address, uint16_t port);
  /**
   * \brief Allocate an IPv6 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param localAddress local address to use
   * \param localPort local port to use
   * \param peerAddress remote address to use
   * \param peerPort remote port to use
   * \return the Endpoint
   */
  Ipv6EndPoint *Allocate6 (Ptr<NetDevice> boundNetDevice,
                           Ipv6Address localAddress, uint16_t localPort,
                           Ipv6Address peerAddress, uint16_t peerPort);

  /**




        }
      else if (ipv4 == Ipv4Address::GetAny () && port != 0)
        {
          m_endPoint = m_tcp->Allocate (GetBoundNetDevice (), port);
        }
      else if (ipv4 != Ipv4Address::GetAny () && port == 0)
        {

        }
      else if (ipv4 != Ipv4Address::GetAny () && port != 0)
        {
          m_endPoint = m_tcp->Allocate (GetBoundNetDevice (), ipv4, port);
        }
      if (0 == m_endPoint)
        {

        }
      else if (ipv6 == Ipv6Address::GetAny () && port != 0)
        {
          m_endPoint6 = m_tcp->Allocate6 (GetBoundNetDevice (), port);
        }
      else if (ipv6 != Ipv6Address::GetAny () && port == 0)
        {

        }
      else if (ipv6 != Ipv6Address::GetAny () && port != 0)
        {
          m_endPoint6 = m_tcp->Allocate6 (GetBoundNetDevice (), ipv6, port);
        }
      if (0 == m_endPoint6)
        {

{
  NS_LOG_FUNCTION (netdevice);
  Socket::BindToNetDevice (netdevice); // Includes sanity check
  if (m_endPoint != 0)
    {
      m_endPoint->BindToNetDevice (netdevice);
        {
          NS_ASSERT (m_endPoint == 0);
          return;
        }
      NS_ASSERT (m_endPoint != 0);
    }

  if (m_endPoint6 != 0)
  if (m_endPoint6 == 0)
    {
      m_endPoint6->BindToNetDevice (netdevice);
        {
          NS_ASSERT (m_endPoint6 == 0);
          return;
        }
      NS_ASSERT (m_endPoint6 != 0);
    }
  m_endPoint6->BindToNetDevice (netdevice);

  return;
}

  // Get port and address from peer (connecting host)
  if (InetSocketAddress::IsMatchingType (toAddress))
    {
      m_endPoint = m_tcp->Allocate (GetBoundNetDevice (),
                                    InetSocketAddress::ConvertFrom (toAddress).GetIpv4 (),
                                    InetSocketAddress::ConvertFrom (toAddress).GetPort (),
                                    InetSocketAddress::ConvertFrom (fromAddress).GetIpv4 (),
                                    InetSocketAddress::ConvertFrom (fromAddress).GetPort ());

    }
  else if (Inet6SocketAddress::IsMatchingType (toAddress))
    {
      m_endPoint6 = m_tcp->Allocate6 (GetBoundNetDevice (),
                                      Inet6SocketAddress::ConvertFrom (toAddress).GetIpv6 (),
                                      Inet6SocketAddress::ConvertFrom (toAddress).GetPort (),
                                      Inet6SocketAddress::ConvertFrom (fromAddress).GetIpv6 (),
                                      Inet6SocketAddress::ConvertFrom (fromAddress).GetPort ());




Ipv4EndPoint *
UdpL4Protocol::Allocate (void)
{
  NS_LOG_FUNCTION (this);
  return m_endPoints->Allocate ();
}


}

Ipv4EndPoint *
UdpL4Protocol::Allocate (Ptr<NetDevice> boundNetDevice, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << port);
  return m_endPoints->Allocate (boundNetDevice, port);
}

Ipv4EndPoint *
UdpL4Protocol::Allocate (Ptr<NetDevice> boundNetDevice, Ipv4Address address, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << address << port);
  return m_endPoints->Allocate (boundNetDevice, address, port);
}
Ipv4EndPoint *
UdpL4Protocol::Allocate (Ptr<NetDevice> boundNetDevice,
                         Ipv4Address localAddress, uint16_t localPort,
                         Ipv4Address peerAddress, uint16_t peerPort)
{
  NS_LOG_FUNCTION (this << boundNetDevice << localAddress << localPort << peerAddress << peerPort);
  return m_endPoints->Allocate (boundNetDevice,
                                localAddress, localPort,
                                peerAddress, peerPort);
}


Ipv6EndPoint *
UdpL4Protocol::Allocate6 (void)
{
  NS_LOG_FUNCTION (this);
  return m_endPoints6->Allocate ();
}


}

Ipv6EndPoint *
UdpL4Protocol::Allocate6 (Ptr<NetDevice> boundNetDevice, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << port);
  return m_endPoints6->Allocate (boundNetDevice, port);
}

Ipv6EndPoint *
UdpL4Protocol::Allocate6 (Ptr<NetDevice> boundNetDevice, Ipv6Address address, uint16_t port)
{
  NS_LOG_FUNCTION (this << boundNetDevice << address << port);
  return m_endPoints6->Allocate (boundNetDevice, address, port);
}
Ipv6EndPoint *
UdpL4Protocol::Allocate6 (Ptr<NetDevice> boundNetDevice,
                          Ipv6Address localAddress, uint16_t localPort,
                          Ipv6Address peerAddress, uint16_t peerPort)
{
  NS_LOG_FUNCTION (this << boundNetDevice << localAddress << localPort << peerAddress << peerPort);
  return m_endPoints6->Allocate (boundNetDevice,
                                 localAddress, localPort,
                                 peerAddress, peerPort);
}

void 




class Ipv6EndPointDemux;
class Ipv6EndPoint;
class UdpSocketImpl;
class NetDevice;

/**
 * \ingroup internet

  Ipv4EndPoint *Allocate (Ipv4Address address);
  /**
   * \brief Allocate an IPv4 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param port port to use
   * \return the Endpoint
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice, uint16_t port);
  /**
   * \brief Allocate an IPv4 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param address address to use
   * \param port port to use
   * \return the Endpoint
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice, Ipv4Address address, uint16_t port);
  /**
   * \brief Allocate an IPv4 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param localAddress local address to use
   * \param localPort local port to use
   * \param peerAddress remote address to use
   * \param peerPort remote port to use
   * \return the Endpoint
   */
  Ipv4EndPoint *Allocate (Ptr<NetDevice> boundNetDevice,
                          Ipv4Address localAddress, uint16_t localPort,
                          Ipv4Address peerAddress, uint16_t peerPort);

  /**

  Ipv6EndPoint *Allocate6 (Ipv6Address address);
  /**
   * \brief Allocate an IPv6 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param port port to use
   * \return the Endpoint
   */
  Ipv6EndPoint *Allocate6 (Ptr<NetDevice> boundNetDevice, uint16_t port);
  /**
   * \brief Allocate an IPv6 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param address address to use
   * \param port port to use
   * \return the Endpoint
   */
  Ipv6EndPoint *Allocate6 (Ptr<NetDevice> boundNetDevice, Ipv6Address address, uint16_t port);
  /**
   * \brief Allocate an IPv6 Endpoint
   * \param boundNetDevice Bound NetDevice (if any)
   * \param localAddress local address to use
   * \param localPort local port to use
   * \param peerAddress remote address to use
   * \param peerPort remote port to use
   * \return the Endpoint
   */
  Ipv6EndPoint *Allocate6 (Ptr<NetDevice> boundNetDevice,
                           Ipv6Address localAddress, uint16_t localPort,
                           Ipv6Address peerAddress, uint16_t peerPort);

  /**

(-)a/src/internet/model/udp-socket-impl.cc (-32 / +67 lines)

Lines 233-238	Link Here

233

234

  NS_LOG_FUNCTION_NOARGS ();

234

  NS_LOG_FUNCTION_NOARGS ();

235

  m_endPoint = m_udp->Allocate ();

235

  m_endPoint = m_udp->Allocate ();

236

  if (m_boundnetdevice)

237

238

      m_endPoint->BindToNetDevice (m_boundnetdevice);

239

236

  return FinishBind ();

240

  return FinishBind ();

237

241

238

242

Lines 241-246	Link Here

241

245

242

  NS_LOG_FUNCTION_NOARGS ();

246

  NS_LOG_FUNCTION_NOARGS ();

243

  m_endPoint6 = m_udp->Allocate6 ();

247

  m_endPoint6 = m_udp->Allocate6 ();

248

  if (m_boundnetdevice)

249

250

      m_endPoint6->BindToNetDevice (m_boundnetdevice);

251

244

  return FinishBind ();

252

  return FinishBind ();

245

253

246

254

Lines 251-257	Link Here

251

259

252

  if (InetSocketAddress::IsMatchingType (address))

260

  if (InetSocketAddress::IsMatchingType (address))

253

261

254

      NS_ASSERT_MSG (m_endPoint == 0, "Endpoint already allocated (maybe you used BindToNetDevice before Bind).");

262

      NS_ASSERT_MSG (m_endPoint == 0, "Endpoint already allocated.");

255

263

256

      InetSocketAddress transport = InetSocketAddress::ConvertFrom (address);

264

      InetSocketAddress transport = InetSocketAddress::ConvertFrom (address);

257

      Ipv4Address ipv4 = transport.GetIpv4 ();

265

      Ipv4Address ipv4 = transport.GetIpv4 ();

Lines 263-269	Link Here

263

271

264

      else if (ipv4 == Ipv4Address::GetAny () && port != 0)

272

      else if (ipv4 == Ipv4Address::GetAny () && port != 0)

265

273

266

          m_endPoint = m_udp->Allocate (port);

274

          m_endPoint = m_udp->Allocate (GetBoundNetDevice (), port);

267

275

268

      else if (ipv4 != Ipv4Address::GetAny () && port == 0)

276

      else if (ipv4 != Ipv4Address::GetAny () && port == 0)

269

277

Lines 271-287	Link Here

271

279

272

      else if (ipv4 != Ipv4Address::GetAny () && port != 0)

280

      else if (ipv4 != Ipv4Address::GetAny () && port != 0)

273

281

274

          m_endPoint = m_udp->Allocate (ipv4, port);

282

          m_endPoint = m_udp->Allocate (GetBoundNetDevice (), ipv4, port);

275

283

276

      if (0 == m_endPoint)

284

      if (0 == m_endPoint)

277

285

278

          m_errno = port ? ERROR_ADDRINUSE : ERROR_ADDRNOTAVAIL;

286

          m_errno = port ? ERROR_ADDRINUSE : ERROR_ADDRNOTAVAIL;

279

          return -1;

287

          return -1;

280

288

289

      if (m_boundnetdevice)

290

291

          m_endPoint->BindToNetDevice (m_boundnetdevice);

292

293

281

294

282

  else if (Inet6SocketAddress::IsMatchingType (address))

295

  else if (Inet6SocketAddress::IsMatchingType (address))

283

296

284

      NS_ASSERT_MSG (m_endPoint == 0, "Endpoint already allocated (maybe you used BindToNetDevice before Bind).");

297

      NS_ASSERT_MSG (m_endPoint == 0, "Endpoint already allocated.");

285

298

286

      Inet6SocketAddress transport = Inet6SocketAddress::ConvertFrom (address);

299

      Inet6SocketAddress transport = Inet6SocketAddress::ConvertFrom (address);

287

      Ipv6Address ipv6 = transport.GetIpv6 ();

300

      Ipv6Address ipv6 = transport.GetIpv6 ();

Lines 292-298	Link Here

292

305

293

      else if (ipv6 == Ipv6Address::GetAny () && port != 0)

306

      else if (ipv6 == Ipv6Address::GetAny () && port != 0)

294

307

295

          m_endPoint6 = m_udp->Allocate6 (port);

308

          m_endPoint6 = m_udp->Allocate6 (GetBoundNetDevice (), port);

296

309

297

      else if (ipv6 != Ipv6Address::GetAny () && port == 0)

310

      else if (ipv6 != Ipv6Address::GetAny () && port == 0)

298

311

Lines 300-318	Link Here

300

313

301

      else if (ipv6 != Ipv6Address::GetAny () && port != 0)

314

      else if (ipv6 != Ipv6Address::GetAny () && port != 0)

302

315

303

          m_endPoint6 = m_udp->Allocate6 (ipv6, port);

316

          m_endPoint6 = m_udp->Allocate6 (GetBoundNetDevice (), ipv6, port);

304

317

305

      if (0 == m_endPoint6)

318

      if (0 == m_endPoint6)

306

319

307

          m_errno = port ? ERROR_ADDRINUSE : ERROR_ADDRNOTAVAIL;

320

          m_errno = port ? ERROR_ADDRINUSE : ERROR_ADDRNOTAVAIL;

308

          return -1;

321

          return -1;

309

322

323

      if (m_boundnetdevice)

324

325

          m_endPoint6->BindToNetDevice (m_boundnetdevice);

326

327

310

      if (ipv6.IsMulticast ())

328

      if (ipv6.IsMulticast ())

311

329

312

          Ptr<Ipv6L3Protocol> ipv6l3 = m_node->GetObject <Ipv6L3Protocol> ();

330

          Ptr<Ipv6L3Protocol> ipv6l3 = m_node->GetObject <Ipv6L3Protocol> ();

313

          if (ipv6l3)

331

          if (ipv6l3)

314

332

315

              ipv6l3->AddMulticastAddress (ipv6);

333

              if (m_boundnetdevice == 0)

334

335

                  ipv6l3->AddMulticastAddress (ipv6);

336

337

              else

338

339

                  uint32_t index = ipv6l3->GetInterfaceForDevice (m_boundnetdevice);

340

                  ipv6l3->AddMulticastAddress (m_endPoint6->GetLocalAddress (), index);

341

316

342

317

343

318

344

Lines 928-964	Link Here

928

954

929

  NS_LOG_FUNCTION (netdevice);

955

  NS_LOG_FUNCTION (netdevice);

930

956

957

  Ptr<NetDevice> oldBoundNetDevice = m_boundnetdevice;

958

931

  Socket::BindToNetDevice (netdevice); // Includes sanity check

959

  Socket::BindToNetDevice (netdevice); // Includes sanity check

932

  if (m_endPoint == 0)

960

  if (m_endPoint != 0)

933

961

934

      if (Bind () == -1)

962

      m_endPoint->BindToNetDevice (netdevice);

935

936

          NS_ASSERT (m_endPoint == 0);

937

          return;

938

939

      NS_ASSERT (m_endPoint != 0);

940

963

941

  m_endPoint->BindToNetDevice (netdevice);

942

964

943

  if (m_endPoint6 == 0)

965

  if (m_endPoint6 != 0)

944

966

945

      if (Bind6 () == -1)

967

      m_endPoint6->BindToNetDevice (netdevice);

968

969

      // The following is to fix the multicast distribution inside the node

970

      // and to upgrade it to the actual bound NetDevice.

971

      if (m_endPoint6->GetLocalAddress ().IsMulticast ())

946

972

947

          NS_ASSERT (m_endPoint6 == 0);

973

          Ptr<Ipv6L3Protocol> ipv6l3 = m_node->GetObject <Ipv6L3Protocol> ();

948

          return;

974

          if (ipv6l3)

949

975

950

      NS_ASSERT (m_endPoint6 != 0);

976

              // Cleanup old one

951

977

              if (oldBoundNetDevice)

952

  m_endPoint6->BindToNetDevice (netdevice);

978

953

979

                  uint32_t index = ipv6l3->GetInterfaceForDevice (oldBoundNetDevice);

954

  if (m_endPoint6->GetLocalAddress ().IsMulticast ())

980

                  ipv6l3->RemoveMulticastAddress (m_endPoint6->GetLocalAddress (), index);

955

981

956

      Ptr<Ipv6L3Protocol> ipv6l3 = m_node->GetObject <Ipv6L3Protocol> ();

982

              else

957

      if (ipv6l3)

983

958

984

                  ipv6l3->RemoveMulticastAddress (m_endPoint6->GetLocalAddress ());

959

          uint32_t index = ipv6l3->GetInterfaceForDevice (netdevice);

985

960

          ipv6l3->RemoveMulticastAddress (m_endPoint6->GetLocalAddress ());

986

              // add new one

961

          ipv6l3->AddMulticastAddress (m_endPoint6->GetLocalAddress (), index);

987

              if (netdevice)

988

989

                  uint32_t index = ipv6l3->GetInterfaceForDevice (netdevice);

990

                  ipv6l3->AddMulticastAddress (m_endPoint6->GetLocalAddress (), index);

991

992

              else

993

994

                  ipv6l3->AddMulticastAddress (m_endPoint6->GetLocalAddress ());

995

996

962

997

963

998

964

999




   * is also possible to bind to mismatching device and address, even if
   * the socket can not receive any packets as a result.
   *
   * \param netdevice Pointer to NetDevice of desired interface
   * it will perform a Bind itself.
   *
   * \param netdevice Pointer to Netdevice of desired interface
   * \returns nothing
   */
  virtual void BindToNetDevice (Ptr<NetDevice> netdevice);

  /**
   * \brief Returns socket's bound NetDevice, if any.
   *
   * This method corresponds to using getsockopt() SO_BINDTODEVICE
   * of real network or BSD sockets.

Return to bug 2762