summaryrefslogtreecommitdiffstats
path: root/socket.c
diff options
context:
space:
mode:
authorJuanJo Ciarlante <jjo@google.com>2009-10-01 00:15:12 +0200
committerJuanJo Ciarlante <juanjosec@gmail.com>2011-03-25 13:30:29 +0100
commitaa8e9576bbd2ecd094276521ad9cf88227a119c9 (patch)
treefa0f00f699e8527a8d71ba8b01719f48b2676edd /socket.c
parentead3784086e76add44d53b0ffa87e3a8bd3fa8c7 (diff)
downloadopenvpn-aa8e9576bbd2ecd094276521ad9cf88227a119c9.tar.gz
openvpn-aa8e9576bbd2ecd094276521ad9cf88227a119c9.tar.xz
openvpn-aa8e9576bbd2ecd094276521ad9cf88227a119c9.zip
* fix multi-tcp crash (corrected assertion)
Diffstat (limited to 'socket.c')
-rw-r--r--socket.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/socket.c b/socket.c
index 96d2602..2bb7141 100644
--- a/socket.c
+++ b/socket.c
@@ -1645,7 +1645,11 @@ link_socket_init_phase1 (struct link_socket *sock,
if (mode == LS_MODE_TCP_ACCEPT_FROM)
{
ASSERT (accept_from);
- ASSERT (sock->info.proto == PROTO_TCPv4_SERVER);
+ ASSERT (sock->info.proto == PROTO_TCPv4_SERVER
+#ifdef USE_PF_INET6
+ || sock->info.proto == PROTO_TCPv6_SERVER
+#endif
+ );
ASSERT (!sock->inetd);
sock->sd = accept_from->sd;
}