Attachment #1702 for bug #1796

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




  m_peerPort = port;
}

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

  m_destroyCallback = callback;
}

void Ipv6EndPoint::ForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface)
{
  if (!m_rxCallback.IsNull ())
    {
      Simulator::ScheduleNow (&Ipv6EndPoint::DoForwardUp, this, p, header, port,
                              incomingInterface);
    }
}


    }
}

void Ipv6EndPoint::DoForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t sport, Ptr<Ipv6Interface> incomingInterface)
{
  m_rxCallback (p, header, sport, incomingInterface);
}

void Ipv6EndPoint::DoForwardIcmp (Ipv6Address src, uint8_t ttl, uint8_t type, 




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

namespace ns3
{

   * \brief Set the reception callback.
   * \param callback callback function
   */
  void SetRxCallback (Callback<void, Ptr<Packet>, Ipv6Header, uint16_t, Ptr<Ipv6Interface> > callback);

  /**
   * \brief Set the ICMP callback.

   * \param p the packet
   * \param header the packet header
   * \param port source port
   * \param incomingInterface incoming interface
   */
  void ForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface);

  /**
   * \brief Function called from an L4Protocol implementation

   * \param p packet
   * \param header the packet header
   * \param sport source port
   * \param incomingInterface incoming interface
   */
  void DoForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t sport, Ptr<Ipv6Interface> incomingInterface);

  /**
   * \brief ForwardIcmp wrapper.

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

  /**
   * \brief The ICMPv6 callback.

(-)a/src/internet/model/tcp-l4-protocol.cc (-1 / +1 lines)

Lines 506-512	Link Here

506

507

  NS_ASSERT_MSG (endPoints.size () == 1, "Demux returned more than one endpoint");

507

  NS_ASSERT_MSG (endPoints.size () == 1, "Demux returned more than one endpoint");

508

  NS_LOG_LOGIC ("TcpL4Protocol "<<this<<" forwarding up to endpoint/socket");

508

  NS_LOG_LOGIC ("TcpL4Protocol "<<this<<" forwarding up to endpoint/socket");

509

  (*endPoints.begin ())->ForwardUp (packet, ipHeader, tcpHeader.GetSourcePort ());

509

  (*endPoints.begin ())->ForwardUp (packet, ipHeader, tcpHeader.GetSourcePort (), interface);

510

  return IpL4Protocol::RX_OK;

510

  return IpL4Protocol::RX_OK;

511

512

(-)a/src/internet/model/tcp-socket-base.cc (-1 / +1 lines)

Lines 810-816	Link Here

810

811

812

void

812

void

813

TcpSocketBase::ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port)

813

TcpSocketBase::ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface)

814

815

  DoForwardUp (packet, header, port);

815

  DoForwardUp (packet, header, port);

816

(-)a/src/internet/model/tcp-socket-base.h (-1 / +2 lines)

Lines 31-36	Link Here

#include "ns3/ipv4-header.h"

#include "ns3/ipv4-header.h"

#include "ns3/ipv4-interface.h"

#include "ns3/ipv4-interface.h"

#include "ns3/ipv6-header.h"

#include "ns3/ipv6-header.h"

#include "ns3/ipv6-interface.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

#include "tcp-tx-buffer.h"

#include "tcp-tx-buffer.h"

#include "tcp-rx-buffer.h"

#include "tcp-rx-buffer.h"

Lines 136-142	Link Here

136

137

  // Helper functions: Transfer operation

138

  // Helper functions: Transfer operation

138

  void ForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port, Ptr<Ipv4Interface> incomingInterface);

139

  void ForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port, Ptr<Ipv4Interface> incomingInterface);

139

  void ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port);

140

  void ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface);

140

  virtual void DoForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port, Ptr<Ipv4Interface> incomingInterface); //Get a pkt from L3

141

  virtual void DoForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port, Ptr<Ipv4Interface> incomingInterface); //Get a pkt from L3

141

  virtual void DoForwardUp (Ptr<Packet> packet, Ipv6Header header, uint16_t port); // Ipv6 version

142

  virtual void DoForwardUp (Ptr<Packet> packet, Ipv6Header header, uint16_t port); // Ipv6 version

142

  void ForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo);

143

  void ForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo);

(-)a/src/internet/model/udp-l4-protocol.cc (-1 / +1 lines)

Lines 402-408	Link Here

402

  for (Ipv6EndPointDemux::EndPointsI endPoint = endPoints.begin ();

402

  for (Ipv6EndPointDemux::EndPointsI endPoint = endPoints.begin ();

403

       endPoint != endPoints.end (); endPoint++)

403

       endPoint != endPoints.end (); endPoint++)

404

405

      (*endPoint)->ForwardUp (packet->Copy (), header, udpHeader.GetSourcePort ());

405

      (*endPoint)->ForwardUp (packet->Copy (), header, udpHeader.GetSourcePort (), interface);

406

407

  return IpL4Protocol::RX_OK;

407

  return IpL4Protocol::RX_OK;

408




#include "ns3/udp-socket-factory.h"
#include "ns3/trace-source-accessor.h"
#include "ns3/ipv4-packet-info-tag.h"
#include "ns3/ipv6-packet-info-tag.h"
#include "udp-socket-impl.h"
#include "udp-l4-protocol.h"
#include "ipv4-end-point.h"

}

void 
UdpSocketImpl::ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface)
{
  NS_LOG_FUNCTION (this << packet << header.GetSourceAddress () << port);


      return;
    }

  // Should check via getsockopt ()..
  if (IsRecvPktInfo ())
    {
      Ipv6PacketInfoTag tag;
      packet->RemovePacketTag (tag);
      tag.SetRecvIf (incomingInterface->GetDevice ()->GetIfIndex ());
      packet->AddPacketTag (tag);
    }

  //Check only version 6 options
  if (IsIpv6RecvTclass ())

(-)a/src/internet/model/udp-socket-impl.h (-1 / +2 lines)

Lines 104-110	Link Here

104

  int FinishBind (void);

104

  int FinishBind (void);

105

  void ForwardUp (Ptr<Packet> p, Ipv4Header header, uint16_t port,

105

  void ForwardUp (Ptr<Packet> p, Ipv4Header header, uint16_t port,

106

                  Ptr<Ipv4Interface> incomingInterface);

106

                  Ptr<Ipv4Interface> incomingInterface);

107

  void ForwardUp6 (Ptr<Packet> p, Ipv6Header header, uint16_t port);

107

  void ForwardUp6 (Ptr<Packet> p, Ipv6Header header, uint16_t port,

108

                   Ptr<Ipv6Interface> incomingInterface);

108

  void Destroy (void);

109

  void Destroy (void);

109

  void Destroy6 (void);

110

  void Destroy6 (void);

110

  int DoSend (Ptr<Packet> p);

111

  int DoSend (Ptr<Packet> p);

Return to bug 1796