X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3582e7ac3d179510287a02861bed2b92f519d5d6..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-olsr.c diff --git a/print-olsr.c b/print-olsr.c index cd96e95d..2b85d67c 100644 --- a/print-olsr.c +++ b/print-olsr.c @@ -240,19 +240,20 @@ olsr_print_lq_neighbor4(netdissect_options *ndo, while (hello_len >= sizeof(struct olsr_lq_neighbor4)) { lq_neighbor = (const struct olsr_lq_neighbor4 *)msg_data; - if (!ND_TTEST_SIZE(lq_neighbor)) - return (-1); + ND_TCHECK_SIZE(lq_neighbor); ND_PRINT("\n\t neighbor %s, link-quality %.2f%%" ", neighbor-link-quality %.2f%%", - ipaddr_string(ndo, lq_neighbor->neighbor), - ((double)EXTRACT_U_1(lq_neighbor->link_quality)/2.55), - ((double)EXTRACT_U_1(lq_neighbor->neighbor_link_quality)/2.55)); + GET_IPADDR_STRING(lq_neighbor->neighbor), + ((double) GET_U_1(lq_neighbor->link_quality)/2.55), + ((double) GET_U_1(lq_neighbor->neighbor_link_quality)/2.55)); msg_data += sizeof(struct olsr_lq_neighbor4); hello_len -= sizeof(struct olsr_lq_neighbor4); } return (0); +trunc: + return -1; } static int @@ -264,19 +265,20 @@ olsr_print_lq_neighbor6(netdissect_options *ndo, while (hello_len >= sizeof(struct olsr_lq_neighbor6)) { lq_neighbor = (const struct olsr_lq_neighbor6 *)msg_data; - if (!ND_TTEST_SIZE(lq_neighbor)) - return (-1); + ND_TCHECK_SIZE(lq_neighbor); ND_PRINT("\n\t neighbor %s, link-quality %.2f%%" ", neighbor-link-quality %.2f%%", - ip6addr_string(ndo, lq_neighbor->neighbor), - ((double)EXTRACT_U_1(lq_neighbor->link_quality)/2.55), - ((double)EXTRACT_U_1(lq_neighbor->neighbor_link_quality)/2.55)); + GET_IP6ADDR_STRING(lq_neighbor->neighbor), + ((double) GET_U_1(lq_neighbor->link_quality)/2.55), + ((double) GET_U_1(lq_neighbor->neighbor_link_quality)/2.55)); msg_data += sizeof(struct olsr_lq_neighbor6); hello_len -= sizeof(struct olsr_lq_neighbor6); } return (0); +trunc: + return -1; } /* @@ -292,12 +294,8 @@ olsr_print_neighbor(netdissect_options *ndo, neighbor = 1; while (hello_len >= sizeof(nd_ipv4)) { - - if (!ND_TTEST_LEN(msg_data, sizeof(nd_ipv4))) - return (-1); /* print 4 neighbors per line */ - - ND_PRINT("%s%s", ipaddr_string(ndo, msg_data), + ND_PRINT("%s%s", GET_IPADDR_STRING(msg_data), neighbor % 4 == 0 ? "\n\t\t" : " "); msg_data += sizeof(nd_ipv4); @@ -327,6 +325,7 @@ olsr_print(netdissect_options *ndo, uint8_t link_type, neighbor_type; const u_char *tptr, *msg_data; + ndo->ndo_protocol = "olsr"; tptr = pptr; if (length < sizeof(struct olsr_common)) { @@ -336,11 +335,11 @@ olsr_print(netdissect_options *ndo, ND_TCHECK_LEN(tptr, sizeof(struct olsr_common)); ptr.common = (const struct olsr_common *)tptr; - length = min(length, EXTRACT_BE_U_2(ptr.common->packet_len)); + length = ND_MIN(length, GET_BE_U_2(ptr.common->packet_len)); ND_PRINT("OLSRv%i, seq 0x%04x, length %u", (is_ipv6 == 0) ? 4 : 6, - EXTRACT_BE_U_2(ptr.common->packet_seq), + GET_BE_U_2(ptr.common->packet_seq), length); tptr += sizeof(struct olsr_common); @@ -364,8 +363,8 @@ olsr_print(netdissect_options *ndo, { ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg6)); msgptr.v6 = (const struct olsr_msg6 *) tptr; - msg_type = EXTRACT_U_1(msgptr.v6->msg_type); - msg_len = EXTRACT_BE_U_2(msgptr.v6->msg_len); + msg_type = GET_U_1(msgptr.v6->msg_type); + msg_len = GET_BE_U_2(msgptr.v6->msg_len); if ((msg_len >= sizeof (struct olsr_msg6)) && (msg_len <= length)) msg_len_valid = 1; @@ -378,11 +377,11 @@ olsr_print(netdissect_options *ndo, ND_PRINT("\n\t%s Message (%#04x), originator %s, ttl %u, hop %u" "\n\t vtime %.3fs, msg-seq 0x%04x, length %u%s", tok2str(olsr_msg_values, "Unknown", msg_type), - msg_type, ip6addr_string(ndo, msgptr.v6->originator), - EXTRACT_U_1(msgptr.v6->ttl), - EXTRACT_U_1(msgptr.v6->hopcount), - ME_TO_DOUBLE(EXTRACT_U_1(msgptr.v6->vtime)), - EXTRACT_BE_U_2(msgptr.v6->msg_seq), + msg_type, GET_IP6ADDR_STRING(msgptr.v6->originator), + GET_U_1(msgptr.v6->ttl), + GET_U_1(msgptr.v6->hopcount), + ME_TO_DOUBLE(GET_U_1(msgptr.v6->vtime)), + GET_BE_U_2(msgptr.v6->msg_seq), msg_len, (msg_len_valid == 0) ? " (invalid)" : ""); if (!msg_len_valid) { return; @@ -395,8 +394,8 @@ olsr_print(netdissect_options *ndo, { ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg4)); msgptr.v4 = (const struct olsr_msg4 *) tptr; - msg_type = EXTRACT_U_1(msgptr.v4->msg_type); - msg_len = EXTRACT_BE_U_2(msgptr.v4->msg_len); + msg_type = GET_U_1(msgptr.v4->msg_type); + msg_len = GET_BE_U_2(msgptr.v4->msg_len); if ((msg_len >= sizeof (struct olsr_msg4)) && (msg_len <= length)) msg_len_valid = 1; @@ -409,11 +408,11 @@ olsr_print(netdissect_options *ndo, ND_PRINT("\n\t%s Message (%#04x), originator %s, ttl %u, hop %u" "\n\t vtime %.3fs, msg-seq 0x%04x, length %u%s", tok2str(olsr_msg_values, "Unknown", msg_type), - msg_type, ipaddr_string(ndo, msgptr.v4->originator), - EXTRACT_U_1(msgptr.v4->ttl), - EXTRACT_U_1(msgptr.v4->hopcount), - ME_TO_DOUBLE(EXTRACT_U_1(msgptr.v4->vtime)), - EXTRACT_BE_U_2(msgptr.v4->msg_seq), + msg_type, GET_IPADDR_STRING(msgptr.v4->originator), + GET_U_1(msgptr.v4->ttl), + GET_U_1(msgptr.v4->hopcount), + ME_TO_DOUBLE(GET_U_1(msgptr.v4->vtime)), + GET_BE_U_2(msgptr.v4->msg_seq), msg_len, (msg_len_valid == 0) ? " (invalid)" : ""); if (!msg_len_valid) { return; @@ -432,8 +431,8 @@ olsr_print(netdissect_options *ndo, ptr.hello = (const struct olsr_hello *)msg_data; ND_PRINT("\n\t hello-time %.3fs, MPR willingness %u", - ME_TO_DOUBLE(EXTRACT_U_1(ptr.hello->htime)), - EXTRACT_U_1(ptr.hello->will)); + ME_TO_DOUBLE(GET_U_1(ptr.hello->htime)), + GET_U_1(ptr.hello->will)); msg_data += sizeof(struct olsr_hello); msg_tlen -= sizeof(struct olsr_hello); @@ -447,9 +446,9 @@ olsr_print(netdissect_options *ndo, ptr.hello_link = (const struct olsr_hello_link *)msg_data; - hello_len = EXTRACT_BE_U_2(ptr.hello_link->len); - link_type = OLSR_EXTRACT_LINK_TYPE(EXTRACT_U_1(ptr.hello_link->link_code)); - neighbor_type = OLSR_EXTRACT_NEIGHBOR_TYPE(EXTRACT_U_1(ptr.hello_link->link_code)); + hello_len = GET_BE_U_2(ptr.hello_link->len); + link_type = OLSR_EXTRACT_LINK_TYPE(GET_U_1(ptr.hello_link->link_code)); + neighbor_type = OLSR_EXTRACT_NEIGHBOR_TYPE(GET_U_1(ptr.hello_link->link_code)); if ((hello_len <= msg_tlen) && (hello_len >= sizeof(struct olsr_hello_link))) @@ -495,7 +494,7 @@ olsr_print(netdissect_options *ndo, ptr.tc = (const struct olsr_tc *)msg_data; ND_PRINT("\n\t advertised neighbor seq 0x%04x", - EXTRACT_BE_U_2(ptr.tc->ans_seq)); + GET_BE_U_2(ptr.tc->ans_seq)); msg_data += sizeof(struct olsr_tc); msg_tlen -= sizeof(struct olsr_tc); @@ -515,16 +514,16 @@ olsr_print(netdissect_options *ndo, case OLSR_MID_MSG: { - size_t addr_size = sizeof(nd_ipv4); + u_int addr_size = (u_int)sizeof(nd_ipv4); if (is_ipv6) - addr_size = sizeof(nd_ipv6); + addr_size = (u_int)sizeof(nd_ipv6); while (msg_tlen >= addr_size) { ND_TCHECK_LEN(msg_data, addr_size); ND_PRINT("\n\t interface address %s", - is_ipv6 ? ip6addr_string(ndo, msg_data) : - ipaddr_string(ndo, msg_data)); + is_ipv6 ? GET_IP6ADDR_STRING(msg_data) : + GET_IPADDR_STRING(msg_data)); msg_data += addr_size; msg_tlen -= addr_size; @@ -548,7 +547,7 @@ olsr_print(netdissect_options *ndo, hna6 = (const struct olsr_hna6 *)msg_data; ND_PRINT("\n\t #%i: %s/%u", - i, ip6addr_string(ndo, hna6->network), + i, GET_IP6ADDR_STRING(hna6->network), mask62plen (hna6->mask)); msg_data += sizeof(struct olsr_hna6); @@ -604,8 +603,8 @@ olsr_print(netdissect_options *ndo, /* normal route */ ND_PRINT("%s%s/%u", col == 0 ? "\n\t " : ", ", - ipaddr_string(ndo, ptr.hna->network), - mask2plen(EXTRACT_BE_U_4(ptr.hna->mask))); + GET_IPADDR_STRING(ptr.hna->network), + mask2plen(GET_BE_U_4(ptr.hna->mask))); } msg_data += sizeof(struct olsr_hna4); @@ -625,9 +624,8 @@ olsr_print(netdissect_options *ndo, if (msg_tlen < 4) goto trunc; - ND_TCHECK_4(msg_data); - name_entries = EXTRACT_BE_U_2(msg_data + 2); + name_entries = GET_BE_U_2(msg_data + 2); addr_size = 4; if (is_ipv6) addr_size = 16; @@ -638,7 +636,7 @@ olsr_print(netdissect_options *ndo, name_entries_valid = 1; ND_PRINT("\n\t Version %u, Entries %u%s", - EXTRACT_BE_U_2(msg_data), + GET_BE_U_2(msg_data), name_entries, (name_entries_valid == 0) ? " (invalid)" : ""); if (name_entries_valid == 0) @@ -652,10 +650,9 @@ olsr_print(netdissect_options *ndo, if (msg_tlen < 4) break; - ND_TCHECK_4(msg_data); - name_entry_type = EXTRACT_BE_U_2(msg_data); - name_entry_len = EXTRACT_BE_U_2(msg_data + 2); + name_entry_type = GET_BE_U_2(msg_data); + name_entry_len = GET_BE_U_2(msg_data + 2); msg_data += 4; msg_tlen -= 4; @@ -683,11 +680,11 @@ olsr_print(netdissect_options *ndo, if (is_ipv6) ND_PRINT(", address %s, name \"", - ip6addr_string(ndo, msg_data)); + GET_IP6ADDR_STRING(msg_data)); else ND_PRINT(", address %s, name \"", - ipaddr_string(ndo, msg_data)); - (void)fn_printn(ndo, msg_data + addr_size, name_entry_len, NULL); + GET_IPADDR_STRING(msg_data)); + (void)nd_printn(ndo, msg_data + addr_size, name_entry_len, NULL); ND_PRINT("\""); msg_data += addr_size + name_entry_len + name_entry_padding; @@ -711,12 +708,5 @@ olsr_print(netdissect_options *ndo, return; trunc: - ND_PRINT("[|olsr]"); + nd_print_trunc(ndo); } - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 4 - * End: - */