diff options
Diffstat (limited to 'src/if.c')
| -rw-r--r-- | src/if.c | 40 |
1 files changed, 29 insertions, 11 deletions
@@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /* * dhcpcd - DHCP client daemon - * Copyright (c) 2006-2021 Roy Marples <roy@marples.name> + * Copyright (c) 2006-2023 Roy Marples <roy@marples.name> * All rights reserved * Redistribution and use in source and binary forms, with or without @@ -132,17 +132,18 @@ void if_closesockets(struct dhcpcd_ctx *ctx) { - if (ctx->pf_inet_fd != -1) - close(ctx->pf_inet_fd); -#ifdef PF_LINK - if (ctx->pf_link_fd != -1) - close(ctx->pf_link_fd); -#endif + if (ctx->link_fd != -1) { + eloop_event_delete(ctx->eloop, ctx->link_fd); + close(ctx->link_fd); + ctx->link_fd = -1; + } - if (ctx->priv) { - if_closesockets_os(ctx); - free(ctx->priv); + if (ctx->pf_inet_fd != -1) { + close(ctx->pf_inet_fd); + ctx->pf_inet_fd = -1; } + + if_closesockets_os(ctx); } int @@ -356,6 +357,16 @@ if_learnaddrs(struct dhcpcd_ctx *ctx, struct if_head *ifs, #endif } } +} + +void if_freeifaddrs(struct dhcpcd_ctx *ctx, struct ifaddrs **ifaddrs) +{ +#ifndef PRIVSEP_GETIFADDRS + UNUSED(ctx); +#endif + + if (ifaddrs == NULL) + return; #ifdef PRIVSEP_GETIFADDRS if (IN_PRIVSEP(ctx)) @@ -363,7 +374,6 @@ if_learnaddrs(struct dhcpcd_ctx *ctx, struct if_head *ifs, else #endif freeifaddrs(*ifaddrs); - *ifaddrs = NULL; } void @@ -973,6 +983,10 @@ xsocket(int domain, int type, int protocol) if ((s = socket(domain, type, protocol)) == -1) return -1; +#ifdef DEBUG_FD + logerrx("pid %d fd=%d domain=%d type=%d protocol=%d", + getpid(), s, domain, type, protocol); +#endif #ifndef HAVE_SOCK_CLOEXEC if ((xtype & SOCK_CLOEXEC) && ((xflags = fcntl(s, F_GETFD)) == -1 || @@ -1014,6 +1028,10 @@ xsocketpair(int domain, int type, int protocol, int fd[2]) if ((s = socketpair(domain, type, protocol, fd)) == -1) return -1; +#ifdef DEBUG_FD + logerrx("pid %d fd[0]=%d fd[1]=%d", getpid(), fd[0], fd[1]); +#endif + #ifndef HAVE_SOCK_CLOEXEC if ((xtype & SOCK_CLOEXEC) && ((xflags = fcntl(fd[0], F_GETFD)) == -1 || fcntl(fd[0], F_SETFD, xflags | FD_CLOEXEC) == -1)) |