public/libevhtp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding sys/un.h checks.

Browse source
This commit is contained in:
Mark Ellzey 2011-12-14 18:34:01 -05:00
parent f6ef167b89
commit 6ec70e5eda
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -27,6 +27,7 @@ CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H)
CHECK_INCLUDE_FILES(stdarg.h HAVE_STDARG_PROTOTYPES)
CHECK_INCLUDE_FILES(sys/tree.h HAVE_SYS_TREE)
CHECK_INCLUDE_FILES(sys/un.h HAVE_SYS_UN)
CHECK_TYPE_SIZE("int" SIZEOF_INT)
CHECK_TYPE_SIZE("long" SIZEOF_LONG)
@ -92,6 +93,10 @@ if (NOT HAVE_STRNLEN)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNO_STRNLEN")
endif(NOT HAVE_STRNLEN)
if (NOT HAVE_SYS_UN)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNO_SYS_UN")
endif(NOT HAVE_SYS_UN)
OPTION(DISABLE_SSL "Disable ssl support" OFF)
OPTION(DISABLE_EVTHR "Disable evthread support" OFF)

16
evhtp.c
View file

@ -8,7 +8,9 @@
#include <strings.h>
#include <inttypes.h>
#include <sys/socket.h>
#ifndef NO_SYS_UN
#include <sys/un.h>
#endif
#include <netinet/in.h>
#include <arpa/inet.h>
#include <alloca.h>
@ -1938,9 +1940,12 @@ int
evhtp_bind_socket(evhtp_t * htp, const char * baddr, uint16_t port, int backlog) {
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
struct sockaddr_un sun;
struct sockaddr * sa;
size_t sin_len;
#ifndef NO_SYS_UN
struct sockaddr_un sun;
#endif
struct sockaddr * sa;
size_t sin_len;
memset(&sin, 0, sizeof(sin));
@ -1954,6 +1959,7 @@ evhtp_bind_socket(evhtp_t * htp, const char * baddr, uint16_t port, int backlog)
evutil_inet_pton(AF_INET6, baddr, &sin6.sin6_addr);
sa = (struct sockaddr *)&sin6;
} else if (*baddr == '/') {
#ifndef NO_SYS_UN
if (strlen(baddr) >= sizeof(sun.sun_path)) {
return -1;
}
@ -1966,6 +1972,10 @@ evhtp_bind_socket(evhtp_t * htp, const char * baddr, uint16_t port, int backlog)
strncpy(sun.sun_path, baddr, strlen(baddr));
sa = (struct sockaddr *)&sun;
#else
fprintf(stderr, "System does not support AF_UNIX sockets\n");
return -1;
#endif
} else {
sin_len = sizeof(struct sockaddr_in);