Flatten vendor/tcpdump and remove keyword expansion.

1 files changed, 0 insertions, 937 deletions

diff --git a/contrib/tcpdump/print-radius.c b/contrib/tcpdump/print-radius.c
deleted file mode 100644
index 203c50b..0000000
--- a/contrib/tcpdump/print-radius.c
+++ /dev/null
@@ -1,937 +0,0 @@
-/*
- * Copyright (C) 2000 Alfredo Andres Omella.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in
- *      the documentation and/or other materials provided with the
- *      distribution.
- *   3. The names of the authors may not be used to endorse or promote
- *      products derived from this software without specific prior
- *      written permission.
- *
- * 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.
- */
-/*
- * Radius printer routines as specified on:
- *
- * RFC 2865:
- *      "Remote Authentication Dial In User Service (RADIUS)"
- *
- * RFC 2866:
- *      "RADIUS Accounting"
- *
- * RFC 2867:
- *      "RADIUS Accounting Modifications for Tunnel Protocol Support"
- *
- * RFC 2868:
- *      "RADIUS Attributes for Tunnel Protocol Support"
- *
- * RFC 2869:
- *      "RADIUS Extensions"
- *
- * 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.27.2.1 2005/09/26 01:02:40 guy Exp $";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <tcpdump-stdinc.h>
-
-#include <string.h>
-
-#include <stdio.h>
-
-#include "interface.h"
-#include "addrtoname.h"
-#include "extract.h"
-#include "oui.h"
-
-#define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) )
-
-#define PRINT_HEX(bytes_len, ptr_data)                               \
-           while(bytes_len)                                          \
-           {                                                         \
-              printf("%02X", *ptr_data );                            \
-              ptr_data++;                                            \
-              bytes_len--;                                           \
-           }
-
-
-/* Radius packet codes */
-#define RADCMD_ACCESS_REQ   1 /* Access-Request      */
-#define RADCMD_ACCESS_ACC   2 /* Access-Accept       */
-#define RADCMD_ACCESS_REJ   3 /* Access-Reject       */
-#define RADCMD_ACCOUN_REQ   4 /* Accounting-Request  */
-#define RADCMD_ACCOUN_RES   5 /* Accounting-Response */
-#define RADCMD_ACCESS_CHA  11 /* Access-Challenge    */
-#define RADCMD_STATUS_SER  12 /* Status-Server       */
-#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 */
-/********************************/
-#define SERV_TYPE    6
-#define FRM_IPADDR   8
-#define LOG_IPHOST  14
-#define LOG_SERVICE 15
-#define FRM_IPX     23
-#define SESSION_TIMEOUT   27
-#define IDLE_TIMEOUT      28
-#define FRM_ATALK_LINK    37
-#define FRM_ATALK_NETWORK 38
-
-#define ACCT_DELAY        41
-#define ACCT_SESSION_TIME 46
-
-#define TUNNEL_TYPE        64
-#define TUNNEL_MEDIUM      65
-#define TUNNEL_CLIENT_END  66
-#define TUNNEL_SERVER_END  67
-#define TUNNEL_PASS        69
-
-#define ARAP_PASS          70
-#define ARAP_FEATURES      71
-
-#define TUNNEL_PRIV_GROUP  81
-#define TUNNEL_ASSIGN_ID   82
-#define TUNNEL_PREFERENCE  83
-
-#define ARAP_CHALLENGE_RESP 84
-#define ACCT_INT_INTERVAL   85
-
-#define TUNNEL_CLIENT_AUTH 90
-#define TUNNEL_SERVER_AUTH 91
-/********************************/
-/* End Radius Attribute types */
-/********************************/
-
-
-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);
-
-
-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   */
-                  };
-
-#define MIN_RADIUS_LEN	20
-
-struct radius_attr { u_int8_t type; /* Attribute type   */
-                     u_int8_t len;  /* Attribute length */
-                   };
-
-
-/* Service-Type Attribute standard values */
-static const char *serv_type[]={ NULL,
-                                "Login",
-                                "Framed",
-                                "Callback Login",
-                                "Callback Framed",
-                                "Outbound",
-                                "Administrative",
-                                "NAS Prompt",
-                                "Authenticate Only",
-                                "Callback NAS Prompt",
-                                "Call Check",
-                                "Callback Administrative",
-                               };
-
-/* Framed-Protocol Attribute standard values */
-static const char *frm_proto[]={ NULL,
-                                 "PPP",
-                                 "SLIP",
-                                 "ARAP",
-                                 "Gandalf proprietary",
-                                 "Xylogics IPX/SLIP",
-                                 "X.75 Synchronous",
-                               };
-
-/* Framed-Routing Attribute standard values */
-static const char *frm_routing[]={ "None",
-                                   "Send",
-                                   "Listen",
-                                   "Send&Listen",
-                                 };
-
-/* Framed-Compression Attribute standard values */
-static const char *frm_comp[]={ "None",
-                                "VJ TCP/IP",
-                                "IPX",
-                                "Stac-LZS",
-                              };
-
-/* Login-Service Attribute standard values */
-static const char *login_serv[]={ "Telnet",
-                                  "Rlogin",
-                                  "TCP Clear",
-                                  "PortMaster(proprietary)",
-                                  "LAT",
-                                  "X.25-PAD",
-                                  "X.25-T3POS",
-                                  "Unassigned",
-                                  "TCP Clear Quiet",
-                                };
-
-
-/* Termination-Action Attribute standard values */
-static const char *term_action[]={ "Default",
-                                   "RADIUS-Request",
-                                 };
-
-/* NAS-Port-Type Attribute standard values */
-static const char *nas_port_type[]={ "Async",
-                                     "Sync",
-                                     "ISDN Sync",
-                                     "ISDN Async V.120",
-                                     "ISDN Async V.110",
-                                     "Virtual",
-                                     "PIAFS",
-                                     "HDLC Clear Channel",
-                                     "X.25",
-                                     "X.75",
-                                     "G.3 Fax",
-                                     "SDSL",
-                                     "ADSL-CAP",
-                                     "ADSL-DMT",
-                                     "ISDN-DSL",
-                                     "Ethernet",
-                                     "xDSL",
-                                     "Cable",
-                                     "Wireless - Other",
-                                     "Wireless - IEEE 802.11",
-                                   };
-
-/* Acct-Status-Type Accounting Attribute standard values */
-static const char *acct_status[]={ NULL,
-                                   "Start",
-                                   "Stop",
-                                   "Interim-Update",
-                                   "Unassigned",
-                                   "Unassigned",
-                                   "Unassigned",
-                                   "Accounting-On",
-                                   "Accounting-Off",
-                                   "Tunnel-Start",
-                                   "Tunnel-Stop",
-                                   "Tunnel-Reject",
-                                   "Tunnel-Link-Start",
-                                   "Tunnel-Link-Stop",
-                                   "Tunnel-Link-Reject",
-                                   "Failed",
-                                 };
-
-/* Acct-Authentic Accounting Attribute standard values */
-static const char *acct_auth[]={ NULL,
-                                 "RADIUS",
-                                 "Local",
-                                 "Remote",
-                               };
-
-/* Acct-Terminate-Cause Accounting Attribute standard values */
-static const char *acct_term[]={ NULL,
-                                 "User Request",
-                                 "Lost Carrier",
-                                 "Lost Service",
-                                 "Idle Timeout",
-                                 "Session Timeout",
-                                 "Admin Reset",
-                                 "Admin Reboot",
-                                 "Port Error",
-                                 "NAS Error",
-                                 "NAS Request",
-                                 "NAS Reboot",
-                                 "Port Unneeded",
-                                 "Port Preempted",
-                                 "Port Suspended",
-                                 "Service Unavailable",
-                                 "Callback",
-                                 "User Error",
-                                 "Host Request",
-                               };
-
-/* Tunnel-Type Attribute standard values */
-static const char *tunnel_type[]={ NULL,
-                                   "PPTP",
-                                   "L2F",
-                                   "L2TP",
-                                   "ATMP",
-                                   "VTP",
-                                   "AH",
-                                   "IP-IP",
-                                   "MIN-IP-IP",
-                                   "ESP",
-                                   "GRE",
-                                   "DVS",
-                                   "IP-in-IP Tunneling",
-                                 };
-
-/* Tunnel-Medium-Type Attribute standard values */
-static const char *tunnel_medium[]={ NULL,
-                                     "IPv4",
-                                     "IPv6",
-                                     "NSAP",
-                                     "HDLC",
-                                     "BBN 1822",
-                                     "802",
-                                     "E.163",
-                                     "E.164",
-                                     "F.69",
-                                     "X.121",
-                                     "IPX",
-                                     "Appletalk",
-                                     "Decnet IV",
-                                     "Banyan Vines",
-                                     "E.164 with NSAP subaddress",
-                                   };
-
-/* ARAP-Zone-Access Attribute standard values */
-static const char *arap_zone[]={ NULL,
-                                 "Only access to dfl zone",
-                                 "Use zone filter inc.",
-                                 "Not used",
-                                 "Use zone filter exc.",
-                               };
-
-static const char *prompt[]={ "No Echo",
-                              "Echo",
-                            };
-
-
-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 );
-                } 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     },
-     { "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*/
-  };
-
-
-/*****************************/
-/* Print an attribute string */
-/* value pointed by 'data'   */
-/* and 'length' size.        */
-/*****************************/
-/* Returns nothing.          */
-/*****************************/
-static void
-print_attr_string(register u_char *data, u_int length, u_short attr_code )
-{
-   register u_int i;
-
-   TCHECK2(data[0],length);
-
-   switch(attr_code)
-   {
-      case TUNNEL_PASS:
-           if (length < 3)
-           {
-              printf(" [|radius]");
-              return;
-           }
-           if (*data && (*data <=0x1F) )
-              printf("Tag %u, ",*data);
-           data++;
-           length--;
-           printf("Salt %u ",EXTRACT_16BITS(data) );
-           data+=2;
-           length-=2;
-        break;
-      case TUNNEL_CLIENT_END:
-      case TUNNEL_SERVER_END:
-      case TUNNEL_PRIV_GROUP:
-      case TUNNEL_ASSIGN_ID:
-      case TUNNEL_CLIENT_AUTH:
-      case TUNNEL_SERVER_AUTH:
-           if (*data <= 0x1F)
-           {
-              if (length < 1)
-              {
-                 printf(" [|radius]");
-                 return;
-              }
-              printf("Tag %u",*data);
-              data++;
-              length--;
-           }
-        break;
-   }
-
-   for (i=0; *data && i < length ; i++, data++)
-       printf("%c",(*data < 32 || *data > 128) ? '.' : *data );
-
-   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;
-
-    if (length < 4)
-        goto trunc;
-    TCHECK2(*data, 4);
-    vendor_id = EXTRACT_32BITS(data);
-    data+=4;
-    length-=4;
-
-    printf("Vendor: %s (%u)",
-           tok2str(smi_values,"Unknown",vendor_id),
-           vendor_id);
-
-    while (length >= 2) {
-	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)",
-                   vendor_type,
-                   vendor_length);
-            return;
-        }
-        if (vendor_length > length)
-        {
-            printf("\n\t    Vendor Attribute: %u, Length: %u (bogus, goes past end of vendor-specific attribute)",
-                   vendor_type,
-                   vendor_length);
-            return;
-        }
-        data+=2;
-        vendor_length-=2;
-        length-=2;
-	TCHECK2(*data, vendor_length);
-
-        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;
-    }
-    return;
-
-   trunc:
-     printf(" [|radius]");
-}
-
-
-
-/******************************/
-/* Print an attribute numeric */
-/* value pointed by 'data'    */
-/* and 'length' size.         */
-/******************************/
-/* Returns nothing.           */
-/******************************/
-static void
-print_attr_num(register u_char *data, u_int length, u_short attr_code )
-{
-   u_int8_t tag;
-   u_int32_t timeout;
-
-   if (length != 4)
-   {
-       printf("ERROR: length %u != 4", length);
-       return;
-   }
-
-   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;
-      table = attr_type[attr_code].subtypes;
-
-      if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) )
-      {
-         if (!*data)
-            printf("Tag[Unused]");
-         else
-            printf("Tag[%d]", *data);
-         data++;
-         data_value = EXTRACT_24BITS(data);
-      }
-      else
-      {
-         data_value = EXTRACT_32BITS(data);
-      }
-      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]);
-      else
-         printf("#%u",data_value);
-   }
-   else
-   {
-      switch(attr_code) /* Be aware of special cases... */
-      {
-        case FRM_IPX:
-             if (EXTRACT_32BITS( data) == 0xFFFFFFFE )
-                printf("NAS Select");
-             else
-                printf("%d",EXTRACT_32BITS( data) );
-          break;
-
-        case SESSION_TIMEOUT:
-        case IDLE_TIMEOUT:
-        case ACCT_DELAY:
-        case ACCT_SESSION_TIME:
-        case ACCT_INT_INTERVAL:
-             timeout = EXTRACT_32BITS( data);
-             if ( timeout < 60 )
-                printf( "%02d secs", timeout);
-             else
-             {
-                if ( timeout < 3600 )
-                   printf( "%02d:%02d min",
-                          timeout / 60, timeout % 60);
-                else
-                   printf( "%02d:%02d:%02d hours",
-                          timeout / 3600, (timeout % 3600) / 60,
-                          timeout % 60);
-             }
-          break;
-
-        case FRM_ATALK_LINK:
-             if (EXTRACT_32BITS(data) )
-                printf("%d",EXTRACT_32BITS(data) );
-             else
-                printf("Unnumbered" );
-          break;
-
-        case FRM_ATALK_NETWORK:
-             if (EXTRACT_32BITS(data) )
-                printf("%d",EXTRACT_32BITS(data) );
-             else
-                printf("NAS assigned" );
-          break;
-
-        case TUNNEL_PREFERENCE:
-            tag = *data;
-            data++;
-            if (tag == 0)
-               printf("Tag (Unused) %d",EXTRACT_24BITS(data) );
-            else
-               printf("Tag (%d) %d", tag, EXTRACT_24BITS(data) );
-          break;
-
-        default:
-             printf("%d",EXTRACT_32BITS( data) );
-          break;
-
-      } /* switch */
-
-   } /* if-else */
-
-   return;
-
-   trunc:
-     printf(" [|radius]");
-}
-
-
-/*****************************/
-/* Print an attribute IPv4   */
-/* address value pointed by  */
-/* 'data' and 'length' size. */
-/*****************************/
-/* Returns nothing.          */
-/*****************************/
-static void
-print_attr_address(register u_char *data, u_int length, u_short attr_code )
-{
-   if (length != 4)
-   {
-       printf("ERROR: length %u != 4", length);
-       return;
-   }
-
-   TCHECK2(data[0],4);
-
-   switch(attr_code)
-   {
-      case FRM_IPADDR:
-      case LOG_IPHOST:
-           if (EXTRACT_32BITS(data) == 0xFFFFFFFF )
-              printf("User Selected");
-           else
-              if (EXTRACT_32BITS(data) == 0xFFFFFFFE )
-                 printf("NAS Select");
-              else
-                 printf("%s",ipaddr_string(data));
-      break;
-
-      default:
-          printf("%s",ipaddr_string(data) );
-      break;
-   }
-
-   return;
-
-   trunc:
-     printf(" [|radius]");
-}
-
-
-/*************************************/
-/* Print an attribute of 'secs since */
-/* January 1, 1970 00:00 UTC' value  */
-/* pointed by 'data' and 'length'    */
-/* size.                             */
-/*************************************/
-/* Returns nothing.                  */
-/*************************************/
-static void print_attr_time(register 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);
-       return;
-   }
-
-   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);
-   return;
-
-   trunc:
-     printf(" [|radius]");
-}
-
-
-/***********************************/
-/* Print an attribute of 'strange' */
-/* data format pointed by 'data'   */
-/* and 'length' size.              */
-/***********************************/
-/* Returns nothing.                */
-/***********************************/
-static void print_attr_strange(register u_char *data, u_int length, u_short attr_code)
-{
-   u_short len_data;
-
-   switch(attr_code)
-   {
-      case ARAP_PASS:
-           if (length != 16)
-           {
-               printf("ERROR: length %u != 16", length);
-               return;
-           }
-           printf("User_challenge (");
-           TCHECK2(data[0],8);
-           len_data = 8;
-           PRINT_HEX(len_data, data);
-           printf(") User_resp(");
-           TCHECK2(data[0],8);
-           len_data = 8;
-           PRINT_HEX(len_data, data);
-           printf(")");
-        break;
-
-      case ARAP_FEATURES:
-           if (length != 14)
-           {
-               printf("ERROR: length %u != 14", length);
-               return;
-           }
-           TCHECK2(data[0],1);
-           if (*data)
-              printf("User can change password");
-           else
-              printf("User cannot change password");
-           data++;
-           TCHECK2(data[0],1);
-           printf(", Min password length: %d",*data);
-           data++;
-           printf(", created at: ");
-           TCHECK2(data[0],4);
-           len_data = 4;
-           PRINT_HEX(len_data, data);
-           printf(", expires in: ");
-           TCHECK2(data[0],4);
-           len_data = 4;
-           PRINT_HEX(len_data, data);
-           printf(", Current Time: ");
-           TCHECK2(data[0],4);
-           len_data = 4;
-           PRINT_HEX(len_data, data);
-        break;
-
-      case ARAP_CHALLENGE_RESP:
-           if (length < 8)
-           {
-               printf("ERROR: length %u != 8", length);
-               return;
-           }
-           TCHECK2(data[0],8);
-           len_data = 8;
-           PRINT_HEX(len_data, data);
-        break;
-   }
-   return;
-
-   trunc:
-     printf(" [|radius]");
-}
-
-
-
-static void
-radius_attrs_print(register const u_char *attr, u_int length)
-{
-   register const struct radius_attr *rad_attr = (struct radius_attr *)attr;
-   const char *attr_string;
-
-   while (length > 0)
-   {
-     if (length < 2)
-        goto trunc;
-     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)",
-               attr_string,
-               rad_attr->type,
-               rad_attr->len);
-	return;
-     }
-     if (rad_attr->len > length)
-     {
-	printf("\n\t  %s Attribute (%u), length: %u (bogus, goes past end of packet)",
-               attr_string,
-               rad_attr->type,
-               rad_attr->len);
-        return;
-     }
-     printf("\n\t  %s Attribute (%u), length: %u, Value: ",
-            attr_string,
-            rad_attr->type,
-            rad_attr->len);
-
-     if (rad_attr->type < TAM_SIZE(attr_type))
-     {
-         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);
-         }
-     }
-     /* 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);
-
-     length-=(rad_attr->len);
-     rad_attr = (struct radius_attr *)( ((char *)(rad_attr))+rad_attr->len);
-   }
-   return;
-
-trunc:
-   printf(" [|radius]");
-}
-
-
-void
-radius_print(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);
-
-   if (len < MIN_RADIUS_LEN)
-   {
-	  printf(" [|radius]");
-	  return;
-   }
-
-   if (len > length)
-	  len = length;
-
-   if (vflag < 1) {
-       printf("RADIUS, %s (%u), id: 0x%02x length: %u",
-              tok2str(radius_command_values,"Unknown Command",rad->code),
-              rad->code,
-              rad->id,
-              len);
-       return;
-   }
-   else {
-       printf("RADIUS, length: %u\n\t%s (%u), id: 0x%02x, Authenticator: ",
-              len,
-              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] );
-   }
-
-   if (len > MIN_RADIUS_LEN)
-      radius_attrs_print( dat + MIN_RADIUS_LEN, len - MIN_RADIUS_LEN);
-   return;
-
-trunc:
-   printf(" [|radius]");
-}