diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-27 14:02:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 14:02:00 -0400 |
| commit | 713cb249d13d3ca89e2294c4ddf1dbecaf06c75e (patch) | |
| tree | 7c59a66912195905ef17bfe20b9ff9cc2cc7ad6e /bgpd/rfapi/rfapi.c | |
| parent | 0d510865ec4cc0d9cd54945647a274e18fa1898a (diff) | |
| parent | e7038ddec68ab012c2d7b7e8ed70cd99b46fc27d (diff) | |
Merge pull request #868 from LabNConsulting/working/master/patch-set/rfapi-lib+
Restore rfapi and encap attribute, broken by some recent changes
Diffstat (limited to 'bgpd/rfapi/rfapi.c')
| -rw-r--r-- | bgpd/rfapi/rfapi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index 3a2a608a7c..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; @@ -224,7 +224,7 @@ static int rfapi_find_node(struct bgp *bgp, struct rfapi_ip_addr *vn_addr, if ((rc = rfapiRaddr2Qprefix(un_addr, &p))) return rc; - rn = route_node_lookup(&h->un[afi], &p); + rn = route_node_lookup(h->un[afi], &p); if (!rn) return ENOENT; @@ -1415,7 +1415,7 @@ int rfapi_init_and_open(struct bgp *bgp, struct rfapi_descriptor *rfd, assert(afi_vn && afi_un); assert(!rfapiRaddr2Qprefix(&rfd->un_addr, &pfx_un)); - rn = route_node_get(&(h->un[afi_un]), &pfx_un); + rn = route_node_get(h->un[afi_un], &pfx_un); assert(rn); rfd->next = rn->info; rn->info = rfd; @@ -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; |