X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/39c8c55aa9ff84244cf558b9a957b78933babf0a..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-bfd.c diff --git a/print-bfd.c b/print-bfd.c index 74030d03..2db14354 100644 --- a/print-bfd.c +++ b/print-bfd.c @@ -15,26 +15,30 @@ /* \summary: Bidirectional Forwarding Detection (BFD) printer */ -/* specification: RFC 5880 (for version 1) and RFC 5881 */ +/* + * specification: draft-ietf-bfd-base-01 for version 0, + * RFC 5880 for version 1, and RFC 5881 + */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "extract.h" #include "udp.h" /* - * Control packet, BFDv0, draft-katz-ward-bfd-01.txt + * Control packet, BFDv0, draft-ietf-bfd-base-01 * * 0 1 2 3 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * |Vers | Diag |H|D|P|F| Rsvd | Detect Mult | Length | + * |Vers | Diag |H|D|P|F|C|A|Rsv| Detect Mult | Length | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * | My Discriminator | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ @@ -69,15 +73,15 @@ */ struct bfd_header_t { - 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]; + nd_uint8_t version_diag; + nd_uint8_t flags; + nd_uint8_t detect_time_multiplier; + nd_uint8_t length; + nd_uint32_t my_discriminator; + nd_uint32_t your_discriminator; + nd_uint32_t desired_min_tx_interval; + nd_uint32_t required_min_rx_interval; + nd_uint32_t required_min_echo_interval; }; /* @@ -91,10 +95,10 @@ struct bfd_header_t { */ struct bfd_auth_header_t { - uint8_t auth_type; - uint8_t auth_len; - uint8_t auth_data; - uint8_t dummy; /* minimun 4 bytes */ + nd_uint8_t auth_type; + nd_uint8_t auth_len; + nd_uint8_t auth_data; + nd_uint8_t dummy; /* minimum 4 bytes */ }; enum auth_type { @@ -126,12 +130,6 @@ enum auth_length { #define BFD_EXTRACT_VERSION(x) (((x)&0xe0)>>5) #define BFD_EXTRACT_DIAG(x) ((x)&0x1f) -static const struct tok bfd_port_values[] = { - { BFD_CONTROL_PORT, "Control" }, - { BFD_ECHO_PORT, "Echo" }, - { 0, NULL } -}; - static const struct tok bfd_diag_values[] = { { 0, "No Diagnostic" }, { 1, "Control Detection Time Expired" }, @@ -145,20 +143,28 @@ static const struct tok bfd_diag_values[] = { { 0, NULL } }; +static const struct tok bfd_port_values[] = { + { BFD_CONTROL_PORT, "Control" }, + { BFD_MULTIHOP_PORT, "Multihop" }, + { BFD_LAG_PORT, "LAG" }, + { SBFD_PORT, "S-BFD" }, + { 0, NULL } +}; + +#define BFD_FLAG_AUTH 0x04 + static const struct tok bfd_v0_flag_values[] = { { 0x80, "I Hear You" }, { 0x40, "Demand" }, { 0x20, "Poll" }, { 0x10, "Final" }, - { 0x08, "Reserved" }, - { 0x04, "Reserved" }, + { 0x08, "Control Plane Independent" }, + { BFD_FLAG_AUTH, "Authentication Present" }, { 0x02, "Reserved" }, { 0x01, "Reserved" }, { 0, NULL } }; -#define BFD_FLAG_AUTH 0x04 - static const struct tok bfd_v1_flag_values[] = { { 0x20, "Poll" }, { 0x10, "Final" }, @@ -177,23 +183,25 @@ static const struct tok bfd_v1_state_values[] = { { 0, NULL } }; -static int -auth_print(netdissect_options *ndo, register const u_char *pptr) +static void +auth_print(netdissect_options *ndo, const u_char *pptr) { const struct bfd_auth_header_t *bfd_auth_header; + uint8_t auth_type, auth_len; int i; pptr += sizeof (struct bfd_header_t); bfd_auth_header = (const struct bfd_auth_header_t *)pptr; - ND_TCHECK(*bfd_auth_header); - ND_PRINT((ndo, "\n\tAuthentication: %s (%u), length: %u", - tok2str(bfd_v1_authentication_values,"Unknown",bfd_auth_header->auth_type), - bfd_auth_header->auth_type, - bfd_auth_header->auth_len)); + ND_TCHECK_SIZE(bfd_auth_header); + auth_type = GET_U_1(bfd_auth_header->auth_type); + auth_len = GET_U_1(bfd_auth_header->auth_len); + ND_PRINT("\n\tAuthentication: %s (%u), length: %u", + tok2str(bfd_v1_authentication_values,"Unknown",auth_type), + auth_type, auth_len); pptr += 2; - ND_PRINT((ndo, "\n\t Auth Key ID: %d", *pptr)); + ND_PRINT("\n\t Auth Key ID: %u", GET_U_1(pptr)); - switch(bfd_auth_header->auth_type) { + switch(auth_type) { case AUTH_PASSWORD: /* * Simple Password Authentication Section Format @@ -206,18 +214,16 @@ auth_print(netdissect_options *ndo, register const u_char *pptr) * | ... | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - if (bfd_auth_header->auth_len < AUTH_PASSWORD_FIELD_MIN_LEN || - bfd_auth_header->auth_len > AUTH_PASSWORD_FIELD_MAX_LEN) { - ND_PRINT((ndo, "[invalid length %d]", - bfd_auth_header->auth_len)); + if (auth_len < AUTH_PASSWORD_FIELD_MIN_LEN || + auth_len > AUTH_PASSWORD_FIELD_MAX_LEN) { + ND_PRINT("[invalid length %u]", + auth_len); break; } pptr++; - ND_PRINT((ndo, ", Password: ")); + ND_PRINT(", Password: "); /* the length is equal to the password length plus three */ - if (fn_printn(ndo, pptr, bfd_auth_header->auth_len - 3, - ndo->ndo_snapend)) - goto trunc; + nd_printjn(ndo, pptr, auth_len - 3); break; case AUTH_MD5: case AUTH_MET_MD5: @@ -236,19 +242,18 @@ auth_print(netdissect_options *ndo, register const u_char *pptr) * | ... | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - if (bfd_auth_header->auth_len != AUTH_MD5_FIELD_LEN) { - ND_PRINT((ndo, "[invalid length %d]", - bfd_auth_header->auth_len)); + if (auth_len != AUTH_MD5_FIELD_LEN) { + ND_PRINT("[invalid length %u]", + auth_len); break; } pptr += 2; - ND_TCHECK_4(pptr); - ND_PRINT((ndo, ", Sequence Number: 0x%08x", EXTRACT_BE_U_4(pptr))); + ND_PRINT(", Sequence Number: 0x%08x", GET_BE_U_4(pptr)); pptr += 4; - ND_TCHECK2(*pptr, AUTH_MD5_HASH_LEN); - ND_PRINT((ndo, "\n\t Digest: ")); + ND_TCHECK_LEN(pptr, AUTH_MD5_HASH_LEN); + ND_PRINT("\n\t Digest: "); for(i = 0; i < AUTH_MD5_HASH_LEN; i++) - ND_PRINT((ndo, "%02x", pptr[i])); + ND_PRINT("%02x", GET_U_1(pptr + i)); break; case AUTH_SHA1: case AUTH_MET_SHA1: @@ -267,140 +272,155 @@ auth_print(netdissect_options *ndo, register const u_char *pptr) * | ... | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - if (bfd_auth_header->auth_len != AUTH_SHA1_FIELD_LEN) { - ND_PRINT((ndo, "[invalid length %d]", - bfd_auth_header->auth_len)); + if (auth_len != AUTH_SHA1_FIELD_LEN) { + ND_PRINT("[invalid length %u]", + auth_len); break; } pptr += 2; - ND_TCHECK_4(pptr); - ND_PRINT((ndo, ", Sequence Number: 0x%08x", EXTRACT_BE_U_4(pptr))); + ND_PRINT(", Sequence Number: 0x%08x", GET_BE_U_4(pptr)); pptr += 4; - ND_TCHECK2(*pptr, AUTH_SHA1_HASH_LEN); - ND_PRINT((ndo, "\n\t Hash: ")); + ND_TCHECK_LEN(pptr, AUTH_SHA1_HASH_LEN); + ND_PRINT("\n\t Hash: "); for(i = 0; i < AUTH_SHA1_HASH_LEN; i++) - ND_PRINT((ndo, "%02x", pptr[i])); + ND_PRINT("%02x", GET_U_1(pptr + i)); break; } - return 0; - -trunc: - return 1; } void -bfd_print(netdissect_options *ndo, register const u_char *pptr, - register u_int len, register u_int port) +bfd_print(netdissect_options *ndo, const u_char *pptr, + u_int len, u_int port) { - const struct bfd_header_t *bfd_header; - uint8_t version = 0; + ndo->ndo_protocol = "bfd"; + if (port == BFD_CONTROL_PORT || + port == BFD_MULTIHOP_PORT || + port == BFD_LAG_PORT || + port == SBFD_PORT) { + /* + * Control packet. + */ + const struct bfd_header_t *bfd_header; + uint8_t version_diag; + uint8_t version = 0; + uint8_t flags; + + bfd_header = (const struct bfd_header_t *)pptr; + ND_TCHECK_SIZE(bfd_header); + version_diag = GET_U_1(bfd_header->version_diag); + version = BFD_EXTRACT_VERSION(version_diag); + flags = GET_U_1(bfd_header->flags); + + switch (version) { + + /* BFDv0 */ + case 0: + if (ndo->ndo_vflag < 1) { + ND_PRINT("BFDv0, Control, Flags: [%s], length: %u", + bittok2str(bfd_v0_flag_values, "none", flags), + len); + return; + } - bfd_header = (const struct bfd_header_t *)pptr; - if (port == BFD_CONTROL_PORT) { - ND_TCHECK(*bfd_header); - version = BFD_EXTRACT_VERSION(bfd_header->version_diag); - } else if (port == BFD_ECHO_PORT) { - /* Echo is BFD v1 only */ - version = 1; - } - switch ((port << 8) | version) { + ND_PRINT("BFDv0, length: %u\n\tControl, Flags: [%s], Diagnostic: %s (0x%02x)", + len, + bittok2str(bfd_v0_flag_values, "none", flags), + tok2str(bfd_diag_values,"unknown",BFD_EXTRACT_DIAG(version_diag)), + BFD_EXTRACT_DIAG(version_diag)); + + ND_PRINT("\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u", + GET_U_1(bfd_header->detect_time_multiplier), + GET_U_1(bfd_header->detect_time_multiplier) * GET_BE_U_4(bfd_header->desired_min_tx_interval)/1000, + GET_U_1(bfd_header->length)); + + + ND_PRINT("\n\tMy Discriminator: 0x%08x", + GET_BE_U_4(bfd_header->my_discriminator)); + ND_PRINT(", Your Discriminator: 0x%08x", + GET_BE_U_4(bfd_header->your_discriminator)); + ND_PRINT("\n\t Desired min Tx Interval: %4u ms", + GET_BE_U_4(bfd_header->desired_min_tx_interval)/1000); + ND_PRINT("\n\t Required min Rx Interval: %4u ms", + GET_BE_U_4(bfd_header->required_min_rx_interval)/1000); + ND_PRINT("\n\t Required min Echo Interval: %4u ms", + GET_BE_U_4(bfd_header->required_min_echo_interval)/1000); + + if (flags & BFD_FLAG_AUTH) { + auth_print(ndo, pptr); + } + break; - /* BFDv0 */ - case (BFD_CONTROL_PORT << 8): - if (ndo->ndo_vflag < 1) - { - ND_PRINT((ndo, "BFDv%u, %s, Flags: [%s], length: %u", - version, + /* BFDv1 */ + case 1: + if (ndo->ndo_vflag < 1) { + ND_PRINT("BFDv1, %s, State %s, Flags: [%s], length: %u", + tok2str(bfd_port_values, "unknown (%u)", port), + tok2str(bfd_v1_state_values, "unknown (%u)", (flags & 0xc0) >> 6), + bittok2str(bfd_v1_flag_values, "none", flags & 0x3f), + len); + return; + } + + ND_PRINT("BFDv1, length: %u\n\t%s, State %s, Flags: [%s], Diagnostic: %s (0x%02x)", + len, tok2str(bfd_port_values, "unknown (%u)", port), - bittok2str(bfd_v0_flag_values, "none", bfd_header->flags), - len)); - return; - } + tok2str(bfd_v1_state_values, "unknown (%u)", (flags & 0xc0) >> 6), + bittok2str(bfd_v1_flag_values, "none", flags & 0x3f), + tok2str(bfd_diag_values,"unknown",BFD_EXTRACT_DIAG(version_diag)), + BFD_EXTRACT_DIAG(version_diag)); + + ND_PRINT("\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u", + GET_U_1(bfd_header->detect_time_multiplier), + GET_U_1(bfd_header->detect_time_multiplier) * GET_BE_U_4(bfd_header->desired_min_tx_interval)/1000, + GET_U_1(bfd_header->length)); + + + ND_PRINT("\n\tMy Discriminator: 0x%08x", + GET_BE_U_4(bfd_header->my_discriminator)); + ND_PRINT(", Your Discriminator: 0x%08x", + GET_BE_U_4(bfd_header->your_discriminator)); + ND_PRINT("\n\t Desired min Tx Interval: %4u ms", + GET_BE_U_4(bfd_header->desired_min_tx_interval)/1000); + ND_PRINT("\n\t Required min Rx Interval: %4u ms", + GET_BE_U_4(bfd_header->required_min_rx_interval)/1000); + ND_PRINT("\n\t Required min Echo Interval: %4u ms", + GET_BE_U_4(bfd_header->required_min_echo_interval)/1000); + + if (flags & BFD_FLAG_AUTH) { + auth_print(ndo, pptr); + } + break; - 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))); - - 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_BE_U_4(bfd_header->desired_min_tx_interval)/1000, - bfd_header->length)); - - - ND_PRINT((ndo, "\n\tMy Discriminator: 0x%08x", EXTRACT_BE_U_4(bfd_header->my_discriminator))); - ND_PRINT((ndo, ", Your Discriminator: 0x%08x", EXTRACT_BE_U_4(bfd_header->your_discriminator))); - ND_PRINT((ndo, "\n\t Desired min Tx Interval: %4u ms", EXTRACT_BE_U_4(bfd_header->desired_min_tx_interval)/1000)); - ND_PRINT((ndo, "\n\t Required min Rx Interval: %4u ms", EXTRACT_BE_U_4(bfd_header->required_min_rx_interval)/1000)); - ND_PRINT((ndo, "\n\t Required min Echo Interval: %4u ms", EXTRACT_BE_U_4(bfd_header->required_min_echo_interval)/1000)); - break; - - /* BFDv1 */ - case (BFD_CONTROL_PORT << 8 | 1): - if (ndo->ndo_vflag < 1) - { - ND_PRINT((ndo, "BFDv%u, %s, State %s, Flags: [%s], length: %u", + default: + ND_PRINT("BFDv%u, Control, 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)); - return; + len); + if (ndo->ndo_vflag >= 1) { + if(!print_unknown_data(ndo, pptr,"\n\t",len)) + return; + } + break; } - - 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))); - - 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_BE_U_4(bfd_header->desired_min_tx_interval)/1000, - bfd_header->length)); - - - ND_PRINT((ndo, "\n\tMy Discriminator: 0x%08x", EXTRACT_BE_U_4(bfd_header->my_discriminator))); - ND_PRINT((ndo, ", Your Discriminator: 0x%08x", EXTRACT_BE_U_4(bfd_header->your_discriminator))); - ND_PRINT((ndo, "\n\t Desired min Tx Interval: %4u ms", EXTRACT_BE_U_4(bfd_header->desired_min_tx_interval)/1000)); - ND_PRINT((ndo, "\n\t Required min Rx Interval: %4u ms", EXTRACT_BE_U_4(bfd_header->required_min_rx_interval)/1000)); - ND_PRINT((ndo, "\n\t Required min Echo Interval: %4u ms", EXTRACT_BE_U_4(bfd_header->required_min_echo_interval)/1000)); - - if (bfd_header->flags & BFD_FLAG_AUTH) { - if (auth_print(ndo, pptr)) - goto trunc; + } else if (port == BFD_ECHO_PORT) { + /* + * Echo packet. + */ + ND_PRINT("BFD, Echo, length: %u", + len); + if (ndo->ndo_vflag >= 1) { + if(!print_unknown_data(ndo, pptr,"\n\t",len)) + return; } - break; - - /* BFDv0 */ - case (BFD_ECHO_PORT << 8): /* not yet supported - fall through */ - /* BFDv1 */ - case (BFD_ECHO_PORT << 8 | 1): - - default: - ND_PRINT((ndo, "BFD, %s, length: %u", - tok2str(bfd_port_values, "unknown (%u)", port), - len)); + } else { + /* + * Unknown packet type. + */ + ND_PRINT("BFD, unknown (%u), length: %u", + port, + len); if (ndo->ndo_vflag >= 1) { if(!print_unknown_data(ndo, pptr,"\n\t",len)) return; } - break; } - return; - -trunc: - ND_PRINT((ndo, "[|BFD]")); } -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */