Translate UDP/1700 as RADIUS

[tcpdump] / print-geneve.c

diff --git a/print-geneve.c b/print-geneve.c
index cf6d9d1e74fb2f7a9eb87d54efc04fd96e397dfd..7550ba06a1c3435243cd89970a71f9a328332be0 100644 (file)
--- a/print-geneve.c
+++ b/print-geneve.c
@@ -19,9 +19,9 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "ethertype.h"
 
 #include "extract.h"
 #include "ethertype.h"
 


@@ -111,14 +111,14 @@ geneve_opts_print(netdissect_options *ndo, const u_char *bp, u_int len)
         }
 
         if (ndo->ndo_vflag > 1 && opt_len > 4) {
         }
 
         if (ndo->ndo_vflag > 1 && opt_len > 4) {

-            const uint32_t *print_data = (const uint32_t *)(bp + 4);
+            const uint32_t *data = (const uint32_t *)(bp + 4);

             int i;
 
             ND_PRINT((ndo, " data"));
 
             for (i = 4; i < opt_len; i += 4) {
             int i;
 
             ND_PRINT((ndo, " data"));
 
             for (i = 4; i < opt_len; i += 4) {

-                ND_PRINT((ndo, " %08x", EXTRACT_32BITS(print_data)));
-                print_data++;
+                ND_PRINT((ndo, " %08x", EXTRACT_32BITS(data)));
+                data++;

             }
         }
 
             }
         }
 


@@ -131,7 +131,7 @@ void
 geneve_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
     uint8_t ver_opt;
 geneve_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
     uint8_t ver_opt;

-    uint version;
+    u_int version;

     uint8_t flags;
     uint16_t prot;
     uint32_t vni;
     uint8_t flags;
     uint16_t prot;
     uint32_t vni;