We also turn of *all* protocol name resolution with -n.

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index 02d6a599eab719e0945d56f94eb0d1ecc4f91d4a..eb48de5059bd1fc4f9368477aa09b0614df068f9 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -19,6 +19,9 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

+
+/* \summary: Radius protocol printer */
+

 /*
  * Radius printer routines as specified on:
  *
 /*
  * Radius printer routines as specified on:
  *


@@ -37,6 +40,10 @@
  * RFC 2869:
  *      "RADIUS Extensions"
  *
  * RFC 2869:
  *      "RADIUS Extensions"
  *

+ * RFC 3580:
+ *      "IEEE 802.1X Remote Authentication Dial In User Service (RADIUS)"
+ *      "Usage Guidelines"
+ *

  * RFC 4675:
  *      "RADIUS Attributes for Virtual LAN and Priority Support"
  *
  * RFC 4675:
  *      "RADIUS Attributes for Virtual LAN and Priority Support"
  *


@@ -52,11 +59,11 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

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

 
 #include <string.h>
 
 
 #include <string.h>
 

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

 #include "addrtoname.h"
 #include "extract.h"
 #include "oui.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "oui.h"


@@ -330,6 +337,7 @@ static const char *tunnel_type[]={ NULL,
                                    "GRE",
                                    "DVS",
                                    "IP-in-IP Tunneling",
                                    "GRE",
                                    "DVS",
                                    "IP-in-IP Tunneling",

+                                   "VLAN",

                                  };
 
 /* Tunnel-Medium-Type Attribute standard values */
                                  };
 
 /* Tunnel-Medium-Type Attribute standard values */


@@ -364,7 +372,8 @@ static const char *prompt[]={ "No Echo",
                             };
 
 
                             };
 
 

-struct attrtype { const char *name;      /* Attribute name                 */
+static struct attrtype {
+                  const char *name;      /* Attribute name                 */

                   const char **subtypes; /* Standard Values (if any)       */
                   u_char siz_subtypes;   /* Size of total standard values  */
                   u_char first_subtype;  /* First standard value is 0 or 1 */
                   const char **subtypes; /* Standard Values (if any)       */
                   u_char siz_subtypes;   /* Size of total standard values  */
                   u_char first_subtype;  /* First standard value is 0 or 1 */


@@ -532,7 +541,7 @@ print_attr_string(netdissect_options *ndo,
    }
 
    for (i=0; *data && i < length ; i++, data++)
    }
 
    for (i=0; *data && i < length ; i++, data++)

-       ND_PRINT((ndo, "%c", (*data < 32 || *data > 128) ? '.' : *data));
+       ND_PRINT((ndo, "%c", (*data < 32 || *data > 126) ? '.' : *data));

 
    return;
 
 
    return;
 


@@ -592,7 +601,7 @@ print_vendor_attr(netdissect_options *ndo,
                vendor_type,
                vendor_length));
         for (idx = 0; idx < vendor_length ; idx++, data++)
                vendor_type,
                vendor_length));
         for (idx = 0; idx < vendor_length ; idx++, data++)

-            ND_PRINT((ndo, "%c", (*data < 32 || *data > 128) ? '.' : *data));
+            ND_PRINT((ndo, "%c", (*data < 32 || *data > 126) ? '.' : *data));

         length-=vendor_length;
     }
     return;
         length-=vendor_length;
     }
     return;