Merge remote-tracking branch 'bpf/master'

diff --git a/.travis.yml b/.travis.yml
index ba0647f21a2df7892bc4a39a7de6d1a88e2a1ca1..7c1c84c99663b3846f4c445a18b565ed9460232a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
     - BUILD_IPV6=false
 
 before_script:
-  - sudo apt-get install libssl-dev libssl0.9.8 libssl1.0.0
+  - sudo apt-get install libssl-dev libssl0.9.8 libssl1.0.0 libdnet-dev libsmi2-dev
   - if [ "$BUILD_LIBPCAP" = "true" ]; then ( cd ../ && git clone git://github.com/the-tcpdump-group/libpcap.git && cd libpcap && ./configure && make ); else sudo apt-get install libpcap-dev; fi
 
 script:

diff --git a/print-loopback.c b/print-loopback.c
index 4994c3a290a2549aeb0af058b57b51a1e9be6e8c..9a74ae611397c537fe32ab5c4968e51ce51747a5 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -1,5 +1,5 @@
 /*
- * This module implements decoding of the the Loopback Protocol, originally
+ * This module implements decoding of the Loopback Protocol, originally
  * defined as the Configuration Testing Protocol. It is based on the following
  * specification:
  * http://www.mit.edu/people/jhawk/ctp.pdf

diff --git a/print-ppp.c b/print-ppp.c
index c03ae881dde63c92bd3516ca72aed942404478b8..0b70eed5135285358098ae6c051b11131202ba0e 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -1242,8 +1242,8 @@ print_ccp_config_options(netdissect_options *ndo,
                }
                ND_TCHECK2(*(p + 2), 1);
                ND_PRINT((ndo, ": Features: %u, PxP: %s, History: %u, #CTX-ID: %u",
-                               (p[2] & 0xc0) >> 5,
-                               (p[2] & 0x200) ? "Enabled" : "Disabled",
+                               (p[2] & 0xc0) >> 6,
+                               (p[2] & 0x20) ? "Enabled" : "Disabled",
                                p[2] & 0x1f, p[3]));
                break;
        case CCPOPT_DEFLATE:

diff --git a/print-rx.c b/print-rx.c
index 5f98eb7ac779786c0b3d9cc0581299088659b846..af80c40d7fa3827d62b7bd43b0834d86113f64be 100644 (file)
--- a/print-rx.c
+++ b/print-rx.c
@@ -2776,7 +2776,7 @@ rx_ack_print(netdissect_options *ndo,
                                }
 
                                /*
-                                * Otherwise, if the there is a skip in
+                                * Otherwise, if there is a skip in
                                 * the range (such as an nacked packet in
                                 * the middle of some acked packets),
                                 * then print the current packet number

diff --git a/util.c b/util.c
index 7f4a3785926d409ed851e167607d7fdcc9c6a840..f71f0e8acfbf179ffc1ab63fcdacdef937f22147 100644 (file)
--- a/util.c
+++ b/util.c
@@ -348,7 +348,7 @@ bittok2str_internal(register const struct tok *lp, register const char *fmt,
         }
 
         if (buflen != 0) { /* did we find anything */
-            /* yep, set the the trailing zero 2 bytes before to eliminate the last comma & whitespace */
+            /* yep, set the trailing zero 2 bytes before to eliminate the last comma & whitespace */
             buf[buflen-2] = '\0';
             return (buf);
         }