Mercurial > hg > dhcpcd

changeset 1890:00e9b4d0b53d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
White space brigade
author Roy Marples <roy@marples.name>
date Tue, 02 Apr 2013 07:01:11 +0000
parents 069e68f6df28
children dd794249b881
files arp.c dhcp-common.c dhcp6.c dhcpcd.c eloop.c if-bsd.c if-linux.c if-options.c ipv4.c ipv6.c ipv6rs.c platform-linux.c script.c
diffstat 13 files changed, 50 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/arp.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/arp.c	Tue Apr 02 07:01:11 2013 +0000
@@ -223,7 +223,7 @@
 		ipv4_opensocket(ifp, ETHERTYPE_ARP);
 		eloop_event_add(state->arp_fd, arp_packet, ifp);
 	}
-	if (++state->claims < ANNOUNCE_NUM)	
+	if (++state->claims < ANNOUNCE_NUM)
 		syslog(LOG_DEBUG,
 		    "%s: sending ARP announce (%d of %d), "
 		    "next in %d.00 seconds",
--- a/dhcp-common.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/dhcp-common.c	Tue Apr 02 07:01:11 2013 +0000
@@ -157,7 +157,7 @@
 			*out = '\0';
 	}
 
-	return count;  
+	return count;
 }
 
 ssize_t
@@ -378,13 +378,13 @@
 			if (dl != -1)
 				l = dl;
 			else
-				l = 0;	
+				l = 0;
 			data += 16;
 		}
 #endif
 		else if (type & BINHEX) {
 			l = snprintf(s, len, "%.2x", data[0]);
-			data++; 
+			data++;
 		} else
 			l = 0;
 		len -= l;
--- a/dhcp6.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/dhcp6.c	Tue Apr 02 07:01:11 2013 +0000
@@ -416,7 +416,7 @@
 		TAILQ_FOREACH(ap, &state->addrs, next) {
 			if (ifo->ia_type == D6_OPTION_IA_PD)
 				len += sizeof(*o) + sizeof(u8) +
-				    sizeof(u32) + sizeof(u32) + 
+				    sizeof(u32) + sizeof(u32) +
 				    sizeof(ap->prefix.s6_addr);
 			else
 				len += sizeof(*o) + sizeof(ap->addr.s6_addr) +
@@ -1858,8 +1858,6 @@
 		free(state->recv);
 		free(state->new);
 		free(state->old);
-//		if (state->state == DH6S_DELEGATED)
-//			return;
 		free(state);
 		ifp->if_data[IF_DATA_DHCP6] = NULL;
 	}
--- a/dhcpcd.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/dhcpcd.c	Tue Apr 02 07:01:11 2013 +0000
@@ -430,15 +430,15 @@
 		ipv6rs_start(ifp);
 
 	if (ifo->options & DHCPCD_IPV6) {
-		if (ifo->options & DHCPCD_IPV6RS)
-			nolease = dhcp6_start(ifp, 0);
-		else if (ifo->options & DHCPCD_IA_FORCED)
-			nolease = dhcp6_start(ifp, 1);
-		else {
-			nolease = dhcp6_find_delegates(ifp);;
+		if (!(ifo->options & DHCPCD_IPV6RS)) {
+			if (ifo->options & DHCPCD_IA_FORCED)
+				nolease = dhcp6_start(ifp, 1);
+			else
+				nolease = dhcp6_find_delegates(ifp);;
+			if (nolease == -1)
+			        syslog(LOG_ERR,
+				    "%s: dhcp6_start: %m", ifp->name);
 		}
-		if (nolease == -1)
-			syslog(LOG_ERR, "%s: dhcp6_start: %m", ifp->name);
 	}
 
 	if (ifo->options & DHCPCD_IPV4)
--- a/eloop.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/eloop.c	Tue Apr 02 07:01:11 2013 +0000
@@ -127,7 +127,7 @@
 			return -1;
 		}
 	}
-    
+
 	/* Now populate the structure and add it to the list */
 	e->fd = fd;
 	e->callback = callback;
@@ -368,7 +368,7 @@
 			syslog(LOG_ERR, "poll: %m");
 			exit(EXIT_FAILURE);
 		}
-		
+
 		/* Process any triggered events. */
 		if (n > 0) {
 			TAILQ_FOREACH(e, &events, next) {
--- a/if-bsd.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/if-bsd.c	Tue Apr 02 07:01:11 2013 +0000
@@ -215,7 +215,7 @@
 		struct sockaddr_dl sdl;
 		struct sockaddr_storage ss;
 	} su;
-	struct rtm 
+	struct rtm
 	{
 		struct rt_msghdr hdr;
 		char buffer[sizeof(su) * 4];
@@ -336,7 +336,7 @@
 		struct sockaddr_dl sdl;
 		struct sockaddr_storage ss;
 	} su;
-	struct rtm 
+	struct rtm
 	{
 		struct rt_msghdr hdr;
 		char buffer[sizeof(su) * 4];
@@ -349,17 +349,17 @@
  * for link local addreses */
 #ifdef __KAME__
 #define SCOPE {								      \
-		if (IN6_IS_ADDR_LINKLOCAL(&su.sin.sin6_addr)) { 	      \
+		if (IN6_IS_ADDR_LINKLOCAL(&su.sin.sin6_addr)) {		      \
 			*(uint16_t *)(void *)&su.sin.sin6_addr.s6_addr[2] =   \
-			    htons(su.sin.sin6_scope_id); 		      \
-			su.sin.sin6_scope_id = 0; 			      \
-		} 							      \
+			    htons(su.sin.sin6_scope_id);		      \
+			su.sin.sin6_scope_id = 0;			      \
+		}							      \
 	}
 #else
 #define SCOPE
 #endif
 
-#define ADDSU {							     	      \
+#define ADDSU {								      \
 		l = RT_ROUNDUP(su.sa.sa_len);				      \
 		memcpy(bp, &su, l);					      \
 		bp += l;						      \
--- a/if-linux.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/if-linux.c	Tue Apr 02 07:01:11 2013 +0000
@@ -495,7 +495,7 @@
 struct nlma
 {
 	struct nlmsghdr hdr;
-	struct ifaddrmsg ifa; 
+	struct ifaddrmsg ifa;
 	char buffer[64];
 };
 
--- a/if-options.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/if-options.c	Tue Apr 02 07:01:11 2013 +0000
@@ -767,7 +767,7 @@
 					syslog(LOG_ERR, "%s: %m", __func__);
 					return -1;
 				}
- 				TAILQ_INIT(ifo->routes);
+				TAILQ_INIT(ifo->routes);
 			}
 			rt = malloc(sizeof(*rt));
 			if (rt == NULL) {
--- a/ipv4.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/ipv4.c	Tue Apr 02 07:01:11 2013 +0000
@@ -185,7 +185,7 @@
 
 	if (routes == NULL) {
 		routes = malloc(sizeof(*routes));
-		if (routes == NULL) 
+		if (routes == NULL)
 			return -1;
 		TAILQ_INIT(routes);
 #ifdef DEBUG_MEMORY
@@ -576,7 +576,7 @@
 	syslog(LOG_DEBUG, "%s: deleting IP address %s/%d",
 	    iface->name, inet_ntoa(state->addr), inet_ntocidr(state->net));
 	retval = ipv4_deleteaddress(iface, &state->addr, &state->net);
-	if (retval == -1 && errno != EADDRNOTAVAIL) 
+	if (retval == -1 && errno != EADDRNOTAVAIL)
 		syslog(LOG_ERR, "del_address: %m");
 	state->addr.s_addr = 0;
 	state->net.s_addr = 0;
--- a/ipv6.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/ipv6.c	Tue Apr 02 07:01:11 2013 +0000
@@ -70,7 +70,7 @@
 
 	if (routes == NULL) {
 		routes = malloc(sizeof(*routes));
-		if (routes == NULL) 
+		if (routes == NULL)
 			return -1;
 		TAILQ_INIT(routes);
 #ifdef DEBUG_MEMORY
@@ -102,7 +102,7 @@
 		errno = ENOMEM;
 		return -1;
 	}
-		
+
 	s += strlcpy(s, p, sl);
 	if (d[0] == 0xfe && (d[1] & 0xc0) == 0x80) {
 		*s++ = '%';
@@ -209,7 +209,7 @@
 	for (i = 0; i < bytes; i++)
 		mask->s6_addr[i] = 0xff;
 	if (bits)
-		mask->s6_addr[bytes] = masks[bits - 1]; 
+		mask->s6_addr[bytes] = masks[bits - 1];
 	return 0;
 }
 
@@ -438,7 +438,7 @@
 	if (rt) {
 		rt->iface = ifp;
 #ifdef __linux__
-		rt->metric = 256;
+		rt->metric = 1024;
 #else
 		rt->metric = 0;
 #endif
--- a/ipv6rs.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/ipv6rs.c	Tue Apr 02 07:01:11 2013 +0000
@@ -221,7 +221,7 @@
 	memcpy(nd + 1, ifp->hwaddr, ifp->hwlen);
 	return 0;
 }
-	
+
 static void
 ipv6rs_sendprobe(void *arg)
 {
@@ -733,7 +733,7 @@
 					*opt = '\0';
 			}
 			break;
-			
+
 		case ND_OPT_DNSSL:
 			dnssl = (struct nd_opt_dnssl *)p;
 			lifetime = ntohl(dnssl->nd_opt_dnssl_lifetime);
@@ -913,7 +913,7 @@
 				break;
 			case ND_OPT_RDNSS:
 				optn = "rdnss";
-				var = &rdnss;	
+				var = &rdnss;
 				break;
 			case ND_OPT_DNSSL:
 				optn = "dnssl";
@@ -1007,7 +1007,7 @@
 			return ap;
 		}
 	}
-	return NULL;	
+	return NULL;
 }
 
 static const struct ipv6_addr *
@@ -1080,7 +1080,7 @@
 				}
 			}
 		}
-	
+
 		TAILQ_FOREACH_SAFE(rao, &rap->options, next, raon) {
 			if (rap->expired) {
 				switch(rao->type) {
@@ -1144,24 +1144,24 @@
 		eloop_event_add(sock, ipv6rs_handledata, NULL);
 	}
 
- 	eloop_timeout_delete(NULL, ifp);
- 
- 	state = RS_STATE(ifp);
- 	if (state == NULL) {
+	eloop_timeout_delete(NULL, ifp);
+
+	state = RS_STATE(ifp);
+	if (state == NULL) {
 		ifp->if_data[IF_DATA_IPV6RS] = calloc(1, sizeof(*state));
- 		state = RS_STATE(ifp);
+		state = RS_STATE(ifp);
 		if (state == NULL) {
 			syslog(LOG_ERR, "%s: %m", __func__);
 			return -1;
 		}
- 	}
- 
- 	/* Always make a new probe as the underlying hardware
- 	 * address could have changed. */
- 	ipv6rs_makeprobe(ifp);
+	}
+
+	/* Always make a new probe as the underlying hardware
+	 * address could have changed. */
+	ipv6rs_makeprobe(ifp);
 	if (state->rs == NULL) {
 		syslog(LOG_ERR, "%s: ipv6rs_makeprobe: %m", __func__);
- 		return -1;
+		return -1;
 	}
 
 	state->rsprobes = 0;
--- a/platform-linux.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/platform-linux.c	Tue Apr 02 07:01:11 2013 +0000
@@ -1,4 +1,4 @@
-/* 
+/*
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2012 Roy Marples <roy@marples.name>
  * All rights reserved
@@ -36,7 +36,7 @@
 #include "if-options.h"
 #include "platform.h"
 
-static const char *mproc = 
+static const char *mproc =
 #if defined(__alpha__)
 	"system type"
 #elif defined(__arm__)
--- a/script.c	Tue Apr 02 06:50:33 2013 +0000
+++ b/script.c	Tue Apr 02 07:01:11 2013 +0000
@@ -247,7 +247,7 @@
 	snprintf(env[1], e, "reason=%s", reason);
 	if (options & DHCPCD_DUMPLEASE)
 		goto dumplease;
- 	e = 20;
+	e = 20;
 	EMALLOC(2, e);
 	snprintf(env[2], e, "pid=%d", getpid());
 	EMALLOC(3, e);
@@ -525,7 +525,7 @@
 	    ifp->options->script[0] == '\0' ||
 	    strcmp(ifp->options->script, "/dev/null") == 0)
 		return 0;
-	
+
 	syslog(LOG_DEBUG, "%s: executing `%s', reason %s",
 	    ifp->name, argv[0], reason);