commit a5ae48c45af8c52a4a4d096126c35f2285a32a22
author shockjiang <shock.jiang@gmail.com> Sun Jul 27 23:21:41 2014 -0700
committer shockjiang <shock.jiang@gmail.com> Sun Jul 27 23:21:41 2014 -0700
tree f3eb1d167277eae26c0d9730e1c0996776a88a38
parent 6e3d1ac32b988cc0ef1da36ba330bcf8fb107dfc

wait to be verified

src/rr.cpp

diff --git a/src/rr.cpp b/src/rr.cpp
index 4f55e21..c2700ba 100644
--- a/src/rr.cpp
+++ b/src/rr.cpp
@@ -32,20 +32,9 @@
 {
 }
 
-template<bool T>
-size_t
-RR::wireEncode(EncodingImpl<T> & block) const
-{
-  size_t totalLength = 0;
-  const std::string& msg = this->getRrdata();
-  totalLength += prependByteArrayBlock(block,
-                                       tlv::ndns::RRData,
-                                       reinterpret_cast<const uint8_t*>(msg.c_str()),
-                                       msg.size()
-                                       );
 
-  return totalLength;
-}
+
+
 
 const Block&
 RR::wireEncode() const
@@ -53,7 +42,9 @@
   if (m_wire.hasWire())
     return m_wire;
   EncodingEstimator estimator;
+
   size_t estimatedSize = wireEncode(estimator);
+  //std::cout<<"estmatedSize="<<estimatedSize<<std::endl;
   EncodingBuffer buffer(estimatedSize, 0);
   wireEncode(buffer);
   m_wire = buffer.block();
@@ -67,7 +58,7 @@
     throw Tlv::Error("The supplied block does not contain wire format");
   }
 
-  if (wire.type() != tlv::ndns::RRData)
+  if (wire.type() != ndn::ndns::tlv::RRData)
     throw Tlv::Error("Unexpected TLV type when decoding Content");
 
   m_wire = wire;
@@ -75,14 +66,26 @@
 
   Block::element_const_iterator it = m_wire.elements_begin();
 
-  if (it != m_wire.elements_end() && it->type() == tlv::ndns::RRData)
+  if (it != m_wire.elements_end() && it->type() == ndn::ndns::tlv::RRDataSub1)
     {
-      m_rrData = std::string(reinterpret_cast<const char*>(it->value()), it->value_size());
+      m_id = readNonNegativeInteger(*it);
       it ++;
     } else {
-    throw Tlv::Error("not the RRData Type");
+    throw Tlv::Error("not the RRDataSub1 Type");
   }
 
+  if (it != m_wire.elements_end() && it->type() == ndn::ndns::tlv::RRDataSub2)
+    {
+
+      m_rrData = std::string(reinterpret_cast<const char*>(it->value()),
+                            it->value_size());
+      it ++;
+    } else {
+    throw Tlv::Error("not the RRDataSub2 Type");
+  }
+
+
+
 }
 
 } // namespace ndns