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

BGP: Add received role value to role mismatch log message

Browse Source
This commit is contained in:
Ondrej Zajicek 2023-01-20 15:55:47 +01:00 committed by Igor Putovny
parent c8a45af2b8
commit f8c5c22817
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proto/bgp/bgp.c
View File

@ -2363,7 +2363,7 @@ bgp_show_afis(int code, char *s, u32 *afis, uint count)
cli_msg(code, b.start); cli_msg(code, b.start);
} }
static const char * const char *
bgp_format_role_name(u8 role) bgp_format_role_name(u8 role)
{ {
static const char *bgp_role_names[] = { "provider", "rs_server", "rs_client", "customer", "peer" }; static const char *bgp_role_names[] = { "provider", "rs_server", "rs_client", "customer", "peer" };

4
proto/bgp/bgp.h
View File

@ -539,9 +539,7 @@ void bgp_refresh_begin(struct bgp_channel *c);
void bgp_refresh_end(struct bgp_channel *c); void bgp_refresh_end(struct bgp_channel *c);
void bgp_store_error(struct bgp_proto *p, struct bgp_conn *c, u8 class, u32 code); void bgp_store_error(struct bgp_proto *p, struct bgp_conn *c, u8 class, u32 code);
void bgp_stop(struct bgp_proto *p, int subcode, byte *data, uint len); void bgp_stop(struct bgp_proto *p, int subcode, byte *data, uint len);
const char *bgp_format_role_name(u8 role);
struct rte_source *bgp_find_source(struct bgp_proto *p, u32 path_id);
struct rte_source *bgp_get_source(struct bgp_proto *p, u32 path_id);
static inline int static inline int
rte_resolvable(rte *rt) rte_resolvable(rte *rt)

10
proto/bgp/packets.c
View File

@ -908,10 +908,10 @@ bgp_rx_open(struct bgp_conn *conn, byte *pkt, uint len)
(local_role == BGP_ROLE_PROVIDER && neigh_role == BGP_ROLE_CUSTOMER) || (local_role == BGP_ROLE_PROVIDER && neigh_role == BGP_ROLE_CUSTOMER) ||
(local_role == BGP_ROLE_RS_CLIENT && neigh_role == BGP_ROLE_RS_SERVER) || (local_role == BGP_ROLE_RS_CLIENT && neigh_role == BGP_ROLE_RS_SERVER) ||
(local_role == BGP_ROLE_RS_SERVER && neigh_role == BGP_ROLE_RS_CLIENT))) (local_role == BGP_ROLE_RS_SERVER && neigh_role == BGP_ROLE_RS_CLIENT)))
{ bgp_error(conn, 2, 11, NULL, 0); return; } { bgp_error(conn, 2, 11, &neigh_role, -1); return; }
if ((p->cf->require_roles) && (neigh_role == BGP_ROLE_UNDEFINED)) if ((p->cf->require_roles) && (neigh_role == BGP_ROLE_UNDEFINED))
{ bgp_error(conn, 2, 11, NULL, 0); return; } { bgp_error(conn, 2, 11, &neigh_role, -1); return; }
/* Check the other connection */ /* Check the other connection */
other = (conn == &p->outgoing_conn) ? &p->incoming_conn : &p->outgoing_conn; other = (conn == &p->outgoing_conn) ? &p->incoming_conn : &p->outgoing_conn;
@ -3158,6 +3158,12 @@ bgp_log_error(struct bgp_proto *p, u8 class, char *msg, uint code, uint subcode,
goto done; goto done;
} }
if ((code == 2) && (subcode == 11) && (len == 1))
{
t += bsprintf(t, " (%s)", bgp_format_role_name(get_u8(data)));
goto done;
}
/* RFC 8203 - shutdown communication */ /* RFC 8203 - shutdown communication */
if (((code == 6) && ((subcode == 2) || (subcode == 4)))) if (((code == 6) && ((subcode == 2) || (subcode == 4))))
if (bgp_handle_message(p, data, len, &t)) if (bgp_handle_message(p, data, len, &t))

4
proto/pipe/pipe.c
View File

@ -43,10 +43,6 @@
#include "pipe.h" #include "pipe.h"
#ifdef CONFIG_BGP
#include "proto/bgp/bgp.h"
#endif
static void static void
pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *old) pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *old)
{ {