From 9deed2ad77f83b417671cd0ee5e15414514a40eb Mon Sep 17 00:00:00 2001 From: Sarita Patra Date: Mon, 11 Jul 2022 04:56:29 -0700 Subject: [PATCH 1/2] pimd: Fix description for PIM_SG_LEN Signed-off-by: Sarita Patra --- lib/prefix.h | 2 +- pimd/pim_str.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/prefix.h b/lib/prefix.h index 3a768572c4..7b2f889874 100644 --- a/lib/prefix.h +++ b/lib/prefix.h @@ -352,7 +352,7 @@ union prefixconstptr { #define PREFIX_STRLEN 80 /* - * Longest possible length of a (S,G) string is 36 bytes + * Longest possible length of a (S,G) string is 34 bytes * 123.123.123.123 = 15 * 2 * (,) = 3 * NULL Character at end = 1 diff --git a/pimd/pim_str.h b/pimd/pim_str.h index 4a19ea7b35..63f10e362b 100644 --- a/pimd/pim_str.h +++ b/pimd/pim_str.h @@ -28,13 +28,14 @@ #include "pim_addr.h" /* - * Longest possible length of a (S,G) string is 36 bytes + * Longest possible length of a IPV4 (S,G) string is 34 bytes * 123.123.123.123 = 16 * 2 * (,) = 3 * NULL Character at end = 1 - * (123.123.123.123,123,123,123,123) + * (123.123.123.123,123.123.123.123) */ #define PIM_SG_LEN PREFIX_SG_STR_LEN + #define pim_inet4_dump prefix_mcast_inet4_dump void pim_addr_dump(const char *onfail, struct prefix *p, char *buf, From 4d69e1ca610c45d0de4ca79acdc2d0c8e36bbeb8 Mon Sep 17 00:00:00 2001 From: Sarita Patra Date: Mon, 11 Jul 2022 04:58:45 -0700 Subject: [PATCH 2/2] pim6d: Longest possible length of a (S,G) string is 94 bytes Longest possible length of a IPV6 (S,G) string is 94 bytes INET6_ADDRSTRLEN * 2 = 46 * 2 (,) = 1 NULL Character at end = 1 Signed-off-by: Sarita Patra --- pimd/pim_str.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pimd/pim_str.h b/pimd/pim_str.h index 63f10e362b..4481776097 100644 --- a/pimd/pim_str.h +++ b/pimd/pim_str.h @@ -27,6 +27,7 @@ #include "prefix.h" #include "pim_addr.h" +#if PIM_IPV == 4 /* * Longest possible length of a IPV4 (S,G) string is 34 bytes * 123.123.123.123 = 16 * 2 @@ -35,6 +36,15 @@ * (123.123.123.123,123.123.123.123) */ #define PIM_SG_LEN PREFIX_SG_STR_LEN +#else +/* + * Longest possible length of a IPV6 (S,G) string is 94 bytes + * INET6_ADDRSTRLEN * 2 = 46 * 2 + * (,) = 3 + * NULL Character at end = 1 + */ +#define PIM_SG_LEN 96 +#endif #define pim_inet4_dump prefix_mcast_inet4_dump