lib, rip, ripng, eigrp: rework if_rmap context

so as to handle ri/ripng/eigrp multiple instances, the need is to
encapsulate if_rmap hash table into a container context self to each
instance. This work then reviews the if_rmap api, mainly by adding a
if_rmap_ctx context, that is passed for each exchange between library
and the daemon.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

1 files changed, 27 insertions, 6 deletions

diff --git a/lib/if_rmap.h b/lib/if_rmap.h
index 8dded2cb48..21ac35fe1d 100644
--- a/lib/if_rmap.h
+++ b/lib/if_rmap.h
@@ -34,12 +34,33 @@ struct if_rmap {
 	char *routemap[IF_RMAP_MAX];
 };
 
-extern void if_rmap_init(int);
-extern void if_rmap_reset(void);
-extern void if_rmap_hook_add(void (*)(struct if_rmap *));
-extern void if_rmap_hook_delete(void (*)(struct if_rmap *));
-extern struct if_rmap *if_rmap_lookup(const char *);
-extern int config_write_if_rmap(struct vty *);
+struct if_rmap_ctx {
+	/* if_rmap */
+	struct hash *ifrmaphash;
+
+	/* Hook functions. */
+	void (*if_rmap_add_hook)(struct if_rmap_ctx *ctx,
+				    struct if_rmap *ifrmap);
+	void (*if_rmap_delete_hook)(struct if_rmap_ctx *ctx,
+				       struct if_rmap *ifrmap);
+
+	/* vrf information */
+	struct vrf *vrf;
+};
+
+extern struct if_rmap_ctx *if_rmap_ctx_create(struct vrf *vrf);
+extern void if_rmap_ctx_delete(struct if_rmap_ctx *ctx);
+extern void if_rmap_init(int node);
+extern void if_rmap_terminate(void);
+void if_rmap_hook_add(struct if_rmap_ctx *ctx,
+		      void (*func)(struct if_rmap_ctx *ctx,
+				   struct if_rmap *));
+void if_rmap_hook_delete(struct if_rmap_ctx *ctx,
+			 void (*func)(struct if_rmap_ctx *ctx,
+				      struct if_rmap *));
+extern struct if_rmap *if_rmap_lookup(struct if_rmap_ctx *ctx,
+				      const char *ifname);
+extern int config_write_if_rmap(struct vty *, struct if_rmap_ctx *ctx);
 
 #ifdef __cplusplus
 }