Linux netlink nlmsg_pid is not process id - only the first socket opened

has that. So after opening the link socket, open a persistent route socket
and record the nlmsg_pid the kernel creates which is guaranteed unique
and won't clash with a process id which can then be ignored by testing it
directly and not that it's some large number.

1 files changed, 18 insertions, 1 deletions

diff --git a/if.c b/if.c
index a3b1e02d..d482a755 100644
--- a/if.c
+++ b/if.c
@@ -89,7 +89,7 @@ int
 if_opensockets(struct dhcpcd_ctx *ctx)
 {
 
-	if ((ctx->link_fd = if_openlinksocket()) == -1)
+	if (if_opensockets_os(ctx) == -1)
 		return -1;
 
 	/* We use this socket for some operations without INET. */
@@ -113,6 +113,23 @@ if_opensockets(struct dhcpcd_ctx *ctx)
 	return 0;
 }
 
+void
+if_closesockets(struct dhcpcd_ctx *ctx)
+{
+
+	if (ctx->pf_inet_fd != -1)
+		close(ctx->pf_inet_fd);
+#ifdef IFLR_ACTIVE
+	if (ctx->pf_link_fd != -1)
+		close(ctx->pf_link_fd);
+#endif
+
+	if (ctx->priv) {
+		if_closesockets_os(ctx);
+		free(ctx->priv);
+	}
+}
+
 int
 if_carrier(struct interface *ifp)
 {