chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Static buffers: ipaddr_getbuf: Rename some variables
[secnet.git]
/
resolver.c
diff --git
a/resolver.c
b/resolver.c
index e9f42f1b88aa83f2a68c609d6636b9a82e5451ca..2bc7d06f40127aa8926e4f16501549aac9a4af86 100644
(file)
--- a/
resolver.c
+++ b/
resolver.c
@@
-75,7
+75,7
@@
static bool_t resolve_request(void *sst, cstring_t name,
return True;
}
return True;
}
-
q=safe_malloc(sizeof *q,"resolve_request"
);
+
NEW(q
);
q->cst=cst;
q->comm=comm;
q->port=port;
q->cst=cst;
q->comm=comm;
q->port=port;
@@
-134,20
+134,23
@@
static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
struct comm_addr *ca=&ca_buf[wslot];
ca->comm=q->comm;
ca->ix=-1;
struct comm_addr *ca=&ca_buf[wslot];
ca->comm=q->comm;
ca->ix=-1;
+ assert(ra->len <= (int)sizeof(ca->ia));
+ memcpy(&ca->ia,&ra->addr,ra->len);
switch (ra->addr.sa.sa_family) {
case AF_INET:
assert(ra->len == sizeof(ca->ia.sin));
switch (ra->addr.sa.sa_family) {
case AF_INET:
assert(ra->len == sizeof(ca->ia.sin));
+ ca->ia.sin.sin_port=htons(q->port);
break;
#ifdef CONFIG_IPV6
case AF_INET6:
assert(ra->len == sizeof(ca->ia.sin6));
break;
#ifdef CONFIG_IPV6
case AF_INET6:
assert(ra->len == sizeof(ca->ia.sin6));
+ ca->ia.sin6.sin6_port=htons(q->port);
break;
#endif /*CONFIG_IPV6*/
default:
/* silently skip unexpected AFs from adns */
continue;
}
break;
#endif /*CONFIG_IPV6*/
default:
/* silently skip unexpected AFs from adns */
continue;
}
- memcpy(&ca->ia,&ra->addr,ra->len);
wslot++;
}
q->answer(q->cst,ca_buf,wslot,total,q->name,0);
wslot++;
}
q->answer(q->cst,ca_buf,wslot,total,q->name,0);