Mailing List Archive

Author: phk
Date: 2008-08-26 09:47:23 +0200 (Tue, 26 Aug 2008)
New Revision: 3126

Added:
trunk/varnish-cache/lib/libvarnish/tcp.c
Removed:
trunk/varnish-cache/bin/varnishd/tcp.c
Modified:
trunk/varnish-cache/bin/varnishd/Makefile.am
trunk/varnish-cache/bin/varnishd/common.h
trunk/varnish-cache/include/libvarnish.h
trunk/varnish-cache/lib/libvarnish/Makefile.am
Log:
Move the tcp.c file to libvarnish, we need the primitives in varnishtest
also.



Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am 2008-08-25 23:09:57 UTC (rev 3125)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am 2008-08-26 07:47:23 UTC (rev 3126)
@@ -53,7 +53,6 @@
storage_malloc.c \
storage_synth.c \
storage_umem.c \
- tcp.c \
varnishd.c

noinst_HEADERS = \

Modified: trunk/varnish-cache/bin/varnishd/common.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/common.h 2008-08-25 23:09:57 UTC (rev 3125)
+++ trunk/varnish-cache/bin/varnishd/common.h 2008-08-26 07:47:23 UTC (rev 3126)
@@ -42,21 +42,6 @@
void VSL_MgtInit(const char *fn, unsigned size);
extern struct varnish_stats *VSL_stats;

-/* tcp.c */
-/* NI_MAXHOST and NI_MAXSERV are ridiculously long for numeric format */
-#define TCP_ADDRBUFSIZE 64
-#define TCP_PORTBUFSIZE 16
-
-void TCP_name(const struct sockaddr *addr, unsigned l, char *abuf, unsigned alen, char *pbuf, unsigned plen);
-void TCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen);
-int TCP_filter_http(int sock);
-void TCP_blocking(int sock);
-void TCP_nonblocking(int sock);
-#ifdef SOL_SOCKET
-int TCP_connect(int s, const struct sockaddr *name, socklen_t namelen, int msec);
-void TCP_close(int *s);
-#endif
-
#define TRUST_ME(ptr) ((void*)(uintptr_t)(ptr))

/* Really belongs in mgt.h, but storage_file chokes on both */

Deleted: trunk/varnish-cache/bin/varnishd/tcp.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/tcp.c 2008-08-25 23:09:57 UTC (rev 3125)
+++ trunk/varnish-cache/bin/varnishd/tcp.c 2008-08-26 07:47:23 UTC (rev 3126)
@@ -1,211 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * 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 AUTHOR 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 AUTHOR 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$
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <errno.h>
-#include <sys/ioctl.h>
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-#include <netdb.h>
-#include <poll.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "config.h"
-#ifndef HAVE_STRLCPY
-#include "compat/strlcpy.h"
-#endif
-
-#include "mgt.h"
-
-/*--------------------------------------------------------------------*/
-
-void
-TCP_name(const struct sockaddr *addr, unsigned l, char *abuf, unsigned alen, char *pbuf, unsigned plen)
-{
- int i;
-
- i = getnameinfo(addr, l, abuf, alen, pbuf, plen,
- NI_NUMERICHOST | NI_NUMERICSERV);
- if (i) {
- printf("getnameinfo = %d %s\n", i, gai_strerror(i));
- strlcpy(abuf, "Conversion", alen);
- strlcpy(pbuf, "Failed", plen);
- return;
- }
- /* XXX dirty hack for v4-to-v6 mapped addresses */
- if (strncmp(abuf, "::ffff:", 7) == 0) {
- for (i = 0; abuf[i + 7]; ++i)
- abuf[i] = abuf[i + 7];
- abuf[i] = '\0';
- }
-}
-
-/*--------------------------------------------------------------------*/
-
-void
-TCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen)
-{
- struct sockaddr_storage addr_s;
- struct sockaddr *addr = (void*)&addr_s;
- socklen_t l;
-
- l = sizeof addr_s;
- AZ(getsockname(sock, addr, &l));
- TCP_name(addr, l, abuf, alen, pbuf, plen);
-}
-
-/*--------------------------------------------------------------------*/
-
-int
-TCP_filter_http(int sock)
-{
-#ifdef HAVE_ACCEPT_FILTERS
- struct accept_filter_arg afa;
- int i;
-
- bzero(&afa, sizeof(afa));
- strcpy(afa.af_name, "httpready");
- errno = 0;
- i = setsockopt(sock, SOL_SOCKET, SO_ACCEPTFILTER,
- &afa, sizeof(afa));
- /* XXX ugly */
- if (i)
- printf("Acceptfilter(%d, httpready): %d %s\n",
- sock, i, strerror(errno));
- return (i);
-#else
- (void)sock;
- return (0);
-#endif
-}
-
-/*--------------------------------------------------------------------
- * Functions for controlling NONBLOCK mode.
- *
- * We use FIONBIO because it is cheaper than fcntl(2), which requires
- * us to do two syscalls, one to get and one to set, the latter of
- * which mucks about a bit before it ends up calling ioctl(FIONBIO),
- * at least on FreeBSD.
- */
-
-void
-TCP_blocking(int sock)
-{
- int i;
-
- i = 0;
- AZ(ioctl(sock, FIONBIO, &i));
-}
-
-void
-TCP_nonblocking(int sock)
-{
- int i;
-
- i = 1;
- AZ(ioctl(sock, FIONBIO, &i));
-}
-
-/*--------------------------------------------------------------------
- * On TCP a connect(2) can block for a looong time, and we don't want that.
- * Unfortunately, the SocketWizards back in those days were happy to wait
- * any amount of time for a connection, so the connect(2) syscall does not
- * take an argument for patience.
- *
- * There is a little used work-around, and we employ it at our peril.
- *
- */
-
-int
-TCP_connect(int s, const struct sockaddr *name, socklen_t namelen, int msec)
-{
- int i, k;
- socklen_t l;
- struct pollfd fds[1];
-
- assert(s >= 0);
-
- /* Set the socket non-blocking */
- TCP_nonblocking(s);
-
- /* Attempt the connect */
- i = connect(s, name, namelen);
- if (i == 0 || errno != EINPROGRESS)
- return (i);
-
- /* Exercise our patience, polling for write */
- fds[0].fd = s;
- fds[0].events = POLLWRNORM;
- fds[0].revents = 0;
- i = poll(fds, 1, msec);
-
- if (i == 0) {
- /* Timeout, close and give up */
- errno = ETIMEDOUT;
- return (-1);
- }
-
- /* Find out if we got a connection */
- l = sizeof k;
- AZ(getsockopt(s, SOL_SOCKET, SO_ERROR, &k, &l));
-
- /* An error means no connection established */
- errno = k;
- if (k)
- return (-1);
-
- TCP_blocking(s);
- return (0);
-}
-
-/*--------------------------------------------------------------------
- * When closing a TCP connection, a couple of errno's are legit, we
- * can't be held responsible for the other end wanting to talk to us.
- */
-
-void
-TCP_close(int *s)
-{
- assert (close(*s) == 0 ||
- errno == ECONNRESET ||
- errno == ENOTCONN);
- *s = -1;
-}

Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h 2008-08-25 23:09:57 UTC (rev 3125)
+++ trunk/varnish-cache/include/libvarnish.h 2008-08-26 07:47:23 UTC (rev 3126)
@@ -50,6 +50,21 @@
/* from libvarnish/num.c */
const char *str2bytes(const char *p, uintmax_t *r, uintmax_t rel);

+/* from libvarnish/tcp.c */
+/* NI_MAXHOST and NI_MAXSERV are ridiculously long for numeric format */
+#define TCP_ADDRBUFSIZE 64
+#define TCP_PORTBUFSIZE 16
+
+void TCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen);
+int TCP_filter_http(int sock);
+void TCP_blocking(int sock);
+void TCP_nonblocking(int sock);
+#ifdef SOL_SOCKET
+void TCP_name(const struct sockaddr *addr, unsigned l, char *abuf, unsigned alen, char *pbuf, unsigned plen);
+int TCP_connect(int s, const struct sockaddr *name, socklen_t namelen, int msec);
+void TCP_close(int *s);
+#endif
+
/* from libvarnish/time.c */
void TIM_format(double t, char *p);
time_t TIM_parse(const char *p);

Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am 2008-08-25 23:09:57 UTC (rev 3125)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am 2008-08-26 07:47:23 UTC (rev 3126)
@@ -14,6 +14,7 @@
flopen.c \
num.c \
time.c \
+ tcp.c \
vct.c \
version.c \
vev.c \

Copied: trunk/varnish-cache/lib/libvarnish/tcp.c (from rev 3125, trunk/varnish-cache/bin/varnishd/tcp.c)
===================================================================
--- trunk/varnish-cache/lib/libvarnish/tcp.c (rev 0)
+++ trunk/varnish-cache/lib/libvarnish/tcp.c 2008-08-26 07:47:23 UTC (rev 3126)
@@ -0,0 +1,211 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * 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 AUTHOR 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 AUTHOR 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$
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include <errno.h>
+#include <sys/ioctl.h>
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+#include <netdb.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "config.h"
+#ifndef HAVE_STRLCPY
+#include "compat/strlcpy.h"
+#endif
+
+#include "libvarnish.h"
+
+/*--------------------------------------------------------------------*/
+
+void
+TCP_name(const struct sockaddr *addr, unsigned l, char *abuf, unsigned alen, char *pbuf, unsigned plen)
+{
+ int i;
+
+ i = getnameinfo(addr, l, abuf, alen, pbuf, plen,
+ NI_NUMERICHOST | NI_NUMERICSERV);
+ if (i) {
+ printf("getnameinfo = %d %s\n", i, gai_strerror(i));
+ strlcpy(abuf, "Conversion", alen);
+ strlcpy(pbuf, "Failed", plen);
+ return;
+ }
+ /* XXX dirty hack for v4-to-v6 mapped addresses */
+ if (strncmp(abuf, "::ffff:", 7) == 0) {
+ for (i = 0; abuf[i + 7]; ++i)
+ abuf[i] = abuf[i + 7];
+ abuf[i] = '\0';
+ }
+}
+
+/*--------------------------------------------------------------------*/
+
+void
+TCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen)
+{
+ struct sockaddr_storage addr_s;
+ struct sockaddr *addr = (void*)&addr_s;
+ socklen_t l;
+
+ l = sizeof addr_s;
+ AZ(getsockname(sock, addr, &l));
+ TCP_name(addr, l, abuf, alen, pbuf, plen);
+}
+
+/*--------------------------------------------------------------------*/
+
+int
+TCP_filter_http(int sock)
+{
+#ifdef HAVE_ACCEPT_FILTERS
+ struct accept_filter_arg afa;
+ int i;
+
+ bzero(&afa, sizeof(afa));
+ strcpy(afa.af_name, "httpready");
+ errno = 0;
+ i = setsockopt(sock, SOL_SOCKET, SO_ACCEPTFILTER,
+ &afa, sizeof(afa));
+ /* XXX ugly */
+ if (i)
+ printf("Acceptfilter(%d, httpready): %d %s\n",
+ sock, i, strerror(errno));
+ return (i);
+#else
+ (void)sock;
+ return (0);
+#endif
+}
+
+/*--------------------------------------------------------------------
+ * Functions for controlling NONBLOCK mode.
+ *
+ * We use FIONBIO because it is cheaper than fcntl(2), which requires
+ * us to do two syscalls, one to get and one to set, the latter of
+ * which mucks about a bit before it ends up calling ioctl(FIONBIO),
+ * at least on FreeBSD.
+ */
+
+void
+TCP_blocking(int sock)
+{
+ int i;
+
+ i = 0;
+ AZ(ioctl(sock, FIONBIO, &i));
+}
+
+void
+TCP_nonblocking(int sock)
+{
+ int i;
+
+ i = 1;
+ AZ(ioctl(sock, FIONBIO, &i));
+}
+
+/*--------------------------------------------------------------------
+ * On TCP a connect(2) can block for a looong time, and we don't want that.
+ * Unfortunately, the SocketWizards back in those days were happy to wait
+ * any amount of time for a connection, so the connect(2) syscall does not
+ * take an argument for patience.
+ *
+ * There is a little used work-around, and we employ it at our peril.
+ *
+ */
+
+int
+TCP_connect(int s, const struct sockaddr *name, socklen_t namelen, int msec)
+{
+ int i, k;
+ socklen_t l;
+ struct pollfd fds[1];
+
+ assert(s >= 0);
+
+ /* Set the socket non-blocking */
+ TCP_nonblocking(s);
+
+ /* Attempt the connect */
+ i = connect(s, name, namelen);
+ if (i == 0 || errno != EINPROGRESS)
+ return (i);
+
+ /* Exercise our patience, polling for write */
+ fds[0].fd = s;
+ fds[0].events = POLLWRNORM;
+ fds[0].revents = 0;
+ i = poll(fds, 1, msec);
+
+ if (i == 0) {
+ /* Timeout, close and give up */
+ errno = ETIMEDOUT;
+ return (-1);
+ }
+
+ /* Find out if we got a connection */
+ l = sizeof k;
+ AZ(getsockopt(s, SOL_SOCKET, SO_ERROR, &k, &l));
+
+ /* An error means no connection established */
+ errno = k;
+ if (k)
+ return (-1);
+
+ TCP_blocking(s);
+ return (0);
+}
+
+/*--------------------------------------------------------------------
+ * When closing a TCP connection, a couple of errno's are legit, we
+ * can't be held responsible for the other end wanting to talk to us.
+ */
+
+void
+TCP_close(int *s)
+{
+ assert (close(*s) == 0 ||
+ errno == ECONNRESET ||
+ errno == ENOTCONN);
+ *s = -1;
+}


Property changes on: trunk/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:mergeinfo
+