diff options
author | Denis Ovsienko <infrastation@yandex.ru> | 2014-03-11 16:08:24 +0400 |
---|---|---|
committer | Denis Ovsienko <infrastation@yandex.ru> | 2014-03-11 17:36:46 +0400 |
commit | cf90fd1a84054121c867a173cb7b7a0f5ae44d2f (patch) | |
tree | 73bd40b05b97205ba6e9857e0f838d3ab8ae4824 /print-bfd.c | |
parent | 0b08cf5378648279efb96ecf03ea2e3f75bc4eff (diff) | |
download | tcpdump-cf90fd1a84054121c867a173cb7b7a0f5ae44d2f.tar.gz |
NDOize ARCNET, BFD and GRE decoders
Diffstat (limited to 'print-bfd.c')
-rw-r--r-- | print-bfd.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/print-bfd.c b/print-bfd.c index b409d315..bc410b4f 100644 --- a/print-bfd.c +++ b/print-bfd.c @@ -20,9 +20,8 @@ #include <tcpdump-stdinc.h> #include <stdio.h> -#include <stdlib.h> -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "udp.h" @@ -161,7 +160,8 @@ 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; @@ -169,7 +169,7 @@ bfd_print(register const u_char *pptr, register u_int len, register u_int port) 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 */ @@ -179,79 +179,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)); + BFD_EXTRACT_DIAG(bfd_header->version_diag))); - printf("\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u", + 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)); + BFD_EXTRACT_DIAG(bfd_header->version_diag))); - printf("\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u", + 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; @@ -261,11 +261,11 @@ 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(gndo, pptr,"\n\t",len)) + len)); + if (ndo->ndo_vflag >= 1) { + if(!print_unknown_data(ndo, pptr,"\n\t",len)) return; } break; @@ -273,7 +273,7 @@ bfd_print(register const u_char *pptr, register u_int len, register u_int port) return; trunc: - printf("[|BFD]"); + ND_PRINT((ndo, "[|BFD]")); } /* * Local Variables: |