ns-3.24: comparison src/devices/mesh/dot11s/hwmp-protocol.cc

equal deleted inserted replaced

-:aa4bd88fadb9
+:765deb024525
 tag.SetSeqno (m_dataSeqno++);
 tag.SetAddress (Mac48Address::GetBroadcast());
 tag.SetTtl (m_maxTtl+1);
 if (m_dataSeqno == 0xffffffff)
 m_dataSeqno = 0;
-NS_LOG_UNCOND("add a tag"<<packet->GetUid());
 packet->AddPacketTag(tag);
 }
 }
 else
 {
 );
 break;
 }
 if ((*i)->GetDestinationAddress () == m_address)
 {
-NS_LOG_UNCOND("PREQ has reached destination:"<<m_address);
 preq.DelDestinationAddressElement ((*i)->GetDestinationAddress());
 SendPrep (
 m_address,
 preq.GetOriginatorAddress (),
 from,
 //m_routingInfoCallback (newInfo);
 //chack if must retransmit:
 if (preq.GetDestCount () == 0)
 return;
 //Forward PREQ to all interfaces:
-NS_LOG_UNCOND("I am "<<m_address<<"retransmitting PREQ:"<<preq);
+NS_LOG_DEBUG("I am "<<m_address<<"retransmitting PREQ:"<<preq);
 for(HwmpPluginMap::iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
 i->second->SendPreq (preq);
 }
 void
 HwmpProtocol::ReceivePrep (IePrep prep, Mac48Address from, uint32_t interface)
 {
 prep.IncrementMetric (1);
 //acceptance cretirea:
-NS_LOG_UNCOND("I am "<<m_address<<", received prep");
+NS_LOG_DEBUG("I am "<<m_address<<", received prep");
 std::map<Mac48Address, uint32_t>::iterator i = m_lastHwmpSeqno.find (prep.GetOriginatorAddress());
 if (i == m_lastHwmpSeqno.end ())
 {
 m_lastHwmpSeqno[prep.GetOriginatorAddress ()] = prep.GetOriginatorSeqNumber();
 }
 HwmpRtable::LookupResult result = m_rtable->LookupReactive(prep.GetDestinationAddress());
 if (result.retransmitter == Mac48Address::GetBroadcast ())
 //try to look for default route
 result = m_rtable->LookupProactive ();
 if (result.retransmitter == Mac48Address::GetBroadcast ())
-{
-NS_LOG_UNCOND("I am "<<m_address<<", can not forward prep");
 return;
-}
 m_rtable->AddPrecursor (prep.GetOriginatorAddress (), interface, result.retransmitter);
 //Forward PREP
 HwmpPluginMap::iterator prep_sender = m_interfaces.find (result.ifIndex);
 NS_ASSERT(prep_sender != m_interfaces.end ());
 prep_sender->second->SendPrep(prep, result.retransmitter);
 }
 void
 HwmpProtocol::ReceivePerr (IePerr perr, Mac48Address from, uint32_t interface)
 {
 //Acceptance cretirea:
-NS_LOG_UNCOND("I am "<<m_address<<", received PERR from "<<from);
+NS_LOG_DEBUG("I am "<<m_address<<", received PERR from "<<from);
 std::vector<IePerr::FailedDestination> destinations = perr.GetAddressUnitVector ();
 HwmpRtable::LookupResult result;
 for(unsigned int i = 0; i < destinations.size (); i ++)
 {
 result = m_rtable->LookupReactive (destinations[i].destination);
-NS_LOG_UNCOND("Destination = "<<destinations[i].destination<<", RA = "<<result.retransmitter);
+NS_LOG_DEBUG("Destination = "<<destinations[i].destination<<", RA = "<<result.retransmitter);
 if (
 (result.retransmitter != from) ||
 (result.ifIndex != interface) ||
 (result.seqnum > destinations[i].seqnum)
 )
 }
 m_rtable->DeleteReactivePath(destinations[i].destination);
 }
 if(perr.GetNumOfDest () == 0)
 return;
+NS_LOG_UNCOND("Forward PERR");
 MakePathError (destinations);
 }
 void
 HwmpProtocol::SendPrep (
 Mac48Address src,
 uint32_t originatorDsn,
 uint32_t destinationSN,
 uint32_t lifetime,
 uint32_t interface)
 {
-NS_LOG_UNCOND("sending prep to "<<dst<<" through "<<retransmitter);
 IePrep prep;
 prep.SetHopcount (0);
 prep.SetTtl (m_maxTtl);
 prep.SetDestinationAddress (dst);
 prep.SetDestinationSeqNumber (destinationSN);
 mac->InstallPlugin (hwmpMac);
 }
 mp->SetRoutingProtocol (this);
 // Mesh point aggregates all installed protocols
 mp->AggregateObject (this);
-//Address tmp_addr = mp->GetAddress ();
-//Mac48Address * address = dynamic_cast<Mac48Address *> (&tmp_addr);
-//if (address == NULL)
-//  return false;
 m_address = Mac48Address::ConvertFrom (mp->GetAddress ());//* address;
 return true;
 }
 void
 HwmpProtocol::PeerLinkStatus(Mac48Address peerAddress, uint32_t interface, bool status)
 {
 if(status)
-{
+m_rtable->AddReactivePath(peerAddress, peerAddress, interface, 1, Seconds (0), 0);
-// m_rtable->AddReactivePath(peerAddress, peerAddress, interface, 1, Seconds (0), 0);
-}
 else
 {
 std::vector<IePerr::FailedDestination> destinations = m_rtable->GetUnreachableDestinations (peerAddress);
 MakePathError (destinations);
 }
 return true;
 m_lastDataSeqno[source] = seqno;
 }
 return false;
 }
-#if 0
-void
-HwmpProtocol::ObtainRoutingInformation (
-HwmpProtocolState::INFO info
-)
-{
-switch (info.type)
-{
-case HwmpProtocolState::INFO_PREP:
-if (info.me != info.source)
-{
-m_rtable->AddPrecursor (info.source, info.outPort, info.nextHop);
-m_rtable->AddPrecursor (info.destination, info.outPort, info.prevHop);
-NS_LOG_DEBUG ("path to "<<info.source<<" precursor is "<<info.nextHop);
-NS_LOG_DEBUG ("path to "<<info.destination<<" precursor is "<<info.prevHop);
-}
-case HwmpProtocolState::INFO_PREQ:
-m_rtable->AddReactivePath (
-info.destination,
-info.nextHop,
-info.outPort,
-info.metric,
-info.lifetime,
-info.dsn);
-SendAllPossiblePackets (info.destination);
-break;
-case HwmpProtocolState::INFO_PERR:
-//delete first subentry
-case HwmpProtocolState::INFO_PROACTIVE:
-//add information to the root MP.
-m_rtable->AddProactivePath (
-info.metric,
-info.destination,
-info.nextHop,
-info.outPort,
-info.lifetime,
-info.dsn);
-//Set mode as PROACTIVE:
-SetProactive (info.outPort);
-break;
-case HwmpProtocolState::INFO_NEW_PEER:
-#if 0
-m_rtable->AddReactivePath (
-info.destination,
-info.nextHop,
-info.outPort,
-info.metric,
-Seconds (0),
-0);
-#endif
-break;
-case HwmpProtocolState::INFO_FAILED_PEER:
-/**
-* Conditions for generating PERR
-*/
-{
-NS_LOG_DEBUG ("Failed peer"<<info.destination);
-std::vector<HwmpRtable::FailedDestination> failedDestinations =
-m_rtable->GetUnreachableDestinations (info.destination, info.outPort);
-/**
-* Entry about peer does not contain seqnum
-*/
-HwmpRtable::FailedDestination peer;
-peer.destination = info.destination;
-peer.seqnum = 0;
-failedDestinations.push_back (peer);
-MakePathError (failedDestinations, info.outPort);
-}
-break;
-default:
-return;
-}
-}
-#endif
 void
 HwmpProtocol::MakePathError (std::vector<IePerr::FailedDestination> destinations)
 {
-NS_LOG_UNCOND ("START PERR, I am "<<m_address);
-//TODO:
-//make a perr IE and send
 //HwmpRtable increments a sequence number as written in 11B.9.7.2
-NS_LOG_UNCOND("Number of unreachable destinations:"<<destinations.size ());
-for(std::vector<IePerr::FailedDestination>::iterator i =  destinations.begin (); i != destinations.end (); i ++)
-{
-HwmpRtable::LookupResult result = m_rtable->LookupReactiveExpired (i->destination);
-NS_LOG_UNCOND("Address::"<<i->destination<<", next hop is "<<result.retransmitter);
-}
 std::vector<std::pair<uint32_t, Mac48Address> > receivers = GetPerrReceivers (destinations);
-NS_LOG_UNCOND("Number of perr receivers:"<<receivers.size ());
 if(receivers.size () == 0)
 return;
-for(std::vector<std::pair<uint32_t, Mac48Address> >::iterator i = receivers.begin (); i != receivers.end (); i ++)
-NS_LOG_UNCOND("Address:"<<i->second<<", interface:"<<i->first);
-//form a path error and send it to proper ports
 IePerr perr;
 for(unsigned int i = 0; i < destinations.size (); i ++)
 {
 perr.AddAddressUnit(destinations[i]);
 m_rtable->DeleteReactivePath(destinations[i].destination);
 for(unsigned int j = 0; j < receivers.size(); j ++)
 if(i->first == receivers[j].first)
 receivers_for_interface.push_back(receivers[j].second);
 i->second->SendOnePerr (perr, receivers_for_interface);
 }
 }
 std::vector<std::pair<uint32_t, Mac48Address> >
 HwmpProtocol::GetPerrReceivers (std::vector<IePerr::FailedDestination> failedDest)
 {
 HwmpRtable::PrecursorList retval;
 m_rtable->DeleteProactivePath(failedDest[i].destination);
 for (unsigned int j = 0; j < precursors.size (); j ++)
 retval.push_back(precursors[j]);
 }
 //Check if we have dublicates in retval and precursors:
-unsigned int size = retval.size();
+for (unsigned int i = 0; i < retval.size(); i ++)
-for (unsigned int i = 0; i < size; i ++)
+for (unsigned int j = i; j < retval.size(); j ++)
-for (unsigned int j = i; j < size; j ++)
 if(retval[i].second == retval[j].second)
-{
-//erase and check size
-NS_LOG_UNCOND("deleting dublicate");
 retval.erase(retval.begin() + j);
-size --;
-}
 return retval;
 }
 std::vector<Mac48Address>
 HwmpProtocol::GetPreqReceivers (uint32_t interface)
 {
 HwmpProtocol::ShouldSendPreq (Mac48Address dst)
 {
 std::map<Mac48Address, EventId>::iterator i = m_preqTimeouts.find (dst);
 if (i == m_preqTimeouts.end ())
 {
-NS_LOG_UNCOND("Timeout is:" <<2*(m_dot11MeshHWMPnetDiameterTraversalTime.GetMilliSeconds()));
 m_preqTimeouts[dst] = Simulator::Schedule (
 MilliSeconds (2*(m_dot11MeshHWMPnetDiameterTraversalTime.GetMilliSeconds())),
 &HwmpProtocol::RetryPathDiscovery, this, dst, 0);
 return true;
 }
 NS_ASSERT (i !=  m_preqTimeouts.end());
 m_preqTimeouts.erase (i);
 return;
 }
 for(HwmpPluginMap::iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
-{
 i->second->RequestDestination(dst);
-i->second->RequestDestination(Mac48Address("00:00:00:00:00:10"));
-i->second->RequestDestination(Mac48Address("00:00:00:00:00:24"));
-}
 m_preqTimeouts[dst] = Simulator::Schedule (
 MilliSeconds (2*(m_dot11MeshHWMPnetDiameterTraversalTime.GetMilliSeconds())),
 &HwmpProtocol::RetryPathDiscovery, this, dst, numOfRetry);
 }
 //Proactive PREQ routines:

changeset 4925	765deb024525
parent 4924	aa4bd88fadb9
child 4926	a9382a693fa1