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

Merge commit 'd429bc5c841a8e9d4c81786973edfa56d20a407e' into thread-next

Browse Source
This commit is contained in:
Maria Matejka 2022-07-13 12:54:20 +02:00
commit af0d5ec279
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proto/babel/babel.c
View File

@ -2257,9 +2257,9 @@ babel_kick_timer(struct babel_proto *p)
static int static int
babel_preexport(struct channel *c, struct rte *new) babel_preexport(struct channel *C, struct rte *new)
{ {
if (new->src->proto != c->proto) if (new->src->proto != C->proto)
return 0; return 0;
/* Reject our own unreachable routes */ /* Reject our own unreachable routes */

4
proto/bgp/attrs.c
View File

@ -1929,10 +1929,10 @@ bgp_setup_out_table(struct bgp_channel *c)
*/ */
int int
bgp_preexport(struct channel *c, rte *e) bgp_preexport(struct channel *C, rte *e)
{ {
struct proto *SRC = e->src->proto; struct proto *SRC = e->src->proto;
struct bgp_proto *p = (struct bgp_proto *) (c->proto); struct bgp_proto *p = (struct bgp_proto *) C->proto;
struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL; struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;
/* Reject our routes */ /* Reject our routes */

6
proto/ospf/ospf.c
View File

@ -486,13 +486,13 @@ ospf_disp(timer * timer)
* import to the filters. * import to the filters.
*/ */
static int static int
ospf_preexport(struct channel *c, rte *e) ospf_preexport(struct channel *C, rte *e)
{ {
struct ospf_proto *p = (struct ospf_proto *) c->proto; struct ospf_proto *p = (struct ospf_proto *) C->proto;
struct ospf_area *oa = ospf_main_area(p); struct ospf_area *oa = ospf_main_area(p);
/* Reject our own routes */ /* Reject our own routes */
if (e->src->proto == c->proto) if (e->src->proto == &p->p)
return -1; return -1;
/* Do not export routes to stub areas */ /* Do not export routes to stub areas */

10
proto/pipe/pipe.c
View File

@ -73,12 +73,12 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, const net_addr *n, rte *
} }
static int static int
pipe_preexport(struct channel *c, rte *e) pipe_preexport(struct channel *C, rte *e)
{ {
struct pipe_proto *p = (void *) c->proto; struct pipe_proto *p = (void *) C->proto;
/* Avoid direct loopbacks */ /* Avoid direct loopbacks */
if (e->sender == c->in_req.hook) if (e->sender == C->in_req.hook)
return -1; return -1;
/* Indirection check */ /* Indirection check */
@ -86,8 +86,8 @@ pipe_preexport(struct channel *c, rte *e)
if (e->generation >= max_generation) if (e->generation >= max_generation)
{ {
log_rl(&p->rl_gen, L_ERR "Route overpiped (%u hops of %u configured in %s) in table %s: %N %s/%u:%u", log_rl(&p->rl_gen, L_ERR "Route overpiped (%u hops of %u configured in %s) in table %s: %N %s/%u:%u",
e->generation, max_generation, c->proto->name, e->generation, max_generation, C->proto->name,
c->table->name, e->net, e->src->proto->name, e->src->private_id, e->src->global_id); C->table->name, e->net, e->src->proto->name, e->src->private_id, e->src->global_id);
return -1; return -1;
} }

4
proto/radv/radv.c
View File

@ -394,10 +394,10 @@ radv_net_match_trigger(struct radv_config *cf, const net_addr *n)
} }
int int
radv_preexport(struct channel *c, rte *new) radv_preexport(struct channel *C, rte *new)
{ {
// struct radv_proto *p = (struct radv_proto *) P; // struct radv_proto *p = (struct radv_proto *) P;
struct radv_config *cf = (struct radv_config *) (c->proto->cf); struct radv_config *cf = (struct radv_config *) (C->proto->cf);
if (radv_net_match_trigger(cf, new->net)) if (radv_net_match_trigger(cf, new->net))
return RIC_PROCESS; return RIC_PROCESS;

4
sysdep/unix/krt.c
View File

@ -681,9 +681,9 @@ krt_scan_timer_kick(struct krt_proto *p)
*/ */
static int static int
krt_preexport(struct channel *c, rte *e) krt_preexport(struct channel *C, rte *e)
{ {
if (e->src->proto == c->proto) if (e->src->proto == C->proto)
return -1; return -1;
if (!krt_capable(e)) if (!krt_capable(e))