head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.3.0.42 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.40 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.38 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.36 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.34 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.32 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.30 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.28 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.26 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.24 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.22 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.20 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.18 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.16 pkgsrc-2008Q1:1.3.0.14 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.12 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.10 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.8 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.0.10 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.8 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.6 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.4 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.2 pkgsrc-2005Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2011.06.09.16.55.30; author drochner; state dead; branches; next 1.3; 1.3 date 2006.08.05.12.20.34; author adam; state Exp; branches; next 1.2; 1.2 date 2006.06.21.21.27.30; author joerg; state Exp; branches; next 1.1; 1.1 date 2004.12.20.23.24.02; author christos; state Exp; branches; next ; desc @@ 1.4 log @update to 0.9.12 changes: -added IPv6 support -more statistics, can be exported as XML -minor feature additions -bugfixes @ text @$NetBSD: patch-ab,v 1.3 2006/08/05 12:20:34 adam Exp $ --- src/direct_resolve.c.orig 2006-04-29 09:58:35.000000000 +0200 +++ src/direct_resolve.c @@@@ -42,7 +42,6 @@@@ #include #include #include -#include #include #include #include @@@@ -72,8 +71,17 @@@@ extern char *sys_errlist[]; #define strerror(errno) (((errno) >= 0 && (errno) < sys_nerr) ? sys_errlist[errno] : "unlisted error") #endif -/* Hmm, it seems Irix requires this */ -extern int errno; +#ifdef res_ninit +#define RES_INIT() res_ninit(&myres); +#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \ + res_nmkquery(&myres, a, b, c, d, e, f, g, h, i) +struct __res_state myres; +#else +#define myres _res +#define RES_INIT() res_init(); +#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \ + res_mkquery(a, b, c, d, e, f, g, h, i) +#endif /* Defines */ #define HostnameLength 255 /* From RFC */ @@@@ -254,15 +262,15 @@@@ void direct_open (void) { int option, i; - res_init (); - if (!_res.nscount) + RES_INIT(); + if (!myres.nscount) { fprintf (stderr, "No nameservers defined.\n"); exit (-1); } - _res.options |= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH; - for (i = 0; i < _res.nscount; i++) - _res.nsaddr_list[i].sin_family = AF_INET; + myres.options |= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH; + for (i = 0; i < myres.nscount; i++) + myres.nsaddr_list[i].sin_family = AF_INET; resfd = socket (AF_INET, SOCK_DGRAM, 0); if (resfd == -1) { @@@@ -320,7 +328,7 @@@@ dorequest (char *s, int type, word id) int buf[(MaxPacketsize / sizeof (int)) + 1]; restell ("dorequest()."); - r = res_mkquery (QUERY, s, C_IN, type, NULL, 0, NULL, (u_char *) buf, + r = RES_MKQUERY (QUERY, s, C_IN, type, NULL, 0, NULL, (u_char *) buf, MaxPacketsize); if (r == -1) { @@@@ -329,9 +337,9 @@@@ dorequest (char *s, int type, word id) } hp = (packetheader *) buf; hp->id = id; /* htons() deliberately left out (redundant) */ - for (i = 0; i < _res.nscount; i++) + for (i = 0; i < myres.nscount; i++) (void) sendto (resfd, buf, r, 0, - (struct sockaddr *) &_res.nsaddr_list[i], + (struct sockaddr *) &myres.nsaddr_list[i], sizeof (struct sockaddr)); } @@@@ -735,15 +743,15 @@@@ direct_ack () /* Check to see if this server is actually one we sent to */ if (from.sin_addr.s_addr == localhost) { - for (i = 0; i < _res.nscount; i++) - if ((_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) || (!_res.nsaddr_list[i].sin_addr.s_addr)) /* 0.0.0.0 replies as 127.0.0.1 */ + for (i = 0; i < myres.nscount; i++) + if ((myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) || (!myres.nsaddr_list[i].sin_addr.s_addr)) /* 0.0.0.0 replies as 127.0.0.1 */ break; } else - for (i = 0; i < _res.nscount; i++) - if (_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) + for (i = 0; i < myres.nscount; i++) + if (myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) break; - if (i == _res.nscount) + if (i == myres.nscount) { snprintf (tempstring, sizeof (tempstring), "Resolver error: Received reply from unknown source: %s", @ 1.3 log @Changes 0.9.6: * On newer distros (like FC5) the linker was called without --export-dynamic, making EtherApe unusable. * Fixed bug 1488215, "cancel" button on preferences dialog doesn't work. * Updated .desktop and .spec files * Updated debian files @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Never include sys/errno.h or define errno. @ text @d3 3 a5 3 --- src/dns.c.orig 2003-04-06 13:45:41.000000000 +0000 +++ src/dns.c @@@@ -38,7 +38,6 @@@@ d13 1 a13 1 @@@@ -60,11 +59,19 @@@@ extern char *sys_errlist[]; d17 2 d22 1 a22 1 + res_nmkquery(&myres, a, b, c, d, e, f, g, h, i) d28 1 a28 1 + res_mkquery(a, b, c, d, e, f, g, h, i) d31 4 a34 9 -/* Hmm, it seems Irix requires this */ -extern int errno; - /* Defined in main.c - non zero if you want to activate DNS resolving, zero to disable*/ extern int dns; @@@@ -432,15 +439,15 @@@@ void dns_open (void) d54 1 a54 2 @@@@ -755,7 +762,7 @@@@ dorequest (char *s, int type, word id) int r, i; d57 1 d63 1 a63 1 @@@@ -764,9 +771,9 @@@@ dorequest (char *s, int type, word id) d75 1 a75 1 @@@@ -1279,15 +1286,15 @@@@ dns_ack () @ 1.1 log @PR/27224: Daniel Carosone: Etherape is multi-threaded and uses _res. Fixed to use the new resolver functions. @ text @d3 11 a13 3 --- src/dns.c.orig 2003-04-06 09:45:41.000000000 -0400 +++ src/dns.c 2004-12-20 18:15:45.000000000 -0500 @@@@ -60,6 +60,17 @@@@ d30 7 a36 2 /* Hmm, it seems Irix requires this */ @@@@ -432,15 +443,15 @@@@ d57 1 a57 1 @@@@ -755,7 +766,7 @@@@ d66 1 a66 1 @@@@ -764,9 +775,9 @@@@ d78 1 a78 1 @@@@ -1279,15 +1290,15 @@@@ @