Use more the EXTRACT_U_1() macro (43/n)

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index 2e7dd78d6aa60404ba1c5369e697724f4b05bef1..5ce68d163cd8bff63cb80dd3c14e6754f73de602 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -594,7 +594,7 @@ print_attr_string(netdissect_options *ndo,
            if (length < 3)
               goto trunc;
            if (*data && (*data <=0x1F) )
            if (length < 3)
               goto trunc;
            if (*data && (*data <=0x1F) )

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

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


@@ -614,7 +614,7 @@ print_attr_string(netdissect_options *ndo,
               if (length < 1)
                  goto trunc;
               if (*data)
               if (length < 1)
                  goto trunc;
               if (*data)

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

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


@@ -626,14 +626,14 @@ print_attr_string(netdissect_options *ndo,
               goto trunc;
            ND_PRINT((ndo, "%s (0x%02x) ",
                   tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)),
               goto trunc;
            ND_PRINT((ndo, "%s (0x%02x) ",
                   tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)),

-                  *data));
+                  EXTRACT_U_1(data)));

            data++;
            length--;
         break;
    }
 
    for (i=0; i < length && EXTRACT_U_1(data); i++, data++)
            data++;
            length--;
         break;
    }
 
    for (i=0; i < length && EXTRACT_U_1(data); i++, data++)

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

 
    return;
 
 
    return;
 


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

-    ND_TCHECK2(*data, 4);
+    ND_TCHECK_4(data);

     vendor_id = EXTRACT_BE_U_4(data);
     data+=4;
     length-=4;
     vendor_id = EXTRACT_BE_U_4(data);
     data+=4;
     length-=4;


@@ -665,7 +665,7 @@ 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 = EXTRACT_U_1(data + 1);
 
         vendor_type = *(data);
         vendor_length = EXTRACT_U_1(data + 1);


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

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

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


@@ -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)
    {


@@ -734,7 +734,7 @@ print_attr_num(netdissect_options *ndo,
          if (!*data)
             ND_PRINT((ndo, "Tag[Unused] "));
          else
          if (!*data)
             ND_PRINT((ndo, "Tag[Unused] "));
          else

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

          data++;
          data_value = EXTRACT_BE_U_3(data);
       }
          data++;
          data_value = EXTRACT_BE_U_3(data);
       }


@@ -796,7 +796,7 @@ print_attr_num(netdissect_options *ndo,
 
         case TUNNEL_PREFERENCE:
             if (*data)
 
         case TUNNEL_PREFERENCE:
             if (*data)

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

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


@@ -806,7 +806,7 @@ print_attr_num(netdissect_options *ndo,
         case EGRESS_VLAN_ID:
             ND_PRINT((ndo, "%s (0x%02x) ",
                    tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)),
         case EGRESS_VLAN_ID:
             ND_PRINT((ndo, "%s (0x%02x) ",
                    tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)),

-                   *data));
+                   EXTRACT_U_1(data)));

             data++;
             ND_PRINT((ndo, "%d", EXTRACT_BE_U_3(data)));
           break;
             data++;
             ND_PRINT((ndo, "%d", EXTRACT_BE_U_3(data)));
           break;


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

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

 
    switch(attr_code)
    {
 
    switch(attr_code)
    {


@@ -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)));
 


@@ -907,9 +907,9 @@ print_attr_netmask6(netdissect_options *ndo,
        return;
    }
    ND_TCHECK2(data[0], length);
        return;
    }
    ND_TCHECK2(data[0], length);

-   if (data[1] > 128)
+   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;
    }
 


@@ -917,9 +917,9 @@ print_attr_netmask6(netdissect_options *ndo,
    if (length > 2)
       memcpy(data2, data+2, length-2);
 
    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 (data[1] > 8 * (length - 2))
+   if (EXTRACT_U_1(data + 1) > 8 * (length - 2))

       ND_PRINT((ndo, " (inconsistent prefix length)"));
 
    return;
       ND_PRINT((ndo, " (inconsistent prefix length)"));
 
    return;


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

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

 
    attr_time = EXTRACT_BE_U_4(data);
    strlcpy(string, ctime(&attr_time), sizeof(string));
 
    attr_time = EXTRACT_BE_U_4(data);
    strlcpy(string, ctime(&attr_time), sizeof(string));


@@ -985,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, ")"));


@@ -1001,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);
+           ND_TCHECK_1(data);

            if (*data)
               ND_PRINT((ndo, "User can change password"));
            else
               ND_PRINT((ndo, "User cannot change password"));
            data++;
            if (*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: %d", 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;


@@ -1030,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;


@@ -1041,7 +1041,7 @@ 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_BE_U_4(data);
            ND_PRINT((ndo, "Error cause %u: %s", error_cause_value, tok2str(errorcausetype, "Error-Cause %u not known", error_cause_value)));
 
            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)));