Merge "Fix crash caused by decryption response delay" into tizen

[platform/upstream/connman.git] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index 19f62c6..9fea4e0 100755 (executable)
--- a/src/manager.c
+++ b/src/manager.c
@@ -221,7 +221,7 @@ static DBusMessage *get_interfaces(DBusConnection *conn, DBusMessage *msg, void
 {
        DBusMessage *reply;
        DBusMessageIter iter, array;
-       const char *default_interface = connman_option_get_string("DefaultWifiInterface");
+       const char *default_interface = connman_setting_get_string("DefaultWifiInterface");
 
        DBG("DefaultWifiInterface %s", default_interface);
 
@@ -249,11 +249,47 @@ static DBusMessage *get_default_service(DBusConnection *conn,
        struct connman_service *service = connman_service_get_default_connection();
        DBG("service %p", service);
 
-       return connman_service_get_defaut_info(msg, service);
+       return connman_service_create_dbus_service_reply(msg, service);
+}
+
+static DBusMessage *get_connected_service(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       const char *ifname;
+       struct connman_service *service;
+
+       dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ifname,
+                                                       DBUS_TYPE_INVALID);
+
+       service = connman_service_get_connected_service(ifname);
+       DBG("Interface Name %s, service %p", ifname, service);
+
+       return connman_service_create_dbus_service_reply(msg, service);
+}
+
+static DBusMessage *get_dhcp_status(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+       const char *ifname;
+       const char *dhcp_status;
+       DBusMessage *reply;
+       DBusMessageIter iter;
+
+       dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ifname, DBUS_TYPE_INVALID);
+       dhcp_status = __connman_network_get_dhcp_status(ifname);
+
+       reply = dbus_message_new_method_return(msg);
+       if (!reply)
+               return NULL;
+
+       if (!dhcp_status)
+               dhcp_status = "Unknown";
+
+       dbus_message_iter_init_append(reply, &iter);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &dhcp_status);
+
+       return reply;
 }
-#endif
 
-#if defined TIZEN_EXT_INS
 static void append_ins_structs(DBusMessageIter *iter, void *user_data)
 {
        __connman_ins_list_struct(iter);
@@ -268,8 +304,9 @@ static DBusMessage *get_ins(DBusConnection *conn,
        if (!reply)
                return NULL;
 
-       __connman_dbus_append_objpath_dict_array(reply,
-                       append_ins_structs, NULL);
+       if (TIZEN_INS_ENABLED)
+               __connman_dbus_append_objpath_dict_array(reply,
+                               append_ins_structs, NULL);
 
        return reply;
 }
@@ -732,8 +769,14 @@ static const GDBusMethodTable manager_methods[] = {
        { GDBUS_METHOD("GetDefaultService",
                        NULL, GDBUS_ARGS({ "service", "oa{sv}" }),
                        get_default_service) },
-#endif
-#if defined TIZEN_EXT_INS
+       { GDBUS_METHOD("GetConnectedService",
+                       GDBUS_ARGS({ "ifname", "s" }),
+                       GDBUS_ARGS({ "service", "oa{sv}" }),
+                       get_connected_service) },
+       { GDBUS_METHOD("GetDhcpStatus",
+                       GDBUS_ARGS({ "ifname", "s" }),
+                       GDBUS_ARGS({ "status", "s" }),
+                       get_dhcp_status) },
        { GDBUS_METHOD("GetINS",
                        NULL, GDBUS_ARGS({ "services", "a(oa{sv})" }),
                        get_ins) },
@@ -816,6 +859,9 @@ static const GDBusSignalTable manager_signals[] = {
        { GDBUS_SIGNAL("PeersChanged",
                        GDBUS_ARGS({ "changed", "a(oa{sv})" },
                                        { "removed", "ao" })) },
+       { GDBUS_SIGNAL("TetheringClientsChanged",
+                       GDBUS_ARGS({ "registered", "as" },
+                                       { "removed", "as" })) },
        { },
 };