X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d8878f053df5026b9906b623a856aeba71026564..febd0bc5aa33b3de9b5864e8c5565fe7b63f519f:/print-radius.c diff --git a/print-radius.c b/print-radius.c index 44f0c7fc..eb48de50 100644 --- 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. */ + +/* \summary: Radius protocol printer */ + /* * Radius printer routines as specified on: * @@ -37,37 +40,42 @@ * RFC 2869: * "RADIUS Extensions" * + * RFC 3580: + * "IEEE 802.1X Remote Authentication Dial In User Service (RADIUS)" + * "Usage Guidelines" + * + * RFC 4675: + * "RADIUS Attributes for Virtual LAN and Priority Support" + * + * RFC 5176: + * "Dynamic Authorization Extensions to RADIUS" + * * Alfredo Andres Omella (aandres@s21sec.com) v0.1 2000/09/15 * * TODO: Among other things to print ok MacIntosh and Vendor values */ -#ifndef lint -static const char rcsid[] _U_ = - "$Id: print-radius.c,v 1.28 2005-09-26 01:01:55 guy Exp $"; -#endif - #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include #include -#include - -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" #include "oui.h" +static const char tstr[] = " [|radius]"; + #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) ) #define PRINT_HEX(bytes_len, ptr_data) \ while(bytes_len) \ { \ - printf("%02X", *ptr_data ); \ + ND_PRINT((ndo, "%02X", *ptr_data )); \ ptr_data++; \ bytes_len--; \ } @@ -82,17 +90,29 @@ static const char rcsid[] _U_ = #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 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" }, +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_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} }; @@ -113,6 +133,9 @@ static struct tok radius_command_values[] = { #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 @@ -135,25 +158,34 @@ static struct tok radius_command_values[] = { /* End Radius Attribute types */ /********************************/ +#define RFC4675_TAGGED 0x31 +#define RFC4675_UNTAGGED 0x32 + +static const struct tok rfc4675_tagged[] = { + { RFC4675_TAGGED, "Tagged" }, + { RFC4675_UNTAGGED, "Untagged" }, + { 0, NULL} +}; -static void print_attr_string(register u_char *, u_int, u_short ); -static void print_attr_num(register u_char *, u_int, u_short ); -static void print_vendor_attr(register u_char *, u_int, u_short ); -static void print_attr_address(register u_char *, u_int, u_short); -static void print_attr_time(register u_char *, u_int, u_short); -static void print_attr_strange(register u_char *, u_int, u_short); +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_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 { u_int8_t code; /* Radius packet code */ - u_int8_t id; /* Radius packet id */ - u_int16_t len; /* Radius total length */ - u_int8_t auth[16]; /* Authenticator */ + +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 */ }; #define MIN_RADIUS_LEN 20 -struct radius_attr { u_int8_t type; /* Attribute type */ - u_int8_t len; /* Attribute length */ +struct radius_attr { uint8_t type; /* Attribute type */ + uint8_t len; /* Attribute length */ }; @@ -214,6 +246,12 @@ 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 */ static const char *nas_port_type[]={ "Async", "Sync", @@ -299,6 +337,7 @@ static const char *tunnel_type[]={ NULL, "GRE", "DVS", "IP-in-IP Tunneling", + "VLAN", }; /* Tunnel-Medium-Type Attribute standard values */ @@ -333,105 +372,106 @@ static const char *prompt[]={ "No Echo", }; -struct attrtype { const char *name; /* Attribute name */ +static struct attrtype { + const char *name; /* Attribute name */ const char **subtypes; /* Standard Values (if any) */ u_char siz_subtypes; /* Size of total standard values */ u_char first_subtype; /* First standard value is 0 or 1 */ - void (*print_func)(register u_char *, u_int, u_short ); + void (*print_func)(netdissect_options *, register const u_char *, u_int, u_short); } 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 }, + { "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*/ - { "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 }, + { "Callback-Id", NULL, 0, 0, print_attr_string }, { "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 }, - { "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 }, + { "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 }, + { "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 }, + { "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*/ - { "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 }, + { "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 }, + { "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 }, - { "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 }, - { "Unassigned", NULL, 0, 0, NULL }, - { "Tunnel Client Authentication ID", NULL, 0, 0, print_attr_string }, - { "Tunnel Server Authentication ID", NULL, 0, 0, print_attr_string }, + { "Connect-Info", NULL, 0, 0, print_attr_string }, + { "Configuration-Token", NULL, 0, 0, print_attr_string }, + { "EAP-Message", NULL, 0, 0, print_attr_string }, + { "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 }, + { "Tunnel-Client-Auth-ID", NULL, 0, 0, print_attr_string }, + { "Tunnel-Server-Auth-ID", NULL, 0, 0, print_attr_string }, { "Unassigned", NULL, 0, 0, NULL }, /*92*/ { "Unassigned", NULL, 0, 0, NULL } /*93*/ }; @@ -445,25 +485,28 @@ struct attrtype { const char *name; /* Attribute name */ /* Returns nothing. */ /*****************************/ static void -print_attr_string(register u_char *data, u_int length, u_short attr_code ) +print_attr_string(netdissect_options *ndo, + register const u_char *data, u_int length, u_short attr_code) { register u_int i; - TCHECK2(data[0],length); + ND_TCHECK2(data[0],length); switch(attr_code) { case TUNNEL_PASS: if (length < 3) { - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); return; } if (*data && (*data <=0x1F) ) - printf("Tag %u, ",*data); + ND_PRINT((ndo, "Tag[%u] ", *data)); + else + ND_PRINT((ndo, "Tag[Unused] ")); data++; length--; - printf("Salt %u ",EXTRACT_16BITS(data) ); + ND_PRINT((ndo, "Salt %u ", EXTRACT_16BITS(data))); data+=2; length-=2; break; @@ -477,31 +520,41 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code ) { if (length < 1) { - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); return; } - printf("Tag %u",*data); + if (*data) + ND_PRINT((ndo, "Tag[%u] ", *data)); + else + ND_PRINT((ndo, "Tag[Unused] ")); data++; length--; } break; + case EGRESS_VLAN_NAME: + ND_PRINT((ndo, "%s (0x%02x) ", + tok2str(rfc4675_tagged,"Unknown tag",*data), + *data)); + data++; + length--; + break; } for (i=0; *data && i < length ; i++, data++) - printf("%c",(*data < 32 || *data > 128) ? '.' : *data ); + ND_PRINT((ndo, "%c", (*data < 32 || *data > 126) ? '.' : *data)); return; trunc: - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); } /* * print vendor specific attributes */ - static void -print_vendor_attr(register u_char *data, u_int length, u_short attr_code _U_) +print_vendor_attr(netdissect_options *ndo, + register const u_char *data, u_int length, u_short attr_code _U_) { u_int idx; u_int vendor_id; @@ -510,55 +563,53 @@ print_vendor_attr(register u_char *data, u_int length, u_short attr_code _U_) if (length < 4) goto trunc; - TCHECK2(*data, 4); + ND_TCHECK2(*data, 4); vendor_id = EXTRACT_32BITS(data); data+=4; length-=4; - printf("Vendor: %s (%u)", + ND_PRINT((ndo, "Vendor: %s (%u)", tok2str(smi_values,"Unknown",vendor_id), - vendor_id); + vendor_id)); while (length >= 2) { - TCHECK2(*data, 2); + ND_TCHECK2(*data, 2); vendor_type = *(data); vendor_length = *(data+1); if (vendor_length < 2) { - printf("\n\t Vendor Attribute: %u, Length: %u (bogus, must be >= 2)", + ND_PRINT((ndo, "\n\t Vendor Attribute: %u, Length: %u (bogus, must be >= 2)", vendor_type, - vendor_length); + vendor_length)); return; } if (vendor_length > length) { - printf("\n\t Vendor Attribute: %u, Length: %u (bogus, goes past end of vendor-specific attribute)", + ND_PRINT((ndo, "\n\t Vendor Attribute: %u, Length: %u (bogus, goes past end of vendor-specific attribute)", vendor_type, - vendor_length); + vendor_length)); return; } data+=2; vendor_length-=2; length-=2; - TCHECK2(*data, vendor_length); + ND_TCHECK2(*data, vendor_length); - printf("\n\t Vendor Attribute: %u, Length: %u, Value: ", + ND_PRINT((ndo, "\n\t Vendor Attribute: %u, Length: %u, Value: ", vendor_type, - vendor_length); + vendor_length)); for (idx = 0; idx < vendor_length ; idx++, data++) - printf("%c",(*data < 32 || *data > 128) ? '.' : *data ); + ND_PRINT((ndo, "%c", (*data < 32 || *data > 126) ? '.' : *data)); length-=vendor_length; } return; trunc: - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); } - - /******************************/ /* Print an attribute numeric */ /* value pointed by 'data' */ @@ -567,31 +618,31 @@ print_vendor_attr(register u_char *data, u_int length, u_short attr_code _U_) /* Returns nothing. */ /******************************/ static void -print_attr_num(register u_char *data, u_int length, u_short attr_code ) +print_attr_num(netdissect_options *ndo, + register const u_char *data, u_int length, u_short attr_code) { - u_int8_t tag; - u_int32_t timeout; + uint32_t timeout; if (length != 4) { - printf("ERROR: length %u != 4", length); + ND_PRINT((ndo, "ERROR: length %u != 4", length)); return; } - TCHECK2(data[0],4); + ND_TCHECK2(data[0],4); /* This attribute has standard values */ if (attr_type[attr_code].siz_subtypes) { static const char **table; - u_int32_t data_value; + uint32_t data_value; table = attr_type[attr_code].subtypes; if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) ) { if (!*data) - printf("Tag[Unused]"); + ND_PRINT((ndo, "Tag[Unused] ")); else - printf("Tag[%d]", *data); + ND_PRINT((ndo, "Tag[%d] ", *data)); data++; data_value = EXTRACT_24BITS(data); } @@ -599,12 +650,12 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) { data_value = EXTRACT_32BITS(data); } - if ( data_value <= (u_int32_t)(attr_type[attr_code].siz_subtypes - 1 + + 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 ) - printf("%s",table[data_value]); + ND_PRINT((ndo, "%s", table[data_value])); else - printf("#%u",data_value); + ND_PRINT((ndo, "#%u", data_value)); } else { @@ -612,9 +663,9 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) { case FRM_IPX: if (EXTRACT_32BITS( data) == 0xFFFFFFFE ) - printf("NAS Select"); + ND_PRINT((ndo, "NAS Select")); else - printf("%d",EXTRACT_32BITS( data) ); + ND_PRINT((ndo, "%d", EXTRACT_32BITS(data))); break; case SESSION_TIMEOUT: @@ -624,44 +675,52 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) case ACCT_INT_INTERVAL: timeout = EXTRACT_32BITS( data); if ( timeout < 60 ) - printf( "%02d secs", timeout); + ND_PRINT((ndo, "%02d secs", timeout)); else { if ( timeout < 3600 ) - printf( "%02d:%02d min", - timeout / 60, timeout % 60); + ND_PRINT((ndo, "%02d:%02d min", + timeout / 60, timeout % 60)); else - printf( "%02d:%02d:%02d hours", + ND_PRINT((ndo, "%02d:%02d:%02d hours", timeout / 3600, (timeout % 3600) / 60, - timeout % 60); + timeout % 60)); } break; case FRM_ATALK_LINK: if (EXTRACT_32BITS(data) ) - printf("%d",EXTRACT_32BITS(data) ); + ND_PRINT((ndo, "%d", EXTRACT_32BITS(data))); else - printf("Unnumbered" ); + ND_PRINT((ndo, "Unnumbered")); break; case FRM_ATALK_NETWORK: if (EXTRACT_32BITS(data) ) - printf("%d",EXTRACT_32BITS(data) ); + ND_PRINT((ndo, "%d", EXTRACT_32BITS(data))); else - printf("NAS assigned" ); + ND_PRINT((ndo, "NAS assigned")); break; case TUNNEL_PREFERENCE: - tag = *data; - data++; - if (tag == 0) - printf("Tag (Unused) %d",EXTRACT_24BITS(data) ); + if (*data) + ND_PRINT((ndo, "Tag[%d] ", *data)); else - printf("Tag (%d) %d", tag, EXTRACT_24BITS(data) ); + ND_PRINT((ndo, "Tag[Unused] ")); + data++; + ND_PRINT((ndo, "%d", EXTRACT_24BITS(data))); + break; + + case EGRESS_VLAN_ID: + ND_PRINT((ndo, "%s (0x%02x) ", + tok2str(rfc4675_tagged,"Unknown tag",*data), + *data)); + data++; + ND_PRINT((ndo, "%d", EXTRACT_24BITS(data))); break; default: - printf("%d",EXTRACT_32BITS( data) ); + ND_PRINT((ndo, "%d", EXTRACT_32BITS(data))); break; } /* switch */ @@ -671,10 +730,9 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) return; trunc: - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); } - /*****************************/ /* Print an attribute IPv4 */ /* address value pointed by */ @@ -683,41 +741,41 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) /* Returns nothing. */ /*****************************/ static void -print_attr_address(register u_char *data, u_int length, u_short attr_code ) +print_attr_address(netdissect_options *ndo, + register const u_char *data, u_int length, u_short attr_code) { if (length != 4) { - printf("ERROR: length %u != 4", length); + ND_PRINT((ndo, "ERROR: length %u != 4", length)); return; } - TCHECK2(data[0],4); + ND_TCHECK2(data[0],4); switch(attr_code) { case FRM_IPADDR: case LOG_IPHOST: if (EXTRACT_32BITS(data) == 0xFFFFFFFF ) - printf("User Selected"); + ND_PRINT((ndo, "User Selected")); else if (EXTRACT_32BITS(data) == 0xFFFFFFFE ) - printf("NAS Select"); + ND_PRINT((ndo, "NAS Select")); else - printf("%s",ipaddr_string(data)); + ND_PRINT((ndo, "%s",ipaddr_string(ndo, data))); break; default: - printf("%s",ipaddr_string(data) ); + ND_PRINT((ndo, "%s", ipaddr_string(ndo, data))); break; } return; trunc: - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); } - /*************************************/ /* Print an attribute of 'secs since */ /* January 1, 1970 00:00 UTC' value */ @@ -726,31 +784,32 @@ print_attr_address(register u_char *data, u_int length, u_short attr_code ) /*************************************/ /* Returns nothing. */ /*************************************/ -static void print_attr_time(register u_char *data, u_int length, u_short attr_code _U_) +static void +print_attr_time(netdissect_options *ndo, + register const u_char *data, u_int length, u_short attr_code _U_) { time_t attr_time; char string[26]; if (length != 4) { - printf("ERROR: length %u != 4", length); + ND_PRINT((ndo, "ERROR: length %u != 4", length)); return; } - TCHECK2(data[0],4); + ND_TCHECK2(data[0],4); attr_time = EXTRACT_32BITS(data); strlcpy(string, ctime(&attr_time), sizeof(string)); /* Get rid of the newline */ string[24] = '\0'; - printf("%.24s", string); + ND_PRINT((ndo, "%.24s", string)); return; trunc: - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); } - /***********************************/ /* Print an attribute of 'strange' */ /* data format pointed by 'data' */ @@ -758,7 +817,9 @@ static void print_attr_time(register u_char *data, u_int length, u_short attr_co /***********************************/ /* Returns nothing. */ /***********************************/ -static void print_attr_strange(register u_char *data, u_int length, u_short attr_code) +static void +print_attr_strange(netdissect_options *ndo, + register const u_char *data, u_int length, u_short attr_code) { u_short len_data; @@ -767,45 +828,45 @@ static void print_attr_strange(register u_char *data, u_int length, u_short attr case ARAP_PASS: if (length != 16) { - printf("ERROR: length %u != 16", length); + ND_PRINT((ndo, "ERROR: length %u != 16", length)); return; } - printf("User_challenge ("); - TCHECK2(data[0],8); + ND_PRINT((ndo, "User_challenge (")); + ND_TCHECK2(data[0],8); len_data = 8; PRINT_HEX(len_data, data); - printf(") User_resp("); - TCHECK2(data[0],8); + ND_PRINT((ndo, ") User_resp(")); + ND_TCHECK2(data[0],8); len_data = 8; PRINT_HEX(len_data, data); - printf(")"); + ND_PRINT((ndo, ")")); break; case ARAP_FEATURES: if (length != 14) { - printf("ERROR: length %u != 14", length); + ND_PRINT((ndo, "ERROR: length %u != 14", length)); return; } - TCHECK2(data[0],1); + ND_TCHECK2(data[0],1); if (*data) - printf("User can change password"); + ND_PRINT((ndo, "User can change password")); else - printf("User cannot change password"); + ND_PRINT((ndo, "User cannot change password")); data++; - TCHECK2(data[0],1); - printf(", Min password length: %d",*data); + ND_TCHECK2(data[0],1); + ND_PRINT((ndo, ", Min password length: %d", *data)); data++; - printf(", created at: "); - TCHECK2(data[0],4); + ND_PRINT((ndo, ", created at: ")); + ND_TCHECK2(data[0],4); len_data = 4; PRINT_HEX(len_data, data); - printf(", expires in: "); - TCHECK2(data[0],4); + ND_PRINT((ndo, ", expires in: ")); + ND_TCHECK2(data[0],4); len_data = 4; PRINT_HEX(len_data, data); - printf(", Current Time: "); - TCHECK2(data[0],4); + ND_PRINT((ndo, ", Current Time: ")); + ND_TCHECK2(data[0],4); len_data = 4; PRINT_HEX(len_data, data); break; @@ -813,10 +874,10 @@ static void print_attr_strange(register u_char *data, u_int length, u_short attr case ARAP_CHALLENGE_RESP: if (length < 8) { - printf("ERROR: length %u != 8", length); + ND_PRINT((ndo, "ERROR: length %u != 8", length)); return; } - TCHECK2(data[0],8); + ND_TCHECK2(data[0],8); len_data = 8; PRINT_HEX(len_data, data); break; @@ -824,47 +885,46 @@ static void print_attr_strange(register u_char *data, u_int length, u_short attr return; trunc: - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); } - - static void -radius_attrs_print(register const u_char *attr, u_int length) +radius_attrs_print(netdissect_options *ndo, + register const u_char *attr, u_int length) { - register const struct radius_attr *rad_attr = (struct radius_attr *)attr; + register const struct radius_attr *rad_attr = (const struct radius_attr *)attr; const char *attr_string; while (length > 0) { if (length < 2) goto trunc; - TCHECK(*rad_attr); - + ND_TCHECK(*rad_attr); + if (rad_attr->type > 0 && rad_attr->type < TAM_SIZE(attr_type)) attr_string = attr_type[rad_attr->type].name; else attr_string = "Unknown"; if (rad_attr->len < 2) { - printf("\n\t %s Attribute (%u), length: %u (bogus, must be >= 2)", + ND_PRINT((ndo, "\n\t %s Attribute (%u), length: %u (bogus, must be >= 2)", attr_string, rad_attr->type, - rad_attr->len); + rad_attr->len)); return; } if (rad_attr->len > length) { - printf("\n\t %s Attribute (%u), length: %u (bogus, goes past end of packet)", + ND_PRINT((ndo, "\n\t %s Attribute (%u), length: %u (bogus, goes past end of packet)", attr_string, rad_attr->type, - rad_attr->len); + rad_attr->len)); return; } - printf("\n\t %s Attribute (%u), length: %u, Value: ", + ND_PRINT((ndo, "\n\t %s Attribute (%u), length: %u, Value: ", attr_string, rad_attr->type, - rad_attr->len); + rad_attr->len)); if (rad_attr->type < TAM_SIZE(attr_type)) { @@ -872,66 +932,66 @@ radius_attrs_print(register const u_char *attr, u_int length) { if ( attr_type[rad_attr->type].print_func ) (*attr_type[rad_attr->type].print_func)( - ((u_char *)(rad_attr+1)), + ndo, ((const u_char *)(rad_attr+1)), rad_attr->len - 2, rad_attr->type); } } /* do we also want to see a hex dump ? */ - if (vflag> 1) - print_unknown_data((u_char *)rad_attr+2,"\n\t ",(rad_attr->len)-2); + if (ndo->ndo_vflag> 1) + print_unknown_data(ndo, (const u_char *)rad_attr+2, "\n\t ", (rad_attr->len)-2); length-=(rad_attr->len); - rad_attr = (struct radius_attr *)( ((char *)(rad_attr))+rad_attr->len); + rad_attr = (const struct radius_attr *)( ((const char *)(rad_attr))+rad_attr->len); } return; trunc: - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); } - void -radius_print(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; u_int len, auth_idx; - TCHECK2(*dat, MIN_RADIUS_LEN); - rad = (struct radius_hdr *)dat; + ND_TCHECK2(*dat, MIN_RADIUS_LEN); + rad = (const struct radius_hdr *)dat; len = EXTRACT_16BITS(&rad->len); if (len < MIN_RADIUS_LEN) { - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); return; } if (len > length) len = length; - if (vflag < 1) { - printf("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, - len); + len)); return; } else { - printf("RADIUS, length: %u\n\t%s (%u), id: 0x%02x, Authenticator: ", + 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); + rad->id)); for(auth_idx=0; auth_idx < 16; auth_idx++) - printf("%02x", rad->auth[auth_idx] ); + ND_PRINT((ndo, "%02x", rad->auth[auth_idx])); } if (len > MIN_RADIUS_LEN) - radius_attrs_print( dat + MIN_RADIUS_LEN, len - MIN_RADIUS_LEN); + radius_attrs_print(ndo, dat + MIN_RADIUS_LEN, len - MIN_RADIUS_LEN); return; trunc: - printf(" [|radius]"); + ND_PRINT((ndo, "%s", tstr)); }