From 5143b2b1dec5daed2681a8cf355cd99bd8deeab3 Mon Sep 17 00:00:00 2001 From: Glenn Date: Mon, 2 Jan 2023 12:22:03 +0100 Subject: [PATCH] fix: Add IPOPT_RA definition & change cmdline option --- src/igmpgen.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/igmpgen.c b/src/igmpgen.c index 27eb7ee..09aab41 100644 --- a/src/igmpgen.c +++ b/src/igmpgen.c @@ -1,6 +1,7 @@ #include #include +#define IPOPT_RA 148 /* router alert */ #define IGMP_V3_MEMBERSHIP_REPORT 0x22 struct igmp_extra { @@ -82,11 +83,13 @@ int main(int argc, char **argv) } *cp++ = 0; - igmp_version = (u_short)atoi(cp); + // igmp_version = (u_short)atoi(cp); + igmp_version = (u_short)atoi(optarg); pkt_ptr = g_igmp_pkts; while(pkt_ptr->igmp_version || pkt_ptr->igmp_tag){ - if ((strcasecmp(pkt_ptr->igmp_tag, optarg) == 0) + // if ((strcasecmp(pkt_ptr->igmp_tag, optarg) == 0) + if ((strcasecmp(pkt_ptr->igmp_tag, cp) == 0) && (igmp_version == pkt_ptr->igmp_version)){ found = 1; igmp_type = pkt_ptr->igmp_type; @@ -322,12 +325,12 @@ int main(int argc, char **argv) void usage(char *name) { struct igmp_extra *pkt_ptr; - fprintf(stderr, "usage: %s -i ethdevice -g group -t packet.version [-s ip:port] [-d ip:port]\n", name); + fprintf(stderr, "usage: %s -i ethdevice -g group -t version.packettype [-s ip:port] [-d ip:port]\n", name); pkt_ptr = g_igmp_pkts; fprintf(stderr,"\nAvailable packet types:\n"); while(pkt_ptr->igmp_version || pkt_ptr->igmp_tag){ - fprintf(stderr," - %s.%d\n", pkt_ptr->igmp_tag, pkt_ptr->igmp_version); + fprintf(stderr," - %d.%s\n", pkt_ptr->igmp_version, pkt_ptr->igmp_tag); pkt_ptr++; } }