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

Merge commit '8931425d02dd8656b48142f608d3119ab6f4a96f' into integrated

Browse Source 
Conflicts:

	nest/rt-table.c
This commit is contained in:
Ondrej Zajicek 2014-04-29 16:05:47 +02:00
commit 51e37fbb40
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nest/rt-table.c
View File

@ -643,6 +643,7 @@ rte_recalculate(struct announce_hook *ah, net *net, rte *new, ea_list *tmpa, str
struct proto *p = ah->proto; struct proto *p = ah->proto;
struct rtable *table = ah->table; struct rtable *table = ah->table;
struct proto_stats *stats = ah->stats; struct proto_stats *stats = ah->stats;
static struct rate_limit rl_pipe;
rte *before_old = NULL; rte *before_old = NULL;
rte *old_best = net->routes; rte *old_best = net->routes;
rte *old = NULL; rte *old = NULL;
@ -666,7 +667,7 @@ rte_recalculate(struct announce_hook *ah, net *net, rte *new, ea_list *tmpa, str
{ {
if (new) if (new)
{ {
log(L_ERR "Pipe collision detected when sending %F to table %s", log_rl(&rl_pipe, L_ERR "Pipe collision detected when sending %F to table %s",
&net->n, table->name); &net->n, table->name);
rte_free_quick(new); rte_free_quick(new);
} }
@ -1335,6 +1336,7 @@ rt_init(void)
static inline int static inline int
rt_prune_step(rtable *tab, int step, int *max_feed) rt_prune_step(rtable *tab, int step, int *max_feed)
{ {
static struct rate_limit rl_flush;
struct fib_iterator *fit = &tab->prune_fit; struct fib_iterator *fit = &tab->prune_fit;
DBG("Pruning route table %s\n", tab->name); DBG("Pruning route table %s\n", tab->name);
@ -1369,7 +1371,7 @@ again:
} }
if (step) if (step)
log(L_WARN "Route %I/%d from %s still in %s after flush", log_rl(&rl_flush, L_WARN "Route %I/%d from %s still in %s after flush",
n->n.prefix, n->n.pxlen, e->attrs->proto->name, tab->name); n->n.prefix, n->n.pxlen, e->attrs->proto->name, tab->name);
rte_discard(tab, e); rte_discard(tab, e);

1
sysdep/cf/bsd-v6.h
View File

@ -13,6 +13,7 @@
#define CONFIG_MULTIPLE_TABLES #define CONFIG_MULTIPLE_TABLES
#define CONFIG_SKIP_MC_BIND #define CONFIG_SKIP_MC_BIND
#define CONFIG_NO_IFACE_BIND
/* /*
Link: sysdep/unix Link: sysdep/unix

1
sysdep/cf/bsd.h
View File

@ -11,6 +11,7 @@
#define CONFIG_MULTIPLE_TABLES #define CONFIG_MULTIPLE_TABLES
#define CONFIG_SKIP_MC_BIND #define CONFIG_SKIP_MC_BIND
#define CONFIG_NO_IFACE_BIND
/* /*
Link: sysdep/unix Link: sysdep/unix

9
sysdep/unix/io.c
View File

@ -1262,6 +1262,15 @@ sk_open(sock *s)
int one = 1; int one = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
ERR("SO_REUSEADDR"); ERR("SO_REUSEADDR");
#ifdef CONFIG_NO_IFACE_BIND
/* Workaround missing ability to bind to an iface */
if ((type == SK_UDP) && s->iface && ipa_zero(s->saddr))
{
if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)) < 0)
ERR("SO_REUSEPORT");
}
#endif
} }
sockaddr_fill(sa, s->saddr, s->iface, port); sockaddr_fill(sa, s->saddr, s->iface, port);