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

Make BGP protocol instance search a separate function

Browse source 
Thanks to Alexander V. Chernikov for the patch.
This commit is contained in:
Ondrej Zajicek 2015-02-21 20:39:59 +01:00
parent 6264aad16f
commit 374917adcc
1 changed files with 63 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
proto/bgp/bgp.c
View file

@ -712,6 +712,28 @@ bgp_connect(struct bgp_proto *p) /* Enter Connect state and start establishing c
return; return;
} }
/**
* bgp_find_proto - find existing proto for incoming connection
* @sk: TCP socket
*
*/
static struct bgp_proto *
bgp_find_proto(sock *sk)
{
struct proto_config *pc;
WALK_LIST(pc, config->protos)
if ((pc->protocol == &proto_bgp) && pc->proto)
{
struct bgp_proto *p = (struct bgp_proto *) pc->proto;
if (ipa_equal(p->cf->remote_ip, sk->daddr) &&
(!ipa_is_link_local(sk->daddr) || (p->cf->iface == sk->iface)))
return p;
}
return NULL;
}
/** /**
* bgp_incoming_connection - handle an incoming connection * bgp_incoming_connection - handle an incoming connection
* @sk: TCP socket * @sk: TCP socket
@ -727,60 +749,58 @@ bgp_connect(struct bgp_proto *p) /* Enter Connect state and start establishing c
static int static int
bgp_incoming_connection(sock *sk, int dummy UNUSED) bgp_incoming_connection(sock *sk, int dummy UNUSED)
{ {
struct proto_config *pc; struct bgp_proto *p;
int acc, hops;
DBG("BGP: Incoming connection from %I port %d\n", sk->daddr, sk->dport); DBG("BGP: Incoming connection from %I port %d\n", sk->daddr, sk->dport);
WALK_LIST(pc, config->protos) p = bgp_find_proto(sk);
if (pc->protocol == &proto_bgp && pc->proto) if (!p)
{ {
struct bgp_proto *p = (struct bgp_proto *) pc->proto; log(L_WARN "BGP: Unexpected connect from unknown address %I%J (port %d)",
if (ipa_equal(p->cf->remote_ip, sk->daddr) && sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL, sk->dport);
(!ipa_is_link_local(sk->daddr) || (p->cf->iface == sk->iface))) rfree(sk);
{ return 0;
/* We are in proper state and there is no other incoming connection */ }
int acc = (p->p.proto_state == PS_START || p->p.proto_state == PS_UP) &&
(p->start_state >= BSS_CONNECT) && (!p->incoming_conn.sk);
if (p->conn && (p->conn->state == BS_ESTABLISHED) && p->gr_ready) /* We are in proper state and there is no other incoming connection */
{ acc = (p->p.proto_state == PS_START || p->p.proto_state == PS_UP) &&
bgp_store_error(p, NULL, BE_MISC, BEM_GRACEFUL_RESTART); (p->start_state >= BSS_CONNECT) && (!p->incoming_conn.sk);
bgp_handle_graceful_restart(p);
bgp_conn_enter_idle_state(p->conn);
acc = 1;
}
BGP_TRACE(D_EVENTS, "Incoming connection from %I%J (port %d) %s", if (p->conn && (p->conn->state == BS_ESTABLISHED) && p->gr_ready)
sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL, {
sk->dport, acc ? "accepted" : "rejected"); bgp_store_error(p, NULL, BE_MISC, BEM_GRACEFUL_RESTART);
bgp_handle_graceful_restart(p);
bgp_conn_enter_idle_state(p->conn);
acc = 1;
}
if (!acc) BGP_TRACE(D_EVENTS, "Incoming connection from %I%J (port %d) %s",
goto reject; sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL,
sk->dport, acc ? "accepted" : "rejected");
int hops = p->cf->multihop ? : 1; if (!acc)
{
rfree(sk);
return 0;
}
if (sk_set_ttl(sk, p->cf->ttl_security ? 255 : hops) < 0) hops = p->cf->multihop ? : 1;
goto err;
if (p->cf->ttl_security) if (sk_set_ttl(sk, p->cf->ttl_security ? 255 : hops) < 0)
if (sk_set_min_ttl(sk, 256 - hops) < 0) goto err;
goto err;
bgp_setup_conn(p, &p->incoming_conn); if (p->cf->ttl_security)
bgp_setup_sk(&p->incoming_conn, sk); if (sk_set_min_ttl(sk, 256 - hops) < 0)
bgp_send_open(&p->incoming_conn); goto err;
return 0;
err: bgp_setup_conn(p, &p->incoming_conn);
sk_log_error(sk, p->p.name); bgp_setup_sk(&p->incoming_conn, sk);
log(L_ERR "%s: Incoming connection aborted", p->p.name); bgp_send_open(&p->incoming_conn);
rfree(sk); return 0;
return 0;
}
}
log(L_WARN "BGP: Unexpected connect from unknown address %I%J (port %d)", err:
sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL, sk->dport); sk_log_error(sk, p->p.name);
reject: log(L_ERR "%s: Incoming connection aborted", p->p.name);
rfree(sk); rfree(sk);
return 0; return 0;
} }