chase changes between c-ares 1.4.0 to c-ares 1.6.0

pass maintainership to submitter

PR:		139228
Submitted by:	Tom Pusateri <pusateri at bangj dot com>
This commit is contained in:
Ying-Chieh Liao 2009-10-04 02:20:08 +00:00
parent 365e5492a2
commit bcc89cd5e0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=242425
2 changed files with 31 additions and 2 deletions

View file

@ -8,12 +8,12 @@
PORTNAME= libevnet
PORTVERSION= 0.3.8
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= http://www.25thandclement.com/~william/projects/releases/
EXTRACT_SUFX= .tgz
MAINTAINER= ijliao@FreeBSD.org
MAINTAINER= pusateri@bangj.com
COMMENT= Network Daemon Services for libevent
BUILD_DEPENDS= ${LOCALBASE}/lib/libarena.a:${PORTSDIR}/devel/libarena

View file

@ -0,0 +1,29 @@
--- src/lookup.c.orig 2009-10-04 10:13:19.191192582 +0800
+++ src/lookup.c 2009-10-04 10:15:44.531364833 +0800
@@ -2037,7 +2037,7 @@
} /* lookup_additional_query() */
-static void lookup_catch_ares(void *, int, unsigned char *, int);
+static void lookup_catch_ares(void *, int, int, unsigned char *, int);
static void lookup_issue_query(struct lookup *l, struct lookup_query *q, const char *qname, size_t qnamelen, int rtype) {
struct ares_channel *c;
@@ -2052,7 +2052,7 @@
q->channel = c;
if (l->opts.query_max != 0 && q->live_queries_made >= l->opts.query_max) {
- lookup_catch_ares(q, ARES_ENODATA, NULL, 0);
+ lookup_catch_ares(q, ARES_ENODATA, 0, NULL, 0);
} else {
++q->live_queries_made;
ares_query(c->channel, qname, C_IN, lookup_rtype2arpa(rtype), lookup_catch_ares, q);
@@ -2708,7 +2708,7 @@
} /* lookup_process() */
-static void lookup_catch_ares(void *l_, int ares_errno, unsigned char *abuf, int alen) {
+static void lookup_catch_ares(void *l_, int ares_errno, int timeouts, unsigned char *abuf, int alen) {
int lookup_errno = LOOKUP_ESUCCESS;
struct lookup_query *q;
struct lookup *l;