Revert "lib: BGP registration with IGP for BGP ORR rSPF calc"

This reverts commit a5dd4bf47d1d24cfc5e916ff29f5124792e85a53.

diff --git a/lib/command.h b/lib/command.h
index 5cc40f71f6537b412340e66f497a1be241a4d4b2..bce4fb9e1cea439422101029540c6de3487cbca1 100644 (file)
--- a/lib/command.h
+++ b/lib/command.h
@@ -398,7 +398,6 @@ struct cmd_node {
 #define BGP_SOFT_IN_STR "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
 #define BGP_SOFT_OUT_STR "Resend all outbound updates\n"
 #define BGP_SOFT_RSCLIENT_RIB_STR "Soft reconfig for rsclient RIB\n"
-#define BGP_ORR_DEBUG "Enable Optimal Route Reflection Debugging logs\n"
 #define OSPF_STR "OSPF information\n"
 #define NEIGHBOR_STR "Specify neighbor router\n"
 #define DEBUG_STR "Debugging functions\n"

diff --git a/lib/orr_msg.h b/lib/orr_msg.h
deleted file mode 100644 (file)
index 03f92ef..0000000
--- a/lib/orr_msg.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Structures common to BGP, OSPF and ISIS for BGP Optimal Route Reflection
- * Copyright (C) 2021 Samsung R&D Institute India - Bangalore.
- *                     Madhurilatha Kuruganti
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _FRR_ORR_MSG_H
-#define _FRR_ORR_MSG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* REVISIT: Need to check if we can use zero length array */
-#define ORR_MAX_PREFIX 100
-
-struct orr_prefix_metric {
-       struct prefix prefix;
-       uint32_t metric;
-};
-
-/* BGP-IGP Register for IGP metric */
-struct orr_igp_metric_reg {
-       bool reg;
-       uint8_t proto;
-       safi_t safi;
-       struct prefix prefix;
-};
-
-/* IGP-BGP message structures */
-struct orr_igp_metric_info {
-       /* IGP instance data. */
-       uint8_t proto;
-       uint32_t instId;
-
-       safi_t safi;
-
-       /* IGP metric from Active Root. */
-       struct prefix root;
-       uint32_t num_entries;
-       struct orr_prefix_metric nexthop[ORR_MAX_PREFIX];
-};
-
-/* BGP ORR Root node */
-struct orr_root {
-       afi_t afi;
-       safi_t safi;
-
-       /* MPLS_TE prefix and router ID */
-       struct prefix prefix;
-       struct in_addr router_id;
-
-       /* Advertising OSPF Router ID. */
-       struct in_addr adv_router;
-
-       /* BGP-ORR Received LSAs */
-       struct ospf_lsa *router_lsa_rcvd;
-
-       /* Routing tables from root node */
-       struct route_table *old_table; /* Old routing table. */
-       struct route_table *new_table; /* Current routing table. */
-
-       struct route_table *old_rtrs; /* Old ABR/ASBR RT. */
-       struct route_table *new_rtrs; /* New ABR/ASBR RT. */
-};
-
-/* Prototypes. */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _FRR_ORR_MSG_H */

diff --git a/lib/subdir.am b/lib/subdir.am
index 1a8c184823f2bd34d90adb4cdf3d1925ea06d435..754a7da638f5ab7883410dd513158b39847be771 100644 (file)
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -225,7 +225,6 @@ pkginclude_HEADERS += \
        lib/ns.h \
        lib/openbsd-queue.h \
        lib/openbsd-tree.h \
-       lib/orr_msg.h \
        lib/plist.h \
        lib/prefix.h \
        lib/printfrr.h \

diff --git a/lib/zclient.h b/lib/zclient.h
index 584a42194de5e5dc09a2cc0926e0d6710977cbb6..8c4ce1b7779b60547ba5dc6ea8faa99ffa67be9c 100644 (file)
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -102,8 +102,6 @@ enum zserv_client_capabilities {
 extern struct sockaddr_storage zclient_addr;
 extern socklen_t zclient_addr_len;
 
-#define ZAPI_ORR_FLAG_UNICAST 0x01
-
 /* Zebra message types. */
 typedef enum {
        ZEBRA_INTERFACE_ADD,
@@ -1248,10 +1246,6 @@ enum zapi_opaque_registry {
        LDP_RLFA_UNREGISTER_ALL = 8,
        /* Announce LDP labels associated to a previously registered RLFA */
        LDP_RLFA_LABELS = 9,
-       /* Register for IGP METRIC with OSPF/ISIS */
-       ORR_IGP_METRIC_REGISTER = 10,
-       /* Send SPF data to BGP */
-       ORR_IGP_METRIC_UPDATE = 11
 };
 
 /* Send the hello message.