diff options
author | hasso <hasso> | 2005-02-01 21:30:04 +0000 |
---|---|---|
committer | hasso <hasso> | 2005-02-01 21:30:04 +0000 |
commit | 3d515fd9af9f126667a9c2da9c2f40c4c37c28df (patch) | |
tree | c107224556ed7678d7a5afc42c19742948cda477 /bgpd/bgpd.c | |
parent | 0a486e5fcb1b8dac7d8b4cf6ed93e82b8b72fed6 (diff) |
* bgp_attr.c, bgp_snmp.c, bgp_vty.c, bgpd.[ch]: Remove support for old
draft - ie. "neighbor version 4-" commands. Preserve dummy "neighbor
version" command as deprecated.
[merge from GNU Zebra]
Diffstat (limited to 'bgpd/bgpd.c')
-rw-r--r-- | bgpd/bgpd.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 097b235c..1cce8c5e 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -705,7 +705,6 @@ peer_new () peer->v_asorig = BGP_DEFAULT_ASORIGINATE; peer->status = Idle; peer->ostatus = Idle; - peer->version = BGP_VERSION_4; peer->weight = 0; /* Set default flags. */ @@ -3061,24 +3060,6 @@ peer_advertise_interval_unset (struct peer *peer) return 0; } -int -peer_version_set (struct peer *peer, int version) -{ - if (version != BGP_VERSION_4 && version != BGP_VERSION_MP_4_DRAFT_00) - return BGP_ERR_INVALID_VALUE; - - peer->version = version; - - return 0; -} - -int -peer_version_unset (struct peer *peer) -{ - peer->version = BGP_VERSION_4; - return 0; -} - /* neighbor interface */ int peer_interface_set (struct peer *peer, const char *str) @@ -4350,11 +4331,6 @@ bgp_config_write_peer (struct vty *vty, struct bgp *bgp, sockunion2str (peer->update_source, buf, SU_ADDRSTRLEN), VTY_NEWLINE); - /* BGP version print. */ - if (peer->version == BGP_VERSION_MP_4_DRAFT_00) - vty_out (vty, " neighbor %s version %s%s", - addr,"4-", VTY_NEWLINE); - /* advertisement-interval */ if (CHECK_FLAG (peer->config, PEER_CONFIG_ROUTEADV)) vty_out (vty, " neighbor %s advertisement-interval %d%s", |