diff options
author | pkelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
---|---|---|
committer | pkelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
commit | 7e965066ede451d7a551dd68d6c59acf32e4846e (patch) | |
tree | f0c2243cc0a2a59f3eb1354ba3987d4cbcb788bc /contrib/tcpdump/print-cfm.c | |
parent | 732211dc794db586649eabfc1d517b8a477440f5 (diff) | |
parent | c2704d8ede887d9fe69a9a11fe0755b09ec6895d (diff) | |
download | FreeBSD-src-7e965066ede451d7a551dd68d6c59acf32e4846e.zip FreeBSD-src-7e965066ede451d7a551dd68d6c59acf32e4846e.tar.gz |
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
Diffstat (limited to 'contrib/tcpdump/print-cfm.c')
-rw-r--r-- | contrib/tcpdump/print-cfm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/tcpdump/print-cfm.c b/contrib/tcpdump/print-cfm.c index e6aec0b..a85eec0 100644 --- a/contrib/tcpdump/print-cfm.c +++ b/contrib/tcpdump/print-cfm.c @@ -227,8 +227,8 @@ static const struct tok cfm_tlv_senderid_chassisid_values[] = { static int cfm_mgmt_addr_print(netdissect_options *ndo, - register const u_char *tptr) { - + register const u_char *tptr) +{ u_int mgmt_addr_type; u_int hexdump = FALSE; @@ -268,7 +268,8 @@ cfm_mgmt_addr_print(netdissect_options *ndo, * The egress-ID string is a 16-Bit string plus a MAC address. */ static const char * -cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr) { +cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr) +{ static char egress_id_buffer[80]; snprintf(egress_id_buffer, sizeof(egress_id_buffer), @@ -281,8 +282,8 @@ cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr) { void cfm_print(netdissect_options *ndo, - register const u_char *pptr, register u_int length) { - + register const u_char *pptr, register u_int length) +{ const struct cfm_common_header_t *cfm_common_header; const struct cfm_tlv_header_t *cfm_tlv_header; const uint8_t *tptr, *tlv_ptr, *ma_name, *ma_nameformat, *ma_namelength; |