From fd923f0bf938ceefa8610485bd50e81fd62479a8 Mon Sep 17 00:00:00 2001
From: taesub kim <taesub.kim@samsung.com>
Date: Thu, 23 Mar 2017 18:07:27 +0900
Subject: [PATCH] Added handling to support TDLS feature #3

Change-Id: I74abf0dd6cc12bd515f4767021f7d311084bb919
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
---
 include/wifi-tdls.h                 |  2 +-
 interfaces/netconfig-iface-wifi.xml |  2 ++
 src/wifi-tdls.c                     | 15 ++++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/include/wifi-tdls.h b/include/wifi-tdls.h
index 688566d..3b9bf0e 100755
--- a/include/wifi-tdls.h
+++ b/include/wifi-tdls.h
@@ -33,7 +33,7 @@ void __netconfig_wifi_notify_tdls_connected_event(const char *peer_mac);
 gboolean handle_tdls_disconnect(Wifi *wifi, GDBusMethodInvocation *context, gchar *peer_mac_addr);
 gboolean handle_tdls_connected_peer(Wifi *wifi, GDBusMethodInvocation *context);
 gboolean handle_tdls_connect(Wifi *wifi, GDBusMethodInvocation *context, gchar *peer_mac_Addr);
-gboolean handle_tdls_discover(Wifi *wifi, GDBusMethodInvocation *context);
+gboolean handle_tdls_discover(Wifi *wifi, GDBusMethodInvocation *context, gchar *peer_mac_Addr);
 
 
 #ifdef __cplusplus
diff --git a/interfaces/netconfig-iface-wifi.xml b/interfaces/netconfig-iface-wifi.xml
index cf5fd45..4edb933 100755
--- a/interfaces/netconfig-iface-wifi.xml
+++ b/interfaces/netconfig-iface-wifi.xml
@@ -124,6 +124,8 @@
 			<arg  type="i" name="result" direction="out" />
 		</method>
 		<method name="TdlsDiscover">
+			<arg type="s" name="peer_mac_addr" direction="in"/>
+			<arg  type="i" name="result" direction="out" />
 		</method>
 		<signal name="PowerOnCompleted"></signal>
 		<signal name="PowerOffCompleted"></signal>
diff --git a/src/wifi-tdls.c b/src/wifi-tdls.c
index 3ae0291..182efea 100755
--- a/src/wifi-tdls.c
+++ b/src/wifi-tdls.c
@@ -85,7 +85,7 @@ gboolean handle_tdls_connect(Wifi *wifi, GDBusMethodInvocation *context,
 	DBG("[TizenMW-->WPAS]: TDLS Setup Request: [%s]", peer_mac_Addr);
 
 	if (is_connected) {
-		ERR(" Already active TDLS Connection !!!");
+		ERR(" Already TDLS Connection !!!");
 	} else {
 		GVariant *message = NULL;
 		message = __netconfig_wifi_tdls_send_dbus_str("TDLSSetup", (const char*)peer_mac_Addr);
@@ -105,15 +105,16 @@ gboolean handle_tdls_connect(Wifi *wifi, GDBusMethodInvocation *context,
 	return TRUE;
 }
 
-gboolean handle_tdls_discover(Wifi *wifi, GDBusMethodInvocation *context)
+gboolean handle_tdls_discover(Wifi *wifi, GDBusMethodInvocation *context,
+			gchar *peer_mac_Addr)
 {
-	DBG("[TizenMW-->WPAS]: TDLS Discover Request ");
+	DBG("[TizenMW-->WPAS]: TDLS Discover Request: [%s], peer_mac_Addr");
 
 	if (is_connected) {
-		ERR(" Already active TDLS Connection !!!");
+		ERR(" Already TDLS Connection !!!");
 	} else {
 		GVariant *message = NULL;
-		message = __netconfig_wifi_tdls_send_dbus_str("TDLSDiscover", "ff:ff:ff:ff:ff:ff");
+		message = __netconfig_wifi_tdls_send_dbus_str("TDLSDiscover", (const char*)peer_mac_Addr);
 
 		if (message == NULL) {
 			ERR(" TDLS : failed to discover !!!");
@@ -125,7 +126,7 @@ gboolean handle_tdls_discover(Wifi *wifi, GDBusMethodInvocation *context)
 		g_variant_unref(message);
 	}
 
-	wifi_complete_tdls_discover(wifi, context);
+	wifi_complete_tdls_discover(wifi, context, 1);
 	return TRUE;
 }
 
@@ -135,7 +136,7 @@ gboolean handle_tdls_disconnect(Wifi *wifi, GDBusMethodInvocation *context,
 	DBG("[TizenMW-->WPAS]: TDLS Teardown Request: [%s]", peer_mac_Addr);
 
 	if (!is_connected) {
-		ERR(" No active TDLS Connection !!!");
+		ERR(" Already TDLS discnnection !!!");
 	} else {
 		GVariant *message = NULL;
 		message = __netconfig_wifi_tdls_send_dbus_str("TDLSTeardown", (const char*)peer_mac_Addr);
-- 
2.34.1