Fix space printing with istr[]

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index d0766e5bbc9ae7ac1645369ab0887de973ebc70a..0d9f67d2c57db123059253ba898c5dd8bc536ae8 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -95,10 +95,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 #include "netdissect.h"
 #include <string.h>
 #include <stdlib.h>
@@ -109,7 +109,6 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|LISP]";
 
 #define IPv4_AFI                       1
 #define IPv6_AFI                       2
@@ -222,8 +221,8 @@ typedef struct map_register_loc {
 
 #define MAP_REGISTER_LOC_LEN sizeof(lisp_map_register_loc)
 
-static inline uint8_t extract_lisp_type(uint8_t);
-static inline uint8_t is_xtr_data_present(uint8_t , uint8_t);
+static uint8_t extract_lisp_type(uint8_t);
+static uint8_t is_xtr_data_present(uint8_t, uint8_t);
 static void lisp_hdr_flag(netdissect_options *, const lisp_map_register_hdr *);
 static void action_flag(netdissect_options *, uint8_t);
 static void loc_hdr_flag(netdissect_options *, uint16_t);
@@ -250,6 +249,7 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        const lisp_map_register_eid *lisp_eid;
        const lisp_map_register_loc *lisp_loc;
 
+       ndo->ndo_protocol = "lisp";
        /* Check if enough bytes for header are available */
        ND_TCHECK_LEN(bp, MAP_REGISTER_HDR_LEN);
        lisp_hdr = (const lisp_map_register_hdr *) bp;
@@ -386,19 +386,21 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        }
        return;
 trunc:
-       ND_PRINT("\n   %s", tstr);
+       nd_print_trunc(ndo);
        return;
 invalid:
-       ND_PRINT("\n   %s", istr);
+       ND_PRINT("%s", istr);
        return;
 }
 
-static inline uint8_t extract_lisp_type(uint8_t lisp_hdr_flags)
+static uint8_t
+extract_lisp_type(uint8_t lisp_hdr_flags)
 {
        return (lisp_hdr_flags) >> TYPE_INDEX;
 }
 
-static inline uint8_t is_xtr_data_present(uint8_t type, uint8_t lisp_hdr_flags)
+static uint8_t
+is_xtr_data_present(uint8_t type, uint8_t lisp_hdr_flags)
 {
        uint8_t xtr_present = 0;