mirror of
https://github.com/libssh2/libssh2.git
synced 2025-11-06 20:49:29 +03:00
31fb8860db
- cmake: always link `ws2_32` on Windows. Also add it to `libssh2.pc`. Fixes #745 - agent: fix gcc compiler warning: `src/agent.c:296:35: warning: 'snprintf' output truncated before the last format character [-Wformat-truncation=]` - autotools: fix `EVP_aes_128_ctr` detection with binutils `ld` The prerequisite for a successful detection is setting `LIBS=-lbcrypt` if the chosen openssl-compatible library requires it, e.g. libressl, or quictls/openssl built with `-DUSE_BCRYPTGENRANDOM`. With llvm `lld`, detection works out of the box. With binutils `ld`, it does not. The reason is `ld`s world-famous pickiness with lib order. To fix it, we pass all custom libs before and after the TLS libs. This ugly hack makes `ld` happy and detection succeed. - agent: fix Windows-specific warning: `src/agent.c:318:10: warning: implicit conversion loses integer precision: 'LRESULT' (aka 'long long') to 'int' [-Wshorten-64-to-32]` - src: fix llvm/clang compiler warning: `src/libssh2_priv.h:987:28: warning: variadic macros are a C99 feature [-Wvariadic-macros]` - src: support `inline` with `__GNUC__` (llvm/clang and gcc), fixing: ``` src/libssh2_priv.h:990:8: warning: extension used [-Wlanguage-extension-token] static inline void ^ ``` - blowfish: support `inline` keyword with MSVC. Also switch to `__inline__` (from `__inline`) for `__GNUC__`: https://gcc.gnu.org/onlinedocs/gcc/Inline.html https://clang.llvm.org/docs/UsersManual.html#differences-between-various-standard-modes - example/test: fix MSVC compiler warnings: - `example\direct_tcpip.c(209): warning C4244: 'function': conversion from 'unsigned int' to 'u_short', possible loss of data` - `tests\session_fixture.c(96): warning C4013: 'getcwd' undefined; assuming extern returning int` - `tests\session_fixture.c(100): warning C4013: 'chdir' undefined; assuming extern returning int` - delete unused macros: - `HAVE_SOCKET` - `HAVE_INET_ADDR` - `NEED_LIB_NSL` - `NEED_LIB_SOCKET` - `HAVE_NTSTATUS_H` - `HAVE_NTDEF_H` - build: delete stale zlib/openssl version numbers from path defaults. - cmake: convert tabs to spaces, add newline at EOFs. Closes #811
120 lines
2.9 KiB
CMake
120 lines
2.9 KiB
CMake
include(CheckCSourceCompiles)
|
|
|
|
# - check_nonblocking_socket_support()
|
|
#
|
|
# Check for how to set a socket to non-blocking state. There seems to exist
|
|
# four known different ways, with the one used almost everywhere being POSIX
|
|
# and XPG3, while the other different ways for different systems (old BSD,
|
|
# Windows and Amiga).
|
|
#
|
|
# One of the following variables will be set indicating the supported
|
|
# method (if any):
|
|
# HAVE_O_NONBLOCK
|
|
# HAVE_FIONBIO
|
|
# HAVE_IOCTLSOCKET
|
|
# HAVE_IOCTLSOCKET_CASE
|
|
# HAVE_SO_NONBLOCK
|
|
# HAVE_DISABLED_NONBLOCKING
|
|
#
|
|
# The following variables may be set before calling this macro to
|
|
# modify the way the check is run:
|
|
#
|
|
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
|
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
|
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
|
# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
|
|
#
|
|
macro(check_nonblocking_socket_support)
|
|
# There are two known platforms (AIX 3.x and SunOS 4.1.x) where the
|
|
# O_NONBLOCK define is found but does not work.
|
|
check_c_source_compiles("
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#if defined(sun) || defined(__sun__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
# if defined(__SVR4) || defined(__srv4__)
|
|
# define PLATFORM_SOLARIS
|
|
# else
|
|
# define PLATFORM_SUNOS4
|
|
# endif
|
|
#endif
|
|
#if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX41)
|
|
# define PLATFORM_AIX_V3
|
|
#endif
|
|
|
|
#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
|
|
#error \"O_NONBLOCK does not work on this platform\"
|
|
#endif
|
|
|
|
int main()
|
|
{
|
|
int socket;
|
|
int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
|
|
}"
|
|
HAVE_O_NONBLOCK)
|
|
|
|
if(NOT HAVE_O_NONBLOCK)
|
|
check_c_source_compiles("/* FIONBIO test (old-style unix) */
|
|
#include <unistd.h>
|
|
#include <stropts.h>
|
|
|
|
int main()
|
|
{
|
|
int socket;
|
|
int flags = ioctl(socket, FIONBIO, &flags);
|
|
}"
|
|
HAVE_FIONBIO)
|
|
|
|
if(NOT HAVE_FIONBIO)
|
|
check_c_source_compiles("/* ioctlsocket test (Windows) */
|
|
#undef inline
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
|
|
#include <windows.h>
|
|
#include <winsock2.h>
|
|
|
|
int main()
|
|
{
|
|
SOCKET sd;
|
|
unsigned long flags = 0;
|
|
sd = socket(0, 0, 0);
|
|
ioctlsocket(sd, FIONBIO, &flags);
|
|
}"
|
|
HAVE_IOCTLSOCKET)
|
|
|
|
if(NOT HAVE_IOCTLSOCKET)
|
|
check_c_source_compiles("/* IoctlSocket test (Amiga?) */
|
|
#include <sys/ioctl.h>
|
|
|
|
int main()
|
|
{
|
|
int socket;
|
|
int flags = IoctlSocket(socket, FIONBIO, (long)1);
|
|
}"
|
|
HAVE_IOCTLSOCKET_CASE)
|
|
|
|
if(NOT HAVE_IOCTLSOCKET_CASE)
|
|
check_c_source_compiles("/* SO_NONBLOCK test (BeOS) */
|
|
#include <socket.h>
|
|
|
|
int main()
|
|
{
|
|
long b = 1;
|
|
int socket;
|
|
int flags = setsockopt(socket, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
|
|
}"
|
|
HAVE_SO_NONBLOCK)
|
|
|
|
if(NOT HAVE_SO_NONBLOCK)
|
|
# No non-blocking socket method found
|
|
set(HAVE_DISABLED_NONBLOCKING 1)
|
|
endif()
|
|
endif()
|
|
endif()
|
|
endif()
|
|
endif()
|
|
endmacro()
|