summaryrefslogtreecommitdiff
path: root/bgpd/bgp_attr.c
diff options
context:
space:
mode:
authorhasso <hasso>2005-02-01 21:30:04 +0000
committerhasso <hasso>2005-02-01 21:30:04 +0000
commit3d515fd9af9f126667a9c2da9c2f40c4c37c28df (patch)
treec107224556ed7678d7a5afc42c19742948cda477 /bgpd/bgp_attr.c
parent0a486e5fcb1b8dac7d8b4cf6ed93e82b8b72fed6 (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/bgp_attr.c')
-rw-r--r--bgpd/bgp_attr.c44
1 files changed, 0 insertions, 44 deletions
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index cad9168d..c702946b 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -994,14 +994,6 @@ bgp_mp_reach_parse (struct peer *peer, bgp_size_t length, struct attr *attr,
stream_forward (s, (snpa_len + 1) >> 1);
}
- /* If peer is based on old draft-00. I read NLRI length from the
- packet. */
- if (peer->version == BGP_VERSION_MP_4_DRAFT_00)
- {
- bgp_size_t nlri_total_len;
- nlri_total_len = stream_getw (s);
- }
-
nlri_len = lim - stream_pnt (s);
if (safi != BGP_SAFI_VPNV4)
@@ -1538,7 +1530,6 @@ bgp_packet_attribute (struct bgp *bgp, struct peer *peer,
if (p->family == AF_INET6)
{
unsigned long sizep;
- unsigned long draftp = 0;
stream_putc (s, BGP_ATTR_FLAG_OPTIONAL);
stream_putc (s, BGP_ATTR_MP_REACH_NLRI);
@@ -1560,29 +1551,17 @@ bgp_packet_attribute (struct bgp *bgp, struct peer *peer,
/* SNPA */
stream_putc (s, 0);
- /* In case of old draft BGP-4+. */
- if (peer->version == BGP_VERSION_MP_4_DRAFT_00)
- {
- draftp = stream_get_putp (s);
- stream_putw (s, 0);
- }
-
/* Prefix write. */
stream_put_prefix (s, p);
/* Set MP attribute length. */
stream_putc_at (s, sizep, (stream_get_putp (s) - sizep) - 1);
-
- /* In case of old draft BGP-4+. */
- if (peer->version == BGP_VERSION_MP_4_DRAFT_00)
- stream_putw_at (s, draftp, (stream_get_putp (s) - draftp) - 2);
}
#endif /* HAVE_IPV6 */
if (p->family == AF_INET && safi == SAFI_MULTICAST)
{
unsigned long sizep;
- unsigned long draftp = 0;
stream_putc (s, BGP_ATTR_FLAG_OPTIONAL);
stream_putc (s, BGP_ATTR_MP_REACH_NLRI);
@@ -1597,28 +1576,16 @@ bgp_packet_attribute (struct bgp *bgp, struct peer *peer,
/* SNPA */
stream_putc (s, 0);
- /* In case of old draft BGP-4+. */
- if (peer->version == BGP_VERSION_MP_4_DRAFT_00)
- {
- draftp = stream_get_putp (s);
- stream_putw (s, 0);
- }
-
/* Prefix write. */
stream_put_prefix (s, p);
/* Set MP attribute length. */
stream_putc_at (s, sizep, (stream_get_putp (s) - sizep) - 1);
-
- /* In case of old draft BGP-4+. */
- if (peer->version == BGP_VERSION_MP_4_DRAFT_00)
- stream_putw_at (s, draftp, (stream_get_putp (s) - draftp) - 2);
}
if (p->family == AF_INET && safi == SAFI_MPLS_VPN)
{
unsigned long sizep;
- unsigned long draftp = 0;
stream_putc (s, BGP_ATTR_FLAG_OPTIONAL);
stream_putc (s, BGP_ATTR_MP_REACH_NLRI);
@@ -1635,13 +1602,6 @@ bgp_packet_attribute (struct bgp *bgp, struct peer *peer,
/* SNPA */
stream_putc (s, 0);
- /* In case of old draft BGP-4+. */
- if (peer->version == BGP_VERSION_MP_4_DRAFT_00)
- {
- draftp = stream_get_putp (s);
- stream_putw (s, 0);
- }
-
/* Tag, RD, Prefix write. */
stream_putc (s, p->prefixlen + 88);
stream_put (s, tag, 3);
@@ -1650,10 +1610,6 @@ bgp_packet_attribute (struct bgp *bgp, struct peer *peer,
/* Set MP attribute length. */
stream_putc_at (s, sizep, (stream_get_putp (s) - sizep) - 1);
-
- /* In case of old draft BGP-4+. */
- if (peer->version == BGP_VERSION_MP_4_DRAFT_00)
- stream_putw_at (s, draftp, (stream_get_putp (s) - draftp) - 2);
}
/* Extended Communities attribute. */