hg/stx-libbasic2: comparison Socket.st

equal deleted inserted replaced

-:11e10753a2a9
+:fbced69597a7
 #ifdef __MINGW__
 # include <stdio.h>
 #endif
 #include "stxOSDefs.h"
-#ifdef WIN32
+#ifdef __win32__
 //#define DEBUG 1
 /* this is to catch uses of those - there should be none */
 # undef __BEGIN_INTERRUPTABLE__
 # undef __END_INTERRUPTABLE__
 # ifdef __TCC__
 # if 0 && (defined( __BORLANDC__ ) || defined( __MINGW__ ))
 #  define SOCKET_FROM_FD(fd)               (SOCKET)(_get_osfhandle(fd))
 # else
 #  define SOCKET_FROM_FD(fd)               (SOCKET)(fd)
 # endif
-#else /* not WIN32 */
+#else /* not __win32__ */
 # define SOCKET_FROM_FD(fd)   (fd)
 # define closesocket(sock)    close(sock)
 # define SOCKET               int
-#endif /* ! WIN32 */
+#endif /* ! __win32__ */
 #define SOCKET_FROM_FILE(f)             (SOCKET_FROM_FD(fileno(f)))
 #define SOCKET_FROM_FILE_OBJECT(f)      (__INST(handleType) == @symbol(socketHandle) ? SOCKET_FROM_FD(__FILEVal(f)) : SOCKET_FROM_FILE(__FILEVal(f)))
 #ifndef __MINGW__
 # define TRUE   1
 #endif
 #ifndef FALSE
 # define FALSE  0
 #endif
-#ifndef WIN32
+#ifndef __win32__
 typedef int BOOL;
 #endif
-#ifdef WIN32
+#ifdef __win32__
 # undef stdout
 # undef stderr
 # define stdout __win32_stdout()
 # define stderr __win32_stderr()
 #endif
 # else
 errno = 0;
 ret = bind(sock, (struct sockaddr *)&sa, sockaddr_size);
 # endif
 if (ret < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	if (errno == 0) {
 	    errno = WSAGetLastError();
 	}
 # endif
 	DBGPRINTF(("SOCKET: bind failed errno=%d\n", errno));
 errno = 0;
 ret = listen(sock, __intVal(aNumber));
 #endif
 if (ret < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	if (errno == 0) {
 	    errno = WSAGetLastError();
 	}
 # endif
 	DBGPRINTF(("SOCKET: listen call failed errno=%d\n", errno));
 	memcpy(&sa, __byteArrayVal(aSocketAddress) + sockAddrOffs, sockaddr_size);
 }
 sock = SOCKET_FROM_FILE_OBJECT(fp);
-#ifdef WIN32
+#ifdef __win32__
 ioctlsocket(sock, FIONBIO, &on);
 #elif defined(O_NONBLOCK)
 /*
 * set to non-blocking and wait later
 */
 }
 // __setWrapCallDebugging(1,0);
 # else // !DO_WRAP_CALLS
-#  if !defined(WIN32) && !defined(O_NONBLOCK)
+#  if !defined(__win32__) && !defined(O_NONBLOCK)
 __BEGIN_INTERRUPTABLE__
 #  endif
 do {
 	ret = connect(sock, (struct sockaddr *)&sa, sockaddr_size);
 } while ((ret < 0)
-#  ifdef WIN32
+#  ifdef __win32__
 	     && (errno = WSAGetLastError())
 #  endif
 	     && ((errno == EINTR)
 #  ifdef EAGAIN
 		 || (errno == EAGAIN)
 #  endif
 		));
-#  if !defined(WIN32) && !defined(O_NONBLOCK)
+#  if !defined(__win32__) && !defined(O_NONBLOCK)
 __END_INTERRUPTABLE__
 #  endif
 #endif
-#if defined(WIN32) && !defined(EINPROGRESS)
+#if defined(__win32__) && !defined(EINPROGRESS)
 # define EINPROGRESSS WSAEINPROGRESSS
 # define EALREADY WSAEALREADY
 #endif
 if (ret < 0) {
 # if defined(EINPROGRESS) || defined(EALREADY)
 	if (0
-#  ifdef WIN32
+#  ifdef __win32__
 	    || (errno == WSAEWOULDBLOCK)
 #  endif
 #  ifdef EINPROGRESS
 	    || (errno == EINPROGRESS)
 #  endif
 # endif
 	    err = __MKSMALLINT(errno);
 	}
 }
-# ifdef WIN32
+# ifdef __win32__
 {
 	int off = 0;
 	ioctlsocket(sock, FIONBIO, &off);
 }
 # elif defined(O_NONBLOCK) // Linux / Unix
 	}
 	// whether the close() will be successful or not - the handle is invalid now!
 	__INST(handle) = nil;
 	do {
-#ifdef WIN32
+#ifdef __win32__
 	    rslt = __STX_WSA_NOINT_CALL1("closesocket", closesocket, socket);
 #else
 	    rslt = close(socket);
 #endif
 	} while((rslt < 0) && (__threadErrno == EINTR));
 	SOCKET sock;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	sz = sizeof(err);
 	if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *)(&err), &sz) < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	    errno = WSAGetLastError();
 # endif
 	    err = errno;
 	}
 }
 SOCKET serverSocket, newSock;
 int _fd;
 union sockaddr_u sa;
 unsigned int alen;
-#ifdef WIN32
+# ifdef __win32__
 serverSocket = SOCKET_FROM_FILE_OBJECT(serverSocketHandle);
-#else
+# else
 serverSocket = __intVal(serverSocketHandle);
-#endif
+# endif
 # if defined(O_NONBLOCK) && defined(SET_NDELAY)
 if (blocking == false) {
 	flags = fcntl(serverSocket, F_GETFL);
 	fcntl(serverSocket, F_SETFL, flags | O_NONBLOCK);
 }
 /*
 * make it a FILE *
 */
-# ifdef WIN32
+# ifdef __win32__
 #  if 0 && (defined( __BORLANDC__ ) || defined( __MINGW__ ))
 __stxWrapApiEnterCritical();
 _fd = _open_osfhandle((long)newSock, 0);
 __stxWrapApiLeaveCritical();
 DBGPRINTF(("SOCKET: sock=%d fd=%d\n", newSock, _fd));
 #  else
 _fd = (int)newSock;
 #  endif
-# else // ! WIN32
+# else // ! __win32__
 fp = fdopen(newSock, "r+");
 if (! fp) {
 	DBGPRINTF(("SOCKET: fdopen call failed\n"));
 	__INST(lastErrorNumber) = __MKSMALLINT(errno);
 	closesocket(newSock);
 	DBGFPRINTF((stderr, "SOCKET: close (fdopen failed) (%d)\n", newSock));
 	RETURN (false);
 }
-# endif // ! WIN32
+# endif // ! __win32__
 if ((@global(FileOpenTrace) == true) || __debugging__) {
-# ifdef WIN32
+# ifdef __win32__
 	console_fprintf(stderr, "fdopen [Socket accept] -> fd: %d (H: %"_lx_")\n", _fd, (INT)newSock);
 # else
 	console_fprintf(stderr, "fdopen [Socket accept] -> %"_lx_" (fd: %d)\n", (INT)fp, newSock);
 # endif
 }
-# ifdef WIN32
+# ifdef __win32__
 __externalAddressVal(newHandle) = _fd;
 __INST(handleType) = @symbol(socketHandle);
 # else
 __externalAddressVal(newHandle) = fp;
 __INST(handleType) = @symbol(socketFilePointer);
 	    u.u_tv.tv_usec = __intVal(arg2);
 	    usize = sizeof(u.u_tv);
 	}
 # endif /* SO_SNDTIMEO */
-# if !defined(IPV6_V6ONLY) && defined(WIN32)
+# if !defined(IPV6_V6ONLY) && defined(__win32__)
 #  define IPPROTO_IPV6 41
 #  define IPV6_V6ONLY 27
 # endif
 # if defined(IPV6_V6ONLY)
 	    level = IPPROTO_IPV6;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
 	    else if (arg1 == false) u.u_bool = FALSE;
 	    else goto argError;
-#  ifdef WIN32
+#  ifdef __win32__
 	    console_fprintf(stderr, "%d %d %d %d\n", level, opt, usize, u.u_int);
 #  endif
 	}
 # endif /* IPV6_V6ONLY */
 	if (usize == -1) goto argError;
 	ok = (setsockopt(sock, level, opt, (char *)&u, usize) >= 0) ? true : false;
-	# ifdef WIN32
 	if (ok == false) {
-#  ifdef WIN32
+# ifdef __win32__
 	    error = __mkSmallInteger(WSAGetLastError());
-#  else
+# else
 	    error = __mkSmallInteger(errno);
-#  endif
-	}
 # endif
+	}
 }
 argError: ;
 #endif /* NO_SOCKET */
 %}.
 addrObjSize = __qSize(addr) - nAddrInstBytes;
 sock = SOCKET_FROM_FILE_OBJECT(fp);
 ret = getpeername(sock, (struct sockaddr *)&sa, &alen);
 if (ret < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	errno = WSAGetLastError();
 # endif
 	DBGPRINTF(("SOCKET: getsocketname failed ret=%d errno=%d\n", ret, errno));
 	error = __MKSMALLINT(errno);
 	goto err;
 }
 sock = SOCKET_FROM_FILE_OBJECT(fp);
 ret = getsockname(sock, (struct sockaddr *)&sa, &alen);
 if (ret < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	errno = WSAGetLastError();
 # endif
 	DBGPRINTF(("SOCKET: getsocketname failed ret=%d errno=%d\n", ret, errno));
 	error = __MKSMALLINT(errno);
 	goto err;
 int dom, typ, proto = 0;
 int on = 1;
 SOCKET sock;
 int _fd;
-# ifdef WIN32
+# ifdef __win32__
 #  ifndef WSA_FLAG_NO_HANDLE_INHERIT
 #   define WSA_FLAG_NO_HANDLE_INHERIT 0x80
 #  endif
 static int noInheritFlag = WSA_FLAG_NO_HANDLE_INHERIT;
 # endif
 * get address and protocol-family
 */
 dom = __intVal(domainCode);
 typ = __intVal(typeCode);
-# ifdef WIN32
+# ifdef __win32__
 sock = WSASocket(dom, typ, proto, 0, 0, noInheritFlag);
 if (sock == INVALID_SOCKET && noInheritFlag) {
 	// tried to open socket with WSA_FLAG_NO_HANDLE_INHERIT
 	// This fails on older windows versions, e.g. Windows XP
 	sock = WSASocket(dom, typ, proto, 0, 0, 0);
 	}
 }
 if (sock == INVALID_SOCKET) {
 	errno = WSAGetLastError();
-# else  // !WIN32
+# else  // !__win32__
 sock = socket(dom, typ, proto);
 # if defined(EPROTONOSUPPORT) /* for SGI */
 if ((sock < 0) && (proto != 0) && (errno == EPROTONOSUPPORT)) {
 	DBGPRINTF(("SOCKET: retry with UNSPEC protocol\n"));
 	proto = 0;
 	sock = socket(dom, typ, 0);
 }
 # endif
 if (sock < 0) {
-# endif // !WIN32
+# endif // !__win32__
 	DBGPRINTF(("SOCKET: socket(dom=%d typ=%d proto=%d) call failed errno=%d\n", dom, typ, proto, errno));
 	error = __MKSMALLINT(errno);
 } else {
 # if defined(SET_LINGER_WHEN_CREATING_SOCKET) && defined(SO_LINGER)
 	    l.l_onoff = 1;
 	    l.l_linger = 30;
 	    setsockopt( sock, SOL_SOCKET, SO_LINGER, &l, sizeof(l));
 	}
 # endif
-# ifdef WIN32
+# ifdef __win32__
 	/*
 	 * make it blocking
 	 */
 	{
 	    unsigned long zero = 0;
 #  else
 	    _fd = (int)sock;
 #  endif
 	    DBGPRINTF(("SOCKET: sock=%d fd=%d\n", sock, _fd));
 	}
-# else  // !WIN32
+# else  // !__win32__
 	fp = fdopen(sock, "r+");
 	if (! fp) {
 	    DBGPRINTF(("SOCKET: fdopen call failed\n"));
 	    error = __MKSMALLINT(errno);
 	    __BEGIN_INTERRUPTABLE__
 	    closesocket(sock);
 	    DBGFPRINTF((stderr, "SOCKET: fdopen failed (%d)\n", sock));
 	    __END_INTERRUPTABLE__
 	    goto out;
 	}
-# endif // !WIN32
+# endif // !__win32__
 	if (@global(FileOpenTrace) == true) {
-# ifdef WIN32
+# ifdef __win32__
 	    console_fprintf(stderr, "fdopen [Socket create] -> fd: %d (H: %"_lx_")\n", (INT)_fd, (INT)sock);
 # else
 	    console_fprintf(stderr, "fdopen [Socket] -> %"_lx_" (fd: %d)\n", (INT)fp, sock);
 # endif
 	}
-# ifdef WIN32
+# ifdef __win32__
 	__externalAddressVal(newHandle) = _fd;
 	__INST(handleType) = @symbol(socketHandle);
 # else
 	__externalAddressVal(newHandle) = fp;
 	__INST(handleType) = @symbol(socketFilePointer);

changeset 3843	fbced69597a7
parent 3742	a12020350fa0
child 3844	69a954c0be09
child 3985	f4df11cffecf