+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
/* Name resolution using adns */
#include <errno.h>
return True;
}
- q=safe_malloc(sizeof *q,"resolve_request");
+ NEW(q);
q->cst=cst;
q->comm=comm;
q->port=port;
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));
+ ca->ia.sin.sin_port=htons(q->port);
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;
}
- memcpy(&ca->ia,&ra->addr,ra->len);
wslot++;
}
q->answer(q->cst,ca_buf,wslot,total,q->name,0);
item_t *i;
string_t conf;
- st=safe_malloc(sizeof(*st),"adnsresolver_apply");
+ NEW(st);
st->cl.description="adns";
st->cl.type=CL_RESOLVER;
st->cl.apply=NULL;