From 8534f05d464cddd265068a333a2bc5591a70156f Mon Sep 17 00:00:00 2001 From: Alex Rousskov Date: Tue, 22 Jan 2013 04:06:18 -0700 Subject: [PATCH] Fix "address.GetPort() != 0" assertion for helpers on FreeBSD (at least). The order (or set of?) #include files used by src/ssl/helper.cc (and probably by other helper source files) has changed recently, exposing a defines.h dependency on sys/socket.h where that system header is required to define AF_UNIX. With AF_UNIX incorrectly undefined, IPC_STREAM was set to IPC_TCP_SOCKET instead of IPC_UNIX_STREAM, and helpers that do not have a notion of a listening port, were trying to create communication sockets using TCP streams, triggering a "must have a port" assertion in comm_connect_addr() called from ipcCreate(). TODO: Moving IPC_* defines into an IPC-specific header file may be a better solution then exposing all defines.h users to sys/socket.h. --- src/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defines.h b/src/defines.h index 3c42025742..1828701ddd 100644 --- a/src/defines.h +++ b/src/defines.h @@ -175,7 +175,7 @@ /* required for AF_UNIX below to be defined [on FreeBSD] */ #if HAVE_SYS_SOCKET_H -#include +#include #endif #if HAVE_SOCKETPAIR && defined (AF_UNIX) -- 2.47.2