Add program_name field in the netdissect_options structure

[tcpdump] / print-gre.c

diff --git a/print-gre.c b/print-gre.c
index 604a969604648abfc0094a8b1e6dc5f137b1b292..ee26d0d3c21542fbc9d2e203bf0e86bb93ef4eda 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -36,7 +36,6 @@
  * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE)
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -45,7 +44,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "ethertype.h"
 
@@ -200,11 +199,9 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        case ETHERTYPE_IP:
                ip_print(ndo, bp, len);
                break;
-#ifdef INET6
        case ETHERTYPE_IPV6:
                ip6_print(ndo, bp, len);
                break;
-#endif
        case ETHERTYPE_MPLS:
                mpls_print(ndo, bp, len);
                break;
@@ -317,15 +314,15 @@ gre_sre_print(netdissect_options *ndo, uint16_t af, uint8_t sreoff,
        case GRESRE_IP:
                ND_PRINT((ndo, ", (rtaf=ip"));
                gre_sre_ip_print(ndo, sreoff, srelen, bp, len);
-               ND_PRINT((ndo, ") "));
+               ND_PRINT((ndo, ")"));
                break;
        case GRESRE_ASN:
                ND_PRINT((ndo, ", (rtaf=asn"));
                gre_sre_asn_print(ndo, sreoff, srelen, bp, len);
-               ND_PRINT((ndo, ") "));
+               ND_PRINT((ndo, ")"));
                break;
        default:
-               ND_PRINT((ndo, ", (rtaf=0x%x) ", af));
+               ND_PRINT((ndo, ", (rtaf=0x%x)", af));
        }
 }