projects
/
l2tpns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't send notification when receiving an unsupported capability.
[l2tpns.git]
/
bgp.c
diff --git
a/bgp.c
b/bgp.c
index
f0ff879
..
420a925
100644
(file)
--- a/
bgp.c
+++ b/
bgp.c
@@
-49,8
+49,6
@@
static int bgp_send_update(struct bgp_peer *peer);
static int bgp_send_update6(struct bgp_peer *peer);
static int bgp_send_notification(struct bgp_peer *peer, uint8_t code,
uint8_t subcode);
static int bgp_send_update6(struct bgp_peer *peer);
static int bgp_send_notification(struct bgp_peer *peer, uint8_t code,
uint8_t subcode);
-static int bgp_send_notification_full(struct bgp_peer *peer, uint8_t code,
- uint8_t subcode, char *notification_data, uint16_t data_len);
static uint16_t our_as;
static struct bgp_route_list *bgp_routes = 0;
static uint16_t our_as;
static struct bgp_route_list *bgp_routes = 0;
@@
-556,7
+554,8
@@
int bgp_add_route6(struct in6_addr ip, int prefixlen)
/* flag established peers for update */
for (i = 0; i < BGP_NUM_PEERS; i++)
/* flag established peers for update */
for (i = 0; i < BGP_NUM_PEERS; i++)
- if (bgp_peers[i].state == Established)
+ if (bgp_peers[i].state == Established
+ && bgp_peers[i].mp_handling == HandleIPv6Routes)
bgp_peers[i].update_routes6 = 1;
LOG(4, 0, 0, "Registered BGP route %s/%d\n",
bgp_peers[i].update_routes6 = 1;
LOG(4, 0, 0, "Registered BGP route %s/%d\n",
@@
-656,7
+655,8
@@
int bgp_del_route6(struct in6_addr ip, int prefixlen)
/* flag established peers for update */
for (i = 0; i < BGP_NUM_PEERS; i++)
/* flag established peers for update */
for (i = 0; i < BGP_NUM_PEERS; i++)
- if (bgp_peers[i].state == Established)
+ if (bgp_peers[i].state == Established
+ && bgp_peers[i].mp_handling == HandleIPv6Routes)
bgp_peers[i].update_routes6 = 1;
LOG(4, 0, 0, "Removed BGP route %s/%d\n",
bgp_peers[i].update_routes6 = 1;
LOG(4, 0, 0, "Removed BGP route %s/%d\n",
@@
-1185,7
+1185,7
@@
static int bgp_handle_input(struct bgp_peer *peer)
param_offset < data.opt_len;
param_offset += 2 + param->len)
{
param_offset < data.opt_len;
param_offset += 2 + param->len)
{
- param = (struct bgp_opt_param *)(&data.opt_params + param_offset);
+ param = (struct bgp_opt_param *)(
(char *)
&data.opt_params + param_offset);
/* sensible check */
if (data.opt_len - param_offset < 2
/* sensible check */
if (data.opt_len - param_offset < 2
@@
-1210,11
+1210,8
@@
static int bgp_handle_input(struct bgp_peer *peer)
capabilities_len = param->len;
capabilities = (char *)¶m->value;
capabilities_len = param->len;
capabilities = (char *)¶m->value;
- }
- /* look for BGP multiprotocol capability */
- if (capabilities)
- {
+ /* look for BGP multiprotocol capability */
for (capability_offset = 0;
capability_offset < capabilities_len;
capability_offset += 2 + capability->len)
for (capability_offset = 0;
capability_offset < capabilities_len;
capability_offset += 2 + capability->len)
@@
-1239,8
+1236,6
@@
static int bgp_handle_input(struct bgp_peer *peer)
LOG(4, 0, 0, "Unsupported Capability code %d from BGP peer %s\n",
capability->code, peer->name);
LOG(4, 0, 0, "Unsupported Capability code %d from BGP peer %s\n",
capability->code, peer->name);
- bgp_send_notification_full(peer, BGP_ERR_OPEN, BGP_ERR_OPN_UNSUP_CAP,
- (char *)capability, 2 + capability->len);
/* we don't terminate, still; we just jump to the next one */
continue;
}
/* we don't terminate, still; we just jump to the next one */
continue;
}
@@
-1252,16
+1247,23
@@
static int bgp_handle_input(struct bgp_peer *peer)
LOG(4, 0, 0, "Unsupported multiprotocol AFI %d and SAFI %d from BGP peer %s\n",
mp_cap->afi, mp_cap->safi, peer->name);
LOG(4, 0, 0, "Unsupported multiprotocol AFI %d and SAFI %d from BGP peer %s\n",
mp_cap->afi, mp_cap->safi, peer->name);
- bgp_send_notification_full(peer, BGP_ERR_OPEN, BGP_ERR_OPN_UNSUP_CAP,
- (char *)capability, 2 + capability->len);
/* we don't terminate, still; we just jump to the next one */
continue;
}
/* we don't terminate, still; we just jump to the next one */
continue;
}
+ /* yes it can! */
peer->mp_handling = HandleIPv6Routes;
}
}
peer->mp_handling = HandleIPv6Routes;
}
}
+ if (peer->mp_handling != HandleIPv6Routes)
+ {
+ peer->mp_handling = DoesntHandleIPv6Routes;
+ if (config->ipv6_prefix.s6_addr[0])
+ LOG(1, 0, 0, "Warning: BGP peer %s doesn't handle IPv6 prefixes updates\n",
+ peer->name);
+ }
+
/* next transition requires an exchange of keepalives */
bgp_send_keepalive(peer);
}
/* next transition requires an exchange of keepalives */
bgp_send_keepalive(peer);
}
@@
-1363,8
+1365,9
@@
static int bgp_send_open(struct bgp_peer *peer)
/* if we know peer doesn't support MP (mp_handling == DoesntHandleIPv6Routes)
then don't add this parameter */
/* if we know peer doesn't support MP (mp_handling == DoesntHandleIPv6Routes)
then don't add this parameter */
- if (peer->mp_handling == HandlingUnknown
- || peer->mp_handling == HandleIPv6Routes)
+ if (config->ipv6_prefix.s6_addr[0]
+ && (peer->mp_handling == HandlingUnknown
+ || peer->mp_handling == HandleIPv6Routes))
{
/* construct the param and capability */
cap_mp_ipv6.code = BGP_CAP_CODE_MP;
{
/* construct the param and capability */
cap_mp_ipv6.code = BGP_CAP_CODE_MP;
@@
-1713,12
+1716,6
@@
static int bgp_send_update6(struct bgp_peer *peer)
/* send/buffer NOTIFICATION message */
static int bgp_send_notification(struct bgp_peer *peer, uint8_t code,
uint8_t subcode)
/* send/buffer NOTIFICATION message */
static int bgp_send_notification(struct bgp_peer *peer, uint8_t code,
uint8_t subcode)
-{
- return bgp_send_notification_full(peer, code, subcode, NULL, 0);
-}
-
-static int bgp_send_notification_full(struct bgp_peer *peer, uint8_t code,
- uint8_t subcode, char *notification_data, uint16_t data_len)
{
struct bgp_data_notification data;
uint16_t len = 0;
{
struct bgp_data_notification data;
uint16_t len = 0;
@@
-1729,9
+1726,6
@@
static int bgp_send_notification_full(struct bgp_peer *peer, uint8_t code,
data.error_subcode = subcode;
len += sizeof(data.error_code);
data.error_subcode = subcode;
len += sizeof(data.error_code);
- memcpy(data.data, notification_data, data_len);
- len += data_len;
-
memset(peer->outbuf->packet.header.marker, 0xff,
sizeof(peer->outbuf->packet.header.marker));
memset(peer->outbuf->packet.header.marker, 0xff,
sizeof(peer->outbuf->packet.header.marker));