#include "config.h"
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include <string.h>
ospf6_print_ls_type(netdissect_options *ndo,
u_int ls_type, const rtrid_t *ls_stateid)
{
- ND_PRINT((ndo, "\n\t %s LSA (%d), %s Scope%s, LSA-ID %s",
+ ND_PRINT("\n\t %s LSA (%u), %s Scope%s, LSA-ID %s",
tok2str(ospf6_lsa_values, "Unknown", ls_type & LS_TYPE_MASK),
ls_type & LS_TYPE_MASK,
tok2str(ospf6_ls_scope_values, "Unknown", ls_type & LS_SCOPE_MASK),
ls_type &0x8000 ? ", transitive" : "", /* U-bit */
- ipaddr_string(ndo, ls_stateid)));
+ ipaddr_string(ndo, ls_stateid));
}
static int
ND_TCHECK(lshp->ls_type);
ND_TCHECK(lshp->ls_seq);
- ND_PRINT((ndo, "\n\t Advertising Router %s, seq 0x%08x, age %us, length %u",
+ ND_PRINT("\n\t Advertising Router %s, seq 0x%08x, age %us, length %u",
ipaddr_string(ndo, &lshp->ls_router),
EXTRACT_BE_U_4(lshp->ls_seq),
EXTRACT_BE_U_2(lshp->ls_age),
- EXTRACT_BE_U_2(lshp->ls_length)-(u_int)sizeof(struct lsa6_hdr)));
+ EXTRACT_BE_U_2(lshp->ls_length)-(u_int)sizeof(struct lsa6_hdr));
ospf6_print_ls_type(ndo, EXTRACT_BE_U_2(lshp->ls_type),
&lshp->ls_stateid);
ND_TCHECK_LEN(lsapp, sizeof(*lsapp) - IPV6_ADDR_LEN_BYTES);
wordlen = (EXTRACT_U_1(lsapp->lsa_p_len) + 31) / 32;
if (wordlen * 4 > sizeof(struct in6_addr)) {
- ND_PRINT((ndo, " bogus prefixlen /%u", EXTRACT_U_1(lsapp->lsa_p_len)));
+ ND_PRINT(" bogus prefixlen /%u", EXTRACT_U_1(lsapp->lsa_p_len));
goto trunc;
}
if (lsa_length < wordlen * 4)
goto trunc;
lsa_length -= wordlen * 4;
- ND_TCHECK2(lsapp->lsa_p_prefix, wordlen * 4);
+ ND_TCHECK_LEN(lsapp->lsa_p_prefix, wordlen * 4);
memset(&prefix, 0, sizeof(prefix));
memcpy(&prefix, lsapp->lsa_p_prefix, wordlen * 4);
- ND_PRINT((ndo, "\n\t\t%s/%u", ip6addr_string(ndo, &prefix),
- EXTRACT_U_1(lsapp->lsa_p_len)));
+ ND_PRINT("\n\t\t%s/%u", ip6addr_string(ndo, &prefix),
+ EXTRACT_U_1(lsapp->lsa_p_len));
if (EXTRACT_U_1(lsapp->lsa_p_opt)) {
- ND_PRINT((ndo, ", Options [%s]",
+ ND_PRINT(", Options [%s]",
bittok2str(ospf6_lsa_prefix_option_values,
- "none", EXTRACT_U_1(lsapp->lsa_p_opt))));
+ "none", EXTRACT_U_1(lsapp->lsa_p_opt)));
}
- ND_PRINT((ndo, ", metric %u", EXTRACT_BE_U_2(lsapp->lsa_p_metric)));
+ ND_PRINT(", metric %u", EXTRACT_BE_U_2(lsapp->lsa_p_metric));
return sizeof(*lsapp) - IPV6_ADDR_LEN_BYTES + wordlen * 4;
trunc:
return (1);
lsa_length -= sizeof (lsap->lsa_un.un_rla.rla_options);
ND_TCHECK(lsap->lsa_un.un_rla.rla_options);
- ND_PRINT((ndo, "\n\t Options [%s]",
+ ND_PRINT("\n\t Options [%s]",
bittok2str(ospf6_option_values, "none",
- EXTRACT_BE_U_4(lsap->lsa_un.un_rla.rla_options))));
- ND_PRINT((ndo, ", RLA-Flags [%s]",
+ EXTRACT_BE_U_4(lsap->lsa_un.un_rla.rla_options)));
+ ND_PRINT(", RLA-Flags [%s]",
bittok2str(ospf6_rla_flag_values, "none",
- EXTRACT_U_1(lsap->lsa_un.un_rla.rla_flags))));
+ EXTRACT_U_1(lsap->lsa_un.un_rla.rla_flags)));
rlp = lsap->lsa_un.un_rla.rla_link;
while (lsa_length != 0) {
if (lsa_length < sizeof (*rlp))
return (1);
lsa_length -= sizeof (*rlp);
- ND_TCHECK(*rlp);
+ ND_TCHECK_SIZE(rlp);
switch (EXTRACT_U_1(rlp->link_type)) {
case RLA_TYPE_VIRTUAL:
- ND_PRINT((ndo, "\n\t Virtual Link: Neighbor Router-ID %s"
+ ND_PRINT("\n\t Virtual Link: Neighbor Router-ID %s"
"\n\t Neighbor Interface-ID %s, Interface %s",
ipaddr_string(ndo, &rlp->link_nrtid),
ipaddr_string(ndo, &rlp->link_nifid),
- ipaddr_string(ndo, &rlp->link_ifid)));
+ ipaddr_string(ndo, &rlp->link_ifid));
break;
case RLA_TYPE_ROUTER:
- ND_PRINT((ndo, "\n\t Neighbor Router-ID %s"
+ ND_PRINT("\n\t Neighbor Router-ID %s"
"\n\t Neighbor Interface-ID %s, Interface %s",
ipaddr_string(ndo, &rlp->link_nrtid),
ipaddr_string(ndo, &rlp->link_nifid),
- ipaddr_string(ndo, &rlp->link_ifid)));
+ ipaddr_string(ndo, &rlp->link_ifid));
break;
case RLA_TYPE_TRANSIT:
- ND_PRINT((ndo, "\n\t Neighbor Network-ID %s"
+ ND_PRINT("\n\t Neighbor Network-ID %s"
"\n\t Neighbor Interface-ID %s, Interface %s",
ipaddr_string(ndo, &rlp->link_nrtid),
ipaddr_string(ndo, &rlp->link_nifid),
- ipaddr_string(ndo, &rlp->link_ifid)));
+ ipaddr_string(ndo, &rlp->link_ifid));
break;
default:
- ND_PRINT((ndo, "\n\t Unknown Router Links Type 0x%02x",
- EXTRACT_U_1(rlp->link_type)));
+ ND_PRINT("\n\t Unknown Router Links Type 0x%02x",
+ EXTRACT_U_1(rlp->link_type));
return (0);
}
- ND_PRINT((ndo, ", metric %d", EXTRACT_BE_U_2(rlp->link_metric)));
+ ND_PRINT(", metric %u", EXTRACT_BE_U_2(rlp->link_metric));
rlp++;
}
break;
return (1);
lsa_length -= sizeof (lsap->lsa_un.un_nla.nla_options);
ND_TCHECK(lsap->lsa_un.un_nla.nla_options);
- ND_PRINT((ndo, "\n\t Options [%s]",
+ ND_PRINT("\n\t Options [%s]",
bittok2str(ospf6_option_values, "none",
- EXTRACT_BE_U_4(lsap->lsa_un.un_nla.nla_options))));
+ EXTRACT_BE_U_4(lsap->lsa_un.un_nla.nla_options)));
- ND_PRINT((ndo, "\n\t Connected Routers:"));
+ ND_PRINT("\n\t Connected Routers:");
ap = lsap->lsa_un.un_nla.nla_router;
while (lsa_length != 0) {
if (lsa_length < sizeof (*ap))
return (1);
lsa_length -= sizeof (*ap);
- ND_TCHECK(*ap);
- ND_PRINT((ndo, "\n\t\t%s", ipaddr_string(ndo, ap)));
+ ND_TCHECK_SIZE(ap);
+ ND_PRINT("\n\t\t%s", ipaddr_string(ndo, ap));
++ap;
}
break;
return (1);
lsa_length -= sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric);
ND_TCHECK(lsap->lsa_un.un_inter_ap.inter_ap_metric);
- ND_PRINT((ndo, ", metric %u",
- EXTRACT_BE_U_4(lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC));
+ ND_PRINT(", metric %u",
+ EXTRACT_BE_U_4(lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC);
tptr = (const uint8_t *)lsap->lsa_un.un_inter_ap.inter_ap_prefix;
while (lsa_length != 0) {
lsa_length -= sizeof (lsap->lsa_un.un_asla.asla_metric);
ND_TCHECK(lsap->lsa_un.un_asla.asla_metric);
flags32 = EXTRACT_BE_U_4(lsap->lsa_un.un_asla.asla_metric);
- ND_PRINT((ndo, "\n\t Flags [%s]",
- bittok2str(ospf6_asla_flag_values, "none", flags32)));
- ND_PRINT((ndo, " metric %u",
+ ND_PRINT("\n\t Flags [%s]",
+ bittok2str(ospf6_asla_flag_values, "none", flags32));
+ ND_PRINT(" metric %u",
EXTRACT_BE_U_4(lsap->lsa_un.un_asla.asla_metric) &
- ASLA_MASK_METRIC));
+ ASLA_MASK_METRIC);
tptr = (const uint8_t *)lsap->lsa_un.un_asla.asla_prefix;
lsapp = (const struct lsa6_prefix *)tptr;
if (lsa_length < sizeof (*fwdaddr6))
return (1);
lsa_length -= sizeof (*fwdaddr6);
- ND_TCHECK(*fwdaddr6);
- ND_PRINT((ndo, " forward %s",
- ip6addr_string(ndo, fwdaddr6)));
+ ND_TCHECK_SIZE(fwdaddr6);
+ ND_PRINT(" forward %s",
+ ip6addr_string(ndo, fwdaddr6));
tptr += sizeof(*fwdaddr6);
}
return (1);
lsa_length -= sizeof (uint32_t);
ND_TCHECK(*(const uint32_t *)tptr);
- ND_PRINT((ndo, " tag %s",
- ipaddr_string(ndo, (const uint32_t *)tptr)));
+ ND_PRINT(" tag %s",
+ ipaddr_string(ndo, (const uint32_t *)tptr));
tptr += sizeof(uint32_t);
}
return (1);
lsa_length -= sizeof (uint32_t);
ND_TCHECK(*(const uint32_t *)tptr);
- ND_PRINT((ndo, " RefLSID: %s",
- ipaddr_string(ndo, (const uint32_t *)tptr)));
+ ND_PRINT(" RefLSID: %s",
+ ipaddr_string(ndo, (const uint32_t *)tptr));
tptr += sizeof(uint32_t);
}
break;
return (1);
lsa_length -= sizeof (llsap->llsa_priandopt);
ND_TCHECK(llsap->llsa_priandopt);
- ND_PRINT((ndo, "\n\t Options [%s]",
+ ND_PRINT("\n\t Options [%s]",
bittok2str(ospf6_option_values, "none",
- EXTRACT_BE_U_4(llsap->llsa_options))));
+ EXTRACT_BE_U_4(llsap->llsa_options)));
if (lsa_length < sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix))
return (1);
lsa_length -= sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix);
ND_TCHECK(llsap->llsa_nprefix);
prefixes = EXTRACT_BE_U_4(llsap->llsa_nprefix);
- ND_PRINT((ndo, "\n\t Priority %d, Link-local address %s, Prefixes %d:",
+ ND_PRINT("\n\t Priority %u, Link-local address %s, Prefixes %u:",
EXTRACT_U_1(llsap->llsa_priority),
ip6addr_string(ndo, &llsap->llsa_lladdr),
- prefixes));
+ prefixes);
tptr = (const uint8_t *)llsap->llsa_prefix;
while (prefixes > 0) {
lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
ND_TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
prefixes = EXTRACT_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
- ND_PRINT((ndo, "\n\t Prefixes %d:", prefixes));
+ ND_PRINT("\n\t Prefixes %u:", prefixes);
tptr = (const uint8_t *)lsap->lsa_un.un_intra_ap.intra_ap_prefix;
while (prefixes > 0) {
const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);
ND_TCHECK_4(hellop->hello_options);
- ND_PRINT((ndo, "\n\tOptions [%s]",
+ ND_PRINT("\n\tOptions [%s]",
bittok2str(ospf6_option_values, "none",
- EXTRACT_BE_U_4(hellop->hello_options))));
+ EXTRACT_BE_U_4(hellop->hello_options)));
ND_TCHECK(hellop->hello_deadint);
- ND_PRINT((ndo, "\n\t Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",
+ ND_PRINT("\n\t Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",
EXTRACT_BE_U_2(hellop->hello_helloint),
EXTRACT_BE_U_2(hellop->hello_deadint),
ipaddr_string(ndo, &hellop->hello_ifid),
- EXTRACT_U_1(hellop->hello_priority)));
+ EXTRACT_U_1(hellop->hello_priority));
ND_TCHECK(hellop->hello_dr);
if (EXTRACT_BE_U_4(hellop->hello_dr) != 0)
- ND_PRINT((ndo, "\n\t Designated Router %s",
- ipaddr_string(ndo, &hellop->hello_dr)));
+ ND_PRINT("\n\t Designated Router %s",
+ ipaddr_string(ndo, &hellop->hello_dr));
ND_TCHECK(hellop->hello_bdr);
if (EXTRACT_BE_U_4(hellop->hello_bdr) != 0)
- ND_PRINT((ndo, ", Backup Designated Router %s",
- ipaddr_string(ndo, &hellop->hello_bdr)));
+ ND_PRINT(", Backup Designated Router %s",
+ ipaddr_string(ndo, &hellop->hello_bdr));
if (ndo->ndo_vflag > 1) {
- ND_PRINT((ndo, "\n\t Neighbor List:"));
+ ND_PRINT("\n\t Neighbor List:");
ap = hellop->hello_neighbor;
while ((const u_char *)ap < dataend) {
- ND_TCHECK(*ap);
- ND_PRINT((ndo, "\n\t %s", ipaddr_string(ndo, ap)));
+ ND_TCHECK_SIZE(ap);
+ ND_PRINT("\n\t %s", ipaddr_string(ndo, ap));
++ap;
}
}
const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);
ND_TCHECK(ddp->db_options);
- ND_PRINT((ndo, "\n\tOptions [%s]",
+ ND_PRINT("\n\tOptions [%s]",
bittok2str(ospf6_option_values, "none",
- EXTRACT_BE_U_4(ddp->db_options))));
+ EXTRACT_BE_U_4(ddp->db_options)));
ND_TCHECK(ddp->db_flags);
- ND_PRINT((ndo, ", DD Flags [%s]",
- bittok2str(ospf6_dd_flag_values,"none",EXTRACT_U_1(ddp->db_flags))));
+ ND_PRINT(", DD Flags [%s]",
+ bittok2str(ospf6_dd_flag_values,"none",EXTRACT_U_1(ddp->db_flags)));
ND_TCHECK(ddp->db_seq);
- ND_PRINT((ndo, ", MTU %u, DD-Sequence 0x%08x",
+ ND_PRINT(", MTU %u, DD-Sequence 0x%08x",
EXTRACT_BE_U_2(ddp->db_mtu),
- EXTRACT_BE_U_4(ddp->db_seq)));
+ EXTRACT_BE_U_4(ddp->db_seq));
if (ndo->ndo_vflag > 1) {
/* Print all the LS adv's */
lshp = ddp->db_lshdr;
if (ndo->ndo_vflag > 1) {
lsrp = (const struct lsr6 *)((const uint8_t *)op + OSPF6HDR_LEN);
while ((const u_char *)lsrp < dataend) {
- ND_TCHECK(*lsrp);
- ND_PRINT((ndo, "\n\t Advertising Router %s",
- ipaddr_string(ndo, &lsrp->ls_router)));
+ ND_TCHECK_SIZE(lsrp);
+ ND_PRINT("\n\t Advertising Router %s",
+ ipaddr_string(ndo, &lsrp->ls_router));
ospf6_print_ls_type(ndo,
EXTRACT_BE_U_2(lsrp->ls_type),
&lsrp->ls_stateid);
goto trunc;
/* Checksum */
ND_TCHECK_2(cp);
- ND_PRINT((ndo, "\n\tLLS Checksum 0x%04x", EXTRACT_BE_U_2(cp)));
+ ND_PRINT("\n\tLLS Checksum 0x%04x", EXTRACT_BE_U_2(cp));
cp += 2;
/* LLS Data Length */
ND_TCHECK_2(cp);
llsdatalen = EXTRACT_BE_U_2(cp);
- ND_PRINT((ndo, ", Data Length %u", llsdatalen));
+ ND_PRINT(", Data Length %u", llsdatalen);
if (llsdatalen < OSPF_LLS_HDRLEN || llsdatalen > len)
goto trunc;
cp += 2;
goto trunc;
/* Authentication Type */
ND_TCHECK_2(cp);
- ND_PRINT((ndo, "\n\tAuthentication Type %s", tok2str(ospf6_auth_type_str, "unknown (0x%04x)", EXTRACT_BE_U_2(cp))));
+ ND_PRINT("\n\tAuthentication Type %s", tok2str(ospf6_auth_type_str, "unknown (0x%04x)", EXTRACT_BE_U_2(cp)));
cp += 2;
/* Auth Data Len */
ND_TCHECK_2(cp);
authdatalen = EXTRACT_BE_U_2(cp);
- ND_PRINT((ndo, ", Length %u", authdatalen));
+ ND_PRINT(", Length %u", authdatalen);
if (authdatalen < OSPF6_AT_HDRLEN || authdatalen > len)
goto trunc;
cp += 2;
cp += 2;
/* Security Association ID */
ND_TCHECK_2(cp);
- ND_PRINT((ndo, ", SAID %u", EXTRACT_BE_U_2(cp)));
+ ND_PRINT(", SAID %u", EXTRACT_BE_U_2(cp));
cp += 2;
/* Cryptographic Sequence Number (High-Order 32 Bits) */
ND_TCHECK_4(cp);
- ND_PRINT((ndo, ", CSN 0x%08x", EXTRACT_BE_U_4(cp)));
+ ND_PRINT(", CSN 0x%08x", EXTRACT_BE_U_4(cp));
cp += 4;
/* Cryptographic Sequence Number (Low-Order 32 Bits) */
ND_TCHECK_4(cp);
- ND_PRINT((ndo, ":%08x", EXTRACT_BE_U_4(cp)));
+ ND_PRINT(":%08x", EXTRACT_BE_U_4(cp));
cp += 4;
/* Authentication Data */
ND_TCHECK_LEN(cp, authdatalen - OSPF6_AT_HDRLEN);
/* value. If it's not valid, say so and return */
ND_TCHECK(op->ospf6_type);
cp = tok2str(ospf6_type_values, "unknown packet type (%u)", EXTRACT_U_1(op->ospf6_type));
- ND_PRINT((ndo, "OSPFv%u, %s, length %u", EXTRACT_U_1(op->ospf6_version), cp, length));
+ ND_PRINT("OSPFv%u, %s, length %u", EXTRACT_U_1(op->ospf6_version), cp, length);
if (*cp == 'u') {
return;
}
ND_TCHECK(op->ospf6_len);
datalen = EXTRACT_BE_U_2(op->ospf6_len);
if (datalen > length) {
- ND_PRINT((ndo, " [len %d]", datalen));
+ ND_PRINT(" [len %u]", datalen);
return;
}
dataend = bp + datalen;
ND_TCHECK(op->ospf6_routerid);
- ND_PRINT((ndo, "\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf6_routerid)));
+ ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf6_routerid));
ND_TCHECK(op->ospf6_areaid);
if (EXTRACT_BE_U_4(op->ospf6_areaid) != 0)
- ND_PRINT((ndo, ", Area %s", ipaddr_string(ndo, &op->ospf6_areaid)));
+ ND_PRINT(", Area %s", ipaddr_string(ndo, &op->ospf6_areaid));
else
- ND_PRINT((ndo, ", Backbone Area"));
+ ND_PRINT(", Backbone Area");
ND_TCHECK(op->ospf6_instanceid);
if (EXTRACT_U_1(op->ospf6_instanceid))
- ND_PRINT((ndo, ", Instance %u", EXTRACT_U_1(op->ospf6_instanceid)));
+ ND_PRINT(", Instance %u", EXTRACT_U_1(op->ospf6_instanceid));
/* Do rest according to version. */
switch (EXTRACT_U_1(op->ospf6_version)) {
return;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ ND_PRINT("%s", tstr);
}
projects / tcpdump / blobdiff