Use nd_ types, add EXTRACT_ calls.

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index 1b88bb8d7917e3997f85683ae656a1e57170a71b..e26f467584952cf691d39b5637eef841f0cf7d7b 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -191,26 +191,26 @@ static const struct tok rfc4675_tagged[] = {
 };
 
 
 };
 
 

-static void print_attr_string(netdissect_options *, register const u_char *, u_int, u_short );
-static void print_attr_num(netdissect_options *, register const u_char *, u_int, u_short );
-static void print_vendor_attr(netdissect_options *, register const u_char *, u_int, u_short );
-static void print_attr_address(netdissect_options *, register const u_char *, u_int, u_short);
-static void print_attr_address6(netdissect_options *, register const u_char *, u_int, u_short);
-static void print_attr_netmask6(netdissect_options *, register const u_char *, u_int, u_short);
-static void print_attr_time(netdissect_options *, register const u_char *, u_int, u_short);
-static void print_attr_strange(netdissect_options *, register const u_char *, u_int, u_short);
-
-
-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_time(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 */

                    };
 
 
                    };
 
 


@@ -443,7 +443,7 @@ static struct attrtype {
                   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 const 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               },


@@ -569,7 +569,7 @@ static struct attrtype {
      { "Digest-Stale",                    NULL, 0, 0, print_attr_string },
      { "Digest-HA1",                      NULL, 0, 0, print_attr_string },
      { "SIP-AOR",                         NULL, 0, 0, print_attr_string },
      { "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 }
+     { "Delegated-IPv6-Prefix",           NULL, 0, 0, print_attr_netmask6 },

   };
 
 
   };
 
 


@@ -582,24 +582,24 @@ static struct attrtype {
 /*****************************/
 static void
 print_attr_string(netdissect_options *ndo,
 /*****************************/
 static void
 print_attr_string(netdissect_options *ndo,

-                  register const 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);
+   ND_TCHECK_LEN(data, length);

 
    switch(attr_code)
    {
       case TUNNEL_PASS:
            if (length < 3)
               goto trunc;
 
    switch(attr_code)
    {
       case TUNNEL_PASS:
            if (length < 3)
               goto trunc;

-           if (*data && (*data <=0x1F) )
-              ND_PRINT((ndo, "Tag[%u] ", *data));
+           if (EXTRACT_U_1(data) && (EXTRACT_U_1(data) <= 0x1F))
+              ND_PRINT((ndo, "Tag[%u] ", EXTRACT_U_1(data)));

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

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

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


@@ -609,12 +609,12 @@ 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 (EXTRACT_U_1(data) <= 0x1F)

            {
               if (length < 1)
                  goto trunc;
            {
               if (length < 1)
                  goto trunc;

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

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


@@ -625,15 +625,15 @@ print_attr_string(netdissect_options *ndo,
            if (length < 1)
               goto trunc;
            ND_PRINT((ndo, "%s (0x%02x) ",
            if (length < 1)
               goto trunc;
            ND_PRINT((ndo, "%s (0x%02x) ",

-                  tok2str(rfc4675_tagged,"Unknown tag",*data),
-                  *data));
+                  tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)),
+                  EXTRACT_U_1(data)));

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

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

 
    return;
 
 
    return;
 


@@ -646,7 +646,7 @@ print_attr_string(netdissect_options *ndo,
  */
 static void
 print_vendor_attr(netdissect_options *ndo,
  */
 static void
 print_vendor_attr(netdissect_options *ndo,

-                  register const 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 idx;
     u_int vendor_id;


@@ -655,8 +655,8 @@ print_vendor_attr(netdissect_options *ndo,
 
     if (length < 4)
         goto trunc;
 
     if (length < 4)
         goto trunc;

-    ND_TCHECK2(*data, 4);
-    vendor_id = EXTRACT_32BITS(data);
+    ND_TCHECK_4(data);
+    vendor_id = EXTRACT_BE_U_4(data);

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


@@ -665,10 +665,10 @@ print_vendor_attr(netdissect_options *ndo,
            vendor_id));
 
     while (length >= 2) {
            vendor_id));
 
     while (length >= 2) {

-       ND_TCHECK2(*data, 2);
+       ND_TCHECK_2(data);

 
 

-        vendor_type = *(data);
-        vendor_length = *(data+1);
+        vendor_type = EXTRACT_U_1(data);
+        vendor_length = EXTRACT_U_1(data + 1);

 
         if (vendor_length < 2)
         {
 
         if (vendor_length < 2)
         {


@@ -687,13 +687,13 @@ print_vendor_attr(netdissect_options *ndo,
         data+=2;
         vendor_length-=2;
         length-=2;
         data+=2;
         vendor_length-=2;
         length-=2;

-       ND_TCHECK2(*data, vendor_length);
+       ND_TCHECK_LEN(data, vendor_length);

 
         ND_PRINT((ndo, "\n\t    Vendor Attribute: %u, Length: %u, Value: ",
                vendor_type,
                vendor_length));
         for (idx = 0; idx < vendor_length ; idx++, data++)
 
         ND_PRINT((ndo, "\n\t    Vendor Attribute: %u, Length: %u, Value: ",
                vendor_type,
                vendor_length));
         for (idx = 0; idx < vendor_length ; idx++, data++)

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

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


@@ -711,7 +711,7 @@ print_vendor_attr(netdissect_options *ndo,
 /******************************/
 static void
 print_attr_num(netdissect_options *ndo,
 /******************************/
 static void
 print_attr_num(netdissect_options *ndo,

-               register const 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;
 


@@ -721,7 +721,7 @@ print_attr_num(netdissect_options *ndo,
        return;
    }
 
        return;
    }
 

-   ND_TCHECK2(data[0],4);
+   ND_TCHECK_4(data);

                           /* This attribute has standard values */
    if (attr_type[attr_code].siz_subtypes)
    {
                           /* This attribute has standard values */
    if (attr_type[attr_code].siz_subtypes)
    {


@@ -731,16 +731,16 @@ print_attr_num(netdissect_options *ndo,
 
       if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) )
       {
 
       if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) )
       {

-         if (!*data)
+         if (!EXTRACT_U_1(data))

             ND_PRINT((ndo, "Tag[Unused] "));
          else
             ND_PRINT((ndo, "Tag[Unused] "));
          else

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

          data++;
          data++;

-         data_value = EXTRACT_24BITS(data);
+         data_value = EXTRACT_BE_U_3(data);

       }
       else
       {
       }
       else
       {

-         data_value = EXTRACT_32BITS(data);
+         data_value = EXTRACT_BE_U_4(data);

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


@@ -754,10 +754,10 @@ print_attr_num(netdissect_options *ndo,
       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 )
+             if (EXTRACT_BE_U_4(data) == 0xFFFFFFFE )

                 ND_PRINT((ndo, "NAS Select"));
              else
                 ND_PRINT((ndo, "NAS Select"));
              else

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

           break;
 
         case SESSION_TIMEOUT:
           break;
 
         case SESSION_TIMEOUT:


@@ -765,7 +765,7 @@ 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 = EXTRACT_BE_U_4(data);

              if ( timeout < 60 )
                 ND_PRINT((ndo,  "%02d secs", timeout));
              else
              if ( timeout < 60 )
                 ND_PRINT((ndo,  "%02d secs", timeout));
              else


@@ -781,38 +781,38 @@ print_attr_num(netdissect_options *ndo,
           break;
 
         case FRM_ATALK_LINK:
           break;
 
         case FRM_ATALK_LINK:

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

              else
                 ND_PRINT((ndo, "Unnumbered"));
           break;
 
         case FRM_ATALK_NETWORK:
              else
                 ND_PRINT((ndo, "Unnumbered"));
           break;
 
         case FRM_ATALK_NETWORK:

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

              else
                 ND_PRINT((ndo, "NAS assigned"));
           break;
 
         case TUNNEL_PREFERENCE:
              else
                 ND_PRINT((ndo, "NAS assigned"));
           break;
 
         case TUNNEL_PREFERENCE:

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

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

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

           break;
 
         case EGRESS_VLAN_ID:
             ND_PRINT((ndo, "%s (0x%02x) ",
           break;
 
         case EGRESS_VLAN_ID:
             ND_PRINT((ndo, "%s (0x%02x) ",

-                   tok2str(rfc4675_tagged,"Unknown tag",*data),
-                   *data));
+                   tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)),
+                   EXTRACT_U_1(data)));

             data++;
             data++;

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

           break;
 
         default:
           break;
 
         default:

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

           break;
 
       } /* switch */
           break;
 
       } /* switch */


@@ -834,7 +834,7 @@ print_attr_num(netdissect_options *ndo,
 /*****************************/
 static void
 print_attr_address(netdissect_options *ndo,
 /*****************************/
 static void
 print_attr_address(netdissect_options *ndo,

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

 {
    if (length != 4)
    {
 {
    if (length != 4)
    {


@@ -842,16 +842,16 @@ print_attr_address(netdissect_options *ndo,
        return;
    }
 
        return;
    }
 

-   ND_TCHECK2(data[0],4);
+   ND_TCHECK_4(data);

 
    switch(attr_code)
    {
       case FRM_IPADDR:
       case LOG_IPHOST:
 
    switch(attr_code)
    {
       case FRM_IPADDR:
       case LOG_IPHOST:

-           if (EXTRACT_32BITS(data) == 0xFFFFFFFF )
+           if (EXTRACT_BE_U_4(data) == 0xFFFFFFFF )

               ND_PRINT((ndo, "User Selected"));
            else
               ND_PRINT((ndo, "User Selected"));
            else

-              if (EXTRACT_32BITS(data) == 0xFFFFFFFE )
+              if (EXTRACT_BE_U_4(data) == 0xFFFFFFFE )

                  ND_PRINT((ndo, "NAS Select"));
               else
                  ND_PRINT((ndo, "%s",ipaddr_string(ndo, data)));
                  ND_PRINT((ndo, "NAS Select"));
               else
                  ND_PRINT((ndo, "%s",ipaddr_string(ndo, data)));


@@ -877,7 +877,7 @@ print_attr_address(netdissect_options *ndo,
 /*****************************/
 static void
 print_attr_address6(netdissect_options *ndo,
 /*****************************/
 static void
 print_attr_address6(netdissect_options *ndo,

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

 {
    if (length != 16)
    {
 {
    if (length != 16)
    {


@@ -885,7 +885,7 @@ print_attr_address6(netdissect_options *ndo,
        return;
    }
 
        return;
    }
 

-   ND_TCHECK2(data[0], 16);
+   ND_TCHECK_16(data);

 
    ND_PRINT((ndo, "%s", ip6addr_string(ndo, data)));
 
 
    ND_PRINT((ndo, "%s", ip6addr_string(ndo, data)));
 


@@ -897,27 +897,30 @@ print_attr_address6(netdissect_options *ndo,
 
 static void
 print_attr_netmask6(netdissect_options *ndo,
 
 static void
 print_attr_netmask6(netdissect_options *ndo,

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

 {
 {

-   u_char data2[18];
+   u_char data2[16];

 
    if (length < 2 || length > 18)
    {
        ND_PRINT((ndo, "ERROR: length %u not in range (2..18)", length));
        return;
    }
 
    if (length < 2 || length > 18)
    {
        ND_PRINT((ndo, "ERROR: length %u not in range (2..18)", length));
        return;
    }

-   else if (data[1] > 128)
+   ND_TCHECK_LEN(data, length);
+   if (EXTRACT_U_1(data + 1) > 128)

    {
    {

-      ND_PRINT((ndo, "ERROR: netmask %u not in range (0..128)", data[1]));
+      ND_PRINT((ndo, "ERROR: netmask %u not in range (0..128)", EXTRACT_U_1(data + 1)));

       return;
    }
 
       return;
    }
 

-   ND_TCHECK2(data[0], length);

    memset(data2, 0, sizeof(data2));
    if (length > 2)
       memcpy(data2, data+2, length-2);
 
    memset(data2, 0, sizeof(data2));
    if (length > 2)
       memcpy(data2, data+2, length-2);
 

-   ND_PRINT((ndo, "%s/%u", ip6addr_string(ndo, data2), data[1]));
+   ND_PRINT((ndo, "%s/%u", ip6addr_string(ndo, data2), EXTRACT_U_1(data + 1)));
+
+   if (EXTRACT_U_1(data + 1) > 8 * (length - 2))
+      ND_PRINT((ndo, " (inconsistent prefix length)"));

 
    return;
 
 
    return;
 


@@ -935,7 +938,7 @@ print_attr_netmask6(netdissect_options *ndo,
 /*************************************/
 static void
 print_attr_time(netdissect_options *ndo,
 /*************************************/
 static void
 print_attr_time(netdissect_options *ndo,

-                register const 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];


@@ -946,9 +949,9 @@ print_attr_time(netdissect_options *ndo,
        return;
    }
 
        return;
    }
 

-   ND_TCHECK2(data[0],4);
+   ND_TCHECK_4(data);

 
 

-   attr_time = EXTRACT_32BITS(data);
+   attr_time = EXTRACT_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';


@@ -968,7 +971,7 @@ print_attr_time(netdissect_options *ndo,
 /***********************************/
 static void
 print_attr_strange(netdissect_options *ndo,
 /***********************************/
 static void
 print_attr_strange(netdissect_options *ndo,

-                   register const 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_int error_cause_value;
 {
    u_short len_data;
    u_int error_cause_value;


@@ -982,11 +985,11 @@ print_attr_strange(netdissect_options *ndo,
                return;
            }
            ND_PRINT((ndo, "User_challenge ("));
                return;
            }
            ND_PRINT((ndo, "User_challenge ("));

-           ND_TCHECK2(data[0],8);
+           ND_TCHECK_8(data);

            len_data = 8;
            PRINT_HEX(len_data, data);
            ND_PRINT((ndo, ") User_resp("));
            len_data = 8;
            PRINT_HEX(len_data, data);
            ND_PRINT((ndo, ") User_resp("));

-           ND_TCHECK2(data[0],8);
+           ND_TCHECK_8(data);

            len_data = 8;
            PRINT_HEX(len_data, data);
            ND_PRINT((ndo, ")"));
            len_data = 8;
            PRINT_HEX(len_data, data);
            ND_PRINT((ndo, ")"));


@@ -998,25 +1001,25 @@ print_attr_strange(netdissect_options *ndo,
                ND_PRINT((ndo, "ERROR: length %u != 14", length));
                return;
            }
                ND_PRINT((ndo, "ERROR: length %u != 14", length));
                return;
            }

-           ND_TCHECK2(data[0],1);
-           if (*data)
+           ND_TCHECK_1(data);
+           if (EXTRACT_U_1(data))

               ND_PRINT((ndo, "User can change password"));
            else
               ND_PRINT((ndo, "User cannot change password"));
            data++;
               ND_PRINT((ndo, "User can change password"));
            else
               ND_PRINT((ndo, "User cannot change password"));
            data++;

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

            data++;
            ND_PRINT((ndo, ", created at: "));
            data++;
            ND_PRINT((ndo, ", created at: "));

-           ND_TCHECK2(data[0],4);
+           ND_TCHECK_4(data);

            len_data = 4;
            PRINT_HEX(len_data, data);
            ND_PRINT((ndo, ", expires in: "));
            len_data = 4;
            PRINT_HEX(len_data, data);
            ND_PRINT((ndo, ", expires in: "));

-           ND_TCHECK2(data[0],4);
+           ND_TCHECK_4(data);

            len_data = 4;
            PRINT_HEX(len_data, data);
            ND_PRINT((ndo, ", Current Time: "));
            len_data = 4;
            PRINT_HEX(len_data, data);
            ND_PRINT((ndo, ", Current Time: "));

-           ND_TCHECK2(data[0],4);
+           ND_TCHECK_4(data);

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


@@ -1027,7 +1030,7 @@ print_attr_strange(netdissect_options *ndo,
                ND_PRINT((ndo, "ERROR: length %u != 8", length));
                return;
            }
                ND_PRINT((ndo, "ERROR: length %u != 8", length));
                return;
            }

-           ND_TCHECK2(data[0],8);
+           ND_TCHECK_8(data);

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


@@ -1038,9 +1041,9 @@ print_attr_strange(netdissect_options *ndo,
                ND_PRINT((ndo, "Error: length %u != 4", length));
                return;
            }
                ND_PRINT((ndo, "Error: length %u != 4", length));
                return;
            }

-           ND_TCHECK2(data[0],4);
+           ND_TCHECK_4(data);

 
 

-           error_cause_value = EXTRACT_32BITS(data);
+           error_cause_value = EXTRACT_BE_U_4(data);

            ND_PRINT((ndo, "Error cause %u: %s", error_cause_value, tok2str(errorcausetype, "Error-Cause %u not known", error_cause_value)));
         break;
    }
            ND_PRINT((ndo, "Error cause %u: %s", error_cause_value, tok2str(errorcausetype, "Error-Cause %u not known", error_cause_value)));
         break;
    }


@@ -1052,10 +1055,11 @@ print_attr_strange(netdissect_options *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 = (const 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)
    {
 
    while (length > 0)
    {


@@ -1063,47 +1067,49 @@ radius_attrs_print(netdissect_options *ndo,
         goto trunc;
      ND_TCHECK(*rad_attr);
 
         goto trunc;
      ND_TCHECK(*rad_attr);
 

-     if (rad_attr->type > 0 && rad_attr->type < TAM_SIZE(attr_type))
-       attr_string = attr_type[rad_attr->type].name;
+     type = EXTRACT_U_1(rad_attr->type);
+     len = EXTRACT_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)
+     if (len < 2)

      {
        ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u (bogus, must be >= 2)",
                attr_string,
      {
        ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u (bogus, must be >= 2)",
                attr_string,

-               rad_attr->type,
-               rad_attr->len));
+               type,
+               len));

        return;
      }
        return;
      }

-     if (rad_attr->len > length)
+     if (len > length)

      {
        ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u (bogus, goes past end of packet)",
                attr_string,
      {
        ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u (bogus, goes past end of packet)",
                attr_string,

-               rad_attr->type,
-               rad_attr->len));
+               type,
+               len));

         return;
      }
      ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u, Value: ",
             attr_string,
         return;
      }
      ND_PRINT((ndo, "\n\t  %s Attribute (%u), length: %u, Value: ",
             attr_string,

-            rad_attr->type,
-            rad_attr->len));
+            type,
+            len));

 
 

-     if (rad_attr->type < TAM_SIZE(attr_type))
+     if (type < TAM_SIZE(attr_type))

      {
      {

-         if (rad_attr->len > 2)
+         if (len > 2)

          {
          {

-             if ( attr_type[rad_attr->type].print_func )
-                 (*attr_type[rad_attr->type].print_func)(
+             if ( attr_type[type].print_func )
+                 (*attr_type[type].print_func)(

                      ndo, ((const u_char *)(rad_attr+1)),
                      ndo, ((const u_char *)(rad_attr+1)),

-                     rad_attr->len - 2, rad_attr->type);
+                     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, (const 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 = (const struct radius_attr *)( ((const char *)(rad_attr))+rad_attr->len);
+     length-=(len);
+     rad_attr = (const struct radius_attr *)( ((const char *)(rad_attr))+len);

    }
    return;
 
    }
    return;
 


@@ -1115,12 +1121,12 @@ void
 radius_print(netdissect_options *ndo,
              const u_char *dat, u_int length)
 {
 radius_print(netdissect_options *ndo,
              const u_char *dat, 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);
+   ND_TCHECK_LEN(dat, MIN_RADIUS_LEN);

    rad = (const struct radius_hdr *)dat;
    rad = (const struct radius_hdr *)dat;

-   len = EXTRACT_16BITS(&rad->len);
+   len = EXTRACT_BE_U_2(rad->len);

 
    if (len < MIN_RADIUS_LEN)
    {
 
    if (len < MIN_RADIUS_LEN)
    {


@@ -1133,18 +1139,18 @@ radius_print(netdissect_options *ndo,
 
    if (ndo->ndo_vflag < 1) {
        ND_PRINT((ndo, "RADIUS, %s (%u), id: 0x%02x length: %u",
 
    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,
+              tok2str(radius_command_values,"Unknown Command",EXTRACT_U_1(rad->code)),
+              EXTRACT_U_1(rad->code),
+              EXTRACT_U_1(rad->id),

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

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

 
        for(auth_idx=0; auth_idx < 16; auth_idx++)
             ND_PRINT((ndo, "%02x", rad->auth[auth_idx]));
 
        for(auth_idx=0; auth_idx < 16; auth_idx++)
             ND_PRINT((ndo, "%02x", rad->auth[auth_idx]));