adnsresfilter: Honour --checkc-freq and --checkc-entex

[adns.git] / client / adnsresfilter.c

diff --git a/client/adnsresfilter.c b/client/adnsresfilter.c
index c534f7d70f578ea5906a4c39b348541750b41e7f..2303f6fe22bc46020591c62e7f9bfbc6ae5281d6 100644 (file)
--- a/client/adnsresfilter.c
+++ b/client/adnsresfilter.c
@@ -4,14 +4,15 @@
  */
 /*
  *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
+ *    Copyright (C) 2014  Mark Wooding
  *    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
- *  the Free Software Foundation; either version 2, or (at your option)
+ *  the Free Software Foundation; either version 3, or (at your option)
  *  any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
@@ -20,8 +21,7 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+ *  along with this program; if not, write to the Free Software Foundation.
  */
 
 #include <stdio.h>
@@ -48,8 +48,7 @@
 
 struct outqueuenode {
   struct outqueuenode *next, *back;
-  void *buffer;
-  char *textp;
+  char *buffer, *textp;
   int textlen;
   struct timeval printbefore;
   struct treething *addr;
@@ -68,7 +67,7 @@ static int peroutqueuenode, outqueuelen;
 static struct sockaddr_in sa;
 static adns_state ads;
 
-static char addrtextbuf[14];
+static char addrtextbuf[18]; /* [ddd.ddd.ddd.ddd] + nul */
 static int cbyte, inbyte, inbuf;
 static unsigned char bytes[4];
 static struct timeval printbefore;
@@ -172,6 +171,10 @@ static void parseargs(const char *const *argv) {
        config_text= arg;
       } else if (!strcmp(arg,"--debug")) {
        initflags |= adns_if_debug;
+      } else if (!strcmp(arg,"--checkc-freq")) {
+       initflags |= adns_if_checkc_freq;
+      } else if (!strcmp(arg,"--checkc-entex")) {
+       initflags |= adns_if_checkc_entex;
       } else if (!strcmp(arg,"--help")) {
        usage(); quitnow(0);
       } else if (!strcmp(arg,"--version")) {
@@ -216,7 +219,8 @@ static void queueoutchar(int c) {
   struct outqueuenode *entry;
   
   entry= outqueue.tail;
-  if (!entry || entry->addr || entry->textlen >= peroutqueuenode) {
+  if (!entry || entry->addr ||
+      entry->textlen >= peroutqueuenode - (entry->textp - entry->buffer)) {
     peroutqueuenode= !peroutqueuenode || !entry || entry->addr ? 128 : 
       peroutqueuenode >= 1024 ? 4096 : peroutqueuenode<<2;
     entry= xmalloc(sizeof(*entry));