From: Willy Tarreau <w@1wt.eu>
Date: Fri, 13 Mar 2015 15:25:15 +0000 (+0100)
Subject: CLEANUP: listeners: remove unused timeout
X-Git-Tag: v1.6-dev2~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=512fd00296a289703d864f4458572d4cb911bb1e;p=thirdparty%2Fhaproxy.git

CLEANUP: listeners: remove unused timeout

Listerner->timeout is a vestigal thing going back to 2007 or so. It
used to only be used by stats and peers frontends to hold a pointer
to the proxy's client timeout. Now that we use regular frontends, we
don't use it anymore.
---

diff --git a/include/types/listener.h b/include/types/listener.h
index 2f5d566eca..ad2fcca1aa 100644
--- a/include/types/listener.h
+++ b/include/types/listener.h
@@ -172,7 +172,6 @@ struct listener {
 	struct list proto_list;         /* list in the protocol header */
 	int (*accept)(struct listener *l, int fd, struct sockaddr_storage *addr); /* upper layer's accept() */
 	struct task * (*handler)(struct task *t); /* protocol handler. It is a task */
-	int  *timeout;                  /* pointer to client-side timeout */
 	struct proxy *frontend;		/* the frontend this listener belongs to, or NULL */
 	struct list wait_queue;		/* link element to make the listener wait for something (LI_LIMITED)  */
 	unsigned int analysers;		/* bitmap of required protocol analysers */
diff --git a/src/cfgparse.c b/src/cfgparse.c
index cdb65035b9..5fe3ffb1eb 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1884,7 +1884,6 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
 					l->maxaccept = 1;
 					l->maxconn = ((struct proxy *)curpeers->peers_fe)->maxconn;
 					l->backlog = ((struct proxy *)curpeers->peers_fe)->backlog;
-					l->timeout = &((struct proxy *)curpeers->peers_fe)->timeout.client;
 					l->accept = session_accept;
 					l->handler = process_session;
 					l->analysers |=  ((struct proxy *)curpeers->peers_fe)->fe_req_ana;
@@ -7708,7 +7707,6 @@ out_uri_auth_compat:
 				listener->maxaccept = (listener->maxaccept + nbproc - 1) / nbproc;
 			}
 
-			listener->timeout = &curproxy->timeout.client;
 			listener->accept = session_accept;
 			listener->handler = process_session;
 			listener->analysers |= curproxy->fe_req_ana;
diff --git a/src/dumpstats.c b/src/dumpstats.c
index 8a9da5a241..ba72d713b1 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -337,7 +337,6 @@ static int stats_parse_global(char **args, int section_type, struct proxy *curpx
 		list_for_each_entry(l, &bind_conf->listeners, by_bind) {
 			l->maxconn = global.stats_fe->maxconn;
 			l->backlog = global.stats_fe->backlog;
-			l->timeout = &global.stats_fe->timeout.client;
 			l->accept = session_accept;
 			l->handler = process_session;
 			l->options |= LI_O_UNLIMITED; /* don't make the peers subject to global limits */