Update from current NetBSD version of ieee80211_radiotap.h.

[tcpdump] / print-ip6opts.c

diff --git a/print-ip6opts.c b/print-ip6opts.c
index 75252a62ff85611e7d972df074ef40261944f7d3..0a4fcf814b819744b78a8ca27cab514ca8844539 100644 (file)
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -32,8 +32,8 @@
 #endif
 
 #ifndef lint
 #endif
 
 #ifndef lint

-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.14 2003-01-10 08:11:00 guy Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.17.2.1 2005-04-20 22:19:06 guy Exp $";

 #endif
 
 #ifdef INET6
 #endif
 
 #ifdef INET6


@@ -289,11 +289,8 @@ int
 hbhopt_print(register const u_char *bp)
 {
     const struct ip6_hbh *dp = (struct ip6_hbh *)bp;
 hbhopt_print(register const u_char *bp)
 {
     const struct ip6_hbh *dp = (struct ip6_hbh *)bp;

-    register const u_char *ep;

     int hbhlen = 0;
 
     int hbhlen = 0;
 

-    /* 'ep' points to the end of available data. */
-    ep = snapend;

     TCHECK(dp->ip6h_len);
     hbhlen = (int)((dp->ip6h_len + 1) << 3);
     TCHECK2(*dp, hbhlen);
     TCHECK(dp->ip6h_len);
     hbhlen = (int)((dp->ip6h_len + 1) << 3);
     TCHECK2(*dp, hbhlen);


@@ -305,18 +302,15 @@ hbhopt_print(register const u_char *bp)
 
   trunc:
     fputs("[|HBH]", stdout);
 
   trunc:
     fputs("[|HBH]", stdout);

-    return(hbhlen);
+    return(-1);

 }
 
 int
 dstopt_print(register const u_char *bp)
 {
     const struct ip6_dest *dp = (struct ip6_dest *)bp;
 }
 
 int
 dstopt_print(register const u_char *bp)
 {
     const struct ip6_dest *dp = (struct ip6_dest *)bp;

-    register const u_char *ep;

     int dstoptlen = 0;
 
     int dstoptlen = 0;
 

-    /* 'ep' points to the end of available data. */
-    ep = snapend;

     TCHECK(dp->ip6d_len);
     dstoptlen = (int)((dp->ip6d_len + 1) << 3);
     TCHECK2(*dp, dstoptlen);
     TCHECK(dp->ip6d_len);
     dstoptlen = (int)((dp->ip6d_len + 1) << 3);
     TCHECK2(*dp, dstoptlen);


@@ -330,6 +324,6 @@ dstopt_print(register const u_char *bp)
 
   trunc:
     fputs("[|DSTOPT]", stdout);
 
   trunc:
     fputs("[|DSTOPT]", stdout);

-    return(dstoptlen);
+    return(-1);

 }
 #endif /* INET6 */
 }
 #endif /* INET6 */