*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include "netdissect.h"
#include "addrtoname.h"
#define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000)
#endif
-static const char tstr[] = "[|igmp]";
/* (following from ipmulti/mrouted/prune.h) */
* beginning, followed by one tr_resp for each hop taken.
*/
struct tr_resp {
- uint32_t tr_qarr; /* query arrival time */
- uint32_t tr_inaddr; /* incoming interface address */
- uint32_t tr_outaddr; /* outgoing interface address */
- uint32_t tr_rmtaddr; /* parent address in source tree */
- uint32_t tr_vifin; /* input packet count on interface */
- uint32_t tr_vifout; /* output packet count on interface */
- uint32_t tr_pktcnt; /* total incoming packets for src-grp */
- uint8_t tr_rproto; /* routing proto deployed on router */
- uint8_t tr_fttl; /* ttl required to forward on outvif */
- uint8_t tr_smask; /* subnet mask for src addr */
- uint8_t tr_rflags; /* forwarding error codes */
+ nd_uint32_t tr_qarr; /* query arrival time */
+ nd_uint32_t tr_inaddr; /* incoming interface address */
+ nd_uint32_t tr_outaddr; /* outgoing interface address */
+ nd_uint32_t tr_rmtaddr; /* parent address in source tree */
+ nd_uint32_t tr_vifin; /* input packet count on interface */
+ nd_uint32_t tr_vifout; /* output packet count on interface */
+ nd_uint32_t tr_pktcnt; /* total incoming packets for src-grp */
+ nd_uint8_t tr_rproto; /* routing proto deployed on router */
+ nd_uint8_t tr_fttl; /* ttl required to forward on outvif */
+ nd_uint8_t tr_smask; /* subnet mask for src addr */
+ nd_uint8_t tr_rflags; /* forwarding error codes */
};
/* defs within mtrace */
static void
print_mtrace(netdissect_options *ndo,
- register const u_char *bp, register u_int len)
+ const char *typename,
+ const u_char *bp, u_int len)
{
- register const struct tr_query *tr = (const struct tr_query *)(bp + 8);
+ const struct tr_query *tr = (const struct tr_query *)(bp + 8);
- ND_TCHECK(*tr);
if (len < 8 + sizeof (struct tr_query)) {
- ND_PRINT((ndo, " [invalid len %d]", len));
+ ND_PRINT(" [invalid len %u]", len);
return;
}
- ND_PRINT((ndo, "mtrace %u: %s to %s reply-to %s",
- EXTRACT_BE_U_3(tr->tr_qid),
- ipaddr_string(ndo, tr->tr_src), ipaddr_string(ndo, tr->tr_dst),
- ipaddr_string(ndo, tr->tr_raddr)));
- if (IN_CLASSD(EXTRACT_BE_U_4(tr->tr_raddr)))
- ND_PRINT((ndo, " with-ttl %u", EXTRACT_U_1(&tr->tr_rttl)));
- return;
-trunc:
- ND_PRINT((ndo, "%s", tstr));
-}
-
-static void
-print_mresp(netdissect_options *ndo,
- register const u_char *bp, register u_int len)
-{
- register const struct tr_query *tr = (const struct tr_query *)(bp + 8);
-
- ND_TCHECK(*tr);
- if (len < 8 + sizeof (struct tr_query)) {
- ND_PRINT((ndo, " [invalid len %d]", len));
- return;
- }
- ND_PRINT((ndo, "mresp %u: %s to %s reply-to %s",
- EXTRACT_BE_U_3(tr->tr_qid),
- ipaddr_string(ndo, tr->tr_src), ipaddr_string(ndo, tr->tr_dst),
- ipaddr_string(ndo, tr->tr_raddr)));
- if (IN_CLASSD(EXTRACT_BE_U_4(tr->tr_raddr)))
- ND_PRINT((ndo, " with-ttl %u", EXTRACT_U_1(&tr->tr_rttl)));
- return;
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ ND_PRINT("%s %u: %s to %s reply-to %s",
+ typename,
+ GET_BE_U_3(tr->tr_qid),
+ GET_IPADDR_STRING(tr->tr_src), GET_IPADDR_STRING(tr->tr_dst),
+ GET_IPADDR_STRING(tr->tr_raddr));
+ if (IN_CLASSD(GET_BE_U_4(tr->tr_raddr)))
+ ND_PRINT(" with-ttl %u", GET_U_1(tr->tr_rttl));
}
static void
print_igmpv3_report(netdissect_options *ndo,
- register const u_char *bp, register u_int len)
+ const u_char *bp, u_int len)
{
u_int group, nsrcs, ngroups;
- register u_int i, j;
+ u_int i, j;
/* Minimum len is 16, and should be a multiple of 4 */
if (len < 16 || len & 0x03) {
- ND_PRINT((ndo, " [invalid len %d]", len));
+ ND_PRINT(" [invalid len %u]", len);
return;
}
- ND_TCHECK_2(bp + 6);
- ngroups = EXTRACT_BE_U_2(bp + 6);
- ND_PRINT((ndo, ", %d group record(s)", ngroups));
+ ngroups = GET_BE_U_2(bp + 6);
+ ND_PRINT(", %u group record(s)", ngroups);
if (ndo->ndo_vflag > 0) {
/* Print the group records */
group = 8;
for (i=0; i<ngroups; i++) {
if (len < group+8) {
- ND_PRINT((ndo, " [invalid number of groups]"));
+ ND_PRINT(" [invalid number of groups]");
return;
}
- ND_TCHECK_4(bp + (group + 4));
- ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, bp + group + 4)));
- ND_PRINT((ndo, " %s", tok2str(igmpv3report2str, " [v3-report-#%d]",
- EXTRACT_U_1(bp + group))));
- nsrcs = EXTRACT_BE_U_2(bp + group + 2);
+ ND_PRINT(" [gaddr %s", GET_IPADDR_STRING(bp + group + 4));
+ ND_PRINT(" %s", tok2str(igmpv3report2str, " [v3-report-#%u]",
+ GET_U_1(bp + group)));
+ nsrcs = GET_BE_U_2(bp + group + 2);
/* Check the number of sources and print them */
if (len < group+8+(nsrcs<<2)) {
- ND_PRINT((ndo, " [invalid number of sources %d]", nsrcs));
+ ND_PRINT(" [invalid number of sources %u]", nsrcs);
return;
}
if (ndo->ndo_vflag == 1)
- ND_PRINT((ndo, ", %d source(s)", nsrcs));
+ ND_PRINT(", %u source(s)", nsrcs);
else {
/* Print the sources */
- ND_PRINT((ndo, " {"));
+ ND_PRINT(" {");
for (j=0; j<nsrcs; j++) {
- ND_TCHECK_4(bp + (group + 8 + (j << 2)));
- ND_PRINT((ndo, " %s", ipaddr_string(ndo, bp + group + 8 + (j << 2))));
+ ND_PRINT(" %s", GET_IPADDR_STRING(bp + group + 8 + (j << 2)));
}
- ND_PRINT((ndo, " }"));
+ ND_PRINT(" }");
}
/* Next group record */
group += 8 + (nsrcs << 2);
- ND_PRINT((ndo, "]"));
+ ND_PRINT("]");
}
}
- return;
-trunc:
- ND_PRINT((ndo, "%s", tstr));
}
static void
print_igmpv3_query(netdissect_options *ndo,
- register const u_char *bp, register u_int len)
+ const u_char *bp, u_int len)
{
u_int mrc;
u_int mrt;
u_int nsrcs;
- register u_int i;
+ u_int i;
- ND_PRINT((ndo, " v3"));
+ ND_PRINT(" v3");
/* Minimum len is 12, and should be a multiple of 4 */
if (len < 12 || len & 0x03) {
- ND_PRINT((ndo, " [invalid len %d]", len));
+ ND_PRINT(" [invalid len %u]", len);
return;
}
- ND_TCHECK_1(bp + 1);
- mrc = EXTRACT_U_1(bp + 1);
+ mrc = GET_U_1(bp + 1);
if (mrc < 128) {
mrt = mrc;
} else {
mrt = ((mrc & 0x0f) | 0x10) << (((mrc & 0x70) >> 4) + 3);
}
if (mrc != 100) {
- ND_PRINT((ndo, " [max resp time "));
+ ND_PRINT(" [max resp time ");
if (mrt < 600) {
- ND_PRINT((ndo, "%.1fs", mrt * 0.1));
+ ND_PRINT("%.1fs", mrt * 0.1);
} else {
unsigned_relts_print(ndo, mrt / 10);
}
- ND_PRINT((ndo, "]"));
+ ND_PRINT("]");
}
- ND_TCHECK_4(bp + 4);
- if (EXTRACT_BE_U_4(bp + 4) == 0)
+ if (GET_BE_U_4(bp + 4) == 0)
return;
- ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, bp + 4)));
- ND_TCHECK_2(bp + 10);
- nsrcs = EXTRACT_BE_U_2(bp + 10);
+ ND_PRINT(" [gaddr %s", GET_IPADDR_STRING(bp + 4));
+ nsrcs = GET_BE_U_2(bp + 10);
if (nsrcs > 0) {
if (len < 12 + (nsrcs << 2))
- ND_PRINT((ndo, " [invalid number of sources]"));
+ ND_PRINT(" [invalid number of sources]");
else if (ndo->ndo_vflag > 1) {
- ND_PRINT((ndo, " {"));
+ ND_PRINT(" {");
for (i=0; i<nsrcs; i++) {
- ND_TCHECK_4(bp + (12 + (i << 2)));
- ND_PRINT((ndo, " %s", ipaddr_string(ndo, bp + 12 + (i << 2))));
+ ND_PRINT(" %s", GET_IPADDR_STRING(bp + 12 + (i << 2)));
}
- ND_PRINT((ndo, " }"));
+ ND_PRINT(" }");
} else
- ND_PRINT((ndo, ", %d source(s)", nsrcs));
+ ND_PRINT(", %u source(s)", nsrcs);
}
- ND_PRINT((ndo, "]"));
- return;
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ ND_PRINT("]");
}
void
igmp_print(netdissect_options *ndo,
- register const u_char *bp, register u_int len)
+ const u_char *bp, u_int len)
{
struct cksum_vec vec[1];
+ ndo->ndo_protocol = "igmp";
if (ndo->ndo_qflag) {
- ND_PRINT((ndo, "igmp"));
+ ND_PRINT("igmp");
return;
}
- ND_TCHECK_1(bp);
- switch (EXTRACT_U_1(bp)) {
+ switch (GET_U_1(bp)) {
case 0x11:
- ND_PRINT((ndo, "igmp query"));
+ ND_PRINT("igmp query");
if (len >= 12)
print_igmpv3_query(ndo, bp, len);
else {
- ND_TCHECK_1(bp + 1);
- if (EXTRACT_U_1(bp + 1)) {
- ND_PRINT((ndo, " v2"));
- if (EXTRACT_U_1(bp + 1) != 100)
- ND_PRINT((ndo, " [max resp time %u]", EXTRACT_U_1(bp + 1)));
+ if (GET_U_1(bp + 1)) {
+ ND_PRINT(" v2");
+ if (GET_U_1(bp + 1) != 100)
+ ND_PRINT(" [max resp time %u]", GET_U_1(bp + 1));
} else
- ND_PRINT((ndo, " v1"));
- ND_TCHECK_4(bp + 4);
- if (EXTRACT_BE_U_4(bp + 4))
- ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(ndo, bp + 4)));
+ ND_PRINT(" v1");
+ if (GET_BE_U_4(bp + 4))
+ ND_PRINT(" [gaddr %s]", GET_IPADDR_STRING(bp + 4));
if (len != 8)
- ND_PRINT((ndo, " [len %d]", len));
+ ND_PRINT(" [len %u]", len);
}
break;
case 0x12:
- ND_TCHECK_4(bp + 4);
- ND_PRINT((ndo, "igmp v1 report %s", ipaddr_string(ndo, bp + 4)));
+ ND_PRINT("igmp v1 report %s", GET_IPADDR_STRING(bp + 4));
if (len != 8)
- ND_PRINT((ndo, " [len %d]", len));
+ ND_PRINT(" [len %u]", len);
break;
case 0x16:
- ND_TCHECK_4(bp + 4);
- ND_PRINT((ndo, "igmp v2 report %s", ipaddr_string(ndo, bp + 4)));
+ ND_PRINT("igmp v2 report %s", GET_IPADDR_STRING(bp + 4));
break;
case 0x22:
- ND_PRINT((ndo, "igmp v3 report"));
+ ND_PRINT("igmp v3 report");
print_igmpv3_report(ndo, bp, len);
break;
case 0x17:
- ND_TCHECK_4(bp + 4);
- ND_PRINT((ndo, "igmp leave %s", ipaddr_string(ndo, bp + 4)));
+ ND_PRINT("igmp leave %s", GET_IPADDR_STRING(bp + 4));
break;
case 0x13:
- ND_PRINT((ndo, "igmp dvmrp"));
+ ND_PRINT("igmp dvmrp");
if (len < 8)
- ND_PRINT((ndo, " [len %d]", len));
+ ND_PRINT(" [len %u]", len);
else
dvmrp_print(ndo, bp, len);
break;
case 0x14:
- ND_PRINT((ndo, "igmp pimv1"));
+ ND_PRINT("igmp pimv1");
pimv1_print(ndo, bp, len);
break;
case 0x1e:
- print_mresp(ndo, bp, len);
+ print_mtrace(ndo, "mresp", bp, len);
break;
case 0x1f:
- print_mtrace(ndo, bp, len);
+ print_mtrace(ndo, "mtrace", bp, len);
break;
default:
- ND_PRINT((ndo, "igmp-%d", EXTRACT_U_1(bp)));
+ ND_PRINT("igmp-%u", GET_U_1(bp));
break;
}
- if (ndo->ndo_vflag && len >= 4 && ND_TTEST2(bp[0], len)) {
+ if (ndo->ndo_vflag && len >= 4 && ND_TTEST_LEN(bp, len)) {
/* Check the IGMP checksum */
vec[0].ptr = bp;
vec[0].len = len;
if (in_cksum(vec, 1))
- ND_PRINT((ndo, " bad igmp cksum %x!", EXTRACT_BE_U_2(bp + 2)));
+ ND_PRINT(" bad igmp cksum %x!", GET_BE_U_2(bp + 2));
}
- return;
-trunc:
- ND_PRINT((ndo, "%s", tstr));
}
projects / tcpdump / blobdiff