From: Mayank Haarit Date: Tue, 22 May 2018 15:06:42 +0000 (+0530) Subject: Send Dbus error message to upper layer X-Git-Tag: accepted/tizen/unified/20180612.044202~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fconnectivity%2Fnet-config.git;a=commitdiff_plain;h=807831a62d5d6b959d3e5a9a30269138136369ba Send Dbus error message to upper layer This patch is to send error message on failing nl socket calls. Change-Id: I259f58470efbdbfead0047655f651e150be33422 Signed-off-by: Mayank Haarit --- diff --git a/src/wifi-netlink-scan.c b/src/wifi-netlink-scan.c index f4fb530..38098f1 100755 --- a/src/wifi-netlink-scan.c +++ b/src/wifi-netlink-scan.c @@ -810,6 +810,7 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa int ret = __netconfig_initialize_nl80211(&global); if (ret < 0) { DBG("__netconfig_initialize_nl80211() failed, error %d", ret); + netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AccessDenied"); wifi_complete_netlink_scan(wifi, context); return TRUE; } @@ -818,6 +819,7 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa ret = __netconfig_request_netlink_scan(global.socket, global.if_index, global.id, params); if (ret < 0) { DBG("__netconfig_request_netlink_scan() failed, error %d", ret); + netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AccessDenied"); wifi_complete_netlink_scan(wifi, context); return TRUE; } @@ -825,6 +827,7 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa ret = __netconfig_initialize_nl_msg(&global); if (ret < 0) { DBG("__netconfig_initialize_nl_msg() failed, error %d", ret); + netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AccessDenied"); wifi_complete_netlink_scan(wifi, context); return TRUE; } @@ -837,6 +840,7 @@ int handle_netlink_scan(Wifi *wifi, GDBusMethodInvocation *context, GVariant *pa nlmsg_free(global.msg); if (ret < 0) { DBG("nl_recvmsgs_default() failed. ret: %d (error: %s)", ret, nl_geterror(-ret)); + netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AccessDenied"); wifi_complete_netlink_scan(wifi, context); return TRUE; }