s/u_short/u_int16_t/ for KAME-origin source codes

[tcpdump] / print-lcp.c

diff --git a/print-lcp.c b/print-lcp.c
index 95c4696a8fea56655a130d20a8d435ab30112814..ee0655c011d2d729fd79b02aac60d9dd1ac8c0b7 100644 (file)
--- a/print-lcp.c
+++ b/print-lcp.c
@@ -21,7 +21,11 @@
 
 #ifndef lint
 static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.1 1999-11-21 03:54:24 assar Exp $ (LBL)";
+"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.4 2000-04-24 12:59:39 itojun Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <sys/param.h>
@@ -122,7 +126,7 @@ static struct tok lcpchap2str[] = {
 };
 
 void
-lcp_print(register const u_char *bp, u_int length, u_int caplen)
+lcp_print(register const u_char *bp, u_int length)
 {
   u_short lcp_code, lcp_id, lcp_length;
   const u_char *lcp_data;
@@ -140,7 +144,7 @@ lcp_print(register const u_char *bp, u_int length, u_int caplen)
 
   printf("LCP %s id=0x%x", tok2str(lcpcode2str, "LCP-#%d", lcp_code), lcp_id);
   
-  switch(lcp_code) {
+  switch (lcp_code) {
   case LCP_CONFREQ:
   case LCP_CONFACK:
   case LCP_CONFNAK:
@@ -153,7 +157,7 @@ lcp_print(register const u_char *bp, u_int length, u_int caplen)
        lcpopt_type = p[0];
        lcpopt_length = p[1];
        p+=2;
-       printf(" <%s ",tok2str(lcpoption2str, "option-#%d", lcpopt_type), lcpopt_length);
+       printf(" <%s ",tok2str(lcpoption2str, "option-#%d", lcpopt_type));
        if (lcpopt_length)
          switch (lcpopt_type) {
          case LCP_MRU:
@@ -209,8 +213,7 @@ lcp_print(register const u_char *bp, u_int length, u_int caplen)
   case LCP_CODEREJ:
     if (snapend < lcp_data+4) return;
     printf(" ");
-    /* XXX What's caplen? (lcp_print doesn't use it so it doesn't matter here) */
-    lcp_print(lcp_data, (lcp_length+lcp_data > snapend ? snapend-lcp_data : lcp_length), 0);
+    lcp_print(lcp_data, (lcp_length+lcp_data > snapend ? snapend-lcp_data : lcp_length));
     break;
   case LCP_TERMREQ:
   case LCP_TERMACK: