ripd: no need to use qobj anymore to keep track of "router rip"

Now that "router rip" and all underlying commands were converted to the
new northbound model, there's no need to use the qobj infrastructure to
keep track of the 'rip' global variable anymore.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/ripd/ripd.c b/ripd/ripd.c
index 9c6681a56e7c72d9807381be1d1dea2417654625..c0474ea93f65e5029f795869ffe30b065c6d74c0 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -47,8 +47,6 @@
 #include "ripd/rip_debug.h"
 #include "ripd/rip_errors.h"
 
-DEFINE_QOBJ_TYPE(rip)
-
 /* UDP receive buffer size */
 #define RIP_UDP_RCV_BUF 41600
 
@@ -2700,8 +2698,6 @@ int rip_create(int socket)
        rip_event(RIP_READ, rip->sock);
        rip_event(RIP_UPDATE_EVENT, 1);
 
-       QOBJ_REG(rip, rip);
-
        return 0;
 }
 
@@ -3318,8 +3314,6 @@ void rip_clean(void)
        struct listnode *listnode = NULL;
 
        if (rip) {
-               QOBJ_UNREG(rip);
-
                /* Clear RIP routes */
                for (rp = route_top(rip->table); rp; rp = route_next(rp))
                        if ((list = rp->info) != NULL) {

diff --git a/ripd/ripd.h b/ripd/ripd.h
index c8bc68c09f36a4b6a2da894cbca08960c47d6c14..e355e1e61b010889ecc1aae7a5ca045099b8a308 100644 (file)
--- a/ripd/ripd.h
+++ b/ripd/ripd.h
@@ -21,7 +21,6 @@
 #ifndef _ZEBRA_RIP_H
 #define _ZEBRA_RIP_H
 
-#include "qobj.h"
 #include "hook.h"
 #include "nexthop.h"
 #include "rip_memory.h"
@@ -151,10 +150,7 @@ struct rip {
                bool metric_config;
                uint8_t metric;
        } route_map[ZEBRA_ROUTE_MAX];
-
-       QOBJ_FIELDS
 };
-DECLARE_QOBJ_TYPE(rip)
 
 /* RIP routing table entry which belong to rip_packet. */
 struct rte {