X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3e496441140ab04cb86bd236fd441fdd44add787..0845bc813c1cc48b18cdefff0b387c110647463c:/print-bfd.c diff --git a/print-bfd.c b/print-bfd.c index f157684f..724032ac 100644 --- a/print-bfd.c +++ b/print-bfd.c @@ -13,23 +13,14 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.10 2006-02-02 06:35:52 hannes Exp $"; -#endif - #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include -#include - -#include "interface.h" +#include "netdissect.h" #include "extract.h" -#include "addrtoname.h" #include "udp.h" @@ -53,7 +44,7 @@ static const char rcsid[] _U_ = * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ -/* +/* * Control packet, BFDv1, draft-ietf-bfd-base-02.txt * * 0 1 2 3 @@ -74,15 +65,15 @@ static const char rcsid[] _U_ = */ struct bfd_header_t { - u_int8_t version_diag; - u_int8_t flags; - u_int8_t detect_time_multiplier; - u_int8_t length; - u_int8_t my_discriminator[4]; - u_int8_t your_discriminator[4]; - u_int8_t desired_min_tx_interval[4]; - u_int8_t required_min_rx_interval[4]; - u_int8_t required_min_echo_interval[4]; + uint8_t version_diag; + uint8_t flags; + uint8_t detect_time_multiplier; + uint8_t length; + uint8_t my_discriminator[4]; + uint8_t your_discriminator[4]; + uint8_t desired_min_tx_interval[4]; + uint8_t required_min_rx_interval[4]; + uint8_t required_min_echo_interval[4]; }; /* @@ -96,9 +87,9 @@ struct bfd_header_t { */ struct bfd_auth_header_t { - u_int8_t auth_type; - u_int8_t auth_len; - u_int8_t auth_data; + uint8_t auth_type; + uint8_t auth_len; + uint8_t auth_data; }; static const struct tok bfd_v1_authentication_values[] = { @@ -167,15 +158,16 @@ static const struct tok bfd_v1_state_values[] = { }; void -bfd_print(register const u_char *pptr, register u_int len, register u_int port) +bfd_print(netdissect_options *ndo, register const u_char *pptr, + register u_int len, register u_int port) { const struct bfd_header_t *bfd_header; const struct bfd_auth_header_t *bfd_auth_header; - u_int8_t version = 0; + uint8_t version = 0; bfd_header = (const struct bfd_header_t *)pptr; if (port == BFD_CONTROL_PORT) { - TCHECK(*bfd_header); + ND_TCHECK(*bfd_header); version = BFD_EXTRACT_VERSION(bfd_header->version_diag); } else if (port == BFD_ECHO_PORT) { /* Echo is BFD v1 only */ @@ -185,79 +177,79 @@ bfd_print(register const u_char *pptr, register u_int len, register u_int port) /* BFDv0 */ case (BFD_CONTROL_PORT << 8): - if (vflag < 1 ) + if (ndo->ndo_vflag < 1) { - printf("BFDv%u, %s, Flags: [%s], length: %u", + ND_PRINT((ndo, "BFDv%u, %s, Flags: [%s], length: %u", version, tok2str(bfd_port_values, "unknown (%u)", port), bittok2str(bfd_v0_flag_values, "none", bfd_header->flags), - len); + len)); return; } - - printf("BFDv%u, length: %u\n\t%s, Flags: [%s], Diagnostic: %s (0x%02x)", + + ND_PRINT((ndo, "BFDv%u, length: %u\n\t%s, Flags: [%s], Diagnostic: %s (0x%02x)", version, len, tok2str(bfd_port_values, "unknown (%u)", port), bittok2str(bfd_v0_flag_values, "none", bfd_header->flags), tok2str(bfd_diag_values,"unknown",BFD_EXTRACT_DIAG(bfd_header->version_diag)), - BFD_EXTRACT_DIAG(bfd_header->version_diag)); - - printf("\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u", + BFD_EXTRACT_DIAG(bfd_header->version_diag))); + + ND_PRINT((ndo, "\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u", bfd_header->detect_time_multiplier, bfd_header->detect_time_multiplier * EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000, - bfd_header->length); + bfd_header->length)); - printf("\n\tMy Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->my_discriminator)); - printf(", Your Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->your_discriminator)); - printf("\n\t Desired min Tx Interval: %4u ms", EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000); - printf("\n\t Required min Rx Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_rx_interval)/1000); - printf("\n\t Required min Echo Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_echo_interval)/1000); + ND_PRINT((ndo, "\n\tMy Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->my_discriminator))); + ND_PRINT((ndo, ", Your Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->your_discriminator))); + ND_PRINT((ndo, "\n\t Desired min Tx Interval: %4u ms", EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000)); + ND_PRINT((ndo, "\n\t Required min Rx Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_rx_interval)/1000)); + ND_PRINT((ndo, "\n\t Required min Echo Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_echo_interval)/1000)); break; /* BFDv1 */ case (BFD_CONTROL_PORT << 8 | 1): - if (vflag < 1 ) + if (ndo->ndo_vflag < 1) { - printf("BFDv%u, %s, State %s, Flags: [%s], length: %u", + ND_PRINT((ndo, "BFDv%u, %s, State %s, Flags: [%s], length: %u", version, tok2str(bfd_port_values, "unknown (%u)", port), tok2str(bfd_v1_state_values, "unknown (%u)", (bfd_header->flags & 0xc0) >> 6), bittok2str(bfd_v1_flag_values, "none", bfd_header->flags & 0x3f), - len); + len)); return; } - - printf("BFDv%u, length: %u\n\t%s, State %s, Flags: [%s], Diagnostic: %s (0x%02x)", + + ND_PRINT((ndo, "BFDv%u, length: %u\n\t%s, State %s, Flags: [%s], Diagnostic: %s (0x%02x)", version, len, tok2str(bfd_port_values, "unknown (%u)", port), tok2str(bfd_v1_state_values, "unknown (%u)", (bfd_header->flags & 0xc0) >> 6), bittok2str(bfd_v1_flag_values, "none", bfd_header->flags & 0x3f), tok2str(bfd_diag_values,"unknown",BFD_EXTRACT_DIAG(bfd_header->version_diag)), - BFD_EXTRACT_DIAG(bfd_header->version_diag)); - - printf("\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u", + BFD_EXTRACT_DIAG(bfd_header->version_diag))); + + ND_PRINT((ndo, "\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u", bfd_header->detect_time_multiplier, bfd_header->detect_time_multiplier * EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000, - bfd_header->length); + bfd_header->length)); - printf("\n\tMy Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->my_discriminator)); - printf(", Your Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->your_discriminator)); - printf("\n\t Desired min Tx Interval: %4u ms", EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000); - printf("\n\t Required min Rx Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_rx_interval)/1000); - printf("\n\t Required min Echo Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_echo_interval)/1000); + ND_PRINT((ndo, "\n\tMy Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->my_discriminator))); + ND_PRINT((ndo, ", Your Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->your_discriminator))); + ND_PRINT((ndo, "\n\t Desired min Tx Interval: %4u ms", EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000)); + ND_PRINT((ndo, "\n\t Required min Rx Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_rx_interval)/1000)); + ND_PRINT((ndo, "\n\t Required min Echo Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_echo_interval)/1000)); if (bfd_header->flags & BFD_FLAG_AUTH) { pptr += sizeof (const struct bfd_header_t); bfd_auth_header = (const struct bfd_auth_header_t *)pptr; - TCHECK2(*bfd_auth_header, sizeof(const struct bfd_auth_header_t)); - printf("\n\t%s (%u) Authentication, length %u present", + ND_TCHECK2(*bfd_auth_header, sizeof(const struct bfd_auth_header_t)); + ND_PRINT((ndo, "\n\t%s (%u) Authentication, length %u present", tok2str(bfd_v1_authentication_values,"Unknown",bfd_auth_header->auth_type), bfd_auth_header->auth_type, - bfd_auth_header->auth_len); + bfd_auth_header->auth_len)); } break; @@ -267,17 +259,23 @@ bfd_print(register const u_char *pptr, register u_int len, register u_int port) case (BFD_ECHO_PORT << 8 | 1): default: - printf("BFD, %s, length: %u", + ND_PRINT((ndo, "BFD, %s, length: %u", tok2str(bfd_port_values, "unknown (%u)", port), - len); - if (vflag >= 1) { - if(!print_unknown_data(pptr,"\n\t",len)) - return; + len)); + if (ndo->ndo_vflag >= 1) { + if(!print_unknown_data(ndo, pptr,"\n\t",len)) + return; } break; } return; trunc: - printf("[|BFD]"); + ND_PRINT((ndo, "[|BFD]")); } +/* + * Local Variables: + * c-style: whitesmith + * c-basic-offset: 8 + * End: + */