Keep the remaining payload length in a separate variable from the total

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index 21314e09c93babd5597f4368edbac8bb493964dd..a8ec0db04a7002b79142c566c195391138b1d50c 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -43,8 +43,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "$Id: print-radius.c,v 1.16 2002-09-05 00:00:18 guy Exp $";
+static const char rcsid[] _U_ =
+    "$Id: print-radius.c,v 1.19.2.2 2003-11-16 08:51:40 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -646,7 +646,7 @@ 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)
+static void print_attr_time(register u_char *data, u_int length, u_short attr_code _U_)
 {
    time_t attr_time;
    char string[26];
@@ -823,7 +823,7 @@ radius_print(const u_char *dat, u_int length)
    }
 
    rad = (struct radius_hdr *)dat;
-   len = ntohs(rad->len);
+   len = EXTRACT_16BITS(&rad->len);
 
    if (len < MIN_RADIUS_LEN)
    {