Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implements RFC 6608 Subcodes for BGP FSM Error.

Browse source
This commit is contained in:
Ondrej Zajicek 2013-07-25 13:55:24 +02:00
parent 508d936078
commit ac57451348
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
proto/bgp/bgp.h
View file

@ -254,6 +254,8 @@ void bgp_log_error(struct bgp_proto *p, u8 class, char *msg, unsigned code, unsi
#define BS_ESTABLISHED 5 #define BS_ESTABLISHED 5
#define BS_CLOSE 6 /* Used during transition to BS_IDLE */ #define BS_CLOSE 6 /* Used during transition to BS_IDLE */
#define BS_MAX 7
/* BGP start states /* BGP start states
* *
* Used in PS_START for fine-grained specification of starting state. * Used in PS_START for fine-grained specification of starting state.

20
proto/bgp/packets.c
View file

@ -24,6 +24,13 @@
static struct rate_limit rl_rcv_update, rl_snd_update; static struct rate_limit rl_rcv_update, rl_snd_update;
/* Table for state -> RFC 6608 FSM error subcodes */
static byte fsm_err_subcode[BS_MAX] = {
[BS_OPENSENT] = 1,
[BS_OPENCONFIRM] = 2,
[BS_ESTABLISHED] = 3
};
/* /*
* MRT Dump format is not semantically specified. * MRT Dump format is not semantically specified.
* We will use these values in appropriate fields: * We will use these values in appropriate fields:
@ -720,7 +727,7 @@ bgp_rx_open(struct bgp_conn *conn, byte *pkt, int len)
/* Check state */ /* Check state */
if (conn->state != BS_OPENSENT) if (conn->state != BS_OPENSENT)
{ bgp_error(conn, 5, 0, NULL, 0); return; } { bgp_error(conn, 5, fsm_err_subcode[conn->state], NULL, 0); return; }
/* Check message contents */ /* Check message contents */
if (len < 29 || len != 29 + pkt[28]) if (len < 29 || len != 29 + pkt[28])
@ -1060,7 +1067,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, int len)
bgp_conn_enter_established_state(conn); bgp_conn_enter_established_state(conn);
if (conn->state != BS_ESTABLISHED) if (conn->state != BS_ESTABLISHED)
{ bgp_error(conn, 5, 0, NULL, 0); return; } { bgp_error(conn, 5, fsm_err_subcode[conn->state], NULL, 0); return; }
bgp_start_timer(conn->hold_timer, conn->hold_time); bgp_start_timer(conn->hold_timer, conn->hold_time);
/* Find parts of the packet and check sizes */ /* Find parts of the packet and check sizes */
@ -1122,7 +1129,10 @@ static struct {
{ 3, 10, "Invalid network field" }, { 3, 10, "Invalid network field" },
{ 3, 11, "Malformed AS_PATH" }, { 3, 11, "Malformed AS_PATH" },
{ 4, 0, "Hold timer expired" }, { 4, 0, "Hold timer expired" },
{ 5, 0, "Finite state machine error" }, { 5, 0, "Finite state machine error" }, /* Subcodes are according to [RFC6608] */
{ 5, 1, "Unexpected message in OpenSent state" },
{ 5, 2, "Unexpected message in OpenConfirm state" },
{ 5, 3, "Unexpected message in Established state" },
{ 6, 0, "Cease" }, /* Subcodes are according to [RFC4486] */ { 6, 0, "Cease" }, /* Subcodes are according to [RFC4486] */
{ 6, 1, "Maximum number of prefixes reached" }, { 6, 1, "Maximum number of prefixes reached" },
{ 6, 2, "Administrative shutdown" }, { 6, 2, "Administrative shutdown" },
@ -1253,7 +1263,7 @@ bgp_rx_keepalive(struct bgp_conn *conn)
case BS_ESTABLISHED: case BS_ESTABLISHED:
break; break;
default: default:
bgp_error(conn, 5, 0, NULL, 0); bgp_error(conn, 5, fsm_err_subcode[conn->state], NULL, 0);
} }
} }
@ -1265,7 +1275,7 @@ bgp_rx_route_refresh(struct bgp_conn *conn, byte *pkt, int len)
BGP_TRACE(D_PACKETS, "Got ROUTE-REFRESH"); BGP_TRACE(D_PACKETS, "Got ROUTE-REFRESH");
if (conn->state != BS_ESTABLISHED) if (conn->state != BS_ESTABLISHED)
{ bgp_error(conn, 5, 0, NULL, 0); return; } { bgp_error(conn, 5, fsm_err_subcode[conn->state], NULL, 0); return; }
if (!p->cf->enable_refresh) if (!p->cf->enable_refresh)
{ bgp_error(conn, 1, 3, pkt+18, 1); return; } { bgp_error(conn, 1, 3, pkt+18, 1); return; }