diff options
Diffstat (limited to 'X11/xtrans')
-rwxr-xr-x[-rw-r--r--] | X11/xtrans/Xtrans.c | 11 | ||||
-rw-r--r-- | X11/xtrans/Xtransint.h | 7 | ||||
-rw-r--r-- | X11/xtrans/Xtranslcl.c | 6 | ||||
-rw-r--r-- | X11/xtrans/Xtranssock.c | 61 |
4 files changed, 55 insertions, 30 deletions
diff --git a/X11/xtrans/Xtrans.c b/X11/xtrans/Xtrans.c index 28808030c..b373cc417 100644..100755 --- a/X11/xtrans/Xtrans.c +++ b/X11/xtrans/Xtrans.c @@ -48,12 +48,16 @@ from The Open Group. */ #include <ctype.h> +#include <unistd.h> #include <stdlib.h> #include <string.h> #ifdef HAVE_SYSTEMD_DAEMON #include <systemd/sd-daemon.h> #endif +#ifdef _MSC_VER +#include <X11\Xwinsock.h> +#endif /* * The transport table contains a definition for every transport (protocol) * family. All operations that can be made on the transport go through this @@ -113,9 +117,10 @@ Xtransport_table Xtransports[] = { { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, #endif /* __SCO__ || __UNIXWARE__ */ #endif /* LOCALCONN */ + { NULL, 0} }; -#define NUMTRANS (sizeof(Xtransports)/sizeof(Xtransport_table)) +#define NUMTRANS (sizeof(Xtransports)/sizeof(Xtransport_table)-1) #ifdef WIN32 @@ -701,7 +706,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) #if defined(WIN32) { #ifdef WIN32 - u_long arg; + unsigned long arg; #else int arg; #endif @@ -929,7 +934,6 @@ TRANS(Writev) (XtransConnInfo ciptr, struct iovec *buf, int size) return ciptr->transptr->Writev (ciptr, buf, size); } -#if XTRANS_SEND_FDS int TRANS(SendFd) (XtransConnInfo ciptr, int fd, int do_close) { @@ -941,7 +945,6 @@ TRANS(RecvFd) (XtransConnInfo ciptr) { return ciptr->transptr->RecvFd(ciptr); } -#endif int TRANS(Disconnect) (XtransConnInfo ciptr) diff --git a/X11/xtrans/Xtransint.h b/X11/xtrans/Xtransint.h index 5ff824de0..edd53254c 100644 --- a/X11/xtrans/Xtransint.h +++ b/X11/xtrans/Xtransint.h @@ -287,7 +287,6 @@ typedef struct _Xtransport { int /* size */ ); -#if XTRANS_SEND_FDS int (*SendFd)( XtransConnInfo, /* connection */ int, /* fd */ @@ -297,7 +296,6 @@ typedef struct _Xtransport { int (*RecvFd)( XtransConnInfo /* connection */ ); -#endif int (*Disconnect)( XtransConnInfo /* connection */ @@ -413,6 +411,11 @@ static int trans_mkdir ( # if defined(XSERV_t) && defined(TRANS_SERVER) # include "os.h" # else + +#ifdef _MSC_VER +#define inline __inline +#endif + static inline void _X_ATTRIBUTE_PRINTF(1, 0) VErrorF(const char *f, va_list args) { diff --git a/X11/xtrans/Xtranslcl.c b/X11/xtrans/Xtranslcl.c index 3217506c3..ee4bcd926 100644 --- a/X11/xtrans/Xtranslcl.c +++ b/X11/xtrans/Xtranslcl.c @@ -72,17 +72,23 @@ from The Open Group. #include <errno.h> #include <ctype.h> +#ifdef _MSC_VER +#include <signal.h> +#else #include <sys/signal.h> #include <sys/ioctl.h> +#endif #include <sys/stat.h> #if defined(SVR4) || defined(__SVR4) #include <sys/filio.h> #endif +#ifndef _MSC_VER #ifdef sun # include <stropts.h> #else # include <sys/stropts.h> #endif +#endif #include <sys/wait.h> #include <sys/types.h> diff --git a/X11/xtrans/Xtranssock.c b/X11/xtrans/Xtranssock.c index d830e7c6c..c71b4cae4 100644 --- a/X11/xtrans/Xtranssock.c +++ b/X11/xtrans/Xtranssock.c @@ -129,11 +129,15 @@ from the copyright holders. #include <X11/Xw32defs.h> #undef close #define close closesocket +#undef ECONNREFUSED #define ECONNREFUSED WSAECONNREFUSED +#undef EADDRINUSE #define EADDRINUSE WSAEADDRINUSE +#undef EPROTOTYPE #define EPROTOTYPE WSAEPROTOTYPE #undef EWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK +#undef EINPROGRESS #define EINPROGRESS WSAEINPROGRESS #undef EINTR #define EINTR WSAEINTR @@ -242,13 +246,20 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr); #endif #if defined HAVE_SOCKLEN_T || (defined(IPv6) && defined(AF_INET6)) +#ifdef _MSC_VER +# define SOCKLEN_T int +#else # define SOCKLEN_T socklen_t +#endif #elif defined(SVR4) || defined(__SVR4) || defined(__SCO__) # define SOCKLEN_T size_t #else # define SOCKLEN_T int #endif +static int TRANS(SocketRecvFdInvalid)(XtransConnInfo ciptr); +static int TRANS(SocketSendFdInvalid)(XtransConnInfo ciptr, int fd, int do_close); + /* * These are some utility function used by the real interface function below. */ @@ -661,7 +672,7 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol, if (Sockettrans2devtab[i].family == AF_INET6) { int one = 1; - setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(int)); + setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&one, sizeof(int)); } #endif /* Save the index for later use */ @@ -746,7 +757,7 @@ TRANS(SocketOpenCLTSServer) (Xtransport *thistrans, const char *protocol, if (Sockettrans2devtab[i].family == AF_INET6) { int one = 1; - setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(int)); + setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&one, sizeof(int)); } #endif /* Save the index for later use */ @@ -871,6 +882,10 @@ set_sun_path(const char *port, const char *upath, char *path, int abstract) #ifdef TRANS_SERVER +#ifndef SO_BINDRETRYCOUNT +#define SO_BINDRETRYCOUNT 20 +#endif + static int TRANS(SocketCreateListener) (XtransConnInfo ciptr, struct sockaddr *sockname, @@ -888,7 +903,7 @@ TRANS(SocketCreateListener) (XtransConnInfo ciptr, || Sockettrans2devtab[ciptr->index].family == AF_INET6 #endif ) - retry = 20; + retry = SO_BINDRETRYCOUNT; else retry = 0; @@ -1269,7 +1284,11 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status) { XtransConnInfo newciptr; +#if defined(IPv6) && defined(AF_INET6) + struct sockaddr_storage sockname; +#else struct sockaddr_in sockname; +#endif SOCKLEN_T namelen = sizeof(sockname); prmsg (2, "SocketINETAccept(%p,%d)\n", ciptr, ciptr->fd); @@ -2205,6 +2224,15 @@ TRANS(SocketSendFd) (XtransConnInfo ciptr, int fd, int do_close) return 0; } +#define MAX_FDS 128 + +union fd_pass { + struct cmsghdr cmsghdr; + char buf[CMSG_SPACE(MAX_FDS * sizeof(int))]; +}; + +#endif /* XTRANS_SEND_FDS */ + static int TRANS(SocketRecvFdInvalid)(XtransConnInfo ciptr) { @@ -2219,15 +2247,6 @@ TRANS(SocketSendFdInvalid)(XtransConnInfo ciptr, int fd, int do_close) return -1; } -#define MAX_FDS 128 - -union fd_pass { - struct cmsghdr cmsghdr; - char buf[CMSG_SPACE(MAX_FDS * sizeof(int))]; -}; - -#endif /* XTRANS_SEND_FDS */ - static int TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size) @@ -2538,10 +2557,8 @@ Xtransport TRANS(SocketTCPFuncs) = { TRANS(SocketWrite), TRANS(SocketReadv), TRANS(SocketWritev), -#if XTRANS_SEND_FDS - TRANS(SocketSendFdInvalid), - TRANS(SocketRecvFdInvalid), -#endif + TRANS(SocketSendFdInvalid), + TRANS(SocketRecvFdInvalid), TRANS(SocketDisconnect), TRANS(SocketINETClose), TRANS(SocketINETClose), @@ -2582,10 +2599,8 @@ Xtransport TRANS(SocketINETFuncs) = { TRANS(SocketWrite), TRANS(SocketReadv), TRANS(SocketWritev), -#if XTRANS_SEND_FDS - TRANS(SocketSendFdInvalid), - TRANS(SocketRecvFdInvalid), -#endif + TRANS(SocketSendFdInvalid), + TRANS(SocketRecvFdInvalid), TRANS(SocketDisconnect), TRANS(SocketINETClose), TRANS(SocketINETClose), @@ -2627,10 +2642,8 @@ Xtransport TRANS(SocketINET6Funcs) = { TRANS(SocketWrite), TRANS(SocketReadv), TRANS(SocketWritev), -#if XTRANS_SEND_FDS - TRANS(SocketSendFdInvalid), - TRANS(SocketRecvFdInvalid), -#endif + TRANS(SocketSendFdInvalid), + TRANS(SocketRecvFdInvalid), TRANS(SocketDisconnect), TRANS(SocketINETClose), TRANS(SocketINETClose), |