bgp: Parse BGP extended message support capability

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index 920bfceb1ea1784a5ca7dbdcf2ca281158d10199..756fff0ffc5a7392eed749b7ffea684636b9cc86 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -100,8 +100,6 @@
 
 #include "netdissect-stdinc.h"
 #include "netdissect.h"
 
 #include "netdissect-stdinc.h"
 #include "netdissect.h"

-#include <string.h>
-#include <stdlib.h>

 
 #include "ip.h"
 #include "ip6.h"
 
 #include "ip.h"
 #include "ip6.h"


@@ -285,8 +283,8 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
                goto invalid;
 
        /* Print all the EID records */
                goto invalid;
 
        /* Print all the EID records */

-       while ((length > packet_offset) && (record_count--)) {
-
+       while ((length > packet_offset) && (record_count != 0)) {
+               record_count--;

                ND_TCHECK_LEN(packet_iterator + packet_offset,
                              MAP_REGISTER_EID_LEN);
                ND_PRINT("\n");
                ND_TCHECK_LEN(packet_iterator + packet_offset,
                              MAP_REGISTER_EID_LEN);
                ND_PRINT("\n");


@@ -328,7 +326,8 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
                ND_PRINT(" %u locator(s)", loc_count);
 
 
                ND_PRINT(" %u locator(s)", loc_count);
 

-               while (loc_count--) {
+               while (loc_count != 0) {
+                       loc_count--;

                        ND_TCHECK_LEN(packet_iterator + packet_offset,
                                      MAP_REGISTER_LOC_LEN);
                        lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset);
                        ND_TCHECK_LEN(packet_iterator + packet_offset,
                                      MAP_REGISTER_LOC_LEN);
                        lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset);