Attachment #1599 for bug #1646

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

(-)./a/examples/ipv6/icmpv6-redirect.cc (-1 / +1 lines)

Lines 155-161 int main (int argc, char **argv)	Link Here

155

  Ipv6InterfaceContainer iic2 = ipv6.Assign (ndc2);

155

  Ipv6InterfaceContainer iic2 = ipv6.Assign (ndc2);

156

  iic2.SetRouter (0, true);

156

  iic2.SetRouter (0, true);

157

158

  stackHelper.AddHostRouteTo (r1, iic2.GetAddress (1, 1), iic1.GetAddress (2, 1), iic1.GetInterfaceIndex (1));

158

  stackHelper.AddHostRouteTo (r1, iic2.GetAddress (1, 1), iic1.GetAddress (2, 0), iic1.GetInterfaceIndex (1));

159

160

  Simulator::Schedule (Seconds (0.0), &StackHelper::PrintRoutingTable, &stackHelper, r1);

160

  Simulator::Schedule (Seconds (0.0), &StackHelper::PrintRoutingTable, &stackHelper, r1);

161

  Simulator::Schedule (Seconds (3.0), &StackHelper::PrintRoutingTable, &stackHelper, sta1);

161

  Simulator::Schedule (Seconds (3.0), &StackHelper::PrintRoutingTable, &stackHelper, sta1);

(-)./a/src/internet/model/icmpv6-l4-protocol.cc (-4 / +27 lines)

Lines 593-602 void Icmpv6L4Protocol::HandleNA (Ptr<Pac	Link Here

593

      Ipv6InterfaceAddress ifaddr;

593

      Ipv6InterfaceAddress ifaddr;

594

      bool found = false;

594

      bool found = false;

595

      uint32_t i = 0;

595

      uint32_t i = 0;

596

      uint32_t nb = 0;

596

      uint32_t nb = interface->GetNAddresses ();

597

598

      for (i = 0; i < nb; i++)

598

      for (i = 0; i < nb; i++)

599

600

          ifaddr = interface->GetAddress (i);

600

          if (ifaddr.GetAddress () == target)

601

          if (ifaddr.GetAddress () == target)

601

602

              found = true;

603

              found = true;

Lines 1072-1078 void Icmpv6L4Protocol::SendErrorParamete	Link Here

1072

  SendMessage (p, dst, header, 255);

1073

  SendMessage (p, dst, header, 255);

1073

1074

1075

void Icmpv6L4Protocol::SendRedirection (Ptr<Packet> redirectedPacket, Ipv6Address dst, Ipv6Address redirTarget, Ipv6Address redirDestination, Address redirHardwareTarget)

1076

void Icmpv6L4Protocol::SendRedirection (Ptr<Packet> redirectedPacket, Ipv6Address src, Ipv6Address dst, Ipv6Address redirTarget, Ipv6Address redirDestination, Address redirHardwareTarget)

1076

1077

  NS_LOG_FUNCTION (this << redirectedPacket << dst << redirTarget << redirDestination << redirHardwareTarget);

1078

  NS_LOG_FUNCTION (this << redirectedPacket << dst << redirTarget << redirDestination << redirHardwareTarget);

1078

  uint32_t llaSize = 0;

1079

  uint32_t llaSize = 0;

Lines 1117-1123 void Icmpv6L4Protocol::SendRedirection (	Link Here

1117

  Icmpv6Redirection redirectionHeader;

1118

  Icmpv6Redirection redirectionHeader;

1118

  redirectionHeader.SetTarget (redirTarget);

1119

  redirectionHeader.SetTarget (redirTarget);

1119

  redirectionHeader.SetDestination (redirDestination);

1120

  redirectionHeader.SetDestination (redirDestination);

1120

  SendMessage (p, dst, redirectionHeader, 64);

1121

  redirectionHeader.CalculatePseudoHeaderChecksum (src, dst, p->GetSize () + redirectionHeader.GetSerializedSize (), PROT_NUMBER);

1122

  p->AddHeader (redirectionHeader);

1123

  SendMessage (p, src, dst, 64);

1121

1124

1122

1125

1123

Ptr<Packet> Icmpv6L4Protocol::ForgeNA (Ipv6Address src, Ipv6Address dst, Address* hardwareAddress, uint8_t flags)

1126

Ptr<Packet> Icmpv6L4Protocol::ForgeNA (Ipv6Address src, Ipv6Address dst, Address* hardwareAddress, uint8_t flags)

Lines 1232-1238 bool Icmpv6L4Protocol::Lookup (Ipv6Addre	Link Here

1232

      cache = FindCache (device);

1235

      cache = FindCache (device);

1233

1236

1234

1237

1235

  return cache->Lookup (dst);

1238

  NdiscCache::Entry* entry = cache->Lookup (dst);

1239

  if (entry)

1240

1241

      if (entry->IsReachable () || entry->IsDelay ())

1242

1243

          *hardwareDestination = entry->GetMacAddress ();

1244

          return true;

1245

1246

      else if (entry->IsStale ())

1247

1248

          entry->StartDelayTimer ();

1249

          entry->MarkDelay ();

1250

          *hardwareDestination = entry->GetMacAddress ();

1251

          return true;

1252

1253

      else

1254

1255

          return false;

1256

1257

1258

  return false;

1236

1259

1237

1260

1238

bool Icmpv6L4Protocol::Lookup (Ptr<Packet> p, Ipv6Address dst, Ptr<NetDevice> device, Ptr<NdiscCache> cache, Address* hardwareDestination)

1261

bool Icmpv6L4Protocol::Lookup (Ptr<Packet> p, Ipv6Address dst, Ptr<NetDevice> device, Ptr<NdiscCache> cache, Address* hardwareDestination)




  /**
   * \brief Send an ICMPv6 Redirection.
   * \param redirectedPacket the redirected packet
   * \param src source IPv6 address
   * \param dst destination IPv6 address
   * \param redirTarget IPv6 target address for Icmpv6Redirection
   * \param redirDestination IPv6 destination address for Icmpv6Redirection
   * \param redirHardwareTarget L2 target address for Icmpv6OptionRdirected
   */
  void SendRedirection (Ptr<Packet> redirectedPacket, Ipv6Address src, Ipv6Address dst, Ipv6Address redirTarget, Ipv6Address redirDestination, Address redirHardwareTarget);

  /**
   * \brief Forge a Neighbor Solicitation.




    }
}

void Ipv6L3Protocol::IpForward (Ptr<const NetDevice> idev, Ptr<Ipv6Route> rtentry, Ptr<const Packet> p, const Ipv6Header& header)
{
  NS_LOG_FUNCTION (this << rtentry << p << header);
  NS_LOG_LOGIC ("Forwarding logic for node: " << m_node->GetId ());


  /* ICMPv6 Redirect */

  /*
   * incoming and outgoing devices are the same
   * send a redirect.
   */
  if (m_sendIcmpv6Redirect && (rtentry->GetOutputDevice () == idev))
  if (m_sendIcmpv6Redirect &&
      ((!rtentry->GetGateway ().IsAny () && rtentry->GetGateway ().CombinePrefix (Ipv6Prefix (64)) == header.GetSourceAddress ().CombinePrefix (Ipv6Prefix (64)))
      || (rtentry->GetDestination ().CombinePrefix (Ipv6Prefix (64)) == header.GetSourceAddress ().CombinePrefix (Ipv6Prefix (64)))))
    {
      NS_LOG_LOGIC ("ICMPv6 redirect!");
      Ptr<Icmpv6L4Protocol> icmpv6 = GetIcmpv6 ();

        {
          target = dst;
        }
      if ((target != dst) && (!target.IsLinkLocal ())) /* RFC 4861 */
        {
          SendRealOut (rtentry, packet, ipHeader);
          return;
        }

      copy->AddHeader (header);

      Ipv6Address linkLocal = GetInterface (GetInterfaceForDevice (rtentry->GetOutputDevice ()))->GetLinkLocalAddress ().GetAddress ();
      Address hardwareSrc;
      icmpv6->Lookup (src, rtentry->GetOutputDevice (), 0, &hardwareSrc);
      Ipv6Address linkLocalSrc = Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac48Address::ConvertFrom (hardwareSrc));

      if (icmpv6->Lookup (target, rtentry->GetOutputDevice (), 0, &hardwareTarget))
        {
          icmpv6->SendRedirection (copy, linkLocal, linkLocalSrc, target, dst, hardwareTarget);
        }
      else
        {
          icmpv6->SendRedirection (copy, linkLocal, linkLocalSrc, target, dst, hardwareTarget);
        }
    }






  /**
   * \brief Forward a packet.
   * \param Ptr<const NetDevice> input device
   * \param rtentry route 
   * \param p packet to forward
   * \param header IPv6 header to add to the packet
   */
  void IpForward (Ptr<const NetDevice>, Ptr<Ipv6Route> rtentry, Ptr<const Packet> p, const Ipv6Header& header);

  /**
   * \brief Forward a packet in multicast.

(-)./a/src/internet/model/ipv6-routing-protocol.h (-1 / +1 lines)

Lines 56-62 class Ipv6RoutingProtocol : public Objec	Link Here

public:

public:

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

  typedef Callback<void, Ptr<Ipv6Route>, Ptr<const Packet>, const Ipv6Header &> UnicastForwardCallback;

  typedef Callback<void, Ptr<const NetDevice>, Ptr<Ipv6Route>, Ptr<const Packet>, const Ipv6Header &> UnicastForwardCallback;

  typedef Callback<void, Ptr<Ipv6MulticastRoute>, Ptr<const Packet>, const Ipv6Header &> MulticastForwardCallback;

  typedef Callback<void, Ptr<Ipv6MulticastRoute>, Ptr<const Packet>, const Ipv6Header &> MulticastForwardCallback;

  typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, uint32_t > LocalDeliverCallback;

  typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, uint32_t > LocalDeliverCallback;

  typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, Socket::SocketErrno > ErrorCallback;

  typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, Socket::SocketErrno > ErrorCallback;

(-)./a/src/internet/model/ipv6-static-routing.cc (-1 / +5 lines)

Lines 304-309 Ptr<Ipv6Route> Ipv6StaticRouting::Lookup	Link Here

304

305

                  rtentry->SetSource (SourceAddressSelection (interfaceIdx, route->GetPrefixToUse ().IsAny () ? route->GetGateway () : route->GetPrefixToUse ()));

305

                  rtentry->SetSource (SourceAddressSelection (interfaceIdx, route->GetPrefixToUse ().IsAny () ? route->GetGateway () : route->GetPrefixToUse ()));

306

307

              else if (route->GetGateway ().IsLinkLocal ()) /* send message via route, the source address should be global unicast address */

308

309

                  rtentry->SetSource (m_ipv6->GetAddress (interfaceIdx, 1).GetAddress ()); /* we don't have a method to find a better global unicast address */

310

307

              else

311

              else

308

312

309

                  rtentry->SetSource (SourceAddressSelection (interfaceIdx, route->GetGateway ()));

313

                  rtentry->SetSource (SourceAddressSelection (interfaceIdx, route->GetGateway ()));

Lines 607-613 bool Ipv6StaticRouting::RouteInput (Ptr<	Link Here

607

  if (rtentry != 0)

611

  if (rtentry != 0)

608

612

609

      NS_LOG_LOGIC ("Found unicast destination- calling unicast callback");

613

      NS_LOG_LOGIC ("Found unicast destination- calling unicast callback");

610

      ucb (rtentry, p, header);  // unicast forwarding callback

614

      ucb (idev, rtentry, p, header);  // unicast forwarding callback

611

      return true;

615

      return true;

612

616

613

  else

617

  else

Return to bug 1646