r2683 - in trunk/varnish-cache: include lib/libvarnish

Sun Jun 15 17:30:49 CEST 2008

Author: phk
Date: 2008-06-15 17:30:49 +0200 (Sun, 15 Jun 2008)
New Revision: 2683

Added:
   trunk/varnish-cache/lib/libvarnish/vct.c
Modified:
   trunk/varnish-cache/include/libvarnish.h
   trunk/varnish-cache/lib/libvarnish/Makefile.am
Log:
Add VCT: a RFC2616 ctype



Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================

--- trunk/varnish-cache/include/libvarnish.h	2008-06-15 13:36:50 UTC (rev 2682)
+++ trunk/varnish-cache/include/libvarnish.h	2008-06-15 15:30:49 UTC (rev 2683)
@@ -54,6 +54,30 @@
 double TIM_mono(void);
 double TIM_real(void);
 
+/* from libvarnish/vct.c */
+#define VCT_SP    	(1<<0)
+#define VCT_CRLF  	(1<<1)
+#define VCT_LWS   	(VCT_CRLF | VCT_SP)
+#define VCT_CTL   	(1<<2)
+#define VCT_UALPHA	(1<<3)
+#define VCT_LOALPHA	(1<<4)
+#define VCT_DIGIT	(1<<5)
+#define VCT_HEX		(1<<6)
+
+extern unsigned char vct_typtab[256];
+
+static inline int
+vct_is(unsigned char x, unsigned char y)
+{
+ 
+        return (vct_typtab[x] & (y));
+}
+
+#define vct_issp(x) vct_is(x, VCT_SP)
+#define vct_iscrlf(x) vct_is(x, VCT_CRLF)
+#define vct_islws(x) vct_is(x, VCT_LWS)
+#define vct_isctl(x) vct_is(x, VCT_CTL)
+
 /* from libvarnish/version.c */
 void varnish_version(const char *);
 

Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am	2008-06-15 13:36:50 UTC (rev 2682)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am	2008-06-15 15:30:49 UTC (rev 2683)
@@ -14,6 +14,7 @@
 	flopen.c \
 	num.c \
 	time.c \
+	vct.c \
 	version.c \
 	vlu.c \
 	vpf.c \

Added: trunk/varnish-cache/lib/libvarnish/vct.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vct.c	                        (rev 0)
+++ trunk/varnish-cache/lib/libvarnish/vct.c	2008-06-15 15:30:49 UTC (rev 2683)
@@ -0,0 +1,132 @@
+/*-
+ * Copyright (c) 2006-2008 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: vpf.h 1410 2007-05-11 11:17:09Z des $
+ *
+ * ctype(3) like functions, according to RFC2616
+ */
+
+#include <libvarnish.h>
+
+unsigned char vct_typtab[256] = {
+	[0x00]	=	VCT_CTL,
+	[0x01]	=	VCT_CTL,
+	[0x02]	=	VCT_CTL,
+	[0x03]	=	VCT_CTL,
+	[0x04]	=	VCT_CTL,
+	[0x05]	=	VCT_CTL,
+	[0x06]	=	VCT_CTL,
+	[0x07]	=	VCT_CTL,
+	[0x08]	=	VCT_CTL,
+	[0x09]	=	VCT_CTL | VCT_SP,
+	[0x0a]	=	VCT_CTL | VCT_CRLF,
+	[0x0b]	=	VCT_CTL,
+	[0x0c]	=	VCT_CTL,
+	[0x0d]	=	VCT_CTL | VCT_CRLF,
+	[0x0e]	=	VCT_CTL,
+	[0x0f]	=	VCT_CTL,
+	[0x10]	=	VCT_CTL,
+	[0x11]	=	VCT_CTL,
+	[0x12]	=	VCT_CTL,
+	[0x13]	=	VCT_CTL,
+	[0x14]	=	VCT_CTL,
+	[0x15]	=	VCT_CTL,
+	[0x16]	=	VCT_CTL,
+	[0x17]	=	VCT_CTL,
+	[0x18]	=	VCT_CTL,
+	[0x19]	=	VCT_CTL,
+	[0x1a]	=	VCT_CTL,
+	[0x1b]	=	VCT_CTL,
+	[0x1c]	=	VCT_CTL,
+	[0x1d]	=	VCT_CTL,
+	[0x1e]	=	VCT_CTL,
+	[0x1f]	=	VCT_CTL,
+        [0x20]  =	VCT_SP,
+	[0x30]	=	VCT_DIGIT | VCT_HEX,
+	[0x31]	=	VCT_DIGIT | VCT_HEX,
+	[0x32]	=	VCT_DIGIT | VCT_HEX,
+	[0x33]	=	VCT_DIGIT | VCT_HEX,
+	[0x34]	=	VCT_DIGIT | VCT_HEX,
+	[0x35]	=	VCT_DIGIT | VCT_HEX,
+	[0x36]	=	VCT_DIGIT | VCT_HEX,
+	[0x37]	=	VCT_DIGIT | VCT_HEX,
+	[0x38]	=	VCT_DIGIT | VCT_HEX,
+	[0x39]	=	VCT_DIGIT | VCT_HEX,
+	[0x41]	=	VCT_UALPHA | VCT_HEX,
+	[0x42]	=	VCT_UALPHA | VCT_HEX,
+	[0x43]	=	VCT_UALPHA | VCT_HEX,
+	[0x44]	=	VCT_UALPHA | VCT_HEX,
+	[0x45]	=	VCT_UALPHA | VCT_HEX,
+	[0x46]	=	VCT_UALPHA | VCT_HEX,
+	[0x47]	=	VCT_UALPHA,
+	[0x48]	=	VCT_UALPHA,
+	[0x49]	=	VCT_UALPHA,
+	[0x4a]	=	VCT_UALPHA,
+	[0x4b]	=	VCT_UALPHA,
+	[0x4c]	=	VCT_UALPHA,
+	[0x4d]	=	VCT_UALPHA,
+	[0x4e]	=	VCT_UALPHA,
+	[0x4f]	=	VCT_UALPHA,
+	[0x50]	=	VCT_UALPHA,
+	[0x51]	=	VCT_UALPHA,
+	[0x52]	=	VCT_UALPHA,
+	[0x53]	=	VCT_UALPHA,
+	[0x54]	=	VCT_UALPHA,
+	[0x55]	=	VCT_UALPHA,
+	[0x56]	=	VCT_UALPHA,
+	[0x57]	=	VCT_UALPHA,
+	[0x58]	=	VCT_UALPHA,
+	[0x59]	=	VCT_UALPHA,
+	[0x5a]	=	VCT_UALPHA,
+	[0x61]	=	VCT_LOALPHA | VCT_HEX,
+	[0x62]	=	VCT_LOALPHA | VCT_HEX,
+	[0x63]	=	VCT_LOALPHA | VCT_HEX,
+	[0x64]	=	VCT_LOALPHA | VCT_HEX,
+	[0x65]	=	VCT_LOALPHA | VCT_HEX,
+	[0x66]	=	VCT_LOALPHA | VCT_HEX,
+	[0x67]	=	VCT_LOALPHA,
+	[0x68]	=	VCT_LOALPHA,
+	[0x69]	=	VCT_LOALPHA,
+	[0x6a]	=	VCT_LOALPHA,
+	[0x6b]	=	VCT_LOALPHA,
+	[0x6c]	=	VCT_LOALPHA,
+	[0x6d]	=	VCT_LOALPHA,
+	[0x6e]	=	VCT_LOALPHA,
+	[0x6f]	=	VCT_LOALPHA,
+	[0x70]	=	VCT_LOALPHA,
+	[0x71]	=	VCT_LOALPHA,
+	[0x72]	=	VCT_LOALPHA,
+	[0x73]	=	VCT_LOALPHA,
+	[0x74]	=	VCT_LOALPHA,
+	[0x75]	=	VCT_LOALPHA,
+	[0x76]	=	VCT_LOALPHA,
+	[0x77]	=	VCT_LOALPHA,
+	[0x78]	=	VCT_LOALPHA,
+	[0x79]	=	VCT_LOALPHA,
+	[0x7a]	=	VCT_LOALPHA,
+	[0x7f]	=	VCT_CTL,
+};


