From: Seonah Moon <seonah1.moon@samsung.com>
Date: Fri, 26 Apr 2019 01:56:43 +0000 (+0900)
Subject: [ASAN-TFDF-1808, TFDF-1821] Use proper data type for GVariant
X-Git-Tag: submit/tizen/20190426.022140^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F204709%2F2;p=platform%2Fcore%2Fapi%2Fsoftap.git

[ASAN-TFDF-1808, TFDF-1821] Use proper data type for GVariant

Change-Id: I6f48c48e675cbacc1d8d10a452b2d2f87e7aeaed
---

diff --git a/include/softap_private.h b/include/softap_private.h
index ae600e6..2c6a8fd 100644
--- a/include/softap_private.h
+++ b/include/softap_private.h
@@ -244,8 +244,8 @@ typedef struct {
 	char passphrase[SOFTAP_KEY_MAX_LEN + 1];
 	char ip_address[SOFTAP_IPV4_ADDRESS_MAX_LEN + 1];
 	char vendor[SOFTAP_VENDOR_MAX_LEN + 1];
-	bool visibility;
-	bool dhcp_enabled;
+	gboolean visibility;
+	gboolean dhcp_enabled;
 	softap_security_type_e sec_type;
 	softap_wireless_mode_e mode;
 	int channel;
diff --git a/packaging/capi-network-softap.spec b/packaging/capi-network-softap.spec
index f9f0b13..75dca24 100644
--- a/packaging/capi-network-softap.spec
+++ b/packaging/capi-network-softap.spec
@@ -1,6 +1,6 @@
 Name:		capi-network-softap
 Summary:	Softap Framework
-Version:	0.0.27
+Version:	0.0.28
 Release:	1
 Group:		System/Network
 License:	Apache-2.0
diff --git a/src/softap.c b/src/softap.c
index e4c3a45..5dcc511 100755
--- a/src/softap.c
+++ b/src/softap.c
@@ -739,7 +739,7 @@ API int softap_create(softap_h *softap)
 
 	memset(sa, 0x00, sizeof(__softap_h));
 
-	sa->visibility = true;
+	sa->visibility = TRUE;
 	sa->sec_type = SOFTAP_SECURITY_TYPE_WPA2_PSK;
 
 	if (__get_common_ssid(ssid, sizeof(ssid)) != SOFTAP_ERROR_NONE) {
@@ -770,7 +770,7 @@ API int softap_create(softap_h *softap)
 
 	sa->channel = SOFTAP_DEFAULT_CHANNEL;
 	sa->mode = SOFTAP_WIRELESS_MODE_G;
-	sa->dhcp_enabled = false;
+	sa->dhcp_enabled = FALSE;
 
 	/* GDbus Setting */
 #if !GLIB_CHECK_VERSION(2, 36, 0)
@@ -1602,7 +1602,7 @@ API int softap_set_ssid_visibility(softap_h softap, bool visible)
 			"parameter(softap) is NULL\n");
 
 	__softap_h *sa = (__softap_h *) softap;
-	sa->visibility = visible;
+	sa->visibility = visible ? TRUE : FALSE;
 
 	return SOFTAP_ERROR_NONE;
 }
@@ -1925,7 +1925,7 @@ API int softap_enable_dhcp(softap_h softap)
 			result = SOFTAP_ERROR_OPERATION_FAILED;
 
 		g_error_free(error);
-		sa->dhcp_enabled = false;
+		sa->dhcp_enabled = FALSE;
 
 		return result;
 //LCOV_EXCL_STOP
@@ -1934,7 +1934,7 @@ API int softap_enable_dhcp(softap_h softap)
 	g_variant_get(parameters, "(u)", &result);
 	g_variant_unref(parameters);
 
-	sa->dhcp_enabled = true;
+	sa->dhcp_enabled = TRUE;
 
 	return SOFTAP_ERROR_NONE;
 }
@@ -1970,7 +1970,7 @@ API int softap_disable_dhcp(softap_h softap)
 	g_variant_get(parameters, "(u)", &result);
 	g_variant_unref(parameters);
 
-	sa->dhcp_enabled = false;
+	sa->dhcp_enabled = FALSE;
 
 	return SOFTAP_ERROR_NONE;
 }
@@ -1988,7 +1988,7 @@ API int softap_is_dhcp_enabled(softap_h softap, bool *dhcp_enabled)
 	GVariant *parameters = NULL;
 	GDBusProxy *proxy = sa->client_bus_proxy;
 	int ret = SOFTAP_ERROR_NONE;
-	bool enabled = false;
+	gboolean enabled = FALSE;
 
 	parameters = g_dbus_proxy_call_sync(proxy, "get_dhcp_state",
 			NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
@@ -2010,7 +2010,7 @@ API int softap_is_dhcp_enabled(softap_h softap, bool *dhcp_enabled)
 	}
 
 	sa->dhcp_enabled = enabled;
-	*dhcp_enabled = sa->dhcp_enabled;
+	*dhcp_enabled = sa->dhcp_enabled == TRUE ? true : false;
 
 	return ret;
 }
@@ -2046,7 +2046,7 @@ API int softap_enable_dhcp_with_range(softap_h softap, char *rangestart, char *r
 			result = SOFTAP_ERROR_OPERATION_FAILED;
 
 		g_error_free(error);
-		sa->dhcp_enabled = false;
+		sa->dhcp_enabled = FALSE;
 
 		return result;
 //LCOV_EXCL_STOP
@@ -2055,7 +2055,7 @@ API int softap_enable_dhcp_with_range(softap_h softap, char *rangestart, char *r
 	g_variant_get(parameters, "(u)", &result);
 	g_variant_unref(parameters);
 
-	sa->dhcp_enabled = true;
+	sa->dhcp_enabled = TRUE;
 
 	return SOFTAP_ERROR_NONE;
 }