lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / pimd / mtracebis.c

diff --git a/pimd/mtracebis.c b/pimd/mtracebis.c
index ce83b420b41ed398953166f8cf92df3de5f9fdb0..65c495eff04502a6f0ca35e74be2d362f4d0aa30 100644 (file)
--- a/pimd/mtracebis.c
+++ b/pimd/mtracebis.c
@@ -17,11 +17,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef __linux__
 
 #include "pim_igmp_mtrace.h"
 
 #include "checksum.h"
+#include "prefix.h"
 #include "mtracebis_routeget.h"
 
 #include <sys/select.h>
@@ -50,7 +55,8 @@
 static const char *progname;
 static void usage(void)
 {
-       fprintf(stderr, "Usage : %s <multicast source>\n", progname);
+       fprintf(stderr, "Usage : %s <multicast source> [<multicast group>]\n",
+               progname);
 }
 static void version(void)
 {
@@ -170,9 +176,21 @@ static void print_fwd_code(uint32_t fwd_code)
 static void print_rsp(struct igmp_mtrace_rsp *rsp)
 {
        print_host(rsp->outgoing);
-       if (rsp->fwd_code == 0) {
+       if (rsp->fwd_code == 0 || rsp->fwd_code == MTRACE_FWD_CODE_REACHED_RP) {
                print_rtg_proto(rsp->rtg_proto);
                printf(" ");
+               if (rsp->fwd_code == MTRACE_FWD_CODE_REACHED_RP)
+                       printf("(RP) ");
+               if (rsp->rtg_proto == MTRACE_RTG_PROTO_PIM) {
+                       switch (rsp->src_mask) {
+                       case MTRACE_SRC_MASK_GROUP:
+                               printf("(*,G) ");
+                               break;
+                       case MTRACE_SRC_MASK_SOURCE:
+                               printf("(S,G) ");
+                               break;
+                       }
+               }
                print_fwd_ttl(rsp->fwd_ttl);
        } else {
                print_fwd_code(rsp->fwd_code);
@@ -252,6 +270,8 @@ static int recv_response(int fd, int *hops, struct igmp_mtrace *mtracer)
        int mtrace_len;
        int responses;
        unsigned short sum;
+       size_t mtrace_off;
+       size_t ip_len;
 
        recvd = recvfrom(fd, mtrace_buf, IP_AND_MTRACE_BUF_LEN, 0, NULL, 0);
 
@@ -278,13 +298,20 @@ static int recv_response(int fd, int *hops, struct igmp_mtrace *mtracer)
        if (sum != in_cksum(ip, ip->ip_hl * 4))
                return -1;
 
-       mtrace = (struct igmp_mtrace *)(mtrace_buf + (4 * ip->ip_hl));
-
-       mtrace_len = ntohs(ip->ip_len) - ip->ip_hl * 4;
+       /* Header overflow check */
+       mtrace_off = 4 * ip->ip_hl;
+       if (mtrace_off > MTRACE_BUF_LEN)
+               return -1;
 
-       if (mtrace_len < (int)MTRACE_HDR_SIZE)
+       /* Underflow/overflow check */
+       ip_len = ntohs(ip->ip_len);
+       if (ip_len < mtrace_off || ip_len < MTRACE_HDR_SIZE
+           || ip_len > MTRACE_BUF_LEN)
                return -1;
 
+       mtrace_len = ip_len - mtrace_off;
+       mtrace = (struct igmp_mtrace *)(mtrace_buf + mtrace_off);
+
        sum = mtrace->checksum;
        mtrace->checksum = 0;
        if (sum != in_cksum(mtrace, mtrace_len)) {
@@ -318,7 +345,7 @@ static int wait_for_response(int fd, int *hops, struct igmp_mtrace *mtrace,
 {
        fd_set readfds;
        struct timeval timeout;
-       int ret = -1;
+       int ret;
        long msec, rmsec, tmsec;
 
        FD_ZERO(&readfds);
@@ -351,6 +378,7 @@ static bool check_end(struct igmp_mtrace *mtrace, int hops)
 int main(int argc, char *const argv[])
 {
        struct in_addr mc_source;
+       struct in_addr mc_group;
        struct in_addr iface_addr;
        struct in_addr gw_addr;
        struct in_addr mtrace_addr;
@@ -370,6 +398,7 @@ int main(int argc, char *const argv[])
        int i, j;
        char ifname[IF_NAMESIZE];
        char mbuf[MTRACE_BUF_LEN];
+       bool not_group;
 
        mtrace_addr.s_addr = inet_addr("224.0.1.32");
 
@@ -385,7 +414,7 @@ int main(int argc, char *const argv[])
        else
                progname = argv[0];
 
-       if (argc != 2) {
+       if (argc != 2 && argc != 3) {
                usage();
                exit(EXIT_FAILURE);
        }
@@ -416,11 +445,28 @@ int main(int argc, char *const argv[])
        }
        if (inet_pton(AF_INET, argv[1], &mc_source) != 1) {
                usage();
-               fprintf(stderr, "%s: %s not a valid IPv4 address\n", argv[0],
+               fprintf(stderr, "%s: %s is not a valid IPv4 address\n", argv[0],
                        argv[1]);
                exit(EXIT_FAILURE);
        }
 
+       mc_group.s_addr = 0;
+       not_group = false;
+
+       if (argc == 3) {
+               if (inet_pton(AF_INET, argv[2], &mc_group) != 1)
+                       not_group = true;
+               if (!not_group && !IPV4_CLASS_DE(ntohl(mc_group.s_addr)))
+                       not_group = true;
+       }
+
+       if (not_group) {
+               usage();
+               fprintf(stderr, "%s: %s is not a valid IPv4 group address\n",
+                       argv[0], argv[2]);
+               exit(EXIT_FAILURE);
+       }
+
        ifindex = routeget(mc_source, &iface_addr, &gw_addr);
        if (ifindex < 0) {
                fprintf(stderr, "%s: failed to get route to source %s\n",
@@ -441,7 +487,7 @@ int main(int argc, char *const argv[])
        mtrace.type = PIM_IGMP_MTRACE_QUERY_REQUEST;
        mtrace.hops = hops;
        mtrace.checksum = 0;
-       mtrace.grp_addr.s_addr = 0;
+       mtrace.grp_addr = mc_group;
        mtrace.src_addr = mc_source;
        mtrace.dst_addr = iface_addr;
        mtrace.rsp_addr = unicast ? iface_addr : mtrace_addr;