/* \summary: Pragmatic General Multicast (PGM) printer */
-#ifdef HAVE_CONFIG_H
+/* specification: RFC 3208
+
+ Plus https://dl.acm.org/doi/pdf/10.1145/347057.347390 for PGMCC,
+ whence the ACK packet type comes; there are some I-Ds for PGMCC,
+ draft-ietf-rmt-bb-pgmcc-00 through draft-ietf-rmt-bb-pgmcc-03,
+ but none of them give any description of the packet-level
+ changes to PGM, unlike the paper in question, which merely gives
+ an *insufficient* description of said changes. In particular,
+ it doesn't indicate what the packet type code for ACK is.
+
+ Luigi Rizzo's PGMCC code for FreeBSD, at
+
+ https://web.archive.org/web/20020302084503/http://info.iet.unipi.it/~luigi/pgm-code/
+
+ uses 0x0b (11) for ACK.
+
+ A capture file attached to
+
+ https://gitlab.com/wireshark/wireshark/-/issues/4798
+
+ has packets that use 0x0d for ACK, as does the Wireshark dissector
+ for PGM, and as does OpenPGM at https://github.com/steve-o/openpgm.
+ It may be that some proprietary PGMCC implementations, such as
+ SmartPGM, do so as well.
+
+ We use *both*, treating *either one* as a PGMCC ACK, pending
+ more information, such as an answer to
+
+ https://github.com/steve-o/openpgm/issues/75.
+
+ */
+
#include <config.h>
-#endif
#include "netdissect-stdinc.h"
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "extract.h"
#include "addrtoname.h"
struct pgm_poll {
nd_uint32_t pgmp_seq;
nd_uint16_t pgmp_round;
+ nd_uint16_t pgmp_subtype;
+ nd_uint16_t pgmp_nla_afi;
nd_uint16_t pgmp_reserved;
+ /* ... uint8_t pgmp_nla[0]; */
/* ... options */
};
struct pgm_polr {
nd_uint32_t pgmp_seq;
nd_uint16_t pgmp_round;
- nd_uint16_t pgmp_subtype;
- nd_uint16_t pgmp_nla_afi;
nd_uint16_t pgmp_reserved;
- /* ... uint8_t pgmp_nla[0]; */
/* ... options */
};
};
typedef enum _pgm_type {
- PGM_SPM = 0, /* source path message */
- PGM_POLL = 1, /* POLL Request */
- PGM_POLR = 2, /* POLL Response */
- PGM_ODATA = 4, /* original data */
- PGM_RDATA = 5, /* repair data */
- PGM_NAK = 8, /* NAK */
- PGM_NULLNAK = 9, /* Null NAK */
- PGM_NCF = 10, /* NAK Confirmation */
- PGM_ACK = 11, /* ACK for congestion control */
- PGM_SPMR = 12, /* SPM request */
- PGM_MAX = 255
+ PGM_SPM = 0x00, /* source path message */
+ PGM_POLL = 0x01, /* POLL Request */
+ PGM_POLR = 0x02, /* POLL Response */
+ PGM_ODATA = 0x04, /* original data */
+ PGM_RDATA = 0x05, /* repair data */
+ PGM_NAK = 0x08, /* NAK */
+ PGM_NULLNAK = 0x09, /* Null NAK */
+ PGM_NCF = 0x0a, /* NAK Confirmation */
+ PGM_ACK = 0x0b, /* ACK for congestion control? */
+ PGM_SPMR = 0x0c, /* SPM request */
+ PGM_ACK2 = 0x0d, /* Also ACK for congestion control? */
} pgm_type;
#define PGM_OPT_BIT_PRESENT 0x01
{
const struct pgm_header *pgm;
const struct ip *ip;
- char ch;
uint8_t pgm_type_val;
uint16_t sport, dport;
u_int nla_afnum;
ip6 = (const struct ip6_hdr *)bp2;
else
ip6 = NULL;
- ch = '\0';
if (!ND_TTEST_2(pgm->pgm_dport)) {
if (ip6) {
- ND_PRINT("%s > %s: [|pgm]",
- ip6addr_string(ndo, ip6->ip6_src),
- ip6addr_string(ndo, ip6->ip6_dst));
+ ND_PRINT("%s > %s:",
+ GET_IP6ADDR_STRING(ip6->ip6_src),
+ GET_IP6ADDR_STRING(ip6->ip6_dst));
} else {
- ND_PRINT("%s > %s: [|pgm]",
- ipaddr_string(ndo, ip->ip_src),
- ipaddr_string(ndo, ip->ip_dst));
+ ND_PRINT("%s > %s:",
+ GET_IPADDR_STRING(ip->ip_src),
+ GET_IPADDR_STRING(ip->ip_dst));
}
- return;
+ nd_trunc_longjmp(ndo);
}
- sport = EXTRACT_BE_U_2(pgm->pgm_sport);
- dport = EXTRACT_BE_U_2(pgm->pgm_dport);
+ sport = GET_BE_U_2(pgm->pgm_sport);
+ dport = GET_BE_U_2(pgm->pgm_dport);
if (ip6) {
- if (EXTRACT_U_1(ip6->ip6_nxt) == IPPROTO_PGM) {
+ if (GET_U_1(ip6->ip6_nxt) == IPPROTO_PGM) {
ND_PRINT("%s.%s > %s.%s: ",
- ip6addr_string(ndo, ip6->ip6_src),
+ GET_IP6ADDR_STRING(ip6->ip6_src),
tcpport_string(ndo, sport),
- ip6addr_string(ndo, ip6->ip6_dst),
+ GET_IP6ADDR_STRING(ip6->ip6_dst),
tcpport_string(ndo, dport));
} else {
ND_PRINT("%s > %s: ",
tcpport_string(ndo, sport), tcpport_string(ndo, dport));
}
} else {
- if (EXTRACT_U_1(ip->ip_p) == IPPROTO_PGM) {
+ if (GET_U_1(ip->ip_p) == IPPROTO_PGM) {
ND_PRINT("%s.%s > %s.%s: ",
- ipaddr_string(ndo, ip->ip_src),
+ GET_IPADDR_STRING(ip->ip_src),
tcpport_string(ndo, sport),
- ipaddr_string(ndo, ip->ip_dst),
+ GET_IPADDR_STRING(ip->ip_dst),
tcpport_string(ndo, dport));
} else {
ND_PRINT("%s > %s: ",
ND_TCHECK_SIZE(pgm);
- ND_PRINT("PGM, length %u", EXTRACT_BE_U_2(pgm->pgm_length));
+ ND_PRINT("PGM, length %u", GET_BE_U_2(pgm->pgm_length));
if (!ndo->ndo_vflag)
return;
- pgm_type_val = EXTRACT_U_1(pgm->pgm_type);
+ pgm_type_val = GET_U_1(pgm->pgm_type);
ND_PRINT(" 0x%02x%02x%02x%02x%02x%02x ",
pgm->pgm_gsid[0],
pgm->pgm_gsid[1],
pgm->pgm_gsid[3],
pgm->pgm_gsid[4],
pgm->pgm_gsid[5]);
+ bp += sizeof(struct pgm_header);
switch (pgm_type_val) {
case PGM_SPM: {
const struct pgm_spm *spm;
- spm = (const struct pgm_spm *)(pgm + 1);
+ spm = (const struct pgm_spm *)bp;
ND_TCHECK_SIZE(spm);
- bp = (const u_char *) (spm + 1);
+ bp += sizeof(struct pgm_spm);
- switch (EXTRACT_BE_U_2(spm->pgms_nla_afi)) {
- case AFNUM_INET:
+ switch (GET_BE_U_2(spm->pgms_nla_afi)) {
+ case AFNUM_IP:
ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
addrtostr(bp, nla_buf, sizeof(nla_buf));
bp += sizeof(nd_ipv4);
break;
- case AFNUM_INET6:
+ case AFNUM_IP6:
ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
addrtostr6(bp, nla_buf, sizeof(nla_buf));
bp += sizeof(nd_ipv6);
break;
default:
- goto trunc;
- break;
+ goto invalid;
}
ND_PRINT("SPM seq %u trail %u lead %u nla %s",
- EXTRACT_BE_U_4(spm->pgms_seq),
- EXTRACT_BE_U_4(spm->pgms_trailseq),
- EXTRACT_BE_U_4(spm->pgms_leadseq),
+ GET_BE_U_4(spm->pgms_seq),
+ GET_BE_U_4(spm->pgms_trailseq),
+ GET_BE_U_4(spm->pgms_leadseq),
nla_buf);
break;
}
case PGM_POLL: {
- const struct pgm_poll *poll_msg;
-
- poll_msg = (const struct pgm_poll *)(pgm + 1);
- ND_TCHECK_SIZE(poll_msg);
- ND_PRINT("POLL seq %u round %u",
- EXTRACT_BE_U_4(poll_msg->pgmp_seq),
- EXTRACT_BE_U_2(poll_msg->pgmp_round));
- bp = (const u_char *) (poll_msg + 1);
- break;
- }
- case PGM_POLR: {
- const struct pgm_polr *polr;
+ const struct pgm_poll *pgm_poll;
uint32_t ivl, rnd, mask;
- polr = (const struct pgm_polr *)(pgm + 1);
- ND_TCHECK_SIZE(polr);
- bp = (const u_char *) (polr + 1);
+ pgm_poll = (const struct pgm_poll *)bp;
+ ND_TCHECK_SIZE(pgm_poll);
+ bp += sizeof(struct pgm_poll);
- switch (EXTRACT_BE_U_2(polr->pgmp_nla_afi)) {
- case AFNUM_INET:
+ switch (GET_BE_U_2(pgm_poll->pgmp_nla_afi)) {
+ case AFNUM_IP:
ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
addrtostr(bp, nla_buf, sizeof(nla_buf));
bp += sizeof(nd_ipv4);
break;
- case AFNUM_INET6:
+ case AFNUM_IP6:
ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
addrtostr6(bp, nla_buf, sizeof(nla_buf));
bp += sizeof(nd_ipv6);
break;
default:
- goto trunc;
- break;
+ goto invalid;
}
- ND_TCHECK_LEN(bp, sizeof(uint32_t));
- ivl = EXTRACT_BE_U_4(bp);
+ ivl = GET_BE_U_4(bp);
bp += sizeof(uint32_t);
- ND_TCHECK_LEN(bp, sizeof(uint32_t));
- rnd = EXTRACT_BE_U_4(bp);
+ rnd = GET_BE_U_4(bp);
bp += sizeof(uint32_t);
- ND_TCHECK_LEN(bp, sizeof(uint32_t));
- mask = EXTRACT_BE_U_4(bp);
+ mask = GET_BE_U_4(bp);
bp += sizeof(uint32_t);
- ND_PRINT("POLR seq %u round %u nla %s ivl %u rnd 0x%08x "
- "mask 0x%08x", EXTRACT_BE_U_4(polr->pgmp_seq),
- EXTRACT_BE_U_2(polr->pgmp_round), nla_buf, ivl, rnd, mask);
+ ND_PRINT("POLL seq %u round %u nla %s ivl %u rnd 0x%08x "
+ "mask 0x%08x", GET_BE_U_4(pgm_poll->pgmp_seq),
+ GET_BE_U_2(pgm_poll->pgmp_round), nla_buf, ivl, rnd,
+ mask);
+ break;
+ }
+ case PGM_POLR: {
+ const struct pgm_polr *polr_msg;
+
+ polr_msg = (const struct pgm_polr *)bp;
+ ND_TCHECK_SIZE(polr_msg);
+ ND_PRINT("POLR seq %u round %u",
+ GET_BE_U_4(polr_msg->pgmp_seq),
+ GET_BE_U_2(polr_msg->pgmp_round));
+ bp += sizeof(struct pgm_polr);
break;
}
case PGM_ODATA: {
const struct pgm_data *odata;
- odata = (const struct pgm_data *)(pgm + 1);
- ND_TCHECK_SIZE(odata);
+ odata = (const struct pgm_data *)bp;
ND_PRINT("ODATA trail %u seq %u",
- EXTRACT_BE_U_4(odata->pgmd_trailseq),
- EXTRACT_BE_U_4(odata->pgmd_seq));
- bp = (const u_char *) (odata + 1);
+ GET_BE_U_4(odata->pgmd_trailseq),
+ GET_BE_U_4(odata->pgmd_seq));
+ bp += sizeof(struct pgm_data);
break;
}
case PGM_RDATA: {
const struct pgm_data *rdata;
- rdata = (const struct pgm_data *)(pgm + 1);
- ND_TCHECK_SIZE(rdata);
+ rdata = (const struct pgm_data *)bp;
ND_PRINT("RDATA trail %u seq %u",
- EXTRACT_BE_U_4(rdata->pgmd_trailseq),
- EXTRACT_BE_U_4(rdata->pgmd_seq));
- bp = (const u_char *) (rdata + 1);
+ GET_BE_U_4(rdata->pgmd_trailseq),
+ GET_BE_U_4(rdata->pgmd_seq));
+ bp += sizeof(struct pgm_data);
break;
}
const struct pgm_nak *nak;
char source_buf[INET6_ADDRSTRLEN], group_buf[INET6_ADDRSTRLEN];
- nak = (const struct pgm_nak *)(pgm + 1);
+ nak = (const struct pgm_nak *)bp;
ND_TCHECK_SIZE(nak);
- bp = (const u_char *) (nak + 1);
+ bp += sizeof(struct pgm_nak);
/*
* Skip past the source, saving info along the way
* and stopping if we don't have enough.
*/
- switch (EXTRACT_BE_U_2(nak->pgmn_source_afi)) {
- case AFNUM_INET:
+ switch (GET_BE_U_2(nak->pgmn_source_afi)) {
+ case AFNUM_IP:
ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
addrtostr(bp, source_buf, sizeof(source_buf));
bp += sizeof(nd_ipv4);
break;
- case AFNUM_INET6:
+ case AFNUM_IP6:
ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
addrtostr6(bp, source_buf, sizeof(source_buf));
bp += sizeof(nd_ipv6);
break;
default:
- goto trunc;
- break;
+ goto invalid;
}
/*
* and stopping if we don't have enough.
*/
bp += (2 * sizeof(uint16_t));
- ND_TCHECK_2(bp);
- switch (EXTRACT_BE_U_2(bp)) {
- case AFNUM_INET:
+ switch (GET_BE_U_2(bp)) {
+ case AFNUM_IP:
ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
addrtostr(bp, group_buf, sizeof(group_buf));
bp += sizeof(nd_ipv4);
break;
- case AFNUM_INET6:
+ case AFNUM_IP6:
ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
addrtostr6(bp, group_buf, sizeof(group_buf));
bp += sizeof(nd_ipv6);
break;
default:
- goto trunc;
- break;
+ goto invalid;
}
/*
break;
}
ND_PRINT("(%s -> %s), seq %u",
- source_buf, group_buf, EXTRACT_BE_U_4(nak->pgmn_seq));
+ source_buf, group_buf, GET_BE_U_4(nak->pgmn_seq));
break;
}
- case PGM_ACK: {
+ case PGM_ACK:
+ case PGM_ACK2: {
const struct pgm_ack *ack;
- ack = (const struct pgm_ack *)(pgm + 1);
+ ack = (const struct pgm_ack *)bp;
ND_TCHECK_SIZE(ack);
ND_PRINT("ACK seq %u",
- EXTRACT_BE_U_4(ack->pgma_rx_max_seq));
- bp = (const u_char *) (ack + 1);
+ GET_BE_U_4(ack->pgma_rx_max_seq));
+ bp += sizeof(struct pgm_ack);
break;
}
break;
}
- if (EXTRACT_U_1(pgm->pgm_options) & PGM_OPT_BIT_PRESENT) {
+ if (GET_U_1(pgm->pgm_options) & PGM_OPT_BIT_PRESENT) {
/*
* make sure there's enough for the first option header
*/
- if (!ND_TTEST_LEN(bp, PGM_MIN_OPT_LEN)) {
- nd_print_trunc(ndo);
- return;
- }
+ ND_TCHECK_LEN(bp, PGM_MIN_OPT_LEN);
/*
* That option header MUST be an OPT_LENGTH option
* (see the first paragraph of section 9.1 in RFC 3208).
*/
- opt_type = EXTRACT_U_1(bp);
+ opt_type = GET_U_1(bp);
bp++;
if ((opt_type & PGM_OPT_MASK) != PGM_OPT_LENGTH) {
ND_PRINT("[First option bad, should be PGM_OPT_LENGTH, is %u]", opt_type & PGM_OPT_MASK);
return;
}
- opt_len = EXTRACT_U_1(bp);
+ opt_len = GET_U_1(bp);
bp++;
if (opt_len != 4) {
ND_PRINT("[Bad OPT_LENGTH option, length %u != 4]", opt_len);
return;
}
- opts_len = EXTRACT_BE_U_2(bp);
+ opts_len = GET_BE_U_2(bp);
bp += sizeof(uint16_t);
if (opts_len < 4) {
ND_PRINT("[Bad total option length %u < 4]", opts_len);
ND_PRINT("[Total option length leaves no room for final option]");
return;
}
- if (!ND_TTEST_2(bp)) {
- nd_print_trunc(ndo);
- return;
- }
- opt_type = EXTRACT_U_1(bp);
+ opt_type = GET_U_1(bp);
bp++;
- opt_len = EXTRACT_U_1(bp);
+ opt_len = GET_U_1(bp);
bp++;
if (opt_len < PGM_MIN_OPT_LEN) {
ND_PRINT("[Bad option, length %u < %u]", opt_len,
ND_PRINT("[Total option length leaves no room for final option]");
return;
}
- if (!ND_TTEST_LEN(bp, opt_len - 2)) {
- nd_print_trunc(ndo);
- return;
- }
+ ND_TCHECK_LEN(bp, opt_len - 2);
switch (opt_type & PGM_OPT_MASK) {
case PGM_OPT_LENGTH:
opt_len, PGM_OPT_LENGTH_LEN);
return;
}
- ND_PRINT(" OPTS LEN (extra?) %u", EXTRACT_BE_U_2(bp));
+ ND_PRINT(" OPTS LEN (extra?) %u", GET_BE_U_2(bp));
bp += 2;
opts_len -= PGM_OPT_LENGTH_LEN;
break;
return;
}
bp += 2;
- seq = EXTRACT_BE_U_4(bp);
+ seq = GET_BE_U_4(bp);
bp += 4;
- offset = EXTRACT_BE_U_4(bp);
+ offset = GET_BE_U_4(bp);
bp += 4;
- len = EXTRACT_BE_U_4(bp);
+ len = GET_BE_U_4(bp);
bp += 4;
ND_PRINT(" FRAG seq %u off %u len %u", seq, offset, len);
opts_len -= PGM_OPT_FRAGMENT_LEN;
ND_PRINT("[Option length not a multiple of 4]");
return;
}
- ND_TCHECK_4(bp);
- ND_PRINT(" %u", EXTRACT_BE_U_4(bp));
+ ND_PRINT(" %u", GET_BE_U_4(bp));
bp += 4;
opt_len -= 4;
opts_len -= 4;
return;
}
bp += 2;
- seq = EXTRACT_BE_U_4(bp);
+ seq = GET_BE_U_4(bp);
bp += 4;
ND_PRINT(" JOIN %u", seq);
opts_len -= PGM_OPT_JOIN_LEN;
return;
}
bp += 2;
- offset = EXTRACT_BE_U_4(bp);
+ offset = GET_BE_U_4(bp);
bp += 4;
- seq = EXTRACT_BE_U_4(bp);
+ seq = GET_BE_U_4(bp);
bp += 4;
ND_PRINT(" BACKOFF ivl %u ivlseq %u", offset, seq);
opts_len -= PGM_OPT_NAK_BO_IVL_LEN;
return;
}
bp += 2;
- offset = EXTRACT_BE_U_4(bp);
+ offset = GET_BE_U_4(bp);
bp += 4;
- seq = EXTRACT_BE_U_4(bp);
+ seq = GET_BE_U_4(bp);
bp += 4;
ND_PRINT(" BACKOFF max %u min %u", offset, seq);
opts_len -= PGM_OPT_NAK_BO_RNG_LEN;
return;
}
bp += 2;
- nla_afnum = EXTRACT_BE_U_2(bp);
+ nla_afnum = GET_BE_U_2(bp);
bp += 2+2;
switch (nla_afnum) {
- case AFNUM_INET:
+ case AFNUM_IP:
if (opt_len != PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv4)) {
ND_PRINT("[Bad OPT_REDIRECT option, length %u != %u + address size]",
opt_len, PGM_OPT_REDIRECT_FIXED_LEN);
bp += sizeof(nd_ipv4);
opts_len -= PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv4);
break;
- case AFNUM_INET6:
+ case AFNUM_IP6:
if (opt_len != PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv6)) {
ND_PRINT("[Bad OPT_REDIRECT option, length %u != %u + address size]",
- PGM_OPT_REDIRECT_FIXED_LEN, opt_len);
+ opt_len, PGM_OPT_REDIRECT_FIXED_LEN);
return;
}
ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
opts_len -= PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv6);
break;
default:
- goto trunc;
- break;
+ goto invalid;
}
ND_PRINT(" REDIRECT %s", nla_buf);
return;
}
bp += 2;
- len = EXTRACT_BE_U_4(bp);
+ len = GET_BE_U_4(bp);
bp += 4;
ND_PRINT(" PARITY MAXTGS %u", len);
opts_len -= PGM_OPT_PARITY_PRM_LEN;
return;
}
bp += 2;
- seq = EXTRACT_BE_U_4(bp);
+ seq = GET_BE_U_4(bp);
bp += 4;
ND_PRINT(" PARITY GROUP %u", seq);
opts_len -= PGM_OPT_PARITY_GRP_LEN;
return;
}
bp += 2;
- len = EXTRACT_BE_U_4(bp);
+ len = GET_BE_U_4(bp);
bp += 4;
ND_PRINT(" PARITY ATGS %u", len);
opts_len -= PGM_OPT_CURR_TGSIZE_LEN;
case PGM_OPT_PATH_NLA:
ND_PRINT(" PATH_NLA [%u]", opt_len);
- bp += opt_len;
+ bp += opt_len - 2;
opts_len -= opt_len;
break;
case PGM_OPT_CR:
ND_PRINT(" CR");
- bp += opt_len;
+ bp += opt_len - 2;
opts_len -= opt_len;
break;
return;
}
bp += 2;
- offset = EXTRACT_BE_U_4(bp);
+ offset = GET_BE_U_4(bp);
bp += 4;
- nla_afnum = EXTRACT_BE_U_2(bp);
+ nla_afnum = GET_BE_U_2(bp);
bp += 2+2;
switch (nla_afnum) {
- case AFNUM_INET:
+ case AFNUM_IP:
if (opt_len != PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv4)) {
ND_PRINT("[Bad OPT_PGMCC_DATA option, length %u != %u + address size]",
opt_len, PGM_OPT_PGMCC_DATA_FIXED_LEN);
bp += sizeof(nd_ipv4);
opts_len -= PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv4);
break;
- case AFNUM_INET6:
+ case AFNUM_IP6:
if (opt_len != PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv6)) {
ND_PRINT("[Bad OPT_PGMCC_DATA option, length %u != %u + address size]",
opt_len, PGM_OPT_PGMCC_DATA_FIXED_LEN);
opts_len -= PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv6);
break;
default:
- goto trunc;
- break;
+ goto invalid;
}
ND_PRINT(" PGMCC DATA %u %s", offset, nla_buf);
return;
}
bp += 2;
- offset = EXTRACT_BE_U_4(bp);
+ offset = GET_BE_U_4(bp);
bp += 4;
- nla_afnum = EXTRACT_BE_U_2(bp);
+ nla_afnum = GET_BE_U_2(bp);
bp += 2+2;
switch (nla_afnum) {
- case AFNUM_INET:
+ case AFNUM_IP:
if (opt_len != PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv4)) {
ND_PRINT("[Bad OPT_PGMCC_FEEDBACK option, length %u != %u + address size]",
opt_len, PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN);
bp += sizeof(nd_ipv4);
opts_len -= PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv4);
break;
- case AFNUM_INET6:
+ case AFNUM_IP6:
if (opt_len != PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv6)) {
ND_PRINT("[Bad OPT_PGMCC_FEEDBACK option, length %u != %u + address size]",
opt_len, PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN);
opts_len -= PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv6);
break;
default:
- goto trunc;
- break;
+ goto invalid;
}
ND_PRINT(" PGMCC FEEDBACK %u %s", offset, nla_buf);
default:
ND_PRINT(" OPT_%02X [%u] ", opt_type, opt_len);
- bp += opt_len;
+ bp += opt_len - 2;
opts_len -= opt_len;
break;
}
if (ndo->ndo_packettype == PT_PGM_ZMTP1 &&
(pgm_type_val == PGM_ODATA || pgm_type_val == PGM_RDATA))
zmtp1_datagram_print(ndo, bp,
- EXTRACT_BE_U_2(pgm->pgm_length));
+ GET_BE_U_2(pgm->pgm_length));
return;
-
-trunc:
- nd_print_trunc(ndo);
- if (ch != '\0')
- ND_PRINT(">");
+invalid:
+ nd_print_invalid(ndo);
}
projects / tcpdump / blobdiff