mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Allows to configure different remote port for BGP sessions.

Browse Source 
Thanks to João Taveira Araújo for the original patch.
This commit is contained in:
Ondrej Zajicek 2014-10-02 11:33:55 +02:00
parent 252c7e4d0b
commit dcde7ae597
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf/confbase.Y
View File

@ -72,7 +72,7 @@ CF_DECLS
%token <t> TEXT %token <t> TEXT
%type <iface> ipa_scope %type <iface> ipa_scope
%type <i> expr bool pxlen %type <i> expr bool pxlen ipa_port
%type <i32> expr_us %type <i32> expr_us
%type <time> datetime %type <time> datetime
%type <a> ipa %type <a> ipa
@ -88,7 +88,7 @@ CF_DECLS
%left '!' %left '!'
%nonassoc '.' %nonassoc '.'
CF_KEYWORDS(DEFINE, ON, OFF, YES, NO, S, MS, US) CF_KEYWORDS(DEFINE, ON, OFF, YES, NO, S, MS, US, PORT)
CF_GRAMMAR CF_GRAMMAR
@ -161,6 +161,14 @@ ipa_scope:
| '%' SYM { $$ = if_get_by_name($2->name); } | '%' SYM { $$ = if_get_by_name($2->name); }
; ;
ipa_port:
/* empty */ { $$ = 0; }
| PORT expr {
if (($2 < 1) || ($2 > 65535)) cf_error("Invalid port number");
$$ = $2;
}
;
prefix: prefix:
ipa pxlen { ipa pxlen {
if (!ip_is_prefix($1, $2)) cf_error("Invalid prefix"); if (!ip_is_prefix($1, $2)) cf_error("Invalid prefix");

3
doc/bird.sgml
View File

@ -1004,7 +1004,6 @@ foot).
So <cf>1.2.0.0/16.pxlen = 16</cf> is true. So <cf>1.2.0.0/16.pxlen = 16</cf> is true.
<tag/ec/ <tag/ec/
This is a specialized type used to represent BGP extended community This is a specialized type used to represent BGP extended community
values. It is essentially a 64bit value, literals of this type are values. It is essentially a 64bit value, literals of this type are
usually written as <cf>(<m/kind/, <m/key/, <m/value/)</cf>, where usually written as <cf>(<m/kind/, <m/key/, <m/value/)</cf>, where
@ -1616,7 +1615,7 @@ using the following configuration parameters:
address, equivalent to the <cf/source address/ option (see below). This address, equivalent to the <cf/source address/ option (see below). This
parameter is mandatory. parameter is mandatory.
<tag>neighbor <m/ip/ as <m/number/</tag> <tag>neighbor <m/ip/ [port <m/number/] as <m/number/</tag>
Define neighboring router this instance will be talking to and what AS Define neighboring router this instance will be talking to and what AS
it's located in. In case the neighbor is in the same AS as we are, we it's located in. In case the neighbor is in the same AS as we are, we
automatically switch to iBGP. This parameter is mandatory. automatically switch to iBGP. This parameter is mandatory.

4
proto/bgp/bgp.c
View File

@ -680,8 +680,8 @@ bgp_connect(struct bgp_proto *p) /* Enter Connect state and start establishing c
s->type = SK_TCP_ACTIVE; s->type = SK_TCP_ACTIVE;
s->saddr = p->source_addr; s->saddr = p->source_addr;
s->daddr = p->cf->remote_ip; s->daddr = p->cf->remote_ip;
s->dport = p->cf->remote_port;
s->iface = p->neigh ? p->neigh->iface : NULL; s->iface = p->neigh ? p->neigh->iface : NULL;
s->dport = BGP_PORT;
s->ttl = p->cf->ttl_security ? 255 : hops; s->ttl = p->cf->ttl_security ? 255 : hops;
s->rbsize = BGP_RX_BUFFER_SIZE; s->rbsize = BGP_RX_BUFFER_SIZE;
s->tbsize = BGP_TX_BUFFER_SIZE; s->tbsize = BGP_TX_BUFFER_SIZE;
@ -1016,9 +1016,9 @@ bgp_start(struct proto *P)
lock = p->lock = olock_new(P->pool); lock = p->lock = olock_new(P->pool);
lock->addr = p->cf->remote_ip; lock->addr = p->cf->remote_ip;
lock->port = p->cf->remote_port;
lock->iface = p->cf->iface; lock->iface = p->cf->iface;
lock->type = OBJLOCK_TCP; lock->type = OBJLOCK_TCP;
lock->port = BGP_PORT;
lock->hook = bgp_start_locked; lock->hook = bgp_start_locked;
lock->data = p; lock->data = p;
olock_acquire(lock); olock_acquire(lock);

1
proto/bgp/bgp.h
View File

@ -23,6 +23,7 @@ struct bgp_config {
ip_addr remote_ip; ip_addr remote_ip;
ip_addr source_addr; /* Source address to use */ ip_addr source_addr; /* Source address to use */
struct iface *iface; /* Interface for link-local addresses */ struct iface *iface; /* Interface for link-local addresses */
u16 remote_port; /* Neighbor destination port */
int multihop; /* Number of hops if multihop */ int multihop; /* Number of hops if multihop */
int ttl_security; /* Enable TTL security [RFC5082] */ int ttl_security; /* Enable TTL security [RFC5082] */
int next_hop_self; /* Always set next hop to local IP address */ int next_hop_self; /* Always set next hop to local IP address */

5
proto/bgp/config.Y
View File

@ -60,7 +60,7 @@ bgp_proto:
| bgp_proto proto_item ';' | bgp_proto proto_item ';'
| bgp_proto LOCAL AS expr ';' { BGP_CFG->local_as = $4; } | bgp_proto LOCAL AS expr ';' { BGP_CFG->local_as = $4; }
| bgp_proto LOCAL ipa AS expr ';' { BGP_CFG->source_addr = $3; BGP_CFG->local_as = $5; } | bgp_proto LOCAL ipa AS expr ';' { BGP_CFG->source_addr = $3; BGP_CFG->local_as = $5; }
| bgp_proto NEIGHBOR ipa ipa_scope AS expr ';' { | bgp_proto NEIGHBOR ipa ipa_scope ipa_port AS expr ';' {
if (ipa_nonzero(BGP_CFG->remote_ip)) if (ipa_nonzero(BGP_CFG->remote_ip))
cf_error("Only one neighbor per BGP instance is allowed"); cf_error("Only one neighbor per BGP instance is allowed");
if (!ipa_has_link_scope($3) != !$4) if (!ipa_has_link_scope($3) != !$4)
@ -68,7 +68,8 @@ bgp_proto:
BGP_CFG->remote_ip = $3; BGP_CFG->remote_ip = $3;
BGP_CFG->iface = $4; BGP_CFG->iface = $4;
BGP_CFG->remote_as = $6; BGP_CFG->remote_port = ($5 > 0) ? $5 : BGP_PORT;
BGP_CFG->remote_as = $7;
} }
| bgp_proto RR CLUSTER ID idval ';' { BGP_CFG->rr_cluster_id = $5; } | bgp_proto RR CLUSTER ID idval ';' { BGP_CFG->rr_cluster_id = $5; }
| bgp_proto RR CLIENT ';' { BGP_CFG->rr_client = 1; } | bgp_proto RR CLIENT ';' { BGP_CFG->rr_client = 1; }