Add p2p interface name to configuration file

Change-Id: I1af29e6875f0a25acc5e9cf7ce2a4f764f3fedb9
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/files/wifi-direct-manager.conf.common b/files/wifi-direct-manager.conf.common
index 4165f44..02ac068 100644 (file)
--- a/files/wifi-direct-manager.conf.common
+++ b/files/wifi-direct-manager.conf.common
@@ -4,6 +4,8 @@ connection_agent=yes
 ip_over_eapol=yes
 # default common interface
 interface=wlan0
+# default p2p interface
+p2p_interface=wlan0
 # default group interface
 group_interface=p2p-wlan0-0
 # default device name
@@ -27,6 +29,6 @@ operating_channel=1
 # default config method
 config_methods=display push_button keypad p2ps
 # default no group interface
-no_group_iface=1
+no_group_iface=0
 # Group operating frequency
 group_operating_freq=0

diff --git a/files/wifi-direct-manager.conf.in b/files/wifi-direct-manager.conf.in
index d8ca2cc..02ac068 100644 (file)
--- a/files/wifi-direct-manager.conf.in
+++ b/files/wifi-direct-manager.conf.in
@@ -4,8 +4,10 @@ connection_agent=yes
 ip_over_eapol=yes
 # default common interface
 interface=wlan0
+# default p2p interface
+p2p_interface=wlan0
 # default group interface
-group_interface=p2p0
+group_interface=p2p-wlan0-0
 # default device name
 device_name=Tizen
 # default primary device type

diff --git a/files/wifi-direct-manager.conf.mobile b/files/wifi-direct-manager.conf.mobile
index 62b3053..e67d32c 100644 (file)
--- a/files/wifi-direct-manager.conf.mobile
+++ b/files/wifi-direct-manager.conf.mobile
@@ -5,6 +5,8 @@ connection_agent=yes
 ip_over_eapol=yes
 # default common interface
 interface=wlan0
+# default p2p interface
+p2p_interface=wlan0
 # default group interface
 group_interface=p2p-wlan0-0
 # default device name

diff --git a/files/wifi-direct-manager.conf.tm1 b/files/wifi-direct-manager.conf.tm1
index 23f698c..e593ade 100644 (file)
--- a/files/wifi-direct-manager.conf.tm1
+++ b/files/wifi-direct-manager.conf.tm1
@@ -5,6 +5,8 @@ connection_agent=yes
 ip_over_eapol=yes
 # default common interface
 interface=wlan0
+# default p2p interface
+p2p_interface=p2p0
 # default group interface
 group_interface=p2p0
 # default device name

diff --git a/files/wifi-direct-manager.conf.tv b/files/wifi-direct-manager.conf.tv
index a5816fe..c111f05 100644 (file)
--- a/files/wifi-direct-manager.conf.tv
+++ b/files/wifi-direct-manager.conf.tv
@@ -5,6 +5,8 @@ connection_agent=yes
 ip_over_eapol=yes
 # default common interface
 interface=p2p0
+# default p2p interface
+p2p_interface=p2p0
 # default group interface
 group_interface=p2p0
 # default device name

diff --git a/files/wifi-direct-manager.conf.wearable b/files/wifi-direct-manager.conf.wearable
index c024181..61e9527 100644 (file)
--- a/files/wifi-direct-manager.conf.wearable
+++ b/files/wifi-direct-manager.conf.wearable
@@ -5,6 +5,8 @@ connection_agent=yes
 ip_over_eapol=yes
 # default common interface
 interface=wlan0
+# default p2p interface
+p2p_interface=wlan0
 # default group interface
 group_interface=p2p-wlan0-0
 # default device name

diff --git a/oem/wifi-direct-oem.h b/oem/wifi-direct-oem.h
index 2a6de5e..a37d52a 100644 (file)
--- a/oem/wifi-direct-oem.h
+++ b/oem/wifi-direct-oem.h
@@ -191,6 +191,7 @@ typedef enum {
 
 typedef struct {
        char ifname[OEM_IFACE_NAME_LEN+1];
+       char p2p_ifname[OEM_IFACE_NAME_LEN+1];
        char group_ifname[OEM_IFACE_NAME_LEN+1];
        char device_name[OEM_DEV_NAME_LEN+1];
        int pri_dev_type;

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index ecab05c..2ea294c 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -6,7 +6,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.250
+Version:       1.2.251
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
index 3698c84..dff4228 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -3725,14 +3725,14 @@ static int _ws_init_dbus_connection(void)
                WDP_LOGD("Subscribed supplicant iface signal [%s]", ws_supplicant_signal_map[i].member);
        }
 
-       if (g_strcmp0(config->ifname, config->group_ifname) != 0) {
+       if (g_strcmp0(config->ifname, config->p2p_ifname) != 0) {
                if (_ws_get_interface(config->ifname, NULL, NULL) < 0)
                        res = _ws_create_interface(config->ifname, NULL, NULL);
-               if (_ws_get_interface(config->group_ifname, __register_p2pdevice_signal, NULL) < 0)
-                       res = _ws_create_interface(config->group_ifname, __register_p2pdevice_signal, NULL);
+               if (_ws_get_interface(config->p2p_ifname, __register_p2pdevice_signal, NULL) < 0)
+                       res = _ws_create_interface(config->p2p_ifname, __register_p2pdevice_signal, NULL);
        } else {
-               if (_ws_get_interface(config->ifname, __register_p2pdevice_signal, NULL) < 0)
-                       res = _ws_create_interface(config->ifname, __register_p2pdevice_signal, NULL);
+               if (_ws_get_interface(config->p2p_ifname, __register_p2pdevice_signal, NULL) < 0)
+                       res = _ws_create_interface(config->p2p_ifname, __register_p2pdevice_signal, NULL);
        }
 
        if (res < 0)

diff --git a/src/wifi-direct-util.c b/src/wifi-direct-util.c
index 253bbda..829b7be 100644 (file)
--- a/src/wifi-direct-util.c
+++ b/src/wifi-direct-util.c
@@ -90,6 +90,7 @@ enum wfd_util_conf_key {
        WFD_CONF_CONNECTION_AGENT,
        WFD_CONF_IP_OVER_EAPOL,
        WFD_CONF_IFACE_NAME,
+       WFD_CONF_P2P_IFACE_NAME,
        WFD_CONF_GROUP_IFACE_NAME,
        WFD_CONF_DEFAULT_DEVICE_NAME,
        WFD_CONF_PRIMARY_DEVICE_TYPE,
@@ -240,6 +241,7 @@ void wfd_util_load_wfd_conf(wfd_manager_s * manager)
                {WFD_CONF_CONNECTION_AGENT, "connection_agent", NULL, 0, FALSE},
                {WFD_CONF_IP_OVER_EAPOL, "ip_over_eapol", NULL, 0, FALSE},
                {WFD_CONF_IFACE_NAME, "interface", NULL, 0, FALSE},
+               {WFD_CONF_P2P_IFACE_NAME, "p2p_interface", NULL, 0, FALSE},
                {WFD_CONF_GROUP_IFACE_NAME, "group_interface", NULL, 0, FALSE},
                {WFD_CONF_DEFAULT_DEVICE_NAME, "device_name", NULL, 0, FALSE},
                {WFD_CONF_PRIMARY_DEVICE_TYPE, "primary_device_type", NULL, 0, FALSE},
@@ -294,6 +296,14 @@ void wfd_util_load_wfd_conf(wfd_manager_s * manager)
        else
                g_strlcpy(oem_conf->ifname, DEFAULT_IFNAME, IFACE_NAME_LEN+1);
 
+       if (wfd_conf[WFD_CONF_P2P_IFACE_NAME].value &&
+                       strlen(wfd_conf[WFD_CONF_P2P_IFACE_NAME].value) > 0)
+               g_strlcpy(oem_conf->p2p_ifname, wfd_conf[WFD_CONF_P2P_IFACE_NAME].value,
+                               IFACE_NAME_LEN+1);
+       else
+               g_strlcpy(oem_conf->p2p_ifname, DEFAULT_IFNAME, IFACE_NAME_LEN+1);
+
+
        if (wfd_conf[WFD_CONF_GROUP_IFACE_NAME].value &&
                        strlen(wfd_conf[WFD_CONF_GROUP_IFACE_NAME].value) > 0)
                g_strlcpy(oem_conf->group_ifname,