From: Benjamin Cama Date: Tue, 19 Jul 2011 21:47:16 +0000 (+0200) Subject: Add Multiprotocol definitions and more param handling. X-Git-Tag: debian/2.2.1-1fdn1~1^2^2~20 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/d7e506baf457af512f47bbe7a4d50dfd9bab087c?ds=sidebyside Add Multiprotocol definitions and more param handling. Signed-off-by: Benjamin Cama --- diff --git a/bgp.c b/bgp.c index d7701be..9d237c9 100644 --- a/bgp.c +++ b/bgp.c @@ -45,6 +45,8 @@ static int bgp_send_keepalive(struct bgp_peer *peer); static int bgp_send_update(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; @@ -907,6 +909,7 @@ static int bgp_handle_input(struct bgp_peer *peer) uint8_t capabilities_len; char *capabilities = NULL; struct bgp_capability *capability; + struct bgp_mp_cap_param *mp_cap; for (i = 0; i < sizeof(p->header.marker); i++) { @@ -979,7 +982,8 @@ static int bgp_handle_input(struct bgp_peer *peer) /* sensible check */ if (data.opt_len - param_offset < 2 - || param->len > data.opt_len - param_offset - 2) { + || param->len > data.opt_len - param_offset - 2) + { LOG(1, 0, 0, "Malformed Optional Parameter list from BGP peer %s\n", peer->name); @@ -988,7 +992,8 @@ static int bgp_handle_input(struct bgp_peer *peer) } /* we know only one parameter type */ - if (param->type != BGP_CAPABILITY_PARAM_TYPE) { + if (param->type != BGP_CAPABILITY_PARAM_TYPE) + { LOG(1, 0, 0, "Unsupported Optional Parameter type %d from BGP peer %s\n", param->type, peer->name); @@ -1011,7 +1016,8 @@ static int bgp_handle_input(struct bgp_peer *peer) /* sensible check */ if (capabilities_len - capability_offset < 2 - || capability->len > capabilities_len - capability_offset - 2) { + || capability->len > capabilities_len - capability_offset - 2) + { LOG(1, 0, 0, "Malformed Capabilities list from BGP peer %s\n", peer->name); @@ -1020,14 +1026,31 @@ static int bgp_handle_input(struct bgp_peer *peer) } /* we only know one capability code */ - if (capability->code != XXX) { + if (capability->code != BGP_CAP_CODE_MP + && capability->len != sizeof(struct bgp_mp_cap_param)) + { LOG(4, 0, 0, "Unsupported Capability code %d from BGP peer %s\n", capability->code, peer->name); - /* TODO: send _which_ capability is unsupported */ - bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_UNSUP_CAP); + bgp_send_notification_full(peer, BGP_ERR_OPEN, BGP_ERR_OPN_UNSUP_CAP, + capability, 2 + capability->len); + /* we don't terminate, still; we just jump to the next one */ + continue; + } + + mp_cap = (struct bgp_mp_cap_param *)&capability->value; + /* the only tuple we support */ + if (mp_cap->afi != AF_INET6 && mp_cap->safi != BGP_MP_SAFI_UNICAST) + { + 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, + capability, 2 + capability->len); /* we don't terminate, still; we just jump to the next one */ + continue; } + } } @@ -1279,6 +1302,12 @@ static int bgp_send_update(struct bgp_peer *peer) /* 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; @@ -1289,6 +1318,9 @@ static int bgp_send_notification(struct bgp_peer *peer, uint8_t 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)); diff --git a/bgp.h b/bgp.h index beb68f9..28b315b 100644 --- a/bgp.h +++ b/bgp.h @@ -46,18 +46,31 @@ struct bgp_data_open { struct bgp_opt_param { uint8_t type; uint8_t len; -#define BGP_MAX_OPT_PARAM_SIZE 256 +#define BGP_MAX_OPT_PARAM_SIZE 256 char value[BGP_MAX_OPT_PARAM_SIZE]; } __attribute__ ((packed)); -#define BGP_CAPABILITY_PARAM_TYPE 2 +#define BGP_CAPABILITY_PARAM_TYPE 2 struct bgp_capability { uint8_t code; uint8_t len; -#define BGP_MAX_CAPABILITY_SIZE 256 +#define BGP_MAX_CAPABILITY_SIZE 256 char value[BGP_MAX_CAPABILITY_SIZE]; } __attribute__ ((packed)); +/* RFC4760 Multiprotocol extension */ +#define BGP_CAP_CODE_MP 1 + +struct bgp_mp_cap_param { + uint16_t afi; /* sa_family_t */ + uint8_t reserved; /* SHOULD be 0 */ + uint8_t safi; +} __attribute__ ((packed)); + +/* bgp_mp_cap_param.safi */ +#define BGP_MP_SAFI_UNICAST 1 +#define BGP_MP_SAFI_MULTICAST 2 + struct bgp_ip_prefix { uint8_t len; uint32_t prefix; /* variable */