sd-icmp6-nd: Add function to stop ongoing ICMPv6 discovery

In some use cases stopping an ongoing ICMPv6 discovery is more
useful than always unreferencing the whole structure.

diff --git a/src/libsystemd-network/sd-icmp6-nd.c b/src/libsystemd-network/sd-icmp6-nd.c
index 10c5e5e87efd522f59d54a0aae98292c14273961..80915c34d6bcb66c3915b25fe41bea70ed98f4af 100644 (file)
--- a/src/libsystemd-network/sd-icmp6-nd.c
+++ b/src/libsystemd-network/sd-icmp6-nd.c
@@ -282,6 +282,19 @@ static int icmp6_router_solicitation_timeout(sd_event_source *s, uint64_t usec,
         return 0;
 }
 
         return 0;
 }
 

+int sd_icmp6_nd_stop(sd_icmp6_nd *nd) {
+        assert_return(nd, -EINVAL);
+        assert_return(nd->event, -EINVAL);
+
+        log_icmp6_nd(client, "Stop ICMPv6");
+
+        icmp6_nd_init(nd);
+
+        nd->state = ICMP6_NEIGHBOR_DISCOVERY_IDLE;
+
+        return 0;
+}
+

 int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) {
         int r;
 
 int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) {
         int r;
 

diff --git a/src/libsystemd-network/test-icmp6-rs.c b/src/libsystemd-network/test-icmp6-rs.c
index cd5c4764e3abd44e4dad610a553fce732c8767d2..b81211f6bcb7a6b5ec4c34b8466953361f16ef2a 100644 (file)
--- a/src/libsystemd-network/test-icmp6-rs.c
+++ b/src/libsystemd-network/test-icmp6-rs.c
@@ -127,6 +127,10 @@ static void test_rs(sd_event *e) {
                                  time_now + 2 *USEC_PER_SEC, 0,
                                  test_rs_hangcheck, NULL) >= 0);
 
                                  time_now + 2 *USEC_PER_SEC, 0,
                                  test_rs_hangcheck, NULL) >= 0);
 

+        assert(sd_icmp6_nd_stop(nd) >= 0);
+        assert(sd_icmp6_router_solicitation_start(nd) >= 0);
+        assert(sd_icmp6_nd_stop(nd) >= 0);
+

         assert(sd_icmp6_router_solicitation_start(nd) >= 0);
 
         sd_event_loop(e);
         assert(sd_icmp6_router_solicitation_start(nd) >= 0);
 
         sd_event_loop(e);

diff --git a/src/systemd/sd-icmp6-nd.h b/src/systemd/sd-icmp6-nd.h
index 5e9dc0aa267d7a43df3c07e4cd102ddb89eb1949..73f91aad1b99e4375d97b49bf2244c872465e1f2 100644 (file)
--- a/src/systemd/sd-icmp6-nd.h
+++ b/src/systemd/sd-icmp6-nd.h
@@ -51,6 +51,7 @@ sd_icmp6_nd *sd_icmp6_nd_ref(sd_icmp6_nd *nd);
 sd_icmp6_nd *sd_icmp6_nd_unref(sd_icmp6_nd *nd);
 int sd_icmp6_nd_new(sd_icmp6_nd **ret);
 
 sd_icmp6_nd *sd_icmp6_nd_unref(sd_icmp6_nd *nd);
 int sd_icmp6_nd_new(sd_icmp6_nd **ret);
 

+int sd_icmp6_nd_stop(sd_icmp6_nd *nd);

 int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd);
 
 #endif
 int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd);
 
 #endif