Remove dbus_connection_close() - not supposed to call this on a share…

…d connection.
sflow · Dec 15, 2016 · bdfb271 · bdfb271
1 parent 998d9b9
commit bdfb271
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 28 deletions.
diff --git a/src/Linux/mod_dbus.c b/src/Linux/mod_dbus.c
@@ -242,19 +242,6 @@ static const char* introspect_xml =
     }
   }
 
-  /*_________________---------------------------__________________
-    _________________         evt_final         __________________
-    -----------------___________________________------------------
-  */
-
-  static void evt_final(EVMod *mod, EVEvent *evt, void *data, size_t dataLen) {
-    HSP_mod_DBUS *mdata = (HSP_mod_DBUS *)mod->data;
-    if(mdata->connection) {
-      dbus_connection_close(mdata->connection);
-      mdata->connection = NULL;
-    }
-  }
-
   /*_________________---------------------------__________________
     _________________       send_reply          __________________
     -----------------___________________________------------------
@@ -480,7 +467,6 @@ static DBusHandlerResult dbusCB(DBusConnection *connection, DBusMessage *msg, vo
 
     // connection OK - so register call-backs
     EVEventRx(mod, EVGetEvent(mdata->pollBus, EVEVENT_DECI), evt_deci);
-    EVEventRx(mod, EVGetEvent(mdata->pollBus, EVEVENT_FINAL), evt_final);
   }
 
 #if defined(__cplusplus)

diff --git a/src/Linux/mod_systemd.c b/src/Linux/mod_systemd.c
@@ -1222,19 +1222,6 @@ extern "C" {
     SFLADD_ELEMENT(cs, &mdata->vnodeElem);
   }
 
-  /*_________________---------------------------__________________
-    _________________         evt_final         __________________
-    -----------------___________________________------------------
-  */
-
-  static void evt_final(EVMod *mod, EVEvent *evt, void *data, size_t dataLen) {
-    HSP_mod_SYSTEMD *mdata = (HSP_mod_SYSTEMD *)mod->data;
-    if(mdata->connection) {
-      dbus_connection_close(mdata->connection);
-      mdata->connection = NULL;
-    }
-  }
-
   /*_________________---------------------------__________________
     _________________       dbusCB              __________________
     -----------------___________________________------------------
@@ -1346,7 +1333,6 @@ static DBusHandlerResult dbusCB(DBusConnection *connection, DBusMessage *message
     EVEventRx(mod, EVGetEvent(mdata->pollBus, EVEVENT_TOCK), evt_tock);
     EVEventRx(mod, EVGetEvent(mdata->pollBus, HSPEVENT_HOST_COUNTER_SAMPLE), evt_host_cs);
     EVEventRx(mod, EVGetEvent(mdata->pollBus, HSPEVENT_CONFIG_FIRST), evt_config_first);
-    EVEventRx(mod, EVGetEvent(mdata->pollBus, EVEVENT_FINAL), evt_final);
   }
 
 #if defined(__cplusplus)