Add program_name field in the netdissect_options structure

[tcpdump] / print-geonet.c

diff --git a/print-geonet.c b/print-geonet.c
index edfb7f2d6c0e359d929b8fb3926e169cd9bb76f4..9b61ef202b7b891a5fdb3564164dfed82bc6b913 100644 (file)
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -15,14 +15,13 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
@@ -118,8 +117,8 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
 
        /* Process Common Header */
        if (length < 36)
-               goto malformed;
-               
+               goto invalid;
+
        ND_TCHECK2(*bp, 7);
        version = bp[0] >> 4;
        next_hdr = bp[0] & 0x0f;
@@ -224,7 +223,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
        /* Skip Extended headers */
        if (hdr_size >= 0) {
                if (length < (u_int)hdr_size)
-                       goto malformed;
+                       goto invalid;
                ND_TCHECK2(*bp, hdr_size);
                length -= hdr_size;
                bp += hdr_size;
@@ -234,7 +233,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
                        case 1:
                        case 2: /* BTP A/B */
                                if (length < 4)
-                                       goto malformed;
+                                       goto invalid;
                                ND_TCHECK2(*bp, 4);
                                print_btp(ndo, bp);
                                length -= 4;
@@ -261,7 +260,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
                ND_DEFAULTPRINT(bp, length);
        return;
 
-malformed:
+invalid:
        ND_PRINT((ndo, " Malformed (small) "));
        /* XXX - print the remaining data as hex? */
        return;