bgpd: "default-originate" shouldn't withdraw non-default routes

Prevent "default-originate" from withdrawing non-default routes like
0.0.0.0/1 by checking prefix length.

Signed-off-by: Xiao Liang <shaw.leon@gmail.com>
(cherry picked from commit 4d74ba929daa6e6b2fe15f9df6e61d5e4808b64c)

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 2cd61b94b0726d6497387aef0912af01da0b4504..9c6b5c6face66834f1f04f976c35417abfea4c95 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2101,9 +2101,7 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi,
         * configured for default-originate */
        if (CHECK_FLAG(peer->af_flags[afi][safi],
                       PEER_FLAG_DEFAULT_ORIGINATE)) {
-               if (p->family == AF_INET && p->u.prefix4.s_addr == INADDR_ANY)
-                       return false;
-               else if (p->family == AF_INET6 && p->prefixlen == 0)
+               if ((p->family == AF_INET || p->family == AF_INET6) && p->prefixlen == 0)
                        return false;
        }