lalith/ns-3-click-mac: comparison src/devices/mesh/mesh-wifi-interface-mac.cc

equal deleted inserted replaced

-:e206046b2e44
+:b90c6c0af6a3
 MeshWifiInterfaceMac::SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager)
 {
 NS_LOG_FUNCTION (this << stationManager);
 m_stationManager = stationManager;
 for (Queues::const_iterator i = m_queues.begin (); i != m_queues.end (); i ++)
+{
 i->second->SetWifiRemoteStationManager (stationManager);
+}
 m_beaconDca->SetWifiRemoteStationManager (stationManager);
 m_low->SetWifiRemoteStationManager (stationManager);
 }
 void
 NS_LOG_FUNCTION (this);
 NS_ASSERT (m_phy != 0); // need PHY to set/get channel
 Ptr<YansWifiPhy> phy = m_phy->GetObject<YansWifiPhy> ();
 if (phy != 0)
-return phy->GetChannelNumber ();
+{
+return phy->GetChannelNumber ();
+}
 else
-return 0;
+{
+return 0;
+}
 }
 void MeshWifiInterfaceMac::SwitchFrequencyChannel (uint16_t new_id)
 {
 NS_LOG_FUNCTION (this);
 // Filter packet through all installed plugins
 for (PluginList::const_iterator i = m_plugins.end()-1; i != m_plugins.begin()-1; i--)
 {
 bool drop = ! ((*i)->UpdateOutcomingFrame(packet, hdr, from, to));
-if (drop) return; // plugin drops frame
+if (drop)
+{
+return; // plugin drops frame
+}
 }
 // Assert that address1 is set. Assert will fail e.g. if there is no installed routing plugin.
 NS_ASSERT (hdr.GetAddr1() != Mac48Address() );
 }
 //Classify: application sets a tag, which is removed here
 // Get Qos tag:
 AccessClass ac = AC_BE;
 QosTag tag;
-if(packet->RemovePacketTag (tag))
+if (packet->RemovePacketTag (tag))
-ac = QosUtilsMapTidToAc (tag.Get ());
+{
+ac = QosUtilsMapTidToAc (tag.Get ());
+}
 m_stats.sentFrames ++;
 m_stats.sentBytes += packet->GetSize ();
 NS_ASSERT(m_queues.find(ac) != m_queues.end ());
 m_queues[ac]->Queue (packet, hdr);
 }
 //Filter management frames:
 WifiMacHeader header = hdr;
 for (PluginList::const_iterator i = m_plugins.end()-1; i != m_plugins.begin()-1; i--)
 {
 bool drop = ! ((*i)->UpdateOutcomingFrame(packet, header, Mac48Address (), Mac48Address ()));
-if (drop) return; // plugin drops frame
+if (drop)
+{
+return; // plugin drops frame
+}
 }
 m_stats.sentFrames ++;
 m_stats.sentBytes += packet->GetSize ();
 Queues::iterator i = m_queues.find (AC_VO);
 if (i == m_queues.end ())
 {
 for (uint32_t i = 0; i < m_stationManager->GetNBasicModes (); i++)
 {
 WifiMode mode = m_stationManager->GetBasicMode (i);
 if (!rates.IsSupportedRate (mode.GetDataRate ()))
-return false;
+{
+return false;
+}
 }
 return true;
 }
 //-----------------------------------------------------------------------------
 m_beaconSendEvent = Simulator::Schedule (randomStart, &MeshWifiInterfaceMac::SendBeacon, this);
 m_tbtt = Simulator::Now() + randomStart;
 }
 else
-// stop sending beacons
+{
-m_beaconSendEvent.Cancel ();
+// stop sending beacons
+m_beaconSendEvent.Cancel ();
+}
 }
 bool
 MeshWifiInterfaceMac::GetBeaconGeneration () const
 {
 // Form & send beacon
 MeshWifiBeacon beacon (GetSsid (), GetSupportedRates (), m_beaconInterval.GetMicroSeconds ());
 // Ask all plugins to add their specific information elements to beacon
 for (PluginList::const_iterator i = m_plugins.begin(); i != m_plugins.end(); ++i)
-(*i)->UpdateBeacon (beacon);
+{
+(*i)->UpdateBeacon (beacon);
+}
 m_beaconDca->Queue (beacon.CreatePacket(), beacon.CreateHeader(GetAddress (), GetMeshPointAddress ()));
 ScheduleNextBeacon ();
 }
 void
 MeshWifiInterfaceMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
 {
 // Process beacon
-if((hdr->GetAddr1() != GetAddress()) && (hdr->GetAddr1() != Mac48Address::GetBroadcast()))
+if ((hdr->GetAddr1() != GetAddress()) && (hdr->GetAddr1() != Mac48Address::GetBroadcast()))
-return;
+{
+return;
+}
 if (hdr->IsBeacon ())
 {
 m_stats.recvBeacons ++;
 MgtBeaconHeader beacon_hdr;
 Mac48Address from = hdr->GetAddr2 ();
 WifiMode mode = m_phy->GetMode (i);
 if (rates.IsSupportedRate (mode.GetDataRate ()))
 {
 peerSta->AddSupportedMode (mode);
 if (rates.IsBasicRate (mode.GetDataRate ()))
-m_stationManager->AddBasicMode (mode);
+{
+m_stationManager->AddBasicMode (mode);
+}
 }
 }
 }
 }
 else
 }
 // Filter frame through all installed plugins
 for (PluginList::iterator i = m_plugins.begin (); i != m_plugins.end(); ++i)
 {
 bool drop = ! ((*i)->Receive(packet, *hdr));
-if (drop) return; // plugin drops frame
+if (drop)
+{
+return; // plugin drops frame
+}
 }
 // Check if QoS tag exists and add it:
 if (hdr->IsQosData ())
-packet->AddPacketTag (QosTag (hdr->GetQosTid ()));
+{
+packet->AddPacketTag (QosTag (hdr->GetQosTid ()));
+}
 // Forward data up
 if (hdr->IsData ())
+{
 ForwardUp (packet, hdr->GetAddr4(), hdr->GetAddr3());
+}
 }
 uint32_t
 MeshWifiInterfaceMac::GetLinkMetric (Mac48Address peerAddress)
 {
 uint32_t metric = 1;
-if(!m_linkMetricCallback.IsNull ())
+if (!m_linkMetricCallback.IsNull ())
-metric = m_linkMetricCallback(peerAddress, this);
+{
+metric = m_linkMetricCallback(peerAddress, this);
+}
 return metric;
 }
 void
 MeshWifiInterfaceMac::SetLinkMetricCallback (Callback<uint32_t, Mac48Address, Ptr<MeshWifiInterfaceMac> > cb)
 }
 void
 MeshWifiInterfaceMac::SetQueue (Ptr<DcaTxop> queue, AccessClass ac)
 {
 Queues::iterator i = m_queues.find(ac);
-if(i != m_queues.end ())
+if (i != m_queues.end ())
 {
 NS_LOG_WARN("Queue is already set!");
 return;
 }
 m_queues.insert (std::make_pair(ac, queue));
 m_queues[ac]->SetManager (m_dcfManager);
 }
 Ptr<DcaTxop>
 MeshWifiInterfaceMac::GetQueue (AccessClass ac)
 {
-Queues::iterator i = m_queues.find(ac);
+Queues::iterator i = m_queues.find (ac);
 if(i != m_queues.end ())
 {
 NS_LOG_WARN("Queue is not found! Check access class!");
 return 0;
 }

changeset 5125	b90c6c0af6a3
parent 5123	bdd3ae2a9816
child 5126	8e06088a785d