Skip to content

V
varnish-cache
Commit 069341b8 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Merge from VTEST

parent bc421898
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
bin/varnishtest/vtc_syslog.c
View file @ 069341b8
...@@ -151,7 +151,10 @@ VUDP_close(int *s) ...@@ -151,7 +151,10 @@ VUDP_close(int *s)
static int static int
VUDP_bind(const struct suckaddr *sa, const char **errp) VUDP_bind(const struct suckaddr *sa, const char **errp)
{ {
int sd, val, e; #ifdef IPV6_V6ONLY
int val;
#endif
int sd, e;
socklen_t sl; socklen_t sl;
const struct sockaddr *so; const struct sockaddr *so;
int proto; int proto;
...@@ -166,15 +169,6 @@ VUDP_bind(const struct suckaddr *sa, const char **errp) ...@@ -166,15 +169,6 @@ VUDP_bind(const struct suckaddr *sa, const char **errp)
*errp = "socket(2)"; *errp = "socket(2)";
return (-1); return (-1);
} }
val = 1;
if (setsockopt(sd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof val) != 0) {
if (errp != NULL)
*errp = "setsockopt(SO_REUSEADDR, 1)";
e = errno;
closefd(&sd);
errno = e;
return (-1);
}
#ifdef IPV6_V6ONLY #ifdef IPV6_V6ONLY
/* forcibly use separate sockets for IPv4 and IPv6 */ /* forcibly use separate sockets for IPv4 and IPv6 */
......
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