diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2019-03-02 19:00:46 +0100 |
|---|---|---|
| committer | Renato Westphal <renatowestphal@gmail.com> | 2019-03-29 15:32:21 +0100 |
| commit | 8f88441d717c0ded412543cceabf0ddd93ee9f09 (patch) | |
| tree | 0a460d2da46a5b910535529c92e8db2fa5ff2a74 /ripd/ripd.h | |
| parent | yang: sync the IETF module translator with the latest frr-ripd changes (diff) | |
| parent | Merge pull request #3894 from donaldsharp/install_replace (diff) | |
| download | frr-8f88441d717c0ded412543cceabf0ddd93ee9f09.tar.xz frr-8f88441d717c0ded412543cceabf0ddd93ee9f09.zip | |
Merge remote-tracking branch 'frr/master' into rip-vrf
Merge commit to solve a bunch of conflicts with other PRs that were
merged in the previous weeks.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ripd/ripd.h')
| -rw-r--r-- | ripd/ripd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ripd/ripd.h b/ripd/ripd.h index f78dae7a8..7b196a16b 100644 --- a/ripd/ripd.h +++ b/ripd/ripd.h @@ -184,6 +184,9 @@ struct rip { /* For distribute-list container */ struct distribute_ctx *distribute_ctx; + /* For if_rmap container */ + struct if_rmap_ctx *if_rmap_ctx; + /* Counters for SNMP. */ struct { /* RIP route changes. */ @@ -469,7 +472,7 @@ extern void rip_zebra_ipv4_add(struct rip *rip, struct route_node *rp); extern void rip_zebra_ipv4_delete(struct rip *rip, struct route_node *rp); extern void rip_interface_multicast_set(int, struct connected *); extern void rip_distribute_update_interface(struct interface *); -extern void rip_if_rmap_update_interface(struct interface *); +extern void rip_if_rmap_update_interface(struct interface *ifp); extern int rip_show_network_config(struct vty *vty, struct rip *rip); extern void rip_show_redistribute_config(struct vty *vty, struct rip *rip); |