interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make TCP_FASTOPEN work again for linux and FreeBSD

This commit is contained in:
Willem Toorop 2019-12-13 16:18:53 +01:00
parent 39e2c8a33e
commit 17d5627529
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -484,10 +484,11 @@ else ()
message(WARNING "TCP Fast Open not available, continuing without.") message(WARNING "TCP Fast Open not available, continuing without.")
endif () endif ()
else () else ()
check_include_file(netinet/tcp.h HAVE_NETINET_TCP_H)
check_symbol_exists(TCP_FASTOPEN "sys/socket.h;netinet/tcp.h" HAVE_DECL_TCP_FASTOPEN) check_symbol_exists(TCP_FASTOPEN "sys/socket.h;netinet/tcp.h" HAVE_DECL_TCP_FASTOPEN)
check_symbol_exists(TCP_FASTOPEN_CONNECT "sys/socket.h;netinet/tcp.h" HAVE_DECL_TCP_FASTOPEN_CONNECT) check_symbol_exists(TCP_FASTOPEN_CONNECT "sys/socket.h;netinet/tcp.h" HAVE_DECL_TCP_FASTOPEN_CONNECT)
check_symbol_exists(MSG_FASTOPEN "sys/socket.h;netinet/tcp.h" HAVE_DECL_MSG_FASTOPEN) check_symbol_exists(MSG_FASTOPEN "sys/socket.h;netinet/tcp.h" HAVE_DECL_MSG_FASTOPEN)
if (NOT TCP_FASTOPEN) if (NOT HAVE_DECL_TCP_FASTOPEN)
message(WARNING "TCP Fast Open not available, continuing without.") message(WARNING "TCP Fast Open not available, continuing without.")
endif () endif ()
endif () endif ()

11
cmake/include/cmakeconfig.h.in
View File

@ -35,6 +35,7 @@
#cmakedefine HAVE_NETDB_H 1 #cmakedefine HAVE_NETDB_H 1
#cmakedefine HAVE_ARPA_INET_H 1 #cmakedefine HAVE_ARPA_INET_H 1
#cmakedefine HAVE_NETINET_IN_H 1 #cmakedefine HAVE_NETINET_IN_H 1
#cmakedefine HAVE_NETINET_TCP_H 1
#cmakedefine HAVE_SYS_SELECT_H 1 #cmakedefine HAVE_SYS_SELECT_H 1
#cmakedefine HAVE_SYS_SOCKET_H 1 #cmakedefine HAVE_SYS_SOCKET_H 1
#cmakedefine HAVE_SYS_SYSCTL_H 1 #cmakedefine HAVE_SYS_SYSCTL_H 1
@ -127,9 +128,9 @@
#cmakedefine HAVE_DECL_SIGADDSET 1 #cmakedefine HAVE_DECL_SIGADDSET 1
#cmakedefine HAVE_DECL_STRPTIME 1 #cmakedefine HAVE_DECL_STRPTIME 1
#cmakedefine USE_DECL_TCP_FASTOPEN 1 #cmakedefine HAVE_DECL_TCP_FASTOPEN 1
#cmakedefine USE_DECL_TCP_FASTOPEN_CONNECT 1 #cmakedefine HAVE_DECL_TCP_FASTOPEN_CONNECT 1
#cmakedefine USE_DECL_MSG_FASTOPEN 1 #cmakedefine HAVE_DECL_MSG_FASTOPEN 1
#if defined(HAVE_DECL_INET_PTON) || defined(HAVE_WIN_DECL_INET_PTON) #if defined(HAVE_DECL_INET_PTON) || defined(HAVE_WIN_DECL_INET_PTON)
#undef HAVE_DECL_INET_PTON #undef HAVE_DECL_INET_PTON
@ -392,6 +393,10 @@ static inline int _gldns_custom_vsnprintf(char *str, size_t size, const char *fo
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif