]> git.puffer.fish Git - matthieu/frr.git/commitdiff
ripd: Simplify code for distance
authoranlan_cs <vic.lan@pica8.com>
Mon, 10 Apr 2023 07:20:43 +0000 (15:20 +0800)
committeranlan_cs <vic.lan@pica8.com>
Mon, 10 Apr 2023 07:53:07 +0000 (15:53 +0800)
Simplify the code for `rip_distance_apply()`.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
ripd/ripd.c

index 15e058a744184704238e5f8e5c06e82c31ca3d62..7dbe2bbccf7d696bf0f127bc5049fa8e5e307670 100644 (file)
@@ -2836,16 +2836,11 @@ uint8_t rip_distance_apply(struct rip *rip, struct rip_info *rinfo)
                        if (access_list_apply(alist, &rinfo->rp->p)
                            == FILTER_DENY)
                                return 0;
-
-                       return rdistance->distance;
-               } else
-                       return rdistance->distance;
+               }
+               return rdistance->distance;
        }
 
-       if (rip->distance)
-               return rip->distance;
-
-       return 0;
+       return rip->distance;
 }
 
 static void rip_distance_show(struct vty *vty, struct rip *rip)