Created
February 20, 2018 18:53
-
-
Save qrwteyrutiyoup/6766b5007a8d40088aeb9690e73ddc10 to your computer and use it in GitHub Desktop.
Fixes for the gpsr code posted at http://www.mehic.info/2016/04/greedy-perimeter-stateless-routing-gpsr-in-ns3-25/
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/gpsr/model/gpsr-packet.cc b/src/gpsr/model/gpsr-packet.cc | |
index c831adc..9a23148 100755 | |
--- a/src/gpsr/model/gpsr-packet.cc | |
+++ b/src/gpsr/model/gpsr-packet.cc | |
@@ -282,7 +282,7 @@ operator<< (std::ostream & os, PositionHeader const & h) | |
bool | |
PositionHeader::operator== (PositionHeader const & o) const | |
{ | |
- return (m_dstPosx == o.m_dstPosx && m_dstPosy == m_dstPosy && m_updated == o.m_updated && m_recPosx == o.m_recPosx && m_recPosy == o.m_recPosy && m_inRec == o.m_inRec && m_lastPosx == o.m_lastPosx && m_lastPosy == o.m_lastPosy); | |
+ return (m_dstPosx == o.m_dstPosx && m_dstPosy == o.m_dstPosy && m_updated == o.m_updated && m_recPosx == o.m_recPosx && m_recPosy == o.m_recPosy && m_inRec == o.m_inRec && m_lastPosx == o.m_lastPosx && m_lastPosy == o.m_lastPosy); | |
} | |
diff --git a/src/gpsr/model/gpsr.cc b/src/gpsr/model/gpsr.cc | |
index cbd2a48..4f19aea 100755 | |
--- a/src/gpsr/model/gpsr.cc | |
+++ b/src/gpsr/model/gpsr.cc | |
@@ -117,7 +117,7 @@ RoutingProtocol::GetTypeId (void) | |
MakeEnumAccessor (&RoutingProtocol::LocationServiceName), | |
MakeEnumChecker (GPSR_LS_GOD, "GOD", | |
GPSR_LS_RLS, "RLS")) | |
- .AddAttribute ("PerimeterMode ", "Indicates if PerimeterMode is enabled", | |
+ .AddAttribute ("PerimeterMode", "Indicates if PerimeterMode is enabled", | |
BooleanValue (false), | |
MakeBooleanAccessor (&RoutingProtocol::PerimeterMode), | |
MakeBooleanChecker ()) | |
diff --git a/src/gpsr/model/gpsr.h b/src/gpsr/model/gpsr.h | |
index bca1762..52e34d2 100755 | |
--- a/src/gpsr/model/gpsr.h | |
+++ b/src/gpsr/model/gpsr.h | |
@@ -89,7 +89,7 @@ public: | |
void SetDownTarget (IpL4Protocol::DownTargetCallback callback); | |
IpL4Protocol::DownTargetCallback GetDownTarget (void) const; | |
- virtual void PrintRoutingTable (ns3::Ptr<ns3::OutputStreamWrapper>) const | |
+ virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream, Time::Unit unit = Time::S) const | |
{ | |
return; | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment