r783 - trunk/varnish-cache/bin/varnishncsa
andersb at projects.linpro.no
andersb at projects.linpro.no
Thu Aug 10 13:10:16 CEST 2006
Author: andersb
Date: 2006-08-10 13:10:16 +0200 (Thu, 10 Aug 2006)
New Revision: 783
Modified:
trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
Log:
Updated to work with new inner workings (ReqStart, ReqEnd, sbuf replacement etc).
Code now compiles.
Modified: trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2006-08-10 08:56:42 UTC (rev 782)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2006-08-10 11:10:16 UTC (rev 783)
@@ -110,7 +110,7 @@
break;
- case SLT_XID:
+ case SLT_ReqStart:
// We use XID to catch that a new request is comming inn.
@@ -118,25 +118,25 @@
case SLT_RxRequest:
- sbuf_clear(ob[u]);
+ vsb_clear(ob[u]);
if (p[1] >= 4 && !strncasecmp((void *)&p[4], "HEAD",4)){
- sbuf_bcat(ob[u], p + 4, strlen(p + 4));
+ vsb_bcat(ob[u], p + 4, strlen(p + 4));
//printf("Got a HEAD\n");
}
else if (p[1] >= 4 && !strncasecmp((void *)&p[4], "POST",4)){
- sbuf_bcat(ob[u], p + 4, strlen(p + 4));
+ vsb_bcat(ob[u], p + 4, strlen(p + 4));
//printf("Got a POST\n");
}
else if (p[1] >= 3 && !strncasecmp((void *)&p[4], "GET",3)){
- sbuf_bcat(ob[u], p + 4, strlen(p + 4));
+ vsb_bcat(ob[u], p + 4, strlen(p + 4));
//printf("Got a GET\n");
}
else {
- sbuf_bcat(ob[u], p + 4, strlen(p + 4));
+ vsb_bcat(ob[u], p + 4, strlen(p + 4));
//printf("Got something other than HEAD, POST, GET\n");
}
@@ -144,15 +144,15 @@
case SLT_RxURL:
- sbuf_cat(ob[u], " ");
- sbuf_bcat(ob[u], p + 4, strlen(p + 4));
+ vsb_cat(ob[u], " ");
+ vsb_bcat(ob[u], p + 4, strlen(p + 4));
break;
case SLT_RxProtocol:
- sbuf_cat(ob[u], " ");
- sbuf_bcat(ob[u], p + 4, strlen(p + 4));
+ vsb_cat(ob[u], " ");
+ vsb_bcat(ob[u], p + 4, strlen(p + 4));
break;
@@ -233,11 +233,11 @@
// and clear variables that are different for each request.
printf("[%d] %s ", u, ll[u].df_h );
- sbuf_finish(ob[u]);
- printf("\"%s\"", sbuf_data(ob[u]));
+ vsb_finish(ob[u]);
+ printf("\"%s\"", vsb_data(ob[u]));
printf(" %s %s ", ll[u].df_s, ll[u].df_b);
printf("\n");
- sbuf_clear(ob[u]);
+ vsb_clear(ob[u]);
ll[u].df_rfini = 0;
More information about the varnish-commit
mailing list