commit f9bb3ebff339dbdfd8a3327506d7adb07fe34c56 parent 5107aefbb6614e7b6545259a797f45a8187bf9f3 Author: finwo <finwo@pm.me> Date: Sat, 3 Jan 2026 19:31:14 +0100 1.34 Diffstat:
106 files changed, 223 insertions(+), 126 deletions(-)
diff --git a/ChangeLog b/ChangeLog @@ -1,6 +1,17 @@ ChangeLog for Crossroads ------------------------------------------------------------------------------ +1.34 [KK 2007-04-03] Added SVN revision number to the overall version + ID, so that tracking historical versions becomes easier. Added + flag -t which causes tabular display in 'crossroads status' + (useful for automated parsing, e.g. for heartbeat scripts). + [KK 2007-04-06] Increased max # of back ends per service to + 20. (In the future this should be a dynamic value - but it'll + take code changes; so for now, I'm taking 20.) + +1.33 [KK 2007-04-02] Added hashpjw.c to the repository - I had + forgotten that in 1.32 (so, 1.32 is broken..). + 1.32 [KK 2007-03-30] Change net_read() and net_copy(): Read exceptions on the client network socket don't issue error or warning messages; clients are notorious for just dropping dead. Logging diff --git a/Makefile b/Makefile @@ -30,6 +30,7 @@ dist: documentation commit: clean headers documentation local clean svn commit + svn commit -m 'Revision number update' etc/svnrev.txt headers: tools/patch-header etc/hdr.template $(VER) src/*.c src/*.h diff --git a/doc/crossroads.html b/doc/crossroads.html @@ -1,12 +1,12 @@ <a name="defs.yo"></a><html><head> -<title>Crossroads 1.32</title> +<title>Crossroads 1.34</title> <link rel="stylesheet" type="text/css" href="http://www.e-tunity.com/css/yodl.css"> <link rel="stylesheet" type="text/css" href="http://www.e-tunity.com/css/yodl.css"> <link rev="made" href="mailto:info@e-tunity.com"> </head> <body> <hr> -<h1>Crossroads 1.32</h1> +<h1>Crossroads 1.34</h1> <h2>Karel Kubat</h2> <h2>e-tunity</h2><h2>2005, 2006, ff.</h2> diff --git a/doc/crossroads.man b/doc/crossroads.man @@ -1,6 +1,6 @@ -.TH "Crossroads 1\&.32" "2005, 2006, ff\&." +.TH "Crossroads 1\&.34" "2005, 2006, ff\&." .PP -.SH "Crossroads 1\&.32" +.SH "Crossroads 1\&.34" .SH "Karel Kubat" .SH "e-tunity" .SH "2005, 2006, ff\&." diff --git a/doc/crossroads.pdf b/doc/crossroads.pdf Binary files differ. diff --git a/etc/Makefile.def b/etc/Makefile.def @@ -3,14 +3,17 @@ # Versioning. This defines the overall version ID and must match the topmost # entry in the ChangeLog. -VER = 1.32 +VER = 1.34 + +# Revision version, auto-detected. +REVVER = $(shell ../etc/svnrev ../ChangeLog ../etc/svnrev.txt) # Default config DEFAULT_CONF = /etc/crossroads.conf # The max nr of backends of a given service. This is a fixed number, # because it defines the size of the shared memory that crossroads claims. -MAX_BACKEND = 10 +MAX_BACKEND = 20 # Magic mask for shared memory keys. SHM_MASK = 0x19081962 diff --git a/etc/svnrev b/etc/svnrev @@ -0,0 +1,42 @@ +#!/usr/bin/perl +use strict; + +die ("Usage: svnrev REFERENCEFILE STATEFILE\n", + "The revision number of the reference file is retrieved and shown.\n", + "The state file is updated.\n") + if ($#ARGV != 1); + +die ("No such file $ARGV[0]\n") + unless (-f $ARGV[0]); + +my $revno; + +# Can we slurp in "svn info"? +if (open (my $if, "svn info $ARGV[0] |")) { + while (defined (my $line = <$if>)) { + chomp ($line); + next unless ($line =~ /Last Changed Rev:/); + $line =~ s/Last Changed Rev: //; + $revno = $line; + } + close ($if); + + if ($revno ne '') { + open (my $of, ">$ARGV[1]") + or die ("Cannot write $ARGV[2]: $!\n"); + print $of ("$revno\n"); + close ($of); + } +} + +# If we failed to retrieve the rev no, get it from the state file. +if ($revno eq '') { + open (my $if, $ARGV[1]) + or die ("Cannot read $ARGV[1]: $!\n"); + $revno = <$if>; + chomp ($revno); + close ($if); +} + +# Finally.. display it +print ("$revno\n"); diff --git a/etc/svnrev.txt b/etc/svnrev.txt @@ -0,0 +1 @@ +140 diff --git a/src/Makefile b/src/Makefile @@ -40,7 +40,7 @@ CC = $(shell ../tools/c-conf c-compiler) DEFS = -DDEFAULT_CONF=\"$(DEFAULT_CONF)\" -DMAX_BACKEND=$(MAX_BACKEND) \ -DSHM_MASK=$(SHM_MASK) -DSLEEP_TIME=$(SLEEP_TIME) \ - -DCONNECT_TIMEOUT=$(CONNECT_TIMEOUT) -DVER=\"$(VER)\" \ + -DCONNECT_TIMEOUT=$(CONNECT_TIMEOUT) -DVER=\"$(VER)/$(REVVER)\" \ -DSET_PROC_TITLE_BY_ARGV=$(SET_PROC_TITLE_BY_ARGV) \ -DTCP_BUFSZ=$(TCP_BUFSZ) \ $(shell ../tools/c-conf ifheader malloc.h HAVE_MALLOC_H) \ diff --git a/src/allocreporter.c b/src/allocreporter.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ansistamp.c b/src/ansistamp.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/backendavailable.c b/src/backendavailable.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/backendconnect.c b/src/backendconnect.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/backendcount.c b/src/backendcount.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/choosebackend.c b/src/choosebackend.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/configtest.c b/src/configtest.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/copysockets.c b/src/copysockets.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/createcommandlinespace.c b/src/createcommandlinespace.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/crossroads.h b/src/crossroads.h @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -280,6 +280,7 @@ EXTERN unsigned char *srbuf; /* server socket input buffer */ EXTERN unsigned srbufpos, srbufmax; /* .. position & bytes */ EXTERN StateStringMap /* state/string map */ statestringmap[]; /* .. and vv */ +EXTERN int tabular_status; /* -t: tabular status overview */ EXTERN int uid_org, uid_set; /* original uid, flag: changed? */ EXTERN FILE *yyin; /* config file handle */ EXTERN int yylineno; /* input line number */ diff --git a/src/deallocreporter.c b/src/deallocreporter.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/decrclientcount.c b/src/decrclientcount.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/error.c b/src/error.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/forktcpservicer.c b/src/forktcpservicer.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/hashpjw.c b/src/hashpjw.c @@ -0,0 +1,25 @@ +/************************************************************************* + * This file is part of Crosroads 1.34, a load balancer and fail over + * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. + * Visit http://crossroads.e-tunity.com for information. + *************************************************************************/ + +#include "crossroads.h" + +int hashpjw (char const *str) { + int h = 0, g; + + while (str && *str) { + h <<= 4; + h += *str; + if ( (g = h & 0xf0000000) ) { + h ^= g >> 24; + h ^= g; + } + + str++; + } + + return (h); +} + diff --git a/src/httpcopy.c b/src/httpcopy.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httperror.c b/src/httperror.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderaddheader.c b/src/httpheaderaddheader.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderappendheader.c b/src/httpheaderappendheader.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderconnectiontype.c b/src/httpheaderconnectiontype.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderfree.c b/src/httpheaderfree.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderhascookie.c b/src/httpheaderhascookie.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderhttpver.c b/src/httpheaderhttpver.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheadernew.c b/src/httpheadernew.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderread.c b/src/httpheaderread.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderremoveheader.c b/src/httpheaderremoveheader.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheadersetheader.c b/src/httpheadersetheader.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderval.c b/src/httpheaderval.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpheaderwrite.c b/src/httpheaderwrite.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpinsertheader.c b/src/httpinsertheader.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpserve.c b/src/httpserve.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpserversocket.c b/src/httpserversocket.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/httpwrite.c b/src/httpwrite.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/incrclientcount.c b/src/incrclientcount.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/initsockaddr.c b/src/initsockaddr.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/interrupt.c b/src/interrupt.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ipfaddallow.c b/src/ipfaddallow.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ipfadddeny.c b/src/ipfadddeny.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ipfallowed.c b/src/ipfallowed.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ipfdenied.c b/src/ipfdenied.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ipfloadfile.c b/src/ipfloadfile.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ipfmatch.c b/src/ipfmatch.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ipfparse.c b/src/ipfparse.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/ishexdigit.c b/src/ishexdigit.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/isspace.c b/src/isspace.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/lexer.c b/src/lexer.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/lockreporter.c b/src/lockreporter.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/logactivityany.c b/src/logactivityany.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/logactivitycontinuation.c b/src/logactivitycontinuation.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/logactivityend.c b/src/logactivityend.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/logactivitystart.c b/src/logactivitystart.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/main.c b/src/main.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -60,7 +60,7 @@ int main (int argc, char **argv) { /* Parse options. */ config_file = DEFAULT_CONF; - while ( (opt = getopt (argc, argv, "?c:fhvi:Val:s")) > 0 ) + while ( (opt = getopt (argc, argv, "?c:fhvi:Val:st")) > 0 ) switch (opt) { case 'a': log_activity++; @@ -107,6 +107,9 @@ int main (int argc, char **argv) { case 's': sloppyportbind++; break; + case 't': + tabular_status++; + break; case 'V': puts (VER); exit (0); diff --git a/src/makesocket.c b/src/makesocket.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/markactivity.c b/src/markactivity.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/msg.c b/src/msg.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/msgdumpbuf.c b/src/msgdumpbuf.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/netbuffer.c b/src/netbuffer.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/netbufread.c b/src/netbufread.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/netcopy.c b/src/netcopy.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/netread.c b/src/netread.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/netwrite.c b/src/netwrite.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/parser.c b/src/parser.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/parser.h b/src/parser.h @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/restart.c b/src/restart.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/runservice.c b/src/runservice.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/serve.c b/src/serve.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/setprogramtitle.c b/src/setprogramtitle.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/showservices.c b/src/showservices.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/showstatus.c b/src/showstatus.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -61,30 +61,39 @@ int show_status (int ac, char **av) { alloc_reporter (service + i, 0); msg ("Reporting service %s (pid = %d)", service[i].name, servicereport->pid); - printf ("Service : %s, %d live connections, last backend %d\n", - service[i].name, servicereport->nclients, - servicereport->last_backend); + if (tabular_status) + printf ("%s ", service[i].name); + else + printf ("Service : %s, %d live connections, " + "last backend %d\n", + service[i].name, servicereport->nclients, + servicereport->last_backend); for (j = 0; j < service[i].nbackend; j++) { - printf (" Backend %2d : %s is %s, %u live connections\n" - " Stats : %lu failures out of %lu connections", - j, - service[i].backend[j].name, - state_to_string (servicereport->backendstate[j].avail), - servicereport->backendstate[j].nclients, - servicereport->backendstate[j].failures, - servicereport->backendstate[j].totuses); - if (service[i].type == type_http) - printf (", %lu sessions,", - servicereport->backendstate[j].sessions); - printf ("\n" - " usage %s, %s", - timestr (servicereport->backendstate[j].nsec), - bytestr (servicereport->backendstate[j].nbytes)); - if (service[i].dispatchover) - printf (", avg %s, %s", - timestr(servicereport->backendstate[j].avg_nsec), - bytestr(servicereport->backendstate[j].avg_nbytes)); - putchar ('\n'); + if (tabular_status) + printf ("%s=%s ", service[i].backend[j].name, + state_to_string(servicereport->backendstate[j].avail)); + else { + printf (" Backend %2d : %s is %s, %u live connections\n" + " Stats : %lu failures out of %lu connections", + j, + service[i].backend[j].name, + state_to_string (servicereport->backendstate[j].avail), + servicereport->backendstate[j].nclients, + servicereport->backendstate[j].failures, + servicereport->backendstate[j].totuses); + if (service[i].type == type_http) + printf (", %lu sessions,", + servicereport->backendstate[j].sessions); + printf ("\n" + " usage %s, %s", + timestr (servicereport->backendstate[j].nsec), + bytestr (servicereport->backendstate[j].nbytes)); + if (service[i].dispatchover) + printf (", avg %s, %s", + timestr(servicereport->backendstate[j].avg_nsec), + bytestr(servicereport->backendstate[j].avg_nbytes)); + putchar ('\n'); + } } if (shmdt (servicereport) < 0) diff --git a/src/stagetostring.c b/src/stagetostring.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/statetostring.c b/src/statetostring.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/stopdaemon.c b/src/stopdaemon.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/strcasestr.c b/src/strcasestr.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/strexpandformat.c b/src/strexpandformat.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/stringtostate.c b/src/stringtostate.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/strlcat.c b/src/strlcat.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/strprintf.c b/src/strprintf.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/strvprintf.c b/src/strvprintf.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/sysrun.c b/src/sysrun.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/tcpserve.c b/src/tcpserve.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/tellservice.c b/src/tellservice.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/thruputlog.c b/src/thruputlog.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/trafficlog.c b/src/trafficlog.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/uidassume.c b/src/uidassume.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/uidrestore.c b/src/uidrestore.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/unlockreporter.c b/src/unlockreporter.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/usage.c b/src/usage.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/usage.txt b/src/usage.txt @@ -26,6 +26,7 @@ Supported flags: for LOG_LOCAL0 to LOG_LOCAL7. -s: Sloppy binding to the listen port of each service (if the port is busy, Crossroads will wait for it to become free). + -t: 'status' output is shown as a tabular availability view -v: Enables verbosity upon startup. Other verbosity (services and back ends) is controlled in the configuration. -V: Shows the version ID and stops. diff --git a/src/vsyslog.c b/src/vsyslog.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/wakeuphandler.c b/src/wakeuphandler.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/warning.c b/src/warning.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/writelog.c b/src/writelog.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/xmalloc.c b/src/xmalloc.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/xrealloc.c b/src/xrealloc.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/xstrcat.c b/src/xstrcat.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/xstrcatch.c b/src/xstrcatch.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ diff --git a/src/xstrdup.c b/src/xstrdup.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.32, a load balancer and fail over + * This file is part of Crosroads 1.34, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/