mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00
Code Releases Activity

Merge commit 'f83ce94d5e410d5e5b921121867321c19451896b' into integrated

Browse Source
This commit is contained in:
Ondrej Zajicek 2014-04-29 15:08:17 +02:00
commit 6310da3509
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nest/neighbor.c
View File

@ -230,7 +230,7 @@ neigh_up(neighbor *n, struct iface *i, int scope)
static void
neigh_down(neighbor *n)
{
DBG("Flushing neighbor %I on %s\n", n->addr, i->name);
DBG("Flushing neighbor %I on %s\n", n->addr, n->iface->name);
rem_node(&n->if_n);
if (! (n->flags & NEF_BIND))
n->iface = NULL;

12
sysdep/linux/netlink.c
View File

@ -7,6 +7,7 @@
*/
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/socket.h>
#include <sys/uio.h>
@ -1060,11 +1061,9 @@ nl_open_async(void)
sock *sk;
struct sockaddr_nl sa;
int fd;
static int nl_open_tried = 0;
if (nl_open_tried)
if (nl_async_sk)
return;
nl_open_tried = 1;
DBG("KRT: Opening async netlink socket\n");
@ -1083,18 +1082,18 @@ nl_open_async(void)
if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0)
{
log(L_ERR "Unable to bind asynchronous rtnetlink socket: %m");
close(fd);
return;
}
nl_async_rx_buffer = xmalloc(NL_RX_SIZE);
sk = nl_async_sk = sk_new(krt_pool);
sk->type = SK_MAGIC;
sk->rx_hook = nl_async_hook;
sk->fd = fd;
if (sk_open(sk))
bug("Netlink: sk_open failed");
if (!nl_async_rx_buffer)
nl_async_rx_buffer = xmalloc(NL_RX_SIZE);
}
/*
@ -1113,6 +1112,7 @@ krt_sys_start(struct krt_proto *p)
void
krt_sys_shutdown(struct krt_proto *p UNUSED)
{
nl_tablex_map(p->addr_type == RT_IPV4)[KRT_CF->sys.table_id] = NULL;
}
int