Merge pull request #372 from fxlb/print-telnet

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index 44f0c7fce9cef1deae71b31de3a1396355b299e1..da2fd9916ca7d3316fd09f27414f602be0ddd070 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -42,11 +42,6 @@
  * 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
@@ -62,6 +57,8 @@ static const char rcsid[] _U_ =
 #include "extract.h"
 #include "oui.h"
 
+static const char tstr[] = " [|radius]";
+
 #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) )
 
 #define PRINT_HEX(bytes_len, ptr_data)                               \
@@ -84,7 +81,7 @@ static const char rcsid[] _U_ =
 #define RADCMD_STATUS_CLI  13 /* Status-Client       */
 #define RADCMD_RESERVED   255 /* Reserved            */
 
-static struct tok radius_command_values[] = {
+static const struct tok radius_command_values[] = {
     { RADCMD_ACCESS_REQ, "Access Request" },
     { RADCMD_ACCESS_ACC, "Access Accept" },
     { RADCMD_ACCESS_REJ, "Access Reject" },
@@ -456,7 +453,7 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code )
       case TUNNEL_PASS:
            if (length < 3)
            {
-              printf(" [|radius]");
+              printf("%s", tstr);
               return;
            }
            if (*data && (*data <=0x1F) )
@@ -477,7 +474,7 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code )
            {
               if (length < 1)
               {
-                 printf(" [|radius]");
+                 printf("%s", tstr);
                  return;
               }
               printf("Tag %u",*data);
@@ -493,7 +490,7 @@ print_attr_string(register u_char *data, u_int length, u_short attr_code )
    return;
 
    trunc:
-      printf(" [|radius]");
+      printf("%s", tstr);
 }
 
 /*
@@ -554,7 +551,7 @@ print_vendor_attr(register u_char *data, u_int length, u_short attr_code _U_)
     return;
 
    trunc:
-     printf(" [|radius]");
+     printf("%s", tstr);
 }
 
 
@@ -671,7 +668,7 @@ print_attr_num(register u_char *data, u_int length, u_short attr_code )
    return;
 
    trunc:
-     printf(" [|radius]");
+     printf("%s", tstr);
 }
 
 
@@ -714,7 +711,7 @@ print_attr_address(register u_char *data, u_int length, u_short attr_code )
    return;
 
    trunc:
-     printf(" [|radius]");
+     printf("%s", tstr);
 }
 
 
@@ -747,7 +744,7 @@ static void print_attr_time(register u_char *data, u_int length, u_short attr_co
    return;
 
    trunc:
-     printf(" [|radius]");
+     printf("%s", tstr);
 }
 
 
@@ -824,7 +821,7 @@ static void print_attr_strange(register u_char *data, u_int length, u_short attr
    return;
 
    trunc:
-     printf(" [|radius]");
+     printf("%s", tstr);
 }
 
 
@@ -840,7 +837,7 @@ radius_attrs_print(register const u_char *attr, u_int length)
      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
@@ -878,7 +875,7 @@ radius_attrs_print(register const u_char *attr, u_int length)
      }
      /* 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);
+         print_unknown_data(gndo,(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);
@@ -886,7 +883,7 @@ radius_attrs_print(register const u_char *attr, u_int length)
    return;
 
 trunc:
-   printf(" [|radius]");
+   printf("%s", tstr);
 }
 
 
@@ -902,7 +899,7 @@ radius_print(const u_char *dat, u_int length)
 
    if (len < MIN_RADIUS_LEN)
    {
-         printf(" [|radius]");
+         printf("%s", tstr);
          return;
    }
 
@@ -933,5 +930,5 @@ radius_print(const u_char *dat, u_int length)
    return;
 
 trunc:
-   printf(" [|radius]");
+   printf("%s", tstr);
 }