Changes to support building on solaris, irix, and darwin. Also
removed test for working fork (AC_FORK).
This commit is contained in:
crs
parent
de1fadc027
commit
9567a970a8
149
acinclude.m4
149
acinclude.m4
|
|
@ -10,9 +10,41 @@ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
dnl GNU General Public License for more details.
|
||||
|
||||
AC_DEFUN([ACX_CHECK_SOCKLEN_T], [
|
||||
AC_MSG_CHECKING([for socklen_t])
|
||||
AC_TRY_COMPILE([
|
||||
#include <unistd.h>
|
||||
#include <sys/socket.h>
|
||||
],
|
||||
[socklen_t len;],[acx_socklen_t_ok=yes],[acx_socklen_t_ok=no])
|
||||
AC_MSG_RESULT($acx_socklen_t_ok)
|
||||
if test x"$acx_socklen_t_ok" = xyes; then
|
||||
ifelse([$1],,AC_DEFINE(HAVE_SOCKLEN_T,1,[Define if your compiler defines socklen_t.]),[$1])
|
||||
:
|
||||
else
|
||||
acx_socklen_t_ok=no
|
||||
$2
|
||||
fi
|
||||
])dnl ACX_CHECK_SOCKLEN_T
|
||||
|
||||
AC_DEFUN([ACX_CHECK_CXX], [
|
||||
AC_MSG_CHECKING([if g++ defines correct C++ macro])
|
||||
AC_TRY_COMPILE(, [
|
||||
#if defined(_LANGUAGE_C) && !defined(_LANGUAGE_C_PLUS_PLUS)
|
||||
#error wrong macro
|
||||
#endif],[acx_cxx_macro_ok=yes],[acx_cxx_macro_ok=no])
|
||||
AC_MSG_RESULT($acx_cxx_macro_ok)
|
||||
if test x"$acx_cxx_macro_ok" = xyes; then
|
||||
SYNERGY_CXXFLAGS=""
|
||||
else
|
||||
SYNERGY_CXXFLAGS="-U_LANGUAGE_C -D_LANGUAGE_C_PLUS_PLUS"
|
||||
fi
|
||||
])dnl ACX_CHECK_CXX
|
||||
|
||||
AC_DEFUN([ACX_CHECK_CXX_BOOL], [
|
||||
AC_MSG_CHECKING([for bool support])
|
||||
AC_TRY_COMPILE(, [bool t = true, f = false;],[acx_cxx_bool_ok=yes])
|
||||
AC_TRY_COMPILE(, [bool t = true, f = false;],
|
||||
[acx_cxx_bool_ok=yes],[acx_cxx_bool_ok=no])
|
||||
AC_MSG_RESULT($acx_cxx_bool_ok)
|
||||
if test x"$acx_cxx_bool_ok" = xyes; then
|
||||
ifelse([$1],,AC_DEFINE(HAVE_CXX_BOOL,1,[Define if your compiler has bool support.]),[$1])
|
||||
|
|
@ -21,11 +53,12 @@ AC_DEFUN([ACX_CHECK_CXX_BOOL], [
|
|||
acx_cxx_bool_ok=no
|
||||
$2
|
||||
fi
|
||||
])dnl ACX_CHECK_BOOL
|
||||
])dnl ACX_CHECK_CXX_BOOL
|
||||
|
||||
AC_DEFUN([ACX_CHECK_CXX_EXCEPTIONS], [
|
||||
AC_MSG_CHECKING([for exception support])
|
||||
AC_TRY_COMPILE(, [try{throw int(4);}catch(int){throw;}catch(...){}],[acx_cxx_exception_ok=yes])
|
||||
AC_TRY_COMPILE(, [try{throw int(4);}catch(int){throw;}catch(...){}],
|
||||
[acx_cxx_exception_ok=yes],[acx_cxx_exception_ok=no])
|
||||
AC_MSG_RESULT($acx_cxx_exception_ok)
|
||||
if test x"$acx_cxx_exception_ok" = xyes; then
|
||||
ifelse([$1],,AC_DEFINE(HAVE_CXX_EXCEPTIONS,1,[Define if your compiler has exceptions support.]),[$1])
|
||||
|
|
@ -38,7 +71,9 @@ AC_DEFUN([ACX_CHECK_CXX_EXCEPTIONS], [
|
|||
|
||||
AC_DEFUN([ACX_CHECK_CXX_CASTS], [
|
||||
AC_MSG_CHECKING([for C++ cast support])
|
||||
AC_TRY_COMPILE(, [const char* f="a";const_cast<char*>(f);reinterpret_cast<const int*>(f);static_cast<int>(4.5);],[acx_cxx_cast_ok=yes])
|
||||
AC_TRY_COMPILE(, [const char* f="a";const_cast<char*>(f);
|
||||
reinterpret_cast<const int*>(f);static_cast<int>(4.5);],
|
||||
[acx_cxx_cast_ok=yes],[acx_cxx_cast_ok=no])
|
||||
AC_MSG_RESULT($acx_cxx_cast_ok)
|
||||
if test x"$acx_cxx_cast_ok" = xyes; then
|
||||
ifelse([$1],,AC_DEFINE(HAVE_CXX_CASTS,1,[Define if your compiler has C++ cast support.]),[$1])
|
||||
|
|
@ -51,7 +86,8 @@ AC_DEFUN([ACX_CHECK_CXX_CASTS], [
|
|||
|
||||
AC_DEFUN([ACX_CHECK_CXX_MUTABLE], [
|
||||
AC_MSG_CHECKING([for mutable support])
|
||||
AC_TRY_COMPILE(, [struct A{mutable int b;void f() const {b=0;}};A a;a.f();],[acx_cxx_mutable_ok=yes])
|
||||
AC_TRY_COMPILE(, [struct A{mutable int b;void f() const {b=0;}};
|
||||
A a;a.f();],[acx_cxx_mutable_ok=yes],[acx_cxx_mutable_ok=no])
|
||||
AC_MSG_RESULT($acx_cxx_mutable_ok)
|
||||
if test x"$acx_cxx_mutable_ok" = xyes; then
|
||||
ifelse([$1],,AC_DEFINE(HAVE_CXX_MUTABLE,1,[Define if your compiler has mutable support.]),[$1])
|
||||
|
|
@ -64,7 +100,8 @@ AC_DEFUN([ACX_CHECK_CXX_MUTABLE], [
|
|||
|
||||
AC_DEFUN([ACX_CHECK_CXX_STDLIB], [
|
||||
AC_MSG_CHECKING([for C++ standard library])
|
||||
AC_TRY_LINK([#include <set>], [std::set<int> a; a.insert(3);],[acx_cxx_stdlib_ok=yes])
|
||||
AC_TRY_LINK([#include <set>], [std::set<int> a; a.insert(3);],
|
||||
[acx_cxx_stdlib_ok=yes],[acx_cxx_stdlib_ok=no])
|
||||
AC_MSG_RESULT($acx_cxx_stdlib_ok)
|
||||
if test x"$acx_cxx_stdlib_ok" = xyes; then
|
||||
ifelse([$1],,AC_DEFINE(HAVE_CXX_STDLIB,1,[Define if your compiler has standard C++ library support.]),[$1])
|
||||
|
|
@ -161,7 +198,58 @@ AC_DEFUN([ACX_CHECK_NANOSLEEP], [
|
|||
acx_nanosleep_ok=no
|
||||
$2
|
||||
fi
|
||||
])dnl ACX_CHECK_POLL
|
||||
])dnl ACX_CHECK_NANOSLEEP
|
||||
|
||||
dnl See if we need extra libraries for inet_aton
|
||||
AC_DEFUN([ACX_CHECK_INET_ATON], [
|
||||
acx_inet_aton_ok=no
|
||||
acx_inet_aton_list=""
|
||||
|
||||
dnl check if user has set INET_ATON_LIBS
|
||||
save_user_INET_ATON_LIBS="$INET_ATON_LIBS"
|
||||
if test x"$INET_ATON_LIBS" != x; then
|
||||
acx_inet_aton_list=user
|
||||
fi
|
||||
|
||||
dnl check various libraries (including no extra libraries) for
|
||||
dnl inet_aton. `none' should appear first.
|
||||
acx_inet_aton_list="none $acx_inet_aton_list resolv"
|
||||
for flag in $acx_inet_aton_list; do
|
||||
case $flag in
|
||||
none)
|
||||
AC_MSG_CHECKING([for inet_aton])
|
||||
INET_ATON_LIBS=""
|
||||
;;
|
||||
|
||||
user)
|
||||
AC_MSG_CHECKING([for inet_aton in $save_user_INET_ATON_LIBS])
|
||||
INET_ATON_LIBS="$save_user_INET_ATON_LIBS"
|
||||
;;
|
||||
|
||||
*)
|
||||
AC_MSG_CHECKING([for inet_aton in -l$flag])
|
||||
INET_ATON_LIBS="-l$flag"
|
||||
;;
|
||||
esac
|
||||
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$INET_ATON_LIBS $LIBS"
|
||||
AC_TRY_LINK([#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>],
|
||||
[struct in_addr addr; inet_aton("foo.bar", &addr);],
|
||||
acx_inet_aton_ok=yes, acx_inet_aton_ok=no)
|
||||
LIBS="$save_LIBS"
|
||||
AC_MSG_RESULT($acx_inet_aton_ok)
|
||||
if test x"$acx_inet_aton_ok" = xyes; then
|
||||
break;
|
||||
fi
|
||||
INET_ATON_LIBS=""
|
||||
done
|
||||
|
||||
AC_SUBST(INET_ATON_LIBS)
|
||||
])dnl ACX_CHECK_INET_ATON
|
||||
|
||||
dnl The following macros are from http://www.gnu.org/software/ac-archive/
|
||||
dnl which distributes them under the following license:
|
||||
|
|
@ -207,6 +295,7 @@ dnl delete any notice of this special exception to the GPL from your modified
|
|||
dnl version
|
||||
|
||||
AC_DEFUN([ACX_PTHREAD], [
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
acx_pthread_ok=no
|
||||
|
||||
# We used to check for pthread.h first, but this fails if pthread.h
|
||||
|
|
@ -217,11 +306,11 @@ acx_pthread_ok=no
|
|||
# etcetera environment variables, and if threads linking works using
|
||||
# them:
|
||||
if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$PTHREAD_LIBS $LIBS"
|
||||
AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
|
||||
AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CXXFLAGS=$PTHREAD_CFLAGS])
|
||||
AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
|
||||
AC_MSG_RESULT($acx_pthread_ok)
|
||||
if test x"$acx_pthread_ok" = xno; then
|
||||
|
|
@ -229,7 +318,7 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
|
|||
PTHREAD_CFLAGS=""
|
||||
fi
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
fi
|
||||
|
||||
# We must check for the threads library under a number of different
|
||||
|
|
@ -296,9 +385,9 @@ for flag in $acx_pthread_flags; do
|
|||
esac
|
||||
|
||||
save_LIBS="$LIBS"
|
||||
save_CFLAGS="$CFLAGS"
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
LIBS="$PTHREAD_LIBS $LIBS"
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
|
||||
|
||||
# Check for various functions. We must include pthread.h,
|
||||
# since some functions may be macros. (On the Sequent, we
|
||||
|
|
@ -316,7 +405,7 @@ for flag in $acx_pthread_flags; do
|
|||
[acx_pthread_ok=yes])
|
||||
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
|
||||
AC_MSG_RESULT($acx_pthread_ok)
|
||||
if test "x$acx_pthread_ok" = xyes; then
|
||||
|
|
@ -332,8 +421,8 @@ fi
|
|||
if test "x$acx_pthread_ok" = xyes; then
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$PTHREAD_LIBS $LIBS"
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
|
||||
|
||||
# Detect AIX lossage: threads are created detached by default
|
||||
# and the JOINABLE attribute has a nonstandard name (UNDETACHED).
|
||||
|
|
@ -361,15 +450,38 @@ if test "x$acx_pthread_ok" = xyes; then
|
|||
case "${host_cpu}-${host_os}" in
|
||||
*-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
|
||||
alpha*-osf*) flag="-D_REENTRANT";;
|
||||
*solaris*) flag="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS";;
|
||||
*solaris*) flag="-D_REENTRANT";;
|
||||
esac
|
||||
AC_MSG_RESULT(${flag})
|
||||
if test "x$flag" != xno; then
|
||||
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
|
||||
fi
|
||||
|
||||
# Detect POSIX sigwait()
|
||||
AC_MSG_CHECKING([for POSIX sigwait])
|
||||
AC_TRY_LINK([#include <pthread.h>
|
||||
#include <signal.h>],
|
||||
[sigset_t sigset; int signal; sigwait(&sigset, &signal);],
|
||||
ok=yes, ok=unknown)
|
||||
if test x"$ok" = xunknown; then
|
||||
save_CXXFLAGS2="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS"
|
||||
AC_TRY_LINK([#include <pthread.h>
|
||||
#include <signal.h>],
|
||||
[sigset_t sigset; int signal; sigwait(&sigset, &signal);],
|
||||
ok=-D_POSIX_PTHREAD_SEMANTICS, ok=no)
|
||||
CXXFLAGS="$save_CXXFLAGS2"
|
||||
fi
|
||||
AC_MSG_RESULT(${ok})
|
||||
if test x"$ok" != xno; then
|
||||
AC_DEFINE(HAVE_POSIX_SIGWAIT,1,[Define if you have a POSIX \`sigwait\' function.])
|
||||
if test x"$ok" != xyes; then
|
||||
PTHREAD_CFLAGS="$ok $PTHREAD_CFLAGS"
|
||||
fi
|
||||
fi
|
||||
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
|
||||
# More AIX lossage: must compile with cc_r
|
||||
AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
|
||||
|
|
@ -389,5 +501,4 @@ else
|
|||
acx_pthread_ok=no
|
||||
$2
|
||||
fi
|
||||
|
||||
])dnl ACX_PTHREAD
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
17
configure.in
17
configure.in
|
|
@ -35,15 +35,22 @@ AC_CHECK_PROG(HAVE_DOT, dot, YES, NO)
|
|||
dnl do checks using C++
|
||||
AC_LANG_CPLUSPLUS
|
||||
|
||||
dnl our files end in .cpp not .C so tests should also end in .cpp
|
||||
ac_ext=cpp
|
||||
|
||||
dnl check compiler
|
||||
ACX_CHECK_CXX
|
||||
|
||||
dnl checks for libraries
|
||||
ACX_PTHREAD(,AC_MSG_ERROR(You must have pthreads to compile synergy))
|
||||
ACX_CHECK_NANOSLEEP
|
||||
ACX_CHECK_INET_ATON
|
||||
|
||||
dnl checks for header files
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS([unistd.h sys/time.h])
|
||||
AC_CHECK_HEADERS([unistd.h sys/time.h sys/types.h])
|
||||
AC_CHECK_HEADERS([sys/socket.h sys/select.h])
|
||||
AC_CHECK_HEADERS([istream ostream sstream])
|
||||
AC_CHECK_HEADERS([windows.h])
|
||||
AC_HEADER_TIME
|
||||
AC_PATH_X
|
||||
AC_PATH_XTRA
|
||||
|
|
@ -54,6 +61,7 @@ CPPFLAGS="$save_CPPFLAGS"
|
|||
|
||||
dnl checks for types
|
||||
AC_TYPE_SIZE_T
|
||||
ACX_CHECK_SOCKLEN_T
|
||||
|
||||
dnl checks for structures
|
||||
AC_STRUCT_TM
|
||||
|
|
@ -71,7 +79,6 @@ ACX_CHECK_CXX_STDLIB(,AC_MSG_ERROR(Your compiler must support the C++ standard l
|
|||
|
||||
dnl checks for library functions
|
||||
dnl AC_TYPE_SIGNAL
|
||||
AC_FUNC_FORK
|
||||
AC_FUNC_MEMCMP
|
||||
AC_FUNC_STRFTIME
|
||||
AC_CHECK_FUNCS(gmtime_r)
|
||||
|
|
@ -86,8 +93,8 @@ dnl checks for system services
|
|||
|
||||
|
||||
dnl adjust variables for X11 and pthreads
|
||||
CXXFLAGS="$CXXFLAGS $X_CFLAGS $PTHREAD_CFLAGS"
|
||||
LIBS="$NANOSLEEP_LIBS $PTHREAD_LIBS $LIBS"
|
||||
CXXFLAGS="$CXXFLAGS $SYNERGY_CXXFLAGS $X_CFLAGS $PTHREAD_CFLAGS"
|
||||
LIBS="$NANOSLEEP_LIBS $INET_ATON_LIBS $PTHREAD_LIBS $LIBS"
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#endif
|
||||
|
||||
// check if win32 platform
|
||||
#if defined(_WIN32) || HAVE_WINDOWS_H
|
||||
#if defined(_WIN32)
|
||||
# define WINDOWS_LIKE 1
|
||||
|
||||
// VC++ specific
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
# define SIZE_OF_INT 4
|
||||
# define SIZE_OF_LONG 4
|
||||
# endif
|
||||
#endif // defined(_WIN32) || HAVE_WINDOWS_H
|
||||
#endif // defined(_WIN32)
|
||||
|
||||
// unix-like if not like anything else
|
||||
#if (!defined(WINDOWS_LIKE) || WINDOWS_LIKE == 0)
|
||||
|
|
|
|||
|
|
@ -548,8 +548,12 @@ CThreadRep::threadSignalHandler(void* vrep)
|
|||
// we exit the loop via thread cancellation in sigwait()
|
||||
for (;;) {
|
||||
// wait
|
||||
#if HAVE_POSIX_SIGWAIT
|
||||
int signal;
|
||||
sigwait(&sigset, &signal);
|
||||
#else
|
||||
sigwait(&sigset);
|
||||
#endif
|
||||
|
||||
// if we get here then the signal was raised. cancel the thread.
|
||||
mainThreadRep->cancel();
|
||||
|
|
|
|||
|
|
@ -21,46 +21,46 @@
|
|||
// CNetwork
|
||||
//
|
||||
|
||||
CNetwork::Socket (PASCAL FAR *CNetwork::accept)(CNetwork::Socket s, CNetwork::Address FAR *addr, CNetwork::AddressLength FAR *addrlen);
|
||||
int (PASCAL FAR *CNetwork::bind)(CNetwork::Socket s, const CNetwork::Address FAR *addr, CNetwork::AddressLength namelen);
|
||||
int (PASCAL FAR *CNetwork::close)(CNetwork::Socket s);
|
||||
int (PASCAL FAR *CNetwork::connect)(CNetwork::Socket s, const CNetwork::Address FAR *name, CNetwork::AddressLength namelen);
|
||||
int (PASCAL FAR *CNetwork::ioctl)(CNetwork::Socket s, int cmd, void FAR *);
|
||||
int (PASCAL FAR *CNetwork::getpeername)(CNetwork::Socket s, CNetwork::Address FAR *name, CNetwork::AddressLength FAR * namelen);
|
||||
int (PASCAL FAR *CNetwork::getsockname)(CNetwork::Socket s, CNetwork::Address FAR *name, CNetwork::AddressLength FAR * namelen);
|
||||
int (PASCAL FAR *CNetwork::getsockopt)(CNetwork::Socket s, int level, int optname, void FAR * optval, CNetwork::AddressLength FAR *optlen);
|
||||
int (PASCAL FAR *CNetwork::listen)(CNetwork::Socket s, int backlog);
|
||||
ssize_t (PASCAL FAR *CNetwork::read)(CNetwork::Socket s, void FAR * buf, size_t len);
|
||||
ssize_t (PASCAL FAR *CNetwork::recv)(CNetwork::Socket s, void FAR * buf, size_t len, int flags);
|
||||
ssize_t (PASCAL FAR *CNetwork::recvfrom)(CNetwork::Socket s, void FAR * buf, size_t len, int flags, CNetwork::Address FAR *from, CNetwork::AddressLength FAR * fromlen);
|
||||
int (PASCAL FAR *CNetwork::poll)(CNetwork::PollEntry fds[], int nfds, int timeout);
|
||||
ssize_t (PASCAL FAR *CNetwork::send)(CNetwork::Socket s, const void FAR * buf, size_t len, int flags);
|
||||
ssize_t (PASCAL FAR *CNetwork::sendto)(CNetwork::Socket s, const void FAR * buf, size_t len, int flags, const CNetwork::Address FAR *to, CNetwork::AddressLength tolen);
|
||||
int (PASCAL FAR *CNetwork::setsockopt)(CNetwork::Socket s, int level, int optname, const void FAR * optval, CNetwork::AddressLength optlen);
|
||||
int (PASCAL FAR *CNetwork::shutdown)(CNetwork::Socket s, int how);
|
||||
CNetwork::Socket (PASCAL FAR *CNetwork::socket)(int af, int type, int protocol);
|
||||
ssize_t (PASCAL FAR *CNetwork::write)(CNetwork::Socket s, const void FAR * buf, size_t len);
|
||||
int (PASCAL FAR *CNetwork::gethostname)(char FAR * name, int namelen);
|
||||
int (PASCAL FAR *CNetwork::getsockerror)(void);
|
||||
|
||||
#if WINDOWS_LIKE
|
||||
|
||||
int (PASCAL FAR *CNetwork::select)(int nfds, fd_set FAR *readfds, fd_set FAR *writefds, fd_set FAR *exceptfds, const struct timeval FAR *timeout);
|
||||
int (PASCAL FAR *CNetwork::WSACleanup)(void);
|
||||
int (PASCAL FAR *CNetwork::__WSAFDIsSet)(CNetwork::Socket, fd_set FAR *);
|
||||
char FAR * (PASCAL FAR *CNetwork::inet_ntoa_n)(struct in_addr in);
|
||||
unsigned long (PASCAL FAR *CNetwork::inet_addr_n)(const char FAR * cp);
|
||||
struct hostent FAR * (PASCAL FAR *CNetwork::gethostbyaddr_n)(const char FAR * addr, int len, int type);
|
||||
struct hostent FAR * (PASCAL FAR *CNetwork::gethostbyname_n)(const char FAR * name);
|
||||
struct servent FAR * (PASCAL FAR *CNetwork::getservbyport_n)(int port, const char FAR * proto);
|
||||
struct servent FAR * (PASCAL FAR *CNetwork::getservbyname_n)(const char FAR * name, const char FAR * proto);
|
||||
struct protoent FAR * (PASCAL FAR *CNetwork::getprotobynumber_n)(int proto);
|
||||
struct protoent FAR * (PASCAL FAR *CNetwork::getprotobyname_n)(const char FAR * name);
|
||||
static CNetwork::Socket (PASCAL FAR *accept_winsock)(CNetwork::Socket s, CNetwork::Address FAR *addr, CNetwork::AddressLength FAR *addrlen);
|
||||
static int (PASCAL FAR *bind_winsock)(CNetwork::Socket s, const CNetwork::Address FAR *addr, CNetwork::AddressLength namelen);
|
||||
static int (PASCAL FAR *close_winsock)(CNetwork::Socket s);
|
||||
static int (PASCAL FAR *connect_winsock)(CNetwork::Socket s, const CNetwork::Address FAR *name, CNetwork::AddressLength namelen);
|
||||
static int (PASCAL FAR *gethostname_winsock)(char FAR * name, int namelen);
|
||||
static int (PASCAL FAR *getpeername_winsock)(CNetwork::Socket s, CNetwork::Address FAR *name, CNetwork::AddressLength FAR * namelen);
|
||||
static int (PASCAL FAR *getsockerror_winsock)(void);
|
||||
static int (PASCAL FAR *getsockname_winsock)(CNetwork::Socket s, CNetwork::Address FAR *name, CNetwork::AddressLength FAR * namelen);
|
||||
static int (PASCAL FAR *getsockopt_winsock)(CNetwork::Socket s, int level, int optname, void FAR * optval, CNetwork::AddressLength FAR *optlen);
|
||||
static char FAR * (PASCAL FAR *inet_ntoa_winsock)(struct in_addr in);
|
||||
static unsigned long (PASCAL FAR *inet_addr_winsock)(const char FAR * cp);
|
||||
static int (PASCAL FAR *ioctl_winsock)(CNetwork::Socket s, int cmd, void FAR *);
|
||||
static int (PASCAL FAR *listen_winsock)(CNetwork::Socket s, int backlog);
|
||||
static ssize_t (PASCAL FAR *recv_winsock)(CNetwork::Socket s, void FAR * buf, size_t len, int flags);
|
||||
static ssize_t (PASCAL FAR *recvfrom_winsock)(CNetwork::Socket s, void FAR * buf, size_t len, int flags, CNetwork::Address FAR *from, CNetwork::AddressLength FAR * fromlen);
|
||||
static int (PASCAL FAR *select_winsock)(int nfds, fd_set FAR *readfds, fd_set FAR *writefds, fd_set FAR *exceptfds, const struct timeval FAR *timeout);
|
||||
static ssize_t (PASCAL FAR *send_winsock)(CNetwork::Socket s, const void FAR * buf, size_t len, int flags);
|
||||
static ssize_t (PASCAL FAR *sendto_winsock)(CNetwork::Socket s, const void FAR * buf, size_t len, int flags, const CNetwork::Address FAR *to, CNetwork::AddressLength tolen);
|
||||
static int (PASCAL FAR *setsockopt_winsock)(CNetwork::Socket s, int level, int optname, const void FAR * optval, CNetwork::AddressLength optlen);
|
||||
static int (PASCAL FAR *shutdown_winsock)(CNetwork::Socket s, int how);
|
||||
static CNetwork::Socket (PASCAL FAR *socket_winsock)(int af, int type, int protocol);
|
||||
static struct hostent FAR * (PASCAL FAR *gethostbyaddr_winsock)(const char FAR * addr, int len, int type);
|
||||
static struct hostent FAR * (PASCAL FAR *gethostbyname_winsock)(const char FAR * name);
|
||||
static struct servent FAR * (PASCAL FAR *getservbyport_winsock)(int port, const char FAR * proto);
|
||||
static struct servent FAR * (PASCAL FAR *getservbyname_winsock)(const char FAR * name, const char FAR * proto);
|
||||
static struct protoent FAR * (PASCAL FAR *getprotobynumber_winsock)(int proto);
|
||||
static struct protoent FAR * (PASCAL FAR *getprotobyname_winsock)(const char FAR * name);
|
||||
static int (PASCAL FAR *WSACleanup_winsock)(void);
|
||||
static int (PASCAL FAR *WSAFDIsSet_winsock)(CNetwork::Socket, fd_set FAR *);
|
||||
|
||||
const int CNetwork::Error = SOCKET_ERROR;
|
||||
const CNetwork::Socket CNetwork::Null = INVALID_SOCKET;
|
||||
|
||||
#undef FD_ISSET
|
||||
#define FD_ISSET(fd, set) CNetwork::__WSAFDIsSet((SOCKET)(fd), (fd_set FAR *)(set))
|
||||
#define FD_ISSET(fd, set) WSAFDIsSet_winsock((SOCKET)(fd), (fd_set FAR *)(set))
|
||||
|
||||
// have poll() pick up our select() pointer
|
||||
#define select select_winsock
|
||||
|
||||
static HMODULE s_networkModule = NULL;
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ netGetProcAddress(HMODULE module, LPCSTR name)
|
|||
void
|
||||
CNetwork::init()
|
||||
{
|
||||
assert(WSACleanup == NULL);
|
||||
assert(WSACleanup_winsock == NULL);
|
||||
assert(s_networkModule == NULL);
|
||||
|
||||
// try winsock 2
|
||||
|
|
@ -119,10 +119,10 @@ void
|
|||
CNetwork::cleanup()
|
||||
{
|
||||
if (s_networkModule != NULL) {
|
||||
WSACleanup();
|
||||
WSACleanup_winsock();
|
||||
::FreeLibrary(s_networkModule);
|
||||
|
||||
WSACleanup = NULL;
|
||||
WSACleanup_winsock = NULL;
|
||||
s_networkModule = NULL;
|
||||
}
|
||||
}
|
||||
|
|
@ -191,61 +191,100 @@ CNetwork::init2(
|
|||
}
|
||||
|
||||
// get function addresses
|
||||
setfunc(accept, accept, Socket (PASCAL FAR *)(Socket s, Address FAR *addr, AddressLength FAR *addrlen));
|
||||
setfunc(bind, bind, int (PASCAL FAR *)(Socket s, const Address FAR *addr, AddressLength namelen));
|
||||
setfunc(close, closesocket, int (PASCAL FAR *)(Socket s));
|
||||
setfunc(connect, connect, int (PASCAL FAR *)(Socket s, const Address FAR *name, AddressLength namelen));
|
||||
setfunc(ioctl, ioctlsocket, int (PASCAL FAR *)(Socket s, int cmd, void FAR *));
|
||||
setfunc(getpeername, getpeername, int (PASCAL FAR *)(Socket s, Address FAR *name, AddressLength FAR * namelen));
|
||||
setfunc(getsockname, getsockname, int (PASCAL FAR *)(Socket s, Address FAR *name, AddressLength FAR * namelen));
|
||||
setfunc(getsockopt, getsockopt, int (PASCAL FAR *)(Socket s, int level, int optname, void FAR * optval, AddressLength FAR *optlen));
|
||||
setfunc(inet_addr_n, inet_addr, unsigned long (PASCAL FAR *)(const char FAR * cp));
|
||||
setfunc(inet_ntoa_n, inet_ntoa, char FAR * (PASCAL FAR *)(struct in_addr in));
|
||||
setfunc(listen, listen, int (PASCAL FAR *)(Socket s, int backlog));
|
||||
setfunc(recv, recv, ssize_t (PASCAL FAR *)(Socket s, void FAR * buf, size_t len, int flags));
|
||||
setfunc(recvfrom, recvfrom, ssize_t (PASCAL FAR *)(Socket s, void FAR * buf, size_t len, int flags, Address FAR *from, AddressLength FAR * fromlen));
|
||||
setfunc(send, send, ssize_t (PASCAL FAR *)(Socket s, const void FAR * buf, size_t len, int flags));
|
||||
setfunc(sendto, sendto, ssize_t (PASCAL FAR *)(Socket s, const void FAR * buf, size_t len, int flags, const Address FAR *to, AddressLength tolen));
|
||||
setfunc(setsockopt, setsockopt, int (PASCAL FAR *)(Socket s, int level, int optname, const void FAR * optval, AddressLength optlen));
|
||||
setfunc(shutdown, shutdown, int (PASCAL FAR *)(Socket s, int how));
|
||||
setfunc(socket, socket, Socket (PASCAL FAR *)(int af, int type, int protocol));
|
||||
setfunc(gethostname, gethostname, int (PASCAL FAR *)(char FAR * name, int namelen));
|
||||
setfunc(gethostbyaddr_n, gethostbyaddr, struct hostent FAR * (PASCAL FAR *)(const char FAR * addr, int len, int type));
|
||||
setfunc(gethostbyname_n, gethostbyname, struct hostent FAR * (PASCAL FAR *)(const char FAR * name));
|
||||
setfunc(getservbyport_n, getservbyport, struct servent FAR * (PASCAL FAR *)(int port, const char FAR * proto));
|
||||
setfunc(getservbyname_n, getservbyname, struct servent FAR * (PASCAL FAR *)(const char FAR * name, const char FAR * proto));
|
||||
setfunc(getprotobynumber_n, getprotobynumber, struct protoent FAR * (PASCAL FAR *)(int proto));
|
||||
setfunc(getprotobyname_n, getprotobyname, struct protoent FAR * (PASCAL FAR *)(const char FAR * name));
|
||||
setfunc(getsockerror, WSAGetLastError, int (PASCAL FAR *)(void));
|
||||
setfunc(WSACleanup, WSACleanup, int (PASCAL FAR *)(void));
|
||||
setfunc(__WSAFDIsSet, __WSAFDIsSet, int (PASCAL FAR *)(CNetwork::Socket, fd_set FAR *));
|
||||
setfunc(select, select, int (PASCAL FAR *)(int nfds, fd_set FAR *readfds, fd_set FAR *writefds, fd_set FAR *exceptfds, const struct timeval FAR *timeout));
|
||||
poll = poll2;
|
||||
read = read2;
|
||||
write = write2;
|
||||
setfunc(accept_winsock, accept, Socket (PASCAL FAR *)(Socket s, Address FAR *addr, AddressLength FAR *addrlen));
|
||||
setfunc(bind_winsock, bind, int (PASCAL FAR *)(Socket s, const Address FAR *addr, AddressLength namelen));
|
||||
setfunc(close_winsock, closesocket, int (PASCAL FAR *)(Socket s));
|
||||
setfunc(connect_winsock, connect, int (PASCAL FAR *)(Socket s, const Address FAR *name, AddressLength namelen));
|
||||
setfunc(gethostname_winsock, gethostname, int (PASCAL FAR *)(char FAR * name, int namelen));
|
||||
setfunc(getpeername_winsock, getpeername, int (PASCAL FAR *)(Socket s, Address FAR *name, AddressLength FAR * namelen));
|
||||
setfunc(getsockerror_winsock, WSAGetLastError, int (PASCAL FAR *)(void));
|
||||
setfunc(getsockname_winsock, getsockname, int (PASCAL FAR *)(Socket s, Address FAR *name, AddressLength FAR * namelen));
|
||||
setfunc(getsockopt_winsock, getsockopt, int (PASCAL FAR *)(Socket s, int level, int optname, void FAR * optval, AddressLength FAR *optlen));
|
||||
setfunc(inet_addr_winsock, inet_addr, unsigned long (PASCAL FAR *)(const char FAR * cp));
|
||||
setfunc(inet_ntoa_winsock, inet_ntoa, char FAR * (PASCAL FAR *)(struct in_addr in));
|
||||
setfunc(ioctl_winsock, ioctlsocket, int (PASCAL FAR *)(Socket s, int cmd, void FAR *));
|
||||
setfunc(listen_winsock, listen, int (PASCAL FAR *)(Socket s, int backlog));
|
||||
setfunc(recv_winsock, recv, ssize_t (PASCAL FAR *)(Socket s, void FAR * buf, size_t len, int flags));
|
||||
setfunc(recvfrom_winsock, recvfrom, ssize_t (PASCAL FAR *)(Socket s, void FAR * buf, size_t len, int flags, Address FAR *from, AddressLength FAR * fromlen));
|
||||
setfunc(select_winsock, select, int (PASCAL FAR *)(int nfds, fd_set FAR *readfds, fd_set FAR *writefds, fd_set FAR *exceptfds, const struct timeval FAR *timeout));
|
||||
setfunc(send_winsock, send, ssize_t (PASCAL FAR *)(Socket s, const void FAR * buf, size_t len, int flags));
|
||||
setfunc(sendto_winsock, sendto, ssize_t (PASCAL FAR *)(Socket s, const void FAR * buf, size_t len, int flags, const Address FAR *to, AddressLength tolen));
|
||||
setfunc(setsockopt_winsock, setsockopt, int (PASCAL FAR *)(Socket s, int level, int optname, const void FAR * optval, AddressLength optlen));
|
||||
setfunc(shutdown_winsock, shutdown, int (PASCAL FAR *)(Socket s, int how));
|
||||
setfunc(socket,_winsock socket, Socket (PASCAL FAR *)(int af, int type, int protocol));
|
||||
setfunc(gethostbyaddr_winsock, gethostbyaddr, struct hostent FAR * (PASCAL FAR *)(const char FAR * addr, int len, int type));
|
||||
setfunc(gethostbyname_winsock, gethostbyname, struct hostent FAR * (PASCAL FAR *)(const char FAR * name));
|
||||
setfunc(getservbyport_winsock, getservbyport, struct servent FAR * (PASCAL FAR *)(int port, const char FAR * proto));
|
||||
setfunc(getservbyname_winsock, getservbyname, struct servent FAR * (PASCAL FAR *)(const char FAR * name, const char FAR * proto));
|
||||
setfunc(getprotobynumber_winsock, getprotobynumber, struct protoent FAR * (PASCAL FAR *)(int proto));
|
||||
setfunc(getprotobyname_winsock, getprotobyname, struct protoent FAR * (PASCAL FAR *)(const char FAR * name));
|
||||
setfunc(WSACleanup_winsock, WSACleanup, int (PASCAL FAR *)(void));
|
||||
setfunc(WSAFDIsSet_winsock, __WSAFDIsSet, int (PASCAL FAR *)(CNetwork::Socket, fd_set FAR *));
|
||||
|
||||
s_networkModule = module;
|
||||
}
|
||||
|
||||
ssize_t PASCAL FAR
|
||||
CNetwork::read2(Socket s, void FAR* buf, size_t len)
|
||||
CNetwork::Socket
|
||||
CNetwork::accept(Socket s, Address* addr, AddressLength* addrlen)
|
||||
{
|
||||
return recv(s, buf, len, 0);
|
||||
return accept_winsock(s, addr, addrlen);
|
||||
}
|
||||
|
||||
ssize_t PASCAL FAR
|
||||
CNetwork::write2(Socket s, const void FAR* buf, size_t len)
|
||||
int
|
||||
CNetwork::bind(Socket s, const Address* addr, AddressLength namelen)
|
||||
{
|
||||
return send(s, buf, len, 0);
|
||||
return bind_winsock(s, addr, namelen);
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::inet_aton(const char FAR * cp, InternetAddress FAR * addr)
|
||||
int
|
||||
CNetwork::close(Socket s)
|
||||
{
|
||||
return close_winsock(s);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::connect(Socket s, const Address* name, AddressLength namelen)
|
||||
{
|
||||
return connect_winsock(s);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::gethostname(char* name, int namelen)
|
||||
{
|
||||
return gethostname_winsock(name, namelen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::getpeername(Socket s, Address* name, AddressLength* namelen)
|
||||
{
|
||||
return getpeername_winsock(s, name, namelen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::getsockerror(void)
|
||||
{
|
||||
return getsockerrror_winsock();
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::getsockname(Socket s, Address* name, AddressLength* namelen)
|
||||
{
|
||||
return getsockname_winsock(s, name, namelen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::getsockopt(Socket s, int level, int optname, void* optval, AddressLength* optlen)
|
||||
{
|
||||
return getsockopt_winsock(s, level, optname, optval, optlen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::inet_aton(const char* cp, InternetAddress* addr)
|
||||
{
|
||||
assert(addr != NULL);
|
||||
|
||||
// fake it with inet_addr
|
||||
unsigned long inetAddr = inet_addr_n(cp);
|
||||
// fake it with inet_addr, which is per-thread on winsock
|
||||
unsigned long inetAddr = inet_addr_winsock(cp);
|
||||
if (inetAddr == INADDR_NONE) {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -255,21 +294,86 @@ CNetwork::inet_aton(const char FAR * cp, InternetAddress FAR * addr)
|
|||
}
|
||||
}
|
||||
|
||||
CString PASCAL FAR
|
||||
CString
|
||||
CNetwork::inet_ntoa(struct in_addr in)
|
||||
{
|
||||
// winsock returns strings per-thread
|
||||
return CString(inet_ntoa_n(in));
|
||||
return CString(inet_ntoa_winsock(in));
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::gethostbyaddr(CHostInfo* hostinfo,
|
||||
const char FAR * addr, int len, int type)
|
||||
int
|
||||
CNetwork::ioctl(Socket s, int cmd, void* arg)
|
||||
{
|
||||
return ioctl_winsock(s, cmd, arg);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::listen(Socket s, int backlog)
|
||||
{
|
||||
return listen_winsock(s, backlog);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::read(Socket s, void* buf, size_t len)
|
||||
{
|
||||
return recv_winsock(s, buf, len, 0);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::recv(Socket s, void* buf, size_t len, int flags)
|
||||
{
|
||||
return recv_winsock(s, buf, len, flags);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::recvfrom(Socket s, void* buf, size_t len, int flags, Address* from, AddressLength* fromlen)
|
||||
{
|
||||
return recvfrom_winsock(s, buf, len, flags, from, fromlen);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::send(Socket s, const void* buf, size_t len, int flags)
|
||||
{
|
||||
return send_winsock(s, buf, len, flags);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::sendto(Socket s, const void* buf, size_t len, int flags, const Address* to, AddressLength tolen)
|
||||
{
|
||||
return sendto_winsock(s, buf, len, flags, to, tolen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::setsockopt(Socket s, int level, int optname, const void* optval, AddressLength optlen)
|
||||
{
|
||||
return setsockopt_winsock(s, level, optname, optval, optlen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::shutdown(Socket s, int how)
|
||||
{
|
||||
return shutdown_winsock(s, how);
|
||||
}
|
||||
|
||||
CNetwork::Socket
|
||||
CNetwork::socket(int af, int type, int protocol)
|
||||
{
|
||||
return socket_winsock(af, type, protocol);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::write(Socket s, const void* buf, size_t len)
|
||||
{
|
||||
return send_winsock(s, buf, len, 0);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::gethostbyaddr(CHostInfo* hostinfo, const char* addr, int len, int type)
|
||||
{
|
||||
assert(hostinfo != NULL);
|
||||
|
||||
// winsock returns structures per-thread
|
||||
struct hostent FAR* info = gethostbyaddr_n(addr, len, type);
|
||||
struct hostent FAR* info = gethostbyaddr_winsock(addr, len, type);
|
||||
if (info == NULL) {
|
||||
return getsockerror();
|
||||
}
|
||||
|
|
@ -280,14 +384,13 @@ CNetwork::gethostbyaddr(CHostInfo* hostinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::gethostbyname(CHostInfo* hostinfo,
|
||||
const char FAR * name)
|
||||
int
|
||||
CNetwork::gethostbyname(CHostInfo* hostinfo, const char* name)
|
||||
{
|
||||
assert(hostinfo != NULL);
|
||||
|
||||
// winsock returns structures per-thread
|
||||
struct hostent FAR* info = gethostbyname_n(name);
|
||||
struct hostent FAR* info = gethostbyname_winsock(name);
|
||||
if (info == NULL) {
|
||||
return getsockerror();
|
||||
}
|
||||
|
|
@ -298,14 +401,13 @@ CNetwork::gethostbyname(CHostInfo* hostinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getservbyport(CServiceInfo* servinfo,
|
||||
int port, const char FAR * proto)
|
||||
int
|
||||
CNetwork::getservbyport(CServiceInfo* servinfo, int port, const char* proto)
|
||||
{
|
||||
assert(servinfo != NULL);
|
||||
|
||||
// winsock returns structures per-thread
|
||||
struct servent FAR* info = getservbyport_n(port, proto);
|
||||
struct servent FAR* info = getservbyport_winsock(port, proto);
|
||||
if (info == NULL) {
|
||||
return getsockerror();
|
||||
}
|
||||
|
|
@ -316,14 +418,13 @@ CNetwork::getservbyport(CServiceInfo* servinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getservbyname(CServiceInfo* servinfo,
|
||||
const char FAR * name, const char FAR * proto)
|
||||
int
|
||||
CNetwork::getservbyname(CServiceInfo* servinfo, const char* name, const char* proto)
|
||||
{
|
||||
assert(servinfo != NULL);
|
||||
|
||||
// winsock returns structures per-thread
|
||||
struct servent FAR* info = getservbyname_n(name, proto);
|
||||
struct servent FAR* info = getservbyname_winsock(name, proto);
|
||||
if (info == NULL) {
|
||||
return getsockerror();
|
||||
}
|
||||
|
|
@ -334,14 +435,13 @@ CNetwork::getservbyname(CServiceInfo* servinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getprotobynumber(CProtocolInfo* protoinfo,
|
||||
int proto)
|
||||
int
|
||||
CNetwork::getprotobynumber(CProtocolInfo* protoinfo, int proto)
|
||||
{
|
||||
assert(protoinfo != NULL);
|
||||
|
||||
// winsock returns structures per-thread
|
||||
struct protoent FAR* info = getprotobynumber_n(proto);
|
||||
struct protoent FAR* info = getprotobynumber_winsock(proto);
|
||||
if (info == NULL) {
|
||||
return getsockerror();
|
||||
}
|
||||
|
|
@ -352,14 +452,13 @@ CNetwork::getprotobynumber(CProtocolInfo* protoinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getprotobyname(CProtocolInfo* protoinfo,
|
||||
const char FAR * name)
|
||||
int
|
||||
CNetwork::getprotobyname(CProtocolInfo* protoinfo, const char* name)
|
||||
{
|
||||
assert(protoinfo != NULL);
|
||||
|
||||
// winsock returns structures per-thread
|
||||
struct protoent FAR* info = getprotobyname_n(name);
|
||||
struct protoent FAR* info = getprotobyname_winsock(name);
|
||||
if (info == NULL) {
|
||||
return getsockerror();
|
||||
}
|
||||
|
|
@ -370,15 +469,15 @@ CNetwork::getprotobyname(CProtocolInfo* protoinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::setblocking(CNetwork::Socket s, bool blocking)
|
||||
int
|
||||
CNetwork::setblocking(Socket s, bool blocking)
|
||||
{
|
||||
int flag = blocking ? 0 : 1;
|
||||
return ioctl(s, FIONBIO, &flag);
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::setnodelay(CNetwork::Socket s, bool nodelay)
|
||||
int
|
||||
CNetwork::setnodelay(Socket s, bool nodelay)
|
||||
{
|
||||
BOOL flag = nodelay ? 1 : 0;
|
||||
return setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(flag));
|
||||
|
|
@ -391,18 +490,11 @@ CNetwork::setnodelay(CNetwork::Socket s, bool nodelay)
|
|||
#include "CMutex.h"
|
||||
#include "CLock.h"
|
||||
|
||||
#if HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
#if HAVE_SYS_STAT_H
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
#if HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#if !defined(TCP_NODELAY)
|
||||
# include <netinet/tcp.h>
|
||||
|
|
@ -450,32 +542,6 @@ CNetwork::init()
|
|||
catch (...) {
|
||||
throw XNetworkFailed();
|
||||
}
|
||||
|
||||
setfunc(accept, accept, Socket (PASCAL FAR *)(Socket s, Address FAR *addr, AddressLength FAR *addrlen));
|
||||
setfunc(bind, bind, int (PASCAL FAR *)(Socket s, const Address FAR *addr, AddressLength namelen));
|
||||
setfunc(close, close, int (PASCAL FAR *)(Socket s));
|
||||
setfunc(connect, connect, int (PASCAL FAR *)(Socket s, const Address FAR *name, AddressLength namelen));
|
||||
setfunc(ioctl, ioctl, int (PASCAL FAR *)(Socket s, int cmd, void FAR *));
|
||||
setfunc(getpeername, getpeername, int (PASCAL FAR *)(Socket s, Address FAR *name, AddressLength FAR * namelen));
|
||||
setfunc(getsockname, getsockname, int (PASCAL FAR *)(Socket s, Address FAR *name, AddressLength FAR * namelen));
|
||||
setfunc(getsockopt, getsockopt, int (PASCAL FAR *)(Socket s, int level, int optname, void FAR * optval, AddressLength FAR *optlen));
|
||||
setfunc(listen, listen, int (PASCAL FAR *)(Socket s, int backlog));
|
||||
#if HAVE_POLL
|
||||
setfunc(poll, poll, int (PASCAL FAR *)(CNetwork::PollEntry fds[], int nfds, int timeout));
|
||||
#else
|
||||
setfunc(poll, CNetwork::poll2, int (PASCAL FAR *)(CNetwork::PollEntry fds[], int nfds, int timeout));
|
||||
#endif
|
||||
setfunc(read, read, ssize_t (PASCAL FAR *)(CNetwork::Socket s, void FAR * buf, size_t len));
|
||||
setfunc(recv, recv, ssize_t (PASCAL FAR *)(Socket s, void FAR * buf, size_t len, int flags));
|
||||
setfunc(recvfrom, recvfrom, ssize_t (PASCAL FAR *)(Socket s, void FAR * buf, size_t len, int flags, Address FAR *from, AddressLength FAR * fromlen));
|
||||
setfunc(send, send, ssize_t (PASCAL FAR *)(Socket s, const void FAR * buf, size_t len, int flags));
|
||||
setfunc(sendto, sendto, ssize_t (PASCAL FAR *)(Socket s, const void FAR * buf, size_t len, int flags, const Address FAR *to, AddressLength tolen));
|
||||
setfunc(setsockopt, setsockopt, int (PASCAL FAR *)(Socket s, int level, int optname, const void FAR * optval, AddressLength optlen));
|
||||
setfunc(shutdown, shutdown, int (PASCAL FAR *)(Socket s, int how));
|
||||
setfunc(socket, socket, Socket (PASCAL FAR *)(int af, int type, int protocol));
|
||||
setfunc(write, write, ssize_t (PASCAL FAR *)(CNetwork::Socket s, const void FAR * buf, size_t len));
|
||||
gethostname = gethostname2;
|
||||
getsockerror = getsockerror2;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -485,25 +551,67 @@ CNetwork::cleanup()
|
|||
s_networkMutex = NULL;
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::gethostname2(char* name, int namelen)
|
||||
CNetwork::Socket
|
||||
CNetwork::accept(Socket s, Address* addr, AddressLength* addrlen)
|
||||
{
|
||||
return ::accept(s, addr, addrlen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::bind(Socket s, const Address* addr, AddressLength namelen)
|
||||
{
|
||||
return ::bind(s, addr, namelen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::close(Socket s)
|
||||
{
|
||||
return ::close(s);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::connect(Socket s, const Address* name, AddressLength namelen)
|
||||
{
|
||||
return ::connect(s, name, namelen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::gethostname(char* name, int namelen)
|
||||
{
|
||||
return ::gethostname(name, namelen);
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getsockerror2(void)
|
||||
int
|
||||
CNetwork::getpeername(Socket s, Address* name, AddressLength* namelen)
|
||||
{
|
||||
return ::getpeername(s, name, namelen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::getsockerror(void)
|
||||
{
|
||||
return errno;
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::inet_aton(const char FAR * cp, InternetAddress FAR * addr)
|
||||
int
|
||||
CNetwork::getsockname(Socket s, Address* name, AddressLength* namelen)
|
||||
{
|
||||
return ::getsockname(s, name, namelen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::getsockopt(Socket s, int level, int optname, void* optval, AddressLength* optlen)
|
||||
{
|
||||
return ::getsockopt(s, level, optname, optval, optlen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::inet_aton(const char* cp, InternetAddress* addr)
|
||||
{
|
||||
return ::inet_aton(cp, addr);
|
||||
}
|
||||
|
||||
CString PASCAL FAR
|
||||
CString
|
||||
CNetwork::inet_ntoa(struct in_addr in)
|
||||
{
|
||||
// single threaded access to inet_ntoa functions
|
||||
|
|
@ -511,15 +619,80 @@ CNetwork::inet_ntoa(struct in_addr in)
|
|||
return CString(::inet_ntoa(in));
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::gethostbyaddr(CHostInfo* hostinfo,
|
||||
const char FAR * addr, int len, int type)
|
||||
int
|
||||
CNetwork::ioctl(Socket s, int cmd, void* arg)
|
||||
{
|
||||
return ::ioctl(s, cmd, arg);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::listen(Socket s, int backlog)
|
||||
{
|
||||
return ::listen(s, backlog);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::read(Socket s, void* buf, size_t len)
|
||||
{
|
||||
return ::read(s, buf, len);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::recv(Socket s, void* buf, size_t len, int flags)
|
||||
{
|
||||
return ::recv(s, buf, len, flags);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::recvfrom(Socket s, void* buf, size_t len, int flags, Address* from, AddressLength* fromlen)
|
||||
{
|
||||
return ::recvfrom(s, buf, len, flags, from, fromlen);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::send(Socket s, const void* buf, size_t len, int flags)
|
||||
{
|
||||
return ::send(s, buf, len, flags);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::sendto(Socket s, const void* buf, size_t len, int flags, const Address* to, AddressLength tolen)
|
||||
{
|
||||
return ::sendto(s, buf, len, flags, to, tolen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::setsockopt(Socket s, int level, int optname, const void* optval, AddressLength optlen)
|
||||
{
|
||||
return ::setsockopt(s, level, optname, optval, optlen);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::shutdown(Socket s, int how)
|
||||
{
|
||||
return ::shutdown(s, how);
|
||||
}
|
||||
|
||||
CNetwork::Socket
|
||||
CNetwork::socket(int af, int type, int protocol)
|
||||
{
|
||||
return ::socket(af, type, protocol);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
CNetwork::write(Socket s, const void* buf, size_t len)
|
||||
{
|
||||
return ::write(s, buf, len);
|
||||
}
|
||||
|
||||
int
|
||||
CNetwork::gethostbyaddr(CHostInfo* hostinfo, const char* addr, int len, int type)
|
||||
{
|
||||
assert(hostinfo != NULL);
|
||||
|
||||
// single threaded access to netdb functions
|
||||
CLock lock(s_networkMutex);
|
||||
struct hostent FAR* info = ::gethostbyaddr(addr, len, type);
|
||||
struct hostent* info = ::gethostbyaddr(addr, len, type);
|
||||
if (info == NULL) {
|
||||
return h_errno;
|
||||
}
|
||||
|
|
@ -530,15 +703,14 @@ CNetwork::gethostbyaddr(CHostInfo* hostinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::gethostbyname(CHostInfo* hostinfo,
|
||||
const char FAR * name)
|
||||
int
|
||||
CNetwork::gethostbyname(CHostInfo* hostinfo, const char* name)
|
||||
{
|
||||
assert(hostinfo != NULL);
|
||||
|
||||
// single threaded access to netdb functions
|
||||
CLock lock(s_networkMutex);
|
||||
struct hostent FAR* info = ::gethostbyname(name);
|
||||
struct hostent* info = ::gethostbyname(name);
|
||||
if (info == NULL) {
|
||||
return h_errno;
|
||||
}
|
||||
|
|
@ -549,15 +721,14 @@ CNetwork::gethostbyname(CHostInfo* hostinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getservbyport(CServiceInfo* servinfo,
|
||||
int port, const char FAR * proto)
|
||||
int
|
||||
CNetwork::getservbyport(CServiceInfo* servinfo, int port, const char* proto)
|
||||
{
|
||||
assert(servinfo != NULL);
|
||||
|
||||
// single threaded access to netdb functions
|
||||
CLock lock(s_networkMutex);
|
||||
struct servent FAR* info = ::getservbyport(port, proto);
|
||||
struct servent* info = ::getservbyport(port, proto);
|
||||
if (info == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -568,15 +739,14 @@ CNetwork::getservbyport(CServiceInfo* servinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getservbyname(CServiceInfo* servinfo,
|
||||
const char FAR * name, const char FAR * proto)
|
||||
int
|
||||
CNetwork::getservbyname(CServiceInfo* servinfo, const char* name, const char* proto)
|
||||
{
|
||||
assert(servinfo != NULL);
|
||||
|
||||
// single threaded access to netdb functions
|
||||
CLock lock(s_networkMutex);
|
||||
struct servent FAR* info = ::getservbyname(name, proto);
|
||||
struct servent* info = ::getservbyname(name, proto);
|
||||
if (info == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -587,15 +757,14 @@ CNetwork::getservbyname(CServiceInfo* servinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getprotobynumber(CProtocolInfo* protoinfo,
|
||||
int proto)
|
||||
int
|
||||
CNetwork::getprotobynumber(CProtocolInfo* protoinfo, int proto)
|
||||
{
|
||||
assert(protoinfo != NULL);
|
||||
|
||||
// single threaded access to netdb functions
|
||||
CLock lock(s_networkMutex);
|
||||
struct protoent FAR* info = ::getprotobynumber(proto);
|
||||
struct protoent* info = ::getprotobynumber(proto);
|
||||
if (info == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -606,15 +775,14 @@ CNetwork::getprotobynumber(CProtocolInfo* protoinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::getprotobyname(CProtocolInfo* protoinfo,
|
||||
const char FAR * name)
|
||||
int
|
||||
CNetwork::getprotobyname(CProtocolInfo* protoinfo, const char* name)
|
||||
{
|
||||
assert(protoinfo != NULL);
|
||||
|
||||
// single threaded access to netdb functions
|
||||
CLock lock(s_networkMutex);
|
||||
struct protoent FAR* info = ::getprotobyname(name);
|
||||
struct protoent* info = ::getprotobyname(name);
|
||||
if (info == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -625,7 +793,7 @@ CNetwork::getprotobyname(CProtocolInfo* protoinfo,
|
|||
}
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
int
|
||||
CNetwork::setblocking(CNetwork::Socket s, bool blocking)
|
||||
{
|
||||
int mode = fcntl(s, F_GETFL, 0);
|
||||
|
|
@ -644,18 +812,26 @@ CNetwork::setblocking(CNetwork::Socket s, bool blocking)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int PASCAL FAR
|
||||
int
|
||||
CNetwork::setnodelay(CNetwork::Socket s, bool nodelay)
|
||||
{
|
||||
int flag = nodelay ? 1 : 0;
|
||||
setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(flag));
|
||||
return setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(flag));
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if WINDOWS_LIKE || !HAVE_POLL
|
||||
#if HAVE_POLL
|
||||
|
||||
#if HAVE_SYS_SELECT_H
|
||||
int
|
||||
CNetwork::poll(PollEntry fd[], int nfds, int timeout)
|
||||
{
|
||||
return ::poll(fd, nfds, timeout);
|
||||
}
|
||||
|
||||
#else // !HAVE_POLL
|
||||
|
||||
#if HAVE_SYS_SELECT_H && !WINDOWS_LIKE
|
||||
# include <sys/select.h>
|
||||
#endif
|
||||
#if HAVE_SYS_TIME_H
|
||||
|
|
@ -668,8 +844,8 @@ CNetwork::setnodelay(CNetwork::Socket s, bool nodelay)
|
|||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
int PASCAL FAR
|
||||
CNetwork::poll2(PollEntry fd[], int nfds, int timeout)
|
||||
int
|
||||
CNetwork::poll(PollEntry fd[], int nfds, int timeout)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -752,7 +928,7 @@ CNetwork::poll2(PollEntry fd[], int nfds, int timeout)
|
|||
return n;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // !HAVE_POLL
|
||||
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -19,13 +19,29 @@
|
|||
#include "CString.h"
|
||||
#include "stdvector.h"
|
||||
|
||||
#if !defined(HAVE_SOCKLEN_T)
|
||||
// Darwin is so unsure what to use for socklen_t it makes us choose
|
||||
# if defined(__APPLE__)
|
||||
# if !defined(_BSD_SOCKLEN_T_)
|
||||
# define _BSD_SOCKLEN_T_ int
|
||||
# endif
|
||||
# else
|
||||
typedef int socklen_t;
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if WINDOWS_LIKE
|
||||
// declare no functions in winsock2
|
||||
# define INCL_WINSOCK_API_PROTOTYPES 0
|
||||
# define INCL_WINSOCK_API_TYPEDEFS 0
|
||||
# include <winsock2.h>
|
||||
typedef int ssize_t;
|
||||
# define SELECT_TYPE_ARG1 int
|
||||
# define SELECT_TYPE_ARG234 (fd_set *)
|
||||
# define SELECT_TYPE_ARG5 (struct timeval *)
|
||||
#endif
|
||||
|
||||
#if UNIX_LIKE
|
||||
# if HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
# endif
|
||||
|
|
@ -35,21 +51,6 @@
|
|||
# if HAVE_POLL
|
||||
# include <sys/poll.h>
|
||||
# endif
|
||||
|
||||
#if WINDOWS_LIKE
|
||||
// declare no functions in winsock2
|
||||
# define INCL_WINSOCK_API_PROTOTYPES 0
|
||||
# define INCL_WINSOCK_API_TYPEDEFS 0
|
||||
# include <winsock2.h>
|
||||
typedef int ssize_t;
|
||||
#else
|
||||
# undef FAR
|
||||
# undef PASCAL
|
||||
# define FAR
|
||||
# define PASCAL
|
||||
#endif
|
||||
|
||||
#if UNIX_LIKE
|
||||
# include <netinet/in.h>
|
||||
# include <netdb.h>
|
||||
# include <errno.h>
|
||||
|
|
@ -73,7 +74,7 @@ public:
|
|||
typedef struct in_addr InternetAddress;
|
||||
#endif
|
||||
|
||||
#if WINDOWS_LIKE || !HAVE_POLL
|
||||
#if !HAVE_POLL
|
||||
class PollEntry {
|
||||
public:
|
||||
Socket fd;
|
||||
|
|
@ -220,95 +221,51 @@ public:
|
|||
|
||||
// socket interface (only available after init())
|
||||
|
||||
static Socket (PASCAL FAR *accept)(Socket s, Address FAR *addr, AddressLength FAR *addrlen);
|
||||
static int (PASCAL FAR *bind)(Socket s, const Address FAR *addr, AddressLength namelen);
|
||||
static int (PASCAL FAR *close)(Socket s);
|
||||
static int (PASCAL FAR *connect)(Socket s, const Address FAR *name, AddressLength namelen);
|
||||
static int (PASCAL FAR *ioctl)(Socket s, int cmd, void FAR *);
|
||||
static int (PASCAL FAR *getpeername)(Socket s, Address FAR *name, AddressLength FAR * namelen);
|
||||
static int (PASCAL FAR *getsockname)(Socket s, Address FAR *name, AddressLength FAR * namelen);
|
||||
static int (PASCAL FAR *getsockopt)(Socket s, int level, int optname, void FAR * optval, AddressLength FAR *optlen);
|
||||
static int PASCAL FAR inet_aton(const char FAR * cp, InternetAddress FAR * addr);
|
||||
static CString PASCAL FAR inet_ntoa(struct in_addr in);
|
||||
static int (PASCAL FAR *listen)(Socket s, int backlog);
|
||||
static ssize_t (PASCAL FAR *read)(Socket s, void FAR * buf, size_t len);
|
||||
static ssize_t (PASCAL FAR *recv)(Socket s, void FAR * buf, size_t len, int flags);
|
||||
static ssize_t (PASCAL FAR *recvfrom)(Socket s, void FAR * buf, size_t len, int flags, Address FAR *from, AddressLength FAR * fromlen);
|
||||
static int (PASCAL FAR *poll)(PollEntry[], int nfds, int timeout);
|
||||
static ssize_t (PASCAL FAR *send)(Socket s, const void FAR * buf, size_t len, int flags);
|
||||
static ssize_t (PASCAL FAR *sendto)(Socket s, const void FAR * buf, size_t len, int flags, const Address FAR *to, AddressLength tolen);
|
||||
static int (PASCAL FAR *setsockopt)(Socket s, int level, int optname, const void FAR * optval, AddressLength optlen);
|
||||
static int (PASCAL FAR *shutdown)(Socket s, int how);
|
||||
static Socket (PASCAL FAR *socket)(int af, int type, int protocol);
|
||||
static ssize_t (PASCAL FAR *write)(Socket s, const void FAR * buf, size_t len);
|
||||
static int (PASCAL FAR *gethostname)(char FAR * name, int namelen);
|
||||
static int PASCAL FAR gethostbyaddr(CHostInfo* hostinfo, const char FAR * addr, int len, int type);
|
||||
static int PASCAL FAR gethostbyname(CHostInfo* hostinfo, const char FAR * name);
|
||||
static int PASCAL FAR getservbyport(CServiceInfo* servinfo, int port, const char FAR * proto);
|
||||
static int PASCAL FAR getservbyname(CServiceInfo* servinfo, const char FAR * name, const char FAR * proto);
|
||||
static int PASCAL FAR getprotobynumber(CProtocolInfo* protoinfo, int proto);
|
||||
static int PASCAL FAR getprotobyname(CProtocolInfo* protoinfo, const char FAR * name);
|
||||
static int (PASCAL FAR *getsockerror)(void);
|
||||
static Socket accept(Socket s, Address* addr, AddressLength* addrlen);
|
||||
static int bind(Socket s, const Address* addr, AddressLength namelen);
|
||||
static int close(Socket s);
|
||||
static int connect(Socket s, const Address* name, AddressLength namelen);
|
||||
static int gethostname(char* name, int namelen);
|
||||
static int getpeername(Socket s, Address* name, AddressLength* namelen);
|
||||
static int getsockerror(void);
|
||||
static int getsockname(Socket s, Address* name, AddressLength* namelen);
|
||||
static int getsockopt(Socket s, int level, int optname, void* optval, AddressLength* optlen);
|
||||
static int inet_aton(const char* cp, InternetAddress* addr);
|
||||
static CString inet_ntoa(struct in_addr in);
|
||||
static int ioctl(Socket s, int cmd, void* );
|
||||
static int listen(Socket s, int backlog);
|
||||
static int poll(PollEntry[], int nfds, int timeout);
|
||||
static ssize_t read(Socket s, void* buf, size_t len);
|
||||
static ssize_t recv(Socket s, void* buf, size_t len, int flags);
|
||||
static ssize_t recvfrom(Socket s, void* buf, size_t len, int flags, Address* from, AddressLength* fromlen);
|
||||
static ssize_t send(Socket s, const void* buf, size_t len, int flags);
|
||||
static ssize_t sendto(Socket s, const void* buf, size_t len, int flags, const Address* to, AddressLength tolen);
|
||||
static int setsockopt(Socket s, int level, int optname, const void* optval, AddressLength optlen);
|
||||
static int shutdown(Socket s, int how);
|
||||
static Socket socket(int af, int type, int protocol);
|
||||
static ssize_t write(Socket s, const void* buf, size_t len);
|
||||
static int gethostbyaddr(CHostInfo* hostinfo, const char* addr, int len, int type);
|
||||
static int gethostbyname(CHostInfo* hostinfo, const char* name);
|
||||
static int getservbyport(CServiceInfo* servinfo, int port, const char* proto);
|
||||
static int getservbyname(CServiceInfo* servinfo, const char* name, const char* proto);
|
||||
static int getprotobynumber(CProtocolInfo* protoinfo, int proto);
|
||||
static int getprotobyname(CProtocolInfo* protoinfo, const char* name);
|
||||
|
||||
// convenience functions (only available after init())
|
||||
|
||||
//! Set socket to (non-)blocking operation
|
||||
static int PASCAL FAR setblocking(CNetwork::Socket s, bool blocking);
|
||||
static int setblocking(Socket s, bool blocking);
|
||||
|
||||
//! Turn Nagle algorithm on or off on socket
|
||||
/*!
|
||||
Set socket to send messages immediately (true) or to collect small
|
||||
messages into one packet (false).
|
||||
*/
|
||||
static int PASCAL FAR setnodelay(CNetwork::Socket s, bool nodelay);
|
||||
static int setnodelay(Socket s, bool nodelay);
|
||||
|
||||
private:
|
||||
#if WINDOWS_LIKE
|
||||
#define SELECT_TYPE_ARG1 int
|
||||
#define SELECT_TYPE_ARG234 (fd_set *)
|
||||
#define SELECT_TYPE_ARG5 (struct timeval *)
|
||||
static void init2(HMODULE);
|
||||
static ssize_t PASCAL FAR read2(Socket s, void FAR * buf, size_t len);
|
||||
static ssize_t PASCAL FAR write2(Socket s, const void FAR * buf, size_t len);
|
||||
static int (PASCAL FAR *WSACleanup)(void);
|
||||
static int (PASCAL FAR *__WSAFDIsSet)(CNetwork::Socket, fd_set FAR *);
|
||||
static int (PASCAL FAR *select)(int nfds, fd_set FAR *readfds, fd_set FAR *writefds, fd_set FAR *exceptfds, const struct timeval FAR *timeout);
|
||||
static char FAR * (PASCAL FAR *inet_ntoa_n)(struct in_addr in);
|
||||
static unsigned long (PASCAL FAR *inet_addr_n)(const char FAR * cp);
|
||||
static struct hostent FAR * (PASCAL FAR *gethostbyaddr_n)(const char FAR * addr, int len, int type);
|
||||
static struct hostent FAR * (PASCAL FAR *gethostbyname_n)(const char FAR * name);
|
||||
static struct servent FAR * (PASCAL FAR *getservbyport_n)(int port, const char FAR * proto);
|
||||
static struct servent FAR * (PASCAL FAR *getservbyname_n)(const char FAR * name, const char FAR * proto);
|
||||
static struct protoent FAR * (PASCAL FAR *getprotobynumber_n)(int proto);
|
||||
static struct protoent FAR * (PASCAL FAR *getprotobyname_n)(const char FAR * name);
|
||||
#endif
|
||||
|
||||
#if UNIX_LIKE
|
||||
static int PASCAL FAR gethostname2(char FAR * name, int namelen);
|
||||
static int PASCAL FAR getsockerror2(void);
|
||||
#endif
|
||||
|
||||
#if WINDOWS_LIKE || UNIX_LIKE
|
||||
/* FIXME -- reentrant netdb stuff
|
||||
create classes for hostent, servent, protoent.
|
||||
each class can clean itself up automatically.
|
||||
inside CNetwork we'll convert from netdb structs to classes.
|
||||
clients will pass a class pointer which CNetwork will assign to (or swap into).
|
||||
won't need free...() functions to clean up structs.
|
||||
each class should know how to copy from respective netdb struct.
|
||||
will need to fix CNetworkAddress to use classes.
|
||||
*/
|
||||
static void copyhostent(struct hostent FAR * dst, const struct hostent FAR * src);
|
||||
static void copyservent(struct servent FAR * dst, const struct servent FAR * src);
|
||||
static void copyprotoent(struct protoent FAR * dst, const struct protoent FAR * src);
|
||||
|
||||
static void freehostent(struct hostent FAR * ent);
|
||||
static void freeservent(struct servent FAR * ent);
|
||||
static void freeprotoent(struct protoent FAR * ent);
|
||||
#endif
|
||||
|
||||
#if WINDOWS_LIKE || !HAVE_POLL
|
||||
static int PASCAL FAR poll2(PollEntry[], int nfds, int timeout);
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ CUnixPlatform::uninstallDaemon(const char*, bool)
|
|||
int
|
||||
CUnixPlatform::daemonize(const char* name, DaemonFunc func)
|
||||
{
|
||||
#if HAVE_WORKING_FORK
|
||||
// fork so shell thinks we're done and so we're not a process
|
||||
// group leader
|
||||
switch (fork()) {
|
||||
|
|
@ -71,7 +70,6 @@ CUnixPlatform::daemonize(const char* name, DaemonFunc func)
|
|||
// parent exits
|
||||
exit(0);
|
||||
}
|
||||
#endif
|
||||
|
||||
// become leader of a new session
|
||||
setsid();
|
||||
|
|
|
|||
Loading…
Reference in New Issue