Attachment #66 for bug #51

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

(-)a/src/core/log.h (+14 lines)

Lines 108-113	Link Here

108

    }                                                   \

108

    }                                                   \

109

  while (false)

109

  while (false)

110

111

#define NS_LOG_M(level)                                 \

112

  do                                                    \

113

    {                                                   \

114

      if (g_log.IsEnabled (level))                      \

115

        {                                               \

116

          std::clog << __PRETTY_FUNCTION__              \

117

                    <<"(this="<<this<<")" << std::endl; \

118

        }                                               \

119

    }                                                   \

120

  while (false)

121

111

#define NS_LOG_ERROR(msg) \

122

#define NS_LOG_ERROR(msg) \

112

  NS_LOG(ns3::LOG_ERROR, msg)

123

  NS_LOG(ns3::LOG_ERROR, msg)

113

124

Lines 122-127	Link Here

122

133

123

#define NS_LOG_FUNCTION \

134

#define NS_LOG_FUNCTION \

124

  NS_LOG_F(ns3::LOG_FUNCTION)

135

  NS_LOG_F(ns3::LOG_FUNCTION)

136

137

#define NS_LOG_METHOD \

138

  NS_LOG_M(ns3::LOG_FUNCTION)

125

139

126

#define NS_LOG_PARAM(msg) \

140

#define NS_LOG_PARAM(msg) \

127

  NS_LOG(ns3::LOG_PARAM, msg)

141

  NS_LOG(ns3::LOG_PARAM, msg)




    }
  Ipv4EndPoint *endPoint = new Ipv4EndPoint (Ipv4Address::GetAny (), port);
  m_endPoints.push_back (endPoint);
  NS_LOG_DEBUG ("Now have >>" << m_endPoints.size () << "<< endpoints.");
  return endPoint;
}

Ipv4EndPoint *
Ipv4EndPointDemux::Allocate (Ipv4Address address)
{
  NS_LOG_METHOD;
  NS_LOG_PARAM ("(" << address << ")");
  uint16_t port = AllocateEphemeralPort ();
  if (port == 0) 

    }
  Ipv4EndPoint *endPoint = new Ipv4EndPoint (address, port);
  m_endPoints.push_back (endPoint);
  NS_LOG_DEBUG ("Now have >>" << m_endPoints.size () << "<< endpoints.");
  return endPoint;
}

Ipv4EndPoint *
Ipv4EndPointDemux::Allocate (uint16_t port)
{
  NS_LOG_METHOD;
  return Allocate (Ipv4Address::GetAny (), port);
}

Ipv4EndPoint *
Ipv4EndPointDemux::Allocate (Ipv4Address address, uint16_t port)
{
  NS_LOG_METHOD;
  NS_LOG_PARAM ("(" << address << ", " << port << ")");
  if (LookupLocal (address, port)) 
    {

    }
  Ipv4EndPoint *endPoint = new Ipv4EndPoint (address, port);
  m_endPoints.push_back (endPoint);
  NS_LOG_DEBUG ("Now have >>" << m_endPoints.size () << "<< endpoints.");
  return endPoint;
}


  Ipv4EndPoint *endPoint = new Ipv4EndPoint (localAddress, localPort);
  endPoint->SetPeer (peerAddress, peerPort);
  m_endPoints.push_back (endPoint);

  NS_LOG_DEBUG ("Now have >>" << m_endPoints.size () << "<< endpoints.");

  return endPoint;
}


 */
Ipv4EndPointDemux::EndPoints
Ipv4EndPointDemux::Lookup (Ipv4Address daddr, uint16_t dport, 
                           Ipv4Address saddr, uint16_t sport,
                           Ptr<Ipv4Interface> interface)
{
  NS_LOG_METHOD;
  uint32_t genericity = 3;
  Ipv4EndPoint *generic = 0;
  EndPoints retval;


  for (EndPointsI i = m_endPoints.begin (); i != m_endPoints.end (); i++) 
    {
      NS_LOG_DEBUG ("Looking at endpoint dport=" << (*i)->GetLocalPort ()
                    << " daddr=" << (*i)->GetLocalAddress ()
                    << " sport=" << (*i)->GetPeerPort ()
                    << " saddr=" << (*i)->GetPeerAddress ());
      if ((*i)->GetLocalPort () != dport) 
        {
          NS_LOG_LOGIC ("Skipping endpoint " << &(*i)
                        << " because endpoint dport "
                        << (*i)->GetLocalPort ()
                        << " does not match packet dport " << dport);
          continue;
        }
      bool isBroadcast = 
        (daddr.IsBroadcast () ||
         daddr.IsSubnetDirectedBroadcast (interface->GetNetworkMask ()));
      NS_LOG_DEBUG ("dest addr " << daddr << " broadcast? " << isBroadcast);

      NS_LOG_LOGIC ("Local address matches: " << 
        bool ((*i)->GetLocalAddress () == daddr || isBroadcast));
      NS_LOG_LOGIC ("Peer port matches: " << 
        bool ((*i)->GetPeerPort () == sport || (*i)->GetPeerPort () == 0));
      NS_LOG_LOGIC ("Peer address matches: " << 
        bool ((*i)->GetPeerAddress () == saddr ||
        (*i)->GetPeerAddress () == Ipv4Address::GetAny ()));
      
      if ( ((*i)->GetLocalAddress () == daddr || isBroadcast)
           && ((*i)->GetPeerPort () == sport || (*i)->GetPeerPort () == 0)
           && ((*i)->GetPeerAddress () == saddr || (*i)->GetPeerAddress () == Ipv4Address::GetAny ()))
        {

(-)a/src/internet-node/ipv4-end-point-demux.h (-1 / +3 lines)

Lines 25-30	Link Here

#include <stdint.h>

#include <stdint.h>

#include <list>

#include <list>

#include "ns3/ipv4-address.h"

#include "ns3/ipv4-address.h"

#include "ipv4-interface.h"

namespace ns3 {

namespace ns3 {

Lines 43-49 public:	Link Here

  EndPoints Lookup (Ipv4Address daddr,

  EndPoints Lookup (Ipv4Address daddr,

                    uint16_t dport,

                    uint16_t dport,

                    Ipv4Address saddr,

                    Ipv4Address saddr,

                    uint16_t sport);

                    uint16_t sport,

                    Ptr<Ipv4Interface> interface);

  Ipv4EndPoint *Allocate (void);

  Ipv4EndPoint *Allocate (void);

  Ipv4EndPoint *Allocate (Ipv4Address address);

  Ipv4EndPoint *Allocate (Ipv4Address address);




  NS_LOG_LOGIC ("Packet from " << from);

  uint32_t index = 0;
  Ptr<Ipv4Interface> ipv4Interface;
  for (Ipv4InterfaceList::const_iterator i = m_interfaces.begin (); 
       i != m_interfaces.end (); 
       i++)
    {
      ipv4Interface = *i;
      if (ipv4Interface->GetDevice () == device)
        {
          m_rxTrace (p, index);
          break;

    }

  NS_LOG_LOGIC ("Forward up");
  ForwardUp (packet, ipHeader, ipv4Interface);
}



}

void
Ipv4L3Protocol::ForwardUp (Packet p, Ipv4Header const&ip,
                           Ptr<Ipv4Interface> interface)
{
  NS_LOG_FUNCTION;
  NS_LOG_PARAM ("(" << &p << ", " << &ip << ")");

  Ptr<Ipv4L4Demux> demux = m_node->QueryInterface<Ipv4L4Demux> (Ipv4L4Demux::iid);
  Ptr<Ipv4L4Protocol> protocol = demux->GetProtocol (ip.GetProtocol ());
  protocol->Receive (p, ip.GetSource (), ip.GetDestination (), interface);
}

void 

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

Lines 227-233 private:	Link Here

227

                   Packet const &packet,

227

                   Packet const &packet,

228

                   Ipv4Header &ipHeader,

228

                   Ipv4Header &ipHeader,

229

                   Ptr<NetDevice> device);

229

                   Ptr<NetDevice> device);

230

  void ForwardUp (Packet p, Ipv4Header const&ip);

230

  void ForwardUp (Packet p, Ipv4Header const&ip, Ptr<Ipv4Interface> interface);

231

  uint32_t AddIpv4Interface (Ptr<Ipv4Interface> interface);

231

  uint32_t AddIpv4Interface (Ptr<Ipv4Interface> interface);

232

  void SetupLoopback (void);

232

  void SetupLoopback (void);

233

(-)a/src/internet-node/ipv4-l4-protocol.h (-1 / +3 lines)

Lines 26-31	Link Here

#define IPV4_L4_PROTOCOL_H

#define IPV4_L4_PROTOCOL_H

#include "ns3/object.h"

#include "ns3/object.h"

#include "ipv4-interface.h"

namespace ns3 {

namespace ns3 {

Lines 65-71 public:	Link Here

*/

*/

  virtual void Receive(Packet& p,

  virtual void Receive(Packet& p,

                       Ipv4Address const &source,

                       Ipv4Address const &source,

                       Ipv4Address const &destination) = 0;

                       Ipv4Address const &destination,

                       Ptr<Ipv4Interface> interface) = 0;

protected:

protected:

  virtual void DoDispose (void);

  virtual void DoDispose (void);

private:

private:





void 
UdpL4Protocol::Receive(Packet& packet, 
                       Ipv4Address const &source,
                       Ipv4Address const &destination,
                       Ptr<Ipv4Interface> interface)
{
  NS_LOG_FUNCTION; 
  NS_LOG_PARAM ("(" << &packet << ", " << source << ", " << destination << 

  packet.RemoveHeader (udpHeader);
  Ipv4EndPointDemux::EndPoints endPoints =
    m_endPoints->Lookup (destination, udpHeader.GetDestination (),
                         source, udpHeader.GetSource (), interface);
  for (Ipv4EndPointDemux::EndPointsI endPoint = endPoints.begin ();
       endPoint != endPoints.end (); endPoint++)
    {

(-)a/src/internet-node/udp-l4-protocol.h (-1 / +2 lines)

Lines 85-91 public:	Link Here

  // inherited from Ipv4L4Protocol

  // inherited from Ipv4L4Protocol

  virtual void Receive(Packet& p,

  virtual void Receive(Packet& p,

                       Ipv4Address const &source,

                       Ipv4Address const &source,

                       Ipv4Address const &destination);

                       Ipv4Address const &destination,

                       Ptr<Ipv4Interface> interface);

protected:

protected:

  virtual void DoDispose (void);

  virtual void DoDispose (void);

private:

private:






  // Create the UDP sockets
  Ptr<SocketFactory> rxSocketFactory = rxNode->QueryInterface<SocketFactory> (Udp::iid);
  Ptr<Socket> rxSocket = rxSocketFactory->CreateSocket ();
  NS_TEST_ASSERT_EQUAL (rxSocket->Bind (InetSocketAddress (Ipv4Address ("10.0.0.2"), 1234)), 0);
  rxSocket->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePacket, this));

  Ptr<SocketFactory> txSocketFactory = txNode->QueryInterface<SocketFactory> (Udp::iid);
  Ptr<Socket> txSocket = txSocketFactory->CreateSocket ();

  // ------ Now the tests ------------



  // When receiving broadcast packets, all sockets sockets bound to
  // the address/port should receive a copy of the same packet.
  Ptr<Socket> rxSocket2 = rxSocketFactory->CreateSocket ();
  rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePacket2, this));
  NS_TEST_ASSERT_EQUAL (rxSocket2->Bind (InetSocketAddress (Ipv4Address ("0.0.0.0"), 1234)), 0);

  m_receivedPacket = Packet ();
  m_receivedPacket2 = Packet ();

Return to bug 51