From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 16 Mar 2017 20:43:01 +0000 (-0400)
Subject: pimd: Cleanup pim_register_recv upstream create
X-Git-Tag: frr-3.1-dev~30^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4a57e76af4235267aabd145fea198720bc8ac8f8;p=mirror%2Ffrr.git

pimd: Cleanup pim_register_recv upstream create

When we get a register packet from a FHR, we
were doing allot of work twice.

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

diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 46d8e3ec2e..cb9d7e3744 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -332,34 +332,16 @@ pim_register_recv (struct interface *ifp,
      */
     if (!upstream)
       {
-	upstream = pim_upstream_add (&sg, ifp,
-				     PIM_UPSTREAM_FLAG_MASK_SRC_STREAM,
-				     __PRETTY_FUNCTION__);
+        upstream = pim_upstream_add (&sg, ifp,
+                                     PIM_UPSTREAM_FLAG_MASK_SRC_STREAM,
+                                     __PRETTY_FUNCTION__);
         if (!upstream)
           {
             zlog_warn ("Failure to create upstream state");
             return 1;
           }
-        PIM_UPSTREAM_FLAG_SET_SRC_STREAM(upstream->flags);
 
         upstream->upstream_register = src_addr;
-	pim_rp_set_upstream_addr (&upstream->upstream_addr, sg.src, sg.grp);
-	if (pim_nexthop_lookup (&upstream->rpf.source_nexthop,
-			        upstream->upstream_addr, 1) != 0)
-          {
-            if (PIM_DEBUG_PIM_REG)
-              {
-                zlog_debug ("Received Register(%s), for which I have no path back", upstream->sg_str);
-              }
-            PIM_UPSTREAM_FLAG_UNSET_SRC_STREAM(upstream->flags);
-            pim_upstream_del (upstream, __PRETTY_FUNCTION__);
-            return 1;
-          }
-	upstream->sg.src = sg.src;
-	upstream->rpf.rpf_addr = upstream->rpf.source_nexthop.mrib_nexthop_addr;
-
-	upstream->join_state = PIM_UPSTREAM_NOTJOINED;
-
       }
 
     if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||