]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: Remove rib_lookup_ipv4_route
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 12 Dec 2018 15:15:27 +0000 (10:15 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 12 Dec 2018 16:54:12 +0000 (11:54 -0500)
The rib_lookup_ipv4_route function is only used in a debug path.
Is only used for v4 and only checks to make sure that the rib
and fib are in sync( which is not needed/used/supported on other
platforms ).  So let's just remove it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
zebra/kernel_socket.c
zebra/rib.h
zebra/zebra_rib.c

index 8a7cb0e5284cee64eeb96b65c16fd6934a0db32b..cb405b3b6220fa75db2f85afb5ea7c56c5646f3e 100644 (file)
@@ -967,6 +967,12 @@ void rtm_read(struct rt_msghdr *rtm)
                nh.bh_type = BLACKHOLE_NULL;
        }
 
+       /*
+        * Ignore our own messages.
+        */
+       if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid)
+               return;
+
        if (dest.sa.sa_family == AF_INET) {
                struct prefix p;
 
@@ -977,114 +983,6 @@ void rtm_read(struct rt_msghdr *rtm)
                else
                        p.prefixlen = ip_masklen(mask.sin.sin_addr);
 
-               /* Catch self originated messages and match them against our
-                * current RIB.
-                * At the same time, ignore unconfirmed messages, they should be
-                * tracked
-                * by rtm_write() and kernel_rtm_ipv4().
-                */
-               if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid) {
-                       char buf[PREFIX_STRLEN], gate_buf[INET_ADDRSTRLEN];
-                       int ret;
-                       if (!IS_ZEBRA_DEBUG_RIB)
-                               return;
-                       ret = rib_lookup_ipv4_route((struct prefix_ipv4 *)&p,
-                                                   &gate, VRF_DEFAULT);
-                       prefix2str(&p, buf, sizeof(buf));
-                       switch (rtm->rtm_type) {
-                       case RTM_ADD:
-                       case RTM_GET:
-                       case RTM_CHANGE:
-                               /* The kernel notifies us about a new route in
-                                  FIB created by us.
-                                  Do we have a correspondent entry in our RIB?
-                                  */
-                               switch (ret) {
-                               case ZEBRA_RIB_NOTFOUND:
-                                       zlog_debug(
-                                               "%s: %s %s: desync: RR isn't yet in RIB, while already in FIB",
-                                               __func__,
-                                               lookup_msg(rtm_type_str,
-                                                          rtm->rtm_type, NULL),
-                                               buf);
-                                       break;
-                               case ZEBRA_RIB_FOUND_CONNECTED:
-                               case ZEBRA_RIB_FOUND_NOGATE:
-                                       inet_ntop(AF_INET, &gate.sin.sin_addr,
-                                                 gate_buf, INET_ADDRSTRLEN);
-                                       zlog_debug(
-                                               "%s: %s %s: desync: RR is in RIB, but gate differs (ours is %s)",
-                                               __func__,
-                                               lookup_msg(rtm_type_str,
-                                                          rtm->rtm_type, NULL),
-                                               buf, gate_buf);
-                                       break;
-                               case ZEBRA_RIB_FOUND_EXACT: /* RIB RR == FIB RR
-                                                              */
-                                       zlog_debug(
-                                               "%s: %s %s: done Ok", __func__,
-                                               lookup_msg(rtm_type_str,
-                                                          rtm->rtm_type, NULL),
-                                               buf);
-                                       rib_lookup_and_dump(
-                                               (struct prefix_ipv4 *)&p,
-                                               VRF_DEFAULT);
-                                       return;
-                                       break;
-                               }
-                               break;
-                       case RTM_DELETE:
-                               /* The kernel notifies us about a route deleted
-                                  by us. Do we still
-                                  have it in the RIB? Do we have anything
-                                  instead? */
-                               switch (ret) {
-                               case ZEBRA_RIB_FOUND_EXACT:
-                                       zlog_debug(
-                                               "%s: %s %s: desync: RR is still in RIB, while already not in FIB",
-                                               __func__,
-                                               lookup_msg(rtm_type_str,
-                                                          rtm->rtm_type, NULL),
-                                               buf);
-                                       rib_lookup_and_dump(
-                                               (struct prefix_ipv4 *)&p,
-                                               VRF_DEFAULT);
-                                       break;
-                               case ZEBRA_RIB_FOUND_CONNECTED:
-                               case ZEBRA_RIB_FOUND_NOGATE:
-                                       zlog_debug(
-                                               "%s: %s %s: desync: RR is still in RIB, plus gate differs",
-                                               __func__,
-                                               lookup_msg(rtm_type_str,
-                                                          rtm->rtm_type, NULL),
-                                               buf);
-                                       rib_lookup_and_dump(
-                                               (struct prefix_ipv4 *)&p,
-                                               VRF_DEFAULT);
-                                       break;
-                               case ZEBRA_RIB_NOTFOUND: /* RIB RR == FIB RR */
-                                       zlog_debug(
-                                               "%s: %s %s: done Ok", __func__,
-                                               lookup_msg(rtm_type_str,
-                                                          rtm->rtm_type, NULL),
-                                               buf);
-                                       rib_lookup_and_dump(
-                                               (struct prefix_ipv4 *)&p,
-                                               VRF_DEFAULT);
-                                       return;
-                                       break;
-                               }
-                               break;
-                       default:
-                               zlog_debug(
-                                       "%s: %s: warning: loopback RTM of type %s received",
-                                       __func__, buf,
-                                       lookup_msg(rtm_type_str, rtm->rtm_type,
-                                                  NULL));
-                       }
-                       return;
-               }
-
                /* Change, delete the old prefix, we have no further information
                 * to specify the route really
                 */
@@ -1109,11 +1007,6 @@ void rtm_read(struct rt_msghdr *rtm)
                                   &nh, 0, 0, 0, true);
        }
        if (dest.sa.sa_family == AF_INET6) {
-               /* One day we might have a debug section here like one in the
-                * IPv4 case above. Just ignore own messages at the moment.
-                */
-               if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid)
-                       return;
                struct prefix p;
                ifindex_t ifindex = 0;
 
index 97eae79f03c276cf0289d344e3e4f8ae28749383..ae25a0e67980acd6593863782c42d039938197fa 100644 (file)
@@ -282,8 +282,6 @@ extern enum multicast_mode multicast_mode_ipv4_get(void);
 extern void rib_lookup_and_dump(struct prefix_ipv4 *p, vrf_id_t vrf_id);
 extern void rib_lookup_and_pushup(struct prefix_ipv4 *p, vrf_id_t vrf_id);
 
-extern int rib_lookup_ipv4_route(struct prefix_ipv4 *p, union sockunion *qgate,
-                                vrf_id_t vrf_id);
 #define ZEBRA_RIB_LOOKUP_ERROR -1
 #define ZEBRA_RIB_FOUND_EXACT 0
 #define ZEBRA_RIB_FOUND_NOGATE 1
index f2d07310eed10914e6bd28d21cc3837f78e99b03..3aba6fcc0efa2c6c5dc723f6f7a0a66226bf6c3f 100644 (file)
@@ -808,84 +808,6 @@ struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p, vrf_id_t vrf_id)
        return NULL;
 }
 
-/*
- * This clone function, unlike its original rib_lookup_ipv4(), checks
- * if specified IPv4 route record (prefix/mask -> gate) exists in
- * the whole RIB and has ROUTE_ENTRY_SELECTED_FIB set.
- *
- * Return values:
- * -1: error
- * 0: exact match found
- * 1: a match was found with a different gate
- * 2: connected route found
- * 3: no matches found
- */
-int rib_lookup_ipv4_route(struct prefix_ipv4 *p, union sockunion *qgate,
-                         vrf_id_t vrf_id)
-{
-       struct route_table *table;
-       struct route_node *rn;
-       struct route_entry *match = NULL;
-       struct nexthop *nexthop;
-       int nexthops_active;
-       rib_dest_t *dest;
-
-       /* Lookup table.  */
-       table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id);
-       if (!table)
-               return ZEBRA_RIB_LOOKUP_ERROR;
-
-       /* Scan the RIB table for exactly matching RIB entry. */
-       rn = route_node_lookup(table, (struct prefix *)p);
-
-       /* No route for this prefix. */
-       if (!rn)
-               return ZEBRA_RIB_NOTFOUND;
-
-       /* Unlock node. */
-       route_unlock_node(rn);
-       dest = rib_dest_from_rnode(rn);
-
-       /* Find out if a "selected" RR for the discovered RIB entry exists ever.
-        */
-       if (dest && dest->selected_fib
-           && !CHECK_FLAG(dest->selected_fib->status, ROUTE_ENTRY_REMOVED))
-               match = dest->selected_fib;
-
-       /* None such found :( */
-       if (!match)
-               return ZEBRA_RIB_NOTFOUND;
-
-       if (match->type == ZEBRA_ROUTE_CONNECT)
-               return ZEBRA_RIB_FOUND_CONNECTED;
-
-       /* Ok, we have a cood candidate, let's check it's nexthop list... */
-       nexthops_active = 0;
-       for (ALL_NEXTHOPS(match->ng, nexthop))
-               if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB)) {
-                       nexthops_active = 1;
-                       if (nexthop->gate.ipv4.s_addr == sockunion2ip(qgate))
-                               return ZEBRA_RIB_FOUND_EXACT;
-                       if (IS_ZEBRA_DEBUG_RIB) {
-                               char gate_buf[INET_ADDRSTRLEN],
-                                       qgate_buf[INET_ADDRSTRLEN];
-                               inet_ntop(AF_INET, &nexthop->gate.ipv4.s_addr,
-                                         gate_buf, INET_ADDRSTRLEN);
-                               inet_ntop(AF_INET, &sockunion2ip(qgate),
-                                         qgate_buf, INET_ADDRSTRLEN);
-                               zlog_debug("%s: qgate == %s, %s == %s",
-                                          __func__, qgate_buf,
-                                          nexthop->rparent ? "rgate" : "gate",
-                                          gate_buf);
-                       }
-               }
-
-       if (nexthops_active)
-               return ZEBRA_RIB_FOUND_NOGATE;
-
-       return ZEBRA_RIB_NOTFOUND;
-}
-
 #define RIB_SYSTEM_ROUTE(R)                                                    \
        ((R)->type == ZEBRA_ROUTE_KERNEL || (R)->type == ZEBRA_ROUTE_CONNECT)