From: taesub kim Date: Wed, 14 Mar 2018 02:12:28 +0000 (+0900) Subject: Fix dbus method return value X-Git-Tag: submit/tizen/20180318.231541~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F172422%2F3;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git Fix dbus method return value Change-Id: I43ca38d158f648ebbd02398eee414d9fa13754e5 Signed-off-by: Taesub Kim --- diff --git a/include/wifi-netlink-scan.h b/include/wifi-netlink-scan.h index b3c1d93..b4e01fd 100755 --- a/include/wifi-netlink-scan.h +++ b/include/wifi-netlink-scan.h @@ -46,7 +46,7 @@ extern "C" { #define NL80211_ATTR_SCAN_SSIDS 45 #define NL80211_ATTR_MAX 221 -struct bss_scan_info_t{ +struct bss_scan_info_t { char bssid[NETCONFIG_BSSID_LEN+1]; char ssid[NETCONFIG_SSID_LEN+1]; char vsie[NETCONFIG_MAX_VSIE_LEN+1]; diff --git a/src/ip-conflict-detect.c b/src/ip-conflict-detect.c index a12c3ed..fab3976 100755 --- a/src/ip-conflict-detect.c +++ b/src/ip-conflict-detect.c @@ -440,7 +440,7 @@ static void __netconfig_wifi_notify_ip_conflict(char *state, char *mac) gboolean handle_ip_conflict_set_enable(Wifi *wifi, GDBusMethodInvocation *context, bool detect) { - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); if (detect == false) { @@ -451,7 +451,7 @@ gboolean handle_ip_conflict_set_enable(Wifi *wifi, GDBusMethodInvocation *contex else { netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AlreadyExists"); wifi_complete_ip_conflict_set_enable(wifi, context); - return FALSE; + return TRUE; } } else { is_ip_conflict_detect_enabled = true; @@ -462,12 +462,12 @@ gboolean handle_ip_conflict_set_enable(Wifi *wifi, GDBusMethodInvocation *contex netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "Failed"); wifi_complete_ip_conflict_set_enable(wifi, context); - return FALSE; + return TRUE; } } else { netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AlreadyExists"); wifi_complete_ip_conflict_set_enable(wifi, context); - return FALSE; + return TRUE; } } @@ -477,7 +477,7 @@ gboolean handle_ip_conflict_set_enable(Wifi *wifi, GDBusMethodInvocation *contex gboolean handle_is_ip_conflict_detect_enabled(Wifi *wifi, GDBusMethodInvocation *context) { - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); GVariant *param = NULL; param = g_variant_new("(b)", is_ip_conflict_detect_enabled); g_dbus_method_invocation_return_value(context, param); @@ -486,9 +486,12 @@ gboolean handle_is_ip_conflict_detect_enabled(Wifi *wifi, GDBusMethodInvocation gboolean handle_set_ip_conflict_period(Wifi *wifi, GDBusMethodInvocation *context, guint initial_time) { - g_return_val_if_fail(wifi != NULL, FALSE); - if (initial_time < MAX_ARP_SEND_TIME && initial_time > MIN_ARP_SEND_TIME) - return FALSE; + g_return_val_if_fail(wifi != NULL, TRUE); + if (initial_time < MAX_ARP_SEND_TIME && initial_time > MIN_ARP_SEND_TIME) { + netconfig_error_dbus_method_return(context, + NETCONFIG_ERROR_INTERNAL, "Failed"); + return TRUE; + } td.initial_time = 1000 * initial_time; // remove timer @@ -500,7 +503,7 @@ gboolean handle_set_ip_conflict_period(Wifi *wifi, GDBusMethodInvocation *contex gboolean handle_get_ip_conflict_state(Wifi *wifi, GDBusMethodInvocation *context) { - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); GVariant *param = NULL; param = g_variant_new("(u)", conflict_state); g_dbus_method_invocation_return_value(context, param); @@ -509,7 +512,7 @@ gboolean handle_get_ip_conflict_state(Wifi *wifi, GDBusMethodInvocation *context gboolean handle_get_ip_conflict_period(Wifi *wifi, GDBusMethodInvocation *context) { - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); GVariant *param = NULL; param = g_variant_new("(u)", td.initial_time/1000); g_dbus_method_invocation_return_value(context, param); diff --git a/src/mptcp-internal.c b/src/mptcp-internal.c old mode 100644 new mode 100755 diff --git a/src/mptcp.c b/src/mptcp.c index 25c679d..2117b8e 100755 --- a/src/mptcp.c +++ b/src/mptcp.c @@ -54,7 +54,7 @@ gboolean handle_mptcp_set_enable(Mptcp *object, GDBusMethodInvocation *invocatio if (mptcp_set_enable(enable) == FALSE) { ERR("Fail to set mptcp_enabled[%d]", enable); - return FALSE; + return TRUE; } mptcp_complete_mptcp_set_enable(object, invocation); @@ -69,7 +69,7 @@ gboolean handle_mptcp_get_enabled(Mptcp *object, GDBusMethodInvocation *invocati value = mptcp_get_enabled(); if (value != 0 && value != 1 && value != 2) { ERR("Invalid value of mptcp_enabled[%d]", value); - return FALSE; + return TRUE; } mptcp_complete_mptcp_get_enabled(object, invocation, value); @@ -82,7 +82,7 @@ gboolean handle_mptcp_set_path_manager(Mptcp *object, GDBusMethodInvocation *inv if (mptcp_set_path_manager(pm) == FALSE) { ERR("Fail to set mptcp_path_manager[%d]", pm); - return FALSE; + return TRUE; } mptcp_complete_mptcp_set_path_manager(object, invocation); @@ -97,7 +97,7 @@ gboolean handle_mptcp_get_path_manager(Mptcp *object, GDBusMethodInvocation *inv pm = mptcp_get_path_manager(); if (pm == NULL) { ERR("Fail to get mptcp_path_manager"); - return FALSE; + return TRUE; } DBG("get path manager %s", pm); @@ -113,7 +113,7 @@ gboolean handle_mptcp_set_scheduler(Mptcp *object, GDBusMethodInvocation *invoca if (mptcp_mptcp_set_scheduler(scheduler) == FALSE) { ERR("Fail to set mptcp_scheduler[%s]", scheduler); - return FALSE; + return TRUE; } mptcp_complete_mptcp_set_scheduler(object, invocation); @@ -128,7 +128,7 @@ gboolean handle_mptcp_get_scheduler(Mptcp *object, GDBusMethodInvocation *invoca scheduler = mptcp_get_scheduler(); if (scheduler == NULL) { ERR("Fail to get mptcp_scheduler"); - return FALSE; + return TRUE; } DBG("get scheduler %s", scheduler); diff --git a/src/network-state.c b/src/network-state.c index 61c5242..bbd34a4 100755 --- a/src/network-state.c +++ b/src/network-state.c @@ -1305,13 +1305,13 @@ static gboolean handle_add_route( if (ip_addr == NULL || netmask == NULL || interface == NULL) { ERR("Invalid parameter"); netconfig_error_invalid_parameter(context); - return FALSE; + return TRUE; } if (netconfig_execute_file(path, args, envs) < 0) { DBG("Failed to add a new route"); netconfig_error_permission_denied(context); - return FALSE; + return TRUE; } break; @@ -1319,7 +1319,7 @@ static gboolean handle_add_route( if (ip_addr == NULL || interface == NULL || gateway == NULL) { ERR("Invalid parameter"); netconfig_error_invalid_parameter(context); - return FALSE; + return TRUE; } buf = ip_addr; @@ -1335,13 +1335,13 @@ static gboolean handle_add_route( if (netconfig_add_route_ipv6(ip_addr, interface, gateway, prefix_len) < 0) { DBG("Failed to add a new route"); netconfig_error_permission_denied(context); - return FALSE; + return TRUE; } break; default: DBG("Unknown Address Family"); netconfig_error_invalid_parameter(context); - return FALSE; + return TRUE; } DBG("Successfully added a new route"); @@ -1375,19 +1375,19 @@ static gboolean handle_remove_route( if (ip_addr == NULL || netmask == NULL || interface == NULL) { DBG("Invalid parameter!"); netconfig_error_invalid_parameter(context); - return FALSE; + return TRUE; } if (netconfig_execute_file(path, args, envs) < 0) { DBG("Failed to remove the route"); netconfig_error_permission_denied(context); - return FALSE; + return TRUE; } break; case AF_INET6: if (ip_addr == NULL || interface == NULL || gateway == NULL) { DBG("Invalid parameter!"); netconfig_error_invalid_parameter(context); - return FALSE; + return TRUE; } buf = ip_addr; @@ -1403,13 +1403,13 @@ static gboolean handle_remove_route( if (netconfig_del_route_ipv6(ip_addr, interface, gateway, prefix_len) < 0) { DBG("Failed to remove the route"); netconfig_error_permission_denied(context); - return FALSE; + return TRUE; } break; default: DBG("Unknown Address Family"); netconfig_error_invalid_parameter(context); - return FALSE; + return TRUE; } DBG("Successfully removed the route"); @@ -1449,7 +1449,7 @@ gboolean handle_ethernet_cable_state(Network *object, if (ret != 0) { DBG("Failed to get ethernet cable state"); netconfig_error_fail_ethernet_cable_state(context); - return FALSE; + return TRUE; } DBG("Successfully get ethernet cable state[%d]", state); @@ -1478,7 +1478,7 @@ gboolean handle_preferred_ipv6_address(Network *object, if (address == NULL) { DBG("Failed to get preferred IPv6 address"); netconfig_error_fail_preferred_ipv6_address(context); - return FALSE; + return TRUE; } DBG("Successfully get preferred IPv6 address[%s]", address); diff --git a/src/utils/util.c b/src/utils/util.c index 06cd08f..3c1c60a 100755 --- a/src/utils/util.c +++ b/src/utils/util.c @@ -875,7 +875,7 @@ gboolean handle_launch_direct(Wifi *wifi, GDBusMethodInvocation *context) { if (!netconfig_check_feature_supported(NETCONFIG_SUPPORTED_FEATURE_WIFI_DIRECT)) { wifi_complete_launch_direct(wifi, context); - return FALSE; + return TRUE; } int ret = 0; @@ -889,7 +889,7 @@ gboolean handle_launch_direct(Wifi *wifi, GDBusMethodInvocation *context) if (ret < 0) { ERR("Failed to launch Wi-Fi direct daemon"); netconfig_error_wifi_direct_failed(context); - return FALSE; + return TRUE; } wifi_complete_launch_direct(wifi, context); diff --git a/src/wifi-agent.c b/src/wifi-agent.c index f8c317e..4ac5bfd 100755 --- a/src/wifi-agent.c +++ b/src/wifi-agent.c @@ -162,7 +162,7 @@ gboolean handle_set_field(NetConnmanAgent *connman_agent, gboolean updated = FALSE; gboolean reply = FALSE; - g_return_val_if_fail(connman_agent != NULL, FALSE); + g_return_val_if_fail(connman_agent != NULL, TRUE); DBG("Set agent fields for %s", service); @@ -174,7 +174,7 @@ gboolean handle_set_field(NetConnmanAgent *connman_agent, g_dbus_method_invocation_return_gerror(context, error); g_clear_error(&error); - return reply; + return TRUE; } __netconfig_agent_clear_fields(); @@ -271,7 +271,9 @@ gboolean handle_set_field(NetConnmanAgent *connman_agent, reply = netconfig_invoke_dbus_method_nonblock(CONNMAN_SERVICE, service, CONNMAN_SERVICE_INTERFACE, "Connect", NULL, __netconfig_wifi_connect_reply); - if (reply != TRUE) { + if (reply == TRUE) { + g_dbus_method_invocation_return_value(context, NULL); + } else { ERR("Fail to connect Wi-Fi"); __netconfig_agent_clear_fields(); error = g_error_new(G_DBUS_ERROR, @@ -280,8 +282,6 @@ gboolean handle_set_field(NetConnmanAgent *connman_agent, g_dbus_method_invocation_return_gerror(context, error); g_clear_error(&error); - g_variant_iter_free(iter); - return reply; } } else { error = g_error_new(G_DBUS_ERROR, @@ -290,14 +290,16 @@ gboolean handle_set_field(NetConnmanAgent *connman_agent, g_dbus_method_invocation_return_gerror(context, error); g_clear_error(&error); - g_variant_iter_free(iter); - return reply; } + if (reply != TRUE) { + ERR("Fail to connect Wi-Fi"); + __netconfig_agent_clear_fields(); + } g_variant_iter_free(iter); net_connman_agent_complete_set_field(connman_agent, context); - return reply; + return TRUE; } gboolean handle_request_input(NetConnmanAgent *connman_agent, @@ -310,7 +312,7 @@ gboolean handle_request_input(NetConnmanAgent *connman_agent, gboolean updated = FALSE; GVariantBuilder *builder = NULL; - g_return_val_if_fail(connman_agent != NULL, FALSE); + g_return_val_if_fail(connman_agent != NULL, TRUE); if (NULL == service) return FALSE; @@ -384,7 +386,7 @@ gboolean handle_request_input(NetConnmanAgent *connman_agent, if (NULL == out_table) { net_connman_agent_complete_request_input(connman_agent, context, out_table); - return FALSE; + return TRUE; } if (updated == TRUE) @@ -401,23 +403,21 @@ gboolean handle_request_input(NetConnmanAgent *connman_agent, __netconfig_agent_clear_fields(); - return updated; + return TRUE; } gboolean handle_report_error(NetConnmanAgent *connman_agent, GDBusMethodInvocation *context, const gchar *service, const gchar *error) { - gboolean ret = TRUE; - - g_return_val_if_fail(connman_agent != NULL, FALSE); + g_return_val_if_fail(connman_agent != NULL, TRUE); net_connman_agent_complete_report_error(connman_agent, context); DBG("Agent error for service[%s] - [%s]", service, error); /* Do something when it failed to make a connection */ - return ret; + return TRUE; } #if defined TIZEN_CAPTIVE_PORTAL @@ -586,11 +586,10 @@ gboolean handle_request_browser(NetConnmanAgent *connman_agent, GDBusMethodInvocation *context, const gchar *service, const gchar *url) { #if defined TIZEN_CAPTIVE_PORTAL - gboolean ret = FALSE; gboolean ignore_portal = FALSE; const char * ssid = NULL; - g_return_val_if_fail(connman_agent != NULL, FALSE); + g_return_val_if_fail(connman_agent != NULL, TRUE); DBG("service[%s] - url[%s]", service, url); @@ -598,7 +597,7 @@ gboolean handle_request_browser(NetConnmanAgent *connman_agent, if (ssid == NULL) { ERR("Connected AP name is NULL!!"); net_connman_agent_complete_request_browser(connman_agent, context); - return FALSE; + return TRUE; } ignore_portal = __check_ignore_portal_list(ssid); @@ -613,13 +612,13 @@ gboolean handle_request_browser(NetConnmanAgent *connman_agent, is_monitor_notifier_registered = TRUE; } - ret = netconfig_send_notification_to_net_popup(NETCONFIG_ADD_PORTAL_NOTI, ssid); + netconfig_send_notification_to_net_popup(NETCONFIG_ADD_PORTAL_NOTI, ssid); timer_data.time_elapsed = 0; __netconfig_wifi_portal_login_timer_start(&timer_data); net_connman_agent_complete_request_browser(connman_agent, context); - return ret; + return TRUE; #else GError *error = NULL; error = g_error_new(G_DBUS_ERROR, @@ -629,6 +628,6 @@ gboolean handle_request_browser(NetConnmanAgent *connman_agent, g_dbus_method_invocation_return_gerror(context, error); g_clear_error(&error); - return FALSE; + return TRUE; #endif } diff --git a/src/wifi-bssid-scan.c b/src/wifi-bssid-scan.c index 2eba2b6..0f925f9 100755 --- a/src/wifi-bssid-scan.c +++ b/src/wifi-bssid-scan.c @@ -493,19 +493,19 @@ gboolean handle_request_bssid_scan(Wifi *wifi, GDBusMethodInvocation *context) int err, enabled = 0; wifi_tech_state_e tech_state; - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); if (netconfig_is_wifi_tethering_on() == TRUE) { ERR("Wi-Fi Tethering is enabled"); netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_NO_SERVICE, "TetheringEnabled"); - return -EBUSY; + return TRUE; } #if !defined TIZEN_WEARABLE if (netconfig_wifi_is_bgscan_paused()) { ERR("Scan is paused"); netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_NO_SERVICE, "ScanPaused"); - return FALSE; + return TRUE; } #endif @@ -519,7 +519,7 @@ gboolean handle_request_bssid_scan(Wifi *wifi, GDBusMethodInvocation *context) if (enabled == 0) { netconfig_error_permission_denied(context); - return FALSE; + return TRUE; } } @@ -532,7 +532,7 @@ gboolean handle_request_bssid_scan(Wifi *wifi, GDBusMethodInvocation *context) else netconfig_error_wifi_driver_failed(context); - return FALSE; + return TRUE; } wifi_complete_request_bssid_scan(wifi, context); diff --git a/src/wifi-config.c b/src/wifi-config.c index 95e45d1..09404e7 100755 --- 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; } diff --git a/src/wifi-eap-config.c b/src/wifi-eap-config.c index 49283ba..66f67eb 100755 --- a/src/wifi-eap-config.c +++ b/src/wifi-eap-config.c @@ -463,16 +463,15 @@ gboolean handle_create_eap_config(Wifi *wifi, GDBusMethodInvocation *context, const gchar *service, GVariant *fields) { gboolean updated = FALSE; - gboolean reply = FALSE; gboolean result = FALSE; - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); DBG("Set agent fields for %s", service); if (netconfig_is_wifi_profile(service) != TRUE) { netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_WRONG_PROFILE, "InvalidService"); - return reply; + return TRUE; } updated = __netconfig_create_config(fields); @@ -524,20 +523,18 @@ gboolean handle_create_eap_config(Wifi *wifi, GDBusMethodInvocation *context, if (result != TRUE) ERR("Fail to connect %s", service); - else - reply = TRUE; - return reply; + return TRUE; } gboolean handle_delete_eap_config(Wifi *wifi, GDBusMethodInvocation *context, const gchar *profile) { - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); wifi_complete_delete_eap_config(wifi, context); - gboolean ret = __netconfig_delete_config((const char *)profile); + __netconfig_delete_config((const char *)profile); - return ret; + return TRUE; } diff --git a/src/wifi-eap.c b/src/wifi-eap.c index f71b35c..48fb5a5 100755 --- a/src/wifi-eap.c +++ b/src/wifi-eap.c @@ -29,15 +29,13 @@ static struct wifi_authentication_data *wifi_authdata; gboolean handle_get_sim_imsi(Wifi *wifi, GDBusMethodInvocation *context) { - gboolean ret = TRUE; - DBG("Get IMSI"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); - ret = __netconfig_wifi_get_sim_imsi(wifi, context); + __netconfig_wifi_get_sim_imsi(wifi, context); - return ret; + return TRUE; } gboolean handle_req_sim_auth(Wifi *wifi, GDBusMethodInvocation *context, GVariant *rand_data) @@ -52,7 +50,7 @@ gboolean handle_req_sim_auth(Wifi *wifi, GDBusMethodInvocation *context, GVarian DBG("Request SIM Authentication"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); g_variant_get(rand_data, "ay", &iter); length = g_variant_iter_n_children(iter); @@ -75,7 +73,7 @@ gboolean handle_req_sim_auth(Wifi *wifi, GDBusMethodInvocation *context, GVarian if (result) wifi_complete_req_sim_auth(wifi, context, result); - return result; + return TRUE; } gboolean handle_req_aka_auth(Wifi *wifi, GDBusMethodInvocation *context, GVariant *rand_data, GVariant *autn_data) @@ -92,7 +90,7 @@ gboolean handle_req_aka_auth(Wifi *wifi, GDBusMethodInvocation *context, GVarian DBG("Request AKA Authentication"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); g_variant_get(rand_data, "ay", &iter); length = g_variant_iter_n_children(iter); @@ -138,32 +136,29 @@ gboolean handle_req_aka_auth(Wifi *wifi, GDBusMethodInvocation *context, GVarian g_array_free(rand_data_garray, FALSE); g_array_free(autn_data_garray, FALSE); - return result; + return TRUE; } gboolean handle_get_sim_auth(Wifi *wifi, GDBusMethodInvocation *context) { - gboolean ret = TRUE; - DBG("Get SIM Authdata"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); - ret = __netconfig_wifi_get_sim_authdata(wifi, context, &wifi_authdata); - return ret; + __netconfig_wifi_get_sim_authdata(wifi, context, &wifi_authdata); + + return TRUE; } gboolean handle_get_aka_auth(Wifi *wifi, GDBusMethodInvocation *context) { - gboolean ret = TRUE; - DBG("Get AKA Authdata"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); - ret = __netconfig_wifi_get_aka_authdata(wifi, context, &wifi_authdata); + __netconfig_wifi_get_aka_authdata(wifi, context, &wifi_authdata); - return ret; + return TRUE; } EXPORT_SYM void netconfig_complete_get_sim_imsi(void *wifi, GDBusMethodInvocation *context, char *imsi) diff --git a/src/wifi-extension.c b/src/wifi-extension.c index 0261844..3a75642 100755 --- a/src/wifi-extension.c +++ b/src/wifi-extension.c @@ -37,7 +37,7 @@ gboolean handle_flush_bss(Wifi *wifi, GDBusMethodInvocation *context) { DBG("Wi-Fi flush bss"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); GDBusConnection *connection = NULL; char *if_path = NULL; @@ -46,7 +46,7 @@ gboolean handle_flush_bss(Wifi *wifi, GDBusMethodInvocation *context) if (if_path == NULL) { netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailFlushBss"); DBG("Fail to get wpa_supplicant DBus path"); - return FALSE; + return TRUE; } connection = netdbus_get_connection(); @@ -54,7 +54,7 @@ gboolean handle_flush_bss(Wifi *wifi, GDBusMethodInvocation *context) netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailFlushBss"); ERR("Failed to get netdbus connection"); g_free(if_path); - return FALSE; + return TRUE; } diff --git a/src/wifi-firmware.c b/src/wifi-firmware.c index 3cfd322..2195913 100755 --- a/src/wifi-firmware.c +++ b/src/wifi-firmware.c @@ -251,7 +251,7 @@ gboolean handle_start(WifiFirmware *firmware, GDBusMethodInvocation *context, co { int err; - g_return_val_if_fail(firmware != NULL, FALSE); + g_return_val_if_fail(firmware != NULL, TRUE); DBG("Wi-Fi firmware start %s", device != NULL ? device : "null"); @@ -274,7 +274,7 @@ gboolean handle_start(WifiFirmware *firmware, GDBusMethodInvocation *context, co } else netconfig_error_wifi_driver_failed(context); - return FALSE; + return TRUE; } wifi_firmware_complete_start(firmware, context); @@ -285,7 +285,7 @@ gboolean handle_stop(WifiFirmware *firmware, GDBusMethodInvocation *context, con { int err; - g_return_val_if_fail(firmware != NULL, FALSE); + g_return_val_if_fail(firmware != NULL, TRUE); DBG("Wi-Fi firmware stop %s", device != NULL ? device : "null"); @@ -302,7 +302,7 @@ gboolean handle_stop(WifiFirmware *firmware, GDBusMethodInvocation *context, con else netconfig_error_wifi_driver_failed(context); - return FALSE; + return TRUE; } wifi_firmware_complete_stop(firmware, context); diff --git a/src/wifi-key-encryption.c b/src/wifi-key-encryption.c index 9091ddb..d57bce1 100755 --- a/src/wifi-key-encryption.c +++ b/src/wifi-key-encryption.c @@ -314,7 +314,7 @@ gboolean handle_encrypt_passphrase(Wifi *wifi, GDBusMethodInvocation *context, c if (!enc_data) { ERR("Failed to encrypt the passphrase"); netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed"); - return FALSE; + return TRUE; } wifi_complete_encrypt_passphrase(wifi, context, enc_data); @@ -330,7 +330,7 @@ gboolean handle_decrypt_passphrase(Wifi *wifi, GDBusMethodInvocation *context, c if ((wifi == NULL) || (enc_data == NULL)) { ERR("Invalid parameter"); netconfig_error_invalid_parameter(context); - return FALSE; + return TRUE; } passphrase = _netconfig_decrypt_passphrase(enc_data); @@ -338,7 +338,7 @@ gboolean handle_decrypt_passphrase(Wifi *wifi, GDBusMethodInvocation *context, c if (!passphrase) { ERR("Failed to decrypt the passphrase"); netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed"); - return FALSE; + return TRUE; } wifi_complete_decrypt_passphrase(wifi, context, passphrase); diff --git a/src/wifi-netlink-scan.c b/src/wifi-netlink-scan.c index 320078f..2876170 100755 --- a/src/wifi-netlink-scan.c +++ b/src/wifi-netlink-scan.c @@ -535,7 +535,7 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa if (ret < 0) { DBG("__netconfig_initialize_nl80211() failed, error %d", ret); wifi_complete_netlink_scan(wifi, context); - return ret; + return TRUE; } /** Request NL80211_CMD_TRIGGER_SCAN to the kernel. */ @@ -543,14 +543,14 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa if (ret < 0) { DBG("__netconfig_request_netlink_scan() failed, error %d", ret); wifi_complete_netlink_scan(wifi, context); - return ret; + return TRUE; } ret = __netconfig_initialize_nl_msg(&global); if (ret < 0) { DBG("__netconfig_initialize_nl_msg() failed, error %d", ret); wifi_complete_netlink_scan(wifi, context); - return ret; + return TRUE; } ret = nl_send_auto_complete(global.socket, global.msg); @@ -562,11 +562,11 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa if (ret < 0) { DBG("nl_recvmsgs_default() failed. ret: %d (error: %s)", ret, nl_geterror(-ret)); wifi_complete_netlink_scan(wifi, context); - return ret; + return TRUE; } wifi_complete_netlink_scan(wifi, context); __netconfig_notify_netlink_scan_done(); - return 1; + return TRUE; } diff --git a/src/wifi-passpoint.c b/src/wifi-passpoint.c index a416154..c7f62be 100755 --- a/src/wifi-passpoint.c +++ b/src/wifi-passpoint.c @@ -80,7 +80,7 @@ static gboolean netconfig_wifi_set_passpoint(gint32 enable) gboolean handle_get_passpoint(Wifi *wifi, GDBusMethodInvocation *context) { gint32 enable = 0; - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); #if defined TIZEN_WLAN_PASSPOINT if (netconfig_wifi_get_passpoint(&enable)) { @@ -88,7 +88,7 @@ gboolean handle_get_passpoint(Wifi *wifi, GDBusMethodInvocation *context) return TRUE; } wifi_complete_get_passpoint(wifi, context, enable); - return FALSE; + return TRUE; #else enable = 0; wifi_complete_get_passpoint(wifi, context, enable); @@ -98,15 +98,11 @@ gboolean handle_get_passpoint(Wifi *wifi, GDBusMethodInvocation *context) gboolean handle_set_passpoint(Wifi *wifi, GDBusMethodInvocation *context, gint enable) { - gboolean result = FALSE; - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); #if defined TIZEN_WLAN_PASSPOINT - result = netconfig_wifi_set_passpoint(enable); - wifi_complete_set_passpoint(wifi, context); - return result; -#else - wifi_complete_set_passpoint(wifi, context); - return result; + netconfig_wifi_set_passpoint(enable); #endif + wifi_complete_set_passpoint(wifi, context); + return TRUE; } diff --git a/src/wifi-power.c b/src/wifi-power.c index eec1689..2ab8f4b 100755 --- a/src/wifi-power.c +++ b/src/wifi-power.c @@ -824,7 +824,7 @@ gboolean handle_load_driver(Wifi *wifi, DBG("Wi-Fi power on requested"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); if (!netconfig_dpm_update_from_wifi()) { DBG("DPM policy restricts Wi-Fi"); @@ -868,7 +868,7 @@ gboolean handle_remove_driver(Wifi *wifi, GDBusMethodInvocation *context) DBG("Wi-Fi power off requested"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); err = wifi_power_off(); if (err < 0) { diff --git a/src/wifi-state.c b/src/wifi-state.c index c29ac9d..27c64f1 100755 --- a/src/wifi-state.c +++ b/src/wifi-state.c @@ -725,7 +725,7 @@ void wifi_state_get_connected_essid(gchar **essid) */ gboolean handle_get_wifi_state(Wifi *wifi, GDBusMethodInvocation *context) { - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); GVariant *param = NULL; wifi_tech_state_e tech_state = NETCONFIG_WIFI_TECH_UNKNOWN; wifi_service_state_e service_state = NETCONFIG_WIFI_UNKNOWN; diff --git a/src/wifi-tdls.c b/src/wifi-tdls.c index 319acbc..7b301fb 100755 --- a/src/wifi-tdls.c +++ b/src/wifi-tdls.c @@ -184,7 +184,7 @@ gboolean handle_tdls_connect(Wifi *wifi, GDBusMethodInvocation *context, if (message == NULL) { ERR(" TDLS : failed to connect !!!"); netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailTdlsConnect"); - return FALSE; + return TRUE; } DBG("[TizenMW<--WPAS] TDLS DBUS Command sent successfully"); @@ -216,7 +216,7 @@ gboolean handle_tdls_discover(Wifi *wifi, GDBusMethodInvocation *context, ERR(" TDLS : failed to discover !!!"); netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailTdlsDiscover"); wifi_complete_tdls_discover(wifi, context, NETCONFIG_ERROR_TDLS_FAIL_DISCOVER); - return FALSE; + return TRUE; } DBG(" TDLS DBUS Command sent successfully"); @@ -254,7 +254,7 @@ gboolean handle_tdls_disconnect(Wifi *wifi, GDBusMethodInvocation *context, if (message == NULL) { ERR(" TDLS : failed to disconnect !!!"); netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailTdlsDisconnect"); - return FALSE; + return TRUE; } DBG("[TizenMW<--WPAS] TDLS DBUS Command sent successfully"); diff --git a/src/wifi-wps.c b/src/wifi-wps.c index 6cf4262..95e8d40 100755 --- a/src/wifi-wps.c +++ b/src/wifi-wps.c @@ -302,7 +302,7 @@ gboolean netconfig_get_wps_field() gboolean handle_request_wps_cancel(Wifi *wifi, GDBusMethodInvocation *context) { INFO("Received WPS PBC Cancel Request"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); __netconfig_wifi_invoke_wps_cancel(); wifi_complete_request_wps_cancel(wifi, context); @@ -313,7 +313,7 @@ gboolean handle_request_wps_connect(Wifi *wifi, GDBusMethodInvocation *context, { INFO("Received WPS PBC/PIN Connection Request"); - g_return_val_if_fail(wifi != NULL, FALSE); + g_return_val_if_fail(wifi != NULL, TRUE); /* Checking the value of pin if param have a string "PBC" * in that scenario PBC will trigger otherwise PIN Connection */