Skip to content

V
varnishevent3
Commit 6916e05d authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Calculate and emit CRC32 checksum for all verbatim bites, 

we need this to produce the correct final CRC32 for gzip'ed
ESI documents.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5758 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 8eea7256
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 50 deletions
bin/varnishd/cache_esi_deliver.c
View file @ 6916e05d
...@@ -39,6 +39,7 @@ SVNID("$Id") ...@@ -39,6 +39,7 @@ SVNID("$Id")
#include "cache_esi.h" #include "cache_esi.h"
#include "vend.h" #include "vend.h"
#include "vct.h" #include "vct.h"
#include "zlib.h"
#include "stevedore.h" #include "stevedore.h"
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -159,7 +160,7 @@ ved_decode_len(uint8_t **pp) ...@@ -159,7 +160,7 @@ ved_decode_len(uint8_t **pp)
p += 9; p += 9;
break; break;
default: default:
printf("%d\n",(*p & 15)); printf("Illegal Length %d %d\n", *p, (*p & 15));
INCOMPL(); INCOMPL();
} }
*pp = p; *pp = p;
...@@ -174,6 +175,7 @@ ESI_Deliver(struct sess *sp) ...@@ -174,6 +175,7 @@ ESI_Deliver(struct sess *sp)
uint8_t *p, *e, *q, *r; uint8_t *p, *e, *q, *r;
unsigned off; unsigned off;
ssize_t l; ssize_t l;
uint32_t crc, crc_ref;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC); CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
st = sp->obj->esidata; st = sp->obj->esidata;
...@@ -190,8 +192,16 @@ ESI_Deliver(struct sess *sp) ...@@ -190,8 +192,16 @@ ESI_Deliver(struct sess *sp)
case VEC_V2: case VEC_V2:
case VEC_V8: case VEC_V8:
l = ved_decode_len(&p); l = ved_decode_len(&p);
crc = vbe32dec(p);
p += 4;
q = (void*)strchr((const char*)p, '\0'); q = (void*)strchr((const char*)p, '\0');
assert (q > p); assert (q > p);
crc_ref = crc32(0L, Z_NULL, 0);
crc_ref = crc32(crc_ref, st->ptr + off, l);
if (crc_ref != crc) {
printf("CRC Mismatch %08x %08x\n", crc_ref, crc);
}
xxxassert(crc_ref == crc);
esi_sendchunk(sp, p, q - p, st->ptr + off, l); esi_sendchunk(sp, p, q - p, st->ptr + off, l);
off += l; off += l;
p = q + 1; p = q + 1;
......
bin/varnishd/cache_esi_parse.c
View file @ 6916e05d
...@@ -39,6 +39,7 @@ SVNID("$Id") ...@@ -39,6 +39,7 @@ SVNID("$Id")
#include "cache_esi.h" #include "cache_esi.h"
#include "vend.h" #include "vend.h"
#include "vct.h" #include "vct.h"
#include "zlib.h"
#include "stevedore.h" #include "stevedore.h"
#ifndef OLD_ESI #ifndef OLD_ESI
...@@ -77,6 +78,9 @@ struct vep_state { ...@@ -77,6 +78,9 @@ struct vep_state {
ssize_t o_skip; ssize_t o_skip;
ssize_t o_pending; ssize_t o_pending;
ssize_t o_total; ssize_t o_total;
uint32_t crc;
ssize_t o_crc;
uint32_t crcp;
const char *hack_p; const char *hack_p;
const char *ver_p; const char *ver_p;
...@@ -252,77 +256,137 @@ vep_emit_len(const struct vep_state *vep, ssize_t l, int m8, int m16, int m64) ...@@ -252,77 +256,137 @@ vep_emit_len(const struct vep_state *vep, ssize_t l, int m8, int m16, int m64)
} }
static void static void
vep_emit_skip(struct vep_state *vep, ssize_t *l) vep_emit_skip(struct vep_state *vep, ssize_t l)
{ {
assert(*l > 0);
if (params->esi_syntax & 0x20) { if (params->esi_syntax & 0x20) {
Debug("---> SKIP(%jd)\n", (intmax_t)*l); Debug("---> SKIP(%jd)\n", (intmax_t)l);
} }
vep_emit_len(vep, *l, VEC_S1, VEC_S2, VEC_S8); vep_emit_len(vep, l, VEC_S1, VEC_S2, VEC_S8);
vep->o_total += *l;
*l = 0;
} }
static void static void
vep_emit_verbatim(struct vep_state *vep, ssize_t *l) vep_emit_verbatim(struct vep_state *vep, ssize_t l)
{ {
uint8_t buf[4];
assert(*l > 0);
if (params->esi_syntax & 0x20) { if (params->esi_syntax & 0x20) {
Debug("---> VERBATIM(%jd)\n", (intmax_t)*l); Debug("---> VERBATIM(%jd)\n", (intmax_t)l);
} }
vep_emit_len(vep, *l, VEC_V1, VEC_V2, VEC_V8); vep_emit_len(vep, l, VEC_V1, VEC_V2, VEC_V8);
vsb_printf(vep->vsb, "%lx\r\n%c", *l, 0); vbe32enc(buf, vep->crc);
vsb_bcat(vep->vsb, buf, sizeof buf);
vsb_printf(vep->vsb, "%lx\r\n%c", l, 0);
}
static void
vep_emit_common(struct vep_state *vep, ssize_t *l, int skip)
{
assert(*l > 0);
assert(*l == vep->o_crc);
if (skip)
vep_emit_skip(vep, *l);
else
vep_emit_verbatim(vep, *l);
vep->crc = crc32(0L, Z_NULL, 0);
vep->o_crc = 0;
vep->o_total += *l; vep->o_total += *l;
*l = 0; *l = 0;
} }
/*---------------------------------------------------------------------
*
*/
static void static void
vep_mark_verbatim(struct vep_state *vep, const char *p) vep_mark_common(struct vep_state *vep, const char *p, int skip)
{ {
ssize_t l; ssize_t l;
/*
* If we changed mode, emit whatever the opposite mode
* assembled before the pending bytes.
*/
if (skip && vep->o_verbatim > 0)
vep_emit_common(vep, &vep->o_verbatim, 0);
else if (!skip && vep->o_skip > 0)
vep_emit_common(vep, &vep->o_skip, 1);
/* In debug mode, the pending bytes are emitted separately. */
if ((params->esi_syntax & 0x10) && vep->o_pending) {
vep->o_crc = vep->o_pending;
vep->crc = vep->crcp;
vep->crcp = crc32(0L, Z_NULL, 0);
vep_emit_common(vep, &vep->o_pending, skip);
}
/* Transfer pending bytes CRC into active mode. */
if (vep->o_pending) {
if (vep->o_crc == 0) {
vep->crc = vep->crcp;
vep->o_crc = vep->o_pending;
} else {
vep->crc = crc32_combine(vep->crc,
vep->crcp, vep->o_pending);
vep->o_crc += vep->o_pending;
}
vep->crcp = crc32(0L, Z_NULL, 0);
}
/*
* Process this bit of input
*/
AN(vep->ver_p); AN(vep->ver_p);
l = p - vep->ver_p; l = p - vep->ver_p;
vep->ver_p = p;
assert(l >= 0); assert(l >= 0);
if (params->esi_syntax & 0x10) { vep->crc = crc32(vep->crc, (const void*)vep->ver_p, l);
if (vep->o_pending) vep->o_crc += l;
vep_emit_verbatim(vep, &vep->o_pending); vep->ver_p = p;
if (l)
vep_emit_verbatim(vep, &l); if ((params->esi_syntax & 0x10) && l > 0) {
/* Emit right away if debug mode */
vep_emit_common(vep, &l, skip);
} else if (skip) {
vep->o_skip += vep->o_pending;
vep->o_skip += l;
} else { } else {
if (vep->o_skip > 0)
vep_emit_skip(vep, &vep->o_skip);
vep->o_verbatim += vep->o_pending; vep->o_verbatim += vep->o_pending;
vep->o_pending = 0;
vep->o_verbatim += l; vep->o_verbatim += l;
} }
vep->o_pending = 0;
}
static void
vep_mark_verbatim(struct vep_state *vep, const char *p)
{
vep_mark_common(vep, p, 0);
} }
static void static void
vep_mark_skip(struct vep_state *vep, const char *p) vep_mark_skip(struct vep_state *vep, const char *p)
{
vep_mark_common(vep, p, 1);
}
static void
vep_mark_pending(struct vep_state *vep, const char *p)
{ {
ssize_t l; ssize_t l;
AN(vep->ver_p); AN(vep->ver_p);
l = p - vep->ver_p; l = p - vep->ver_p;
vep->ver_p = p; if (l == 0)
return;
assert(l >= 0); assert(l >= 0);
if (params->esi_syntax & 0x10) { vep->crcp = crc32(vep->crcp, (const void *)vep->ver_p, l);
if (vep->o_pending) vep->ver_p = p;
vep_emit_skip(vep, &vep->o_pending);
if (l) vep->o_pending += l;
vep_emit_skip(vep, &l); fflush(stdout);
} else { }
if (vep->o_verbatim > 0)
vep_emit_verbatim(vep, &vep->o_verbatim);
vep->o_skip += vep->o_pending;
vep->o_pending = 0;
vep->o_skip += l;
}
}
/*--------------------------------------------------------------------- /*---------------------------------------------------------------------
*/ */
...@@ -389,9 +453,9 @@ vep_do_include(struct vep_state *vep, enum dowhat what) ...@@ -389,9 +453,9 @@ vep_do_include(struct vep_state *vep, enum dowhat what)
} }
XXXAN(vep->include_src); XXXAN(vep->include_src);
if (vep->o_skip > 0) if (vep->o_skip > 0)
vep_emit_skip(vep, &vep->o_skip); vep_emit_common(vep, &vep->o_skip, 1);
if (vep->o_verbatim > 0) if (vep->o_verbatim > 0)
vep_emit_verbatim(vep, &vep->o_verbatim); vep_emit_common(vep, &vep->o_verbatim, 0);
/* XXX: what if it contains NUL bytes ?? */ /* XXX: what if it contains NUL bytes ?? */
p = vsb_data(vep->include_src); p = vsb_data(vep->include_src);
l = vsb_len(vep->include_src); l = vsb_len(vep->include_src);
...@@ -863,8 +927,7 @@ vep_parse(struct vep_state *vep, const char *p, size_t l) ...@@ -863,8 +927,7 @@ vep_parse(struct vep_state *vep, const char *p, size_t l)
INCOMPL(); INCOMPL();
} }
} }
vep->o_pending += p - vep->ver_p; vep_mark_pending(vep, p);
vep->ver_p = p;
} }
/*--------------------------------------------------------------------- /*---------------------------------------------------------------------
...@@ -944,9 +1007,11 @@ vfp_esi_begin(struct sess *sp, size_t estimate) ...@@ -944,9 +1007,11 @@ vfp_esi_begin(struct sess *sp, size_t estimate)
vep->magic = VEP_MAGIC; vep->magic = VEP_MAGIC;
vep->sp = sp; vep->sp = sp;
vep->bytes = vfp_esi_bytes_uu; vep->bytes = vfp_esi_bytes_uu;
vep->vsb = vsb_newauto();
vep->state = VEP_START; vep->state = VEP_START;
vep->vsb = vsb_newauto();
AN(vep->vsb); AN(vep->vsb);
vep->crc = crc32(0L, Z_NULL, 0);
vep->crcp = crc32(0L, Z_NULL, 0);
sp->wrk->vep = vep; sp->wrk->vep = vep;
(void)estimate; (void)estimate;
...@@ -985,14 +1050,12 @@ vfp_esi_end(struct sess *sp) ...@@ -985,14 +1050,12 @@ vfp_esi_end(struct sess *sp)
(intmax_t)vep->o_skip, (intmax_t)vep->o_verbatim, (intmax_t)vep->o_skip, (intmax_t)vep->o_verbatim,
(intmax_t)vep->o_total, (intmax_t)sp->obj->len, (intmax_t)l); (intmax_t)vep->o_total, (intmax_t)sp->obj->len, (intmax_t)l);
assert(l >= 0); assert(l >= 0);
if (vep->o_skip) if (vep->o_pending)
vep_emit_skip(vep, &vep->o_skip); vep_mark_verbatim(vep, vep->ver_p);
if (vep->o_verbatim) if (vep->o_skip > 0)
vep_emit_verbatim(vep, &vep->o_verbatim); vep_emit_common(vep, &vep->o_skip, 1);
l = sp->obj->len - vep->o_total; else if (vep->o_verbatim > 0)
if (l) vep_emit_common(vep, &vep->o_verbatim, 0);
vep_emit_verbatim(vep, &l);
vep->o_verbatim += l;
vsb_finish(vep->vsb); vsb_finish(vep->vsb);
l = vsb_len(vep->vsb); l = vsb_len(vep->vsb);
if (vep->state != VEP_NOTXML && l > 0) { if (vep->state != VEP_NOTXML && l > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment