sd-ndisc: introduce sd_ndisc_is_running()

diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c
index fe81794e3dfedb1717cad830d7fbc271521a3d55..0b5626670b92237b3a1ea957c69e512514c5c3cf 100644 (file)
--- a/src/libsystemd-network/sd-ndisc.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -42,6 +42,13 @@ static void ndisc_callback(sd_ndisc *ndisc, sd_ndisc_event_t event, sd_ndisc_rou
         ndisc->callback(ndisc, event, rt, ndisc->userdata);
 }
 
+int sd_ndisc_is_running(sd_ndisc *nd) {
+        if (!nd)
+                return false;
+
+        return sd_event_source_get_enabled(nd->recv_event_source, NULL) > 0;
+}
+
 int sd_ndisc_set_callback(
                 sd_ndisc *nd,
                 sd_ndisc_callback_t callback,
@@ -58,7 +65,7 @@ int sd_ndisc_set_callback(
 int sd_ndisc_set_ifindex(sd_ndisc *nd, int ifindex) {
         assert_return(nd, -EINVAL);
         assert_return(ifindex > 0, -EINVAL);
-        assert_return(nd->fd < 0, -EBUSY);
+        assert_return(!sd_ndisc_is_running(nd), -EBUSY);
 
         nd->ifindex = ifindex;
         return 0;
@@ -104,7 +111,7 @@ int sd_ndisc_attach_event(sd_ndisc *nd, sd_event *event, int64_t priority) {
         int r;
 
         assert_return(nd, -EINVAL);
-        assert_return(nd->fd < 0, -EBUSY);
+        assert_return(!sd_ndisc_is_running(nd), -EBUSY);
         assert_return(!nd->event, -EBUSY);
 
         if (event)
@@ -123,7 +130,7 @@ int sd_ndisc_attach_event(sd_ndisc *nd, sd_event *event, int64_t priority) {
 int sd_ndisc_detach_event(sd_ndisc *nd) {
 
         assert_return(nd, -EINVAL);
-        assert_return(nd->fd < 0, -EBUSY);
+        assert_return(!sd_ndisc_is_running(nd), -EBUSY);
 
         nd->event = sd_event_unref(nd->event);
         return 0;
@@ -316,7 +323,7 @@ int sd_ndisc_stop(sd_ndisc *nd) {
         if (!nd)
                 return 0;
 
-        if (nd->fd < 0)
+        if (!sd_ndisc_is_running(nd))
                 return 0;
 
         log_ndisc(nd, "Stopping IPv6 Router Solicitation client");
@@ -333,7 +340,7 @@ int sd_ndisc_start(sd_ndisc *nd) {
         assert_return(nd->event, -EINVAL);
         assert_return(nd->ifindex > 0, -EINVAL);
 
-        if (nd->fd >= 0)
+        if (sd_ndisc_is_running(nd))
                 return 0;
 
         assert(!nd->recv_event_source);

diff --git a/src/systemd/sd-ndisc.h b/src/systemd/sd-ndisc.h
index c348e505ede3dc1d529d56c00cc115a27dca284b..1bc7c738894e26227c426c8b514477160ec55915 100644 (file)
--- a/src/systemd/sd-ndisc.h
+++ b/src/systemd/sd-ndisc.h
@@ -52,6 +52,7 @@ _SD_DEFINE_POINTER_CLEANUP_FUNC(sd_ndisc, sd_ndisc_unref);
 
 int sd_ndisc_start(sd_ndisc *nd);
 int sd_ndisc_stop(sd_ndisc *nd);
+int sd_ndisc_is_running(sd_ndisc *nd);
 
 int sd_ndisc_attach_event(sd_ndisc *nd, sd_event *event, int64_t priority);
 int sd_ndisc_detach_event(sd_ndisc *nd);