From: Renato Westphal <renato@opensourcerouting.org>
Date: Wed, 9 May 2018 04:35:02 +0000 (-0300)
Subject: ripd: no need to use qobj anymore to keep track of "router rip"
X-Git-Tag: frr-7.1-dev~228^2~19
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c1b7e58eda4cbe7a6fef67b5918781a040c0f234;p=mirror%2Ffrr.git

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 9c6681a56e..c0474ea93f 100644
--- 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 c8bc68c09f..e355e1e61b 100644
--- 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 {