commit d1b1bf6666799c64bd7e7e692c29540a08424c8d
author Davide Pesavento <davide.pesavento@lip6.fr> Thu Jul 26 18:05:08 2018 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Thu Jul 26 18:27:16 2018 -0400
tree 4e26f5e1a1d6f8439328464de5d9e5698c49de1f
parent b5b8f9502499f0e804251f3a91b7311eaf867d76

dump: handle exceptions thrown by lp::Packet::wireDecode()

Change-Id: Ia3bd8a4f57c70313a589c197ee453f517664ec43
Refs: #3943

tools/dump/ndndump.cpp

diff --git a/tools/dump/ndndump.cpp b/tools/dump/ndndump.cpp
index 77743a8..4020d45 100644
--- a/tools/dump/ndndump.cpp
+++ b/tools/dump/ndndump.cpp
@@ -189,7 +189,13 @@
   Block netPacket;
 
   if (block.type() == lp::tlv::LpPacket) {
-    lpPacket = lp::Packet(block);
+    try {
+      lpPacket.wireDecode(block);
+    }
+    catch (const tlv::Error& e) {
+      std::cout << os.str() << ", " << "INVALID-NDNLPv2-PACKET: " << e.what() << std::endl;
+      return;
+    }
 
     Buffer::const_iterator begin, end;
     if (lpPacket.has<lp::FragmentField>()) {
@@ -237,7 +243,7 @@
     }
   }
   catch (const tlv::Error& e) {
-    std::cerr << e.what() << std::endl;
+    std::cout << os.str() << ", " << "INVALID-PACKET: " << e.what() << std::endl;
   }
 }