diff options
| author | itojun <itojun> | 2002-10-30 05:11:42 +0000 |
|---|---|---|
| committer | itojun <itojun> | 2002-10-30 05:11:42 +0000 |
| commit | a77df9c411f5693114e32921665f0fa6959c8a58 (patch) | |
| tree | e575640141cbe06f16d5b565b05748d8d7dd9af6 /print-gre.c | |
| parent | dbc2d676c588f8a350780a90b29c0f6dab6f4283 (diff) | |
| download | tcpdump-a77df9c411f5693114e32921665f0fa6959c8a58.tar.gz | |
o for gre version 1, correctly check if kp (key present) is unset.
o remove trailing spaces for better output.
o print sequence, acknowledge and callid as unsigned, and remove key
from version 1 since it's actually the payload length (not including
the gre header).
from openbsd
Diffstat (limited to 'print-gre.c')
| -rw-r--r-- | print-gre.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/print-gre.c b/print-gre.c index 70840025..e3d2a9ed 100644 --- a/print-gre.c +++ b/print-gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-gre.c,v 1.5 2002/09/18 20:40:06 jason Exp $ */ +/* $OpenBSD: print-gre.c,v 1.6 2002/10/30 03:04:04 fgsch Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -38,7 +38,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.18 2002-09-24 23:39:22 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.19 2002-10-30 05:11:42 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -151,7 +151,7 @@ gre_print_0(const u_char *bp, u_int length) if (flags & GRE_SP) { if (len < 4) goto trunc; - printf("seq=0x%x ", EXTRACT_32BITS(bp)); + printf("seq %u ", EXTRACT_32BITS(bp)); bp += 4; len -= 4; } @@ -225,19 +225,19 @@ gre_print_1(const u_char *bp, u_int length) bp += 2; if (flags & GRE_CP) { - printf("cpset! "); + printf("cpset!"); return; } if (flags & GRE_RP) { - printf("rpset! "); + printf("rpset!"); return; } - if ((flags & GRE_KP) != 0) { - printf("kpunset! "); + if ((flags & GRE_KP) == 0) { + printf("kpunset!"); return; } if (flags & GRE_sP) { - printf("spset! "); + printf("spset!"); return; } @@ -247,7 +247,7 @@ gre_print_1(const u_char *bp, u_int length) if (len < 4) goto trunc; k = EXTRACT_32BITS(bp); - printf("key=0x%x call=0x%x ", (k >> 16) & 0xffff, k & 0xffff); + printf("call %d ", k & 0xffff); len -= 4; bp += 4; } @@ -255,7 +255,7 @@ gre_print_1(const u_char *bp, u_int length) if (flags & GRE_SP) { if (len < 4) goto trunc; - printf("seq=0x%x ", EXTRACT_32BITS(bp)); + printf("seq %u ", EXTRACT_32BITS(bp)); bp += 4; len -= 4; } @@ -263,22 +263,22 @@ gre_print_1(const u_char *bp, u_int length) if (flags & GRE_AP) { if (len < 4) goto trunc; - printf("ack=0x%x ", EXTRACT_32BITS(bp)); + printf("ack %u ", EXTRACT_32BITS(bp)); bp += 4; len -= 4; } if ((flags & GRE_SP) == 0) { - printf("no-payload "); + printf("no-payload"); return; } switch (prot) { case GREPROTO_PPP: - printf("gre-ppp-payload "); + printf("gre-ppp-payload"); break; default: - printf("gre-proto-0x%x ", prot); + printf("gre-proto-0x%x", prot); break; } return; |