Mercurial > hg > dhcpcd

changeset 2444:b3f7ac378bb5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some -Wconversion errors on FreeBSD.
author Roy Marples <roy@marples.name>
date Fri, 25 Apr 2014 13:05:15 +0000
parents d4c651006a97
children 7fea68938e29
files dhcp.c dhcp6.c dhcp6.h ipv6nd.c
diffstat 4 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp.c	Fri Apr 25 11:53:14 2014 +0000
+++ b/dhcp.c	Fri Apr 25 13:05:15 2014 +0000
@@ -1871,11 +1871,11 @@
 		lease->renewaltime = lease->rebindtime = lease->leasetime;
 	else {
 		eloop_timeout_add_sec(iface->ctx->eloop,
-		    lease->renewaltime, dhcp_renew, iface);
+		    (time_t)lease->renewaltime, dhcp_renew, iface);
 		eloop_timeout_add_sec(iface->ctx->eloop,
-		    lease->rebindtime, dhcp_rebind, iface);
+		    (time_t)lease->rebindtime, dhcp_rebind, iface);
 		eloop_timeout_add_sec(iface->ctx->eloop,
-		    lease->leasetime, dhcp_expire, iface);
+		    (time_t)lease->leasetime, dhcp_expire, iface);
 		syslog(LOG_DEBUG,
 		    "%s: renew in %"PRIu32" seconds, rebind in %"PRIu32
 		    " seconds",
--- a/dhcp6.c	Fri Apr 25 11:53:14 2014 +0000
+++ b/dhcp6.c	Fri Apr 25 13:05:15 2014 +0000
@@ -2228,7 +2228,7 @@
 			if (u32 >= 60 && u32 <= 86400) {
 				syslog(LOG_DEBUG, "%s: SOL_MAX_RT %d -> %d",
 				    ifp->name, state->sol_max_rt, u32);
-				state->sol_max_rt = u32;
+				state->sol_max_rt = (time_t)u32;
 			} else
 				syslog(LOG_ERR, "%s: invalid SOL_MAX_RT %d",
 				    ifp->name, u32);
@@ -2240,7 +2240,7 @@
 			if (u32 >= 60 && u32 <= 86400) {
 				syslog(LOG_DEBUG, "%s: INF_MAX_RT %d -> %d",
 				    ifp->name, state->inf_max_rt, u32);
-				state->inf_max_rt = u32;
+				state->inf_max_rt = (time_t)u32;
 			} else
 				syslog(LOG_ERR, "%s: invalid INF_MAX_RT %d",
 				    ifp->name, u32);
@@ -2406,15 +2406,16 @@
 		else
 			state->state = DH6S_BOUND;
 		if (state->renew && state->renew != ND6_INFINITE_LIFETIME)
-			eloop_timeout_add_sec(ifp->ctx->eloop, state->renew,
+			eloop_timeout_add_sec(ifp->ctx->eloop,
+			    (time_t)state->renew,
 			    state->state == DH6S_INFORMED ?
 			    dhcp6_startinform : dhcp6_startrenew, ifp);
 		if (state->rebind && state->rebind != ND6_INFINITE_LIFETIME)
-			eloop_timeout_add_sec(ifp->ctx->eloop, state->rebind,
-			    dhcp6_startrebind, ifp);
+			eloop_timeout_add_sec(ifp->ctx->eloop,
+			    (time_t)state->rebind, dhcp6_startrebind, ifp);
 		if (state->expire && state->expire != ND6_INFINITE_LIFETIME)
-			eloop_timeout_add_sec(ifp->ctx->eloop, state->expire,
-			    dhcp6_startexpire, ifp);
+			eloop_timeout_add_sec(ifp->ctx->eloop,
+			    (time_t)state->expire, dhcp6_startexpire, ifp);
 		if (ifp->options->ia_type == D6_OPTION_IA_PD)
 			dhcp6_delegate_prefix(ifp);
 
--- a/dhcp6.h	Fri Apr 25 11:53:14 2014 +0000
+++ b/dhcp6.h	Fri Apr 25 13:05:15 2014 +0000
@@ -174,12 +174,12 @@
 	struct timeval RT;
 	unsigned int IMD;
 	unsigned int RTC;
-	unsigned int IRT;
+	time_t IRT;
 	unsigned int MRC;
-	unsigned int MRT;
+	time_t MRT;
 	void (*MRCcallback)(void *);
-	unsigned int sol_max_rt;
-	unsigned int inf_max_rt;
+	time_t sol_max_rt;
+	time_t inf_max_rt;
 
 	struct dhcp6_message *send;
 	size_t send_len;
--- a/ipv6nd.c	Fri Apr 25 11:53:14 2014 +0000
+++ b/ipv6nd.c	Fri Apr 25 13:05:15 2014 +0000
@@ -905,7 +905,7 @@
 		if (lifetime == ~0U)
 			timerclear(&rao->expire);
 		else {
-			expire.tv_sec = lifetime;
+			expire.tv_sec = (time_t)lifetime;
 			expire.tv_usec = 0;
 			timeradd(&rap->received, &expire, &rao->expire);
 		}
@@ -1110,7 +1110,7 @@
 			continue;
 		valid = 0;
 		if (rap->lifetime) {
-			lt.tv_sec = rap->lifetime;
+			lt.tv_sec = (time_t)rap->lifetime;
 			lt.tv_usec = 0;
 			timeradd(&rap->received, &lt, &expire);
 			if (rap->lifetime == 0 || timercmp(&now, &expire, >)) {