commit c75996344f0918aba6f45652237130313dcc32ed
author Junxiao Shi <git@mail1.yoursunny.com> Sun Jul 24 20:46:24 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Sun Jul 24 20:46:24 2016 +0000
tree ae73acb9d97ab2d43637938d3c437754d30f98e9
parent c1c2b83766be0a2f531f15c45ccf9746cb0e37ce

dump: improve error messages

refs #3683

Change-Id: I84f9fe14567d6197d959769e53217a174ad6d80a

tools/dump/main.cpp

diff --git a/tools/dump/main.cpp b/tools/dump/main.cpp
index 39723fa..2ace7f6 100644
--- a/tools/dump/main.cpp
+++ b/tools/dump/main.cpp
@@ -148,7 +148,12 @@
     return 2;
   }
 
-  instance.run();
+  try {
+    instance.run();
+  }
+  catch (const std::exception& e) {
+    std::cerr << "ERROR: " << e.what() << "\n\n";
+  }
 
   return 0;
 }

tools/dump/ndndump.cpp

diff --git a/tools/dump/ndndump.cpp b/tools/dump/ndndump.cpp
index 95875a9..24084f5 100644
--- a/tools/dump/ndndump.cpp
+++ b/tools/dump/ndndump.cpp
@@ -83,7 +83,7 @@
     const char* pcapDevice = pcap_lookupdev(errbuf);
 
     if (pcapDevice == nullptr) {
-      throw Error(errbuf);
+      BOOST_THROW_EXCEPTION(Error(errbuf));
     }
 
     interface = pcapDevice;
@@ -106,14 +106,14 @@
     char errbuf[PCAP_ERRBUF_SIZE];
     m_pcap = pcap_open_live(interface.c_str(), MAX_SNAPLEN, 0, 1000, errbuf);
     if (m_pcap == nullptr) {
-      throw Error("Cannot open interface " + interface + "(" + errbuf + ")");
+      BOOST_THROW_EXCEPTION(Error("Cannot open interface " + interface + " (" + errbuf + ")"));
     }
   }
   else {
     char errbuf[PCAP_ERRBUF_SIZE];
     m_pcap = pcap_open_offline(inputFile.c_str(), errbuf);
     if (m_pcap == nullptr) {
-      throw Error("Cannot file " + inputFile + " for reading (" + errbuf + ")");
+      BOOST_THROW_EXCEPTION(Error("Cannot open file " + inputFile + " for reading (" + errbuf + ")"));
     }
   }
 
@@ -126,21 +126,21 @@
     int res = pcap_compile(m_pcap, &program, pcapProgram.c_str(), 0, PCAP_NETMASK_UNKNOWN);
 
     if (res < 0) {
-      throw Error("Cannot parse tcpdump expression '" + pcapProgram +
-                  "' (" + pcap_geterr(m_pcap) + ")");
+      BOOST_THROW_EXCEPTION(Error("Cannot parse tcpdump expression '" + pcapProgram +
+                                  "' (" + pcap_geterr(m_pcap) + ")"));
     }
 
     res = pcap_setfilter(m_pcap, &program);
     pcap_freecode(&program);
 
     if (res < 0) {
-      throw Error(std::string("pcap_setfilter failed (") + pcap_geterr(m_pcap) + ")");
+      BOOST_THROW_EXCEPTION(Error(std::string("pcap_setfilter failed (") + pcap_geterr(m_pcap) + ")"));
     }
   }
 
   m_dataLinkType = pcap_datalink(m_pcap);
   if (m_dataLinkType != DLT_EN10MB && m_dataLinkType != DLT_PPP) {
-    throw Error("Unsupported pcap format (" + to_string(m_dataLinkType));
+    BOOST_THROW_EXCEPTION(Error("Unsupported pcap format (" + to_string(m_dataLinkType)));
   }
 
   pcap_loop(m_pcap, -1, &Ndndump::onCapturedPacket, reinterpret_cast<uint8_t*>(this));