merge
authorPavel Boyko <boyko@iitp.ru>
Tue, 07 Jul 2009 13:42:58 +0400
changeset 5559 e7b217d30a47
parent 5558 de12546014c4 (current diff)
parent 5557 784e2c6d2336 (diff)
child 5560 bf790e14f13f
merge
src/routing/aodv/aodv-packet.cc
src/routing/aodv/aodv-packet.h
--- a/src/routing/aodv/aodv-packet.cc	Tue Jul 07 13:41:03 2009 +0400
+++ b/src/routing/aodv/aodv-packet.cc	Tue Jul 07 13:42:58 2009 +0400
@@ -34,7 +34,6 @@
 //-----------------------------------------------------------------------------
 RreqHeader::RreqHeader () : rq_flags(0), reserved(0), rq_hop_count(0), rq_bcast_id(0), rq_dst_seqno(0), rq_src_seqno(0)
 {
-  // TODO check defaults in AODV UU
   SetGratiousRrep (false);
   SetDestinationOnly (false);
   SetUnknownSeqno (false);
@@ -254,7 +253,7 @@
   if(prefixSize != 0)
     os << "prefix size " << prefixSize << "\n";
   else os << "\n";
-  os << "source ipv4 " << rp_src
+  os << "source ipv4 " << rp_src << "\n"
   << "life time " << rp_lifetime << "\n"
   << "acknowledgment required flag " << (*this).GetAckRequired() << "\n";
 }
@@ -392,10 +391,9 @@
 void
 RrepAckHeader::Print (std::ostream &os) const
 {
-  // TODO
+  os << "RREP-ACK\n";
 }
 
-
 bool
 RrepAckHeader::operator==(RrepAckHeader const & o) const
 {
@@ -496,7 +494,13 @@
 void
 RerrHeader::Print (std::ostream &os) const
 {
-  // TODO
+  os << "REER\n"
+     << "Unreachable destination (ipv4 address, seq. number):\n";
+  std::map<Ipv4Address, uint32_t>::const_iterator j;
+  for(j = unreachable_dst.begin(); j != unreachable_dst.end(); ++j)
+  {
+    os << (*j).first << ", " << (*j).second << "\n";
+  }
 }
 
 void