diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2014-02-24 13:58:58 +0000 | 
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2014-02-24 13:58:58 +0000 | 
| commit | 989b3b2d6068ce5b525479b7754977baf6364a7d (patch) | |
| tree | dbbce28742bfdb3ea58da4461b1bb3e5c2fcaa28 /lib/isc/unix/interfaceiter.c | |
| parent | 98ec2cd1facbb6a0e284fd0bacab33fbafb76fb8 (diff) | |
Notes
Diffstat (limited to 'lib/isc/unix/interfaceiter.c')
| -rw-r--r-- | lib/isc/unix/interfaceiter.c | 18 | 
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c index af2b06d093a6c..7272f718230f4 100644 --- a/lib/isc/unix/interfaceiter.c +++ b/lib/isc/unix/interfaceiter.c @@ -1,5 +1,5 @@  /* - * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008, 2014  Internet Systems Consortium, Inc. ("ISC")   * Copyright (C) 1999-2003  Internet Software Consortium.   *   * Permission to use, copy, modify, and/or distribute this software for any @@ -79,14 +79,14 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src,  	dst->family = family;  	switch (family) {  	case AF_INET: -		memcpy(&dst->type.in, -		       &((struct sockaddr_in *) src)->sin_addr, -		       sizeof(struct in_addr)); +		memmove(&dst->type.in, +			&((struct sockaddr_in *) src)->sin_addr, +			sizeof(struct in_addr));  		break;  	case AF_INET6:  		sa6 = (struct sockaddr_in6 *)src; -		memcpy(&dst->type.in6, &sa6->sin6_addr, -		       sizeof(struct in6_addr)); +		memmove(&dst->type.in6, &sa6->sin6_addr, +			sizeof(struct in6_addr));  #ifdef ISC_PLATFORM_HAVESCOPEID  		if (sa6->sin6_scope_id != 0)  			isc_netaddr_setzone(dst, sa6->sin6_scope_id); @@ -105,8 +105,8 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src,  			if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) {  				isc_uint16_t zone16; -				memcpy(&zone16, &sa6->sin6_addr.s6_addr[2], -				       sizeof(zone16)); +				memmove(&zone16, &sa6->sin6_addr.s6_addr[2], +					sizeof(zone16));  				zone16 = ntohs(zone16);  				if (zone16 != 0) {  					/* the zone ID is embedded */ @@ -252,7 +252,7 @@ isc_interfaceiter_current(isc_interfaceiter_t *iter,  			  isc_interface_t *ifdata)  {  	REQUIRE(iter->result == ISC_R_SUCCESS); -	memcpy(ifdata, &iter->current, sizeof(*ifdata)); +	memmove(ifdata, &iter->current, sizeof(*ifdata));  	return (ISC_R_SUCCESS);  }  | 
