Imported Upstream version 1.24

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

diff --git a/plugins/loopback.c b/plugins/loopback.c
index 303c54b..e113887 100644 (file)
--- a/plugins/loopback.c
+++ b/plugins/loopback.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -39,6 +39,7 @@
 #include <connman/plugin.h>
 #include <connman/utsname.h>
 #include <connman/log.h>
+#include <connman/inet.h>
 
 static in_addr_t loopback_address;
 static in_addr_t loopback_netmask;
@@ -85,7 +86,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;
@@ -107,24 +108,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)
@@ -133,7 +134,7 @@ static int setup_loopback(void)
        struct sockaddr_in addr;
        int sk, err;
 
-       sk = socket(PF_INET, SOCK_DGRAM, 0);
+       sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
        if (sk < 0)
                return -errno;
 
@@ -147,12 +148,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));
@@ -206,12 +207,21 @@ static const char *loopback_get_hostname(void)
 
 static int loopback_set_hostname(const char *hostname)
 {
-       int err;
+       const char *ptr;
+       int err, len;
 
        if (g_strcmp0(hostname, "<hostname>") == 0)
                return 0;
 
-       if (sethostname(hostname, strlen(hostname)) < 0) {
+       len = strlen(hostname);
+
+       if (!connman_inet_check_hostname(hostname, len))
+               return -EINVAL;
+
+       if ((ptr = strstr(hostname, ".")))
+               len = ptr - hostname;
+
+       if (sethostname(hostname, len) < 0) {
                err = -errno;
                connman_error("Failed to set hostname to %s", hostname);
                return err;
@@ -224,9 +234,14 @@ static int loopback_set_hostname(const char *hostname)
 
 static int loopback_set_domainname(const char *domainname)
 {
-       int err;
+       int err, len;
+
+       len = strlen(domainname);
+
+       if (!connman_inet_check_hostname(domainname, len))
+               return -EINVAL;
 
-       if (setdomainname(domainname, strlen(domainname)) < 0) {
+       if (setdomainname(domainname, len) < 0) {
                err = -errno;
                connman_error("Failed to set domainname to %s", domainname);
                return err;