Attachment #17 for bug #36

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

(-)ns-3-dev/src/internet-node/arp-cache.cc (+2 lines)

Lines 109-114 ArpCache::Lookup (Ipv4Address to)	Link Here

109

ArpCache::Entry *

109

ArpCache::Entry *

110

ArpCache::Add (Ipv4Address to)

110

ArpCache::Add (Ipv4Address to)

111

112

  NS_ASSERT (m_arpCache.find (to) == m_arpCache.end ());

113

112

  ArpCache::Entry *entry = new ArpCache::Entry (this);

114

  ArpCache::Entry *entry = new ArpCache::Entry (this);

113

  m_arpCache[to] = entry;

115

  m_arpCache[to] = entry;

114

  return entry;

116

  return entry;




 */

#include "ns3/packet.h"
#include "ns3/debug.h"
#include "ns3/composite-trace-resolver.h"
#include "ns3/node.h"
#include "ns3/net-device.h"

    {
      Ptr<ArpPrivate> arp = m_node->QueryInterface<ArpPrivate> (ArpPrivate::iid);
      MacAddress hardwareDestination;
      bool found;

      if (dest.IsBroadcast ())
        {
           hardwareDestination = GetDevice ()->GetBroadcast ();
           found = true;
        }
      else
        {
          Ptr<ArpPrivate> arp = m_node->QueryInterface<ArpPrivate> (ArpPrivate::iid);
          found = arp->Lookup (p, dest, GetDevice (), &hardwareDestination);
        }

      if (found)
        {
          GetDevice ()->Send (p, hardwareDestination, Ipv4L3Protocol::PROT_NUMBER);

(-)ns-3-dev/src/internet-node/arp-l3-protocol.cc (+22 lines)

Lines 87-92 ArpL3Protocol::Receive(Packet& packet, P	Link Here

  ArpCache *cache = FindCache (device);

  ArpCache *cache = FindCache (device);

  ArpHeader arp;

  ArpHeader arp;

  packet.RemoveHeader (arp);

  packet.RemoveHeader (arp);

  NS_DEBUG ("ARP: received "<< (arp.IsRequest ()? "request" : "reply") <<

            " node="<<m_node->GetId ()<<", got request from " <<

            arp.GetSourceIpv4Address () << " for address " <<

            arp.GetDestinationIpv4Address () << "; we have address " <<

            cache->GetInterface ()->GetAddress ());

  if (arp.IsRequest () &&

  if (arp.IsRequest () &&

      arp.GetDestinationIpv4Address () == cache->GetInterface ()->GetAddress ())

      arp.GetDestinationIpv4Address () == cache->GetInterface ()->GetAddress ())

Lines 128-133 ArpL3Protocol::Receive(Packet& packet, P	Link Here

128

	  // XXX report packet as dropped.

135

	  // XXX report packet as dropped.

129

136

130

137

138

  else

139

140

      NS_DEBUG ("node="<<m_node->GetId ()<<", got request from " <<

141

                arp.GetSourceIpv4Address () << " for unknown address " <<

142

                arp.GetDestinationIpv4Address () << " -- drop");

143

131

144

132

bool

145

bool

133

ArpL3Protocol::Lookup (Packet &packet, Ipv4Address destination,

146

ArpL3Protocol::Lookup (Packet &packet, Ipv4Address destination,

Lines 203-208 void	Link Here

203

ArpL3Protocol::SendArpRequest (ArpCache const *cache, Ipv4Address to)

216

ArpL3Protocol::SendArpRequest (ArpCache const *cache, Ipv4Address to)

204

217

205

  ArpHeader arp;

218

  ArpHeader arp;

219

  NS_DEBUG ("ARP: sending request from node "<<m_node->GetId ()<<

220

            " || src: " << cache->GetDevice ()->GetAddress () <<

221

            " / " << cache->GetInterface ()->GetAddress () <<

222

            " || dst: " << cache->GetDevice ()->GetBroadcast () <<

223

            " / " << to);

206

  arp.SetRequest (cache->GetDevice ()->GetAddress (),

224

  arp.SetRequest (cache->GetDevice ()->GetAddress (),

207

		  cache->GetInterface ()->GetAddress (),

225

		  cache->GetInterface ()->GetAddress (),

208

                  cache->GetDevice ()->GetBroadcast (),

226

                  cache->GetDevice ()->GetBroadcast (),

Lines 216-221 void	Link Here

216

ArpL3Protocol::SendArpReply (ArpCache const *cache, Ipv4Address toIp, MacAddress toMac)

234

ArpL3Protocol::SendArpReply (ArpCache const *cache, Ipv4Address toIp, MacAddress toMac)

217

235

218

  ArpHeader arp;

236

  ArpHeader arp;

237

  NS_DEBUG ("ARP: sending reply from node "<<m_node->GetId ()<<

238

            "|| src: " << cache->GetDevice ()->GetAddress () <<

239

            " / " << cache->GetInterface ()->GetAddress () <<

240

            " || dst: " << toMac << " / " << toIp);

219

  arp.SetReply (cache->GetDevice ()->GetAddress (),

241

  arp.SetReply (cache->GetDevice ()->GetAddress (),

220

                cache->GetInterface ()->GetAddress (),

242

                cache->GetInterface ()->GetAddress (),

221

                toMac, toIp);

243

                toMac, toIp);




  uint32_t index = m_nInterfaces;
  m_interfaces.push_back (interface);
  m_nInterfaces++;
  if (interface->IsUp ())
    {
      AddNetworkRouteTo (interface->GetAddress () & interface->GetNetworkMask (),
                         interface->GetNetworkMask (), index);
    }
  return index;
}
Ipv4Interface *


  m_identification ++;

  if (destination.IsBroadcast ())
  // the route calculation for an outgoing packet is not
  // done in the ip layer. It is done within the application
  // socket when the first packet is sent to avoid this
  // costly lookup on a per-packet basis.
  // That would require us to get the route from the packet,
  // most likely with a packet tag. The higher layers do not
  // do this yet for us.
  Ipv4Route *route = Lookup (ipHeader.GetDestination ());
  if (route == 0) 
    {
      Packet packet1 = packet;
      packet1.AddHeader (ipHeader);
      return;
    }

      for (Ipv4InterfaceList::iterator ifaceIter = m_interfaces.begin ();
           ifaceIter != m_interfaces.end (); ifaceIter++)
        {
          Ipv4Interface *outInterface = *ifaceIter;
          // XXX log trace here.
          NS_ASSERT (packet.GetSize () <= outInterface->GetMtu ());
          outInterface->Send (packet1, destination);
        }
    }
  else
    {
      // XXX Note here that in most ipv4 stacks in the world,
      // the route calculation for an outgoing packet is not
      // done in the ip layer. It is done within the application
      // socket when the first packet is sent to avoid this
      // costly lookup on a per-packet basis.
      // That would require us to get the route from the packet,
      // most likely with a packet tag. The higher layers do not
      // do this yet for us.
      Ipv4Route *route = Lookup (ipHeader.GetDestination ());
      if (route == 0) 
        {
          NS_DEBUG ("not for me -- forwarding but no route to host. drop.");
          m_dropTrace (packet);
          return;
        }
      SendRealOut (packet, ipHeader, *route);
    }
}

void

	}
    }
      
  if (ipHeader.GetDestination ().IsBroadcast ()) 
    {
      NS_DEBUG ("for me 3");
      return false;

{
  Ipv4Interface *interface = GetInterface (i);
  interface->SetUp ();
  AddNetworkRouteTo (interface->GetAddress () & interface->GetNetworkMask (),
                     interface->GetNetworkMask (), i);
}
void 
Ipv4L3Protocol::SetDown (uint32_t i)

(-)ns-3-dev/src/node/ipv4-address.h (-1 / +10 lines)

Lines 80-86 public:	Link Here

*/

*/

  void Print (std::ostream &os) const;

  void Print (std::ostream &os) const;

  bool IsBroadcast (void);

  bool IsBroadcast (void) const {

    return (m_address == 0xffffffffU);

  bool IsMulticast (void);

  bool IsMulticast (void);

  static Ipv4Address GetZero (void);

  static Ipv4Address GetZero (void);

Lines 128-133 public:	Link Here

128

};

131

};

129

bool operator != (Ipv4Address const &a, Ipv4Address const &b);

132

bool operator != (Ipv4Address const &a, Ipv4Address const &b);

130

133

134

135

inline Ipv4Address operator & (Ipv4Address const &address, Ipv4Mask const &mask)

136

137

  return Ipv4Address (address.GetHostOrder () & mask.GetHostOrder ());

138

139

131

}; // namespace ns3

140

}; // namespace ns3

132

141

133

#endif /* IPV4_ADDRESS_H */

142

#endif /* IPV4_ADDRESS_H */

Return to bug 36