r1037 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-09-16 23:14:29 +0200 (Sat, 16 Sep 2006)
New Revision: 1037

Modified:
   trunk/varnish-cache/bin/varnishd/cache_session.c
Log:
use miniobj on srcaddr's


Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c	2006-09-16 21:14:13 UTC (rev 1036)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c	2006-09-16 21:14:29 UTC (rev 1037)
@@ -146,6 +146,7 @@
 	if (c3 != NULL) {
 		memset(c3, 0, sizeof *c3);
 		strcpy(c3->addr, sp->addr);
+		c3->magic = SRCADDR_MAGIC;
 		c3->hash = u;
 		c3->acct.first = now;
 		c3->ttl = now + params->srcaddr_ttl;
@@ -167,6 +168,7 @@
 
 	if (sp->srcaddr == NULL)
 		return;
+	CHECK_OBJ(sp->srcaddr, SRCADDR_MAGIC);
 	ch = sp->srcaddr->sah;
 	CHECK_OBJ(ch, SRCADDRHEAD_MAGIC);
 	LOCK(&ch->mtx);
@@ -202,6 +204,7 @@
 	ses_sum_acct(&sp->acct, a);
 	
 	if (sp->srcaddr != NULL) {
+		CHECK_OBJ(sp->srcaddr, SRCADDR_MAGIC);
 		LOCK(&sp->srcaddr->sah->mtx);
 		b = &sp->srcaddr->acct;
 		ses_sum_acct(b, a);