]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #9854 from opensourcerouting/zapi-call-table
authorRuss White <russ@riw.us>
Tue, 26 Oct 2021 15:33:44 +0000 (11:33 -0400)
committerGitHub <noreply@github.com>
Tue, 26 Oct 2021 15:33:44 +0000 (11:33 -0400)
*: convert zclient callbacks to table

1  2 
bgpd/bgp_zebra.c
lib/zclient.c
lib/zclient.h
nhrpd/nhrpd.h
pbrd/pbr_zebra.c

Simple merge
diff --cc lib/zclient.c
Simple merge
diff --cc lib/zclient.h
index 3cad9bd4fa511eeb462d148a7059eebd031c3cfe,3c4df9e249b4b4427bdd9a6c864bc0dfb457ed46..82eaefda429a215f36a3516860a2048197311c28
@@@ -329,12 -342,9 +342,9 @@@ struct zclient 
        struct redist_proto mi_redist[AFI_MAX][ZEBRA_ROUTE_MAX];
        vrf_bitmap_t redist[AFI_MAX][ZEBRA_ROUTE_MAX];
  
 -      /* Redistribute defauilt. */
 +      /* Redistribute default. */
        vrf_bitmap_t default_information[AFI_MAX];
  
- #define ZAPI_CALLBACK_ARGS                                                     \
-       int cmd, struct zclient *zclient, uint16_t length, vrf_id_t vrf_id
        /* Pointer to the callback functions. */
        void (*zebra_connected)(struct zclient *);
        void (*zebra_capabilities)(struct zclient_capabilities *cap);
diff --cc nhrpd/nhrpd.h
Simple merge
Simple merge