diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-06-30 19:52:56 +0200 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-06-30 19:52:56 +0200 |
| commit | 1161690b93b48fbd07f4ee25c1261574db8d71c5 (patch) | |
| tree | 7ffbe5c3b333b1fe0b8a3f042d8b1af602d48019 /bgpd/bgp_vty.h | |
| parent | bgpd: Make SAFI-1 and SAFI-4 use the same table (diff) | |
| parent | Merge pull request #740 from donaldsharp/ospf_commands (diff) | |
| download | frr-1161690b93b48fbd07f4ee25c1261574db8d71c5.tar.xz frr-1161690b93b48fbd07f4ee25c1261574db8d71c5.zip | |
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'bgpd/bgp_vty.h')
| -rw-r--r-- | bgpd/bgp_vty.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bgpd/bgp_vty.h b/bgpd/bgp_vty.h index b3e6f73a6..edc994a57 100644 --- a/bgpd/bgp_vty.h +++ b/bgpd/bgp_vty.h @@ -54,14 +54,11 @@ extern int bgp_vty_return (struct vty *vty, int ret); extern struct peer * peer_and_group_lookup_vty (struct vty *vty, const char *peer_str); -extern int -bgp_parse_afi(const char *str, afi_t *afi); - extern afi_t -bgp_vty_afi_from_arg(const char *afi_str); +bgp_vty_afi_from_str(const char *afi_str); extern safi_t -bgp_vty_safi_from_arg(const char *safi_str); +bgp_vty_safi_from_str(const char *safi_str); extern int argv_find_and_parse_afi(struct cmd_token **argv, int argc, int *index, afi_t *afi); |