mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-08 12:18:42 +00:00
Code Releases Activity

BGP: Update SendHoldTimer BGP Error code

Browse Source 
IANA registered an "Early Allocation" BGP Error code for 'Send Hold
Timer Expired' event. Update BIRD to use that error code.
This commit is contained in:
Job Snijders 2024-02-18 09:00:10 +01:00 committed by Ondrej Zajicek
parent c3335b5044
commit 44a16bff6c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proto/bgp/bgp.c
View File

@ -1059,12 +1059,13 @@ bgp_send_hold_timeout(timer *t)
struct bgp_conn *conn = t->data; struct bgp_conn *conn = t->data;
struct bgp_proto *p = conn->bgp; struct bgp_proto *p = conn->bgp;
DBG("BGP: Send hold timeout\n");
if (conn->state == BS_CLOSE) if (conn->state == BS_CLOSE)
return; return;
/* Error codes not yet assigned by IANA */ uint code = 8;
uint code = 4; uint subcode = 0;
uint subcode = 1;
/* Like bgp_error() but without NOTIFICATION */ /* Like bgp_error() but without NOTIFICATION */
bgp_log_error(p, BE_BGP_TX, "Error", code, subcode, NULL, 0); bgp_log_error(p, BE_BGP_TX, "Error", code, subcode, NULL, 0);

4
proto/bgp/packets.c
View File

@ -3275,7 +3275,6 @@ 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" },
{ 4, 1, "Send hold timer expired" }, /* Provisional [draft-ietf-idr-bgp-sendholdtimer] */
{ 5, 0, "Finite state machine error" }, /* Subcodes are according to [RFC6608] */ { 5, 0, "Finite state machine error" }, /* Subcodes are according to [RFC6608] */
{ 5, 1, "Unexpected message in OpenSent state" }, { 5, 1, "Unexpected message in OpenSent state" },
{ 5, 2, "Unexpected message in OpenConfirm state" }, { 5, 2, "Unexpected message in OpenConfirm state" },
@ -3290,7 +3289,8 @@ static struct {
{ 6, 7, "Connection collision resolution" }, { 6, 7, "Connection collision resolution" },
{ 6, 8, "Out of Resources" }, { 6, 8, "Out of Resources" },
{ 7, 0, "Invalid ROUTE-REFRESH message" }, /* [RFC7313] */ { 7, 0, "Invalid ROUTE-REFRESH message" }, /* [RFC7313] */
{ 7, 1, "Invalid ROUTE-REFRESH message length" } /* [RFC7313] */ { 7, 1, "Invalid ROUTE-REFRESH message length" }, /* [RFC7313] */
{ 8, 0, "Send hold timer expired" }, /* [draft-ietf-idr-bgp-sendholdtimer] */
}; };
/** /**