Fix MDL and MCL reference counting in IO watchers

When a io_watcher is added to an MDL or an MCL channel, its reference
should be incremented because the watcher should keep its own reference
the the structure.

Also a destroy function is added in order to decrement the reference
once the watcher is removed.

diff --git a/health/mcap.c b/health/mcap.c
index 8ecdc68..81fd8df 100644 (file)
--- a/health/mcap.c
+++ b/health/mcap.c
@@ -1638,8 +1638,11 @@ static void mcap_connect_mdl_cb(GIOChannel *chan, GError *conn_err,
        }
 
        mdl->state = MDL_CONNECTED;
-       mdl->wid = g_io_add_watch(mdl->dc, G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-                                               (GIOFunc) mdl_event_cb, mdl);
+       mdl->wid = g_io_add_watch_full(mdl->dc, G_PRIORITY_DEFAULT,
+                                       G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+                                       (GIOFunc) mdl_event_cb,
+                                       mcap_mdl_ref(mdl),
+                                       (GDestroyNotify) mcap_mdl_unref);
 
        cb(mdl, conn_err, user_data);
 }
@@ -1774,9 +1777,11 @@ static void mcap_connect_mcl_cb(GIOChannel *chan, GError *conn_err,
                                                        mcap_mcl_ref(mcl));
        }
 
-       mcl->wid = g_io_add_watch(mcl->cc,
+       mcl->wid = g_io_add_watch_full(mcl->cc, G_PRIORITY_DEFAULT,
                                G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-                               (GIOFunc) mcl_control_cb, mcl);
+                               (GIOFunc) mcl_control_cb,
+                               mcap_mcl_ref(mcl),
+                               (GDestroyNotify) mcap_mcl_unref);
        connect_cb(mcl, gerr, data);
 }
 
@@ -1786,8 +1791,11 @@ static void set_mdl_properties(GIOChannel *chan, struct mcap_mdl *mdl)
 
        mdl->state = MDL_CONNECTED;
        mdl->dc = g_io_channel_ref(chan);
-       mdl->wid = g_io_add_watch(mdl->dc, G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-                                               (GIOFunc) mdl_event_cb, mdl);
+       mdl->wid = g_io_add_watch_full(mdl->dc, G_PRIORITY_DEFAULT,
+                                       G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+                                       (GIOFunc) mdl_event_cb,
+                                       mcap_mdl_ref(mdl),
+                                       (GDestroyNotify) mcap_mdl_unref);
 
        mcl->state = MCL_ACTIVE;
        mcl->cb->mdl_connected(mdl, mcl->cb->user_data);
@@ -1919,9 +1927,11 @@ static void set_mcl_conf(GIOChannel *chan, struct mcap_mcl *mcl)
                mcl->mi->mcls = g_slist_prepend(mcl->mi->mcls,
                                                        mcap_mcl_ref(mcl));
 
-       mcl->wid = g_io_add_watch(mcl->cc,
-                       G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-                       (GIOFunc) mcl_control_cb, mcl);
+       mcl->wid = g_io_add_watch_full(mcl->cc, G_PRIORITY_DEFAULT,
+                               G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+                               (GIOFunc) mcl_control_cb,
+                               mcap_mcl_ref(mcl),
+                               (GDestroyNotify) mcap_mcl_unref);
 
        /* Callback to report new MCL */
        if (reconn)