ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

a different fix for the lwres_net_aton problem in lwres_create_addr, that

Browse Source 
addresses any alignment issues that might have existed with casting
an unsigned char pointer to a struct pointer.
This commit is contained in:
David Lawrence
2001-04-12 22:45:12 +00:00
parent 79b19f175c
commit ae6860081f
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/lwres/lwconfig.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lwconfig.c,v 1.31 2001/04/12 20:23:48 tale Exp $ */
/* $Id: lwconfig.c,v 1.32 2001/04/12 22:45:12 tale Exp $ */
/***
*** Module for parsing resolv.conf files.
@@ -427,29 +427,28 @@ lwres_conf_parsesearch(lwres_context_t *ctx, FILE *fp) {
static lwres_result_t
lwres_create_addr(const char *buffer, lwres_addr_t *addr, int convert_zero) {
unsigned char addrbuff[NS_IN6ADDRSZ];
unsigned int len;
struct in_addr v4;
struct in6_addr v6;
if (lwres_net_aton(buffer, (struct in_addr *)&addrbuff) == 1) {
if (lwres_net_aton(buffer, &v4) == 1) {
if (convert_zero) {
unsigned char zeroaddress[] = {0, 0, 0, 0};
unsigned char loopaddress[] = {127, 0, 0, 1};
if (memcmp(addrbuff, zeroaddress, 4) == 0)
memcpy(addrbuff, loopaddress, 4);
if (memcmp(&v4, zeroaddress, 4) == 0)
memcpy(&v4, loopaddress, 4);
}
addr->family = LWRES_ADDRTYPE_V4;
addr->length = NS_INADDRSZ;
len = NS_INADDRSZ;
} else if (lwres_net_pton(AF_INET6, buffer, &addrbuff) == 1) {
memcpy((void *)addr->address, &v4, NS_INADDRSZ);
} else if (lwres_net_pton(AF_INET6, buffer, &v6) == 1) {
addr->family = LWRES_ADDRTYPE_V6;
addr->length = NS_IN6ADDRSZ;
len = NS_IN6ADDRSZ;
memcpy((void *)addr->address, &v6, NS_IN6ADDRSZ);
} else {
return (LWRES_R_FAILURE); /* Unrecognised format. */
}
memcpy((void *)addr->address, addrbuff, len);
return (LWRES_R_SUCCESS);
}