element: Remove IPv6

[framework/connectivity/connman.git] / src / task.c

diff --git a/src/task.c b/src/task.c
index 3997307..37bbe71 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -39,6 +39,7 @@ struct notify_data {
 struct connman_task {
        char *path;
        pid_t pid;
+       guint child_watch;
        GPtrArray *argv;
        GPtrArray *envp;
        connman_task_exit_t exit_func;
@@ -69,6 +70,9 @@ static void free_task(gpointer data)
        if (task->pid > 0)
                kill(task->pid, SIGTERM);
 
+       if (task->child_watch > 0)
+               g_source_remove(task->child_watch);
+
        g_ptr_array_foreach(task->envp, free_pointer, NULL);
        g_ptr_array_free(task->envp, TRUE);
 
@@ -242,17 +246,23 @@ int connman_task_set_notify(struct connman_task *task, const char *member,
 static void task_died(GPid pid, gint status, gpointer user_data)
 {
        struct connman_task *task = user_data;
+       int exit_code;
 
-       if (WIFEXITED(status))
-               DBG("task %p exit status %d", task, WEXITSTATUS(status));
-       else
+       if (WIFEXITED(status)) {
+               exit_code = WEXITSTATUS(status);
+               DBG("task %p exit status %d", task, exit_code);
+       } else {
+               exit_code = 0;
                DBG("task %p signal %d", task, WTERMSIG(status));
+       }
 
        g_spawn_close_pid(pid);
        task->pid = -1;
 
+       task->child_watch = 0;
+
        if (task->exit_func)
-               task->exit_func(task, task->exit_data);
+               task->exit_func(task, exit_code, task->exit_data);
 }
 
 static void task_setup(gpointer user_data)
@@ -273,11 +283,10 @@ static void task_setup(gpointer user_data)
  */
 int connman_task_run(struct connman_task *task,
                        connman_task_exit_t function, void *user_data,
-                       int *fd, int *standard_output, int *standard_error)
+                       int *stdin_fd, int *stdout_fd, int *stderr_fd)
 {
+       GSpawnFlags flags = G_SPAWN_DO_NOT_REAP_CHILD;
        gboolean result;
-       GSpawnFlags flags = G_SPAWN_DO_NOT_REAP_CHILD |
-                                               G_SPAWN_STDOUT_TO_DEV_NULL;
        char **argv, **envp;
 
        DBG("task %p", task);
@@ -285,9 +294,10 @@ int connman_task_run(struct connman_task *task,
        if (task->pid > 0)
                return -EALREADY;
 
-       if (standard_output == NULL)
+       if (stdout_fd == NULL)
                flags |= G_SPAWN_STDOUT_TO_DEV_NULL;
-       if (standard_error == NULL)
+
+       if (stderr_fd == NULL)
                flags |= G_SPAWN_STDERR_TO_DEV_NULL;
 
        task->exit_func = function;
@@ -320,17 +330,15 @@ int connman_task_run(struct connman_task *task,
        argv = (char **) task->argv->pdata;
        envp = (char **) task->envp->pdata;
 
-       result = g_spawn_async_with_pipes(NULL, argv, envp,
-                                         G_SPAWN_DO_NOT_REAP_CHILD,
-                                         task_setup, task, &task->pid,
-                                         fd, standard_output,
-                                         standard_output, NULL);
+       result = g_spawn_async_with_pipes(NULL, argv, envp, flags,
+                                       task_setup, task, &task->pid,
+                                       stdin_fd, stdout_fd, stderr_fd, NULL);
        if (result == FALSE) {
                connman_error("Failed to spawn %s", argv[0]);
                return -EIO;
        }
 
-       g_child_watch_add(task->pid, task_died, task);
+       task->child_watch = g_child_watch_add(task->pid, task_died, task);
 
        return 0;
 }
@@ -375,13 +383,12 @@ static DBusHandlerResult task_filter(DBusConnection *connection,
 
        if (dbus_message_get_no_reply(message) == FALSE) {
                DBusMessage *reply;
-               dbus_bool_t result;
 
                reply = dbus_message_new_method_return(message);
                if (reply == NULL)
                        return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
-               result = dbus_connection_send(connection, reply, NULL);
+               dbus_connection_send(connection, reply, NULL);
 
                dbus_message_unref(reply);
        }