commit b302e2846e5dcfc6c7dd837779bbb507744e34ff parent 6a15322c387b1bd2352e7fcdf1977e8c4ea32f58 Author: finwo <finwo@pm.me> Date: Sat, 3 Jan 2026 19:31:25 +0100 1.36 Diffstat:
103 files changed, 152 insertions(+), 122 deletions(-)
diff --git a/ChangeLog b/ChangeLog @@ -1,6 +1,11 @@ ChangeLog for Crossroads ------------------------------------------------------------------------------ +1.36 [KK 2007-04-16] Fixed small bug in total usage counting. Bugfix + in resetting temporary failure counts of back ends (while waiting + for retries to expire). Added __attribute__ compiler macro to + functions such as msg(), warning() -- and fixed format conversion issues. + 1.35 [KK 2007-04-16] Added 'retries' keyword to back end definitions. 1.34 [KK 2007-04-03] Added SVN revision number to the overall version diff --git a/doc/conf/retries.yo b/doc/conf/retries.yo @@ -0,0 +1,11 @@ +conf(retries - Specifying allowed failures) + (Back ends that are 'flaky' or on a less reliable network can be + marked as unavailable after not just one failure, but after + e.g. three. You can use this configuration if you suspect that + spurious errors cause otherwise 'good' back ends to be marked as + unavailable, while they in fact still could be used.) + (tt(retries) em(number); where em(number) is the threshold of bad + connections. Once exceeded, Crossroads will mark a back end as + unavailable.) + (1; a back end is assumed to be unavailable after the first bad + connection.) diff --git a/doc/crossroads.html b/doc/crossroads.html @@ -1,12 +1,12 @@ <a name="defs.yo"></a><html><head> -<title>Crossroads 1.35</title> +<title>Crossroads 1.36</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.35</h1> +<h1>Crossroads 1.36</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\&.35" "2005, 2006, ff\&." +.TH "Crossroads 1\&.36" "2005, 2006, ff\&." .PP -.SH "Crossroads 1\&.35" +.SH "Crossroads 1\&.36" .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,7 +3,7 @@ # Versioning. This defines the overall version ID and must match the topmost # entry in the ChangeLog. -VER = 1.35 +VER = 1.36 # Revision version, auto-detected. REVVER = $(shell ../etc/svnrev ../ChangeLog ../etc/svnrev.txt) diff --git a/etc/svnrev.txt b/etc/svnrev.txt @@ -1 +1 @@ -140 +142 diff --git a/src/allocreporter.c b/src/allocreporter.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -271,7 +271,7 @@ void choose_backend () { values[i] = servicereport->backendstate[backends[i]].nsec * 1000000 * activeservice->backend[backends[i]].weight; - msg ("Service %s: By duration weighing: backend %d has value %lu" + msg ("Service %s: By duration weighing: backend %d has value %g" " (sec=%g, avgsec=%g, weight=%d)", activeservice->name, backends[i], values[i], @@ -310,7 +310,7 @@ void choose_backend () { servicereport->backendstate[backends[i]].nclients * activeservice->backend[backends[i]].weight; msg ("Service %s: " - "by connections weighing: backend %d has value %u", + "by connections weighing: backend %d has value %g", activeservice->name, backends[i], values[i]); } /* Find the minimum in the values array. */ diff --git a/src/configtest.c b/src/configtest.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -290,7 +290,10 @@ EXTERN int yylineno; /* input line number */ EXTERN char *yyerrmsg; /* parsing error msg */ EXTERN char *yytext; /* lexical buffer */ -/* Functions. */ +/* Functions. To suppress the __attribute__ macro (if you're on a + * non-gcc compiler), uncomment the following. */ +// #undef __attribute__ +// #define __attribute(x) extern void alloc_reporter (Service *active, int first); extern char *ansistamp (TmType t); extern int backend_available (int target); @@ -302,7 +305,8 @@ extern int configtest (int ac, char **av); extern void create_commandline_space (void); extern void decr_client_count (void); extern void dealloc_reporter (Service *s); -extern void error (char const *fmt, ...); +extern void error (char const *fmt, ...) + __attribute__ ((format (printf, 1, 2))); extern int fork_tcp_servicer (int to_backend); extern int hashpjw (char const *s); extern void http_copy (HttpHeader *h, int src_sock, int dst_sock, @@ -344,7 +348,8 @@ extern void log_activity_end (void); extern void log_activity_continuation (void); extern int make_socket (int port, char const *ipaddr); extern void mark_activity (double nbytes, double nsec, Backendavail newstate); -extern void msg (char const *fmt, ...); +extern void msg (char const *fmt, ...) + __attribute__ ((format (printf, 1, 2))); extern void msgdumpbuf (unsigned char const *buf, int buflen); extern unsigned net_copy (int clientsock, int serversock, unsigned maxbytes, unsigned char *buf); @@ -358,7 +363,8 @@ extern unsigned net_write (int sock, unsigned char const *buf, unsigned len, extern int restart (int ac, char **av); extern void runservice (void); extern int serve (int ac, char **av); -extern void set_program_title (char const *fmt, ...); +extern void set_program_title (char const *fmt, ...) + __attribute__ ((format (printf, 1, 2))); extern int show_services (int ac, char **av); extern int show_status (int ac, char **av); extern char *stage_to_string (Programstage stage); @@ -366,7 +372,8 @@ extern char *state_to_string (Backendavail avail); extern Backendavail string_to_state (char const *str); extern int stop_daemon (int ac, char **av); extern char *str_expand_format (char const *h); -extern char *str_printf (char const *fmt, ...); +extern char *str_printf (char const *fmt, ...) + __attribute__ ((format (printf, 1, 2))); extern char *str_vprintf (char const *fmt, va_list args); extern void sysrun (char const *cmd); extern void tcpserve (int sock); @@ -378,8 +385,10 @@ extern void uid_assume (void); extern void uid_restore (void); extern void usage (void); extern void wakeup_handler (void); -extern void warning (char const *fmt, ...); -extern void writelog (int prio, char const *fmt, ...); +extern void warning (char const *fmt, ...) + __attribute__ ((format (printf, 1, 2))); +extern void writelog (int prio, char const *fmt, ...) + __attribute__ ((format (printf, 2, 3))); extern int yyparse (void); extern void *xmalloc (unsigned sz); extern void *xrealloc (void *what, unsigned sz); diff --git a/src/deallocreporter.c b/src/deallocreporter.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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 @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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/httpcopy.c b/src/httpcopy.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -8,10 +8,10 @@ void http_error (int clientsock) { char *buf = str_printf ("HTTP/1.0 502 Internal Server Error\r\n" - "Content-Length: %d\r\n" + "Content-Length: %u\r\n" "\r\n" ERRORTEXT, - strlen(ERRORTEXT)); + (unsigned) strlen(ERRORTEXT)); write (clientsock, buf, strlen(buf)); decr_client_count(); error ("No back end could be selected. Client received error page."); diff --git a/src/httpheaderaddheader.c b/src/httpheaderaddheader.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -33,7 +33,7 @@ void incr_client_count () { sysrun (activeservice->backend[current_backend].onstart); msg ("Service %s: Activity on back end %d now %d, total %d", - activeservice->name, + activeservice->name, current_backend, servicereport->backendstate[current_backend].nclients, totclients); } diff --git a/src/initsockaddr.c b/src/initsockaddr.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -35,7 +35,7 @@ int ipf_parse (char const *val, IpFilter *res) { if ( (cp = strchr (val, '/')) ) { if (sscanf (cp + 1, "%d", &nr) < 1) { warning ("Invalid IP filter specifier '%s' " - "(bad mask '$s')", val, cp + 1); + "(bad mask '%s')", val, cp + 1); return (3); } for (i = 1; i <= nr; i++) { diff --git a/src/ishexdigit.c b/src/ishexdigit.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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/makesocket.c b/src/makesocket.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -22,7 +22,7 @@ void mark_activity (double nbytes, double nsec, lock_reporter(); /* If the new activity is a failure: increase fails count. - * Upon availability, set fails count to 0. */ + * Upon other state, set fails count to zero. */ if (newstate == st_unavailable && servicereport->backendstate[current_backend].avail != st_unavailable) { servicereport->backendstate[current_backend].fail++; @@ -94,12 +94,12 @@ void mark_activity (double nbytes, double nsec, servicereport->backendstate[current_backend].avail = st_unavailable; } + servicereport->backendstate[current_backend].totuses++; } else if (newstate != st_intermediate) { /* When applying any other state than intermediate, it's OK */ servicereport->backendstate[current_backend].avail = newstate; + servicereport->backendstate[current_backend].totuses++; } - /* Total uses has gone up */ - servicereport->backendstate[current_backend].totuses++; } /* Don't update servicereport beyond this point! */ @@ -110,7 +110,7 @@ void mark_activity (double nbytes, double nsec, msg ("Service %s: updated stats for backend %d (%s): " "hits=%lu, " "totfails=%lu, secs=%g, avgsecs=%g, " - "bytes=%llu, avgbytes=%lu, state=%s", + "bytes=%g, avgbytes=%lu, state=%s", activeservice->name, current_backend, activeservice->backend[current_backend].name, servicereport->backendstate[current_backend].totuses, diff --git a/src/msg.c b/src/msg.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -99,8 +99,9 @@ unsigned net_copy (int cl, int sr, unsigned max, unsigned char *buf) { decr_client_count(); log_activity_end(); warning ("Service %s: write error when sending data to %s", + activeservice->name, dir == dir_client_to_server ? "server" : "client"); - _exit (0); + exit (0); } totwritten += nwritten; } diff --git a/src/netread.c b/src/netread.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -72,7 +72,7 @@ unsigned net_write (int sock, unsigned char const *buf, unsigned buflen, decr_client_count(); log_activity_end(); error ("Service %s: exception on %s network", - is_client ? "client" : "server"); + activeservice->name, is_client ? "client" : "server"); } /* We can write! */ diff --git a/src/parser.c b/src/parser.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/ @@ -47,7 +47,7 @@ static char *bytestr (double nbytes) { buf = str_printf ("%.2fKb", nbytes / (double) 1024); else - buf = str_printf ("%llub", nbytes); + buf = str_printf ("%gb", nbytes); return (buf); } diff --git a/src/stagetostring.c b/src/stagetostring.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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,8 +1,9 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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 tell_service (int ac, char **av) { @@ -34,6 +35,7 @@ int tell_service (int ac, char **av) { alloc_reporter (target_service, 0); servicereport->backendstate[target_backend].avail = avail; + servicereport->backendstate[target_backend].fail = 0; msg ("Marked backend %s of service %s as %s.", av[1], av[0], av[2]); return (1); diff --git a/src/thruputlog.c b/src/thruputlog.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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/vsyslog.c b/src/vsyslog.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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,8 +1,9 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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" void wakeup_handler () { @@ -48,6 +49,7 @@ void wakeup_handler () { lock_reporter(); servicereport->backendstate[current_backend].avail = sock >= 0 ? st_available : st_unavailable; + servicereport->backendstate[current_backend].fail = 0; unlock_reporter(); } } diff --git a/src/warning.c b/src/warning.c @@ -1,5 +1,5 @@ /************************************************************************* - * This file is part of Crosroads 1.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, 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.35, a load balancer and fail over + * This file is part of Crosroads 1.36, a load balancer and fail over * utility for TCP. Copyright (c) Karel Kubat, distributed under GPL. * Visit http://crossroads.e-tunity.com for information. *************************************************************************/