Fix dbus method return value

[platform/core/connectivity/net-config.git] / src / wifi-config.c

diff --git a/src/wifi-config.c b/src/wifi-config.c
index 95e45d1..09404e7 100755 (executable)
--- a/src/wifi-config.c
+++ b/src/wifi-config.c
@@ -915,13 +915,13 @@ gboolean handle_get_config_ids(Wifi *wifi, GDBusMethodInvocation *context)
        guint length;
        gchar **result = NULL;
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
        config_ids = _get_list();
        if (config_ids == NULL) {
                ERR("Fail to get config list");
                netconfig_error_no_profile(context);
-               return FALSE;
+               return TRUE;
        }
 
        length = g_slist_length(config_ids);
@@ -953,7 +953,7 @@ gboolean handle_load_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        GVariantBuilder *b = NULL;
        struct wifi_config *conf = NULL;
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
        conf = g_new0(struct wifi_config, 1);
 
@@ -962,7 +962,7 @@ gboolean handle_load_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                g_free(conf);
                ERR("Fail to _load_configuration");
                netconfig_error_no_profile(context);
-               return FALSE;
+               return TRUE;
        }
 
        b = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
@@ -1006,7 +1006,7 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        if ((wifi == NULL) || (config_id == NULL) || (configuration == NULL)) {
                ERR("Invalid parameter");
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        conf = g_new0(struct wifi_config, 1);
@@ -1062,7 +1062,8 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                g_free(conf->proxy_address);
                g_free(conf);
                ERR("Fail to get_wifi_config_group_name");
-               return FALSE;
+               netconfig_error_fail_save_congifuration(context);
+               return TRUE;
        }
 
        keyfile = g_key_file_new();
@@ -1119,7 +1120,7 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
 
        g_variant_iter_free(iter);
 
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_load_eap_configuration(Wifi *wifi, GDBusMethodInvocation *context,
@@ -1129,7 +1130,7 @@ gboolean handle_load_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
        GVariantBuilder *b = NULL;
        struct wifi_config *conf = NULL;
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
        conf = g_new0(struct wifi_config, 1);
        conf->eap_config = g_new0(struct wifi_eap_config, 1);
@@ -1140,7 +1141,7 @@ gboolean handle_load_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
                g_free(conf);
                ERR("Fail to _load_configuration");
                netconfig_error_no_profile(context);
-               return FALSE;
+               return TRUE;
        }
 
        b = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
@@ -1220,7 +1221,7 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
        if ((wifi == NULL) || (config_id == NULL) || (configuration == NULL)) {
                ERR("Invalid parameter");
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        conf = g_new0(struct wifi_config, 1);
@@ -1328,7 +1329,7 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
        if (ret != TRUE) {
                __free_wifi_configuration(conf);
                ERR("Fail to get_wifi_config_group_name");
-               return FALSE;
+               return TRUE;
        }
 
        keyfile = g_key_file_new();
@@ -1411,7 +1412,7 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
 
        g_variant_iter_free(iter);
 
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_remove_configuration(Wifi *wifi, GDBusMethodInvocation *context, const gchar *config_id)
@@ -1421,7 +1422,7 @@ gboolean handle_remove_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        if ((wifi == NULL) || (config_id == NULL)) {
                ERR("Invalid parameter");
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        ret = _remove_configuration(config_id);
@@ -1429,11 +1430,11 @@ gboolean handle_remove_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                /* no configuration or error */
                ERR("No [%s] configuration", config_id);
                netconfig_error_no_profile(context);
-               return FALSE;
+               return TRUE;
        }
 
        wifi_complete_remove_configuration(wifi, context);
-       return ret;
+       return TRUE;
 }
 
 /* config field key / value */
@@ -1462,9 +1463,9 @@ gboolean handle_set_config_field(Wifi *wifi, GDBusMethodInvocation *context,
        gboolean ret = FALSE;
        gchar *keyfile_key = NULL;
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
-       g_return_val_if_fail(config_id != NULL, FALSE);
-       g_return_val_if_fail(key != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
+       g_return_val_if_fail(config_id != NULL, TRUE);
+       g_return_val_if_fail(key != NULL, TRUE);
 
        DBG("Key[%s] Value[%d]", key, value);
 
@@ -1473,7 +1474,7 @@ gboolean handle_set_config_field(Wifi *wifi, GDBusMethodInvocation *context,
                if (!ret) {
                        ERR("Fail to [%s]set_wifi_config_field(%s/manual)", config_id, WIFI_CONFIG_PROXY_METHOD);
                        netconfig_error_invalid_parameter(context);
-                       return FALSE;
+                       return TRUE;
                }
                keyfile_key = g_strdup_printf("%s", WIFI_CONFIG_PROXY_SERVER);
        } else if (g_strcmp0(key, WIFI_CONFIG_HIDDEN) == 0) {
@@ -1497,20 +1498,19 @@ gboolean handle_set_config_field(Wifi *wifi, GDBusMethodInvocation *context,
        } else {
                ERR("Not supported key[%s]", key);
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        ret = _set_field(config_id, keyfile_key, (const gchar *)value);
        if (!ret) {
                ERR("Fail to [%s]set_wifi_config_field(%s/%s)", config_id, key, value);
-               ret = FALSE;
        }
 
        if (keyfile_key != NULL)
                g_free(keyfile_key);
 
        wifi_complete_set_config_field(wifi, context);
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_get_config_passphrase(Wifi *wifi, GDBusMethodInvocation *context, const gchar *config_id)
@@ -1521,20 +1521,20 @@ gboolean handle_get_config_passphrase(Wifi *wifi, GDBusMethodInvocation *context
        if ((wifi == NULL) || (config_id == NULL)) {
                ERR("Invalid parameter");
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        ret = _get_field(config_id, WIFI_CONFIG_PASSPHRASE, &passphrase);
        if (!ret) {
                ERR("Fail to [%s] _get_field(%s)", config_id, WIFI_CONFIG_PASSPHRASE);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed");
-               return FALSE;
+               return TRUE;
        }
 
        wifi_complete_get_config_passphrase(wifi, context, passphrase);
        g_free(passphrase);
 
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_add_vsie(Wifi *wifi, GDBusMethodInvocation *context,
@@ -1542,8 +1542,8 @@ gboolean handle_add_vsie(Wifi *wifi, GDBusMethodInvocation *context,
 {
        DBG("Frame ID: [%d] VSIE: [%s]", frame_id, vsie);
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
-       g_return_val_if_fail(vsie != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
+       g_return_val_if_fail(vsie != NULL, TRUE);
 
        gboolean ret = FALSE;
 
@@ -1551,11 +1551,11 @@ gboolean handle_add_vsie(Wifi *wifi, GDBusMethodInvocation *context,
        if (!ret) {
                DBG("Failed to add vsie: %s", vsie);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed");
-               return ret;
+               return TRUE;
        }
 
        wifi_complete_add_vsie(wifi, context);
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_get_vsie(Wifi *wifi, GDBusMethodInvocation *context,
@@ -1563,7 +1563,7 @@ gboolean handle_get_vsie(Wifi *wifi, GDBusMethodInvocation *context,
 {
        DBG("Frame ID: [%d]", frame_id);
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
        gboolean ret = FALSE;
        gchar *vsie = NULL;
@@ -1572,13 +1572,13 @@ gboolean handle_get_vsie(Wifi *wifi, GDBusMethodInvocation *context,
        if (!ret) {
                DBG("Failed to get vsie for frame:[%d]", frame_id);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed");
-               return ret;
+               return TRUE;
        }
 
        DBG("Received vsie: %s", vsie);
        wifi_complete_get_vsie(wifi, context, vsie);
 
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_remove_vsie(Wifi *wifi, GDBusMethodInvocation *context,
@@ -1586,8 +1586,8 @@ gboolean handle_remove_vsie(Wifi *wifi, GDBusMethodInvocation *context,
 {
        DBG("Frame ID: [%d] VSIE: [%s]", frame_id, vsie);
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
-       g_return_val_if_fail(vsie != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
+       g_return_val_if_fail(vsie != NULL, TRUE);
 
        gboolean ret = FALSE;
 
@@ -1595,9 +1595,9 @@ gboolean handle_remove_vsie(Wifi *wifi, GDBusMethodInvocation *context,
        if (!ret) {
                DBG("Failed to remove vsie: %s", vsie);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed");
-               return ret;
+               return TRUE;
        }
 
        wifi_complete_remove_vsie(wifi, context);
-       return ret;
+       return TRUE;
 }