tomh/ns-3-dev-spectrum-wifi: comparison src/devices/mesh/dot11s/hwmp-protocol.cc

equal deleted inserted replaced

-:cdd13648776b
+:d390c2dd2f14
 "Lifetime of poractive routing information",
 TimeValue (MicroSeconds (1024*5000)),
 MakeTimeAccessor (&HwmpProtocol::m_dot11MeshHWMPactiveRootTimeout),
 MakeTimeChecker ()
 )
-.AddAttribute ("dot11MeshHWMPactiveRootTimeout",
-"Lifetime of poractive routing information",
-TimeValue (MicroSeconds (1024*5000)),
-MakeTimeAccessor (&HwmpProtocol::m_dot11MeshHWMPactiveRootTimeout),
-MakeTimeChecker ()
-)
 .AddAttribute ("dot11MeshHWMPactivePathTimeout",
 "Lifetime of reactive routing information",
 TimeValue (MicroSeconds (1024*5000)),
 MakeTimeAccessor (&HwmpProtocol::m_dot11MeshHWMPactivePathTimeout),
 MakeTimeChecker ()
 .AddAttribute ("dot11MeshHWMPrannInterval",
 "Lifetime of poractive routing information",
 TimeValue (MicroSeconds (1024*5000)),
 MakeTimeAccessor (&HwmpProtocol::m_dot11MeshHWMPrannInterval),
 MakeTimeChecker ()
+)
+.AddAttribute ("maxQueueSize",
+"Maximum number of packets we can store when resolving route",
+UintegerValue (255),
+MakeUintegerAccessor (&HwmpProtocol::m_maxQueueSize),
+MakeUintegerChecker<uint16_t> (1)
+)
+.AddAttribute ("maxTtl",
+"Initial value of Time To Live field",
+UintegerValue (32),
+MakeUintegerAccessor (&HwmpProtocol::m_maxTtl),
+MakeUintegerChecker<uint8_t> (1)
 );
 return tid;
 }
 HwmpProtocol::HwmpProtocol ():
 m_dataSeqno(0),
 m_hwmpSeqno(0),
-m_maxTtl (32),
 m_rtable (CreateObject<HwmpRtable> ())
 {
 }
 HwmpProtocol::~HwmpProtocol ()
 m_dataSeqno = 0;
 packet->AddTag(tag);
 if (destination == Mac48Address::GetBroadcast ())
 {
 //Reply immediately
-routeReply (true, packet, source, destination, protocolType, 0xffffffff);
+routeReply (true, packet, source, destination, protocolType, HwmpRtable::INTERFACE_ANY);
 }
 else
 {
 }
 // packet from own interface
 {
 NS_ASSERT (packet->FindFirstMatchingTag(tag));
 if (destination == Mac48Address::GetBroadcast ())
 //reply immediately
-routeReply (true, packet, source, destination, protocolType, 0xffffffff);
+routeReply (true, packet, source, destination, protocolType, HwmpRtable::INTERFACE_ANY);
 else
 {
 NS_ASSERT(false);
 }
 }
 true,
 packet,
 source,
 destination,
 protocolType,
-HwmpRtable::PORT_ANY
+HwmpRtable::INTERFACE_ANY
 );
 return true;
 }
 result = m_rtable->LookupReactive (destination);
 if (result.retransmitter == Mac48Address::GetBroadcast ())
 HwmpProtocol::SetRoot (uint32_t port)
 {
 int position = 0;
 for (std::vector<Ptr<HwmpProtocolState> >::iterator i = m_hwmpStates.begin (); i != m_hwmpStates.end(); i++)
 {
-if (((*i)->GetAssociatedIfaceId () == port)||(port == HwmpRtable::PORT_ANY))
+if (((*i)->GetAssociatedIfaceId () == port)||(port == HwmpRtable::INTERFACE_ANY))
 {
 if (m_hwmpStates[position]->SetRoot ())
 {
 m_modes[position] = ROOT;
 NS_LOG_DEBUG ("I am proactive");
 HwmpProtocol::UnSetRoot (uint32_t port)
 {
 int position = 0;
 for (std::vector<Ptr<HwmpProtocolState> >::iterator i = m_hwmpStates.begin (); i != m_hwmpStates.end(); i++)
 {
-if (((*i)->GetAssociatedIfaceId () == port)||(port == HwmpRtable::PORT_ANY))
+if (((*i)->GetAssociatedIfaceId () == port)||(port == HwmpRtable::INTERFACE_ANY))
 {
 m_modes[position] = REACTIVE;
 m_hwmpStates[position]->UnSetRoot ();
 }
 position ++;
 m_rtable->DeleteProactivePath (failedDest[i].destination, port);
 }
 return retransmitters;
 }
 #endif
-void
-HwmpProtocol::SetMaxQueueSize (int maxPacketsPerDestination)
-{
-}
 bool
 HwmpProtocol::QueuePacket (MeshL2RoutingProtocol::QueuedPacket packet)
 {
-#if 0
+if (m_rqueue.size () > m_maxQueueSize)
-if ((int)m_rqueue[packet.dst].size () > m_maxQueueSize)
 return false;
-m_rqueue[packet.dst].push (packet);
+m_rqueue.push_back (packet);
-#endif
 return true;
 }
 MeshL2RoutingProtocol::QueuedPacket
-HwmpProtocol::DequeuePacket (Mac48Address dst)
+HwmpProtocol::DequeueFirstPacketByDst (Mac48Address dst)
 {
 MeshL2RoutingProtocol::QueuedPacket retval;
-#if 0
 retval.pkt = NULL;
-//Ptr<Packet> in this structure is NULL when queue is empty
+for(std::vector<QueuedPacket>::iterator i = m_rqueue.begin (); i != m_rqueue.end (); i++)
-std::map<Mac48Address, std::queue<QueuedPacket> >:: iterator i = m_rqueue.find (dst);
+if((*i).dst == dst)
-if (i == m_rqueue.end ())
+{
-return retval;
+retval = (*i);
-if ((int)m_rqueue[dst].size () == 0)
-return retval;
-if ((int)i->second.size () == 0)
-{
 m_rqueue.erase (i);
-return retval;
+break;
 }
-retval = m_rqueue[dst].front ();
-m_rqueue[dst].pop ();
-#endif
 return retval;
 }
-void
+MeshL2RoutingProtocol::QueuedPacket
-HwmpProtocol::SendAllPossiblePackets (Mac48Address dst)
+HwmpProtocol::DequeueFirstPacket ()
 {
-#if 0
+MeshL2RoutingProtocol::QueuedPacket retval;
+retval.pkt = NULL;
+if(m_rqueue.size () != 0)
+retval = m_rqueue[0];
+m_rqueue.erase (m_rqueue.begin ());
+return retval;
+}
+void
+HwmpProtocol::ReactivePathResolved (Mac48Address dst)
+{
 HwmpRtable::LookupResult result = m_rtable->LookupReactive (dst);
+NS_ASSERT(result.retransmitter != Mac48Address::GetBroadcast ());
+//Send all packets stored for this destination
 MeshL2RoutingProtocol::QueuedPacket packet;
 while (1)
+{
-{
+packet = DequeueFirstPacketByDst (dst);
-packet = DequeuePacket (dst);
+if (packet.pkt == NULL)
-if (packet.pkt == NULL)
+return;
-return;
+//set RA tag for retransmitter:
-//set RA tag for retransmitter:
+HwmpTag tag;
-HwmpProtocolTag tag;
+NS_ASSERT (packet.pkt->FindFirstMatchingTag(tag));
-NS_ASSERT (packet.pkt->FindFirstMatchingTag(tag));
+tag.SetAddress (result.retransmitter);
-tag.SetAddress (result.retransmitter);
+packet.pkt->RemoveAllTags ();
-NS_ASSERT (result.retransmitter != Mac48Address::GetBroadcast());
+packet.pkt->AddTag (tag);
-packet.pkt->RemoveAllTags ();
+packet.reply (true, packet.pkt, packet.src, packet.dst, packet.protocol, result.ifIndex);
-packet.pkt->AddTag (tag);
+}
-packet.reply (true, packet.pkt, packet.src, packet.dst, packet.protocol, result.ifIndex);
+}
-}
+void
-#endif
+HwmpProtocol::ProactivePathResolved ()
-}
+{
+//send all packets to root
+HwmpRtable::LookupResult result = m_rtable->LookupProactive ();
+NS_ASSERT(result.retransmitter != Mac48Address::GetBroadcast ());
+NS_ASSERT(false);
+}
 bool
 HwmpProtocol::ShouldSendPreq (Mac48Address dst)
 {
 std::map<Mac48Address, EventId>::iterator i = m_preqTimeouts.find (dst);
 if (i == m_preqTimeouts.end ())
 return false;
 }
 void
 HwmpProtocol::RetryPathDiscovery (Mac48Address dst, uint8_t numOfRetry)
 {
-#if 0
 HwmpRtable::LookupResult result = m_rtable->LookupReactive (dst);
+if(result.retransmitter == Mac48Address::GetBroadcast ())
+result = m_rtable->LookupProactive ();
 if (result.retransmitter != Mac48Address::GetBroadcast ())
 {
 std::map<Mac48Address, EventId>::iterator i = m_preqTimeouts.find (dst);
 NS_ASSERT (i !=  m_preqTimeouts.end());
 m_preqTimeouts.erase (i);
 return;
 }
 numOfRetry++;
-if (numOfRetry > dot11sParameters::dot11MeshHWMPmaxPREQretries)
+if (numOfRetry > m_dot11MeshHWMPmaxPREQretries)
 {
 MeshL2RoutingProtocol::QueuedPacket packet;
 //purge queue and delete entry from retryDatabase
 while (1)
 {
-packet = DequeuePacket (dst);
+packet = DequeueFirstPacketByDst (dst);
 if (packet.pkt == NULL)
 break;
 packet.reply (false, packet.pkt, packet.src, packet.dst, packet.protocol, HwmpRtable::MAX_METRIC);
 }
 std::map<Mac48Address, EventId>::iterator i = m_preqTimeouts.find (dst);
 NS_ASSERT (i !=  m_preqTimeouts.end());
 m_preqTimeouts.erase (i);
 return;
 }
-#if 0
+//TODO: Request a destination again
-for (unsigned int i = 0; i < m_requestCallback.size (); i++)
+NS_ASSERT(false);
-if ((m_modes[i] == REACTIVE) || (m_modes[i] == ROOT))
-m_requestCallback[i] (dst);
-#endif
 m_preqTimeouts[dst] = Simulator::Schedule (
-MilliSeconds (2*(dot11sParameters::dot11MeshHWMPnetDiameterTraversalTime.GetMilliSeconds())),
+MilliSeconds (2*(m_dot11MeshHWMPnetDiameterTraversalTime.GetMilliSeconds())),
 &HwmpProtocol::RetryPathDiscovery, this, dst, numOfRetry);
-#endif
 }
 } //namespace dot11s
 } //namespace ns3

changeset 4893	d390c2dd2f14
parent 4892	cdd13648776b
child 4894	a6cf8696922a