r1917 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-08-21 18:48:00 +0200 (Tue, 21 Aug 2007)
New Revision: 1917

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
Log:
Be much more paranoid about backends, now that they can go away.


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-08-21 15:37:17 UTC (rev 1916)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-08-21 16:48:00 UTC (rev 1917)
@@ -297,7 +297,9 @@
 	int i;
 
 	AN(sp->bereq);
+	CHECK_OBJ_NOTNULL(sp->backend, BACKEND_MAGIC);
 	i = Fetch(sp);
+	CHECK_OBJ_NOTNULL(sp->backend, BACKEND_MAGIC);
 
 	/* Experimental. Set time for last check of backend health.
 	 * If the backend replied with 200, it is obviously up and running,
@@ -426,6 +428,7 @@
 
 	/* Experimental. Reduce health parameter of backend towards zero
 	 * if it has been more than a minute since it was checked. */
+	CHECK_OBJ_NOTNULL(sp->backend, BACKEND_MAGIC);
 	time_diff = TIM_mono() - sp->backend->last_check;
 	minutes = time_diff / 60;
 	if (minutes > sp->backend->minute_limit) {
@@ -759,7 +762,9 @@
 	http_DoConnection(sp);
 
 	/* By default we use the first backend */
+	AZ(sp->backend);
 	sp->backend = sp->vcl->backend[0];
+	CHECK_OBJ_NOTNULL(sp->backend, BACKEND_MAGIC);
 
 	/* XXX: Handle TRACE & OPTIONS of Max-Forwards = 0 */
 
@@ -817,6 +822,8 @@
 			CHECK_OBJ(w->nobj, OBJECT_MAGIC);
 		if (w->nobjhead != NULL)
 			CHECK_OBJ(w->nobjhead, OBJHEAD_MAGIC);
+		if (sp->backend != NULL)
+			CHECK_OBJ(sp->backend, BACKEND_MAGIC);
 
 		switch (sp->step) {
 #define STEP(l,u) case STP_##u: done = cnt_##l(sp); break;