Attachment #221 for bug #273

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




}

void
BridgeNetDevice::ReceiveFromDevice (Ptr<NetDevice> incomingPort, Ptr<const Packet> packet, uint16_t protocol,
                                    Address const &src, Address const &dst, PacketType packetType)
{
  NS_LOG_FUNCTION_NOARGS ();

}

void
BridgeNetDevice::ForwardUnicast (Ptr<NetDevice> incomingPort, Ptr<const Packet> packet,
                                 uint16_t protocol, Mac48Address src, Mac48Address dst)
{
  NS_LOG_DEBUG ("LearningBridgeForward (incomingPort=" << incomingPort->GetName ()

}

void
BridgeNetDevice::ForwardBroadcast (Ptr<NetDevice> incomingPort, Ptr<const Packet> packet,
                                        uint16_t protocol, Mac48Address src, Mac48Address dst)
{
  NS_LOG_DEBUG ("LearningBridgeForward (incomingPort=" << incomingPort->GetName ()

(-)a/src/devices/bridge/bridge-net-device.h (-3 / +3 lines)

Lines 72-82 protected:	Link Here

protected:

protected:

  virtual void DoDispose (void);

  virtual void DoDispose (void);

  void ReceiveFromDevice (Ptr<NetDevice> device, Ptr<Packet> packet, uint16_t protocol,

  void ReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,

                          Address const &source, Address const &destination, PacketType packetType);

                          Address const &source, Address const &destination, PacketType packetType);

  void ForwardUnicast (Ptr<NetDevice> incomingPort, Ptr<Packet> packet,

  void ForwardUnicast (Ptr<NetDevice> incomingPort, Ptr<const Packet> packet,

                       uint16_t protocol, Mac48Address src, Mac48Address dst);

                       uint16_t protocol, Mac48Address src, Mac48Address dst);

  void ForwardBroadcast (Ptr<NetDevice> incomingPort, Ptr<Packet> packet,

  void ForwardBroadcast (Ptr<NetDevice> incomingPort, Ptr<const Packet> packet,

                         uint16_t protocol, Mac48Address src, Mac48Address dst);

                         uint16_t protocol, Mac48Address src, Mac48Address dst);

  void Learn (Mac48Address source, Ptr<NetDevice> port);

  void Learn (Mac48Address source, Ptr<NetDevice> port);

  Ptr<NetDevice> GetLearnedState (Mac48Address source);

  Ptr<NetDevice> GetLearnedState (Mac48Address source);

(-)a/src/internet-stack/arp-l3-protocol.cc (-1 / +3 lines)

Lines 117-126 ArpL3Protocol::FindCache (Ptr<NetDevice>	Link Here

117

118

119

void

119

void

120

ArpL3Protocol::Receive(Ptr<NetDevice> device, Ptr<Packet> packet, uint16_t protocol, const Address &from,

120

ArpL3Protocol::Receive(Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t protocol, const Address &from,

121

                       const Address &to, NetDevice::PacketType packetType)

121

                       const Address &to, NetDevice::PacketType packetType)

122

123

  NS_LOG_FUNCTION_NOARGS ();

123

  NS_LOG_FUNCTION_NOARGS ();

124

125

  Ptr<Packet> packet = p->Copy ();

124

126

125

  Ptr<ArpCache> cache = FindCache (device);

127

  Ptr<ArpCache> cache = FindCache (device);

126

  ArpHeader arp;

128

  ArpHeader arp;

(-)a/src/internet-stack/arp-l3-protocol.h (-1 / +1 lines)

Lines 54-60 public:	Link Here

/**

/**

   * \brief Receive a packet

   * \brief Receive a packet

*/

*/

  void Receive(Ptr<NetDevice> device, Ptr<Packet> p, uint16_t protocol, const Address &from, const Address &to,

  void Receive(Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t protocol, const Address &from, const Address &to,

               NetDevice::PacketType packetType);

               NetDevice::PacketType packetType);

/**

/**

   * \brief Perform an ARP lookup

   * \brief Perform an ARP lookup

(-)a/src/internet-stack/ipv4-l3-protocol.cc (-2 / +4 lines)

Lines 449-460 Ipv4L3Protocol::FindInterfaceForDevice (	Link Here

449

450

451

void

451

void

452

Ipv4L3Protocol::Receive( Ptr<NetDevice> device, Ptr<Packet> packet, uint16_t protocol, const Address &from,

452

Ipv4L3Protocol::Receive( Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t protocol, const Address &from,

453

                         const Address &to, NetDevice::PacketType packetType)

453

                         const Address &to, NetDevice::PacketType packetType)

454

455

  NS_LOG_FUNCTION (this << &device << packet << protocol <<  from);

455

  NS_LOG_FUNCTION (this << &device << p << protocol <<  from);

456

457

  NS_LOG_LOGIC ("Packet from " << from << " received on node " << m_node->GetId ());

457

  NS_LOG_LOGIC ("Packet from " << from << " received on node " << m_node->GetId ());

458

459

  Ptr<Packet> packet = p->Copy ();

458

460

459

  uint32_t index = 0;

461

  uint32_t index = 0;

460

  Ptr<Ipv4Interface> ipv4Interface;

462

  Ptr<Ipv4Interface> ipv4Interface;

(-)a/src/internet-stack/ipv4-l3-protocol.h (-1 / +1 lines)

Lines 83-89 public:	Link Here

   *    - implement a per-NetDevice ARP cache

   *    - implement a per-NetDevice ARP cache

   *    - send back arp replies on the right device

   *    - send back arp replies on the right device

*/

*/

  void Receive( Ptr<NetDevice> device, Ptr<Packet> p, uint16_t protocol, const Address &from,

  void Receive( Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t protocol, const Address &from,

                const Address &to, NetDevice::PacketType packetType);

                const Address &to, NetDevice::PacketType packetType);

/**

/**

(-)a/src/node/net-device.h (-2 / +2 lines)

Lines 274-280 public:	Link Here

274

   * \returns true if the callback could handle the packet successfully, false

274

   * \returns true if the callback could handle the packet successfully, false

275

   *          otherwise.

275

   *          otherwise.

276

*/

276

*/

277

  typedef Callback<bool,Ptr<NetDevice>,Ptr<Packet>,uint16_t,const Address &> ReceiveCallback;

277

  typedef Callback<bool,Ptr<NetDevice>,Ptr<const Packet>,uint16_t,const Address &> ReceiveCallback;

278

279

/**

279

/**

280

   * \param cb callback to invoke whenever a packet has been received and must

280

   * \param cb callback to invoke whenever a packet has been received and must

Lines 296-302 public:	Link Here

296

   * \returns true if the callback could handle the packet successfully, false

296

   * \returns true if the callback could handle the packet successfully, false

297

   *          otherwise.

297

   *          otherwise.

298

*/

298

*/

299

  typedef Callback< bool, Ptr<NetDevice>, Ptr<Packet>, uint16_t,

299

  typedef Callback< bool, Ptr<NetDevice>, Ptr<const Packet>, uint16_t,

300

                    const Address &, const Address &, PacketType > PromiscReceiveCallback;

300

                    const Address &, const Address &, PacketType > PromiscReceiveCallback;

301

302

/**

302

/**




}

bool
Node::PromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,
                                const Address &from, const Address &to, NetDevice::PacketType packetType)
{
  NS_LOG_FUNCTION(device->GetName ());

}

bool
Node::NonPromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,
                                   const Address &from)
{
  NS_LOG_FUNCTION(device->GetName ());

}

bool
Node::ReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,
                         const Address &from, const Address &to, NetDevice::PacketType packetType, bool promiscuous)
{
  NS_LOG_FUNCTION(device->GetName ());
  bool found = false;
  // if there are (potentially) multiple handlers, we need to copy the
  // packet before passing it to each handler, because handlers may
  // modify it.
  bool copyNeeded = (m_handlers.size () > 1);

  for (ProtocolHandlerList::iterator i = m_handlers.begin ();
       i != m_handlers.end (); i++)

            {
              if (promiscuous == i->promiscuous)
                {
                  i->handler (device, packet->Copy (), protocol, from, to, packetType);
                  found = true;
                }
            }




   *                   this value is only valid for promiscuous mode
   *                   protocol handlers.
   */
  typedef Callback<void,Ptr<NetDevice>, Ptr<const Packet>,uint16_t,const Address &,
                   const Address &, NetDevice::PacketType> ProtocolHandler;
  /**
   * \param handler the handler to register

   */
  virtual void NotifyDeviceAdded (Ptr<NetDevice> device);

  bool NonPromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet>, uint16_t protocol, const Address &from);
  bool PromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet>, uint16_t protocol,
                                 const Address &from, const Address &to, NetDevice::PacketType packetType);
  bool ReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet>, uint16_t protocol,
                          const Address &from, const Address &to, NetDevice::PacketType packetType, bool promisc);

  void Construct (void);

(-)a/src/node/packet-socket.cc (-2 / +2 lines)

Lines 344-350 PacketSocket::SendTo (Ptr<Packet> p, uin	Link Here

344

345

346

void

346

void

347

PacketSocket::ForwardUp (Ptr<NetDevice> device, Ptr<Packet> packet,

347

PacketSocket::ForwardUp (Ptr<NetDevice> device, Ptr<const Packet> packet,

348

                         uint16_t protocol, const Address &from,

348

                         uint16_t protocol, const Address &from,

349

                         const Address &to, NetDevice::PacketType packetType)

349

                         const Address &to, NetDevice::PacketType packetType)

350

Lines 369-375 PacketSocket::ForwardUp (Ptr<NetDevice>	Link Here

369

      SocketAddressTag tag;

369

      SocketAddressTag tag;

370

      tag.SetAddress (address);

370

      tag.SetAddress (address);

371

      packet->AddTag (tag);

371

      packet->AddTag (tag);

372

      m_deliveryQueue.push (packet);

372

      m_deliveryQueue.push (packet->Copy ());

373

      m_rxAvailable += packet->GetSize ();

373

      m_rxAvailable += packet->GetSize ();

374

      NS_LOG_LOGIC ("UID is " << packet->GetUid() << " PacketSocket " << this);

374

      NS_LOG_LOGIC ("UID is " << packet->GetUid() << " PacketSocket " << this);

375

      NotifyDataRecv ();

375

      NotifyDataRecv ();

(-)a/src/node/packet-socket.h (-1 / +1 lines)

Lines 103-109 public:	Link Here

103

    Address &fromAddress);

103

    Address &fromAddress);

104

105

private:

105

private:

106

  void ForwardUp (Ptr<NetDevice> device, Ptr<Packet> packet,

106

  void ForwardUp (Ptr<NetDevice> device, Ptr<const Packet> packet,

107

                  uint16_t protocol, const Address &from, const Address &to,

107

                  uint16_t protocol, const Address &from, const Address &to,

108

                  NetDevice::PacketType packetType);

108

                  NetDevice::PacketType packetType);

109

  int DoBind (const PacketSocketAddress &address);

109

  int DoBind (const PacketSocketAddress &address);

Return to bug 273