diff options
| author | Patrick Kelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
|---|---|---|
| committer | Patrick Kelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
| commit | 8bdc5a6251ddffc81a013f36b4384c8ace9c4bec (patch) | |
| tree | f0c2243cc0a2a59f3eb1354ba3987d4cbcb788bc /contrib/tcpdump/print-babel.c | |
| parent | 6bae05d951855544018d42bbf8c04f3ceea630b8 (diff) | |
| parent | 7041091186ddb72670e3e2d8254859ed31d3f2e6 (diff) | |
| download | src-8bdc5a6251ddffc81a013f36b4384c8ace9c4bec.tar.gz src-8bdc5a6251ddffc81a013f36b4384c8ace9c4bec.zip | |
MFV r285191: tcpdump 4.7.4.
Also, the changes made in r272451 and r272653 that were lost in the
merge of 4.6.2 (r276788) have been restored.
PR: 199568
Differential Revision: https://reviews.freebsd.org/D3007
Reviewed by: brooks, hiren
Approved by: jmallett (mentor)
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=285275
Diffstat (limited to 'contrib/tcpdump/print-babel.c')
| -rw-r--r-- | contrib/tcpdump/print-babel.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-babel.c b/contrib/tcpdump/print-babel.c index bb3401be5e07..75cb32cf19e9 100644 --- a/contrib/tcpdump/print-babel.c +++ b/contrib/tcpdump/print-babel.c @@ -46,7 +46,8 @@ static void babel_print_v2(netdissect_options *, const u_char *cp, u_int length) void babel_print(netdissect_options *ndo, - const u_char *cp, u_int length) { + const u_char *cp, u_int length) +{ ND_PRINT((ndo, "babel")); ND_TCHECK2(*cp, 4); @@ -270,7 +271,8 @@ network_address(int ae, const unsigned char *a, unsigned int len, */ static void subtlvs_print(netdissect_options *ndo, - const u_char *cp, const u_char *ep, const uint8_t tlv_type) { + const u_char *cp, const u_char *ep, const uint8_t tlv_type) +{ uint8_t subtype, sublen; const char *sep; uint32_t t1, t2; @@ -340,7 +342,8 @@ subtlvs_print(netdissect_options *ndo, static void babel_print_v2(netdissect_options *ndo, - const u_char *cp, u_int length) { + const u_char *cp, u_int length) +{ u_int i; u_short bodylen; u_char v4_prefix[16] = |