welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Multiprotocol definitions and more param handling.

Browse source 
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
This commit is contained in:
Benjamin Cama 2011-07-19 23:47:16 +02:00
parent 1b8cb12cb4
commit d7e506baf4
2 changed files with 54 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

44
bgp.c
View file

@ -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 <AFI, SAFI> 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));

19
bgp.h
View file

@ -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 */