*/
/*
* This file is
- * Copyright (C) 1999 Tony Finch <dot@dotat.at>
- * Copyright (C) 1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ * Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+ * Copyright (C) 1999-2000 Ian Jackson <ian@davenant.greenend.org.uk>
*
* It is part of adns, which is
- * Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- * Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ * Copyright (C) 1997-2000,2003,2006 Ian Jackson
+ * Copyright (C) 1999-2000,2003,2006 Tony Finch
+ * Copyright (C) 1991 Massachusetts Institute of Technology
+ * (See the file INSTALL for full details.)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * This version was originally supplied by Tony Finch, but has been
- * modified by Ian Jackson as it was incorporated into adns.
+ * This version was originally supplied by Tony Finch, but has been
+ * modified by Ian Jackson as it was incorporated into adns and
+ * subsequently.
*/
static const char * const cvsid =
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
+#include <stdarg.h>
+#include "config.h"
#include "adns.h"
+#include "client.h"
+
+#ifdef ADNS_REGRESS_TEST
+# include "hredirect.h"
+#endif
/* maximum number of concurrent DNS queries */
-#define MAXPENDING 1000
+#define MAXMAXPENDING 64000
+#define DEFMAXPENDING 2000
/* maximum length of a line */
#define MAXLINE 1024
#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 sensible_ctype(type,ch) (type((unsigned char)(ch)))
+ /* isfoo() functions from ctype.h can't safely be fed char - blech ! */
+
+static void msg(const char *fmt, ...) {
+ va_list al;
-static void aargh(const char *msg) {
- fprintf(stderr, "%s: %s: %s (%d)\n", progname, msg,
- strerror(errno) ? strerror(errno) : "Unknown error", errno);
+ fprintf(stderr, "%s: ", progname);
+ va_start(al,fmt);
+ vfprintf(stderr, fmt, al);
+ va_end(al);
+ fputc('\n',stderr);
+}
+
+static void aargh(const char *cause) {
+ const char *why = strerror(errno);
+ if (!why) why = "Unknown error";
+ msg("%s: %s (%d)", cause, why, errno);
exit(1);
}
ptrs[0]= start;
retry:
- while (!isdigit(*ptrs[0]))
+ while (!sensible_ctype(isdigit,*ptrs[0]))
if (!*ptrs[0]++) {
strcpy(buf, "invalid.");
*addr= *rest= NULL;
return buf;
}
- for (i= 1; i < 5; i ++) {
- ptrs[i]= strchr(ptrs[i-1], (i == 4) ? ' ' : '.');
- if (!ptrs[i] || ptrs[i]-ptrs[i-1] > 3) {
- ptrs[0]++;
+ for (i= 1; i < 5; i++) {
+ ptrs[i]= ptrs[i-1];
+ while (sensible_ctype(isdigit,*ptrs[i]++));
+ if ((i == 4 && !sensible_ctype(isspace,ptrs[i][-1])) ||
+ (i != 4 && ptrs[i][-1] != '.') ||
+ (ptrs[i]-ptrs[i-1] > 4)) {
+ ptrs[0]= ptrs[i]-1;
goto retry;
- } else
- ptrs[i]++;
+ }
}
sprintf(buf, "%.*s.%.*s.%.*s.%.*s.in-addr.arpa.",
- ptrs[4]-ptrs[3]-1, ptrs[3],
- ptrs[3]-ptrs[2]-1, ptrs[2],
- ptrs[2]-ptrs[1]-1, ptrs[1],
- ptrs[1]-ptrs[0]-1, ptrs[0]);
+ (int)(ptrs[4]-ptrs[3]-1), ptrs[3],
+ (int)(ptrs[3]-ptrs[2]-1), ptrs[2],
+ (int)(ptrs[2]-ptrs[1]-1), ptrs[1],
+ (int)(ptrs[1]-ptrs[0]-1), ptrs[0]);
*addr= ptrs[0];
*rest= ptrs[4]-1;
return buf;
}
-static void printline(char *start, char *addr, char *rest, char *domain) {
+static void printline(FILE *outf, char *start, char *addr, char *rest, char *domain) {
if (domain)
- printf("%.*s%s%s", addr - start, start, domain, rest);
+ fprintf(outf, "%.*s%s%s", (int)(addr - start), start, domain, rest);
else
- fputs(start, stdout);
- if (ferror(stdout)) aargh("write output");
+ fputs(start, outf);
+ if (ferror(outf)) aargh("write output");
}
typedef struct logline {
adns_query query;
} logline;
-static logline *readline(adns_state adns, int opts) {
+static logline *readline(FILE *inf, adns_state adns, int opts) {
static char buf[MAXLINE];
char *str;
logline *line;
- if (fgets(buf, MAXLINE, stdin)) {
+ if (fgets(buf, MAXLINE, inf)) {
str= malloc(sizeof(*line) + strlen(buf) + 1);
if (!str) aargh("malloc");
line= (logline*)str;
line->next= NULL;
line->start= str+sizeof(logline);
strcpy(line->start, buf);
- str = ipaddr2domain(line->start, &line->addr, &line->rest);
+ str= ipaddr2domain(line->start, &line->addr, &line->rest);
if (opts & OPT_DEBUG)
- fprintf(stderr, "%s: adns_submit %s\n", progname, str);
+ msg("submitting %.*s -> %s", (int)(line->rest-line->addr), guard_null(line->addr), str);
if (adns_submit(adns, str, adns_r_ptr,
adns_qf_quoteok_cname|adns_qf_cname_loose,
NULL, &line->query))
aargh("adns_submit");
return line;
}
- if (!feof(stdin))
+ if (!feof(inf))
aargh("fgets");
return NULL;
}
-static void proclog(int opts) {
+static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
int eof, err, len;
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(adns, opts);
+ head= tail= readline(inf, adns, opts);
len= 1; eof= 0;
while (head) {
- if (eof || len > MAXPENDING)
- if (opts & OPT_POLL)
- err= adns_wait_poll(adns, &head->query, &answer, NULL);
- else
- err= adns_wait(adns, &head->query, &answer, NULL);
- else
- err= adns_check(adns, &head->query, &answer, NULL);
- if (err != EWOULDBLOCK) {
- printline(head->start, head->addr, head->rest,
- answer->status == adns_s_ok ? *answer->rrs.str : NULL);
- line= head; head= head->next;
- free(line); free(answer);
- len--;
+ while (head) {
+ if (opts & OPT_DEBUG)
+ msg("%d in queue; checking %.*s", len,
+ (int)(head->rest-head->addr), guard_null(head->addr));
+ if (eof || len >= maxpending) {
+ if (opts & OPT_POLL)
+ err= adns_wait_poll(adns, &head->query, &answer, NULL);
+ else
+ err= adns_wait(adns, &head->query, &answer, NULL);
+ } else {
+ 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;
+ free(line);
+ free(answer);
+ len--;
}
if (!eof) {
- line= readline(adns, opts);
- if (!line)
+ line= readline(inf, adns, opts);
+ if (line) {
+ if (!head) head= line;
+ else tail->next= line;
+ tail= line; len++;
+ } else {
eof= 1;
- else {
- if (!head)
- head = line;
- else
- tail->next = line;
- tail = line;
- len++;
}
}
}
adns_finish(adns);
}
+static void printhelp(FILE *file) {
+ fputs("usage: adnslogres [<options>] [<logfile>]\n"
+ " adnslogres --version|--help\n"
+ "options: -c <concurrency> set max number of outstanding queries\n"
+ " -p use poll(2) instead of select(2)\n"
+ " -d turn on debugging\n"
+ " -C <config> use instead of contents of resolv.conf\n",
+ stdout);
+}
+
+static void usage(void) {
+ printhelp(stderr);
+ exit(1);
+}
+
int main(int argc, char *argv[]) {
- int c, opts;
+ int c, opts, maxpending;
+ extern char *optarg;
+ FILE *inf;
- progname= *argv;
- opts= 0;
+ if (argv[1] && !strncmp(argv[1],"--",2)) {
+ if (!strcmp(argv[1],"--help")) {
+ printhelp(stdout);
+ } else if (!strcmp(argv[1],"--version")) {
+ fputs(VERSION_MESSAGE("adnslogres"),stdout);
+ } else {
+ usage();
+ }
+ if (ferror(stdout) || fclose(stdout)) { perror("stdout"); exit(1); }
+ exit(0);
+ }
- while ((c= getopt(argc, argv, "dp")) != -1) {
+ maxpending= DEFMAXPENDING;
+ opts= 0;
+ while ((c= getopt(argc, argv, "c:C:dp")) != -1)
switch (c) {
+ case 'c':
+ maxpending= atoi(optarg);
+ if (maxpending < 1 || maxpending > MAXMAXPENDING) {
+ fprintf(stderr, "%s: unfeasible concurrency %d\n", progname, maxpending);
+ exit(1);
+ }
+ break;
+ case 'C':
+ config_text= optarg;
+ break;
case 'd':
- opts |= OPT_DEBUG;
+ opts|= OPT_DEBUG;
break;
case 'p':
- opts |= OPT_POLL;
+ opts|= OPT_POLL;
break;
default:
- fprintf(stderr, "usage: %s [-d] < logfile\n", progname);
- exit(1);
+ usage();
}
- argc-= optind;
- argv+= optind;
- }
- proclog(opts);
+ argc-= optind;
+ argv+= optind;
+
+ inf= NULL;
+ if (argc == 0)
+ inf= stdin;
+ else if (argc == 1)
+ inf= fopen(*argv, "r");
+ else
+ usage();
+
+ if (!inf)
+ aargh("couldn't open input");
+
+ proclog(inf, stdout, maxpending, opts);
+
+ if (fclose(inf))
+ aargh("fclose input");
+ if (fclose(stdout))
+ aargh("fclose output");
- if (fclose(stdout)) aargh("finish writing output");
return 0;
}
~ianmdlvl / adns.git / blobdiff