sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

tsocket: Fix the build on FreeBSD

Browse Source 
FreeBSD does not have TCP_USER_TIMEOUT

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2022-12-09 14:48:06 +01:00 committed by Jeremy Allison
parent 6d36577715
commit 1625dc4b56
4 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/tsocket/wscript Normal file
View File

@ -0,0 +1,36 @@
#!/usr/bin/env python
def configure(conf):
conf.CHECK_CODE('''
#include <netinet/tcp.h>
int main(void) { return TCP_USER_TIMEOUT; }
''',
'HAVE_TCP_USER_TIMEOUT',
addmain=False,
msg='Checking for TCP_USER_TIMEOUT')
def build(bld):
bld.SAMBA_SUBSYSTEM(
'LIBTSOCKET',
source='tsocket.c tsocket_helpers.c tsocket_bsd.c',
public_deps='talloc tevent iov_buf socket-blocking',
public_headers='tsocket.h tsocket_internal.h'
)
bld.SAMBA_BINARY(
'test_tsocket_bsd_addr',
source='tests/test_bsd_addr.c',
deps='cmocka replace LIBTSOCKET',
local_include=False,
for_selftest=True
)
bld.SAMBA_BINARY(
'test_tstream',
source='tests/test_tstream.c tests/socketpair_tcp.c',
deps='cmocka replace LIBTSOCKET',
local_include=False,
enabled=bld.CONFIG_SET('HAVE_TCP_USER_TIMEOUT'),
for_selftest=True
)

21
lib/tsocket/wscript_build
View File

@ -1,21 +0,0 @@
#!/usr/bin/env python
bld.SAMBA_SUBSYSTEM('LIBTSOCKET',
source='tsocket.c tsocket_helpers.c tsocket_bsd.c',
public_deps='talloc tevent iov_buf socket-blocking',
public_headers='tsocket.h tsocket_internal.h',
)
bld.SAMBA_BINARY('test_tsocket_bsd_addr',
source='tests/test_bsd_addr.c',
deps='cmocka replace LIBTSOCKET',
local_include=False,
for_selftest=True)
bld.SAMBA_BINARY('test_tstream',
source='tests/test_tstream.c tests/socketpair_tcp.c',
deps='cmocka replace LIBTSOCKET',
local_include=False,
for_selftest=True)

7
selftest/tests.py
View File

@ -469,9 +469,10 @@ plantestsuite("samba.unittests.credentials", "none",
[os.path.join(bindir(), "default/auth/credentials/test_creds")])
plantestsuite("samba.unittests.tsocket_bsd_addr", "none",
[os.path.join(bindir(), "default/lib/tsocket/test_tsocket_bsd_addr")])
plantestsuite("samba.unittests.tsocket_tstream", "none",
[os.path.join(bindir(), "default/lib/tsocket/test_tstream")],
environ={'SOCKET_WRAPPER_DIR': ''})
if ("HAVE_TCP_USER_TIMEOUT" in config_hash):
plantestsuite("samba.unittests.tsocket_tstream", "none",
[os.path.join(bindir(), "default/lib/tsocket/test_tstream")],
environ={'SOCKET_WRAPPER_DIR': ''})
plantestsuite("samba.unittests.adouble", "none",
[os.path.join(bindir(), "test_adouble")])
plantestsuite("samba.unittests.gnutls_aead_aes_256_cbc_hmac_sha512", "none",

1
wscript
View File

@ -348,6 +348,7 @@ def configure(conf):
conf.RECURSE('source3')
conf.RECURSE('lib/texpect')
conf.RECURSE('lib/tsocket')
conf.RECURSE('python')
if conf.env.with_ctdb:
conf.RECURSE('ctdb')