pimd: Fix up rp initialization breakage

When I converted over to using 'struct prefix'
I broke the initialization of the rp.

In addition, I used the wrong AFI type
to switch on in pim_rpf.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 05b6623e8cef260d064934f000f796a01f6a0f4d..612c08e1b7112f16a8e258919ae97f7becfdb152 100644 (file)
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -91,6 +91,7 @@ pim_rp_init (void)
     return;
 
   str2prefix ("224.0.0.0/4", &rp_info->group);
+  rp_info->group.family = AF_INET;
   rp_info->rp.rpf_addr.family = AF_INET;
   rp_info->rp.rpf_addr.u.prefix4.s_addr = INADDR_NONE;
   tail = rp_info;
@@ -192,8 +193,8 @@ pim_rp_new (const char *rp, const char *group_range)
 
   if (!result)
     return -1;
-
-  result = inet_pton (rp_info->rp.rpf_addr.family, rp, &rp_info->rp.rpf_addr.u.prefix);
+  rp_info->rp.rpf_addr.family = AF_INET;
+  result = inet_pton (rp_info->rp.rpf_addr.family, rp, &rp_info->rp.rpf_addr.u.prefix4);
   if (result <= 0)
     return -1;
 

diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index 662d4aaf520896e4254dd86af5e54b824cb3302a..f3bdb683051ed52fa43dd0d53d3cabae40e0a862 100644 (file)
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -245,10 +245,10 @@ pim_rpf_addr_is_inaddr_none (struct pim_rpf *rpf)
 {
   switch (rpf->rpf_addr.family)
     {
-    case AFI_IP:
+    case AF_INET:
       return rpf->rpf_addr.u.prefix4.s_addr == INADDR_NONE;
       break;
-    case AFI_IP6:
+    case AF_INET6:
       zlog_warn ("%s: v6 Unimplmeneted", __PRETTY_FUNCTION__);
       return 1;
       break;
@@ -265,10 +265,10 @@ pim_rpf_addr_is_inaddr_any (struct pim_rpf *rpf)
 {
   switch (rpf->rpf_addr.family)
     {
-    case AFI_IP:
+    case AF_INET:
       return rpf->rpf_addr.u.prefix4.s_addr == INADDR_ANY;
       break;
-    case AFI_IP6:
+    case AF_INET6:
       zlog_warn ("%s: v6 Unimplmented", __PRETTY_FUNCTION__);
       return 1;
       break;