Don't restore kernel RA defaults or drop RA's when forking.

Add some more memory cleanups when testing forking.

diff --git a/bind.c b/bind.c
index eed64a6010c87cdb3624c38d21b5816654610c0b..889d99e8cf8ecd7e54264f8fafc146ea5542dafe 100644 (file)
--- a/bind.c
+++ b/bind.c
@@ -109,6 +109,7 @@ daemonise(void)
                writepid(pidfd, pid);
                close(pidfd);
                pidfd = -1;
+               options |= DHCPCD_FORKED;
                exit(EXIT_SUCCESS);
        }
        options |= DHCPCD_DAEMONISED;

diff --git a/if-options.h b/if-options.h
index 3e083d87b39dc0d5bec3b05ad148c82a9a3cdde6..212cd8d40e74fe33c075d4d565767074545295a0 100644 (file)
--- a/if-options.h
+++ b/if-options.h
@@ -82,6 +82,7 @@
 #define DHCPCD_IPV6RA_OWN              (1ULL << 33)
 #define DHCPCD_IPV6RA_OWN_DEFAULT      (1ULL << 34)
 #define DHCPCD_IPV4                    (1ULL << 35)
+#define DHCPCD_FORKED                  (1ULL << 36)
 
 extern const struct option cf_options[];
 

diff --git a/ipv6.c b/ipv6.c
index e88035e6ae127e680a187b48f0389edea996d5f4..1367657e213d7ed80e9956ea14f66f1abaed775a 100644 (file)
--- a/ipv6.c
+++ b/ipv6.c
@@ -54,7 +54,12 @@ static struct rt6head *routes;
 static void
 ipv6_cleanup()
 {
+       struct rt6 *rt;
 
+       while ((rt = TAILQ_FIRST(routes))) {
+               TAILQ_REMOVE(routes, rt, next);
+               free(rt);
+       }
        free(routes);
 }
 #endif

diff --git a/ipv6rs.c b/ipv6rs.c
index 242ff7ca61fad94f0cc2fe33309679a6d8fb5fb1..95e148dc7f65060ca7397dddf2a57f6dd26f9b6f 100644 (file)
--- a/ipv6rs.c
+++ b/ipv6rs.c
@@ -263,14 +263,14 @@ ipv6rs_free_opts(struct ra *rap)
 }
 
 static void
-ipv6rs_drop_addrs(struct ra *rap)
+ipv6rs_freedrop_addrs(struct ra *rap, int drop)
 {
        struct ipv6_addr *ap;
 
        while ((ap = TAILQ_FIRST(&rap->addrs))) {
                TAILQ_REMOVE(&rap->addrs, ap, next);
-               if ((options & DHCPCD_IPV6RA_OWN)) {
-               syslog(LOG_INFO, "%s: deleting address %s",
+               if (drop && (options & DHCPCD_IPV6RA_OWN)) {
+                       syslog(LOG_INFO, "%s: deleting address %s",
                            rap->iface->name, ap->saddr);
                        if (del_address6(rap->iface, ap) == -1)
                                syslog(LOG_ERR, "del_address6 %m");
@@ -279,13 +279,13 @@ ipv6rs_drop_addrs(struct ra *rap)
        }
 }
 
-void ipv6rs_drop_ra(struct ra *rap)
+void ipv6rs_freedrop_ra(struct ra *rap, int drop)
 {
 
        delete_timeout(NULL, rap->iface);
        delete_timeout(NULL, rap);
        TAILQ_REMOVE(&ipv6_routers, rap, next);
-       ipv6rs_drop_addrs(rap);
+       ipv6rs_freedrop_addrs(rap, drop);
        ipv6rs_free_opts(rap);
        free(rap->data);
        free(rap->ns);
@@ -303,7 +303,7 @@ ipv6rs_free(struct interface *ifp)
        n = 0;
        TAILQ_FOREACH_SAFE(rap, &ipv6_routers, next, ran) {
                if (rap->iface == ifp) {
-                       ipv6rs_drop_ra(rap);
+                       ipv6rs_free_ra(rap);
                        n++;
                }
        }

diff --git a/ipv6rs.h b/ipv6rs.h
index 4af65450a1cefa53a161a45d95c41e1550592977..cae4058d41392f4efd2b4fc64201fb836c2f68ca 100644 (file)
--- a/ipv6rs.h
+++ b/ipv6rs.h
@@ -69,7 +69,9 @@ int ipv6rs_open(void);
 void ipv6rs_handledata(void *);
 int ipv6rs_start(struct interface *);
 ssize_t ipv6rs_env(char **, const char *, const struct interface *);
-void ipv6rs_drop_ra(struct ra *);
+void ipv6rs_freedrop_ra(struct ra *, int);
+#define ipv6rs_free_ra(ra) ipv6rs_freedrop_ra((ra),  0)
+#define ipv6rs_drop_ra(ra) ipv6rs_freedrop_ra((ra),  1)
 ssize_t ipv6rs_free(struct interface *);
 void ipv6rs_expire(void *arg);
 int ipv6rs_has_ra(const struct interface *);

diff --git a/platform-bsd.c b/platform-bsd.c
index fc6561307937f51e2b85e12ace3a02a0c11ce4ad..2304680e7d8a5b7487c81229dcd44c07011b5d9a 100644 (file)
--- a/platform-bsd.c
+++ b/platform-bsd.c
@@ -80,6 +80,8 @@ static void
 restore_kernel_ra(void)
 {
 
+       if (!(options & DHCPCD_FORKED))
+               return;
        syslog(LOG_INFO, "restoring Kernel IPv6 RA support");
        if (set_inet6_sysctl(IPV6CTL_ACCEPT_RTADV, 1) == -1)
                syslog(LOG_ERR, "IPV6CTL_ACCEPT_RTADV: %m");

diff --git a/platform-linux.c b/platform-linux.c
index 64059175e323d91b76aef90fa8dc42affba36b01..393e51987c602523d9b4587ed44d9093ffa0c0b3 100644 (file)
--- a/platform-linux.c
+++ b/platform-linux.c
@@ -146,7 +146,15 @@ restore_kernel_ra(void)
 {
        char path[256];
 
+#ifndef DEBUG_MEMORY
+       if (options & DHCPCD_FORKED)
+               return;
+#endif
+
        for (nrestore--; nrestore >= 0; nrestore--) {
+#ifdef DEBUG_MEMORY
+               if (!(options & DHCPCD_FORKED)) {
+#endif
                syslog(LOG_INFO, "%s: restoring Kernel IPv6 RA support",
                       restore[nrestore]);
                snprintf(path, sizeof(path), "%s/%s/accept_ra",
@@ -154,6 +162,7 @@ restore_kernel_ra(void)
                if (write_path(path, "1") == -1)
                        syslog(LOG_ERR, "write_path: %s: %m", path);
 #ifdef DEBUG_MEMORY
+               }
                free(restore[nrestore]);
 #endif
        }
@@ -179,7 +188,8 @@ check_ipv6(const char *ifname)
        if (r == 0)
                options |= DHCPCD_IPV6RA_OWN;
        else if (options & DHCPCD_IPV6RA_OWN) {
-               syslog(LOG_INFO, "disabling Kernel IPv6 RA support");
+               syslog(LOG_INFO, "%s: disabling Kernel IPv6 RA support",
+                   ifname);
                if (write_path(path, "0") == -1) {
                        syslog(LOG_ERR, "write_path: %s: %m", path);
                        return 0;