proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 15:17:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3527 from opensourcerouting/ldpd-bsd-fixes

Browse Source 
ldpd: *BSD fixes
This commit is contained in:
Donald Sharp 2018-12-21 20:20:48 -05:00 committed by GitHub
commit a60df89e65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ldpd/ldpe.c
View File

@ -139,6 +139,16 @@ ldpe(void)
void void
ldpe_init(struct ldpd_init *init) ldpe_init(struct ldpd_init *init)
{ {
#ifdef __OpenBSD__
/* This socket must be open before dropping privileges. */
global.pfkeysock = pfkey_init();
if (sysdep.no_pfkey == 0) {
pfkey_ev = NULL;
thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock,
&pfkey_ev);
}
#endif
/* drop privileges */ /* drop privileges */
ldpe_privs.user = init->user; ldpe_privs.user = init->user;
ldpe_privs.group = init->group; ldpe_privs.group = init->group;
@ -159,14 +169,6 @@ ldpe_init(struct ldpd_init *init)
fatal("inet_pton"); fatal("inet_pton");
if (inet_pton(AF_INET6, AllRouters_v6, &global.mcast_addr_v6) != 1) if (inet_pton(AF_INET6, AllRouters_v6, &global.mcast_addr_v6) != 1)
fatal("inet_pton"); fatal("inet_pton");
#ifdef __OpenBSD__
global.pfkeysock = pfkey_init();
if (sysdep.no_pfkey == 0) {
pfkey_ev = NULL;
thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock,
&pfkey_ev);
}
#endif
/* mark sockets as closed */ /* mark sockets as closed */
global.ipv4.ldp_disc_socket = -1; global.ipv4.ldp_disc_socket = -1;

13
ldpd/socket.c
View File

@ -268,9 +268,18 @@ sock_set_bindany(int fd, int enable)
return (-1); return (-1);
} }
return (0); return (0);
#elif defined(IP_BINDANY)
frr_elevate_privs(&ldpd_privs) {
if (setsockopt(fd, IPPROTO_IP, IP_BINDANY, &enable, sizeof(int))
< 0) {
log_warn("%s: error setting IP_BINDANY", __func__);
return (-1);
}
}
#else #else
log_warnx("%s: missing SO_BINDANY and IP_FREEBIND, unable to bind " log_warnx(
"to a nonlocal IP address", __func__); "%s: missing SO_BINDANY, IP_FREEBIND and IP_BINDANY, unable to bind to a nonlocal IP address",
__func__);
return (-1); return (-1);
#endif /* HAVE_SO_BINDANY */ #endif /* HAVE_SO_BINDANY */
} }

2
zebra/kernel_socket.c
View File

@ -139,7 +139,9 @@ const struct message rtm_type_str[] = {{RTM_ADD, "RTM_ADD"},
{RTM_LOSING, "RTM_LOSING"}, {RTM_LOSING, "RTM_LOSING"},
{RTM_REDIRECT, "RTM_REDIRECT"}, {RTM_REDIRECT, "RTM_REDIRECT"},
{RTM_MISS, "RTM_MISS"}, {RTM_MISS, "RTM_MISS"},
#ifdef RTM_LOCK
{RTM_LOCK, "RTM_LOCK"}, {RTM_LOCK, "RTM_LOCK"},
#endif /* RTM_LOCK */
#ifdef OLDADD #ifdef OLDADD
{RTM_OLDADD, "RTM_OLDADD"}, {RTM_OLDADD, "RTM_OLDADD"},
#endif /* RTM_OLDADD */ #endif /* RTM_OLDADD */