flimflam: Add L2TP/IPsec VPN plugin

src/task.c

 /*
  *
  *  Connection Manager
  *
  *  Copyright (C) 2007-2009  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
  *  published by the Free Software Foundation.
  *
@@ skipping 341 matching lines @@
 
         return 0;
 }
 
 static DBusHandlerResult task_filter(DBusConnection *connection,
                                         DBusMessage *message, void *user_data)
 {
         struct connman_task *task;
         struct notify_data *notify;
         const char *path, *member;
+        DBusMessage *reply = NULL;
 
         if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_METHOD_CALL)
                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
         if (dbus_message_has_interface(message,
                                         CONNMAN_TASK_INTERFACE) == FALSE)
                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
         path = dbus_message_get_path(message);
         if (path == NULL)
                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
         task = g_hash_table_lookup(task_hash, path);
         if (task == NULL)
                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
-        if (dbus_message_get_no_reply(message) == FALSE) {
-                DBusMessage *reply;
-                dbus_bool_t result;
+        member = dbus_message_get_member(message);
+        if (member == NULL)
+                goto send_reply;
 
+        notify = g_hash_table_lookup(task->notify, member);
+        if (notify == NULL)
+                goto send_reply;
+
+        if (notify->func)
+                reply = notify->func(task, message, notify->data);
+
+send_reply:
+        if (dbus_message_get_no_reply(message) == FALSE &&
+                                                reply == NULL) {
                 reply = dbus_message_new_method_return(message);
                 if (reply == NULL)
                         return DBUS_HANDLER_RESULT_NEED_MEMORY;
+        }
+
+        if (reply != NULL) {
+                dbus_bool_t result;
 
                 result = dbus_connection_send(connection, reply, NULL);
 
                 dbus_message_unref(reply);
         }
 
-        member = dbus_message_get_member(message);
-        if (member == NULL)
-                return DBUS_HANDLER_RESULT_HANDLED;
-
-        notify = g_hash_table_lookup(task->notify, member);
-        if (notify == NULL)
-                return DBUS_HANDLER_RESULT_HANDLED;
-
-        if (notify->func)
-                notify->func(task, message, notify->data);
-
         return DBUS_HANDLER_RESULT_HANDLED;
 }
 
 static const char *task_rule = "type=method_call"
                                         ",interface=" CONNMAN_TASK_INTERFACE;
 
 int __connman_task_init(void)
 {
         _DBG_TASK("");
 
@@ skipping 19 matching lines @@
         dbus_bus_remove_match(connection, task_rule, NULL);
         dbus_connection_flush(connection);
 
         g_hash_table_destroy(task_hash);
         task_hash = NULL;
 
         dbus_connection_remove_filter(connection, task_filter, NULL);
 
         dbus_connection_unref(connection);
 }