diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-04-14 21:46:44 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-04-15 08:42:03 -0400 |
| commit | 2fcc254eed8931c1fb6041abc824f46efb4a65cc (patch) | |
| tree | 01fe38bdba96d95afa20ecf1aeda905918f2be18 /lib/zclient.c | |
| parent | 33e450331eb2060dc315915e13949ad2f0960114 (diff) | |
lib, bgpd: Refactor vrf handling through zclient
Protocols receive zclient vrf creation events from zebra.
This data was being handed to the protocol to decode and
then to hand back to zclient to create the vrf to then
handle appropriately. This is a bad idea.
Modify the code such that when zclient.c receives a vrf
event from zebra that it decodes the data and just creates
the vrf. Individual protocols just need to handle the
appropriate vrf events.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
Diffstat (limited to 'lib/zclient.c')
| -rw-r--r-- | lib/zclient.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/zclient.c b/lib/zclient.c index c971bff6e2..1aa1251bf5 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -919,8 +919,8 @@ zebra_router_id_update_read (struct stream *s, struct prefix *rid) * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ -struct vrf * -zebra_vrf_add_read (struct stream *s, vrf_id_t vrf_id) +static void +zclient_vrf_add (struct stream *s, vrf_id_t vrf_id) { struct vrf *vrf; char vrfname_tmp[VRF_NAMSIZ]; @@ -931,18 +931,18 @@ zebra_vrf_add_read (struct stream *s, vrf_id_t vrf_id) /* Lookup/create vrf by vrf_id. */ vrf = vrf_get (vrf_id, vrfname_tmp); - return vrf; + vrf_enable (vrf); } -struct vrf * -zebra_vrf_state_read (struct stream *s, vrf_id_t vrf_id) +static void +zclient_vrf_delete (struct stream *s, vrf_id_t vrf_id) { struct vrf *vrf; /* Lookup vrf by vrf_id. */ vrf = vrf_lookup (vrf_id); - return vrf; + vrf_delete (vrf); } struct interface * @@ -1341,12 +1341,10 @@ zclient_read (struct thread *thread) (*zclient->router_id_update) (command, zclient, length, vrf_id); break; case ZEBRA_VRF_ADD: - if (zclient->vrf_add) - (*zclient->vrf_add) (command, zclient, length, vrf_id); + zclient_vrf_add (zclient->ibuf, vrf_id); break; case ZEBRA_VRF_DELETE: - if (zclient->vrf_delete) - (*zclient->vrf_delete) (command, zclient, length, vrf_id); + zclient_vrf_delete (zclient->ibuf, vrf_id); break; case ZEBRA_INTERFACE_ADD: if (zclient->interface_add) |