to fix close(0) issue and version update

Change-Id: I36c85f2e074133dfa9045fc556600c9ad37d7565

diff --git a/debian/changelog b/debian/changelog
index 8226b4a..f3f2e80 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wfi-direct-manager (0.6.9) precise; urgency=low
+
+  * to fix PLM issue and prevent defect(private code sync)
+  * Git : framework/connectivity/wifi-direct-manager
+  * Tag : wifi-direct-manager_0.6.9
+
+ -- Gibyoung Kim <lastkgb.kim@samsung.com>  Tue, 05 Mar 2013 21:46:11 +0900
+
 wfi-direct-manager (0.6.8) precise; urgency=low
 
   * Remove prevent issue : Resource leak, Uninitialized pointer read

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 3a60a97..3ce6c90 100755 (executable)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:       wifi-direct-manager
 Summary:    Wi-Fi Direct manger
-Version:    0.6.8
+Version:    0.6.9
 Release:    1
 Group:      TO_BE_FILLED
 License:    Apache License Version 2.0

diff --git a/plugin/wpasupplicant/src/wifi-direct-plugin.c b/plugin/wpasupplicant/src/wifi-direct-plugin.c
index 11e4e5e..59bcb8f 100644 (file)
--- a/plugin/wpasupplicant/src/wifi-direct-plugin.c
+++ b/plugin/wpasupplicant/src/wifi-direct-plugin.c
@@ -2264,7 +2264,7 @@ int wfd_ws_deactivate()
        // close control interface
        g_source_remove(g_source_id);
        unlink("/tmp/wpa_ctrl_monitor");
-       if (g_monitor_sockfd >= 0)
+       if (g_monitor_sockfd > 2)
                close(g_monitor_sockfd);
 
        // terminate wpasupplicant
@@ -2287,7 +2287,7 @@ int wfd_ws_deactivate()
        memset(res_buffer, 0x0, 1024);
 
        unlink("/tmp/wpa_ctrl_control");
-       if (g_control_sockfd >= 0)
+       if (g_control_sockfd > 2)
                close(g_control_sockfd);
 
        wfd_ws_glist_reset_connected_peer();
@@ -3526,7 +3526,8 @@ bool wfd_ws_dhcpc_get_ip_address(char *ipaddr_buf, int len, int is_IPv6)
 
        if(ioctl(fd, SIOCGIFADDR, &IfRequest) < 0) {
                WDP_LOGE( "Failed to get IP\n");
-               close(fd);
+               if (fd > 2)
+                       close(fd);
                return false;
        }