Mailing List Archive

Author: phk
Date: 2007-05-09 11:45:01 +0200 (Wed, 09 May 2007)
New Revision: 1393

Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_vrt.c
Log:
Don't use sockaddr->sa_len, it was too advanced for POSIX people


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2007-05-09 09:44:35 UTC (rev 1392)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2007-05-09 09:45:01 UTC (rev 1393)
@@ -257,6 +257,7 @@

unsigned sockaddrlen;
struct sockaddr sockaddr[2];
+ unsigned mysockaddrlen;
struct sockaddr mysockaddr[2];

/* formatted ascii client address */

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2007-05-09 09:44:35 UTC (rev 1392)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2007-05-09 09:45:01 UTC (rev 1393)
@@ -264,10 +264,10 @@
{
socklen_t l;

- if (sp->mysockaddr->sa_len == 0) {
+ if (sp->mysockaddrlen == 0) {
l = sizeof sp->mysockaddr;
AZ(getsockname(sp->fd, sp->mysockaddr, &l));
- assert(l == sp->mysockaddr->sa_len);
+ sp->mysockaddrlen = l;
}

return (sp->mysockaddr);