hg/stx-libbasic2: comparison Socket.st

equal deleted inserted replaced

-:ae55ba1cd11e
+:8d9865be083a
 // linger.onoff=off linger.time= *irrelevant*
 //# define SET_LINGER_WHEN_CREATING_SOCKET
 # ifdef __MINGW__
 extern HANDLE _get_osfhandle();
+# endif
+# if defined(__BORLANDC__)
+// not defined in borland headers
+typedef unsigned int socklen_t;
 # endif
 # if 0 && (defined( __BORLANDC__ ) || defined( __MINGW__ ))
 #  define SOCKET_FROM_FD(fd)               (SOCKET)(_get_osfhandle(fd))
 # else
 If blocking is false, this call will return immediately, if there is no connection pending."
 |serverSocketHandle addr domainClass newHandle|
 handle notNil ifTrue:[
-	^ self errorAlreadyOpen
+^ self errorAlreadyOpen
 ].
 domain := aServerSocket domain.
 socketType := aServerSocket type.
 handleType := aServerSocket handleType.
 serverSocketHandle := aServerSocket fileHandle.
 serverSocketHandle isNil ifTrue:[
-	^ self error:'invalid server socket'
+^ self error:'invalid server socket'
 ].
 "unix domain sockets do not return a valid peer name on accept"
 domainClass := self class socketAddressClassForDomain:domain.
 domainClass isNil ifTrue:[
-	^ self error:'invalid (unsupported) domain'.
+^ self error:'invalid (unsupported) domain'.
 ].
 addr := domainClass new.
 newHandle := OperatingSystem socketAccessor new.
 %{  /* STACK: 100000 */
 serverSocket = __intVal(serverSocketHandle);
 #endif
 # if defined(O_NONBLOCK) && defined(SET_NDELAY)
 if (blocking == false) {
-	flags = fcntl(serverSocket, F_GETFL);
+flags = fcntl(serverSocket, F_GETFL);
-	fcntl(serverSocket, F_SETFL, flags | O_NONBLOCK);
+fcntl(serverSocket, F_SETFL, flags | O_NONBLOCK);
 }
 # endif
 # ifdef DO_WRAP_CALLS
 do {
-	__threadErrno = 0;
+__threadErrno = 0;
-	alen = sizeof(sa);
+alen = sizeof(sa);
-	newSock = (SOCKET)STX_WSA_CALL3("accept", accept, serverSocket, &sa, &alen);
+newSock = (SOCKET)STX_WSA_CALL3("accept", accept, serverSocket, &sa, &alen);
 } while ((newSock < 0) && (__threadErrno == EINTR));
 if (newSock < 0) {
-	errno = __threadErrno;
+errno = __threadErrno;
 }
 # else
 __BEGIN_INTERRUPTABLE__
 do {
-	alen = sizeof(sa);
+alen = sizeof(sa);
-	newSock = accept(serverSocket, (struct sockaddr *) &sa, &alen);
+newSock = accept(serverSocket, (struct sockaddr *) &sa, &alen);
 } while ((newSock < 0) && (errno == EINTR));
 __END_INTERRUPTABLE__
 # endif
 DBGFPRINTF((stderr, "SOCKET: accept newSock=%d\n", newSock));
 # if defined(O_NDELAY) && defined(SET_NDELAY)
 if (blocking == false) {
-	fcntl(serverSocket, F_SETFL, flags);
+fcntl(serverSocket, F_SETFL, flags);
 }
 # endif
 if (newSock == -1) {
-	DBGPRINTF(("SOCKET: accept call failed errno=%d\n", errno));
+DBGPRINTF(("SOCKET: accept call failed errno=%d\n", errno));
-	__INST(lastErrorNumber) = __MKSMALLINT(errno);
+__INST(lastErrorNumber) = __MKSMALLINT(errno);
-	RETURN (false);
+RETURN (false);
 }
 if (__isNonNilObject(addr)) {
-	OBJ oClass = __qClass(addr);
+OBJ oClass = __qClass(addr);
-	int nInstVars, nInstBytes, objSize;
+int nInstVars, nInstBytes, objSize;
-	char *addrP;
+char *addrP;
-	if (! __isBytes(addr) ) {
+if (! __isBytes(addr) ) {
-	    DBGPRINTF(("SOCKET: bad addr\n"));
+DBGPRINTF(("SOCKET: bad addr\n"));
-	    closesocket(newSock);
+closesocket(newSock);
-	    RETURN (false);
+RETURN (false);
-	}
+}
-	nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
+nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
-	nInstBytes = OHDR_SIZE + (nInstVars * sizeof(OBJ));
+nInstBytes = OHDR_SIZE + (nInstVars * sizeof(OBJ));
-	objSize = __qSize(addr) - nInstBytes;
+objSize = __qSize(addr) - nInstBytes;
-	addrP = (char *)__InstPtr(addr) + nInstBytes;
+addrP = (char *)__InstPtr(addr) + nInstBytes;
-	if (objSize < alen) {
+if (objSize < alen) {
-	    DBGPRINTF(("SOCKET: bad addr\n"));
+DBGPRINTF(("SOCKET: bad addr\n"));
-	    closesocket(newSock);
+closesocket(newSock);
-	    RETURN (false);
+RETURN (false);
-	}
+}
-	/*
+/*
-	 * extract the partners address
+* extract the partners address
-	 */
+*/
-	memcpy(addrP, (char *)&sa, alen);
+memcpy(addrP, (char *)&sa, alen);
 }
 /*
 * make it a FILE *
 */
 _fd = (int)newSock;
 #  endif
 # else // ! WIN32
 fp = fdopen(newSock, "r+");
 if (! fp) {
-	DBGPRINTF(("SOCKET: fdopen call failed\n"));
+DBGPRINTF(("SOCKET: fdopen call failed\n"));
-	__INST(lastErrorNumber) = __MKSMALLINT(errno);
+__INST(lastErrorNumber) = __MKSMALLINT(errno);
-	closesocket(newSock);
+closesocket(newSock);
-	DBGFPRINTF((stderr, "SOCKET: close (fdopen failed) (%d)\n", newSock));
+DBGFPRINTF((stderr, "SOCKET: close (fdopen failed) (%d)\n", newSock));
-	RETURN (false);
+RETURN (false);
 }
 # endif // ! WIN32
 if ((@global(FileOpenTrace) == true) || __debugging__) {
 # ifdef WIN32
-	console_fprintf(stderr, "fdopen [Socket accept] -> fd: %d (H: %"_lx_")\n", _fd, (INT)newSock);
+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);
+console_fprintf(stderr, "fdopen [Socket accept] -> %"_lx_" (fd: %d)\n", (INT)fp, newSock);
 # endif
 }
 # ifdef WIN32
 __externalAddressVal(newHandle) = _fd;
 handle := newHandle.
 buffered := false.
 mode := #readwrite.
 binary := false.
-Lobby register:self.
+self registerForFinalization.
 peer := addr.
 port := aServerSocket port.
 ^ true
 !
 #AF_INET, #AF_INET6, #AF_UNIX ... and #stream, #datagram, #raw resp."
 |domainName domainCode typeCode error newHandle|
 handle notNil ifTrue:[
-	^ self errorAlreadyOpen
+^ self errorAlreadyOpen
 ].
 domainName := SocketAddress domainCodeFromName:domainArg.
 domainCode := OperatingSystem domainCodeOf:domainName.
 typeCode := OperatingSystem socketTypeCodeOf:typeArg.
 newHandle := OperatingSystem socketAccessor new.
 #  endif
 static int noInheritFlag = WSA_FLAG_NO_HANDLE_INHERIT;
 # endif
 if (! __isSmallInteger(domainCode)) {
-	error = @symbol(badArgument1);
+error = @symbol(badArgument1);
-	goto out;
+goto out;
 }
 if (! __isSmallInteger(typeCode)) {
-	error = @symbol(badArgument2);
+error = @symbol(badArgument2);
-	goto out;
+goto out;
 }
 if (protocolNumber != nil) {
-	if (!__isSmallInteger(protocolNumber)) {
+if (!__isSmallInteger(protocolNumber)) {
-	    error = @symbol(badArgument3);
+error = @symbol(badArgument3);
-	    goto out;
+goto out;
-	}
+}
-	proto = __intVal(protocolNumber);
+proto = __intVal(protocolNumber);
 }
 /*
 * get address and protocol-family
 */
 typ = __intVal(typeCode);
 # 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
+// tried to open socket with WSA_FLAG_NO_HANDLE_INHERIT
-	// This fails on older windows versions, e.g. Windows XP
+// This fails on older windows versions, e.g. Windows XP
-	sock = WSASocket(dom, typ, proto, 0, 0, 0);
+sock = WSASocket(dom, typ, proto, 0, 0, 0);
-	if (sock != INVALID_SOCKET) {
+if (sock != INVALID_SOCKET) {
-	    // no error without WSA_FLAG_NO_HANDLE_INHERIT,
+// no error without WSA_FLAG_NO_HANDLE_INHERIT,
-	    // never use this flag again!
+// never use this flag again!
-	    noInheritFlag = 0;
+noInheritFlag = 0;
-	}
+}
 }
 if (sock == INVALID_SOCKET) {
-	errno = WSAGetLastError();
+errno = WSAGetLastError();
 # 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"));
+DBGPRINTF(("SOCKET: retry with UNSPEC protocol\n"));
-	proto = 0;
+proto = 0;
-	sock = socket(dom, typ, 0);
+sock = socket(dom, typ, 0);
 }
 # endif
 if (sock < 0) {
 # endif // !WIN32
-	DBGPRINTF(("SOCKET: socket(dom=%d typ=%d proto=%d) call failed errno=%d\n", dom, typ, proto, errno));
+DBGPRINTF(("SOCKET: socket(dom=%d typ=%d proto=%d) call failed errno=%d\n", dom, typ, proto, errno));
-	error = __MKSMALLINT(errno);
+error = __MKSMALLINT(errno);
 } else {
 # if defined(SET_LINGER_WHEN_CREATING_SOCKET) && defined(SO_LINGER)
-	{
+{
-	    struct linger l;
+struct linger l;
-	    l.l_onoff = 1;
+l.l_onoff = 1;
-	    l.l_linger = 30;
+l.l_linger = 30;
-	    setsockopt( sock, SOL_SOCKET, SO_LINGER, &l, sizeof(l));
+setsockopt( sock, SOL_SOCKET, SO_LINGER, &l, sizeof(l));
-	}
+}
 # endif
 # ifdef WIN32
-	/*
+/*
-	 * make it blocking
+* make it blocking
-	 */
+*/
-	{
+{
-	    unsigned long zero = 0;
+unsigned long zero = 0;
-	    ioctlsocket(sock, FIONBIO, &zero);
+ioctlsocket(sock, FIONBIO, &zero);
-	}
+}
-	{
+{
 #  if 0 && (defined( __BORLANDC__ ) || defined( __MINGW__ ))
-	    /*
+/*
-	     * make it a FILE *
+* make it a FILE *
-	     */
+*/
-	    __stxWrapApiEnterCritical();
+__stxWrapApiEnterCritical();
-	    _fd = _open_osfhandle((long)sock, 0);
+_fd = _open_osfhandle((long)sock, 0);
-	    __stxWrapApiLeaveCritical();
+__stxWrapApiLeaveCritical();
 #  else
-	    _fd = (int)sock;
+_fd = (int)sock;
 #  endif
-	    DBGPRINTF(("SOCKET: sock=%d fd=%d\n", sock, _fd));
+DBGPRINTF(("SOCKET: sock=%d fd=%d\n", sock, _fd));
-	}
+}
 # else  // !WIN32
-	fp = fdopen(sock, "r+");
+fp = fdopen(sock, "r+");
-	if (! fp) {
+if (! fp) {
-	    DBGPRINTF(("SOCKET: fdopen call failed\n"));
+DBGPRINTF(("SOCKET: fdopen call failed\n"));
-	    error = __MKSMALLINT(errno);
+error = __MKSMALLINT(errno);
-	    __BEGIN_INTERRUPTABLE__
+__BEGIN_INTERRUPTABLE__
-	    closesocket(sock);
+closesocket(sock);
-	    DBGFPRINTF((stderr, "SOCKET: fdopen failed (%d)\n", sock));
+DBGFPRINTF((stderr, "SOCKET: fdopen failed (%d)\n", sock));
-	    __END_INTERRUPTABLE__
+__END_INTERRUPTABLE__
-	    goto out;
+goto out;
-	}
+}
 # endif // !WIN32
-	if (@global(FileOpenTrace) == true) {
+if (@global(FileOpenTrace) == true) {
 # ifdef WIN32
-	    console_fprintf(stderr, "fdopen [Socket create] -> fd: %d (H: %"_lx_")\n", (INT)_fd, (INT)sock);
+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);
+console_fprintf(stderr, "fdopen [Socket] -> %"_lx_" (fd: %d)\n", (INT)fp, sock);
 # endif
-	}
+}
 # ifdef WIN32
-	__externalAddressVal(newHandle) = _fd;
+__externalAddressVal(newHandle) = _fd;
-	__INST(handleType) = @symbol(socketHandle);
+__INST(handleType) = @symbol(socketHandle);
 # else
-	__externalAddressVal(newHandle) = fp;
+__externalAddressVal(newHandle) = fp;
-	__INST(handleType) = @symbol(socketFilePointer);
+__INST(handleType) = @symbol(socketFilePointer);
 # endif
 }
 #endif
 out:;
 %}.
 "all ok?"
 handleType notNil ifTrue:[
-	handle := newHandle.
+handle := newHandle.
-	domain := domainArg.
+domain := domainArg.
-	socketType := typeArg.
+socketType := typeArg.
-	Lobby register:self.
+self registerForFinalization.
-	^ self.
+^ self.
 ].
 error isInteger ifTrue:[
-	lastErrorNumber := error.
+lastErrorNumber := error.
-	^ self openError:error.
+^ self openError:error.
 ].
 ^ self primitiveFailed:error.
 "
 Socket new domain:#AF_INET type:#stream

branch	jv
changeset 3623	8d9865be083a
parent 3619	ae55ba1cd11e
parent 3620	c648d063bccc
child 3634	d702e00e8533