colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More verbose tracking of pppd

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3990 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-08-21 12:55:36 +00:00
parent f00b41e3f8
commit 1be9a6ecb7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ppp-manager/nm-ppp-manager.c
View File

@@ -585,7 +585,7 @@ nm_find_pppd (void)
} }
static void static void
ppp_exit_code (guint pppd_exit_status) ppp_exit_code (guint pppd_exit_status, GPid pid)
{ {
const char *msg; const char *msg;
@@ -653,7 +653,7 @@ ppp_exit_code (guint pppd_exit_status)
msg = "Unknown error"; msg = "Unknown error";
} }
g_warning ("pppd exited with error: %s", msg); nm_warning ("ppp pid %d exited with error: %s", pid, msg);
} }
static void static void
@@ -666,15 +666,16 @@ ppp_watch_cb (GPid pid, gint status, gpointer user_data)
if (WIFEXITED (status)) { if (WIFEXITED (status)) {
err = WEXITSTATUS (status); err = WEXITSTATUS (status);
if (err != 0) if (err != 0)
ppp_exit_code (err); ppp_exit_code (err, priv->pid);
} else if (WIFSTOPPED (status)) } else if (WIFSTOPPED (status))
g_warning ("ppp stopped unexpectedly with signal %d", WSTOPSIG (status)); nm_warning ("ppp pid %d stopped unexpectedly with signal %d", priv->pid, WSTOPSIG (status));
else if (WIFSIGNALED (status)) else if (WIFSIGNALED (status))
g_warning ("ppp died with signal %d", WTERMSIG (status)); nm_warning ("ppp pid %d died with signal %d", priv->pid, WTERMSIG (status));
else else
g_warning ("ppp died from an unknown cause"); nm_warning ("ppp pid %d died from an unknown cause", priv->pid);
/* Reap child if needed. */ /* Reap child if needed. */
nm_debug ("ppp pid %d cleaned up", priv->pid);
waitpid (pid, NULL, WNOHANG); waitpid (pid, NULL, WNOHANG);
priv->pid = 0; priv->pid = 0;
@@ -949,6 +950,7 @@ ensure_killed (gpointer data)
/* ensure the child is reaped */ /* ensure the child is reaped */
waitpid (pid, NULL, WNOHANG); waitpid (pid, NULL, WNOHANG);
nm_debug ("ppp pid %d cleaned up", pid);
return FALSE; return FALSE;
} }
@@ -991,6 +993,7 @@ nm_ppp_manager_stop (NMPPPManager *manager)
kill (priv->pid, SIGKILL); kill (priv->pid, SIGKILL);
/* ensure the child is reaped */ /* ensure the child is reaped */
waitpid (priv->pid, NULL, WNOHANG); waitpid (priv->pid, NULL, WNOHANG);
nm_debug ("ppp pid %d cleaned up", priv->pid);
} }
priv->pid = 0; priv->pid = 0;