summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Faurot <eric@cvs.openbsd.org>2013-07-12 14:38:35 +0000
committerEric Faurot <eric@cvs.openbsd.org>2013-07-12 14:38:35 +0000
commitc17ce4316454323ab5f3c7304e6dd74c1c5e299a (patch)
treeab347b23ab3cef240e2a085965af07124afa36f7
parentc997c52d98f10ff436ff39bfc2be12b74c27203e (diff)
update after asr changes.
-rw-r--r--usr.sbin/smtpd/dns.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/smtpd/dns.c b/usr.sbin/smtpd/dns.c
index 506f82f027b..ca5337b46e4 100644
--- a/usr.sbin/smtpd/dns.c
+++ b/usr.sbin/smtpd/dns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.c,v 1.66 2013/05/24 17:03:14 eric Exp $ */
+/* $OpenBSD: dns.c,v 1.67 2013/07/12 14:38:34 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -236,13 +236,13 @@ dns_dispatch_mx(int ev, struct async_res *ar, void *arg)
return;
}
- unpack_init(&pack, ar->ar_data, ar->ar_datalen);
- unpack_header(&pack, &h);
- unpack_query(&pack, &q);
+ asr_unpack_init(&pack, ar->ar_data, ar->ar_datalen);
+ asr_unpack_header(&pack, &h);
+ asr_unpack_query(&pack, &q);
found = 0;
for (; h.ancount; h.ancount--) {
- unpack_rr(&pack, &rr);
+ asr_unpack_rr(&pack, &rr);
if (rr.rr_type != T_MX)
continue;
print_dname(rr.rr.mx.exchange, buf, sizeof(buf));
@@ -279,11 +279,11 @@ dns_dispatch_mx_preference(int ev, struct async_res *ar, void *arg)
}
else {
error = DNS_ENOTFOUND;
- unpack_init(&pack, ar->ar_data, ar->ar_datalen);
- unpack_header(&pack, &h);
- unpack_query(&pack, &q);
+ asr_unpack_init(&pack, ar->ar_data, ar->ar_datalen);
+ asr_unpack_header(&pack, &h);
+ asr_unpack_query(&pack, &q);
for (; h.ancount; h.ancount--) {
- unpack_rr(&pack, &rr);
+ asr_unpack_rr(&pack, &rr);
if (rr.rr_type != T_MX)
continue;
print_dname(rr.rr.mx.exchange, buf, sizeof(buf));
@@ -364,7 +364,7 @@ async_event_dispatch(int fd, short ev, void *arg)
int r;
struct timeval tv;
- while ((r = async_run(aev->async, &ar)) == ASYNC_YIELD)
+ while ((r = asr_async_run(aev->async, &ar)) == ASYNC_YIELD)
aev->callback(r, &ar, aev->arg);
event_del(&aev->ev);