mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
ctdb-build: Remove duplicate socket_wrapper library
Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Amitay Isaacs
Michael Adam
parent
400cb4d031
commit
b72abf493a
@ -1,21 +0,0 @@
|
||||
AC_ARG_ENABLE(socket-wrapper,
|
||||
AS_HELP_STRING([--enable-socket-wrapper], [Turn on socket wrapper library (default=no)]))
|
||||
|
||||
DEFAULT_TEST_OPTIONS=
|
||||
HAVE_SOCKET_WRAPPER=no
|
||||
|
||||
if eval "test x$developer = xyes"; then
|
||||
enable_socket_wrapper=yes
|
||||
fi
|
||||
|
||||
if eval "test x$enable_socket_wrapper = xyes"; then
|
||||
AC_DEFINE(SOCKET_WRAPPER,1,[Use socket wrapper library])
|
||||
DEFAULT_TEST_OPTIONS=--socket-wrapper
|
||||
HAVE_SOCKET_WRAPPER=yes
|
||||
|
||||
SOCKET_WRAPPER_OBJS="lib/socket_wrapper/socket_wrapper.o"
|
||||
fi
|
||||
|
||||
AC_SUBST(DEFAULT_TEST_OPTIONS)
|
||||
AC_SUBST(HAVE_SOCKET_WRAPPER)
|
||||
AC_SUBST(SOCKET_WRAPPER_OBJS)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,177 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) Jelmer Vernooij 2005 <jelmer@samba.org>
|
||||
* Copyright (C) Stefan Metzmacher 2006 <metze@samba.org>
|
||||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the author nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __SOCKET_WRAPPER_H__
|
||||
#define __SOCKET_WRAPPER_H__
|
||||
|
||||
const char *socket_wrapper_dir(void);
|
||||
unsigned int socket_wrapper_default_iface(void);
|
||||
int swrap_socket(int family, int type, int protocol);
|
||||
int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
|
||||
int swrap_connect(int s, const struct sockaddr *serv_addr, socklen_t addrlen);
|
||||
int swrap_bind(int s, const struct sockaddr *myaddr, socklen_t addrlen);
|
||||
int swrap_listen(int s, int backlog);
|
||||
int swrap_getpeername(int s, struct sockaddr *name, socklen_t *addrlen);
|
||||
int swrap_getsockname(int s, struct sockaddr *name, socklen_t *addrlen);
|
||||
int swrap_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen);
|
||||
int swrap_setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen);
|
||||
ssize_t swrap_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen);
|
||||
ssize_t swrap_sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen);
|
||||
ssize_t swrap_sendmsg(int s, const struct msghdr *msg, int flags);
|
||||
ssize_t swrap_recvmsg(int s, struct msghdr *msg, int flags);
|
||||
int swrap_ioctl(int s, int req, void *ptr);
|
||||
ssize_t swrap_recv(int s, void *buf, size_t len, int flags);
|
||||
ssize_t swrap_read(int s, void *buf, size_t len);
|
||||
ssize_t swrap_send(int s, const void *buf, size_t len, int flags);
|
||||
int swrap_readv(int s, const struct iovec *vector, size_t count);
|
||||
int swrap_writev(int s, const struct iovec *vector, size_t count);
|
||||
int swrap_close(int);
|
||||
int swrap_dup(int oldfd);
|
||||
int swrap_dup2(int oldfd, int newfd);
|
||||
|
||||
#ifdef SOCKET_WRAPPER_REPLACE
|
||||
|
||||
#ifdef accept
|
||||
#undef accept
|
||||
#endif
|
||||
#define accept(s,addr,addrlen) swrap_accept(s,addr,addrlen)
|
||||
|
||||
#ifdef connect
|
||||
#undef connect
|
||||
#endif
|
||||
#define connect(s,serv_addr,addrlen) swrap_connect(s,serv_addr,addrlen)
|
||||
|
||||
#ifdef bind
|
||||
#undef bind
|
||||
#endif
|
||||
#define bind(s,myaddr,addrlen) swrap_bind(s,myaddr,addrlen)
|
||||
|
||||
#ifdef listen
|
||||
#undef listen
|
||||
#endif
|
||||
#define listen(s,blog) swrap_listen(s,blog)
|
||||
|
||||
#ifdef getpeername
|
||||
#undef getpeername
|
||||
#endif
|
||||
#define getpeername(s,name,addrlen) swrap_getpeername(s,name,addrlen)
|
||||
|
||||
#ifdef getsockname
|
||||
#undef getsockname
|
||||
#endif
|
||||
#define getsockname(s,name,addrlen) swrap_getsockname(s,name,addrlen)
|
||||
|
||||
#ifdef getsockopt
|
||||
#undef getsockopt
|
||||
#endif
|
||||
#define getsockopt(s,level,optname,optval,optlen) swrap_getsockopt(s,level,optname,optval,optlen)
|
||||
|
||||
#ifdef setsockopt
|
||||
#undef setsockopt
|
||||
#endif
|
||||
#define setsockopt(s,level,optname,optval,optlen) swrap_setsockopt(s,level,optname,optval,optlen)
|
||||
|
||||
#ifdef recvfrom
|
||||
#undef recvfrom
|
||||
#endif
|
||||
#define recvfrom(s,buf,len,flags,from,fromlen) swrap_recvfrom(s,buf,len,flags,from,fromlen)
|
||||
|
||||
#ifdef sendto
|
||||
#undef sendto
|
||||
#endif
|
||||
#define sendto(s,buf,len,flags,to,tolen) swrap_sendto(s,buf,len,flags,to,tolen)
|
||||
|
||||
#ifdef sendmsg
|
||||
#undef sendmsg
|
||||
#endif
|
||||
#define sendmsg(s,msg,flags) swrap_sendmsg(s,msg,flags)
|
||||
|
||||
#ifdef recvmsg
|
||||
#undef recvmsg
|
||||
#endif
|
||||
#define recvmsg(s,msg,flags) swrap_recvmsg(s,msg,flags)
|
||||
|
||||
#ifdef ioctl
|
||||
#undef ioctl
|
||||
#endif
|
||||
#define ioctl(s,req,ptr) swrap_ioctl(s,req,ptr)
|
||||
|
||||
#ifdef recv
|
||||
#undef recv
|
||||
#endif
|
||||
#define recv(s,buf,len,flags) swrap_recv(s,buf,len,flags)
|
||||
|
||||
#ifdef read
|
||||
#undef read
|
||||
#endif
|
||||
#define read(s,buf,len) swrap_read(s,buf,len)
|
||||
|
||||
#ifdef send
|
||||
#undef send
|
||||
#endif
|
||||
#define send(s,buf,len,flags) swrap_send(s,buf,len,flags)
|
||||
|
||||
#ifdef readv
|
||||
#undef readv
|
||||
#endif
|
||||
#define readv(s, vector, count) swrap_readv(s,vector, count)
|
||||
|
||||
#ifdef writev
|
||||
#undef writev
|
||||
#endif
|
||||
#define writev(s, vector, count) swrap_writev(s,vector, count)
|
||||
|
||||
#ifdef socket
|
||||
#undef socket
|
||||
#endif
|
||||
#define socket(domain,type,protocol) swrap_socket(domain,type,protocol)
|
||||
|
||||
#ifdef close
|
||||
#undef close
|
||||
#endif
|
||||
#define close(s) swrap_close(s)
|
||||
|
||||
#ifdef dup
|
||||
#undef dup
|
||||
#endif
|
||||
#define dup(s) swrap_dup(s)
|
||||
|
||||
#ifdef dup2
|
||||
#undef dup2
|
||||
#endif
|
||||
#define dup2(s, s2) swrap_dup2(s, s2)
|
||||
|
||||
#endif /* SOCKET_WRAPPER_REPLACE */
|
||||
#endif /* __SOCKET_WRAPPER_H__ */
|
||||
@ -1,105 +0,0 @@
|
||||
/*
|
||||
Unix SMB/CIFS implementation.
|
||||
|
||||
local testing of the socket wrapper
|
||||
|
||||
Copyright (C) Jelmer Vernooij 2007
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
#include "system/network.h"
|
||||
#include "../socket_wrapper/socket_wrapper.h"
|
||||
#include "torture/torture.h"
|
||||
|
||||
static char *old_dir = NULL;
|
||||
static char *old_iface = NULL;
|
||||
|
||||
static void backup_env(void)
|
||||
{
|
||||
old_dir = getenv("SOCKET_WRAPPER_DIR");
|
||||
old_iface = getenv("SOCKET_WRAPPER_DEFAULT_IFACE");
|
||||
}
|
||||
|
||||
static void restore_env(void)
|
||||
{
|
||||
if (old_dir == NULL)
|
||||
unsetenv("SOCKET_WRAPPER_DIR");
|
||||
else
|
||||
setenv("SOCKET_WRAPPER_DIR", old_dir, 1);
|
||||
if (old_iface == NULL)
|
||||
unsetenv("SOCKET_WRAPPER_DEFAULT_IFACE");
|
||||
else
|
||||
setenv("SOCKET_WRAPPER_DEFAULT_IFACE", old_iface, 1);
|
||||
}
|
||||
|
||||
static bool test_socket_wrapper_dir(struct torture_context *tctx)
|
||||
{
|
||||
backup_env();
|
||||
|
||||
setenv("SOCKET_WRAPPER_DIR", "foo", 1);
|
||||
torture_assert_str_equal(tctx, socket_wrapper_dir(), "foo", "setting failed");
|
||||
setenv("SOCKET_WRAPPER_DIR", "./foo", 1);
|
||||
torture_assert_str_equal(tctx, socket_wrapper_dir(), "foo", "setting failed");
|
||||
unsetenv("SOCKET_WRAPPER_DIR");
|
||||
torture_assert_str_equal(tctx, socket_wrapper_dir(), NULL, "resetting failed");
|
||||
|
||||
restore_env();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool test_swrap_socket(struct torture_context *tctx)
|
||||
{
|
||||
backup_env();
|
||||
setenv("SOCKET_WRAPPER_DIR", "foo", 1);
|
||||
|
||||
torture_assert_int_equal(tctx, swrap_socket(1337, 1337, 0), -1, "unknown address family fails");
|
||||
torture_assert_int_equal(tctx, errno, EAFNOSUPPORT, "correct errno set");
|
||||
torture_assert_int_equal(tctx, swrap_socket(AF_INET, 1337, 0), -1, "unknown type fails");
|
||||
torture_assert_int_equal(tctx, errno, EPROTONOSUPPORT, "correct errno set");
|
||||
torture_assert_int_equal(tctx, swrap_socket(AF_INET, SOCK_DGRAM, 10), -1, "unknown protocol fails");
|
||||
torture_assert_int_equal(tctx, errno, EPROTONOSUPPORT, "correct errno set");
|
||||
|
||||
restore_env();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
unsigned int socket_wrapper_default_iface(void);
|
||||
static bool test_socket_wrapper_default_iface(struct torture_context *tctx)
|
||||
{
|
||||
backup_env();
|
||||
unsetenv("SOCKET_WRAPPER_DEFAULT_IFACE");
|
||||
torture_assert_int_equal(tctx, socket_wrapper_default_iface(), 1, "unset");
|
||||
setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "2", 1);
|
||||
torture_assert_int_equal(tctx, socket_wrapper_default_iface(), 2, "unset");
|
||||
setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "bla", 1);
|
||||
torture_assert_int_equal(tctx, socket_wrapper_default_iface(), 1, "unset");
|
||||
restore_env();
|
||||
return true;
|
||||
}
|
||||
|
||||
struct torture_suite *torture_local_socket_wrapper(TALLOC_CTX *mem_ctx)
|
||||
{
|
||||
struct torture_suite *suite = torture_suite_create(mem_ctx,
|
||||
"socket-wrapper");
|
||||
|
||||
torture_suite_add_simple_test(suite, "socket_wrapper_dir", test_socket_wrapper_dir);
|
||||
torture_suite_add_simple_test(suite, "socket", test_swrap_socket);
|
||||
torture_suite_add_simple_test(suite, "socket_wrapper_default_iface", test_socket_wrapper_default_iface);
|
||||
|
||||
return suite;
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import Options
|
||||
|
||||
def set_options(opt):
|
||||
gr = opt.option_group('developer options')
|
||||
gr.add_option('--enable-socket-wrapper',
|
||||
help=("Turn on socket wrapper library (default=no)"),
|
||||
action="store_true", dest='enable_socket_wrapper', default=False)
|
||||
|
||||
def configure(conf):
|
||||
if (Options.options.enable_socket_wrapper or Options.options.developer or Options.options.enable_selftest):
|
||||
conf.DEFINE('SOCKET_WRAPPER', 1)
|
||||
conf.ADD_GLOBAL_DEPENDENCY('socket_wrapper')
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
bld.SAMBA_LIBRARY('socket_wrapper',
|
||||
source='socket_wrapper.c',
|
||||
group='base_libraries',
|
||||
private_library=True,
|
||||
enabled=bld.CONFIG_SET('SOCKET_WRAPPER'),
|
||||
deps='replace')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user