From: hannes Date: Fri, 6 Feb 2004 14:38:50 +0000 (+0000) Subject: sync the radius printer to HEAD to fix the recent overflow issues X-Git-Tag: tcpdump-3.8.2~35 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/cd2dee71ab6c28fb9ba98e696b9b4e02efbb7731 sync the radius printer to HEAD to fix the recent overflow issues --- diff --git a/Makefile.in b/Makefile.in index 1ba6cbaf..0fbcc03c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.276.2.1 2003-11-16 08:51:01 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.276.2.2 2004-02-06 14:38:52 hannes Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -65,7 +65,7 @@ INSTALL_DATA = @INSTALL_DATA@ @rm -f $@ $(CC) $(CFLAGS) -c $(srcdir)/$*.c -CSRC = addrtoname.c gmpls.c gmt2local.c machdep.c parsenfsfh.c \ +CSRC = addrtoname.c gmpls.c gmt2local.c machdep.c oui.c parsenfsfh.c \ print-802_11.c print-ah.c print-arcnet.c print-aodv.c \ print-arp.c print-ascii.c print-atalk.c print-atm.c \ print-beep.c print-bfd.c print-bgp.c print-bootp.c print-cdp.c \ diff --git a/oui.c b/oui.c new file mode 100644 index 00000000..56c2b53a --- /dev/null +++ b/oui.c @@ -0,0 +1,62 @@ +/* + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that: (1) source code + * distributions retain the above copyright notice and this paragraph + * in its entirety, and (2) distributions including binary code include + * the above copyright notice and this paragraph in its entirety in + * the documentation or other materials provided with the distribution. + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND + * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT + * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE. + * + * Original code by Hannes Gredler (hannes@juniper.net) + */ + +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/oui.c,v 1.2.2.1 2004-02-06 14:38:51 hannes Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include "interface.h" +#include "oui.h" + +/* FIXME complete OUI list using a script */ + +struct tok oui_values[] = { + { 0x009069, "Juniper"}, + { 0x00000c, "Cisco"}, +}; + +/* list taken from ethereal/packet-radius.c */ + +struct tok smi_values[] = { + { SMI_ACC, "ACC"}, + { SMI_CISCO, "Cisco"}, + { SMI_SHIVA, "Shiva"}, + { SMI_MICROSOFT, "Microsoft"}, + { SMI_LIVINGSTON, "Livingston"}, + { SMI_3COM, "3Com"}, + { SMI_ASCEND, "Ascend"}, + { SMI_BAY, "Bay Networks"}, + { SMI_FOUNDRY, "Foundry"}, + { SMI_VERSANET, "Versanet"}, + { SMI_REDBACK, "Redback"}, + { SMI_JUNIPER, "Juniper Networks"}, + { SMI_APTIS, "Aptis"}, + { SMI_COSINE, "CoSine Communications"}, + { SMI_SHASTA, "Shasta"}, + { SMI_NOMADIX, "Nomadix"}, + { SMI_UNISPHERE, "Unisphere Networks"}, + { SMI_ISSANNI, "Issanni Communications"}, + { SMI_QUINTUM, "Quintum"}, + { SMI_COLUBRIS, "Colubris"}, + { SMI_COLUMBIA_UNIVERSITY, "Columbia University"}, + { SMI_THE3GPP, "3GPP"}, + { 0, NULL } +}; diff --git a/oui.h b/oui.h new file mode 100644 index 00000000..3d23a6b4 --- /dev/null +++ b/oui.h @@ -0,0 +1,41 @@ +/* @(#) $Header: /tcpdump/master/tcpdump/oui.h,v 1.2.2.1 2004-02-06 14:38:50 hannes Exp $ (LBL) */ +/* + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that: (1) source code + * distributions retain the above copyright notice and this paragraph + * in its entirety, and (2) distributions including binary code include + * the above copyright notice and this paragraph in its entirety in + * the documentation or other materials provided with the distribution. + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND + * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT + * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE. + * + * Original code by Hannes Gredler (hannes@juniper.net) + */ + +extern struct tok oui_values[]; +extern struct tok smi_values[]; + +#define SMI_ACC 5 +#define SMI_CISCO 9 +#define SMI_SHIVA 166 +#define SMI_LIVINGSTON 307 +#define SMI_MICROSOFT 311 +#define SMI_3COM 429 +#define SMI_ASCEND 529 +#define SMI_BAY 1584 +#define SMI_FOUNDRY 1991 +#define SMI_VERSANET 2180 +#define SMI_REDBACK 2352 +#define SMI_JUNIPER 2636 +#define SMI_APTIS 2637 +#define SMI_COSINE 3085 +#define SMI_SHASTA 3199 +#define SMI_NOMADIX 3309 +#define SMI_UNISPHERE 4874 +#define SMI_ISSANNI 5948 +#define SMI_QUINTUM 6618 +#define SMI_COLUBRIS 8744 +#define SMI_COLUMBIA_UNIVERSITY 11862 +#define SMI_THE3GPP 10415 diff --git a/print-radius.c b/print-radius.c index 77870f48..2eb20e6b 100644 --- a/print-radius.c +++ b/print-radius.c @@ -44,7 +44,7 @@ #ifndef lint static const char rcsid[] _U_ = - "$Id: print-radius.c,v 1.19.2.3 2004-01-07 07:53:17 hannes Exp $"; + "$Id: print-radius.c,v 1.19.2.4 2004-02-06 14:38:51 hannes Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -60,6 +60,7 @@ static const char rcsid[] _U_ = #include "interface.h" #include "addrtoname.h" #include "extract.h" +#include "oui.h" #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) ) @@ -83,6 +84,18 @@ static const char rcsid[] _U_ = #define RADCMD_STATUS_CLI 13 /* Status-Client */ #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" }, + { RADCMD_RESERVED, "Reserved" }, + { 0, NULL} +}; /********************************/ /* Begin Radius Attribute types */ @@ -125,6 +138,7 @@ static const char rcsid[] _U_ = 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); @@ -326,104 +340,100 @@ struct attrtype { const char *name; /* Attribute name */ void (*print_func)(register u_char *, u_int, u_short ); } attr_type[]= { - { NULL, NULL, 0, 0, NULL }, - { "User", NULL, 0, 0, print_attr_string }, - { "Pass", NULL, 0, 0, NULL }, - { "CHAP-Pass", NULL, 0, 0, NULL }, - { "NAS_ipaddr", 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_proto", frm_proto, TAM_SIZE(frm_proto)-1, 1, print_attr_num }, - { "Framed_ipaddr", NULL, 0, 0, print_attr_address }, - { "Framed_ipnet", 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_compress", frm_comp, TAM_SIZE(frm_comp), 0, print_attr_num }, - { "Login_iphost", 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 }, -/*17*/ { "Unassigned", NULL, 0, 0, NULL }, - { "Reply", NULL, 0, 0, print_attr_string }, - { "Callback-number", NULL, 0, 0, print_attr_string }, - { "Callback-id", NULL, 0, 0, print_attr_string }, -/*21*/ { "Unassigned", NULL, 0, 0, NULL }, - { "Framed_route", NULL, 0, 0, print_attr_string }, - { "Framed_ipx_net", 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_attr_string }, - { "Session_timeout", NULL, 0, 0, print_attr_num }, - { "Idle_timeout", NULL, 0, 0, print_attr_num }, - { "Term_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_atalk_link", NULL, 0, 0, print_attr_num }, - { "Framed_atalk_net", NULL, 0, 0, print_attr_num }, - { "Framed_atalk_zone", NULL, 0, 0, print_attr_string }, - { "Acct_status", acct_status, TAM_SIZE(acct_status)-1, 1, print_attr_num }, - { "Acct_delay", NULL, 0, 0, print_attr_num }, - { "Acct_in_octets", NULL, 0, 0, print_attr_num }, - { "Acct_out_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_in_packets", NULL, 0, 0, print_attr_num }, - { "Acct_out_packets", NULL, 0, 0, print_attr_num }, - { "Acct_term_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_in_giga", NULL, 0, 0, print_attr_num }, - { "Acct_out_giga", NULL, 0, 0, print_attr_num }, -/*54*/ { "Unassigned", NULL, 0, 0, NULL }, - { "Event_timestamp", NULL, 0, 0, print_attr_time }, -/*56*/ { "Unassigned", NULL, 0, 0, NULL }, -/*57*/ { "Unassigned", NULL, 0, 0, NULL }, -/*58*/ { "Unassigned", NULL, 0, 0, NULL }, -/*59*/ { "Unassigned", 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 }, -/*63*/ { "Login_LAT_port", NULL, 0, 0, print_attr_string }, - { "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 }, - { "Acct_tunnel_connect", NULL, 0, 0, print_attr_string }, - { "Tunnel_pass", NULL, 0, 0, print_attr_string }, - { "ARAP_pass", NULL, 0, 0, print_attr_strange }, - { "ARAP_feature", NULL, 0, 0, print_attr_strange }, -/*72*/ { "ARAP_zone_acces", arap_zone, TAM_SIZE(arap_zone)-1, 1, - print_attr_num }, - { "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_msg", NULL, 0, 0, print_attr_string }, -/*80*/ { "Message_auth", NULL, 0, 0, print_attr_string }, - { "Tunnel_priv_group", NULL, 0, 0, print_attr_string }, - { "Tunnel_assign_id", NULL, 0, 0, print_attr_string }, - { "Tunnel_pref", NULL, 0, 0, print_attr_num }, - { "ARAP_challenge_resp", NULL, 0, 0, print_attr_strange }, - { "Acct_interim_interval", NULL, 0, 0, print_attr_num }, -/*86*/ { "Acct_tunnel_pack_lost", NULL, 0, 0, print_attr_num }, - { "NAS_port_id", NULL, 0, 0, print_attr_string }, - { "Framed_pool", NULL, 0, 0, print_attr_string }, - { "Unassigned", NULL, 0, 0, NULL }, - { "Tunnel_client_auth_id", NULL, 0, 0, print_attr_string }, - { "Tunnel_server_auth_id", NULL, 0, 0, print_attr_string }, -/*92*/ { "Unassigned", NULL, 0, 0, NULL }, -/*93*/ { "Unassigned", NULL, 0, 0, NULL } + { 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 }, + { "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 }, + { "Unassigned", NULL, 0, 0, NULL }, /*21*/ + { "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 }, + { "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 }, + { "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*/ }; @@ -441,14 +451,13 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code ) TCHECK2(data[0],length); - printf("{"); switch(attr_code) { case TUNNEL_PASS: if (*data && (*data <=0x1F) ) - printf("Tag[%d] ",*data); + printf("Tag %u, ",*data); data++; - printf("Salt[%d] ",EXTRACT_16BITS(data) ); + printf("Salt %u ",EXTRACT_16BITS(data) ); data+=2; length-=2; break; @@ -460,7 +469,7 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code ) case TUNNEL_SERVER_AUTH: if (*data <= 0x1F) { - printf("Tag[%d] ",*data); + printf("Tag %u",*data); data++; length--; } @@ -470,14 +479,54 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code ) for (i=0; *data && i < length ; i++, data++) printf("%c",(*data < 32 || *data > 128) ? '.' : *data ); - printf("}"); - return; trunc: printf("|radius"); } +/* + * print vendor specific attributes + */ + +static void +print_vendor_attr(register u_char *data, u_int length, u_short attr_code _U_) +{ + u_int idx; + u_int vendor_id; + u_int vendor_type; + u_int vendor_length; + + /* FIXME: all sort of boundary checks */ + vendor_id = EXTRACT_32BITS(data); + data+=4; + length-=4; + + printf("Vendor: %s (%u)", + tok2str(smi_values,"Unknown",vendor_id), + vendor_id); + + while (length >= 2) { + if(!TTEST2(*data, 2)) + return; + + vendor_type = *(data); + vendor_length = *(data+1); + + data+=2; + if(!TTEST2(*data, vendor_length)) + return; + + printf("\n\t Vendor Attribute: %u, Length: %u, Value: ", + vendor_type, + vendor_length); + for (idx = 0; idx < vendor_length ; idx++, data++) + printf("%c",(*data < 32 || *data > 128) ? '.' : *data ); + length-=vendor_length; + } +} + + /******************************/ /* Print an attribute numeric */ @@ -494,7 +543,7 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) if (length != 4) { - printf("{length %u != 4}", length); + printf("ERROR: length %u != 4", length); return; } @@ -509,9 +558,9 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) ) { if (!*data) - printf("{Tag[Unused]"); + printf("Tag[Unused]"); else - printf("{Tag[%d]", *data); + printf("Tag[%d]", *data); data++; data_value = EXTRACT_24BITS(data); } @@ -522,9 +571,9 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) if ( data_value <= (u_int32_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]); + printf("%s",table[data_value]); else - printf("{#%u}",data_value); + printf("#%u",data_value); } else { @@ -532,9 +581,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}"); + printf("NAS Select"); else - printf("{%d}",EXTRACT_32BITS( data) ); + printf("%d",EXTRACT_32BITS( data) ); break; case SESSION_TIMEOUT: @@ -544,14 +593,14 @@ 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); + printf( "%02d secs", timeout); else { if ( timeout < 3600 ) - printf( "{%02d:%02d min}", + printf( "%02d:%02d min", timeout / 60, timeout % 60); else - printf( "{%02d:%02d:%02d hours}", + printf( "%02d:%02d:%02d hours", timeout / 3600, (timeout % 3600) / 60, timeout % 60); } @@ -559,29 +608,29 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code ) case FRM_ATALK_LINK: if (EXTRACT_32BITS(data) ) - printf("{%d}",EXTRACT_32BITS(data) ); + printf("%d",EXTRACT_32BITS(data) ); else - printf("{Unnumbered}" ); + printf("Unnumbered" ); break; case FRM_ATALK_NETWORK: if (EXTRACT_32BITS(data) ) - printf("{%d}",EXTRACT_32BITS(data) ); + printf("%d",EXTRACT_32BITS(data) ); else - printf("{NAS_assign}" ); + printf("NAS assigned" ); break; case TUNNEL_PREFERENCE: tag = *data; data++; if (tag == 0) - printf("{Tag[Unused] %d}",EXTRACT_24BITS(data) ); + printf("Tag (Unused) %d",EXTRACT_24BITS(data) ); else - printf("{Tag[%d] %d}", tag, EXTRACT_24BITS(data) ); + printf("Tag (%d) %d", tag, EXTRACT_24BITS(data) ); break; default: - printf("{%d}",EXTRACT_32BITS( data) ); + printf("%d",EXTRACT_32BITS( data) ); break; } /* switch */ @@ -607,7 +656,7 @@ print_attr_address(register u_char *data, u_int length, u_short attr_code ) { if (length != 4) { - printf("{length %u != 4}", length); + printf("ERROR: length %u != 4", length); return; } @@ -618,23 +667,23 @@ print_attr_address(register u_char *data, u_int length, u_short attr_code ) case FRM_IPADDR: case LOG_IPHOST: if (EXTRACT_32BITS(data) == 0xFFFFFFFF ) - printf("{User_select}"); + printf("User Selected"); else if (EXTRACT_32BITS(data) == 0xFFFFFFFE ) - printf("{NAS_select}"); + printf("NAS Select"); else - printf("{%s}",ipaddr_string(data)); + printf("%s",ipaddr_string(data)); break; default: - printf("{%s}",ipaddr_string(data) ); + printf("%s",ipaddr_string(data) ); break; } return; trunc: - printf("{|radius}"); + printf("|radius"); } @@ -653,7 +702,7 @@ static void print_attr_time(register u_char *data, u_int length, u_short attr_co if (length != 4) { - printf("{length %u != 4}", length); + printf("ERROR: length %u != 4", length); return; } @@ -663,11 +712,11 @@ static void print_attr_time(register u_char *data, u_int length, u_short attr_co strlcpy(string, ctime(&attr_time), sizeof(string)); /* Get rid of the newline */ string[24] = '\0'; - printf("{%.24s}", string); + printf("%.24s", string); return; trunc: - printf("{|radius}"); + printf("|radius"); } @@ -687,61 +736,58 @@ static void print_attr_strange(register u_char *data, u_int length, u_short attr case ARAP_PASS: if (length != 16) { - printf("{length %u != 16}", length); + printf("ERROR: length %u != 16", length); return; } - printf("{User_challenge["); + printf("User_challenge ("); TCHECK2(data[0],8); len_data = 8; PRINT_HEX(len_data, data); - printf("] User_resp["); + printf(") User_resp("); TCHECK2(data[0],8); len_data = 8; PRINT_HEX(len_data, data); - printf("]}"); + printf(")"); break; case ARAP_FEATURES: if (length != 14) { - printf("{length %u != 14}", length); + printf("ERROR: length %u != 14", length); return; } TCHECK2(data[0],1); if (*data) - printf("{User_can_change_pass"); + printf("User can change password"); else - printf("{User_cant_change_pass"); + printf("User cannot change password"); data++; TCHECK2(data[0],1); - printf(" Min_pass_len[%d]",*data); + printf(", Min password length: %d",*data); data++; - printf(" Pass_created_at["); + printf(", created at: "); TCHECK2(data[0],4); len_data = 4; PRINT_HEX(len_data, data); - printf("] Pass_expired_in["); + printf(", expires in: "); TCHECK2(data[0],4); len_data = 4; PRINT_HEX(len_data, data); - printf("] Current_time["); + printf(", Current Time: "); len_data = 4; TCHECK2(data[0],4); PRINT_HEX(len_data, data); - printf("]}"); break; case ARAP_CHALLENGE_RESP: if (length < 8) { - printf("{length %u != 8}", length); + printf("ERROR: length %u != 8", length); return; } - printf("{"); TCHECK2(data[0],8); len_data = 8; PRINT_HEX(len_data, data); - printf("}"); break; } @@ -762,41 +808,45 @@ radius_attr_print(register const u_char *attr, u_int length) return; } - printf(" Attr[ "); while (length > 0) { - if (rad_attr->len == 0) + if (rad_attr->len == 0 && rad_attr->type < (TAM_SIZE(attr_type)-1)) { - printf("(zero-length attribute)"); + printf("\n\t %s Attribute (%u), zero-length", + attr_type[rad_attr->type].name, + rad_attr->type); return; } - if ( rad_attr->len <= length ) + if ( rad_attr->len <= length && rad_attr->type < (TAM_SIZE(attr_type)-1)) { - if ( !rad_attr->type || (rad_attr->type > (TAM_SIZE(attr_type)-1)) ) - printf("#%d",rad_attr->type); - else - { - printf(" %s",attr_type[rad_attr->type].name); - - if (rad_attr->len > 2) - { - if ( attr_type[rad_attr->type].print_func ) - (*attr_type[rad_attr->type].print_func)( - ((u_char *)(rad_attr+1)), - rad_attr->len - 2, rad_attr->type); - } - } + printf("\n\t %s Attribute (%u), length: %u, Value: ", + attr_type[rad_attr->type].name, + rad_attr->type, + rad_attr->len); + + if ( !rad_attr->type || (rad_attr->type > (TAM_SIZE(attr_type)-1)) ) { + } + else { + if (rad_attr->len > 2) + { + if ( attr_type[rad_attr->type].print_func ) + (*attr_type[rad_attr->type].print_func)( + ((u_char *)(rad_attr+1)), + rad_attr->len - 2, rad_attr->type); + } + } } - else - { + else { printf(" [|radius]"); return; } + /* do we want to see an additionally hexdump ? */ + if (vflag> 1 && rad_attr->len >= 2) + print_unknown_data((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); } - - printf(" ]"); } @@ -805,7 +855,7 @@ radius_print(const u_char *dat, u_int length) { register const struct radius_hdr *rad; register u_int i; - u_int len; + u_int len, auth_idx; if (snapend < dat) { @@ -836,49 +886,24 @@ radius_print(const u_char *dat, u_int length) i -= MIN_RADIUS_LEN; - switch (rad->code) - { - case RADCMD_ACCESS_REQ: - printf(" rad-access-req %u", length); - break; - - case RADCMD_ACCESS_ACC: - printf(" rad-access-accept %u", length); - break; - - case RADCMD_ACCESS_REJ: - printf(" rad-access-reject %u", length); - break; - - case RADCMD_ACCOUN_REQ: - printf(" rad-account-req %u", length); - break; - - case RADCMD_ACCOUN_RES: - printf(" rad-account-resp %u", length); - break; - - case RADCMD_ACCESS_CHA: - printf(" rad-access-cha %u", length); - break; - - case RADCMD_STATUS_SER: - printf(" rad-status-serv %u", length); - break; - - case RADCMD_STATUS_CLI: - printf(" rad-status-cli %u", length); - break; - - case RADCMD_RESERVED: - printf(" rad-reserved %u", length); - break; - - default: - printf(" rad-#%u %u", rad->code, length); - break; + if (vflag < 1) { + printf("RADIUS, %s (%u), id: 0x%02x length: %u", + tok2str(radius_command_values,"Unknown Command",rad->code), + rad->code, + rad->id, + length); + return; + } + else { + printf("RADIUS, length: %u\n\t%s (%u), id: 0x%02x, Authenticator: ", + length, + tok2str(radius_command_values,"Unknown Command",rad->code), + rad->code, + rad->id); + + for(auth_idx=0; auth_idx < 16; auth_idx++) + printf("%02x", rad->auth[auth_idx] ); } - printf(" [id %u]", rad->id); if (i) radius_attr_print( dat + MIN_RADIUS_LEN, i);