X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f58b1c21204c3fe61daff89c8e3bdec9bb44b6f0..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-babel.c diff --git a/print-babel.c b/print-babel.c index bb3401be..3f0166d1 100644 --- a/print-babel.c +++ b/print-babel.c @@ -26,17 +26,18 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED +/* \summary: Babel Routing Protocol printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include #include #include -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" @@ -46,19 +47,20 @@ 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); + ND_TCHECK_4(cp); - if(cp[0] != 42) { - ND_PRINT((ndo, " malformed header")); + if(EXTRACT_U_1(cp) != 42) { + ND_PRINT((ndo, " invalid header")); return; } else { - ND_PRINT((ndo, " %d", cp[1])); + ND_PRINT((ndo, " %d", EXTRACT_U_1(cp + 1))); } - switch(cp[1]) { + switch(EXTRACT_U_1(cp + 1)) { case 2: babel_print_v2(ndo, cp, length); break; @@ -88,6 +90,9 @@ babel_print(netdissect_options *ndo, #define MESSAGE_MH_REQUEST 10 #define MESSAGE_TSPC 11 #define MESSAGE_HMAC 12 +#define MESSAGE_UPDATE_SRC_SPECIFIC 13 +#define MESSAGE_REQUEST_SRC_SPECIFIC 14 +#define MESSAGE_MH_REQUEST_SRC_SPECIFIC 15 /* sub-TLVs */ #define MESSAGE_SUB_PAD1 0 @@ -107,7 +112,9 @@ format_id(const u_char *id) { static char buf[25]; snprintf(buf, 25, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", - id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7]); + EXTRACT_U_1(id), EXTRACT_U_1(id + 1), EXTRACT_U_1(id + 2), + EXTRACT_U_1(id + 3), EXTRACT_U_1(id + 4), EXTRACT_U_1(id + 5), + EXTRACT_U_1(id + 6), EXTRACT_U_1(id + 7)); buf[24] = '\0'; return buf; } @@ -122,11 +129,7 @@ format_prefix(netdissect_options *ndo, const u_char *prefix, unsigned char plen) if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0) snprintf(buf, 50, "%s/%u", ipaddr_string(ndo, prefix + 12), plen - 96); else -#ifdef INET6 snprintf(buf, 50, "%s/%u", ip6addr_string(ndo, prefix), plen); -#else - snprintf(buf, 50, "IPv6 addresses not supported"); -#endif buf[49] = '\0'; return buf; } @@ -137,11 +140,7 @@ format_address(netdissect_options *ndo, const u_char *prefix) if(memcmp(prefix, v4prefix, 12) == 0) return ipaddr_string(ndo, prefix + 12); else -#ifdef INET6 return ip6addr_string(ndo, prefix); -#else - return "IPv6 addresses not supported"; -#endif } static const char * @@ -270,22 +269,25 @@ 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; while (cp < ep) { - subtype = *cp++; + subtype = EXTRACT_U_1(cp); + cp++; if(subtype == MESSAGE_SUB_PAD1) { ND_PRINT((ndo, " sub-pad1")); continue; } if(cp == ep) - goto corrupt; - sublen = *cp++; + goto invalid; + sublen = EXTRACT_U_1(cp); + cp++; if(cp + sublen > ep) - goto corrupt; + goto invalid; switch(subtype) { case MESSAGE_SUB_PADN: @@ -300,25 +302,27 @@ subtlvs_print(netdissect_options *ndo, } sep = " "; while(sublen--) { - ND_PRINT((ndo, "%s%s", sep, tok2str(diversity_str, "%u", *cp++))); + ND_PRINT((ndo, "%s%s", sep, tok2str(diversity_str, "%u", EXTRACT_U_1(cp)))); + cp++; sep = "-"; } - if(tlv_type != MESSAGE_UPDATE) + if(tlv_type != MESSAGE_UPDATE && + tlv_type != MESSAGE_UPDATE_SRC_SPECIFIC) ND_PRINT((ndo, " (bogus)")); break; case MESSAGE_SUB_TIMESTAMP: ND_PRINT((ndo, " sub-timestamp")); if(tlv_type == MESSAGE_HELLO) { if(sublen < 4) - goto corrupt; - t1 = EXTRACT_32BITS(cp); + goto invalid; + t1 = EXTRACT_BE_U_4(cp); ND_PRINT((ndo, " %s", format_timestamp(t1))); } else if(tlv_type == MESSAGE_IHU) { if(sublen < 8) - goto corrupt; - t1 = EXTRACT_32BITS(cp); + goto invalid; + t1 = EXTRACT_BE_U_4(cp); ND_PRINT((ndo, " %s", format_timestamp(t1))); - t2 = EXTRACT_32BITS(cp + 4); + t2 = EXTRACT_BE_U_4(cp + 4); ND_PRINT((ndo, "|%s", format_timestamp(t2))); } else ND_PRINT((ndo, " (bogus)")); @@ -331,26 +335,27 @@ subtlvs_print(netdissect_options *ndo, } /* while */ return; - corrupt: - ND_PRINT((ndo, " (corrupt)")); + invalid: + ND_PRINT((ndo, "%s", istr)); } #define ICHECK(i, l) \ - if ((i) + (l) > bodylen || (i) + (l) > length) goto corrupt; + if ((i) + (l) > bodylen || (i) + (l) > length) goto invalid; 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] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0, 0, 0, 0 }; u_char v6_prefix[16] = {0}; - ND_TCHECK2(*cp, 4); + ND_TCHECK_4(cp); if (length < 4) - goto corrupt; - bodylen = EXTRACT_16BITS(cp + 2); + goto invalid; + bodylen = EXTRACT_BE_U_2(cp + 2); ND_PRINT((ndo, " (%u)", bodylen)); /* Process the TLVs in the body */ @@ -361,18 +366,18 @@ babel_print_v2(netdissect_options *ndo, message = cp + 4 + i; - ND_TCHECK2(*message, 1); - if((type = message[0]) == MESSAGE_PAD1) { + ND_TCHECK_1(message); + if((type = EXTRACT_U_1(message)) == MESSAGE_PAD1) { ND_PRINT((ndo, ndo->ndo_vflag ? "\n\tPad 1" : " pad1")); i += 1; continue; } - ND_TCHECK2(*message, 2); + ND_TCHECK_2(message); ICHECK(i, 2); - len = message[1]; + len = EXTRACT_U_1(message + 1); - ND_TCHECK2(*message, 2 + len); + ND_TCHECK_LEN(message, 2 + len); ICHECK(i, 2 + len); switch(type) { @@ -390,9 +395,9 @@ babel_print_v2(netdissect_options *ndo, ND_PRINT((ndo, " ack-req")); else { ND_PRINT((ndo, "\n\tAcknowledgment Request ")); - if(len < 6) goto corrupt; - nonce = EXTRACT_16BITS(message + 4); - interval = EXTRACT_16BITS(message + 6); + if(len < 6) goto invalid; + nonce = EXTRACT_BE_U_2(message + 4); + interval = EXTRACT_BE_U_2(message + 6); ND_PRINT((ndo, "%04x %s", nonce, format_interval(interval))); } } @@ -404,8 +409,8 @@ babel_print_v2(netdissect_options *ndo, ND_PRINT((ndo, " ack")); else { ND_PRINT((ndo, "\n\tAcknowledgment ")); - if(len < 2) goto corrupt; - nonce = EXTRACT_16BITS(message + 2); + if(len < 2) goto invalid; + nonce = EXTRACT_BE_U_2(message + 2); ND_PRINT((ndo, "%04x", nonce)); } } @@ -417,9 +422,9 @@ babel_print_v2(netdissect_options *ndo, ND_PRINT((ndo, " hello")); else { ND_PRINT((ndo, "\n\tHello ")); - if(len < 6) goto corrupt; - seqno = EXTRACT_16BITS(message + 4); - interval = EXTRACT_16BITS(message + 6); + if(len < 6) goto invalid; + seqno = EXTRACT_BE_U_2(message + 4); + interval = EXTRACT_BE_U_2(message + 6); ND_PRINT((ndo, "seqno %u interval %s", seqno, format_interval(interval))); /* Extra data. */ if(len > 6) @@ -436,10 +441,11 @@ babel_print_v2(netdissect_options *ndo, u_char address[16]; int rc; ND_PRINT((ndo, "\n\tIHU ")); - if(len < 6) goto corrupt; - txcost = EXTRACT_16BITS(message + 4); - interval = EXTRACT_16BITS(message + 6); - rc = network_address(message[2], message + 8, len - 6, address); + if(len < 6) goto invalid; + txcost = EXTRACT_BE_U_2(message + 4); + interval = EXTRACT_BE_U_2(message + 6); + rc = network_address(EXTRACT_U_1(message + 2), message + 8, + len - 6, address); if(rc < 0) { ND_PRINT((ndo, "%s", tstr)); break; } ND_PRINT((ndo, "%s txcost %u interval %s", format_address(ndo, address), txcost, format_interval(interval))); @@ -456,7 +462,7 @@ babel_print_v2(netdissect_options *ndo, ND_PRINT((ndo, " router-id")); else { ND_PRINT((ndo, "\n\tRouter Id")); - if(len < 10) goto corrupt; + if(len < 10) goto invalid; ND_PRINT((ndo, " %s", format_id(message + 4))); } } @@ -469,9 +475,10 @@ babel_print_v2(netdissect_options *ndo, int rc; u_char nh[16]; ND_PRINT((ndo, "\n\tNext Hop")); - if(len < 2) goto corrupt; - rc = network_address(message[2], message + 4, len - 2, nh); - if(rc < 0) goto corrupt; + if(len < 2) goto invalid; + rc = network_address(EXTRACT_U_1(message + 2), message + 4, + len - 2, nh); + if(rc < 0) goto invalid; ND_PRINT((ndo, " %s", format_address(ndo, nh))); } } @@ -484,33 +491,35 @@ babel_print_v2(netdissect_options *ndo, ND_PRINT((ndo, "/truncated")); else ND_PRINT((ndo, "%s%s%s", - (message[3] & 0x80) ? "/prefix": "", - (message[3] & 0x40) ? "/id" : "", - (message[3] & 0x3f) ? "/unknown" : "")); + (EXTRACT_U_1(message + 3) & 0x80) ? "/prefix": "", + (EXTRACT_U_1(message + 3) & 0x40) ? "/id" : "", + (EXTRACT_U_1(message + 3) & 0x3f) ? "/unknown" : "")); } else { u_short interval, seqno, metric; u_char plen; int rc; u_char prefix[16]; ND_PRINT((ndo, "\n\tUpdate")); - if(len < 10) goto corrupt; - plen = message[4] + (message[2] == 1 ? 96 : 0); - rc = network_prefix(message[2], message[4], message[5], + if(len < 10) goto invalid; + plen = EXTRACT_U_1(message + 4) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0); + rc = network_prefix(EXTRACT_U_1(message + 2), + EXTRACT_U_1(message + 4), + EXTRACT_U_1(message + 5), message + 12, - message[2] == 1 ? v4_prefix : v6_prefix, + EXTRACT_U_1(message + 2) == 1 ? v4_prefix : v6_prefix, len - 10, prefix); - if(rc < 0) goto corrupt; - interval = EXTRACT_16BITS(message + 6); - seqno = EXTRACT_16BITS(message + 8); - metric = EXTRACT_16BITS(message + 10); + if(rc < 0) goto invalid; + interval = EXTRACT_BE_U_2(message + 6); + seqno = EXTRACT_BE_U_2(message + 8); + metric = EXTRACT_BE_U_2(message + 10); ND_PRINT((ndo, "%s%s%s %s metric %u seqno %u interval %s", - (message[3] & 0x80) ? "/prefix": "", - (message[3] & 0x40) ? "/id" : "", - (message[3] & 0x3f) ? "/unknown" : "", + (EXTRACT_U_1(message + 3) & 0x80) ? "/prefix": "", + (EXTRACT_U_1(message + 3) & 0x40) ? "/id" : "", + (EXTRACT_U_1(message + 3) & 0x3f) ? "/unknown" : "", format_prefix(ndo, prefix, plen), metric, seqno, format_interval_update(interval))); - if(message[3] & 0x80) { - if(message[2] == 1) + if(EXTRACT_U_1(message + 3) & 0x80) { + if(EXTRACT_U_1(message + 2) == 1) memcpy(v4_prefix, prefix, 16); else memcpy(v6_prefix, prefix, 16); @@ -529,13 +538,14 @@ babel_print_v2(netdissect_options *ndo, int rc; u_char prefix[16], plen; ND_PRINT((ndo, "\n\tRequest ")); - if(len < 2) goto corrupt; - plen = message[3] + (message[2] == 1 ? 96 : 0); - rc = network_prefix(message[2], message[3], 0, + if(len < 2) goto invalid; + plen = EXTRACT_U_1(message + 3) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0); + rc = network_prefix(EXTRACT_U_1(message + 2), + EXTRACT_U_1(message + 3), 0, message + 4, NULL, len - 2, prefix); - if(rc < 0) goto corrupt; + if(rc < 0) goto invalid; ND_PRINT((ndo, "for %s", - message[2] == 0 ? "any" : format_prefix(ndo, prefix, plen))); + EXTRACT_U_1(message + 2) == 0 ? "any" : format_prefix(ndo, prefix, plen))); } } break; @@ -548,14 +558,15 @@ babel_print_v2(netdissect_options *ndo, u_short seqno; u_char prefix[16], plen; ND_PRINT((ndo, "\n\tMH-Request ")); - if(len < 14) goto corrupt; - seqno = EXTRACT_16BITS(message + 4); - rc = network_prefix(message[2], message[3], 0, + if(len < 14) goto invalid; + seqno = EXTRACT_BE_U_2(message + 4); + rc = network_prefix(EXTRACT_U_1(message + 2), + EXTRACT_U_1(message + 3), 0, message + 16, NULL, len - 14, prefix); - if(rc < 0) goto corrupt; - plen = message[3] + (message[2] == 1 ? 96 : 0); + if(rc < 0) goto invalid; + plen = EXTRACT_U_1(message + 3) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0); ND_PRINT((ndo, "(%u hops) for %s seqno %u id %s", - message[6], format_prefix(ndo, prefix, plen), + EXTRACT_U_1(message + 6), format_prefix(ndo, prefix, plen), seqno, format_id(message + 8))); } } @@ -565,9 +576,9 @@ babel_print_v2(netdissect_options *ndo, ND_PRINT((ndo, " tspc")); else { ND_PRINT((ndo, "\n\tTS/PC ")); - if(len < 6) goto corrupt; - ND_PRINT((ndo, "timestamp %u packetcounter %u", EXTRACT_32BITS (message + 4), - EXTRACT_16BITS(message + 2))); + if(len < 6) goto invalid; + ND_PRINT((ndo, "timestamp %u packetcounter %u", EXTRACT_BE_U_4(message + 4), + EXTRACT_BE_U_2(message + 2))); } break; case MESSAGE_HMAC : { @@ -576,13 +587,127 @@ babel_print_v2(netdissect_options *ndo, else { unsigned j; ND_PRINT((ndo, "\n\tHMAC ")); - if(len < 18) goto corrupt; - ND_PRINT((ndo, "key-id %u digest-%u ", EXTRACT_16BITS(message + 2), len - 2)); + if(len < 18) goto invalid; + ND_PRINT((ndo, "key-id %u digest-%u ", EXTRACT_BE_U_2(message + 2), len - 2)); for (j = 0; j < len - 2; j++) - ND_PRINT((ndo, "%02X", message[4 + j])); + ND_PRINT((ndo, "%02X", EXTRACT_U_1(message + j + 4))); + } + } + break; + + case MESSAGE_UPDATE_SRC_SPECIFIC : { + if(!ndo->ndo_vflag) { + ND_PRINT((ndo, " ss-update")); + } else { + u_char prefix[16], src_prefix[16]; + u_short interval, seqno, metric; + u_char ae, plen, src_plen, omitted; + int rc; + int parsed_len = 10; + ND_PRINT((ndo, "\n\tSS-Update")); + if(len < 10) goto invalid; + ae = EXTRACT_U_1(message + 2); + src_plen = EXTRACT_U_1(message + 3); + plen = EXTRACT_U_1(message + 4); + omitted = EXTRACT_U_1(message + 5); + interval = EXTRACT_BE_U_2(message + 6); + seqno = EXTRACT_BE_U_2(message + 8); + metric = EXTRACT_BE_U_2(message + 10); + rc = network_prefix(ae, plen, omitted, message + 2 + parsed_len, + ae == 1 ? v4_prefix : v6_prefix, + len - parsed_len, prefix); + if(rc < 0) goto invalid; + if(ae == 1) + plen += 96; + parsed_len += rc; + rc = network_prefix(ae, src_plen, 0, message + 2 + parsed_len, + NULL, len - parsed_len, src_prefix); + if(rc < 0) goto invalid; + if(ae == 1) + src_plen += 96; + parsed_len += rc; + + ND_PRINT((ndo, " %s from", format_prefix(ndo, prefix, plen))); + ND_PRINT((ndo, " %s metric %u seqno %u interval %s", + format_prefix(ndo, src_prefix, src_plen), + metric, seqno, format_interval_update(interval))); + /* extra data? */ + if((u_int)parsed_len < len) + subtlvs_print(ndo, message + 2 + parsed_len, + message + 2 + len, type); } } break; + + case MESSAGE_REQUEST_SRC_SPECIFIC : { + if(!ndo->ndo_vflag) + ND_PRINT((ndo, " ss-request")); + else { + int rc, parsed_len = 3; + u_char ae, plen, src_plen, prefix[16], src_prefix[16]; + ND_PRINT((ndo, "\n\tSS-Request ")); + if(len < 3) goto invalid; + ae = EXTRACT_U_1(message + 2); + plen = EXTRACT_U_1(message + 3); + src_plen = EXTRACT_U_1(message + 4); + rc = network_prefix(ae, plen, 0, message + 2 + parsed_len, + NULL, len - parsed_len, prefix); + if(rc < 0) goto invalid; + if(ae == 1) + plen += 96; + parsed_len += rc; + rc = network_prefix(ae, src_plen, 0, message + 2 + parsed_len, + NULL, len - parsed_len, src_prefix); + if(rc < 0) goto invalid; + if(ae == 1) + src_plen += 96; + parsed_len += rc; + if(ae == 0) { + ND_PRINT((ndo, "for any")); + } else { + ND_PRINT((ndo, "for (%s, ", format_prefix(ndo, prefix, plen))); + ND_PRINT((ndo, "%s)", format_prefix(ndo, src_prefix, src_plen))); + } + } + } + break; + + case MESSAGE_MH_REQUEST_SRC_SPECIFIC : { + if(!ndo->ndo_vflag) + ND_PRINT((ndo, " ss-mh-request")); + else { + int rc, parsed_len = 14; + u_short seqno; + u_char ae, plen, src_plen, prefix[16], src_prefix[16], hopc; + const u_char *router_id = NULL; + ND_PRINT((ndo, "\n\tSS-MH-Request ")); + if(len < 14) goto invalid; + ae = EXTRACT_U_1(message + 2); + plen = EXTRACT_U_1(message + 3); + seqno = EXTRACT_BE_U_2(message + 4); + hopc = EXTRACT_U_1(message + 6); + src_plen = EXTRACT_U_1(message + 7); + router_id = message + 8; + rc = network_prefix(ae, plen, 0, message + 2 + parsed_len, + NULL, len - parsed_len, prefix); + if(rc < 0) goto invalid; + if(ae == 1) + plen += 96; + parsed_len += rc; + rc = network_prefix(ae, src_plen, 0, message + 2 + parsed_len, + NULL, len - parsed_len, src_prefix); + if(rc < 0) goto invalid; + if(ae == 1) + src_plen += 96; + ND_PRINT((ndo, "(%u hops) for (%s, ", + hopc, format_prefix(ndo, prefix, plen))); + ND_PRINT((ndo, "%s) seqno %u id %s", + format_prefix(ndo, src_prefix, src_plen), + seqno, format_id(router_id))); + } + } + break; + default: if (!ndo->ndo_vflag) ND_PRINT((ndo, " unknown")); @@ -597,7 +722,7 @@ babel_print_v2(netdissect_options *ndo, ND_PRINT((ndo, " %s", tstr)); return; - corrupt: - ND_PRINT((ndo, " (corrupt)")); + invalid: + ND_PRINT((ndo, "%s", istr)); return; }