X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a97fb2f3ae9731dd13e6854742c090ca9ef454cf..0f328b4aa16b0b47f05a85c440ce1d07719e3cac:/print-radius.c diff --git a/print-radius.c b/print-radius.c index 08922673..fda7710c 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,27 +40,51 @@ * 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 5580: + * "Carrying Location Objects in RADIUS and Diameter" + * + * RFC 7155: + * "Diameter Network Access Server Application" + * * 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" @@ -69,7 +96,7 @@ static const char tstr[] = " [|radius]"; #define PRINT_HEX(bytes_len, ptr_data) \ while(bytes_len) \ { \ - printf("%02X", *ptr_data ); \ + ND_PRINT((ndo, "%02X", *ptr_data )); \ ptr_data++; \ bytes_len--; \ } @@ -84,17 +111,29 @@ static const char tstr[] = " [|radius]"; #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[] = { - { 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_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} }; @@ -115,6 +154,9 @@ static const 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 @@ -133,29 +175,42 @@ static const struct tok radius_command_values[] = { #define TUNNEL_CLIENT_AUTH 90 #define TUNNEL_SERVER_AUTH 91 + +#define ERROR_CAUSE 101 /********************************/ /* 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_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 { 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 */ }; @@ -216,6 +271,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", @@ -301,6 +362,7 @@ static const char *tunnel_type[]={ NULL, "GRE", "DVS", "IP-in-IP Tunneling", + "VLAN", }; /* Tunnel-Medium-Type Attribute standard values */ @@ -334,108 +396,180 @@ static const char *prompt[]={ "No Echo", "Echo", }; +/* Error-Cause standard values */ +#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 } + }; + -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 }, - { "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 }, + { "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 }, + { "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 }, + { "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 }, + { "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 }, + { "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 }, }; @@ -447,25 +581,25 @@ 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("%s", tstr); - return; - } - if (*data && (*data <=0x1F) ) - printf("Tag %u, ",*data); + goto trunc; + 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--; - printf("Salt %u ",EXTRACT_16BITS(data) ); + ND_PRINT((ndo, "Salt %u ", EXTRACT_BE_U_2(data))); data+=2; length-=2; break; @@ -475,35 +609,44 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code ) case TUNNEL_ASSIGN_ID: case TUNNEL_CLIENT_AUTH: case TUNNEL_SERVER_AUTH: - if (*data <= 0x1F) + if (EXTRACT_U_1(data) <= 0x1F) { if (length < 1) - { - printf("%s", tstr); - return; - } - printf("Tag %u",*data); + goto trunc; + if (EXTRACT_U_1(data)) + ND_PRINT((ndo, "Tag[%u] ", EXTRACT_U_1(data))); + else + ND_PRINT((ndo, "Tag[Unused] ")); data++; length--; } break; + case EGRESS_VLAN_NAME: + if (length < 1) + goto trunc; + ND_PRINT((ndo, "%s (0x%02x) ", + tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)), + EXTRACT_U_1(data))); + data++; + length--; + break; } - for (i=0; *data && i < length ; i++, data++) - printf("%c",(*data < 32 || *data > 128) ? '.' : *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; trunc: - printf("%s", tstr); + 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; @@ -512,55 +655,53 @@ print_vendor_attr(register u_char *data, u_int length, u_short attr_code _U_) if (length < 4) goto trunc; - TCHECK2(*data, 4); - vendor_id = EXTRACT_32BITS(data); + ND_TCHECK_4(data); + vendor_id = EXTRACT_BE_U_4(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_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) { - 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", ND_ISPRINT(EXTRACT_U_1(data)) ? EXTRACT_U_1(data) : '.')); length-=vendor_length; } return; trunc: - printf("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); } - - /******************************/ /* Print an attribute numeric */ /* value pointed by 'data' */ @@ -569,54 +710,54 @@ 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_TCHECK_4(data); /* 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]"); + if (!EXTRACT_U_1(data)) + ND_PRINT((ndo, "Tag[Unused] ")); else - printf("Tag[%d]", *data); + ND_PRINT((ndo, "Tag[%d] ", EXTRACT_U_1(data))); data++; - data_value = EXTRACT_24BITS(data); + data_value = EXTRACT_BE_U_3(data); } else { - data_value = EXTRACT_32BITS(data); + data_value = EXTRACT_BE_U_4(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 { switch(attr_code) /* Be aware of special cases... */ { case FRM_IPX: - if (EXTRACT_32BITS( data) == 0xFFFFFFFE ) - printf("NAS Select"); + if (EXTRACT_BE_U_4(data) == 0xFFFFFFFE ) + ND_PRINT((ndo, "NAS Select")); else - printf("%d",EXTRACT_32BITS( data) ); + ND_PRINT((ndo, "%d", EXTRACT_BE_U_4(data))); break; case SESSION_TIMEOUT: @@ -624,46 +765,54 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) case ACCT_DELAY: case ACCT_SESSION_TIME: case ACCT_INT_INTERVAL: - timeout = EXTRACT_32BITS( data); + timeout = EXTRACT_BE_U_4(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) ); + if (EXTRACT_BE_U_4(data)) + ND_PRINT((ndo, "%d", EXTRACT_BE_U_4(data))); else - printf("Unnumbered" ); + ND_PRINT((ndo, "Unnumbered")); break; case FRM_ATALK_NETWORK: - if (EXTRACT_32BITS(data) ) - printf("%d",EXTRACT_32BITS(data) ); + if (EXTRACT_BE_U_4(data)) + ND_PRINT((ndo, "%d", EXTRACT_BE_U_4(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 (EXTRACT_U_1(data)) + ND_PRINT((ndo, "Tag[%d] ", EXTRACT_U_1(data))); else - printf("Tag (%d) %d", tag, EXTRACT_24BITS(data) ); + ND_PRINT((ndo, "Tag[Unused] ")); + data++; + ND_PRINT((ndo, "%d", EXTRACT_BE_U_3(data))); + break; + + case EGRESS_VLAN_ID: + ND_PRINT((ndo, "%s (0x%02x) ", + tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_U_1(data)), + EXTRACT_U_1(data))); + data++; + ND_PRINT((ndo, "%d", EXTRACT_BE_U_3(data))); break; default: - printf("%d",EXTRACT_32BITS( data) ); + ND_PRINT((ndo, "%d", EXTRACT_BE_U_4(data))); break; } /* switch */ @@ -673,10 +822,9 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) return; trunc: - printf("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); } - /*****************************/ /* Print an attribute IPv4 */ /* address value pointed by */ @@ -685,40 +833,100 @@ 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_TCHECK_4(data); switch(attr_code) { case FRM_IPADDR: case LOG_IPHOST: - if (EXTRACT_32BITS(data) == 0xFFFFFFFF ) - printf("User Selected"); + if (EXTRACT_BE_U_4(data) == 0xFFFFFFFF ) + ND_PRINT((ndo, "User Selected")); else - if (EXTRACT_32BITS(data) == 0xFFFFFFFE ) - printf("NAS Select"); + if (EXTRACT_BE_U_4(data) == 0xFFFFFFFE ) + 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("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); } +/*****************************/ +/* Print an attribute IPv6 */ +/* address value pointed by */ +/* 'data' and 'length' size. */ +/*****************************/ +/* Returns nothing. */ +/*****************************/ +static void +print_attr_address6(netdissect_options *ndo, + register const u_char *data, u_int length, u_short attr_code _U_) +{ + if (length != 16) + { + ND_PRINT((ndo, "ERROR: length %u != 16", length)); + return; + } + + ND_TCHECK_16(data); + + ND_PRINT((ndo, "%s", ip6addr_string(ndo, data))); + + return; + + trunc: + ND_PRINT((ndo, "%s", tstr)); +} + +static void +print_attr_netmask6(netdissect_options *ndo, + register const u_char *data, u_int length, u_short attr_code _U_) +{ + u_char data2[16]; + + if (length < 2 || length > 18) + { + ND_PRINT((ndo, "ERROR: length %u not in range (2..18)", length)); + return; + } + ND_TCHECK2(data[0], 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; + } + + memset(data2, 0, sizeof(data2)); + if (length > 2) + memcpy(data2, data+2, length-2); + + 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; + + trunc: + ND_PRINT((ndo, "%s", tstr)); +} /*************************************/ /* Print an attribute of 'secs since */ @@ -728,31 +936,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_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'; - printf("%.24s", string); + ND_PRINT((ndo, "%.24s", string)); return; trunc: - printf("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); } - /***********************************/ /* Print an attribute of 'strange' */ /* data format pointed by 'data' */ @@ -760,54 +969,57 @@ 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; + u_int error_cause_value; switch(attr_code) { 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_TCHECK_8(data); len_data = 8; PRINT_HEX(len_data, data); - printf(") User_resp("); - TCHECK2(data[0],8); + ND_PRINT((ndo, ") User_resp(")); + ND_TCHECK_8(data); 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); - if (*data) - printf("User can change password"); + ND_TCHECK_1(data); + if (EXTRACT_U_1(data)) + 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_TCHECK_1(data); + ND_PRINT((ndo, ", Min password length: %d", EXTRACT_U_1(data))); data++; - printf(", created at: "); - TCHECK2(data[0],4); + ND_PRINT((ndo, ", created at: ")); + ND_TCHECK_4(data); len_data = 4; PRINT_HEX(len_data, data); - printf(", expires in: "); - TCHECK2(data[0],4); + ND_PRINT((ndo, ", expires in: ")); + ND_TCHECK_4(data); len_data = 4; PRINT_HEX(len_data, data); - printf(", Current Time: "); - TCHECK2(data[0],4); + ND_PRINT((ndo, ", Current Time: ")); + ND_TCHECK_4(data); len_data = 4; PRINT_HEX(len_data, data); break; @@ -815,33 +1027,44 @@ 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_TCHECK_8(data); len_data = 8; PRINT_HEX(len_data, data); break; + + case ERROR_CAUSE: + if (length != 4) + { + ND_PRINT((ndo, "Error: length %u != 4", length)); + return; + } + 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))); + break; } return; trunc: - printf("%s", tstr); + 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; @@ -849,24 +1072,24 @@ radius_attrs_print(register const u_char *attr, u_int length) 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)) { @@ -874,66 +1097,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("%s", tstr); + 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; - len = EXTRACT_16BITS(&rad->len); + ND_TCHECK2(*dat, MIN_RADIUS_LEN); + rad = (const struct radius_hdr *)dat; + len = EXTRACT_BE_U_2(&rad->len); if (len < MIN_RADIUS_LEN) { - printf("%s", tstr); + 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("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); }