From: Lou Berger <lberger@labn.net>
Date: Thu, 27 Jul 2017 17:06:49 +0000 (-0400)
Subject: bgpd rfapi: use afi_t
X-Git-Tag: frr-4.0-dev~490^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F868%2Fhead;p=mirror%2Ffrr.git

bgpd rfapi: use afi_t

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 4b55c20c1c..c8e2dd9525 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -2503,7 +2503,7 @@ DEFUN (vnc_nve_group_prefix,
 	VTY_DECLVAR_CONTEXT(bgp, bgp);
 	VTY_DECLVAR_CONTEXT_SUB(rfapi_nve_group_cfg, rfg);
 	struct prefix p;
-	int afi;
+	afi_t afi;
 	struct route_table *rt;
 	struct route_node *rn;
 	int is_un_prefix = 0;
@@ -3830,7 +3830,7 @@ void bgp_rfapi_cfg_init(void)
 struct rfapi_cfg *bgp_rfapi_cfg_new(struct rfapi_rfp_cfg *cfg)
 {
 	struct rfapi_cfg *h;
-	int afi;
+	afi_t afi;
 
 	h = (struct rfapi_cfg *)XCALLOC(MTYPE_RFAPI_CFG,
 					sizeof(struct rfapi_cfg));
@@ -3880,7 +3880,7 @@ struct rfapi_cfg *bgp_rfapi_cfg_new(struct rfapi_rfp_cfg *cfg)
 
 void bgp_rfapi_cfg_destroy(struct bgp *bgp, struct rfapi_cfg *h)
 {
-	int afi;
+	afi_t afi;
 	if (h == NULL)
 		return;
 
@@ -4571,7 +4571,8 @@ int bgp_rfapi_cfg_write(struct vty *vty, struct bgp *bgp)
 void bgp_rfapi_show_summary(struct bgp *bgp, struct vty *vty)
 {
 	struct rfapi_cfg *hc = bgp->rfapi_cfg;
-	int afi, type, redist = 0;
+	afi_t afi;
+	int type, redist = 0;
 	char tmp[40];
 	if (hc == NULL)
 		return;
diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index 29c114d994..ab71eda126 100644
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -205,7 +205,7 @@ static int rfapi_find_node(struct bgp *bgp, struct rfapi_ip_addr *vn_addr,
 	struct prefix p;
 	struct route_node *rn;
 	int rc;
-	int afi;
+	afi_t afi;
 
 	if (!bgp) {
 		return ENXIO;
@@ -2367,7 +2367,7 @@ int rfapi_register(void *handle, struct rfapi_ip_prefix *prefix,
 	struct prefix p;
 	struct prefix *pfx_ip = NULL;
 	struct prefix_rd prd;
-	int afi;
+	afi_t afi;
 	struct prefix pfx_mac_buf;
 	struct prefix *pfx_mac = NULL;
 	struct prefix pfx_vn_buf;
diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index f156161ef9..0bbbe12cce 100644
--- a/bgpd/rfapi/rfapi_import.c
+++ b/bgpd/rfapi/rfapi_import.c
@@ -4248,7 +4248,7 @@ static void rfapiBgpTableFilteredImport(struct bgp *bgp,
 struct rfapi *bgp_rfapi_new(struct bgp *bgp)
 {
 	struct rfapi *h;
-	int afi;
+	afi_t afi;
 	struct rfapi_rfp_cfg *cfg = NULL;
 	struct rfapi_rfp_cb_methods *cbm = NULL;
 
@@ -4290,7 +4290,7 @@ struct rfapi *bgp_rfapi_new(struct bgp *bgp)
 
 void bgp_rfapi_destroy(struct bgp *bgp, struct rfapi *h)
 {
-	int afi;
+	afi_t afi;
 
 	if (bgp == NULL || h == NULL)
 		return;