Attachment #1464 for bug #1528

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




          continue;
        }

      if (endP->GetBoundNetDevice ())
        {
          if (endP->GetBoundNetDevice () != incomingInterface->GetDevice ())
            {
              NS_LOG_LOGIC ("Skipping endpoint " << &endP
                                                 << " because endpoint is bound to specific device and"
                                                 << endP->GetBoundNetDevice ()
                                                 << " does not match packet device " << incomingInterface->GetDevice ());
              continue;
            }
        }

      /*    Ipv6Address incomingInterfaceAddr = incomingInterface->GetAddress (); */
      NS_LOG_DEBUG ("dest addr " << daddr);





  m_peerPort = port;
}

void Ipv6EndPoint::BindToNetDevice (Ptr<NetDevice> netdevice)
{
  m_boundnetdevice = netdevice;
  return;
}

Ptr<NetDevice> Ipv6EndPoint::GetBoundNetDevice (void)
{
  return m_boundnetdevice;
}

void Ipv6EndPoint::SetRxCallback (Callback<void, Ptr<Packet>, Ipv6Address, Ipv6Address, uint16_t> callback)
{
  m_rxCallback = callback;





#include "ns3/ipv6-address.h"
#include "ns3/callback.h"
#include "ns3/net-device.h"

namespace ns3
{

  void SetPeer (Ipv6Address addr, uint16_t port);

  /**
   * \brief Bind a socket to specific device.
   *
   * This method corresponds to using setsockopt() SO_BINDTODEVICE
   * of real network or BSD sockets.   If set on a socket, this option will
   * force packets to leave the bound device regardless of the device that
   * IP routing would naturally choose.  In the receive direction, only
   * packets received from the bound interface will be delivered.
   *
   * This option has no particular relationship to binding sockets to
   * an address via Socket::Bind ().  It is possible to bind sockets to a
   * specific IP address on the bound interface by calling both
   * Socket::Bind (address) and Socket::BindToNetDevice (device), but it
   * 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
   * \returns nothing
   */
  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.
   *
   *
   * \returns Pointer to interface.
   */
  Ptr<NetDevice> GetBoundNetDevice (void);

  /**
   * \brief Set the reception callback.
   * \param callback callback function
   */

  uint16_t m_peerPort;

  /**
   * \brief The NetDevice the EndPoint is bound to (if any).
   */
  Ptr<NetDevice> m_boundnetdevice;

  /**
   * \brief The RX callback.
   */
  Callback<void, Ptr<Packet>, Ipv6Address, Ipv6Address, uint16_t> m_rxCallback;

(-)a/src/internet/model/ipv6-raw-socket-impl.cc (+16 lines)

Lines 308-313	Link Here

308

  return rx;

308

  return rx;

309

310

311

void Ipv6RawSocketImpl::BindToNetDevice (Ptr<NetDevice> netdevice)

312

313

  NS_LOG_FUNCTION (netdevice);

314

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

315

  return;

316

317

311

bool Ipv6RawSocketImpl::ForwardUp (Ptr<const Packet> p, Ipv6Header hdr, Ptr<NetDevice> device)

318

bool Ipv6RawSocketImpl::ForwardUp (Ptr<const Packet> p, Ipv6Header hdr, Ptr<NetDevice> device)

312

319

313

  NS_LOG_FUNCTION (this << *p << hdr << device);

320

  NS_LOG_FUNCTION (this << *p << hdr << device);

Lines 317-322	Link Here

317

      return false;

324

      return false;

318

325

319

326

327

  Ptr<NetDevice> boundNetDevice = Socket::GetBoundNetDevice();

328

  if (boundNetDevice)

329

330

      if (boundNetDevice != device)

331

332

          return false;

333

334

335

320

  if ((m_src == Ipv6Address::GetAny () || hdr.GetDestinationAddress () == m_src) &&

336

  if ((m_src == Ipv6Address::GetAny () || hdr.GetDestinationAddress () == m_src) &&

321

      (m_dst == Ipv6Address::GetAny () || hdr.GetSourceAddress () == m_dst) &&

337

      (m_dst == Ipv6Address::GetAny () || hdr.GetSourceAddress () == m_dst) &&

322

      hdr.GetNextHeader () == m_protocol)

338

      hdr.GetNextHeader () == m_protocol)




  virtual int Bind6 ();

  /**
   * \brief Bind a socket to specific device.
   *
   * This method corresponds to using setsockopt() SO_BINDTODEVICE
   * of real network or BSD sockets.   If set on a socket, this option will
   * force packets to leave the bound device regardless of the device that
   * IP routing would naturally choose.  In the receive direction, only
   * packets received from the bound interface will be delivered.
   *
   * This option has no particular relationship to binding sockets to
   * an address via Socket::Bind ().  It is possible to bind sockets to a
   * specific IP address on the bound interface by calling both
   * Socket::Bind (address) and Socket::BindToNetDevice (device), but it
   * 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
   * \returns nothing
   */
  virtual void BindToNetDevice (Ptr<NetDevice> netdevice);

  /**
   * \brief Get socket address.
   * \param address socket address if method success
   * \return 0 if success, -1 otherwise

Return to bug 1528