From 1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7 Mon Sep 17 00:00:00 2001 From: Zhang zhengguang Date: Thu, 17 Jul 2014 10:37:39 +0800 Subject: Imported Upstream version 1.24 --- plugins/loopback.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/loopback.c') diff --git a/plugins/loopback.c b/plugins/loopback.c index a111eeed..e113887d 100644 --- a/plugins/loopback.c +++ b/plugins/loopback.c @@ -86,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; @@ -108,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) @@ -148,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)); @@ -215,10 +215,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 +238,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) { -- cgit v1.2.3