Merge "Fixed to check whether Ethernet cable state changed callback exists when it...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c6b06c..1dbc63c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,15 +17,6 @@ SET(pc_dependents "capi-base-common")
 IF(TIZEN_DUALSIM_ENABLE)
     ADD_DEFINITIONS(-DTIZEN_DUALSIM_ENABLE)
 ENDIF(TIZEN_DUALSIM_ENABLE)
-IF(TIZEN_WEARABLE)
-    ADD_DEFINITIONS(-DTIZEN_WEARABLE)
-ENDIF(TIZEN_WEARABLE)
-IF(TIZEN_MOBILE)
-    ADD_DEFINITIONS(-DTIZEN_MOBILE)
-ENDIF(TIZEN_MOBILE)
-IF(TIZEN_TV)
-    ADD_DEFINITIONS(-DTIZEN_TV)
-ENDIF(TIZEN_TV)
 
 
 INCLUDE(FindPkgConfig)

diff --git a/packaging/capi-network-connection.spec b/packaging/capi-network-connection.spec
index 4fbea54..3634961 100755 (executable)
--- a/packaging/capi-network-connection.spec
+++ b/packaging/capi-network-connection.spec
@@ -38,17 +38,6 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
 %if 0%{?model_build_feature_network_dsds} == 1
        -DTIZEN_DUALSIM_ENABLE=1 \
 %endif
-%if "%{profile}" == "wearable"
-       -DTIZEN_WEARABLE=1 \
-%else
-%if "%{profile}" == "mobile"
-       -DTIZEN_MOBILE=1 \
-%else
-%if "%{profile}" == "tv"
-       -DTIZEN_TV=1 \
-%endif
-%endif
-%endif
        .
 
 make %{?_smp_mflags}

diff --git a/src/connection.c b/src/connection.c
index 9a736f2..004ab62 100755 (executable)
--- a/src/connection.c
+++ b/src/connection.c
@@ -16,12 +16,15 @@
 
 #include <glib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <vconf/vconf.h>
+#include <system_info.h>
 
 #include "net_connection_private.h"
 
 static __thread GSList *conn_handle_list = NULL;
+static int tv_profile = -1; // Unknown
 
 //LCOV_EXCL_START
 static int __connection_convert_net_state(int status)
@@ -220,7 +223,7 @@ static gboolean __connection_cb_ip_changed_cb_idle(gpointer user_data)
        if (callback)
                callback(ip_addr, NULL, data);
 
-       g_free(ip_addr);
+       free(ip_addr);
 
        return FALSE;
 }
@@ -312,7 +315,7 @@ static gboolean __connection_cb_proxy_changed_cb_idle(gpointer user_data)
        if (callback)
                callback(proxy, NULL, data);
 
-       g_free(proxy);
+       free(proxy);
 
        return FALSE;
 }
@@ -557,37 +560,46 @@ EXPORT_API int connection_get_mac_address(connection_h connection, connection_ty
 
        switch (type) {
        case CONNECTION_TYPE_WIFI:
-#if defined TIZEN_TV
-               fp = fopen(WIFI_MAC_INFO_FILE, "r");
-               if (fp == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to open file %s", WIFI_MAC_INFO_FILE); //LCOV_EXCL_LINE
-                       return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+               if (__builtin_expect(tv_profile == -1, 0)) {
+                       char *profileName;
+                       system_info_get_platform_string("http://tizen.org/feature/profile", &profileName);
+                       if (*profileName == 't' || *profileName == 'T')
+                               tv_profile = 1;
+                       else
+                               tv_profile = 0;
+                       free(profileName);
                }
+               if (tv_profile == 1) {
+                       fp = fopen(WIFI_MAC_INFO_FILE, "r");
+                       if (fp == NULL) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "Failed to open file %s", WIFI_MAC_INFO_FILE); //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+                       }
 
-               if (fgets(buf, sizeof(buf), fp) == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to get MAC info from %s", WIFI_MAC_INFO_FILE); //LCOV_EXCL_LINE
-                       fclose(fp); //LCOV_EXCL_LINE
-                       return CONNECTION_ERROR_OPERATION_FAILED;
-               }
+                       if (fgets(buf, sizeof(buf), fp) == NULL) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get MAC info from %s", WIFI_MAC_INFO_FILE); //LCOV_EXCL_LINE
+                               fclose(fp); //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OPERATION_FAILED;
+                       }
 
-               CONNECTION_LOG(CONNECTION_INFO, "%s : %s", WIFI_MAC_INFO_FILE, buf);
+                       CONNECTION_LOG(CONNECTION_INFO, "%s : %s", WIFI_MAC_INFO_FILE, buf);
 
-               *mac_addr = (char *)malloc(CONNECTION_MAC_INFO_LENGTH + 1);
-               if (*mac_addr == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "malloc() failed"); //LCOV_EXCL_LINE
-                       fclose(fp); //LCOV_EXCL_LINE
-                       return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
-               }
-               g_strlcpy(*mac_addr, buf, CONNECTION_MAC_INFO_LENGTH + 1);
-               fclose(fp);
-#else
-               *mac_addr = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
+                       *mac_addr = (char *)malloc(CONNECTION_MAC_INFO_LENGTH + 1);
+                       if (*mac_addr == NULL) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "malloc() failed"); //LCOV_EXCL_LINE
+                               fclose(fp); //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+                       }
+                       g_strlcpy(*mac_addr, buf, CONNECTION_MAC_INFO_LENGTH + 1);
+                       fclose(fp);
+               } else {
+                       *mac_addr = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
 
-               if (*mac_addr == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to get vconf from %s", VCONFKEY_WIFI_BSSID_ADDRESS); //LCOV_EXCL_LINE
-                       return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+                       if (*mac_addr == NULL) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get vconf from %s", VCONFKEY_WIFI_BSSID_ADDRESS); //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+                       }
                }
-#endif
                break;
        //LCOV_EXCL_START
        case CONNECTION_TYPE_ETHERNET: