commit 78de735ab0cafcf0e63179d74ba18ea5f186a792
author Davide Pesavento <davide.pesavento@lip6.fr> Sun Jul 22 00:35:45 2018 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Sun Jul 22 00:35:45 2018 -0400
tree d5ba4d268ca13e61f7d0075b56160e37dbd36200
parent 468dbdf326d6473b6f84c0fd8a7e4bb3ba889400

dump: remove dependency on Boost.Regex

Use std::regex instead.

Change-Id: Icb0f88a3f01d16ca53089cdc764d529687eaca81

tools/dump/ndndump.cpp

diff --git a/tools/dump/ndndump.cpp b/tools/dump/ndndump.cpp
index 1fec4f1..9e0d5d4 100644
--- a/tools/dump/ndndump.cpp
+++ b/tools/dump/ndndump.cpp
@@ -95,22 +95,18 @@
     else {
       std::cerr << "ndndump: reading from " << inputFile << std::endl;
     }
-
-    if (!nameFilter.empty()) {
-      std::cerr << "ndndump: using name filter " << nameFilter << std::endl;
-    }
   }
 
   if (!interface.empty()) {
     char errbuf[PCAP_ERRBUF_SIZE];
-    m_pcap = pcap_open_live(interface.c_str(), MAX_SNAPLEN, 0, 1000, errbuf);
+    m_pcap = pcap_open_live(interface.data(), MAX_SNAPLEN, 0, 1000, errbuf);
     if (m_pcap == nullptr) {
       BOOST_THROW_EXCEPTION(Error("Cannot open interface " + interface + " (" + errbuf + ")"));
     }
   }
   else {
     char errbuf[PCAP_ERRBUF_SIZE];
-    m_pcap = pcap_open_offline(inputFile.c_str(), errbuf);
+    m_pcap = pcap_open_offline(inputFile.data(), errbuf);
     if (m_pcap == nullptr) {
       BOOST_THROW_EXCEPTION(Error("Cannot open file " + inputFile + " for reading (" + errbuf + ")"));
     }
@@ -122,7 +118,7 @@
     }
 
     bpf_program program;
-    int res = pcap_compile(m_pcap, &program, pcapProgram.c_str(), 0, PCAP_NETMASK_UNKNOWN);
+    int res = pcap_compile(m_pcap, &program, pcapProgram.data(), 0, PCAP_NETMASK_UNKNOWN);
 
     if (res < 0) {
       BOOST_THROW_EXCEPTION(Error("Cannot parse tcpdump expression '" + pcapProgram +
@@ -145,7 +141,6 @@
   pcap_loop(m_pcap, -1, &Ndndump::onCapturedPacket, reinterpret_cast<uint8_t*>(this));
 }
 
-
 void
 Ndndump::onCapturedPacket(const pcap_pkthdr* header, const uint8_t* packet) const
 {
@@ -408,12 +403,11 @@
 bool
 Ndndump::matchesFilter(const Name& name) const
 {
-  if (nameFilter.empty())
+  if (!nameFilter)
     return true;
 
   /// \todo Switch to NDN regular expressions
-
-  return boost::regex_match(name.toUri(), nameFilter);
+  return std::regex_match(name.toUri(), *nameFilter);
 }
 
 } // namespace dump