hg/stx-libbasic2: comparison Socket.st

equal deleted inserted replaced

-:65fa153f17aa
+:c0e89dcb58b3
 #endif /* WIN32 */
 # define SOCKET_FROM_FILE(f)             (SOCKET_FROM_FD(fileno(f)))
 # define SOCKET_FROM_FILE_OBJECT(f)      (SOCKET_FROM_FILE(__FILEVal(f)))
 #ifndef WIN32
 # define closesocket(sock)    close(sock)
+# define SOCKET               int
 #endif
 #include <stdio.h>
 #include <errno.h>
 |nReceived|
 %{
 #ifndef NO_SOCKET
 OBJ fp = __INST(filePointer);
-int objSize, offs;
-int sock;
-int n;
-char *extPtr;
-unsigned char *buffer;
-unsigned char *allocatedBuffer;
-int flags = 0;
 if (fp != nil) {
+	SOCKET sock;
+	int objSize, offs;
+	int n;
+	char *extPtr;
+	unsigned char *buffer;
+	unsigned char *allocatedBuffer;
+	int flags = 0;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	if (! setupBufferParameters(aDataBuffer, startIndex, &extPtr, &offs, &objSize)) goto bad;
 	if (__isSmallInteger(nBytes)) {
 	    if (__intVal(nBytes) < objSize) {
 	    allocatedBuffer = buffer = (char *)malloc(objSize);
 	}
 	do {
 	    __threadErrno = 0;
-	    n = STX_API_CALL4("recv", recv, sock, buffer, objSize, flags);
+	    n = STX_WSA_CALL4("recv", recv, sock, buffer, objSize, flags);
 	} while ((n < 0) && (__threadErrno == EINTR));
 	if (allocatedBuffer) {
 	    if (n > 0) {
 		bcopy(allocatedBuffer, (char *)__InstPtr(aDataBuffer) + offs, n);
 ].
 %{
 #ifndef NO_SOCKET
 OBJ fp = __INST(filePointer);
-int objSize;
-int sock;
-union sockaddr_u sa;
-int alen = 0;
-int n, offs;
-int flags = 0;
-char *extPtr;
-unsigned char *allocatedBuffer = NULL;
-unsigned char *buffer = NULL;
 if (fp != nil) {
+	SOCKET sock;
+	int objSize;
+	union sockaddr_u sa;
+	int alen = 0;
+	int n, offs;
+	int flags = 0;
+	char *extPtr;
+	unsigned char *allocatedBuffer = NULL;
+	unsigned char *buffer = NULL;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	if (! setupBufferParameters(aDataBuffer, startIndex, &extPtr, &offs, &objSize)) goto bad;
 	if (__isSmallInteger(nBytes)) {
 	    if (__intVal(nBytes) < objSize) {
 	}
 	do {
 	    __threadErrno = 0;
 	    alen = sizeof(sa);
-	    n = STX_API_CALL6("recvfrom", recvfrom, sock, buffer, objSize, flags, (struct sockaddr *)&sa, &alen);
+	    n = STX_WSA_CALL6("recvfrom", recvfrom, sock, buffer, objSize, flags, (struct sockaddr *)&sa, &alen);
 	} while ((n < 0) && (__threadErrno == EINTR));
 	if (allocatedBuffer) {
 	    if (n > 0) {
 		bcopy(allocatedBuffer, (char *)__InstPtr(aDataBuffer) + offs, n);
 |nReceived portNo|
 %{
 #ifndef NO_SOCKET
-OBJ oClass;
 OBJ fp = __INST(filePointer);
-int objSize;
-int sock;
-int n;
-char *extPtr;
-int _flags = 0;
-int offs;
-unsigned long norder;
-unsigned char *buffer;
-unsigned char *allocatedBuffer;
 if ((fp != nil)
 && __isSmallInteger(startIndex)
 && __isSmallInteger(nBytes)) {
+	SOCKET sock;
+	int objSize;
+	int n;
+	char *extPtr;
+	int _flags = 0;
+	int offs;
+	unsigned long norder;
+	unsigned char *buffer;
+	unsigned char *allocatedBuffer;
 	_flags = __longIntVal(flags);
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	if (! setupBufferParameters(aDataBuffer, startIndex, &extPtr, &offs, &objSize)) goto bad;
 	    bcopy((char *)__InstPtr(aDataBuffer) + offs, allocatedBuffer, objSize);
 	}
 	do {
 	    __threadErrno = 0;
-	    n = STX_API_CALL4("send", send, sock, buffer, objSize, _flags);
+	    n = STX_WSA_CALL4("send", send, sock, buffer, objSize, _flags);
 	} while ((n < 0) && (__threadErrno == EINTR));
 	if (allocatedBuffer) {
 	    free(allocatedBuffer);
 	}
 	].
 	addr := domainClass hostAddress:anAddressBuffer.
 ].
 %{
 #ifndef NO_SOCKET
-OBJ oClass;
 OBJ fp = __INST(filePointer);
-int objSize;
-struct sockaddr *sockaddr_ptr;
-union sockaddr_u sa;
-int alen = 0;
-int sockAddrOffs, sockaddr_size;
-int sock;
-int n;
-char *extPtr;
-int _flags = 0;
-int offs;
-unsigned long norder;
-unsigned char *buffer;
-unsigned char *allocatedBuffer;
 if ((fp != nil)
 && __isSmallInteger(startIndex)
 && __isSmallInteger(nBytes)) {
+	SOCKET sock;
+	int objSize;
+	struct sockaddr *sockaddr_ptr;
+	union sockaddr_u sa;
+	int alen = 0;
+	int sockAddrOffs, sockaddr_size;
+	int n;
+	char *extPtr;
+	int _flags = 0;
+	int offs;
+	unsigned long norder;
+	unsigned char *buffer;
+	unsigned char *allocatedBuffer;
 	_flags = __longIntVal(flags);
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	if (! __isBytes(addr)) {
 	    sockaddr_size = 0;
 	    bcopy((char *)__InstPtr(aDataBuffer) + offs, allocatedBuffer, objSize);
 	}
 	do {
 	    __threadErrno = 0;
-	    n = STX_API_CALL6("sendto", sendto, sock, buffer, objSize, _flags, sockaddr_ptr, sockaddr_size);
+	    n = STX_WSA_CALL6("sendto", sendto, sock, buffer, objSize, _flags, sockaddr_ptr, sockaddr_size);
 	} while ((n < 0) && (__threadErrno == EINTR));
 	if (allocatedBuffer) {
 	    free(allocatedBuffer);
 	}
 ].
 %{  /* STACK: 100000 */
 #ifndef NO_SOCKET
 OBJ fp = __INST(filePointer);
-int sock;
-union sockaddr_u sa;
-int sockaddr_size;
-int ret;
-int sockAddrOffs;
 if (! __isBytes(addr)) {
 	addr = nil;
 	fprintf(stderr, "Socket: bad sddr\n");
 	RETURN (false);
 }
 if (fp != nil) {
+	SOCKET sock;
+	union sockaddr_u sa;
+	int sockaddr_size;
+	int ret;
+	int sockAddrOffs;
 	{
 	    int nIndex;
 	    OBJ cls;
 	    sockAddrOffs = 0;
 		DBGPRINTF(("SOCKET: setsockopt - SO_REUSEADDR failed\n"));
 	    }
 	}
 # endif /* SO_REUSEADDR */
-# ifdef DO_WRAP_CALLS
+# ifdef BIND_BLOCKS
+#  ifdef DO_WRAP_CALLS
 	do {
 	    __threadErrno = 0;
-	    ret = STX_API_CALL3("bind", bind, sock, &sa, sockaddr_size);
+	    ret = STX_WSA_CALL3("bind", bind, sock, &sa, sockaddr_size);
 	} while ((ret < 0) && (__threadErrno == EINTR));
-# else
+#  else
 	__BEGIN_INTERRUPTABLE__
 	do {
 	    ret = bind(sock, (struct sockaddr *)&sa, sockaddr_size);
 	} while ((ret < 0) && (errno == EINTR));
 	__END_INTERRUPTABLE__
+#  endif
+# else
+	ret = bind(sock, (struct sockaddr *)&sa, sockaddr_size);
 # endif
 	if (ret < 0) {
 	    DBGPRINTF(("SOCKET: bind failed errno=%d\n", errno));
 	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    RETURN (false);
 %{  /* STACK: 32000 */
 OBJ fp = __INST(filePointer);
 if (fp != nil) {
-	int    sock;
+	SOCKET sock;
 	int opt = -1;
 	int level = -1;
 	int usize = -1;
 	int ret;
 	union u {
 OBJ t;
 t = __INST(filePointer);
 if (t != nil) {
 	FILE *fp;
-	int sock;
+	SOCKET sock;
 	__INST(filePointer) = nil;
 	fp = __FILEVal(t);
 	sock = SOCKET_FROM_FILE(fp);
 	  } while ((ret < 0) && (__threadErrno == EINTR));
 #  ifdef WIN32
 	  do {
 	    __threadErrno = 0;
-	    ret = STX_API_CALL1("closesocket", closesocket, sock);
+	    ret = STX_WSA_CALL1("closesocket", closesocket, sock);
 	  } while ((ret < 0) && (__threadErrno == EINTR));
 	  closesocket(sock);
 #  endif
 	}
 # else /* !DO_WRAP_CALLS */
 	fflush(fp);
 	/* shutdown(fileno(fp), 2); */
 	if (@global(FileOpenTrace) == true) {
 	    fprintf(stderr, "fclose [Socket] %x\n", fp);
 	}
+#  ifdef xxWIN32
+	closesocket(sock);
+#  endif
+	fclose(fp);
 #  ifdef WIN32
 	closesocket(sock);
 #  endif
-	fclose(fp);
 # endif /* !DO_WRAP_CALLS */
 }
 #endif /* NO_SOCKET */
 %}
 fp = __INST(filePointer);
 if (fp == nil) {
 	err = EBADF;
 } else {
-	int sz, sock;
+	int sz;
+	SOCKET sock;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	sz = sizeof(err);
 	if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &sz) < 0) {
 # ifdef WIN32
 	^ self errorNotOpen
 ].
 %{
 #ifndef NO_SOCKET
 OBJ fp = __INST(filePointer);
-int sock;
+SOCKET sock;
 int ret;
 if (! __isSmallInteger(aNumber)) {
 	DBGPRINTF(("SOCKET: invalid arg\n"));
 	RETURN (false);
 #ifdef LISTEN_BLOCKS
 # ifdef DO_WRAP_CALLS
 do {
 	__threadErrno = 0;
-	ret = STX_API_CALL2("listen", listen, sock, __intVal(aNumber));
+	ret = STX_WSA_CALL2("listen", listen, sock, __intVal(aNumber));
 } while ((ret < 0) && (__threadErrno == EINTR));
 # else
 __BEGIN_INTERRUPTABLE__
 do {
 	ret = listen(sock, __intVal(aNumber));
 OBJ fp;
 fp = __INST(filePointer);
 if ((fp != nil) && __isSmallInteger(howNum)) {
-	int sock;
+	SOCKET sock;
 	int ret;
 	__INST(filePointer) = nil;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 # ifdef DO_WRAP_CALLS
 	do {
 	    __threadErrno = 0;
-	    ret = STX_API_CALL2("shutdown", shutdown, sock, __intVal(howNum));
+	    ret = STX_WSA_CALL2("shutdown", shutdown, sock, __intVal(howNum));
 	} while ((ret < 0) && (__threadErrno == EINTR));
 # else
 	__BEGIN_INTERRUPTABLE__
 	shutdown(sock, __intVal(howNum));
 	__END_INTERRUPTABLE__
 %{  /* STACK: 100000 */
 #ifndef NO_SOCKET
 FILE *fp;
 int flags;
-int sock, newSock;
+SOCKET sock, newSock;
 union sockaddr_u sa;
 int alen, alen0;
 struct hostent *he ;
 char dotted[20] ;
 # ifdef DO_WRAP_CALLS
 do {
 	__threadErrno = 0;
 	alen = alen0;
-	newSock = STX_API_CALL3("accept", accept, sock, &sa, &alen);
+	newSock = STX_WSA_CALL3("accept", accept, sock, &sa, &alen);
 } while ((newSock < 0) && (__threadErrno == EINTR));
 # else
 __BEGIN_INTERRUPTABLE__
 do {
 	alen = alen0;
 #  ifdef DO_WRAP_CALLS
 	{
 	  int ret;
 	  do {
 	      __threadErrno = 0;
-	      ret = STX_API_CALL1("closesocket", closesocket, newSock);
+	      ret = STX_WSA_CALL1("closesocket", closesocket, newSock);
 	  } while ((ret < 0) && (__threadErrno == EINTR));
 	}
 #  else
 	closesocket(newSock);
 #  endif
 %{  /* STACK: 100000 */
 #ifndef NO_SOCKET
 OBJ fp = __INST(filePointer);
 union sockaddr_u sa;
-int a, sock;
+SOCKET sock;
+int a;
 int ret, oldFlags;
 int on = 1;
 int sockaddr_size;
 if (!__isNonNilObject(addr) || !__isBytes(addr)) {
 * connect
 */
 # ifdef DO_WRAP_CALLS
 do {
 	__threadErrno = 0;
-	ret = STX_API_CALL3("connect", connect, sock, &sa, sockaddr_size);
+	ret = STX_WSA_CALL3("connect", connect, sock, &sa, sockaddr_size);
 	DBGPRINTF(("SOCKET: connect returns %d\n", ret));
 } while ((ret < 0) && (__threadErrno == EINTR));
 # else
 __BEGIN_INTERRUPTABLE__
 do {
 addr := domainClass new.
 %{
 #ifndef NO_SOCKET
 OBJ fp = __INST(filePointer);
-OBJ addrClass;
+SOCKET sock;
-int sock;
 int ret;
 union sockaddr_u sa;
 int alen, alen0;
 char *addrP;
-int addrObjSize, nAddrInstVars, nAddrInstBytes;
+int addrObjSize, nAddrInstBytes;
 if (!__isSmallInteger(addrLen)) {
 	DBGPRINTF(("SOCKET: bad addrLen\n"));
 	error = @symbol(badArgument);
 	goto err;
 	error = @symbol(badArgument);
 	goto err;
 }
 {
-	OBJ oClass;
+	OBJ addrClass;
+	int nAddrInstVars;
 	addrClass = __qClass(addr);
 	nAddrInstVars = __intVal(__ClassInstPtr(addrClass)->c_ninstvars);
 	nAddrInstBytes = OHDR_SIZE + (nAddrInstVars * sizeof(OBJ));
 	addrObjSize = __qSize(addr) - nAddrInstBytes;
 socketAddress := ByteArray new:16.
 %{
 #ifndef NO_SOCKET
 OBJ fp = __INST(filePointer);
-int sock;
+SOCKET sock;
 int sockaddr_size;
 int ret;
 if (!__isNonNilObject(socketAddress) ||
 	(__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
 typeCode := OperatingSystem socketTypeCodeOf:typeArg.
 %{
 #ifndef NO_SOCKET
 FILE *fp;
-int dom, typ, pf, proto = 0, sock;
+int dom, typ, pf, proto = 0;
 int on = 1;
+SOCKET sock;
 if (! __isSmallInteger(domainCode)) {
 	DBGPRINTF(("SOCKET: bad domain\n"));
 	RETURN ( nil );
 }
 * get address and protocol-family
 */
 dom = __intVal(domainCode);
 typ = __intVal(typeCode);
-# ifdef DO_WRAP_CALLS
+# ifdef SOCKET_BLOCKS
+#  ifdef DO_WRAP_CALLS
 do {
 	__threadErrno = 0;
-	sock = STX_API_CALL3("socket", socket, dom, typ, proto);
+	sock = STX_WSA_CALL3("socket", socket, dom, typ, proto);
 } while ((sock < 0) && (__threadErrno == EINTR));
-# else
+#  else
 __BEGIN_INTERRUPTABLE__
 do {
 	DBGPRINTF(("SOCKET: opening socket domain=%d type=%d proto=%d\n", dom, typ, proto));
 	sock = socket(dom, typ, proto);
-# if defined(EPROTONOSUPPORT) /* for SGI */
+#   if defined(EPROTONOSUPPORT) /* for SGI */
 	if ((proto != 0) && (sock < 0) && (errno == EPROTONOSUPPORT)) {
 	    DBGPRINTF(("SOCKET: retry with UNSPEC protocol\n"));
 	    proto = 0;
 	    sock = socket(dom, typ, 0);
 	}
-# endif
+#   endif
 } while ((sock < 0) && (errno == EINTR));
 __END_INTERRUPTABLE__
+#  endif
+# else
+sock = socket(dom, typ, proto);
+#  if defined(EPROTONOSUPPORT) /* for SGI */
+if ((proto != 0) && (sock < 0) && (errno == EPROTONOSUPPORT)) {
+	DBGPRINTF(("SOCKET: retry with UNSPEC protocol\n"));
+	proto = 0;
+	sock = socket(dom, typ, 0);
+}
+#  endif
 # endif
 DBGFPRINTF((stderr, "socket create newSock=%d\n", sock));
-if (sock < 0) {
+# ifdef WIN32
+if (sock == INVALID_SOCKET)
+# else
+if (sock < 0)
+# endif
+{
 	DBGPRINTF(("SOCKET: socket(dom=%d typ=%d proto=%d) call failed errno=%d\n", dom, typ, proto, errno));
 	__INST(lastErrorNumber) = __MKSMALLINT(errno);
 } else {
 # ifdef SO_REUSEADDR
 	if (reuse == true) {
 # ifdef DO_WRAP_CALLS
 	    { int ret;
 	      do {
 		__threadErrno = 0;
-		ret = STX_API_CALL1("closesocket", closesocket, sock);
+		ret = STX_WSA_CALL1("closesocket", closesocket, sock);
 	      } while ((ret < 0) && (__threadErrno == EINTR));
 	    }
 # else
 	    __BEGIN_INTERRUPTABLE__
 	    closesocket(sock);
 ].
 %{
 #if defined(SO_RCVBUF) && defined(SOL_SOCKET)
 {
 	OBJ fp = __INST(filePointer);
-	int sock;
+	SOCKET sock;
 	int opt;
 	int size;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	if (getsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char *)&opt, &size) >= 0) {
 ].
 %{
 #if defined(SO_RCVBUF) && defined(SOL_SOCKET)
 if (__isSmallInteger(size)) {
 	OBJ fp = __INST(filePointer);
-	int sock;
+	SOCKET sock;
 	int opt;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	opt = __intVal(size);
 	if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char *)&opt, sizeof(int)) >= 0 ) {
 millis := (seconds * 1000) rounded.
 %{
 #if defined(SO_RCVTIMEO) && defined(SOL_SOCKET) && defined(HZ)
 if (__isSmallInteger(millis)) {
 	OBJ fp = __INST(filePointer);
-	int sock;
+	SOCKET sock;
 	int opt;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	opt = __intVal(millis) / (1000 / HZ);
 	if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&opt, sizeof(int)) >= 0 ) {
 ].
 %{
 #if defined(SO_SNDBUF) && defined(SOL_SOCKET)
 {
 	OBJ fp = __INST(filePointer);
-	int sock;
+	SOCKET sock;
 	int opt;
 	int size;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)&opt, &size) >= 0) {
 ].
 %{
 #if defined(SO_SNDBUF) && defined(SOL_SOCKET)
 if (__isSmallInteger(size)) {
 	OBJ fp = __INST(filePointer);
-	int sock;
+	SOCKET sock;
 	int opt;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	opt = __intVal(size);
 	if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)&opt, sizeof(int)) >= 0) {
 millis := (seconds * 1000) rounded.
 %{
 #if defined(SO_SNDTIMEO) && defined(SOL_SOCKET) && defined(HZ)
 if (__isSmallInteger(millis)) {
 	OBJ fp = __INST(filePointer);
-	int sock;
+	SOCKET sock;
 	int opt;
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	opt = __intVal(millis) / (1000 / HZ);
 	if (setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&opt, sizeof(int)) >= 0) {
 #if defined(IPPROTO_TCP) && defined(TCP_CORK)
 int onOff = (aBoolean == true);
 if ((aBoolean == true) || (aBoolean == false)) {
 	OBJ fp = __INST(filePointer);
-	int sock;
+	SOCKET sock;
 	int onOff = (aBoolean == true);
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	if (setsockopt(sock, IPPROTO_TCP, TCP_CORK, (char *)&onOff, sizeof(int)) >= 0) {
 	    RETURN(true);
 #if defined(IPPROTO_TCP) && defined(TCP_NODELAY)
 int onOff = (aBoolean == true);
 if ((aBoolean == true) || (aBoolean == false)) {
 	OBJ fp = __INST(filePointer);
-	int sock;
+	SOCKET sock;
 	int onOff = (aBoolean == true);
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&onOff, sizeof(int)) >= 0) {
 	    RETURN(true);
 ! !
 !Socket class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.214 2005-03-10 20:02:45 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.215 2005-03-10 23:07:29 cg Exp $'
 ! !

changeset 1539	c0e89dcb58b3
parent 1538	65fa153f17aa
child 1540	1b511ad12399