From 8044f7aa553b22e94608eabbfef818452da2f628 Mon Sep 17 00:00:00 2001 From: Yash Ranjan Date: Thu, 10 Dec 2020 21:16:37 -0800 Subject: [PATCH 1/2] ospf6d: Fix for "show ipv6 ospf6 database intra-prefix" Some prefixes were not shown in the intra-prefix database show command, due to issues with pointer calculation. Signed-off-by: Yash Ranjan --- ospf6d/ospf6_intra.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index be5069c88d..91945f9791 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -796,7 +796,7 @@ static char *ospf6_intra_prefix_lsa_get_prefix_str(struct ospf6_lsa *lsa, + sizeof(struct ospf6_lsa_header)); prefixnum = ntohs(intra_prefix_lsa->prefix_num); - if (pos > prefixnum) + if ((pos + 1) > prefixnum) return NULL; start = (char *)intra_prefix_lsa @@ -812,8 +812,7 @@ static char *ospf6_intra_prefix_lsa_get_prefix_str(struct ospf6_lsa *lsa, } if (cnt < pos) { - current = - start + pos * OSPF6_PREFIX_SIZE(prefix); + current += OSPF6_PREFIX_SIZE(prefix); cnt++; } else { memset(&in6, 0, sizeof(in6)); From 08d8fa45877c7e6bdd10933fca9f25ea94927ddc Mon Sep 17 00:00:00 2001 From: Yash Ranjan Date: Thu, 10 Dec 2020 21:19:55 -0800 Subject: [PATCH 2/2] ospf6d: Fix for "show ipv6 ospf6 database link" Some prefixes were not shown in the link database show command, due to issues with pointer calculation. Signed-off-by: Yash Ranjan --- ospf6d/ospf6_intra.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index 91945f9791..17538c466a 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -609,9 +609,8 @@ static char *ospf6_link_lsa_get_prefix_str(struct ospf6_lsa *lsa, char *buf, return NULL; } - if (cnt < pos) { - current = - start + pos * OSPF6_PREFIX_SIZE(prefix); + if (cnt < (pos - 1)) { + current += OSPF6_PREFIX_SIZE(prefix); cnt++; } else { memset(&in6, 0, sizeof(in6));