};
-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
-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 */
};
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 },
/*****************************/
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;
- if (*data && (*data <=0x1F) )
+ 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] "));
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 (*data)
+ if (EXTRACT_U_1(data))
ND_PRINT((ndo, "Tag[%u] ", EXTRACT_U_1(data)));
else
ND_PRINT((ndo, "Tag[Unused] "));
}
for (i=0; i < length && EXTRACT_U_1(data); i++, data++)
- ND_PRINT((ndo, "%c", (EXTRACT_U_1(data) < 32 || EXTRACT_U_1(data) > 126) ? '.' : EXTRACT_U_1(data)));
+ ND_PRINT((ndo, "%c", ND_ISPRINT(EXTRACT_U_1(data)) ? EXTRACT_U_1(data) : '.'));
return;
*/
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;
while (length >= 2) {
ND_TCHECK_2(data);
- vendor_type = *(data);
+ vendor_type = EXTRACT_U_1(data);
vendor_length = EXTRACT_U_1(data + 1);
if (vendor_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, "%c", (EXTRACT_U_1(data) < 32 || EXTRACT_U_1(data) > 126) ? '.' : EXTRACT_U_1(data)));
+ ND_PRINT((ndo, "%c", ND_ISPRINT(EXTRACT_U_1(data)) ? EXTRACT_U_1(data) : '.'));
length-=vendor_length;
}
return;
/******************************/
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;
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[%d] ", EXTRACT_U_1(data)));
+ ND_PRINT((ndo, "Tag[%u] ", EXTRACT_U_1(data)));
data++;
data_value = EXTRACT_BE_U_3(data);
}
if (EXTRACT_BE_U_4(data) == 0xFFFFFFFE )
ND_PRINT((ndo, "NAS Select"));
else
- ND_PRINT((ndo, "%d", EXTRACT_BE_U_4(data)));
+ ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(data)));
break;
case SESSION_TIMEOUT:
case FRM_ATALK_LINK:
if (EXTRACT_BE_U_4(data))
- ND_PRINT((ndo, "%d", EXTRACT_BE_U_4(data)));
+ ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(data)));
else
ND_PRINT((ndo, "Unnumbered"));
break;
case FRM_ATALK_NETWORK:
if (EXTRACT_BE_U_4(data))
- ND_PRINT((ndo, "%d", EXTRACT_BE_U_4(data)));
+ ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(data)));
else
ND_PRINT((ndo, "NAS assigned"));
break;
case TUNNEL_PREFERENCE:
- if (*data)
- ND_PRINT((ndo, "Tag[%d] ", EXTRACT_U_1(data)));
+ if (EXTRACT_U_1(data))
+ ND_PRINT((ndo, "Tag[%u] ", EXTRACT_U_1(data)));
else
ND_PRINT((ndo, "Tag[Unused] "));
data++;
- ND_PRINT((ndo, "%d", EXTRACT_BE_U_3(data)));
+ ND_PRINT((ndo, "%u", EXTRACT_BE_U_3(data)));
break;
case EGRESS_VLAN_ID:
tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)),
EXTRACT_U_1(data)));
data++;
- ND_PRINT((ndo, "%d", EXTRACT_BE_U_3(data)));
+ ND_PRINT((ndo, "%u", EXTRACT_BE_U_3(data)));
break;
default:
- ND_PRINT((ndo, "%d", EXTRACT_BE_U_4(data)));
+ ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(data)));
break;
} /* switch */
/*****************************/
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)
{
/*****************************/
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)
{
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[16];
ND_PRINT((ndo, "ERROR: length %u not in range (2..18)", length));
return;
}
- ND_TCHECK2(data[0], length);
- 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)", EXTRACT_U_1(data + 1)));
return;
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;
/*************************************/
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];
/***********************************/
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;
return;
}
ND_TCHECK_1(data);
- if (*data)
+ if (EXTRACT_U_1(data))
ND_PRINT((ndo, "User can change password"));
else
ND_PRINT((ndo, "User cannot change password"));
data++;
ND_TCHECK_1(data);
- ND_PRINT((ndo, ", Min password length: %d", EXTRACT_U_1(data)));
+ ND_PRINT((ndo, ", Min password length: %u", EXTRACT_U_1(data)));
data++;
ND_PRINT((ndo, ", created at: "));
ND_TCHECK_4(data);
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;
+ uint8_t type, len;
while (length > 0)
{
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";
- if (rad_attr->len < 2)
+ if (len < 2)
{
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;
}
- 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,
- rad_attr->type,
- rad_attr->len));
+ type,
+ len));
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)),
- rad_attr->len - 2, rad_attr->type);
+ len - 2, type);
}
}
/* 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;
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;
- ND_TCHECK2(*dat, MIN_RADIUS_LEN);
+ ND_TCHECK_LEN(dat, MIN_RADIUS_LEN);
rad = (const struct radius_hdr *)dat;
- len = EXTRACT_BE_U_2(&rad->len);
+ len = EXTRACT_BE_U_2(rad->len);
if (len < MIN_RADIUS_LEN)
{
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,
- 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]));
projects / tcpdump / blobdiff