static void _ppp_cleanup (NMPPPManager *manager) { NMPPPManagerPrivate *priv; g_return_if_fail (NM_IS_PPP_MANAGER (manager)); priv = NM_PPP_MANAGER_GET_PRIVATE (manager); cancel_get_secrets (manager); if (priv->monitor_id) { g_source_remove (priv->monitor_id); priv->monitor_id = 0; } if (priv->monitor_fd) { /* Get the stats one last time */ monitor_cb (manager); close (priv->monitor_fd); priv->monitor_fd = 0; } if (priv->ppp_timeout_handler) { g_source_remove (priv->ppp_timeout_handler); priv->ppp_timeout_handler = 0; } if (priv->ppp_watch_id) { g_source_remove (priv->ppp_watch_id); priv->ppp_watch_id = 0; } if (priv->pid) { if (kill (priv->pid, SIGTERM) == 0) g_timeout_add_seconds (2, ensure_killed, GINT_TO_POINTER (priv->pid)); else { kill (priv->pid, SIGKILL); /* ensure the child is reaped */ nm_log_dbg (LOGD_PPP, "waiting for pppd pid %d to exit", priv->pid); waitpid (priv->pid, NULL, 0); nm_log_dbg (LOGD_PPP, "pppd pid %d cleaned up", priv->pid); } priv->pid = 0; } }
static void _ppp_cleanup (NMPPPManager *manager) { NMPPPManagerPrivate *priv; g_return_if_fail (NM_IS_PPP_MANAGER (manager)); priv = NM_PPP_MANAGER_GET_PRIVATE (manager); cancel_get_secrets (manager); nm_clear_g_source (&priv->monitor_id); if (priv->monitor_fd >= 0) { /* Get the stats one last time */ monitor_cb (manager); close (priv->monitor_fd); priv->monitor_fd = -1; } nm_clear_g_source (&priv->ppp_timeout_handler); nm_clear_g_source (&priv->ppp_watch_id); }