/* If it's a single group and a single source, use 1-line output. */
if (ND_TTEST2(bp[0], 30) && bp[11] == 1 &&
- ((njoin = EXTRACT_BE_16BITS(&bp[20])) + EXTRACT_BE_16BITS(&bp[22])) == 1) {
+ ((njoin = EXTRACT_BE_U_2(bp + 20)) + EXTRACT_BE_U_2(bp + 22)) == 1) {
int hold;
ND_PRINT((ndo, " RPF %s ", ipaddr_string(ndo, bp)));
- hold = EXTRACT_BE_16BITS(&bp[6]);
+ hold = EXTRACT_BE_U_2(bp + 6);
if (hold != 180) {
ND_PRINT((ndo, "Hold "));
unsigned_relts_print(ndo, hold);
}
ND_PRINT((ndo, "%s (%s/%d, %s", njoin ? "Join" : "Prune",
- ipaddr_string(ndo, &bp[26]), bp[25] & 0x3f,
- ipaddr_string(ndo, &bp[12])));
- if (EXTRACT_BE_32BITS(&bp[16]) != 0xffffffff)
- ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[16])));
+ ipaddr_string(ndo, bp + 26), EXTRACT_U_1(bp + 25) & 0x3f,
+ ipaddr_string(ndo, bp + 12)));
+ if (EXTRACT_BE_U_4(bp + 16) != 0xffffffff)
+ ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp + 16)));
ND_PRINT((ndo, ") %s%s %s",
- (bp[24] & 0x01) ? "Sparse" : "Dense",
- (bp[25] & 0x80) ? " WC" : "",
- (bp[25] & 0x40) ? "RP" : "SPT"));
+ (EXTRACT_U_1(bp + 24) & 0x01) ? "Sparse" : "Dense",
+ (EXTRACT_U_1(bp + 25) & 0x80) ? " WC" : "",
+ (EXTRACT_U_1(bp + 25) & 0x40) ? "RP" : "SPT"));
return;
}
len -= 4;
if (len < 4)
goto trunc;
- ND_TCHECK2(bp[2], 2);
+ ND_TCHECK_2(bp + 2);
if (ndo->ndo_vflag > 1)
ND_PRINT((ndo, "\n"));
ND_PRINT((ndo, " Hold time: "));
- unsigned_relts_print(ndo, EXTRACT_BE_16BITS(&bp[2]));
+ unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
if (ndo->ndo_vflag < 2)
return;
bp += 4;
if (len < 4)
goto trunc;
- ND_TCHECK2(bp[0], 4);
+ ND_TCHECK_4(bp);
ngroups = bp[3];
bp += 4;
len -= 4;
if (len < 4)
goto trunc;
ND_TCHECK2(bp[0], sizeof(struct in_addr));
- if (EXTRACT_BE_32BITS(&bp[0]) != 0xffffffff)
- ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[0])));
+ if (EXTRACT_BE_U_4(bp) != 0xffffffff)
+ ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp)));
bp += 4;
len -= 4;
if (len < 4)
goto trunc;
- ND_TCHECK2(bp[0], 4);
- njoin = EXTRACT_BE_16BITS(&bp[0]);
- nprune = EXTRACT_BE_16BITS(&bp[2]);
+ ND_TCHECK_4(bp);
+ njoin = EXTRACT_BE_U_2(bp);
+ nprune = EXTRACT_BE_U_2(bp + 2);
ND_PRINT((ndo, " joined: %d pruned: %d", njoin, nprune));
bp += 4;
len -= 4;
type = "Prune";
if (len < 6)
goto trunc;
- ND_TCHECK2(bp[0], 6);
+ ND_TCHECK_6(bp);
ND_PRINT((ndo, "\n\t%s %s%s%s%s/%d", type,
- (bp[0] & 0x01) ? "Sparse " : "Dense ",
- (bp[1] & 0x80) ? "WC " : "",
- (bp[1] & 0x40) ? "RP " : "SPT ",
- ipaddr_string(ndo, &bp[2]),
- bp[1] & 0x3f));
+ (EXTRACT_U_1(bp) & 0x01) ? "Sparse " : "Dense ",
+ (EXTRACT_U_1(bp + 1) & 0x80) ? "WC " : "",
+ (EXTRACT_U_1(bp + 1) & 0x40) ? "RP " : "SPT ",
+ ipaddr_string(ndo, bp + 2),
+ EXTRACT_U_1(bp + 1) & 0x3f));
bp += 6;
len -= 6;
}
ND_PRINT((ndo, " Sparse-Dense-mode"));
break;
default:
- ND_PRINT((ndo, " mode-%d", bp[8] >> 4));
+ ND_PRINT((ndo, " mode-%d", EXTRACT_U_1(bp + 8) >> 4));
break;
}
}
if (ndo->ndo_vflag) {
- ND_TCHECK2(bp[10],2);
+ ND_TCHECK_2(bp + 10);
ND_PRINT((ndo, " (Hold-time "));
- unsigned_relts_print(ndo, EXTRACT_BE_16BITS(&bp[10]));
+ unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 10));
ND_PRINT((ndo, ")"));
}
break;
case PIMV1_TYPE_REGISTER:
ND_TCHECK2(bp[8], 20); /* ip header */
- ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[20]),
- ipaddr_string(ndo, &bp[24])));
+ ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, bp + 20),
+ ipaddr_string(ndo, bp + 24)));
break;
case PIMV1_TYPE_REGISTER_STOP:
ND_TCHECK2(bp[12], sizeof(struct in_addr));
- ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[8]),
- ipaddr_string(ndo, &bp[12])));
+ ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, bp + 8),
+ ipaddr_string(ndo, bp + 12)));
break;
case PIMV1_TYPE_RP_REACHABILITY:
if (ndo->ndo_vflag) {
- ND_TCHECK2(bp[22], 2);
- ND_PRINT((ndo, " group %s", ipaddr_string(ndo, &bp[8])));
- if (EXTRACT_BE_32BITS(&bp[12]) != 0xffffffff)
- ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[12])));
- ND_PRINT((ndo, " RP %s hold ", ipaddr_string(ndo, &bp[16])));
- unsigned_relts_print(ndo, EXTRACT_BE_16BITS(&bp[22]));
+ ND_TCHECK_2(bp + 22);
+ ND_PRINT((ndo, " group %s", ipaddr_string(ndo, bp + 8)));
+ if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)
+ ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp + 12)));
+ ND_PRINT((ndo, " RP %s hold ", ipaddr_string(ndo, bp + 16)));
+ unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 22));
}
break;
case PIMV1_TYPE_ASSERT:
ND_TCHECK2(bp[16], sizeof(struct in_addr));
- ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[16]),
- ipaddr_string(ndo, &bp[8])));
- if (EXTRACT_BE_32BITS(&bp[12]) != 0xffffffff)
- ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[12])));
- ND_TCHECK2(bp[24], 4);
+ ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, bp + 16),
+ ipaddr_string(ndo, bp + 8)));
+ if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)
+ ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp + 12)));
+ ND_TCHECK_4(bp + 24);
ND_PRINT((ndo, " %s pref %d metric %d",
- (bp[20] & 0x80) ? "RP-tree" : "SPT",
- EXTRACT_BE_32BITS(&bp[20]) & 0x7fffffff,
- EXTRACT_BE_32BITS(&bp[24])));
+ (EXTRACT_U_1(bp + 20) & 0x80) ? "RP-tree" : "SPT",
+ EXTRACT_BE_U_4(bp + 20) & 0x7fffffff,
+ EXTRACT_BE_U_4(bp + 24)));
break;
case PIMV1_TYPE_JOIN_PRUNE:
case PIMV1_TYPE_GRAFT:
}
ND_TCHECK(bp[4]);
if ((bp[4] >> 4) != 1)
- ND_PRINT((ndo, " [v%d]", bp[4] >> 4));
+ ND_PRINT((ndo, " [v%d]", EXTRACT_U_1(bp + 4) >> 4));
return;
trunc:
ND_TCHECK(bp[1]);
numrps = bp[1];
- ND_TCHECK2(bp[2], 2);
+ ND_TCHECK_2(bp + 2);
ND_PRINT((ndo, " Hold "));
- hold = EXTRACT_BE_16BITS(&bp[2]);
+ hold = EXTRACT_BE_U_2(bp + 2);
if (hold)
- unsigned_relts_print(ndo, EXTRACT_BE_16BITS(&bp[2]));
+ unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
else
ND_PRINT((ndo, "FOREVER"));
if (len < 4)
goto trunc;
- ND_TCHECK2(bp[0], 4);
+ ND_TCHECK_4(bp);
ND_PRINT((ndo, " RP %s", ipaddr_string(ndo, bp)));
bp += 4;
len -= 4;
break;
}
if (bp[0] & 0xfc)
- ND_PRINT((ndo, " [rsvd=0x%02x]", bp[0] & 0xfc));
+ ND_PRINT((ndo, " [rsvd=0x%02x]", EXTRACT_U_1(bp) & 0xfc));
bp += 1;
len -= 1;
if (len < 1)
for (; nentries; nentries--) {
if (len < 6)
goto trunc;
- ND_TCHECK2(bp[0], 6);
- ND_PRINT((ndo, "%c%s%s/%d", s, bp[0] & 1 ? "!" : "",
- ipaddr_string(ndo, &bp[2]), bp[1]));
+ ND_TCHECK_6(bp);
+ ND_PRINT((ndo, "%c%s%s/%d", s, EXTRACT_U_1(bp) & 1 ? "!" : "",
+ ipaddr_string(ndo, bp + 2), EXTRACT_U_1(bp + 1)));
if (bp[0] & 0x02) {
ND_PRINT((ndo, " bidir"));
}
if (bp[0] & 0xfc) {
- ND_PRINT((ndo, "[rsvd=0x%02x]", bp[0] & 0xfc));
+ ND_PRINT((ndo, "[rsvd=0x%02x]", EXTRACT_U_1(bp) & 0xfc));
}
s = ',';
bp += 6; len -= 6;
if (!silent) {
ND_PRINT((ndo, "%s", ipaddr_string(ndo, bp + 2)));
if (bp[1] != 32)
- ND_PRINT((ndo, "/%u", bp[1]));
+ ND_PRINT((ndo, "/%u", EXTRACT_U_1(bp + 1)));
}
}
else if (af == AF_INET6) {
if (!silent) {
ND_PRINT((ndo, "%s", ip6addr_string(ndo, bp + 2)));
if (bp[1] != 128)
- ND_PRINT((ndo, "/%u", bp[1]));
+ ND_PRINT((ndo, "/%u", EXTRACT_U_1(bp + 1)));
}
}
if (bp[0] && !silent) {
if (at == pimv2_group) {
- ND_PRINT((ndo, "(0x%02x)", bp[0]));
+ ND_PRINT((ndo, "(0x%02x)", EXTRACT_U_1(bp)));
} else {
ND_PRINT((ndo, "(%s%s%s",
- bp[0] & 0x04 ? "S" : "",
- bp[0] & 0x02 ? "W" : "",
- bp[0] & 0x01 ? "R" : ""));
+ EXTRACT_U_1(bp) & 0x04 ? "S" : "",
+ EXTRACT_U_1(bp) & 0x02 ? "W" : "",
+ EXTRACT_U_1(bp) & 0x01 ? "R" : ""));
if (bp[0] & 0xf8) {
- ND_PRINT((ndo, "+0x%02x", bp[0] & 0xf8));
+ ND_PRINT((ndo, "+0x%02x", EXTRACT_U_1(bp) & 0xf8));
}
ND_PRINT((ndo, ")"));
}
if (len < 4)
goto trunc;
ND_TCHECK(pim->pim_cksum);
- ND_PRINT((ndo, ", cksum 0x%04x ", EXTRACT_BE_16BITS(&pim->pim_cksum)));
- if (EXTRACT_BE_16BITS(&pim->pim_cksum) == 0) {
+ ND_PRINT((ndo, ", cksum 0x%04x ", EXTRACT_BE_U_2(&pim->pim_cksum)));
+ if (EXTRACT_BE_U_2(&pim->pim_cksum) == 0) {
ND_PRINT((ndo, "(unverified)"));
} else {
if (PIM_TYPE(pim->pim_typever) == PIMV2_TYPE_REGISTER) {
while (len > 0) {
if (len < 4)
goto trunc;
- ND_TCHECK2(bp[0], 4);
- otype = EXTRACT_BE_16BITS(&bp[0]);
- olen = EXTRACT_BE_16BITS(&bp[2]);
+ ND_TCHECK_4(bp);
+ otype = EXTRACT_BE_U_2(bp);
+ olen = EXTRACT_BE_U_2(bp + 2);
ND_PRINT((ndo, "\n\t %s Option (%u), length %u, Value: ",
tok2str(pimv2_hello_option_values, "Unknown", otype),
otype,
ND_PRINT((ndo, "ERROR: Option Length != 2 Bytes (%u)", olen));
} else {
unsigned_relts_print(ndo,
- EXTRACT_BE_16BITS(bp));
+ EXTRACT_BE_U_2(bp));
}
break;
} else {
char t_bit;
uint16_t lan_delay, override_interval;
- lan_delay = EXTRACT_BE_16BITS(bp);
- override_interval = EXTRACT_BE_16BITS(bp + 2);
+ lan_delay = EXTRACT_BE_U_2(bp);
+ override_interval = EXTRACT_BE_U_2(bp + 2);
t_bit = (lan_delay & 0x8000)? 1 : 0;
lan_delay &= ~0x8000;
ND_PRINT((ndo, "\n\t T-bit=%d, LAN delay %dms, Override interval %dms",
ND_PRINT((ndo, "Bi-Directional Capability (Old)"));
break;
case 4:
- ND_PRINT((ndo, "%u", EXTRACT_BE_32BITS(bp)));
+ ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(bp)));
break;
default:
ND_PRINT((ndo, "ERROR: Option Length != 4 Bytes (%u)", olen));
if (olen != 4) {
ND_PRINT((ndo, "ERROR: Option Length != 4 Bytes (%u)", olen));
} else {
- ND_PRINT((ndo, "0x%08x", EXTRACT_BE_32BITS(bp)));
+ ND_PRINT((ndo, "0x%08x", EXTRACT_BE_U_4(bp)));
}
break;
if (olen != 4) {
ND_PRINT((ndo, "ERROR: Option Length != 4 Bytes (%u)", olen));
} else {
- ND_PRINT((ndo, "v%d", *bp));
+ ND_PRINT((ndo, "v%d", EXTRACT_U_1(bp)));
if (*(bp+1) != 0) {
ND_PRINT((ndo, ", interval "));
unsigned_relts_print(ndo, *(bp+1));
}
- if (EXTRACT_BE_16BITS(bp + 2) != 0) {
- ND_PRINT((ndo, " ?0x%04x?", EXTRACT_BE_16BITS(bp + 2)));
+ if (EXTRACT_BE_U_2(bp + 2) != 0) {
+ ND_PRINT((ndo, " ?0x%04x?", EXTRACT_BE_U_2(bp + 2)));
}
}
break;
ND_PRINT((ndo, ", Flags [ %s ]\n\t",
tok2str(pimv2_register_flag_values,
"none",
- EXTRACT_BE_32BITS(bp))));
+ EXTRACT_BE_U_4(bp))));
bp += 4; len -= 4;
/* encapsulated multicast packet */
}
if (len < 4)
goto trunc;
- ND_TCHECK2(*bp, 4);
+ ND_TCHECK_4(bp);
ngroup = bp[1];
- holdtime = EXTRACT_BE_16BITS(&bp[2]);
+ holdtime = EXTRACT_BE_U_2(bp + 2);
ND_PRINT((ndo, "\n\t %u group(s)", ngroup));
if (PIM_TYPE(pim->pim_typever) != 7) { /*not for Graft-ACK*/
ND_PRINT((ndo, ", holdtime: "));
bp += advance; len -= advance;
if (len < 4)
goto trunc;
- ND_TCHECK2(*bp, 4);
- njoin = EXTRACT_BE_16BITS(&bp[0]);
- nprune = EXTRACT_BE_16BITS(&bp[2]);
+ ND_TCHECK_4(bp);
+ njoin = EXTRACT_BE_U_2(bp);
+ nprune = EXTRACT_BE_U_2(bp + 2);
ND_PRINT((ndo, ", joined sources: %u, pruned sources: %u", njoin, nprune));
bp += 4; len -= 4;
for (j = 0; j < njoin; j++) {
/* Fragment Tag, Hash Mask len, and BSR-priority */
if (len < 2)
goto trunc;
- ND_TCHECK_16BITS(bp);
- ND_PRINT((ndo, " tag=%x", EXTRACT_BE_16BITS(bp)));
+ ND_TCHECK_2(bp);
+ ND_PRINT((ndo, " tag=%x", EXTRACT_BE_U_2(bp)));
bp += 2;
len -= 2;
if (len < 1)
goto trunc;
ND_TCHECK(bp[0]);
- ND_PRINT((ndo, " hashmlen=%d", bp[0]));
+ ND_PRINT((ndo, " hashmlen=%d", EXTRACT_U_1(bp)));
if (len < 2)
goto trunc;
ND_TCHECK(bp[2]);
- ND_PRINT((ndo, " BSRprio=%d", bp[1]));
+ ND_PRINT((ndo, " BSRprio=%d", EXTRACT_U_1(bp + 1)));
bp += 2;
len -= 2;
if (len < 1)
goto trunc;
ND_TCHECK(bp[0]);
- ND_PRINT((ndo, " RPcnt=%d", bp[0]));
+ ND_PRINT((ndo, " RPcnt=%d", EXTRACT_U_1(bp)));
if (len < 2)
goto trunc;
ND_TCHECK(bp[1]);
- ND_PRINT((ndo, " FRPcnt=%d", frpcnt = bp[1]));
+ ND_PRINT((ndo, " FRPcnt=%d", frpcnt = EXTRACT_U_1(bp + 1)));
if (len < 4)
goto trunc;
bp += 4;
if (len < 2)
goto trunc;
- ND_TCHECK_16BITS(bp);
+ ND_TCHECK_2(bp);
ND_PRINT((ndo, ",holdtime="));
unsigned_relts_print(ndo,
- EXTRACT_BE_16BITS(bp));
+ EXTRACT_BE_U_2(bp));
if (len < 3)
goto trunc;
ND_TCHECK(bp[2]);
- ND_PRINT((ndo, ",prio=%d", bp[2]));
+ ND_PRINT((ndo, ",prio=%d", EXTRACT_U_1(bp + 2)));
if (len < 4)
goto trunc;
bp += 4;
bp += advance; len -= advance;
if (len < 8)
goto trunc;
- ND_TCHECK2(*bp, 8);
+ ND_TCHECK_8(bp);
if (bp[0] & 0x80)
ND_PRINT((ndo, " RPT"));
- ND_PRINT((ndo, " pref=%u", EXTRACT_BE_32BITS(&bp[0]) & 0x7fffffff));
- ND_PRINT((ndo, " metric=%u", EXTRACT_BE_32BITS(&bp[4])));
+ ND_PRINT((ndo, " pref=%u", EXTRACT_BE_U_4(bp) & 0x7fffffff));
+ ND_PRINT((ndo, " metric=%u", EXTRACT_BE_U_4(bp + 4)));
break;
case PIMV2_TYPE_CANDIDATE_RP:
if (len < 1)
goto trunc;
ND_TCHECK(bp[0]);
- ND_PRINT((ndo, " prefix-cnt=%d", bp[0]));
+ ND_PRINT((ndo, " prefix-cnt=%d", EXTRACT_U_1(bp)));
pfxcnt = bp[0];
if (len < 2)
goto trunc;
ND_TCHECK(bp[1]);
- ND_PRINT((ndo, " prio=%d", bp[1]));
+ ND_PRINT((ndo, " prio=%d", EXTRACT_U_1(bp + 1)));
if (len < 4)
goto trunc;
- ND_TCHECK_16BITS(&bp[2]);
+ ND_TCHECK_2(bp + 2);
ND_PRINT((ndo, " holdtime="));
- unsigned_relts_print(ndo, EXTRACT_BE_16BITS(&bp[2]));
+ unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
bp += 4;
len -= 4;
len -= advance;
if (len < 2)
goto trunc;
- ND_TCHECK_16BITS(bp);
+ ND_TCHECK_2(bp);
ND_PRINT((ndo, " TUNR "));
- unsigned_relts_print(ndo, EXTRACT_BE_16BITS(bp));
+ unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp));
break;
projects / tcpdump / blobdiff