From b2788fad63a1d1208434e7ae139fa595ea00ce96 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Mon, 5 May 2014 08:32:45 -0300
Subject: [PATCH] Simplified error string generation on
 Sniffer::pcap_open_live_extended.

---
 src/sniffer.cpp    | 12 +-----------
 tests/src/icmp.cpp |  6 +++---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index d384ed7..33a761d 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -211,17 +211,7 @@ pcap_open_live_extended(const char *source, int snaplen, int promisc, int to_ms,
     return (p);
     
 fail:
-    if (status == PCAP_ERROR)
-        snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", source,
-                 pcap_geterr(p));
-    else if (status == PCAP_ERROR_NO_SUCH_DEVICE ||
-             status == PCAP_ERROR_PERM_DENIED ||
-             status == PCAP_ERROR_PROMISC_PERM_DENIED)
-        snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s (%s)", source,
-                 pcap_statustostr(status), pcap_geterr(p));
-    else
-        snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", source,
-                pcap_statustostr(status));
+    snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", source, pcap_geterr(p));
     pcap_close(p);
     return (NULL);
 }
diff --git a/tests/src/icmp.cpp b/tests/src/icmp.cpp
index 27f46fc..6eaf559 100644
--- a/tests/src/icmp.cpp
+++ b/tests/src/icmp.cpp
@@ -40,7 +40,7 @@ TEST_F(ICMPTest, DefaultConstructor) {
     EXPECT_EQ(icmp.code(), 0);
     EXPECT_EQ(icmp.type(), ICMP::ECHO_REQUEST);
     EXPECT_EQ(icmp.id(), 0);
-    EXPECT_EQ(icmp.check(), 0);
+    EXPECT_EQ(icmp.checksum(), 0);
 }
 
 TEST_F(ICMPTest, CopyConstructor) {
@@ -79,7 +79,7 @@ TEST_F(ICMPTest, ChecksumOnTimestamp) {
     EthernetII pkt(raw_pkt, sizeof(raw_pkt));
     pkt.serialize();
     EXPECT_EQ(0xb919, pkt.rfind_pdu<IP>().checksum());
-    EXPECT_EQ(0xed8d, pkt.rfind_pdu<ICMP>().check());
+    EXPECT_EQ(0xed8d, pkt.rfind_pdu<ICMP>().checksum());
 }
 
 TEST_F(ICMPTest, AddressMaskRequest) {
@@ -91,7 +91,7 @@ TEST_F(ICMPTest, AddressMaskRequest) {
     EthernetII pkt(raw_pkt, sizeof(raw_pkt));
     IP::serialization_type buffer = pkt.serialize();
     EXPECT_EQ(0xf926, pkt.rfind_pdu<IP>().checksum());
-    EXPECT_EQ(0xeaf9, pkt.rfind_pdu<ICMP>().check());
+    EXPECT_EQ(0xeaf9, pkt.rfind_pdu<ICMP>().checksum());
     EXPECT_EQ(IPv4Address("1.2.3.4"), pkt.rfind_pdu<ICMP>().address_mask());
 }