5359edc160de518d8e43fdd3448365c15b912c3c
galt
  Mon Jul 22 11:48:10 2019 -0700
Added ipv6 support. Listening processes us hybrid dual stack feature of OS to simplify implementation and use a single listening socket. Works with both TCP and UDP. Parasol working. geoIp also updated and ready for IPv6. Should be invisible to most users, while providing connections via ipv6 where available. Supports both ipv4 and ipv6.

diff --git src/weblet/bottleneck/bottleneck.c src/weblet/bottleneck/bottleneck.c
index 59df59c..4fae285 100644
--- src/weblet/bottleneck/bottleneck.c
+++ src/weblet/bottleneck/bottleneck.c
@@ -1,310 +1,310 @@
 /* bottleneck - A server that helps slow down hyperactive web robots. */
 #include "common.h"
 #include <sys/wait.h>
 #include "localmem.h"
 #include "linefile.h"
 #include "hash.h"
 #include "options.h"
 #include "portable.h"
 #include "internet.h"
 #include "net.h"
 
 
 int port = 17776;	/* Default bottleneck port. */
 char *host = "localhost";   /* Default host. */
 int penalty = 75;	    /* Penalty in milliseconds per access. */
 int recovery = 10;	    /* Recovery in milliseconds per second. */
 struct cidr *subnet = NULL;        /* Subnet as CIDR struct. */
 
 void usage()
 /* Explain usage and exit. */
 {
 errAbort(
   "bottleneck v2 - A server that helps slow down hyperactive web robots\n"
   "usage:\n"
   "   bottleneck start\n"
   "Start up bottleneck server\n"
   "   bottleneck query ip-address [count] [fraction]\n"
   "Ask bottleneck server how long to wait to service ip-address after imposing\n"
   "the specified fraction of the access penalty (default of 1.0)\n"
   "   bottleneck list\n"
   "List accessing sites\n"
   "   bottleneck set ip-address milliseconds\n"
   "Set current delay for given ip-address\n"
   "options:\n"
   "   -port=XXXX - Use specific tcp/ip port. Default %d.\n"
   "   -host=XXXXX - Use specific host.  Default %s.\n"
   "   -subnet=WWW.XXX.YYY.ZZZ Restrict access to subnet (example 192.168.255.255).\n"
-  "      Also accepts CIDR notation example 192.168.255.255/16\n"
+  "      Supports comma-separated list of IPv4 or IPv6 subnets in CIDR notation, for example 192.168.255.255/16\n"
   "   -penalty=N - Penalty (in milliseconds) for each access, default %d\n"
   "   -recovery=N - Amount to recover (in milliseconds) for each second\n"
   "                 between accesses.  Default %d\n"
   "Note: penalty and recovery if moved from defaults should balance\n"
   "At the default settings, an equilibrium will be achieved when queries\n"
   "are spaced 7.5 seconds apart.  At the default decay value, an accumulated\n"
   "delay of 15 seconds will take 25 minutes of idleness to decay back to zero.\n"
   , port, host, penalty, recovery
   );
 }
 
 static struct optionSpec options[] = {
    {"port", OPTION_INT},
    {"host", OPTION_STRING},
    {"subnet", OPTION_STRING},
    {"penalty", OPTION_INT},
    {"recovery", OPTION_INT},
    {NULL, 0},
 };
 
 struct tracker
 /* Keep track of IP addresses. */
     {
     struct tracker *next;	/* Next in list. */
     char *name;	/* Name (IP address).  Not allocated here. */
     time_t lastAccess;		/* Time of last access. */
     int curDelay;		/* Current delay in 1000ths of second. */
     int maxDelay;		/* Maximum delay so far. */
     int accessCount;		/* Total number of accesses since started tracking. */
     };
 
 struct hash *trackerHash = NULL;	/* Hash of all trackers. */
 struct tracker *trackerList;		/* List of all trackers. */
 time_t now;				/* Current time. */
 
 struct tracker *trackerForIp(char *ip)
 /* Find tracker for given IP address.  Make it up if it
  * doesn't already exist. */
 {
 struct tracker *tracker = hashFindVal(trackerHash, ip);
 if (tracker == NULL)
     {
     lmAllocVar(trackerHash->lm, tracker);
     hashAddSaveName(trackerHash, ip, tracker, &tracker->name);
     tracker->lastAccess = now;
     tracker->curDelay = -penalty;
     slAddHead(&trackerList, tracker);
     }
 return tracker;
 }
 
 int calcDelay(struct tracker *tracker, double fraction)
 /* Figure out recommended delay. */
 {
 int timeDiff = now - tracker->lastAccess;
 int delay;
 if (timeDiff < 0)
     timeDiff = 0;
 delay = tracker->curDelay + (int)(fraction*penalty) - timeDiff*recovery;
 if (delay < 0)
     delay = 0;
 return delay;
 }
 
 void returnList(int socket)
 /* Send list of all things tracked down socket. */
 {
 struct tracker *tracker;
 char buf[256];
 int timeDiff;
 safef(buf, sizeof(buf), "#IP_ADDRESS\thits\ttime\tmax\tcurrent");
 netSendString(socket, buf);
 for (tracker = trackerList; tracker != NULL; tracker = tracker->next)
     {
     timeDiff = now - tracker->lastAccess;
     safef(buf, sizeof(buf), "%s\t%d\t%d\t%d\t%d", 
     	tracker->name, tracker->accessCount, timeDiff, 
 	tracker->maxDelay, calcDelay(tracker, 1.0));
     if (!netSendString(socket, buf))
         break;
     }
 netSendString(socket, "");
 }
 
 void clearZombies()
 /* Clear any zombie processes */
 {
 int stat;
 for (;;)
     {
     if (waitpid(-1, &stat, WNOHANG) <= 0)
 	break;
     }
 }
 
 void forkOutList(int socket)
 /* Fork instance of self to send list of all things tracked
  * down socket. */
 {
 if (fork() == 0)
     {
     returnList(socket);
     exit(0);
     }
 else
     {
     clearZombies();
     }
 }
 
 void startServer()
 /* Start up bottleneck server. */
 {
 int acceptor;
 subnet = internetParseSubnetCidr(optionVal("subnet", NULL));
 trackerHash = newHash(18);
 acceptor = netAcceptingSocket(port, 64);
 for (;;)
     {
     struct tracker *tracker;
     int socket = netAcceptFrom(acceptor, subnet);
     char buf[256], *s;
     s = netGetString(socket, buf);
     if (s != NULL)
 	{
 	now = time(NULL);
 	if (s[0] == '?')
 	    {
 	    if (s[1] == 0)
 		forkOutList(socket);
 	    else
 	        {
 		char *command = nextWord(&s);
 		if (sameString(command, "?set"))
 		    {
 		    char *ip = nextWord(&s);
 		    char *millis = nextWord(&s);
 		    if (millis != NULL)
 		        {
 			tracker = trackerForIp(ip);
 			tracker->curDelay = atoi(millis) - penalty;
 			tracker->lastAccess = now;
 			}
 		    }
 		}
 	    }
 	else
 	    {
 	    char *ip = nextWord(&s);
 	    char *fraction = nextWord(&s);
 	    tracker = trackerForIp(ip);
 	    tracker->accessCount += 1;
 	    if (fraction != NULL)
 		tracker->curDelay = calcDelay(tracker, atof(fraction));
 	    else
 		tracker->curDelay = calcDelay(tracker, 1.0);
 	    if (tracker->maxDelay < tracker->curDelay)
 	        tracker->maxDelay = tracker->curDelay;
 	    tracker->lastAccess = now;
 	    safef(buf, sizeof(buf), "%d", tracker->curDelay);
 	    netSendString(socket, buf);
 	    }
 	}
     close(socket);
     }
 }
 
 void forkOffServer()
 /* Close standard file handles and fork to be a better daemon. */
 {
 /* Close standard file handles. */
 close(0);
 close(1);
 close(2);
 
 if (fork() == 0)
     {
     /* Execute daemon. */
     startServer();
     }
 }
 
 void queryServer(char *ip, int count, double fraction)
 /* Query bottleneck server - just for testing.
  * Main query is over ip port. */
 {
 int i;
 char sendString[256];
 safef(sendString, sizeof(sendString), "%s %f", ip, fraction);
 for (i=0; i<count; ++i)
     {
     int socket = netMustConnect(host, port);
     char buf[256], *s;
     netSendString(socket, sendString);
     s = netGetString(socket, buf);
     if (s == NULL)
         errAbort("Shut out by bottleneck server %s:%d", host, port);
     printf("%s millisecond delay recommended\n", s);
     close(socket);
     }
 }
 
 void setUser(char *ip, char *millis)
 /* Set user current delay. */
 {
 int socket = netMustConnect(host, port);
 char buf[256];
 safef(buf, sizeof(buf), "?set %s %s", ip, millis);
 netSendString(socket, buf);
 close(socket);
 }
 
 void listAll()
 /* Ask server for info on all IP addresses. */
 {
 int socket = netMustConnect(host, port);
 char buf[256], *s;
 netSendString(socket, "?");
 for (;;)
     {
     s = netGetString(socket, buf);
     if (s == NULL || s[0] == 0)
         break;
     printf("%s\n", buf);
     }
 close(socket);
 }
 
 int main(int argc, char *argv[])
 /* Process command line. */
 {
 char *command;
 optionInit(&argc, argv, options);
 if (argc < 2)
     usage();
 port = optionInt("port", port);
 host = optionVal("host", host);
 penalty = optionInt("penalty", penalty);
 recovery = optionInt("recovery", recovery);
 command = argv[1];
 if (sameString(command, "start"))
     {
     if (argc != 2)
         usage();
     forkOffServer();
     }
 else if (sameString(command, "query"))
     {
     int count = 1;
     if (argc > 3)
 	count = atoi(argv[3]);
     double fraction = 1.0;
     if (argc > 4)
     fraction = atof(argv[4]);
     queryServer(argv[2], count, fraction);
     }
 else if (sameString(command, "list"))
     {
     listAll();
     }
 else if (sameString(command, "set"))
     {
     if (argc != 4)
         usage();
     setUser(argv[2], argv[3]);
     }
 else
     {
     usage();
     }
 return 0;
 }