Attachment #2553 for bug #2482

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





const uint8_t Icmpv6L4Protocol::PROT_NUMBER = 58;

const uint8_t Icmpv6L4Protocol::MAX_INITIAL_RTR_ADVERT_INTERVAL = 16;
const uint8_t Icmpv6L4Protocol::MAX_INITIAL_RTR_ADVERTISEMENTS = 3;
const uint8_t Icmpv6L4Protocol::MAX_FINAL_RTR_ADVERTISEMENTS = 3;
const uint8_t Icmpv6L4Protocol::MIN_DELAY_BETWEEN_RAS = 3;
const uint32_t Icmpv6L4Protocol::MAX_RA_DELAY_TIME = 500; /* millisecond */

const uint8_t Icmpv6L4Protocol::MAX_RTR_SOLICITATION_DELAY = 1;
const uint8_t Icmpv6L4Protocol::RTR_SOLICITATION_INTERVAL = 4;
const uint8_t Icmpv6L4Protocol::MAX_RTR_SOLICITATIONS = 3;

const uint8_t Icmpv6L4Protocol::MAX_MULTICAST_SOLICIT = 3;
const uint8_t Icmpv6L4Protocol::MAX_UNICAST_SOLICIT = 3;
const uint8_t Icmpv6L4Protocol::MAX_ANYCAST_DELAY_TIME = 1;
const uint8_t Icmpv6L4Protocol::MAX_NEIGHBOR_ADVERTISEMENT = 3;
const uint32_t Icmpv6L4Protocol::REACHABLE_TIME = 30000;
const uint32_t Icmpv6L4Protocol::RETRANS_TIMER = 1000;
const uint8_t Icmpv6L4Protocol::DELAY_FIRST_PROBE_TIME = 5;
const double Icmpv6L4Protocol::MIN_RANDOM_FACTOR = 0.5;
const double Icmpv6L4Protocol::MAX_RANDOM_FACTOR = 1.5;

TypeId Icmpv6L4Protocol::GetTypeId ()
{

                   StringValue ("ns3::UniformRandomVariable[Min=0.0|Max=10.0]"),
                   MakePointerAccessor (&Icmpv6L4Protocol::m_solicitationJitter),
                   MakePointerChecker<RandomVariableStream> ())
    .AddAttribute ("MAX_INITIAL_RTR_ADVERT_INTERVAL", "Neighbor Discovery router constants : max initial RA initial interval.",
                   UintegerValue (16),
                   MakeUintegerAccessor (&Icmpv6L4Protocol::MAX_INITIAL_RTR_ADVERT_INTERVAL),
                   MakeUintegerChecker<uint8_t> ())
    .AddAttribute ("MAX_INITIAL_RTR_ADVERTISEMENTS", "Neighbor Discovery router constants : max initial RA transmission.",
                   IntegerValue (3),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_INITIAL_RTR_ADVERTISEMENTS),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MAX_FINAL_RTR_ADVERTISEMENTS", "Neighbor Discovery router constants : max final RA transmission.",
                   IntegerValue (3),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_FINAL_RTR_ADVERTISEMENTS),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MIN_DELAY_BETWEEN_RAS", "Neighbor Discovery router constants : min delay between RA.",
                   IntegerValue (3),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MIN_DELAY_BETWEEN_RAS),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MAX_RA_DELAY_TIME", "Neighbor Discovery router constants : max delay between RA.",
                   IntegerValue (500),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_RA_DELAY_TIME),
                   MakeIntegerChecker<uint32_t> ())
    .AddAttribute ("MAX_RTR_SOLICITATION_DELAY", "Neighbor Discovery host constants : max RS delay.",
                   IntegerValue (1),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_RTR_SOLICITATION_DELAY),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("RTR_SOLICITATION_INTERVAL", "Neighbor Discovery host constants : RS interval.",
                   IntegerValue (4),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::RTR_SOLICITATION_INTERVAL),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MAX_RTR_SOLICITATIONS", "Neighbor Discovery host constants : max RS transmission.",
                   IntegerValue (3),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_RTR_SOLICITATIONS),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MAX_MULTICAST_SOLICIT", "Neighbor Discovery node constants : max multicast solicitations.",
                   IntegerValue (3),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_MULTICAST_SOLICIT),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MAX_UNICAST_SOLICIT", "Neighbor Discovery node constants : max unicast solicitations.",
                   IntegerValue (3),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_UNICAST_SOLICIT),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MAX_ANYCAST_DELAY_TIME", "Neighbor Discovery node constants : max anycast delay.",
                   IntegerValue (1),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_ANYCAST_DELAY_TIME),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MAX_NEIGHBOR_ADVERTISEMENT", "Neighbor Discovery node constants : max NA transmission.",
                   IntegerValue (3),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::MAX_NEIGHBOR_ADVERTISEMENT),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("REACHABLE_TIME", "Neighbor Discovery node constants : reachable time.",
                   IntegerValue (30000),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::REACHABLE_TIME),
                   MakeIntegerChecker<uint32_t> ())
    .AddAttribute ("RETRANS_TIMER", "Neighbor Discovery node constants : retransmission timer.",
                   IntegerValue (1000),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::RETRANS_TIMER),
                   MakeIntegerChecker<uint32_t> ())
    .AddAttribute ("DELAY_FIRST_PROBE_TIME", "Neighbor Discovery node constants : delay for the first probe.",
                   IntegerValue (5),
                   MakeIntegerAccessor (&Icmpv6L4Protocol::DELAY_FIRST_PROBE_TIME),
                   MakeIntegerChecker<uint8_t> ())
    .AddAttribute ("MIN_RANDOM_FACTOR", "Neighbor Discovery node constants : min random factor.",
                   DoubleValue (0.5),
                   MakeDoubleAccessor (&Icmpv6L4Protocol::MIN_RANDOM_FACTOR),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("MAX_RANDOM_FACTOR", "Neighbor Discovery node constants : max random factor.",
                   DoubleValue (1.5),
                   MakeDoubleAccessor (&Icmpv6L4Protocol::MAX_RANDOM_FACTOR),
                   MakeDoubleChecker<double> ())
  ;
  return tid;
}




  /**
   * \brief Neighbor Discovery router constants : max initial RA initial interval.
   */
  uint8_t MAX_INITIAL_RTR_ADVERT_INTERVAL;

  /**
   * \brief Neighbor Discovery router constants : max initial RA transmission.
   */
  uint8_t MAX_INITIAL_RTR_ADVERTISEMENTS;

  /**
   * \brief Neighbor Discovery router constants : max final RA transmission.
   */
  uint8_t MAX_FINAL_RTR_ADVERTISEMENTS;

  /**
   * \brief Neighbor Discovery router constants : min delay between RA.
   */
  uint8_t MIN_DELAY_BETWEEN_RAS;

  /**
   * \brief Neighbor Discovery router constants : max delay between RA.
   */
  uint32_t MAX_RA_DELAY_TIME;

  /**
   * \brief Neighbor Discovery host constants : max RS delay.
   */
  uint8_t MAX_RTR_SOLICITATION_DELAY;

  /**
   * \brief Neighbor Discovery host constants : RS interval.
   */
  uint8_t RTR_SOLICITATION_INTERVAL;

  /**
   * \brief Neighbor Discovery host constants : max RS transmission.
   */
  uint8_t MAX_RTR_SOLICITATIONS;

  /**
   * \brief Neighbor Discovery node constants : max multicast solicitations.
   */
  uint8_t MAX_MULTICAST_SOLICIT;

  /**
   * \brief Neighbor Discovery node constants : max unicast solicitations.
   */
  uint8_t MAX_UNICAST_SOLICIT;

  /**
   * \brief Neighbor Discovery node constants : max anycast delay.
   */
  uint8_t MAX_ANYCAST_DELAY_TIME;

  /**
   * \brief Neighbor Discovery node constants : max NA transmission.
   */
  uint8_t MAX_NEIGHBOR_ADVERTISEMENT;

  /**
   * \brief Neighbor Discovery node constants : reachable time.
   */
  uint32_t REACHABLE_TIME;

  /**
   * \brief Neighbor Discovery node constants : retransmission timer.
   */
  uint32_t RETRANS_TIMER;

  /**
   * \brief Neighbor Discovery node constants : delay for the first probe.
   */
  uint8_t DELAY_FIRST_PROBE_TIME;
  
  /**
   * \brief Neighbor Discovery node constants : min random factor.
   */
  double MIN_RANDOM_FACTOR;

  /**
   * \brief Neighbor Discovery node constants : max random factor.
   */
  double MAX_RANDOM_FACTOR;

  /**
   * \brief Get ICMPv6 protocol number.

(-)a/src/internet/model/ndisc-cache.cc (-4 / +12 lines)

Lines 417-422 Time NdiscCache::Entry::GetLastReachabilityConfirmation () const	Link Here

417

void NdiscCache::Entry::StartReachableTimer ()

417

void NdiscCache::Entry::StartReachableTimer ()

418

419

  NS_LOG_FUNCTION_NOARGS ();

419

  NS_LOG_FUNCTION_NOARGS ();

420

  Ptr<Ipv6L3Protocol> ipv6 = m_ndCache->GetDevice ()->GetNode ()->GetObject<Ipv6L3Protocol> ();

421

  Ptr<Icmpv6L4Protocol> icmpv6 = ipv6->GetIcmpv6 ();

420

  if (m_nudTimer.IsRunning ())

422

  if (m_nudTimer.IsRunning ())

421

423

422

      m_nudTimer.Cancel ();

424

      m_nudTimer.Cancel ();

Lines 424-430 void NdiscCache::Entry::StartReachableTimer ()	Link Here

424

426

425

  m_lastReachabilityConfirmation = Simulator::Now ();

427

  m_lastReachabilityConfirmation = Simulator::Now ();

426

  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionReachableTimeout, this);

428

  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionReachableTimeout, this);

427

  m_nudTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::REACHABLE_TIME));

429

  m_nudTimer.SetDelay (MilliSeconds (icmpv6->REACHABLE_TIME));

428

  m_nudTimer.Schedule ();

430

  m_nudTimer.Schedule ();

429

431

430

432

Lines 446-481 void NdiscCache::Entry::UpdateReachableTimer ()	Link Here

446

void NdiscCache::Entry::StartProbeTimer ()

448

void NdiscCache::Entry::StartProbeTimer ()

447

449

448

  NS_LOG_FUNCTION_NOARGS ();

450

  NS_LOG_FUNCTION_NOARGS ();

451

  Ptr<Ipv6L3Protocol> ipv6 = m_ndCache->GetDevice ()->GetNode ()->GetObject<Ipv6L3Protocol> ();

452

  Ptr<Icmpv6L4Protocol> icmpv6 = ipv6->GetIcmpv6 ();

449

  if (m_nudTimer.IsRunning ())

453

  if (m_nudTimer.IsRunning ())

450

454

451

      m_nudTimer.Cancel ();

455

      m_nudTimer.Cancel ();

452

456

453

  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionProbeTimeout, this);

457

  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionProbeTimeout, this);

454

  m_nudTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::RETRANS_TIMER));

458

  m_nudTimer.SetDelay (MilliSeconds (icmpv6->RETRANS_TIMER));

455

  m_nudTimer.Schedule ();

459

  m_nudTimer.Schedule ();

456

460

457

461

458

void NdiscCache::Entry::StartDelayTimer ()

462

void NdiscCache::Entry::StartDelayTimer ()

459

463

460

  NS_LOG_FUNCTION_NOARGS ();

464

  NS_LOG_FUNCTION_NOARGS ();

465

  Ptr<Ipv6L3Protocol> ipv6 = m_ndCache->GetDevice ()->GetNode ()->GetObject<Ipv6L3Protocol> ();

466

  Ptr<Icmpv6L4Protocol> icmpv6 = ipv6->GetIcmpv6 ();

461

  if (m_nudTimer.IsRunning ())

467

  if (m_nudTimer.IsRunning ())

462

468

463

      m_nudTimer.Cancel ();

469

      m_nudTimer.Cancel ();

464

470

465

  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionDelayTimeout, this);

471

  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionDelayTimeout, this);

466

  m_nudTimer.SetDelay (Seconds (Icmpv6L4Protocol::DELAY_FIRST_PROBE_TIME));

472

  m_nudTimer.SetDelay (Seconds (icmpv6->DELAY_FIRST_PROBE_TIME));

467

  m_nudTimer.Schedule ();

473

  m_nudTimer.Schedule ();

468

474

469

475

470

void NdiscCache::Entry::StartRetransmitTimer ()

476

void NdiscCache::Entry::StartRetransmitTimer ()

471

477

472

  NS_LOG_FUNCTION_NOARGS ();

478

  NS_LOG_FUNCTION_NOARGS ();

479

  Ptr<Ipv6L3Protocol> ipv6 = m_ndCache->GetDevice ()->GetNode ()->GetObject<Ipv6L3Protocol> ();

480

  Ptr<Icmpv6L4Protocol> icmpv6 = ipv6->GetIcmpv6 ();

473

  if (m_nudTimer.IsRunning ())

481

  if (m_nudTimer.IsRunning ())

474

482

475

      m_nudTimer.Cancel ();

483

      m_nudTimer.Cancel ();

476

484

477

  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionRetransmitTimeout, this);

485

  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionRetransmitTimeout, this);

478

  m_nudTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::RETRANS_TIMER));

486

  m_nudTimer.SetDelay (MilliSeconds (icmpv6->RETRANS_TIMER));

479

  m_nudTimer.Schedule ();

487

  m_nudTimer.Schedule ();

480

488

481

489

Return to bug 2482