diff --git a/src/devices/mesh/dot11s/dot11s-mac-header.cc b/src/devices/mesh/dot11s/dot11s-mac-header.cc index 083fbe455..af9a23286 100644 --- a/src/devices/mesh/dot11s/dot11s-mac-header.cc +++ b/src/devices/mesh/dot11s/dot11s-mac-header.cc @@ -164,8 +164,9 @@ MeshHeader::Deserialize (Buffer::Iterator start) void MeshHeader::Print (std::ostream &os) const { - os << "flags = " << (uint16_t) m_meshFlags << "\nttl = " << (uint16_t) m_meshTtl << "\nseqno = " - << m_meshSeqno << "\naddr4 = " << m_addr4 << "\naddr5 = " << m_addr5 << "\naddr6 = " << m_addr6; + os << "flags = " << (uint16_t) m_meshFlags << std::endl << "ttl = " << (uint16_t) m_meshTtl + << std::endl << "seqno = " << m_meshSeqno << std::endl<< "addr4 = " << m_addr4 << std::endl + << "addr5 = " << m_addr5 << std::endl << "addr6 = " << m_addr6 << std::endl; } bool operator== (const MeshHeader & a, const MeshHeader & b) diff --git a/src/devices/mesh/dot11s/hwmp-protocol-mac.cc b/src/devices/mesh/dot11s/hwmp-protocol-mac.cc index 79ba921b7..5910b3363 100644 --- a/src/devices/mesh/dot11s/hwmp-protocol-mac.cc +++ b/src/devices/mesh/dot11s/hwmp-protocol-mac.cc @@ -448,10 +448,10 @@ HwmpProtocolMac::Statistics::Print (std::ostream & os) const void HwmpProtocolMac::Report (std::ostream & os) const { - os << "GetAddress () << "\">\n"; + os << "GetAddress () << "\">" << std::endl; m_stats.Print (os); - os << "\n"; + os << "" << std::endl; } void HwmpProtocolMac::ResetStats () diff --git a/src/devices/mesh/dot11s/hwmp-protocol.cc b/src/devices/mesh/dot11s/hwmp-protocol.cc index 12ff6e720..2a4229456 100644 --- a/src/devices/mesh/dot11s/hwmp-protocol.cc +++ b/src/devices/mesh/dot11s/hwmp-protocol.cc @@ -53,7 +53,7 @@ HwmpProtocol::GetTypeId () &HwmpProtocol::m_randomStart), MakeTimeChecker () ) - .AddAttribute ( "maxQueueSize", + .AddAttribute ( "MaxQueueSize", "Maximum number of packets we can store when resolving route", UintegerValue (255), MakeUintegerAccessor ( @@ -115,42 +115,42 @@ HwmpProtocol::GetTypeId () &HwmpProtocol::m_dot11MeshHWMPrannInterval), MakeTimeChecker () ) - .AddAttribute ( "maxTtl", + .AddAttribute ( "MaxTtl", "Initial value of Time To Live field", UintegerValue (32), MakeUintegerAccessor ( &HwmpProtocol::m_maxTtl), MakeUintegerChecker (2) ) - .AddAttribute ( "unicastPerrThreshold", + .AddAttribute ( "UnicastPerrThreshold", "Maximum number of PERR receivers, when we send a PERR as a chain of unicasts", UintegerValue (32), MakeUintegerAccessor ( &HwmpProtocol::m_unicastPerrThreshold), MakeUintegerChecker (1) ) - .AddAttribute ( "unicastPreqThreshold", + .AddAttribute ( "UnicastPreqThreshold", "Maximum number of PREQ receivers, when we send a PREQ as a chain of unicasts", UintegerValue (1), MakeUintegerAccessor ( &HwmpProtocol::m_unicastPreqThreshold), MakeUintegerChecker (1) ) - .AddAttribute ( "unicastDataThreshold", + .AddAttribute ( "UnicastDataThreshold", "Maximum number ofbroadcast receivers, when we send a broadcast as a chain of unicasts", UintegerValue (1), MakeUintegerAccessor ( &HwmpProtocol::m_unicastDataThreshold), MakeUintegerChecker (1) ) - .AddAttribute ( "doFlag", + .AddAttribute ( "DoFlag", "Destination only HWMP flag", BooleanValue (false), MakeBooleanAccessor ( &HwmpProtocol::m_doFlag), MakeBooleanChecker () ) - .AddAttribute ( "rfFlag", + .AddAttribute ( "RfFlag", "Reply and forward flag", BooleanValue (true), MakeBooleanAccessor ( @@ -1101,7 +1101,7 @@ void HwmpProtocol::Statistics::Print (std::ostream & os) const "totalDropped=\"" << totalDropped << "\" " "initiatedPreq=\"" << initiatedPreq << "\" " "initiatedPrep=\"" << initiatedPrep << "\" " - "initiatedPerr=\"" << initiatedPerr << "\"\n"; + "initiatedPerr=\"" << initiatedPerr << "\"" << std::endl; } void HwmpProtocol::Report (std::ostream & os) const @@ -1129,7 +1129,7 @@ HwmpProtocol::Report (std::ostream & os) const { plugin->second->Report (os); } - os << "\n"; + os << "" << std::endl; } void HwmpProtocol::ResetStats () diff --git a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc b/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc index eee3b8a6b..3524f966c 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc +++ b/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc @@ -148,11 +148,11 @@ IeBeaconTiming::GetInformationSize () const void IeBeaconTiming::PrintInformation (std::ostream& os) const { - os << "Number of units: " << (uint16_t) m_numOfUnits << "\n"; + os << "Number of units: " << (uint16_t) m_numOfUnits << std::endl; for (NeighboursTimingUnitsList::const_iterator j = m_neighbours.begin (); j != m_neighbours.end (); j++) { os << "AID=" << (uint16_t) (*j)->GetAid () << ", Last beacon was at " << (*j)->GetLastBeacon () - << ", with beacon interval " << (*j)->GetBeaconInterval () << "\n"; + << ", with beacon interval " << (*j)->GetBeaconInterval () << std::endl; } } void diff --git a/src/devices/mesh/dot11s/ie-dot11s-configuration.cc b/src/devices/mesh/dot11s/ie-dot11s-configuration.cc index ef71d71e3..72e07f514 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-configuration.cc +++ b/src/devices/mesh/dot11s/ie-dot11s-configuration.cc @@ -156,12 +156,12 @@ void IeConfiguration::PrintInformation (std::ostream& os) const { os << "Number of neighbors: = " << (uint16_t) m_neighbors - << "\nActive Path Selection Protocol ID: = " << (uint32_t) m_APSPId - << "\nActive Path Selection Metric ID: = " << (uint32_t) m_APSMId - << "\nCongestion Control Mode ID: = " << (uint32_t) m_CCMId - << "\nSynchronize protocol ID: = " << (uint32_t) m_SPId - << "\nAuthentication protocol ID: = " << (uint32_t) m_APId - << "\nCapabilities: = " << m_meshCap.GetUint16 () << "\n"; + << std::endl << "Active Path Selection Protocol ID: = " << (uint32_t) m_APSPId + << std::endl << "Active Path Selection Metric ID: = " << (uint32_t) m_APSMId + << std::endl << "Congestion Control Mode ID: = " << (uint32_t) m_CCMId + << std::endl << "Synchronize protocol ID: = " << (uint32_t) m_SPId + << std::endl << "Authentication protocol ID: = " << (uint32_t) m_APId + << std::endl << "Capabilities: = " << m_meshCap.GetUint16 () << std::endl; } void IeConfiguration::SetRouting (dot11sPathSelectionProtocol routingId) diff --git a/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc b/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc index bf1c28d1d..624ccef5e 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc +++ b/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc @@ -149,11 +149,11 @@ void IePeerManagement::PrintInformation (std::ostream& os) const { - os << " Subtype: = " << (uint16_t) m_subtype << "\n"; - os << " Length: = " << (uint16_t) m_length << "\n"; - os << " LocalLinkId: = " << m_localLinkId << "\n"; - os << " PeerLinkId: = " << m_peerLinkId << "\n"; - os << " ReasonCode: = " << m_reasonCode << "\n"; + os << " Subtype: = " << (uint16_t) m_subtype << std::endl; + os << " Length: = " << (uint16_t) m_length << std::endl; + os << " LocalLinkId: = " << m_localLinkId << std::endl; + os << " PeerLinkId: = " << m_peerLinkId << std::endl; + os << " ReasonCode: = " << m_reasonCode << std::endl; } bool operator== (const IePeerManagement & a, const IePeerManagement & b) diff --git a/src/devices/mesh/dot11s/ie-dot11s-perr.cc b/src/devices/mesh/dot11s/ie-dot11s-perr.cc index f5a127d2c..70ceaa9ba 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-perr.cc +++ b/src/devices/mesh/dot11s/ie-dot11s-perr.cc @@ -45,7 +45,7 @@ IePerr::PrintInformation (std::ostream &os) const os << "Failed destination address: = " << m_addressUnits[j].destination << ", sequence number = " << m_addressUnits[j].seqnum; } - os << "\n"; + os << std::endl; } uint8_t IePerr::GetNumOfDest () diff --git a/src/devices/mesh/dot11s/ie-dot11s-prep.cc b/src/devices/mesh/dot11s/ie-dot11s-prep.cc index a185c82d1..22a440ad8 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-prep.cc +++ b/src/devices/mesh/dot11s/ie-dot11s-prep.cc @@ -190,10 +190,10 @@ IePrep::GetInformationSize () const void IePrep::PrintInformation (std::ostream& os) const { - os << "Flags: = " << m_flags << "\nHopcount: = " << m_hopcount << "\nTTL: = " << m_ttl - << "\nDestination: = " << m_destinationAddress << "\nDest. seqnum: = " << m_destSeqNumber - << "\nLifetime: = " << m_lifetime << "\nMetric: = " << m_metric << "\nOriginator: = " - << m_originatorAddress << "\nOrig. seqnum: = " << m_originatorSeqNumber << "\n"; + os << "Flags: = " << m_flags << std::endl << "Hopcount: = " << m_hopcount << std::endl << "TTL: = " << m_ttl + << std::endl<< "Destination: = " << m_destinationAddress << std::endl << "Dest. seqnum: = " << m_destSeqNumber + << std::endl << "Lifetime: = " << m_lifetime << std::endl<< "Metric: = " << m_metric << std::endl << "Originator: = " + << m_originatorAddress << std::endl << "Orig. seqnum: = " << m_originatorSeqNumber << std::endl; } bool operator== (const IePrep & a, const IePrep & b) diff --git a/src/devices/mesh/dot11s/ie-dot11s-preq.cc b/src/devices/mesh/dot11s/ie-dot11s-preq.cc index e4c8c41e9..943a5e728 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-preq.cc +++ b/src/devices/mesh/dot11s/ie-dot11s-preq.cc @@ -323,17 +323,17 @@ IePreq::GetInformationSize () const void IePreq::PrintInformation (std::ostream &os) const { - os << " originator address = " << m_originatorAddress << "\n"; - os << " TTL = " << (uint16_t) m_ttl << "\n"; - os << " hop count = " << (uint16_t) m_hopCount << "\n"; - os << " metric = " << m_metric << "\n"; - os << " seqno = " << m_originatorSeqNumber << "\n"; - os << " lifetime = " << m_lifetime << "\n"; - os << " preq ID = " << m_preqId << "\n"; - os << " Destinations are:\n"; + os << " originator address = " << m_originatorAddress << "std::endl"; + os << " TTL = " << (uint16_t) m_ttl << "std::endl"; + os << " hop count = " << (uint16_t) m_hopCount << "std::endl"; + os << " metric = " << m_metric << "std::endl"; + os << " seqno = " << m_originatorSeqNumber << "std::endl"; + os << " lifetime = " << m_lifetime << "std::endl"; + os << " preq ID = " << m_preqId << "std::endl"; + os << " Destinations are:std::endl"; for (int j = 0; j < m_destCount; j++) { - os << " " << m_destinations[j]->GetDestinationAddress () << "\n"; + os << " " << m_destinations[j]->GetDestinationAddress () << "std::endl"; } } std::vector > diff --git a/src/devices/mesh/dot11s/ie-dot11s-rann.cc b/src/devices/mesh/dot11s/ie-dot11s-rann.cc index 14c767dbb..23595cdb7 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-rann.cc +++ b/src/devices/mesh/dot11s/ie-dot11s-rann.cc @@ -153,12 +153,12 @@ IeRann::GetInformationSize () const void IeRann::PrintInformation (std::ostream &os) const { - os << " flags = " << (int) m_flags << "\n"; - os << " hop count = " << (int) m_hopcount << "\n"; - os << " TTL = " << (int) m_ttl << "\n"; - os << " originator address = " << m_originatorAddress << "\n"; - os << " dst seq. number = " << m_destSeqNumber << "\n"; - os << " metric = " << m_metric << "\n"; + os << " flags = " << (int) m_flags << "std::endl"; + os << " hop count = " << (int) m_hopcount << "std::endl"; + os << " TTL = " << (int) m_ttl << "std::endl"; + os << " originator address = " << m_originatorAddress << "std::endl"; + os << " dst seq. number = " << m_destSeqNumber << "std::endl"; + os << " metric = " << m_metric << "std::endl"; } bool diff --git a/src/devices/mesh/dot11s/peer-link-frame.cc b/src/devices/mesh/dot11s/peer-link-frame.cc index 1b08b615f..f7540c9c7 100644 --- a/src/devices/mesh/dot11s/peer-link-frame.cc +++ b/src/devices/mesh/dot11s/peer-link-frame.cc @@ -97,9 +97,9 @@ PeerLinkFrameStart::GetInstanceTypeId () const void PeerLinkFrameStart::Print (std::ostream &os) const { - os << "subtype = " << (uint16_t) m_subtype << "\ncapability = " << m_capability << "\naid = " - << (uint16_t) m_aid << "\nrates = " << m_rates << "\nmeshId = " << m_meshId << "\nconfiguration = " - << m_config << "\nreason code = " << m_reasonCode; + os << "subtype = " << (uint16_t) m_subtype << "std::endlcapability = " << m_capability << "std::endlaid = " + << (uint16_t) m_aid << "std::endlrates = " << m_rates << "std::endlmeshId = " << m_meshId << "std::endlconfiguration = " + << m_config << "std::endlreason code = " << m_reasonCode; } uint32_t PeerLinkFrameStart::GetSerializedSize () const diff --git a/src/devices/mesh/dot11s/peer-management-protocol-mac.cc b/src/devices/mesh/dot11s/peer-management-protocol-mac.cc index 141bfe646..7e4c0eec5 100644 --- a/src/devices/mesh/dot11s/peer-management-protocol-mac.cc +++ b/src/devices/mesh/dot11s/peer-management-protocol-mac.cc @@ -288,27 +288,27 @@ void PeerManagementProtocolMac::Statistics::Print (std::ostream & os) const { os << "\n"; + "txOpen=\"" << txOpen << "\"" << std::endl << + "txConfirm=\"" << txConfirm << "\"" << std::endl << + "txClose=\"" << txClose << "\"" << std::endl << + "rxOpen=\"" << rxOpen << "\"" << std::endl << + "rxConfirm=\"" << rxConfirm << "\"" << std::endl << + "rxClose=\"" << rxClose << "\"" << std::endl << + "dropped=\"" << dropped << "\"" << std::endl << + "brokenMgt=\"" << brokenMgt << "\"" << std::endl << + "txMgt=\"" << txMgt << "\"" << std::endl << + "txMgtBytes=\"" << txMgtBytes << "\"" << std::endl << + "rxMgt=\"" << rxMgt << "\"" << std::endl << + "rxMgtBytes=\"" << rxMgtBytes << "\"" << std::endl << + "beaconShift=\"" << beaconShift << "\"/>" << std::endl; } void PeerManagementProtocolMac::Report (std::ostream & os) const { os << "GetAddress () << "\">\n"; + "address=\"" << m_parent->GetAddress () << "\">" << std::endl; m_stats.Print (os); - os << "\n"; + os << "" << std::endl; } void PeerManagementProtocolMac::ResetStats () diff --git a/src/devices/mesh/dot11s/peer-management-protocol.cc b/src/devices/mesh/dot11s/peer-management-protocol.cc index 212555c7a..343290bdd 100644 --- a/src/devices/mesh/dot11s/peer-management-protocol.cc +++ b/src/devices/mesh/dot11s/peer-management-protocol.cc @@ -547,7 +547,7 @@ PeerManagementProtocol::Statistics::Print (std::ostream & os) const void PeerManagementProtocol::Report (std::ostream & os) const { - os << "\n"; + os << "" << std::endl; m_stats.Print (os); for (PeerManagementProtocolMacMap::const_iterator plugins = m_plugins.begin (); plugins != m_plugins.end (); plugins++) { @@ -561,7 +561,7 @@ PeerManagementProtocol::Report (std::ostream & os) const (*i)->Report (os); } } - os << "\n"; + os << "" << std::endl; } void PeerManagementProtocol::ResetStats () diff --git a/src/devices/mesh/flame/flame-header.cc b/src/devices/mesh/flame/flame-header.cc index ad016c3bc..443590156 100644 --- a/src/devices/mesh/flame/flame-header.cc +++ b/src/devices/mesh/flame/flame-header.cc @@ -49,8 +49,8 @@ FlameHeader::GetInstanceTypeId (void) const void FlameHeader::Print (std::ostream &os) const { - os << "Cost = " << (uint16_t) m_cost << "\nSequence number = " << m_seqno - << "\nOrig Destination = " << m_origDst << "\nOrig Source = " << m_origSrc << "\n"; + os << "Cost = " << (uint16_t) m_cost << std::endl << "Sequence number = " << m_seqno + << std::endl << "Orig Destination = " << m_origDst << std::endl << "Orig Source = " << m_origSrc << std::endl; } uint32_t FlameHeader::GetSerializedSize (void) const diff --git a/src/devices/mesh/flame/flame-protocol-mac.cc b/src/devices/mesh/flame/flame-protocol-mac.cc index 9bbb4b5c8..f9b6650c5 100644 --- a/src/devices/mesh/flame/flame-protocol-mac.cc +++ b/src/devices/mesh/flame/flame-protocol-mac.cc @@ -107,15 +107,15 @@ FlameProtocolMac::Statistics::Print (std::ostream &os) const "txBytes=\"" << txBytes << "\" " "rxUnicast=\"" << rxUnicast << "\" " "rxBroadcast=\"" << rxBroadcast << "\" " - "rxBytes=\"" << rxBytes << "\"/>\n"; + "rxBytes=\"" << rxBytes << "\"/>" << std::endl; } void FlameProtocolMac::Report (std::ostream & os) const { - os << "GetAddress () << "\">\n"; + os << "GetAddress () << "\">" << std::endl; m_stats.Print (os); - os << "\n"; + os << "" << std::endl; } void diff --git a/src/devices/mesh/flame/flame-protocol.cc b/src/devices/mesh/flame/flame-protocol.cc index 7e716dd7c..a9b800d4d 100644 --- a/src/devices/mesh/flame/flame-protocol.cc +++ b/src/devices/mesh/flame/flame-protocol.cc @@ -345,21 +345,21 @@ FlameProtocol::Statistics::Print (std::ostream & os) const "txBroadcast=\"" << txBroadcast << "\" " "txBytes=\"" << txBytes << "\" " "droppedTtl=\"" << droppedTtl << "\" " - "totalDropped=\"" << totalDropped << "\"/>\n"; + "totalDropped=\"" << totalDropped << "\"/>" << std::endl; } void FlameProtocol::Report (std::ostream & os) const { os << "\n"; + "address=\"" << m_address << "\"" << std::endl << + "broadcastInterval=\"" << m_broadcastInterval.GetSeconds () << "\"" << std::endl << + "maxCost=\"" << (uint16_t) m_maxCost << "\">" << std::endl; m_stats.Print (os); for (FlamePluginMap::const_iterator plugin = m_interfaces.begin (); plugin != m_interfaces.end (); plugin++) { plugin->second->Report (os); } - os << "\n"; + os << "" << std::endl; } void FlameProtocol::ResetStats () diff --git a/src/devices/mesh/flame/flame-rtable.cc b/src/devices/mesh/flame/flame-rtable.cc index 6449bb0c9..ffb018953 100644 --- a/src/devices/mesh/flame/flame-rtable.cc +++ b/src/devices/mesh/flame/flame-rtable.cc @@ -36,7 +36,7 @@ FlameRtable::GetTypeId () static TypeId tid = TypeId ("ns3::flame::FlameRtable") .SetParent () .AddConstructor () - .AddAttribute ( "lifetime", + .AddAttribute ( "Lifetime", "The lifetime of the routing enrty", TimeValue (Seconds (120)), MakeTimeAccessor ( &FlameRtable::m_lifetime), diff --git a/src/devices/mesh/wifi-information-element.cc b/src/devices/mesh/wifi-information-element.cc index f2a8e9b91..f84ca3c7b 100644 --- a/src/devices/mesh/wifi-information-element.cc +++ b/src/devices/mesh/wifi-information-element.cc @@ -66,9 +66,9 @@ WifiInformationElement::Deserialize (Buffer::Iterator i) void WifiInformationElement::Print (std::ostream &os) const { - os << "\n\n"; + os << std::endl << "" << std::endl; PrintInformation (os); - os << "\n"; + os << "" << std::endl; } bool operator< (WifiInformationElement const & a, WifiInformationElement const & b)