Fix the dangling pointer(network) inside autosignalpoll_timeout().

[platform/upstream/connman.git] / plugins / loopback.c

diff --git a/plugins/loopback.c b/plugins/loopback.c
old mode 100644 (file)
new mode 100755 (executable)
index a111eee..44100c6
--- a/plugins/loopback.c
+++ b/plugins/loopback.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <stdio.h>
+
 #include <errno.h>
 #include <unistd.h>
 #include <limits.h>
@@ -34,6 +36,8 @@
 #include <net/if.h>
 
 #include <glib.h>
+#include <glib/gprintf.h>
+
 
 #define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/plugin.h>
@@ -62,16 +66,47 @@ static int setup_hostname(void)
 
        memset(system_hostname, 0, sizeof(system_hostname));
 
-       if (gethostname(system_hostname, HOST_NAME_MAX) < 0) {
-               connman_error("Failed to get current hostname");
-               return -EIO;
-       }
+#if defined TIZEN_EXT
+               FILE *fp = NULL;
+#define WIFI_MAC "/opt/etc/.mac.info"
+               {
+                       char* rv = 0;
+                       gchar* dev_id = "TIZEN";
+                       char wifi_mac[HOST_NAME_MAX + 1];
+
+                       fp = fopen(WIFI_MAC, "r");
+                       if(!fp){
+                               connman_error("Failed to get current hostname");
+                               strncpy(system_hostname, dev_id, strlen(dev_id));
+                               goto host_name_end;
+                       }
+
+                       rv = fgets(wifi_mac, HOST_NAME_MAX, fp);
+                       if(!rv){
+                               connman_error("Failed to get current hostname");
+                               strncpy(system_hostname, dev_id, strlen(dev_id));
+                               fclose(fp);
+                               goto host_name_end;
+                       }
+
+                       dev_id = g_base64_encode((const guchar *)wifi_mac, strlen(wifi_mac));
+                       g_sprintf(system_hostname, "TIZEN-%s", dev_id);
+                       g_free(dev_id);
+                       fclose(fp);
+               }
 
-       if (strlen(system_hostname) > 0 &&
-                               strcmp(system_hostname, "(none)") != 0)
-               connman_info("System hostname is %s", system_hostname);
-       else
-               create_hostname();
+       host_name_end :
+#else
+               if (gethostname(system_hostname, HOST_NAME_MAX) < 0) {
+                       connman_error("Failed to get current hostname");
+                       return -EIO;
+               }
+#endif
+               if (strlen(system_hostname) > 0 &&
+                                       strcmp(system_hostname, "(none)") != 0)
+                       connman_info("System hostname is %s", system_hostname);
+               else
+                       create_hostname();
 
        memset(name, 0, sizeof(name));
 
@@ -86,7 +121,7 @@ static int setup_hostname(void)
        return 0;
 }
 
-static gboolean valid_loopback(int sk, struct ifreq *ifr)
+static bool valid_loopback(int sk, struct ifreq *ifr)
 {
        struct sockaddr_in *addr;
        int err;
@@ -108,24 +143,24 @@ static gboolean valid_loopback(int sk, struct ifreq *ifr)
        if (addr->sin_addr.s_addr != loopback_address) {
                connman_warn("Invalid loopback address %s",
                        inet_ntop(AF_INET, &addr->sin_addr, buf, sizeof(buf)));
-               return FALSE;
+               return false;
        }
 
        err = ioctl(sk, SIOCGIFNETMASK, ifr);
        if (err < 0) {
                err = -errno;
                connman_error("Getting netmask failed (%s)", strerror(-err));
-               return TRUE;
+               return true;
        }
 
        addr = (struct sockaddr_in *) &ifr->ifr_netmask;
        if (addr->sin_addr.s_addr != loopback_netmask) {
                connman_warn("Invalid loopback netmask %s",
                        inet_ntop(AF_INET, &addr->sin_addr, buf, sizeof(buf)));
-               return FALSE;
+               return false;
        }
 
-       return TRUE;
+       return true;
 }
 
 static int setup_loopback(void)
@@ -148,12 +183,12 @@ static int setup_loopback(void)
 
        if (ifr.ifr_flags & IFF_UP) {
                connman_info("Checking loopback interface settings");
-               if (valid_loopback(sk, &ifr) == TRUE) {
+               if (valid_loopback(sk, &ifr)) {
                        err = -EALREADY;
                        goto done;
                }
 
-               connman_warn("Correcting wrong lookback settings");
+               connman_warn("Correcting wrong loopback settings");
        }
 
        memset(&addr, 0, sizeof(addr));
@@ -215,10 +250,10 @@ static int loopback_set_hostname(const char *hostname)
 
        len = strlen(hostname);
 
-       if (connman_inet_check_hostname(hostname, len) == FALSE)
+       if (!connman_inet_check_hostname(hostname, len))
                return -EINVAL;
 
-       if ((ptr = strstr(hostname, ".")) != NULL)
+       if ((ptr = strstr(hostname, ".")))
                len = ptr - hostname;
 
        if (sethostname(hostname, len) < 0) {
@@ -238,7 +273,7 @@ static int loopback_set_domainname(const char *domainname)
 
        len = strlen(domainname);
 
-       if (connman_inet_check_hostname(domainname, len) == FALSE)
+       if (!connman_inet_check_hostname(domainname, len))
                return -EINVAL;
 
        if (setdomainname(domainname, len) < 0) {