CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index c2022c8daa03dd8fadce0c64b567c190247493a4..598db8e6dd02ebb3ce1a086c7319da9ea46446fa 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,59 +40,107 @@
  * RFC 2869:
  *      "RADIUS Extensions"
  *
  * RFC 2869:
  *      "RADIUS Extensions"
  *

+ * RFC 3162:
+ *      "RADIUS and IPv6"
+ *
+ * RFC 3580:
+ *      "IEEE 802.1X Remote Authentication Dial In User Service (RADIUS)"
+ *      "Usage Guidelines"
+ *
+ * RFC 4072:
+ *      "Diameter Extensible Authentication Protocol (EAP) Application"
+ *
+ * RFC 4675:
+ *      "RADIUS Attributes for Virtual LAN and Priority Support"
+ *
+ * RFC 4818:
+ *      "RADIUS Delegated-IPv6-Prefix Attribute"
+ *
+ * RFC 4849:
+ *      "RADIUS Filter Rule Attribute"
+ *
+ * RFC 5090:
+ *      "RADIUS Extension for Digest Authentication"
+ *
+ * RFC 5176:
+ *      "Dynamic Authorization Extensions to RADIUS"
+ *
+ * RFC 5447:
+ *      "Diameter Mobile IPv6"
+ *
+ * RFC 5580:
+ *      "Carrying Location Objects in RADIUS and Diameter"
+ *
+ * RFC 6572:
+ *      "RADIUS Support for Proxy Mobile IPv6"
+ *
+ * RFC 7155:
+ *      "Diameter Network Access Server Application"
+ *

  * Alfredo Andres Omella ([email protected]) v0.1 2000/09/15
  *
  * TODO: Among other things to print ok MacIntosh and Vendor values
  */
 
  * Alfredo Andres Omella ([email protected]) v0.1 2000/09/15
  *
  * TODO: Among other things to print ok MacIntosh and Vendor values
  */
 

-#define NETDISSECT_REWORKED
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

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

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

-#include "interface.h"
+#include "netdissect-ctype.h"
+
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"

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

-
-static const char tstr[] = " [|radius]";
+#include "ntp.h"

 
 #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) )
 
 #define PRINT_HEX(bytes_len, ptr_data)                               \
            while(bytes_len)                                          \
            {                                                         \
 
 #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) )
 
 #define PRINT_HEX(bytes_len, ptr_data)                               \
            while(bytes_len)                                          \
            {                                                         \

-              ND_PRINT((ndo, "%02X", *ptr_data ));                   \
+              ND_PRINT("%02X", GET_U_1(ptr_data));                   \

               ptr_data++;                                            \
               bytes_len--;                                           \
            }
 
               ptr_data++;                                            \
               bytes_len--;                                           \
            }
 

-

 /* Radius packet codes */
 /* Radius packet codes */

-#define RADCMD_ACCESS_REQ   1 /* Access-Request      */
-#define RADCMD_ACCESS_ACC   2 /* Access-Accept       */
-#define RADCMD_ACCESS_REJ   3 /* Access-Reject       */
-#define RADCMD_ACCOUN_REQ   4 /* Accounting-Request  */
-#define RADCMD_ACCOUN_RES   5 /* Accounting-Response */
-#define RADCMD_ACCESS_CHA  11 /* Access-Challenge    */
-#define RADCMD_STATUS_SER  12 /* Status-Server       */
-#define RADCMD_STATUS_CLI  13 /* Status-Client       */
-#define RADCMD_RESERVED   255 /* Reserved            */
+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-27 */
+#define RADCMD_ACCESS_REQ    1 /* Access-Request      */
+#define RADCMD_ACCESS_ACC    2 /* Access-Accept       */
+#define RADCMD_ACCESS_REJ    3 /* Access-Reject       */
+#define RADCMD_ACCOUNT_REQ   4 /* Accounting-Request  */
+#define RADCMD_ACCOUNT_RES   5 /* Accounting-Response */
+#define RADCMD_ACCESS_CHA   11 /* Access-Challenge    */
+#define RADCMD_STATUS_SER   12 /* Status-Server       */
+#define RADCMD_STATUS_CLI   13 /* Status-Client       */
+#define RADCMD_DISCON_REQ   40 /* Disconnect-Request  */
+#define RADCMD_DISCON_ACK   41 /* Disconnect-ACK      */
+#define RADCMD_DISCON_NAK   42 /* Disconnect-NAK      */
+#define RADCMD_COA_REQ      43 /* CoA-Request         */
+#define RADCMD_COA_ACK      44 /* CoA-ACK             */
+#define RADCMD_COA_NAK      45 /* CoA-NAK             */
+#define RADCMD_RESERVED    255 /* Reserved            */

 
 static const struct tok radius_command_values[] = {
 
 static const struct tok radius_command_values[] = {

-    { RADCMD_ACCESS_REQ, "Access Request" },
-    { RADCMD_ACCESS_ACC, "Access Accept" },
-    { RADCMD_ACCESS_REJ, "Access Reject" },
-    { RADCMD_ACCOUN_REQ, "Accounting Request" },
-    { RADCMD_ACCOUN_RES, "Accounting Response" },
-    { RADCMD_ACCESS_CHA, "Access Challenge" },
-    { RADCMD_STATUS_SER, "Status Server" },
-    { RADCMD_STATUS_CLI, "Status Client" },
-    { RADCMD_RESERVED,   "Reserved" },
+    { RADCMD_ACCESS_REQ,  "Access-Request" },
+    { RADCMD_ACCESS_ACC,  "Access-Accept" },
+    { RADCMD_ACCESS_REJ,  "Access-Reject" },
+    { RADCMD_ACCOUNT_REQ, "Accounting-Request" },
+    { RADCMD_ACCOUNT_RES, "Accounting-Response" },
+    { RADCMD_ACCESS_CHA,  "Access-Challenge" },
+    { RADCMD_STATUS_SER,  "Status-Server" },
+    { RADCMD_STATUS_CLI,  "Status-Client" },
+    { RADCMD_DISCON_REQ,  "Disconnect-Request" },
+    { RADCMD_DISCON_ACK,  "Disconnect-ACK" },
+    { RADCMD_DISCON_NAK,  "Disconnect-NAK" },
+    { RADCMD_COA_REQ,     "CoA-Request" },
+    { RADCMD_COA_ACK,     "CoA-ACK" },
+    { RADCMD_COA_NAK,     "CoA-NAK" },
+    { RADCMD_RESERVED,    "Reserved" },

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 


@@ -109,6 +160,9 @@ static const struct tok radius_command_values[] = {
 #define ACCT_DELAY        41
 #define ACCT_SESSION_TIME 46
 
 #define ACCT_DELAY        41
 #define ACCT_SESSION_TIME 46
 

+#define EGRESS_VLAN_ID   56
+#define EGRESS_VLAN_NAME 58
+

 #define TUNNEL_TYPE        64
 #define TUNNEL_MEDIUM      65
 #define TUNNEL_CLIENT_END  66
 #define TUNNEL_TYPE        64
 #define TUNNEL_MEDIUM      65
 #define TUNNEL_CLIENT_END  66


@@ -118,6 +172,8 @@ static const struct tok radius_command_values[] = {
 #define ARAP_PASS          70
 #define ARAP_FEATURES      71
 
 #define ARAP_PASS          70
 #define ARAP_FEATURES      71
 

+#define EAP_MESSAGE        79
+

 #define TUNNEL_PRIV_GROUP  81
 #define TUNNEL_ASSIGN_ID   82
 #define TUNNEL_PREFERENCE  83
 #define TUNNEL_PRIV_GROUP  81
 #define TUNNEL_ASSIGN_ID   82
 #define TUNNEL_PREFERENCE  83


@@ -127,33 +183,50 @@ static const struct tok radius_command_values[] = {
 
 #define TUNNEL_CLIENT_AUTH 90
 #define TUNNEL_SERVER_AUTH 91
 
 #define TUNNEL_CLIENT_AUTH 90
 #define TUNNEL_SERVER_AUTH 91

+
+#define ERROR_CAUSE 101

 /********************************/
 /* End Radius Attribute types */
 /********************************/
 
 /********************************/
 /* End Radius Attribute types */
 /********************************/
 

+#define RFC4675_TAGGED   0x31
+#define RFC4675_UNTAGGED 0x32

 
 

-static void print_attr_string(netdissect_options *, register u_char *, u_int, u_short );
-static void print_attr_num(netdissect_options *, register u_char *, u_int, u_short );
-static void print_vendor_attr(netdissect_options *, register u_char *, u_int, u_short );
-static void print_attr_address(netdissect_options *, register u_char *, u_int, u_short);
-static void print_attr_time(netdissect_options *, register u_char *, u_int, u_short);
-static void print_attr_strange(netdissect_options *, register u_char *, u_int, u_short);
-
+static const struct tok rfc4675_tagged[] = {
+    { RFC4675_TAGGED,   "Tagged" },
+    { RFC4675_UNTAGGED, "Untagged" },
+    { 0, NULL}
+};

 
 

-struct radius_hdr { uint8_t  code; /* Radius packet code  */
-                    uint8_t  id;   /* Radius packet id    */
-                    uint16_t len;  /* Radius total length */
-                    uint8_t  auth[16]; /* Authenticator   */
+static void print_attr_string(netdissect_options *, const u_char *, u_int, u_short );
+static void print_attr_num(netdissect_options *, const u_char *, u_int, u_short );
+static void print_vendor_attr(netdissect_options *, const u_char *, u_int, u_short );
+static void print_attr_address(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_address6(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_netmask6(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_mip6_home_link_prefix(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_operator_name(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_location_information(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_location_data(netdissect_options *, const u_char *, u_int, u_short);
+static void print_basic_location_policy_rules(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_time(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_vector64(netdissect_options *, const u_char *, u_int, u_short);
+static void print_attr_strange(netdissect_options *, const u_char *, u_int, u_short);
+
+struct radius_hdr { nd_uint8_t  code;     /* Radius packet code  */
+                    nd_uint8_t  id;       /* Radius packet id    */
+                    nd_uint16_t len;      /* Radius total length */
+                    nd_byte     auth[16]; /* Authenticator   */

                   };
 
 #define MIN_RADIUS_LEN 20
 
                   };
 
 #define MIN_RADIUS_LEN 20
 

-struct radius_attr { uint8_t type; /* Attribute type   */
-                     uint8_t len;  /* Attribute length */
+struct radius_attr { nd_uint8_t type; /* Attribute type   */
+                     nd_uint8_t len;  /* Attribute length */

                    };
 
                    };
 

-

 /* Service-Type Attribute standard values */
 /* Service-Type Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-4 */

 static const char *serv_type[]={ NULL,
                                 "Login",
                                 "Framed",
 static const char *serv_type[]={ NULL,
                                 "Login",
                                 "Framed",


@@ -164,11 +237,22 @@ static const char *serv_type[]={ NULL,
                                 "NAS Prompt",
                                 "Authenticate Only",
                                 "Callback NAS Prompt",
                                 "NAS Prompt",
                                 "Authenticate Only",
                                 "Callback NAS Prompt",

+                                /* ^ [0, 9] ^ */

                                 "Call Check",
                                 "Callback Administrative",
                                 "Call Check",
                                 "Callback Administrative",

+                                "Voice",
+                                "Fax",
+                                "Modem Relay",
+                                "IAPP-Register",
+                                "IAPP-AP-Check",
+                                "Authorize Only",
+                                "Framed-Management",
+                                "Additional-Authorization",
+                                /* ^ [10, 19] ^ */

                                };
 
 /* Framed-Protocol Attribute standard values */
                                };
 
 /* Framed-Protocol Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-5 */

 static const char *frm_proto[]={ NULL,
                                  "PPP",
                                  "SLIP",
 static const char *frm_proto[]={ NULL,
                                  "PPP",
                                  "SLIP",


@@ -176,9 +260,11 @@ static const char *frm_proto[]={ NULL,
                                  "Gandalf proprietary",
                                  "Xylogics IPX/SLIP",
                                  "X.75 Synchronous",
                                  "Gandalf proprietary",
                                  "Xylogics IPX/SLIP",
                                  "X.75 Synchronous",

+                                 "GPRS PDP Context",

                                };
 
 /* Framed-Routing Attribute standard values */
                                };
 
 /* Framed-Routing Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-6 */

 static const char *frm_routing[]={ "None",
                                    "Send",
                                    "Listen",
 static const char *frm_routing[]={ "None",
                                    "Send",
                                    "Listen",


@@ -186,6 +272,7 @@ static const char *frm_routing[]={ "None",
                                  };
 
 /* Framed-Compression Attribute standard values */
                                  };
 
 /* Framed-Compression Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-7 */

 static const char *frm_comp[]={ "None",
                                 "VJ TCP/IP",
                                 "IPX",
 static const char *frm_comp[]={ "None",
                                 "VJ TCP/IP",
                                 "IPX",


@@ -193,6 +280,7 @@ static const char *frm_comp[]={ "None",
                               };
 
 /* Login-Service Attribute standard values */
                               };
 
 /* Login-Service Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-8 */

 static const char *login_serv[]={ "Telnet",
                                   "Rlogin",
                                   "TCP Clear",
 static const char *login_serv[]={ "Telnet",
                                   "Rlogin",
                                   "TCP Clear",


@@ -204,13 +292,20 @@ static const char *login_serv[]={ "Telnet",
                                   "TCP Clear Quiet",
                                 };
 
                                   "TCP Clear Quiet",
                                 };
 

-

 /* Termination-Action Attribute standard values */
 /* Termination-Action Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-9 */

 static const char *term_action[]={ "Default",
                                    "RADIUS-Request",
                                  };
 
 static const char *term_action[]={ "Default",
                                    "RADIUS-Request",
                                  };
 

+/* Ingress-Filters Attribute standard values */
+static const char *ingress_filters[]={ NULL,
+                                       "Enabled",
+                                       "Disabled",
+                                     };
+

 /* NAS-Port-Type Attribute standard values */
 /* NAS-Port-Type Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-13 */

 static const char *nas_port_type[]={ "Async",
                                      "Sync",
                                      "ISDN Sync",
 static const char *nas_port_type[]={ "Async",
                                      "Sync",
                                      "ISDN Sync",


@@ -221,6 +316,7 @@ static const char *nas_port_type[]={ "Async",
                                      "HDLC Clear Channel",
                                      "X.25",
                                      "X.75",
                                      "HDLC Clear Channel",
                                      "X.25",
                                      "X.75",

+                                     /* ^ [0, 9] ^ */

                                      "G.3 Fax",
                                      "SDSL",
                                      "ADSL-CAP",
                                      "G.3 Fax",
                                      "SDSL",
                                      "ADSL-CAP",


@@ -231,9 +327,37 @@ static const char *nas_port_type[]={ "Async",
                                      "Cable",
                                      "Wireless - Other",
                                      "Wireless - IEEE 802.11",
                                      "Cable",
                                      "Wireless - Other",
                                      "Wireless - IEEE 802.11",

+                                     /* ^ [10, 19] ^ */
+                                     "Token-Ring",
+                                     "FDDI",
+                                     "Wireless - CDMA200",
+                                     "Wireless - UMTS",
+                                     "Wireless - 1X-EV",
+                                     "IAPP",
+                                     "FTTP",
+                                     "Wireless - IEEE 802.16",
+                                     "Wireless - IEEE 802.20",
+                                     "Wireless - IEEE 802.22",
+                                     /* ^ [20, 29] ^ */
+                                     "PPPoA",
+                                     "PPPoEoA",
+                                     "PPPoEoE",
+                                     "PPPoEoVLAN",
+                                     "PPPoEoQinQ",
+                                     "xPON",
+                                     "Wireless - XGP",
+                                     "WiMAX Pre-Release 8 IWK Function",
+                                     "WIMAX-WIFI-IWK",
+                                     "WIMAX-SFF",
+                                     /* ^ [30, 39] ^ */
+                                     "WIMAX-HA-LMA",
+                                     "WIMAX-DHCP",
+                                     "WIMAX-LBS",
+                                     "WIMAX-WVS",

                                    };
 
 /* Acct-Status-Type Accounting Attribute standard values */
                                    };
 
 /* Acct-Status-Type Accounting Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-10 */

 static const char *acct_status[]={ NULL,
                                    "Start",
                                    "Stop",
 static const char *acct_status[]={ NULL,
                                    "Start",
                                    "Stop",


@@ -244,6 +368,7 @@ static const char *acct_status[]={ NULL,
                                    "Accounting-On",
                                    "Accounting-Off",
                                    "Tunnel-Start",
                                    "Accounting-On",
                                    "Accounting-Off",
                                    "Tunnel-Start",

+                                     /* ^ [0, 9] ^ */

                                    "Tunnel-Stop",
                                    "Tunnel-Reject",
                                    "Tunnel-Link-Start",
                                    "Tunnel-Stop",
                                    "Tunnel-Reject",
                                    "Tunnel-Link-Start",


@@ -253,13 +378,16 @@ static const char *acct_status[]={ NULL,
                                  };
 
 /* Acct-Authentic Accounting Attribute standard values */
                                  };
 
 /* Acct-Authentic Accounting Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-11 */

 static const char *acct_auth[]={ NULL,
                                  "RADIUS",
                                  "Local",
                                  "Remote",
 static const char *acct_auth[]={ NULL,
                                  "RADIUS",
                                  "Local",
                                  "Remote",

+                                 "Diameter",

                                };
 
 /* Acct-Terminate-Cause Accounting Attribute standard values */
                                };
 
 /* Acct-Terminate-Cause Accounting Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-12 */

 static const char *acct_term[]={ NULL,
                                  "User Request",
                                  "Lost Carrier",
 static const char *acct_term[]={ NULL,
                                  "User Request",
                                  "Lost Carrier",


@@ -270,6 +398,7 @@ static const char *acct_term[]={ NULL,
                                  "Admin Reboot",
                                  "Port Error",
                                  "NAS Error",
                                  "Admin Reboot",
                                  "Port Error",
                                  "NAS Error",

+                                 /* ^ [0, 9] ^ */

                                  "NAS Request",
                                  "NAS Reboot",
                                  "Port Unneeded",
                                  "NAS Request",
                                  "NAS Reboot",
                                  "Port Unneeded",


@@ -279,9 +408,16 @@ static const char *acct_term[]={ NULL,
                                  "Callback",
                                  "User Error",
                                  "Host Request",
                                  "Callback",
                                  "User Error",
                                  "Host Request",

+                                 "Supplicant Restart",
+                                 /* ^ [10, 19] ^ */
+                                 "Reauthentication Failure",
+                                 "Port Reinitialized",
+                                 "Port Administratively Disabled",
+                                 "Lost Power",

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

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-14 */

 static const char *tunnel_type[]={ NULL,
                                    "PPTP",
                                    "L2F",
 static const char *tunnel_type[]={ NULL,
                                    "PPTP",
                                    "L2F",


@@ -292,12 +428,15 @@ static const char *tunnel_type[]={ NULL,
                                    "IP-IP",
                                    "MIN-IP-IP",
                                    "ESP",
                                    "IP-IP",
                                    "MIN-IP-IP",
                                    "ESP",

+                                   /* ^ [0, 9] ^ */

                                    "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 */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-15 */

 static const char *tunnel_medium[]={ NULL,
                                      "IPv4",
                                      "IPv6",
 static const char *tunnel_medium[]={ NULL,
                                      "IPv4",
                                      "IPv6",


@@ -308,6 +447,7 @@ static const char *tunnel_medium[]={ NULL,
                                      "E.163",
                                      "E.164",
                                      "F.69",
                                      "E.163",
                                      "E.164",
                                      "F.69",

+                                     /* ^ [0, 9] ^ */

                                      "X.121",
                                      "IPX",
                                      "Appletalk",
                                      "X.121",
                                      "IPX",
                                      "Appletalk",


@@ -317,6 +457,7 @@ static const char *tunnel_medium[]={ NULL,
                                    };
 
 /* ARAP-Zone-Access Attribute standard values */
                                    };
 
 /* ARAP-Zone-Access Attribute standard values */

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-16 */

 static const char *arap_zone[]={ NULL,
                                  "Only access to dfl zone",
                                  "Use zone filter inc.",
 static const char *arap_zone[]={ NULL,
                                  "Only access to dfl zone",
                                  "Use zone filter inc.",


@@ -324,115 +465,291 @@ static const char *arap_zone[]={ NULL,
                                  "Use zone filter exc.",
                                };
 
                                  "Use zone filter exc.",
                                };
 

+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-17 */

 static const char *prompt[]={ "No Echo",
                               "Echo",
                             };
 
 static const char *prompt[]={ "No Echo",
                               "Echo",
                             };
 

+/* Error-Cause standard values */
+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-18 */
+#define ERROR_CAUSE_RESIDUAL_CONTEXT_REMOVED 201
+#define ERROR_CAUSE_INVALID_EAP_PACKET 202
+#define ERROR_CAUSE_UNSUPPORTED_ATTRIBUTE 401
+#define ERROR_CAUSE_MISSING_ATTRIBUTE 402
+#define ERROR_CAUSE_NAS_IDENTIFICATION_MISMATCH 403
+#define ERROR_CAUSE_INVALID_REQUEST 404
+#define ERROR_CAUSE_UNSUPPORTED_SERVICE 405
+#define ERROR_CAUSE_UNSUPPORTED_EXTENSION 406
+#define ERROR_CAUSE_INVALID_ATTRIBUTE_VALUE 407
+#define ERROR_CAUSE_ADMINISTRATIVELY_PROHIBITED 501
+#define ERROR_CAUSE_PROXY_REQUEST_NOT_ROUTABLE 502
+#define ERROR_CAUSE_SESSION_CONTEXT_NOT_FOUND 503
+#define ERROR_CAUSE_SESSION_CONTEXT_NOT_REMOVABLE 504
+#define ERROR_CAUSE_PROXY_PROCESSING_ERROR 505
+#define ERROR_CAUSE_RESOURCES_UNAVAILABLE 506
+#define ERROR_CAUSE_REQUEST_INITIATED 507
+#define ERROR_CAUSE_MULTIPLE_SESSION_SELECTION_UNSUPPORTED 508
+#define ERROR_CAUSE_LOCATION_INFO_REQUIRED 509
+static const struct tok errorcausetype[] = {
+                                 { ERROR_CAUSE_RESIDUAL_CONTEXT_REMOVED,               "Residual Session Context Removed" },
+                                 { ERROR_CAUSE_INVALID_EAP_PACKET,                     "Invalid EAP Packet (Ignored)" },
+                                 { ERROR_CAUSE_UNSUPPORTED_ATTRIBUTE,                  "Unsupported Attribute" },
+                                 { ERROR_CAUSE_MISSING_ATTRIBUTE,                      "Missing Attribute" },
+                                 { ERROR_CAUSE_NAS_IDENTIFICATION_MISMATCH,            "NAS Identification Mismatch" },
+                                 { ERROR_CAUSE_INVALID_REQUEST,                        "Invalid Request" },
+                                 { ERROR_CAUSE_UNSUPPORTED_SERVICE,                    "Unsupported Service" },
+                                 { ERROR_CAUSE_UNSUPPORTED_EXTENSION,                  "Unsupported Extension" },
+                                 { ERROR_CAUSE_INVALID_ATTRIBUTE_VALUE,                "Invalid Attribute Value" },
+                                 { ERROR_CAUSE_ADMINISTRATIVELY_PROHIBITED,            "Administratively Prohibited" },
+                                 { ERROR_CAUSE_PROXY_REQUEST_NOT_ROUTABLE,             "Request Not Routable (Proxy)" },
+                                 { ERROR_CAUSE_SESSION_CONTEXT_NOT_FOUND,              "Session Context Not Found" },
+                                 { ERROR_CAUSE_SESSION_CONTEXT_NOT_REMOVABLE,          "Session Context Not Removable" },
+                                 { ERROR_CAUSE_PROXY_PROCESSING_ERROR,                 "Other Proxy Processing Error" },
+                                 { ERROR_CAUSE_RESOURCES_UNAVAILABLE,                  "Resources Unavailable" },
+                                 { ERROR_CAUSE_REQUEST_INITIATED,                      "Request Initiated" },
+                                 { ERROR_CAUSE_MULTIPLE_SESSION_SELECTION_UNSUPPORTED, "Multiple Session Selection Unsupported" },
+                                 { ERROR_CAUSE_LOCATION_INFO_REQUIRED,                 "Location Info Required" },
+                                                                                                                                { 0, NULL }
+                               };
+
+/* MIP6-Feature-Vector standard values */
+/* https://www.iana.org/assignments/aaa-parameters/aaa-parameters.xhtml */
+#define MIP6_INTEGRATED 0x0000000000000001
+#define LOCAL_HOME_AGENT_ASSIGNMENT 0x0000000000000002
+#define PMIP6_SUPPORTED 0x0000010000000000
+#define IP4_HOA_SUPPORTED 0x0000020000000000
+#define LOCAL_MAG_ROUTING_SUPPORTED 0x0000040000000000
+#define ASSIGN_LOCAL_IP 0x0000080000000000
+#define MIP4_SUPPORTED 0x0000100000000000
+#define OPTIMIZED_IDLE_MODE_MOBILITY 0x0000200000000000
+#define GTPv2_SUPPORTED 0x0000400000000000
+#define IP4_TRANSPORT_SUPPORTED 0x0000800000000000
+#define IP4_HOA_ONLY_SUPPORTED 0x0001000000000000
+#define INTER_MAG_ROUTING_SUPPORTED 0x0002000000000000
+static const struct mip6_feature_vector {
+                  uint64_t v;
+                  const char *s;
+                } mip6_feature_vector[] = {
+                                 { MIP6_INTEGRATED,             "MIP6_INTEGRATED" },
+                                 { LOCAL_HOME_AGENT_ASSIGNMENT, "LOCAL_HOME_AGENT_ASSIGNMENT" },
+                                 { PMIP6_SUPPORTED,             "PMIP6_SUPPORTED" },
+                                 { IP4_HOA_SUPPORTED,           "IP4_HOA_SUPPORTED" },
+                                 { LOCAL_MAG_ROUTING_SUPPORTED, "LOCAL_MAG_ROUTING_SUPPORTED" },
+                                 { ASSIGN_LOCAL_IP,             "ASSIGN_LOCAL_IP" },
+                                 { MIP4_SUPPORTED,              "MIP4_SUPPORTED" },
+                                 { OPTIMIZED_IDLE_MODE_MOBILITY, "OPTIMIZED_IDLE_MODE_MOBILITY" },
+                                 { GTPv2_SUPPORTED,             "GTPv2_SUPPORTED" },
+                                 { IP4_TRANSPORT_SUPPORTED,     "IP4_TRANSPORT_SUPPORTED" },
+                                 { IP4_HOA_ONLY_SUPPORTED,      "IP4_HOA_ONLY_SUPPORTED" },
+                                 { INTER_MAG_ROUTING_SUPPORTED, "INTER_MAG_ROUTING_SUPPORTED" },
+                               };
+
+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-19 */
+#define OPERATOR_NAME_TADIG 0x30
+#define OPERATOR_NAME_REALM 0x31
+#define OPERATOR_NAME_E212  0x32
+#define OPERATOR_NAME_ICC   0x33
+static const struct tok operator_name_vector[] = {
+                                 { OPERATOR_NAME_TADIG, "TADIG" },
+                                 { OPERATOR_NAME_REALM, "REALM" },
+                                 { OPERATOR_NAME_E212,  "E212"  },
+                                 { OPERATOR_NAME_ICC,   "ICC"   },
+                                 { 0, NULL }
+                               };
+
+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-20 */
+#define LOCATION_INFORMATION_CODE_CIVIC      0
+#define LOCATION_INFORMATION_CODE_GEOSPATIAL 1
+static const struct tok location_information_code_vector[] = {
+                                 { LOCATION_INFORMATION_CODE_CIVIC     , "Civic"      },
+                                 { LOCATION_INFORMATION_CODE_GEOSPATIAL, "Geospatial" },
+                                 { 0, NULL }
+                               };
+
+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-21 */
+#define LOCATION_INFORMATION_ENTITY_USER   0
+#define LOCATION_INFORMATION_ENTITY_RADIUS 1
+static const struct tok location_information_entity_vector[] = {
+                                 { LOCATION_INFORMATION_ENTITY_USER,   "User"   },
+                                 { LOCATION_INFORMATION_ENTITY_RADIUS, "RADIUS" },
+                                 { 0, NULL }
+                               };

 
 

-struct attrtype { const char *name;      /* Attribute name                 */
+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-22 */
+static const struct tok blpr_bm[] = {
+                                 { 0x0001, "MBZ-15" },
+                                 { 0x0002, "MBZ-14" },
+                                 { 0x0004, "MBZ-13" },
+                                 { 0x0008, "MBZ-12" },
+                                 { 0x0010, "MBZ-11" },
+                                 { 0x0020, "MBZ-10" },
+                                 { 0x0040, "MBZ-9" },
+                                 { 0x0080, "MBZ-8" },
+                                 { 0x0100, "MBZ-7" },
+                                 { 0x0200, "MBZ-6" },
+                                 { 0x0400, "MBZ-5" },
+                                 { 0x0800, "MBZ-4" },
+                                 { 0x1000, "MBZ-3" },
+                                 { 0x2000, "MBZ-2" },
+                                 { 0x4000, "MBZ-1" },
+                                 { 0x8000, "Retransmission Allowed" },
+                                 { 0, NULL }
+                               };
+
+/* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-2 */
+static const 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 */

-                  void (*print_func)(netdissect_options *, register u_char *, u_int, u_short);
+                  void (*print_func)(netdissect_options *, const u_char *, u_int, u_short);

                 } attr_type[]=
   {
      { NULL,                              NULL, 0, 0, NULL               },
                 } attr_type[]=
   {
      { NULL,                              NULL, 0, 0, NULL               },

-     { "Username",                        NULL, 0, 0, print_attr_string  },
-     { "Password",                        NULL, 0, 0, NULL               },
-     { "CHAP Password",                   NULL, 0, 0, NULL               },
-     { "NAS IP Address",                  NULL, 0, 0, print_attr_address },
-     { "NAS Port",                        NULL, 0, 0, print_attr_num     },
-     { "Service Type",                    serv_type, TAM_SIZE(serv_type)-1, 1, print_attr_num },
-     { "Framed Protocol",                 frm_proto, TAM_SIZE(frm_proto)-1, 1, print_attr_num },
-     { "Framed IP Address",               NULL, 0, 0, print_attr_address },
-     { "Framed IP Network",               NULL, 0, 0, print_attr_address },
-     { "Framed Routing",                  frm_routing, TAM_SIZE(frm_routing), 0, print_attr_num },
-     { "Filter ID",                       NULL, 0, 0, print_attr_string  },
-     { "Framed MTU",                      NULL, 0, 0, print_attr_num     },
-     { "Framed Compression",              frm_comp, TAM_SIZE(frm_comp),   0, print_attr_num },
-     { "Login IP Host",                   NULL, 0, 0, print_attr_address },
-     { "Login Service",                   login_serv, TAM_SIZE(login_serv), 0, print_attr_num },
-     { "Login TCP Port",                  NULL, 0, 0, print_attr_num     },
+     { "User-Name",                       NULL, 0, 0, print_attr_string  },
+     { "User-Password",                   NULL, 0, 0, NULL               },
+     { "CHAP-Password",                   NULL, 0, 0, NULL               },
+     { "NAS-IP-Address",                  NULL, 0, 0, print_attr_address },
+     { "NAS-Port",                        NULL, 0, 0, print_attr_num     },
+     { "Service-Type",                    serv_type, TAM_SIZE(serv_type)-1, 1, print_attr_num },
+     { "Framed-Protocol",                 frm_proto, TAM_SIZE(frm_proto)-1, 1, print_attr_num },
+     { "Framed-IP-Address",               NULL, 0, 0, print_attr_address },
+     { "Framed-IP-Netmask",               NULL, 0, 0, print_attr_address },
+     /* ^ [0, 9] ^ */
+     { "Framed-Routing",                  frm_routing, TAM_SIZE(frm_routing), 0, print_attr_num },
+     { "Filter-Id",                       NULL, 0, 0, print_attr_string  },
+     { "Framed-MTU",                      NULL, 0, 0, print_attr_num     },
+     { "Framed-Compression",              frm_comp, TAM_SIZE(frm_comp),   0, print_attr_num },
+     { "Login-IP-Host",                   NULL, 0, 0, print_attr_address },
+     { "Login-Service",                   login_serv, TAM_SIZE(login_serv), 0, print_attr_num },
+     { "Login-TCP-Port",                  NULL, 0, 0, print_attr_num     },

      { "Unassigned",                      NULL, 0, 0, NULL }, /*17*/
      { "Unassigned",                      NULL, 0, 0, NULL }, /*17*/

-     { "Reply",                           NULL, 0, 0, print_attr_string },
-     { "Callback-number",                 NULL, 0, 0, print_attr_string },
-     { "Callback-ID",                     NULL, 0, 0, print_attr_string },
+     { "Reply-Message",                   NULL, 0, 0, print_attr_string },
+     { "Callback-Number",                 NULL, 0, 0, print_attr_string },
+     /* ^ [10, 19] ^ */
+     { "Callback-Id",                     NULL, 0, 0, print_attr_string },

      { "Unassigned",                      NULL, 0, 0, NULL }, /*21*/
      { "Unassigned",                      NULL, 0, 0, NULL }, /*21*/

-     { "Framed Route",                    NULL, 0, 0, print_attr_string },
-     { "Framed IPX Network",              NULL, 0, 0, print_attr_num    },
+     { "Framed-Route",                    NULL, 0, 0, print_attr_string },
+     { "Framed-IPX-Network",              NULL, 0, 0, print_attr_num    },

      { "State",                           NULL, 0, 0, print_attr_string },
      { "Class",                           NULL, 0, 0, print_attr_string },
      { "State",                           NULL, 0, 0, print_attr_string },
      { "Class",                           NULL, 0, 0, print_attr_string },

-     { "Vendor Specific",                 NULL, 0, 0, print_vendor_attr },
-     { "Session Timeout",                 NULL, 0, 0, print_attr_num    },
-     { "Idle Timeout",                    NULL, 0, 0, print_attr_num    },
-     { "Termination Action",              term_action, TAM_SIZE(term_action), 0, print_attr_num },
-     { "Called Station",                  NULL, 0, 0, print_attr_string },
-     { "Calling Station",                 NULL, 0, 0, print_attr_string },
-     { "NAS ID",                          NULL, 0, 0, print_attr_string },
-     { "Proxy State",                     NULL, 0, 0, print_attr_string },
-     { "Login LAT Service",               NULL, 0, 0, print_attr_string },
-     { "Login LAT Node",                  NULL, 0, 0, print_attr_string },
-     { "Login LAT Group",                 NULL, 0, 0, print_attr_string },
-     { "Framed Appletalk Link",           NULL, 0, 0, print_attr_num    },
-     { "Framed Appltalk Net",             NULL, 0, 0, print_attr_num    },
-     { "Framed Appletalk Zone",           NULL, 0, 0, print_attr_string },
-     { "Accounting Status",               acct_status, TAM_SIZE(acct_status)-1, 1, print_attr_num },
-     { "Accounting Delay",                NULL, 0, 0, print_attr_num    },
-     { "Accounting Input Octets",         NULL, 0, 0, print_attr_num    },
-     { "Accounting Output Octets",        NULL, 0, 0, print_attr_num    },
-     { "Accounting Session ID",           NULL, 0, 0, print_attr_string },
-     { "Accounting Authentication",       acct_auth, TAM_SIZE(acct_auth)-1, 1, print_attr_num },
-     { "Accounting Session Time",         NULL, 0, 0, print_attr_num },
-     { "Accounting Input Packets",        NULL, 0, 0, print_attr_num },
-     { "Accounting Output Packets",       NULL, 0, 0, print_attr_num },
-     { "Accounting Termination Cause",    acct_term, TAM_SIZE(acct_term)-1, 1, print_attr_num },
-     { "Accounting Multilink Session ID", NULL, 0, 0, print_attr_string },
-     { "Accounting Link Count",           NULL, 0, 0, print_attr_num },
-     { "Accounting Input Giga",           NULL, 0, 0, print_attr_num },
-     { "Accounting Output Giga",          NULL, 0, 0, print_attr_num },
+     { "Vendor-Specific",                 NULL, 0, 0, print_vendor_attr },
+     { "Session-Timeout",                 NULL, 0, 0, print_attr_num    },
+     { "Idle-Timeout",                    NULL, 0, 0, print_attr_num    },
+     { "Termination-Action",              term_action, TAM_SIZE(term_action), 0, print_attr_num },
+     /* ^ [20, 29] ^ */
+     { "Called-Station-Id",               NULL, 0, 0, print_attr_string },
+     { "Calling-Station-Id",              NULL, 0, 0, print_attr_string },
+     { "NAS-Identifier",                  NULL, 0, 0, print_attr_string },
+     { "Proxy-State",                     NULL, 0, 0, print_attr_string },
+     { "Login-LAT-Service",               NULL, 0, 0, print_attr_string },
+     { "Login-LAT-Node",                  NULL, 0, 0, print_attr_string },
+     { "Login-LAT-Group",                 NULL, 0, 0, print_attr_string },
+     { "Framed-AppleTalk-Link",           NULL, 0, 0, print_attr_num    },
+     { "Framed-AppleTalk-Network",        NULL, 0, 0, print_attr_num    },
+     { "Framed-AppleTalk-Zone",           NULL, 0, 0, print_attr_string },
+     /* ^ [30, 39] ^ */
+     { "Acct-Status-Type",                acct_status, TAM_SIZE(acct_status)-1, 1, print_attr_num },
+     { "Acct-Delay-Time",                 NULL, 0, 0, print_attr_num    },
+     { "Acct-Input-Octets",               NULL, 0, 0, print_attr_num    },
+     { "Acct-Output-Octets",              NULL, 0, 0, print_attr_num    },
+     { "Acct-Session-Id",                 NULL, 0, 0, print_attr_string },
+     { "Acct-Authentic",                  acct_auth, TAM_SIZE(acct_auth)-1, 1, print_attr_num },
+     { "Acct-Session-Time",               NULL, 0, 0, print_attr_num },
+     { "Acct-Input-Packets",              NULL, 0, 0, print_attr_num },
+     { "Acct-Output-Packets",             NULL, 0, 0, print_attr_num },
+     { "Acct-Terminate-Cause",            acct_term, TAM_SIZE(acct_term)-1, 1, print_attr_num },
+     /* ^ [40, 49] ^ */
+     { "Acct-Multi-Session-Id",           NULL, 0, 0, print_attr_string },
+     { "Acct-Link-Count",                 NULL, 0, 0, print_attr_num },
+     { "Acct-Input-Gigawords",            NULL, 0, 0, print_attr_num },
+     { "Acct-Output-Gigawords",           NULL, 0, 0, print_attr_num },

      { "Unassigned",                      NULL, 0, 0, NULL }, /*54*/
      { "Unassigned",                      NULL, 0, 0, NULL }, /*54*/

-     { "Event Timestamp",                 NULL, 0, 0, print_attr_time },
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*56*/
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*57*/
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*58*/
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*59*/
-     { "CHAP challenge",                  NULL, 0, 0, print_attr_string },
-     { "NAS Port Type",                   nas_port_type, TAM_SIZE(nas_port_type), 0, print_attr_num },
-     { "Port Limit",                      NULL, 0, 0, print_attr_num },
-     { "Login LAT Port",                  NULL, 0, 0, print_attr_string }, /*63*/
-     { "Tunnel Type",                     tunnel_type, TAM_SIZE(tunnel_type)-1, 1, print_attr_num },
-     { "Tunnel Medium",                   tunnel_medium, TAM_SIZE(tunnel_medium)-1, 1, print_attr_num },
-     { "Tunnel Client End",               NULL, 0, 0, print_attr_string },
-     { "Tunnel Server End",               NULL, 0, 0, print_attr_string },
-     { "Accounting Tunnel connect",       NULL, 0, 0, print_attr_string },
-     { "Tunnel Password",                 NULL, 0, 0, print_attr_string  },
-     { "ARAP Password",                   NULL, 0, 0, print_attr_strange },
-     { "ARAP Feature",                    NULL, 0, 0, print_attr_strange },
-     { "ARAP Zone Acces",                 arap_zone, TAM_SIZE(arap_zone)-1, 1, print_attr_num }, /*72*/
-     { "ARAP Security",                   NULL, 0, 0, print_attr_string },
-     { "ARAP Security Data",              NULL, 0, 0, print_attr_string },
-     { "Password Retry",                  NULL, 0, 0, print_attr_num    },
+     { "Event-Timestamp",                 NULL, 0, 0, print_attr_time },
+     { "Egress-VLANID",                   NULL, 0, 0, print_attr_num },
+     { "Ingress-Filters",                 ingress_filters, TAM_SIZE(ingress_filters)-1, 1, print_attr_num },
+     { "Egress-VLAN-Name",                NULL, 0, 0, print_attr_string },
+     { "User-Priority-Table",             NULL, 0, 0, NULL },
+     /* ^ [50, 59] ^ */
+     { "CHAP-Challenge",                  NULL, 0, 0, print_attr_string },
+     { "NAS-Port-Type",                   nas_port_type, TAM_SIZE(nas_port_type), 0, print_attr_num },
+     { "Port-Limit",                      NULL, 0, 0, print_attr_num },
+     { "Login-LAT-Port",                  NULL, 0, 0, print_attr_string }, /*63*/
+     { "Tunnel-Type",                     tunnel_type, TAM_SIZE(tunnel_type)-1, 1, print_attr_num },
+     { "Tunnel-Medium-Type",              tunnel_medium, TAM_SIZE(tunnel_medium)-1, 1, print_attr_num },
+     { "Tunnel-Client-Endpoint",          NULL, 0, 0, print_attr_string },
+     { "Tunnel-Server-Endpoint",          NULL, 0, 0, print_attr_string },
+     { "Acct-Tunnel-Connection",          NULL, 0, 0, print_attr_string },
+     { "Tunnel-Password",                 NULL, 0, 0, print_attr_string  },
+     /* ^ [60, 69] ^ */
+     { "ARAP-Password",                   NULL, 0, 0, print_attr_strange },
+     { "ARAP-Features",                   NULL, 0, 0, print_attr_strange },
+     { "ARAP-Zone-Access",                arap_zone, TAM_SIZE(arap_zone)-1, 1, print_attr_num }, /*72*/
+     { "ARAP-Security",                   NULL, 0, 0, print_attr_string },
+     { "ARAP-Security-Data",              NULL, 0, 0, print_attr_string },
+     { "Password-Retry",                  NULL, 0, 0, print_attr_num    },

      { "Prompt",                          prompt, TAM_SIZE(prompt), 0, print_attr_num },
      { "Prompt",                          prompt, TAM_SIZE(prompt), 0, print_attr_num },

-     { "Connect Info",                    NULL, 0, 0, print_attr_string   },
-     { "Config Token",                    NULL, 0, 0, print_attr_string   },
-     { "EAP Message",                     NULL, 0, 0, print_attr_string   },
-     { "Message Authentication",          NULL, 0, 0, print_attr_string }, /*80*/
-     { "Tunnel Private Group",            NULL, 0, 0, print_attr_string },
-     { "Tunnel Assigned ID",              NULL, 0, 0, print_attr_string },
-     { "Tunnel Preference",               NULL, 0, 0, print_attr_num    },
-     { "ARAP Challenge Response",         NULL, 0, 0, print_attr_strange },
-     { "Accounting Interim Interval",     NULL, 0, 0, print_attr_num     },
-     { "Accounting Tunnel packets lost",  NULL, 0, 0, print_attr_num }, /*86*/
-     { "NAS Port ID",                     NULL, 0, 0, print_attr_string },
-     { "Framed Pool",                     NULL, 0, 0, print_attr_string },
-     { "Chargeable User Identity",        NULL, 0, 0, print_attr_string },
-     { "Tunnel Client Authentication ID", NULL, 0, 0, print_attr_string },
-     { "Tunnel Server Authentication ID", NULL, 0, 0, print_attr_string },
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*92*/
-     { "Unassigned",                      NULL, 0, 0, NULL }  /*93*/
+     { "Connect-Info",                    NULL, 0, 0, print_attr_string   },
+     { "Configuration-Token",             NULL, 0, 0, print_attr_string   },
+     { "EAP-Message",                     NULL, 0, 0, print_attr_string   },
+     /* ^ [70, 79] ^ */
+     { "Message-Authenticator",           NULL, 0, 0, print_attr_string }, /*80*/
+     { "Tunnel-Private-Group-ID",         NULL, 0, 0, print_attr_string },
+     { "Tunnel-Assignment-ID",            NULL, 0, 0, print_attr_string },
+     { "Tunnel-Preference",               NULL, 0, 0, print_attr_num    },
+     { "ARAP-Challenge-Response",         NULL, 0, 0, print_attr_strange },
+     { "Acct-Interim-Interval",           NULL, 0, 0, print_attr_num     },
+     { "Acct-Tunnel-Packets-Lost",        NULL, 0, 0, print_attr_num }, /*86*/
+     { "NAS-Port-Id",                     NULL, 0, 0, print_attr_string },
+     { "Framed-Pool",                     NULL, 0, 0, print_attr_string },
+     { "CUI",                             NULL, 0, 0, print_attr_string },
+     /* ^ [80, 89] ^ */
+     { "Tunnel-Client-Auth-ID",           NULL, 0, 0, print_attr_string },
+     { "Tunnel-Server-Auth-ID",           NULL, 0, 0, print_attr_string },
+     { "NAS-Filter-Rule",                 NULL, 0, 0, print_attr_string },
+     { "Unassigned",                      NULL, 0, 0, NULL },  /*93*/
+     { "Originating-Line-Info",           NULL, 0, 0, NULL },
+     { "NAS-IPv6-Address",                NULL, 0, 0, print_attr_address6 },
+     { "Framed-Interface-ID",             NULL, 0, 0, NULL },
+     { "Framed-IPv6-Prefix",              NULL, 0, 0, print_attr_netmask6 },
+     { "Login-IPv6-Host",                 NULL, 0, 0, print_attr_address6 },
+     { "Framed-IPv6-Route",               NULL, 0, 0, print_attr_string },
+     /* ^ [90, 99] ^ */
+     { "Framed-IPv6-Pool",                NULL, 0, 0, print_attr_string },
+     { "Error-Cause",                     NULL, 0, 0, print_attr_strange },
+     { "EAP-Key-Name",                    NULL, 0, 0, NULL },
+     { "Digest-Response",                 NULL, 0, 0, print_attr_string },
+     { "Digest-Realm",                    NULL, 0, 0, print_attr_string },
+     { "Digest-Nonce",                    NULL, 0, 0, print_attr_string },
+     { "Digest-Response-Auth",            NULL, 0, 0, print_attr_string },
+     { "Digest-Nextnonce",                NULL, 0, 0, print_attr_string },
+     { "Digest-Method",                   NULL, 0, 0, print_attr_string },
+     { "Digest-URI",                      NULL, 0, 0, print_attr_string },
+     /* ^ [100, 109] ^ */
+     { "Digest-Qop",                      NULL, 0, 0, print_attr_string },
+     { "Digest-Algorithm",                NULL, 0, 0, print_attr_string },
+     { "Digest-Entity-Body-Hash",         NULL, 0, 0, print_attr_string },
+     { "Digest-CNonce",                   NULL, 0, 0, print_attr_string },
+     { "Digest-Nonce-Count",              NULL, 0, 0, print_attr_string },
+     { "Digest-Username",                 NULL, 0, 0, print_attr_string },
+     { "Digest-Opaque",                   NULL, 0, 0, print_attr_string },
+     { "Digest-Auth-Param",               NULL, 0, 0, print_attr_string },
+     { "Digest-AKA-Auts",                 NULL, 0, 0, print_attr_string },
+     { "Digest-Domain",                   NULL, 0, 0, print_attr_string },
+     /* ^ [110, 119] ^ */
+     { "Digest-Stale",                    NULL, 0, 0, print_attr_string },
+     { "Digest-HA1",                      NULL, 0, 0, print_attr_string },
+     { "SIP-AOR",                         NULL, 0, 0, print_attr_string },
+     { "Delegated-IPv6-Prefix",           NULL, 0, 0, print_attr_netmask6 },
+     { "MIP6-Feature-Vector",             NULL, 0, 0, print_attr_vector64 },
+     { "MIP6-Home-Link-Prefix",           NULL, 0, 0, print_attr_mip6_home_link_prefix },
+     { "Operator-Name",                   NULL, 0, 0, print_attr_operator_name },
+     { "Location-Information",            NULL, 0, 0, print_attr_location_information },
+     { "Location-Data",                   NULL, 0, 0, print_attr_location_data },
+     { "Basic-Location-Policy-Rules",     NULL, 0, 0, print_basic_location_policy_rules }
+     /* ^ [120, 129] ^ */

   };
 
   };
 

-

 /*****************************/
 /* Print an attribute string */
 /* value pointed by 'data'   */
 /*****************************/
 /* Print an attribute string */
 /* value pointed by 'data'   */


@@ -442,27 +759,20 @@ struct attrtype { const char *name;      /* Attribute name                 */
 /*****************************/
 static void
 print_attr_string(netdissect_options *ndo,
 /*****************************/
 static void
 print_attr_string(netdissect_options *ndo,

-                  register u_char *data, u_int length, u_short attr_code)
+                  const u_char *data, u_int length, u_short attr_code)

 {
 {

-   register u_int i;
+   u_int i;

 
 

-   ND_TCHECK2(data[0],length);
-
-   switch(attr_code)
-   {
+   switch(attr_code) {

       case TUNNEL_PASS:
       case TUNNEL_PASS:

-           if (length < 3)
-           {
-              ND_PRINT((ndo, "%s", tstr));
-              return;
-           }
-           if (*data && (*data <=0x1F) )
-              ND_PRINT((ndo, "Tag[%u] ", *data));
+           ND_ICHECK_U(length, <, 3);
+           if (GET_U_1(data) && (GET_U_1(data) <= 0x1F))
+              ND_PRINT("Tag[%u] ", GET_U_1(data));

            else
            else

-              ND_PRINT((ndo, "Tag[Unused] "));
+              ND_PRINT("Tag[Unused] ");

            data++;
            length--;
            data++;
            length--;

-           ND_PRINT((ndo, "Salt %u ", EXTRACT_16BITS(data)));
+           ND_PRINT("Salt %u ", GET_BE_U_2(data));

            data+=2;
            length-=2;
         break;
            data+=2;
            length-=2;
         break;


@@ -472,30 +782,37 @@ print_attr_string(netdissect_options *ndo,
       case TUNNEL_ASSIGN_ID:
       case TUNNEL_CLIENT_AUTH:
       case TUNNEL_SERVER_AUTH:
       case TUNNEL_ASSIGN_ID:
       case TUNNEL_CLIENT_AUTH:
       case TUNNEL_SERVER_AUTH:

-           if (*data <= 0x1F)
-           {
-              if (length < 1)
-              {
-                 ND_PRINT((ndo, "%s", tstr));
-                 return;
-              }
-              if (*data)
-                ND_PRINT((ndo, "Tag[%u] ", *data));
+           if (GET_U_1(data) <= 0x1F) {
+              ND_ICHECK_U(length, <, 1);
+              if (GET_U_1(data))
+                ND_PRINT("Tag[%u] ", GET_U_1(data));

               else
               else

-                ND_PRINT((ndo, "Tag[Unused] "));
+                ND_PRINT("Tag[Unused] ");

               data++;
               length--;
            }
         break;
               data++;
               length--;
            }
         break;

+      case EGRESS_VLAN_NAME:
+           ND_ICHECK_U(length, <, 1);
+           ND_PRINT("%s (0x%02x) ",
+                  tok2str(rfc4675_tagged,"Unknown tag",GET_U_1(data)),
+                  GET_U_1(data));
+           data++;
+           length--;
+        break;
+      case EAP_MESSAGE:
+           ND_ICHECK_U(length, <, 1);
+           eap_print(ndo, data, length);
+           return;

    }
 
    }
 

-   for (i=0; *data && i < length ; i++, data++)
-       ND_PRINT((ndo, "%c", (*data < 32 || *data > 128) ? '.' : *data));
+   for (i=0; i < length && GET_U_1(data); i++, data++)
+       ND_PRINT("%c", ND_ASCII_ISPRINT(GET_U_1(data)) ? GET_U_1(data) : '.');

 
    return;
 
 
    return;
 

-   trunc:
-      ND_PRINT((ndo, "%s", tstr));
+invalid:
+   nd_print_invalid(ndo);

 }
 
 /*
 }
 
 /*


@@ -503,60 +820,43 @@ print_attr_string(netdissect_options *ndo,
  */
 static void
 print_vendor_attr(netdissect_options *ndo,
  */
 static void
 print_vendor_attr(netdissect_options *ndo,

-                  register u_char *data, u_int length, u_short attr_code _U_)
+                  const u_char *data, u_int length, u_short attr_code _U_)

 {
     u_int idx;
     u_int vendor_id;
     u_int vendor_type;
     u_int vendor_length;
 
 {
     u_int idx;
     u_int vendor_id;
     u_int vendor_type;
     u_int vendor_length;
 

-    if (length < 4)
-        goto trunc;
-    ND_TCHECK2(*data, 4);
-    vendor_id = EXTRACT_32BITS(data);
+    ND_ICHECK_U(length, <, 4);
+    vendor_id = GET_BE_U_4(data);

     data+=4;
     length-=4;
 
     data+=4;
     length-=4;
 

-    ND_PRINT((ndo, "Vendor: %s (%u)",
+    ND_PRINT("Vendor: %s (%u)",

            tok2str(smi_values,"Unknown",vendor_id),
            tok2str(smi_values,"Unknown",vendor_id),

-           vendor_id));
+           vendor_id);

 
     while (length >= 2) {
 
     while (length >= 2) {

-       ND_TCHECK2(*data, 2);
-
-        vendor_type = *(data);
-        vendor_length = *(data+1);
-
-        if (vendor_length < 2)
-        {
-            ND_PRINT((ndo, "\n\t    Vendor Attribute: %u, Length: %u (bogus, must be >= 2)",
-                   vendor_type,
-                   vendor_length));
-            return;
-        }
-        if (vendor_length > length)
-        {
-            ND_PRINT((ndo, "\n\t    Vendor Attribute: %u, Length: %u (bogus, goes past end of vendor-specific attribute)",
-                   vendor_type,
-                   vendor_length));
-            return;
-        }
+        vendor_type = GET_U_1(data);
+        vendor_length = GET_U_1(data + 1);
+
+        ND_PRINT("\n\t    Vendor Attribute: %u, length: %u",
+                 vendor_type, vendor_length);
+        ND_ICHECKMSG_U("length", vendor_length, <, 2);
+        ND_ICHECKMSG_U("length", vendor_length, >, length);

         data+=2;
         vendor_length-=2;
         length-=2;
         data+=2;
         vendor_length-=2;
         length-=2;

-       ND_TCHECK2(*data, vendor_length);

 
 

-        ND_PRINT((ndo, "\n\t    Vendor Attribute: %u, Length: %u, Value: ",
-               vendor_type,
-               vendor_length));
+        ND_PRINT(", value: ");

         for (idx = 0; idx < vendor_length ; idx++, data++)
         for (idx = 0; idx < vendor_length ; idx++, data++)

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

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

-   trunc:
-     ND_PRINT((ndo, "%s", tstr));
+invalid:
+    nd_print_invalid(ndo);

 }
 
 /******************************/
 }
 
 /******************************/


@@ -568,53 +868,42 @@ print_vendor_attr(netdissect_options *ndo,
 /******************************/
 static void
 print_attr_num(netdissect_options *ndo,
 /******************************/
 static void
 print_attr_num(netdissect_options *ndo,

-               register u_char *data, u_int length, u_short attr_code)
+               const u_char *data, u_int length, u_short attr_code)

 {
    uint32_t timeout;
 
 {
    uint32_t timeout;
 

-   if (length != 4)
-   {
-       ND_PRINT((ndo, "ERROR: length %u != 4", length));
-       return;
-   }
+   ND_ICHECK_U(length, !=, 4);

 
 

-   ND_TCHECK2(data[0],4);

                           /* This attribute has standard values */
                           /* This attribute has standard values */

-   if (attr_type[attr_code].siz_subtypes)
-   {
+   if (attr_type[attr_code].siz_subtypes) {

       static const char **table;
       uint32_t data_value;
       table = attr_type[attr_code].subtypes;
 
       static const char **table;
       uint32_t data_value;
       table = attr_type[attr_code].subtypes;
 

-      if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) )
-      {
-         if (!*data)
-            ND_PRINT((ndo, "Tag[Unused] "));
+      if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) ) {
+         if (!GET_U_1(data))
+            ND_PRINT("Tag[Unused] ");

          else
          else

-            ND_PRINT((ndo, "Tag[%d] ", *data));
+            ND_PRINT("Tag[%u] ", GET_U_1(data));

          data++;
          data++;

-         data_value = EXTRACT_24BITS(data);
-      }
-      else
-      {
-         data_value = EXTRACT_32BITS(data);
+         data_value = GET_BE_U_3(data);
+      } else {
+         data_value = GET_BE_U_4(data);

       }
       if ( data_value <= (uint32_t)(attr_type[attr_code].siz_subtypes - 1 +
             attr_type[attr_code].first_subtype) &&
           data_value >= attr_type[attr_code].first_subtype )
       }
       if ( data_value <= (uint32_t)(attr_type[attr_code].siz_subtypes - 1 +
             attr_type[attr_code].first_subtype) &&
           data_value >= attr_type[attr_code].first_subtype )

-         ND_PRINT((ndo, "%s", table[data_value]));
+         ND_PRINT("%s", table[data_value]);

       else
       else

-         ND_PRINT((ndo, "#%u", data_value));
-   }
-   else
-   {
+         ND_PRINT("#%u", data_value);
+   } else {

       switch(attr_code) /* Be aware of special cases... */
       {
         case FRM_IPX:
       switch(attr_code) /* Be aware of special cases... */
       {
         case FRM_IPX:

-             if (EXTRACT_32BITS( data) == 0xFFFFFFFE )
-                ND_PRINT((ndo, "NAS Select"));
+             if (GET_BE_U_4(data) == 0xFFFFFFFE )
+                ND_PRINT("NAS Select");

              else
              else

-                ND_PRINT((ndo, "%d", EXTRACT_32BITS(data)));
+                ND_PRINT("%u", GET_BE_U_4(data));

           break;
 
         case SESSION_TIMEOUT:
           break;
 
         case SESSION_TIMEOUT:


@@ -622,56 +911,62 @@ print_attr_num(netdissect_options *ndo,
         case ACCT_DELAY:
         case ACCT_SESSION_TIME:
         case ACCT_INT_INTERVAL:
         case ACCT_DELAY:
         case ACCT_SESSION_TIME:
         case ACCT_INT_INTERVAL:

-             timeout = EXTRACT_32BITS( data);
+             timeout = GET_BE_U_4(data);

              if ( timeout < 60 )
              if ( timeout < 60 )

-                ND_PRINT((ndo,  "%02d secs", timeout));
-             else
-             {
+                ND_PRINT("%02d secs", timeout);
+             else {

                 if ( timeout < 3600 )
                 if ( timeout < 3600 )

-                   ND_PRINT((ndo,  "%02d:%02d min",
-                          timeout / 60, timeout % 60));
+                   ND_PRINT("%02d:%02d min",
+                          timeout / 60, timeout % 60);

                 else
                 else

-                   ND_PRINT((ndo, "%02d:%02d:%02d hours",
+                   ND_PRINT("%02d:%02d:%02d hours",

                           timeout / 3600, (timeout % 3600) / 60,
                           timeout / 3600, (timeout % 3600) / 60,

-                          timeout % 60));
+                          timeout % 60);

              }
           break;
 
         case FRM_ATALK_LINK:
              }
           break;
 
         case FRM_ATALK_LINK:

-             if (EXTRACT_32BITS(data) )
-                ND_PRINT((ndo, "%d", EXTRACT_32BITS(data)));
+             if (GET_BE_U_4(data))
+                ND_PRINT("%u", GET_BE_U_4(data));

              else
              else

-                ND_PRINT((ndo, "Unnumbered"));
+                ND_PRINT("Unnumbered");

           break;
 
         case FRM_ATALK_NETWORK:
           break;
 
         case FRM_ATALK_NETWORK:

-             if (EXTRACT_32BITS(data) )
-                ND_PRINT((ndo, "%d", EXTRACT_32BITS(data)));
+             if (GET_BE_U_4(data))
+                ND_PRINT("%u", GET_BE_U_4(data));

              else
              else

-                ND_PRINT((ndo, "NAS assigned"));
+                ND_PRINT("NAS assigned");

           break;
 
         case TUNNEL_PREFERENCE:
           break;
 
         case TUNNEL_PREFERENCE:

-            if (*data)
-               ND_PRINT((ndo, "Tag[%d] ", *data));
+            if (GET_U_1(data))
+               ND_PRINT("Tag[%u] ", GET_U_1(data));

             else
             else

-               ND_PRINT((ndo, "Tag[Unused] "));
+               ND_PRINT("Tag[Unused] ");
+            data++;
+            ND_PRINT("%u", GET_BE_U_3(data));
+          break;
+
+        case EGRESS_VLAN_ID:
+            ND_PRINT("%s (0x%02x) ",
+                   tok2str(rfc4675_tagged,"Unknown tag",GET_U_1(data)),
+                   GET_U_1(data));

             data++;
             data++;

-            ND_PRINT((ndo, "%d", EXTRACT_24BITS(data)));
+            ND_PRINT("%u", GET_BE_U_3(data));

           break;
 
         default:
           break;
 
         default:

-             ND_PRINT((ndo, "%d", EXTRACT_32BITS(data)));
+             ND_PRINT("%u", GET_BE_U_4(data));

           break;
 
       } /* switch */
 
    } /* if-else */
           break;
 
       } /* switch */
 
    } /* if-else */

-

    return;
 
    return;
 

-   trunc:
-     ND_PRINT((ndo, "%s", tstr));
+invalid:
+   nd_print_invalid(ndo);

 }
 
 /*****************************/
 }
 
 /*****************************/


@@ -683,38 +978,211 @@ print_attr_num(netdissect_options *ndo,
 /*****************************/
 static void
 print_attr_address(netdissect_options *ndo,
 /*****************************/
 static void
 print_attr_address(netdissect_options *ndo,

-                   register u_char *data, u_int length, u_short attr_code)
+                   const u_char *data, u_int length, u_short attr_code)

 {
 {

-   if (length != 4)
-   {
-       ND_PRINT((ndo, "ERROR: length %u != 4", length));
-       return;
-   }
+   ND_ICHECK_U(length, !=, 4);

 
 

-   ND_TCHECK2(data[0],4);
-
-   switch(attr_code)
-   {
+   switch(attr_code) {

       case FRM_IPADDR:
       case LOG_IPHOST:
       case FRM_IPADDR:
       case LOG_IPHOST:

-           if (EXTRACT_32BITS(data) == 0xFFFFFFFF )
-              ND_PRINT((ndo, "User Selected"));
+           if (GET_BE_U_4(data) == 0xFFFFFFFF )
+              ND_PRINT("User Selected");

            else
            else

-              if (EXTRACT_32BITS(data) == 0xFFFFFFFE )
-                 ND_PRINT((ndo, "NAS Select"));
+              if (GET_BE_U_4(data) == 0xFFFFFFFE )
+                 ND_PRINT("NAS Select");

               else
               else

-                 ND_PRINT((ndo, "%s",ipaddr_string(ndo, data)));
+                 ND_PRINT("%s",GET_IPADDR_STRING(data));

       break;
 
       default:
       break;
 
       default:

-          ND_PRINT((ndo, "%s", ipaddr_string(ndo, data)));
+          ND_PRINT("%s", GET_IPADDR_STRING(data));

       break;
    }
       break;
    }

+   return;
+
+invalid:
+   nd_print_invalid(ndo);
+}
+
+/*****************************/
+/* Print an attribute IPv6   */
+/* address value pointed by  */
+/* 'data' and 'length' size. */
+/*****************************/
+/* Returns nothing.          */
+/*****************************/
+static void
+print_attr_address6(netdissect_options *ndo,
+                   const u_char *data, u_int length, u_short attr_code _U_)
+{
+   ND_ICHECK_U(length, !=, 16);
+
+   ND_PRINT("%s", GET_IP6ADDR_STRING(data));
+   return;
+
+invalid:
+   nd_print_invalid(ndo);
+}
+
+static void
+print_attr_netmask6(netdissect_options *ndo,
+                    const u_char *data, u_int length, u_short attr_code _U_)
+{
+   u_char data2[16];
+   u_int reserved_mbz, prefix_length;
+
+   ND_ICHECK_U(length, <, 2);
+   ND_ICHECK_U(length, >, 18);
+   reserved_mbz = GET_U_1(data);
+   if (reserved_mbz)
+      ND_PRINT("[reserved-MBZ %u] ", reserved_mbz);
+   prefix_length = GET_U_1(data + 1);
+   ND_ICHECKMSG_U("prefix length", prefix_length, >, 128);
+   memset(data2, 0, sizeof(data2));
+   if (length > 2)
+      GET_CPY_BYTES(data2, data+2, length-2);
+
+   ND_PRINT("%s/%u", ip6addr_string(ndo, data2), prefix_length); /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */
+
+   ND_ICHECKMSG_U("inconsistent prefix length", prefix_length, >, 8 * (length - 2));
+
+   return;
+
+invalid:
+   nd_print_invalid(ndo);
+}
+
+static void
+print_attr_mip6_home_link_prefix(netdissect_options *ndo,
+                    const u_char *data, u_int length, u_short attr_code _U_)
+{
+   ND_ICHECK_U(length, !=, 17);
+   ND_ICHECKMSG_U("prefix length", GET_U_1(data), >, 128);
+
+   ND_PRINT("%s/%u", GET_IP6ADDR_STRING(data + 1), GET_U_1(data));
+
+   return;
+
+invalid:
+   nd_print_invalid(ndo);
+}
+
+static void
+print_attr_operator_name(netdissect_options *ndo,
+                    const u_char *data, u_int length, u_short attr_code _U_)
+{
+   u_int namespace_value;
+
+   ND_ICHECK_U(length, <, 2);
+   namespace_value = GET_U_1(data);
+   data++;
+   ND_PRINT("[%s] ", tok2str(operator_name_vector, "unknown namespace %u", namespace_value));
+
+   nd_printjn(ndo, data, length - 1);
+
+   return;
+
+invalid:
+   nd_print_invalid(ndo);
+}
+
+static void
+print_attr_location_information(netdissect_options *ndo,
+                    const u_char *data, u_int length, u_short attr_code _U_)
+{
+   uint16_t index;
+   uint8_t code, entity;
+
+   ND_ICHECK_U(length, <, 21);
+
+   index = GET_BE_U_2(data);
+   data += 2;
+
+   code = GET_U_1(data);
+   data++;
+
+   entity = GET_U_1(data);
+   data++;
+
+   ND_PRINT("index %u, code %s, entity %s, ",
+       index,
+       tok2str(location_information_code_vector, "Unknown (%u)", code),
+       tok2str(location_information_entity_vector, "Unknown (%u)", entity)
+   );
+
+   ND_PRINT("sighting time ");
+   p_ntp_time(ndo, (const struct l_fixedpt *)data);
+   ND_PRINT(", ");
+   data += 8;
+
+   ND_PRINT("time to live ");
+   p_ntp_time(ndo, (const struct l_fixedpt *)data);
+   ND_PRINT(", ");
+   data += 8;
+
+   ND_PRINT("method \"");
+   nd_printjn(ndo, data, length - 20);
+   ND_PRINT("\"");
+
+   return;
+
+invalid:
+   nd_print_invalid(ndo);
+}
+
+static void
+print_attr_location_data(netdissect_options *ndo,
+                    const u_char *data, u_int length, u_short attr_code _U_)
+{
+   uint16_t index;
+
+   ND_ICHECK_U(length, <, 3);
+
+   index = GET_BE_U_2(data);
+   data += 2;
+   ND_PRINT("index %u, location", index);
+
+   /* The Location field of the String field of the Location-Data attribute
+    * can have two completely different structures depending on the value of
+    * the Code field of a Location-Info attribute, which supposedly precedes
+    * the current attribute. Unfortunately, this choice of encoding makes it
+    * non-trivial to decode the Location field without preserving some state
+    * between the attributes.
+    */
+   hex_and_ascii_print(ndo, "\n\t    ", data, length - 2);
+
+   return;
+
+invalid:
+   nd_print_invalid(ndo);
+}
+
+static void
+print_basic_location_policy_rules(netdissect_options *ndo,
+                    const u_char *data, u_int length, u_short attr_code _U_)
+{
+   uint16_t flags;
+
+   ND_ICHECK_U(length, <, 10);
+
+   flags = GET_BE_U_2(data);
+   data += 2;
+   ND_PRINT("flags [%s], ", bittok2str(blpr_bm, "none", flags));
+
+   ND_PRINT("retention expires ");
+   p_ntp_time(ndo, (const struct l_fixedpt *)data);
+   data += 8;
+
+   if (length > 10) {
+      ND_PRINT(", note well \"");
+      nd_printjn(ndo, data, length - 10);
+      ND_PRINT("\"");
+   }

 
    return;
 
 
    return;
 

-   trunc:
-     ND_PRINT((ndo, "%s", tstr));
+invalid:
+   nd_print_invalid(ndo);

 }
 
 /*************************************/
 }
 
 /*************************************/


@@ -727,28 +1195,52 @@ print_attr_address(netdissect_options *ndo,
 /*************************************/
 static void
 print_attr_time(netdissect_options *ndo,
 /*************************************/
 static void
 print_attr_time(netdissect_options *ndo,

-                register u_char *data, u_int length, u_short attr_code _U_)
+                const u_char *data, u_int length, u_short attr_code _U_)

 {
    time_t attr_time;
    char string[26];
 
 {
    time_t attr_time;
    char string[26];
 

-   if (length != 4)
-   {
-       ND_PRINT((ndo, "ERROR: length %u != 4", length));
-       return;
-   }
+   ND_ICHECK_U(length, !=, 4);

 
 

-   ND_TCHECK2(data[0],4);
-
-   attr_time = EXTRACT_32BITS(data);
+   attr_time = GET_BE_U_4(data);

    strlcpy(string, ctime(&attr_time), sizeof(string));
    /* Get rid of the newline */
    string[24] = '\0';
    strlcpy(string, ctime(&attr_time), sizeof(string));
    /* Get rid of the newline */
    string[24] = '\0';

-   ND_PRINT((ndo, "%.24s", string));
+   ND_PRINT("%.24s", string);

    return;
 
    return;
 

-   trunc:
-     ND_PRINT((ndo, "%s", tstr));
+invalid:
+   nd_print_invalid(ndo);
+}
+
+static void
+print_attr_vector64(netdissect_options *ndo,
+                   const u_char *data, u_int length, u_short attr_code _U_)
+{
+   uint64_t data_value, i;
+   const char *sep = "";
+
+   ND_ICHECK_U(length, !=, 8);
+
+   ND_PRINT("[");
+
+   data_value = GET_BE_U_8(data);
+   /* Print the 64-bit field in a format similar to bittok2str(), less
+    * flagging any unknown bits. This way it should be easier to replace
+    * the custom code with a library function later.
+    */
+   for (i = 0; i < TAM_SIZE(mip6_feature_vector); i++) {
+       if (data_value & mip6_feature_vector[i].v) {
+           ND_PRINT("%s%s", sep, mip6_feature_vector[i].s);
+           sep = ", ";
+       }
+   }
+
+   ND_PRINT("]");
+   return;
+
+invalid:
+   nd_print_invalid(ndo);

 }
 
 /***********************************/
 }
 
 /***********************************/


@@ -760,179 +1252,148 @@ print_attr_time(netdissect_options *ndo,
 /***********************************/
 static void
 print_attr_strange(netdissect_options *ndo,
 /***********************************/
 static void
 print_attr_strange(netdissect_options *ndo,

-                   register u_char *data, u_int length, u_short attr_code)
+                   const u_char *data, u_int length, u_short attr_code)

 {
    u_short len_data;
 {
    u_short len_data;

+   u_int error_cause_value;

 
 

-   switch(attr_code)
-   {
+   switch(attr_code) {

       case ARAP_PASS:
       case ARAP_PASS:

-           if (length != 16)
-           {
-               ND_PRINT((ndo, "ERROR: length %u != 16", length));
-               return;
-           }
-           ND_PRINT((ndo, "User_challenge ("));
-           ND_TCHECK2(data[0],8);
+           ND_ICHECK_U(length, !=, 16);
+           ND_PRINT("User_challenge (");

            len_data = 8;
            PRINT_HEX(len_data, data);
            len_data = 8;
            PRINT_HEX(len_data, data);

-           ND_PRINT((ndo, ") User_resp("));
-           ND_TCHECK2(data[0],8);
+           ND_PRINT(") User_resp(");

            len_data = 8;
            PRINT_HEX(len_data, data);
            len_data = 8;
            PRINT_HEX(len_data, data);

-           ND_PRINT((ndo, ")"));
+           ND_PRINT(")");

         break;
 
       case ARAP_FEATURES:
         break;
 
       case ARAP_FEATURES:

-           if (length != 14)
-           {
-               ND_PRINT((ndo, "ERROR: length %u != 14", length));
-               return;
-           }
-           ND_TCHECK2(data[0],1);
-           if (*data)
-              ND_PRINT((ndo, "User can change password"));
+           ND_ICHECK_U(length, !=, 14);
+           if (GET_U_1(data))
+              ND_PRINT("User can change password");

            else
            else

-              ND_PRINT((ndo, "User cannot change password"));
+              ND_PRINT("User cannot change password");

            data++;
            data++;

-           ND_TCHECK2(data[0],1);
-           ND_PRINT((ndo, ", Min password length: %d", *data));
+           ND_PRINT(", Min password length: %u", GET_U_1(data));

            data++;
            data++;

-           ND_PRINT((ndo, ", created at: "));
-           ND_TCHECK2(data[0],4);
+           ND_PRINT(", created at: ");

            len_data = 4;
            PRINT_HEX(len_data, data);
            len_data = 4;
            PRINT_HEX(len_data, data);

-           ND_PRINT((ndo, ", expires in: "));
-           ND_TCHECK2(data[0],4);
+           ND_PRINT(", expires in: ");

            len_data = 4;
            PRINT_HEX(len_data, data);
            len_data = 4;
            PRINT_HEX(len_data, data);

-           ND_PRINT((ndo, ", Current Time: "));
-           ND_TCHECK2(data[0],4);
+           ND_PRINT(", Current Time: ");

            len_data = 4;
            PRINT_HEX(len_data, data);
         break;
 
       case ARAP_CHALLENGE_RESP:
            len_data = 4;
            PRINT_HEX(len_data, data);
         break;
 
       case ARAP_CHALLENGE_RESP:

-           if (length < 8)
-           {
-               ND_PRINT((ndo, "ERROR: length %u != 8", length));
-               return;
-           }
-           ND_TCHECK2(data[0],8);
+           ND_ICHECK_U(length, !=, 8);

            len_data = 8;
            PRINT_HEX(len_data, data);
         break;
            len_data = 8;
            PRINT_HEX(len_data, data);
         break;

+
+      case ERROR_CAUSE:
+           ND_ICHECK_U(length, !=, 4);
+           error_cause_value = GET_BE_U_4(data);
+           ND_PRINT("Error cause %u: %s", error_cause_value, tok2str(errorcausetype, "Error-Cause %u not known", error_cause_value));
+        break;

    }
    return;
 
    }
    return;
 

-   trunc:
-     ND_PRINT((ndo, "%s", tstr));
+invalid:
+   nd_print_invalid(ndo);

 }
 
 static void
 radius_attrs_print(netdissect_options *ndo,
 }
 
 static void
 radius_attrs_print(netdissect_options *ndo,

-                   register const u_char *attr, u_int length)
+                   const u_char *attr, u_int length)

 {
 {

-   register const struct radius_attr *rad_attr = (struct radius_attr *)attr;
+   const struct radius_attr *rad_attr = (const struct radius_attr *)attr;

    const char *attr_string;
    const char *attr_string;

+   uint8_t type, len;

 
 

-   while (length > 0)
-   {
-     if (length < 2)
-        goto trunc;
-     ND_TCHECK(*rad_attr);
+   while (length != 0) {
+     ND_ICHECK_U(length, <, 2);

 
 

-     if (rad_attr->type > 0 && rad_attr->type < TAM_SIZE(attr_type))
-       attr_string = attr_type[rad_attr->type].name;
+     type = GET_U_1(rad_attr->type);
+     len = GET_U_1(rad_attr->len);
+     if (type != 0 && type < TAM_SIZE(attr_type))
+       attr_string = attr_type[type].name;

      else
        attr_string = "Unknown";
      else
        attr_string = "Unknown";

-     if (rad_attr->len < 2)
-     {
-       ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u (bogus, must be >= 2)",
-               attr_string,
-               rad_attr->type,
-               rad_attr->len));
-       return;
-     }
-     if (rad_attr->len > length)
-     {
-       ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u (bogus, goes past end of packet)",
+
+     ND_PRINT("\n\t  %s Attribute (%u), length: %u",

                attr_string,
                attr_string,

-               rad_attr->type,
-               rad_attr->len));
-        return;
-     }
-     ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u, Value: ",
-            attr_string,
-            rad_attr->type,
-            rad_attr->len));
-
-     if (rad_attr->type < TAM_SIZE(attr_type))
-     {
-         if (rad_attr->len > 2)
-         {
-             if ( attr_type[rad_attr->type].print_func )
-                 (*attr_type[rad_attr->type].print_func)(
-                     ndo, ((u_char *)(rad_attr+1)),
-                     rad_attr->len - 2, rad_attr->type);
+               type,
+               len);
+     ND_ICHECKMSG_U("length", len, <, 2);
+     ND_ICHECKMSG_U("length", len, >, length);
+     ND_PRINT(", Value: ");
+
+     if (type < TAM_SIZE(attr_type)) {
+         if (len > 2) {
+             if ( attr_type[type].print_func )
+                 (*attr_type[type].print_func)(
+                     ndo, ((const u_char *)(rad_attr+1)),
+                     len - 2, type);

          }
      }
      /* do we also want to see a hex dump ? */
      if (ndo->ndo_vflag> 1)
          }
      }
      /* do we also want to see a hex dump ? */
      if (ndo->ndo_vflag> 1)

-         print_unknown_data(ndo, (u_char *)rad_attr+2, "\n\t    ", (rad_attr->len)-2);
+         print_unknown_data(ndo, (const u_char *)rad_attr+2, "\n\t    ", (len)-2);

 
 

-     length-=(rad_attr->len);
-     rad_attr = (struct radius_attr *)( ((char *)(rad_attr))+rad_attr->len);
+     length-=(len);
+     rad_attr = (const struct radius_attr *)( ((const char *)(rad_attr))+len);

    }
    return;
 
    }
    return;
 

-trunc:
-   ND_PRINT((ndo, "%s", tstr));
+invalid:
+   nd_print_invalid(ndo);

 }
 
 void
 radius_print(netdissect_options *ndo,
 }
 
 void
 radius_print(netdissect_options *ndo,

-             const u_char *dat, u_int length)
+             const u_char *dat, const u_int length)

 {
 {

-   register const struct radius_hdr *rad;
+   const struct radius_hdr *rad;

    u_int len, auth_idx;
 
    u_int len, auth_idx;
 

-   ND_TCHECK2(*dat, MIN_RADIUS_LEN);
-   rad = (struct radius_hdr *)dat;
-   len = EXTRACT_16BITS(&rad->len);
-
-   if (len < MIN_RADIUS_LEN)
-   {
-         ND_PRINT((ndo, "%s", tstr));
-         return;
-   }
+   ndo->ndo_protocol = "radius";
+   nd_print_protocol_caps(ndo);
+   ND_ICHECK_U(length, <, MIN_RADIUS_LEN);
+   rad = (const struct radius_hdr *)dat;
+   len = GET_BE_U_2(rad->len);

 
 

-   if (len > length)
-         len = length;
+   ND_ICHECKMSG_U("length", len, <, MIN_RADIUS_LEN);
+   ND_ICHECKMSG_U("length", len, >, 4096);
+   ND_ICHECKMSG_U("length", len, >, length);

 
    if (ndo->ndo_vflag < 1) {
 
    if (ndo->ndo_vflag < 1) {

-       ND_PRINT((ndo, "RADIUS, %s (%u), id: 0x%02x length: %u",
-              tok2str(radius_command_values,"Unknown Command",rad->code),
-              rad->code,
-              rad->id,
-              len));
+       ND_PRINT(", %s (%u), id: 0x%02x, length: %u",
+              tok2str(radius_command_values,"Unknown Command",GET_U_1(rad->code)),
+              GET_U_1(rad->code),
+              GET_U_1(rad->id),
+              len);
+       ND_TCHECK_LEN(dat, MIN_RADIUS_LEN);

        return;
        return;

-   }
-   else {
-       ND_PRINT((ndo, "RADIUS, length: %u\n\t%s (%u), id: 0x%02x, Authenticator: ",
+   } else {
+       ND_PRINT(", length: %u\n\t%s (%u), id: 0x%02x, Authenticator: ",

               len,
               len,

-              tok2str(radius_command_values,"Unknown Command",rad->code),
-              rad->code,
-              rad->id));
+              tok2str(radius_command_values,"Unknown Command",GET_U_1(rad->code)),
+              GET_U_1(rad->code),
+              GET_U_1(rad->id));

 
        for(auth_idx=0; auth_idx < 16; auth_idx++)
 
        for(auth_idx=0; auth_idx < 16; auth_idx++)

-            ND_PRINT((ndo, "%02x", rad->auth[auth_idx]));
+            ND_PRINT("%02x", GET_U_1((rad->auth + auth_idx)));

    }
 
    if (len > MIN_RADIUS_LEN)
       radius_attrs_print(ndo, dat + MIN_RADIUS_LEN, len - MIN_RADIUS_LEN);
    return;
 
    }
 
    if (len > MIN_RADIUS_LEN)
       radius_attrs_print(ndo, dat + MIN_RADIUS_LEN, len - MIN_RADIUS_LEN);
    return;
 

-trunc:
-   ND_PRINT((ndo, "%s", tstr));
+invalid:
+   nd_print_invalid(ndo);

 }
 }