~mdw
/
adns
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
@@ -9,7 +9,7 @@
[adns]
/
client
/
adnslogres.c
diff --git
a/client/adnslogres.c
b/client/adnslogres.c
index
285d890
..
b86b408
100644
(file)
--- a/
client/adnslogres.c
+++ b/
client/adnslogres.c
@@
-31,7
+31,7
@@
*/
static const char * const cvsid =
*/
static const char * const cvsid =
- "$Id: adnslogres.c,v 1.1
5 2000/09/16 19:29:22
ian Exp $";
+ "$Id: adnslogres.c,v 1.1
7 2000/09/16 21:48:13
ian Exp $";
#include <sys/types.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/time.h>
@@
-47,6
+47,10
@@
static const char * const cvsid =
#include "config.h"
#include "adns.h"
#include "config.h"
#include "adns.h"
+#ifdef ADNS_REGRESS_TEST
+# include "hredirect.h"
+#endif
+
/* maximum number of concurrent DNS queries */
#define MAXMAXPENDING 64000
#define DEFMAXPENDING 2000
/* maximum number of concurrent DNS queries */
#define MAXMAXPENDING 64000
#define DEFMAXPENDING 2000
@@
-58,7
+62,8
@@
static const char * const cvsid =
#define OPT_DEBUG 1
#define OPT_POLL 2
#define OPT_DEBUG 1
#define OPT_POLL 2
-static const char *progname;
+static const char *const progname= "adnslogres";
+static const char *config_text;
#define guard_null(str) ((str) ? (str) : "")
#define guard_null(str) ((str) ? (str) : "")
@@
-163,8
+168,14
@@
static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
adns_state adns;
adns_answer *answer;
logline *head, *tail, *line;
adns_state adns;
adns_answer *answer;
logline *head, *tail, *line;
+ adns_initflags initflags;
- errno= adns_init(&adns, (opts & OPT_DEBUG) ? adns_if_debug : 0, 0);
+ initflags= (opts & OPT_DEBUG) ? adns_if_debug : 0;
+ if (config_text) {
+ errno= adns_init_strcfg(&adns, initflags, stderr, config_text);
+ } else {
+ errno= adns_init(&adns, initflags, 0);
+ }
if (errno) aargh("adns_init");
head= tail= readline(inf, adns, opts);
len= 1; eof= 0;
if (errno) aargh("adns_init");
head= tail= readline(inf, adns, opts);
len= 1; eof= 0;
@@
-173,7
+184,7
@@
static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
if (opts & OPT_DEBUG)
msg("%d in queue; checking %.*s", len,
head->rest-head->addr, guard_null(head->addr));
if (opts & OPT_DEBUG)
msg("%d in queue; checking %.*s", len,
head->rest-head->addr, guard_null(head->addr));
- if (eof || len > maxpending) {
+ if (eof || len >
=
maxpending) {
if (opts & OPT_POLL)
err= adns_wait_poll(adns, &head->query, &answer, NULL);
else
if (opts & OPT_POLL)
err= adns_wait_poll(adns, &head->query, &answer, NULL);
else
@@
-182,10
+193,15
@@
static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
err= adns_check(adns, &head->query, &answer, NULL);
}
if (err == EAGAIN) break;
err= adns_check(adns, &head->query, &answer, NULL);
}
if (err == EAGAIN) break;
+ if (err) {
+ fprintf(stderr, "%s: adns_wait/check: %s", progname, strerror(err));
+ exit(1);
+ }
printline(outf, head->start, head->addr, head->rest,
answer->status == adns_s_ok ? *answer->rrs.str : NULL);
line= head; head= head->next;
printline(outf, head->start, head->addr, head->rest,
answer->status == adns_s_ok ? *answer->rrs.str : NULL);
line= head; head= head->next;
- free(line); free(answer);
+ free(line);
+ free(answer);
len--;
}
if (!eof) {
len--;
}
if (!eof) {
@@
-203,7
+219,8
@@
static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
}
static void usage(void) {
}
static void usage(void) {
- fprintf(stderr, "usage: %s [-d] [-p] [-c concurrency] [logfile]\n", progname);
+ fprintf(stderr, "usage: %s [-d] [-p] [-c concurrency] [-C config] [logfile]\n",
+ progname);
exit(1);
}
exit(1);
}
@@
-212,15
+229,9
@@
int main(int argc, char *argv[]) {
extern char *optarg;
FILE *inf;
extern char *optarg;
FILE *inf;
- progname= strrchr(*argv, '/');
- if (progname)
- progname++;
- else
- progname= *argv;
-
maxpending= DEFMAXPENDING;
opts= 0;
maxpending= DEFMAXPENDING;
opts= 0;
- while ((c= getopt(argc, argv, "c:dp")) != -1)
+ while ((c= getopt(argc, argv, "c:
C:
dp")) != -1)
switch (c) {
case 'c':
maxpending= atoi(optarg);
switch (c) {
case 'c':
maxpending= atoi(optarg);
@@
-229,6
+240,9
@@
int main(int argc, char *argv[]) {
exit(1);
}
break;
exit(1);
}
break;
+ case 'C':
+ config_text= optarg;
+ break;
case 'd':
opts|= OPT_DEBUG;
break;
case 'd':
opts|= OPT_DEBUG;
break;