hg/stx-libbasic2: comparison Socket.st

equal deleted inserted replaced

-:2b2dc6b59b5a
+:a868b0e54a2b
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
+"{ Package: 'stx:libbasic2' }"
 NonPositionableExternalStream subclass:#Socket
 	instanceVariableNames:'domain socketType protocol port serviceName peerName'
 	classVariableNames:''
 	poolDictionaries:''
 int n;
 char *cp;
 int flags = 0;
 if (fp != nil) {
-	sock = fileno(__FILEVal(fp));
+sock = fileno(__FILEVal(fp));
-	oClass = __Class(aDataBuffer);
+oClass = __Class(aDataBuffer);
-	switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-	    case BYTEARRAY:
+case BYTEARRAY:
-	    case WORDARRAY:
+case WORDARRAY:
-	    case SWORDARRAY:
+case SWORDARRAY:
-	    case LONGARRAY:
+case LONGARRAY:
-	    case SLONGARRAY:
+case SLONGARRAY:
-	    case FLOATARRAY:
+case FLOATARRAY:
-	    case DOUBLEARRAY:
+case DOUBLEARRAY:
-		break;
+break;
-	    default:
+default:
-		goto bad;
+goto bad;
-	}
+}
-	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 = _Size(aDataBuffer) - nInstBytes;
+objSize = _Size(aDataBuffer) - nInstBytes;
-	cp = (char *)__InstPtr(aDataBuffer) + nInstBytes;
+cp = (char *)__InstPtr(aDataBuffer) + nInstBytes;
-	if (__isSmallInteger(startIndex)) {
+if (__isSmallInteger(startIndex)) {
-	    cp += __intVal(startIndex);
+cp += __intVal(startIndex);
-	    objSize -= __intVal(startIndex);
+objSize -= __intVal(startIndex);
-	}
+}
-	if (__isSmallInteger(nBytes)) {
+if (__isSmallInteger(nBytes)) {
-	    if (__intVal(nBytes) < objSize) {
+if (__intVal(nBytes) < objSize) {
-		objSize = __intVal(nBytes);
+objSize = __intVal(nBytes);
-	    }
+}
-	}
+}
-	__BEGIN_INTERRUPTABLE__
+__BEGIN_INTERRUPTABLE__
-	do {
+do {
-	    if (addrBytes == nil) {
+if (addrBytes == nil) {
-		n = recvfrom(sock, cp, objSize, flags, (struct sockaddr *) 0, 0);
+n = recvfrom(sock, cp, objSize, flags, (struct sockaddr *) 0, 0);
-	    } else {
+} else {
-		n = recvfrom(sock, cp, objSize, flags, (struct sockaddr *) &sa, &alen);
+n = recvfrom(sock, cp, objSize, flags, (struct sockaddr *) &sa, &alen);
-	    }
+}
-	} while ((n < 0) && (errno == EINTR));
+} while ((n < 0) && (errno == EINTR));
-	__END_INTERRUPTABLE__
+__END_INTERRUPTABLE__
-	if (n >= 0) {
+if (n >= 0) {
-	    if (addrBytes != nil) {
+if (addrBytes != nil) {
-		oClass = __Class(addrBytes);
+oClass = __Class(addrBytes);
-		if ((_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) != BYTEARRAY)
+if ((_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) != BYTEARRAY)
-		    goto bad;
+goto bad;
-		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 = _Size(addrBytes) - nInstBytes;
+objSize = _Size(addrBytes) - nInstBytes;
-		cp = (char *)__InstPtr(addrBytes) + nInstBytes;
+cp = (char *)__InstPtr(addrBytes) + nInstBytes;
-		if (objSize < alen)
+if (objSize < alen)
-		    goto bad;
+goto bad;
-		myDomain = __INST(domain);
+myDomain = __INST(domain);
-		/*
+/*
-		 * extract the datagrams address
+* extract the datagrams address
-		 */
+*/
 # ifdef AF_INET
-		if (myDomain == @symbol(inet)) {
+if (myDomain == @symbol(inet)) {
-		    if (objSize < 4)
+if (objSize < 4)
-			goto bad;
+goto bad;
-		    cp[0] = (sa.in.sin_addr.s_addr >> 24) & 0xFF;
+cp[0] = (sa.in.sin_addr.s_addr >> 24) & 0xFF;
-		    cp[2] = (sa.in.sin_addr.s_addr >> 16) & 0xFF;
+cp[2] = (sa.in.sin_addr.s_addr >> 16) & 0xFF;
-		    cp[3] = (sa.in.sin_addr.s_addr >> 8) & 0xFF;
+cp[3] = (sa.in.sin_addr.s_addr >> 8) & 0xFF;
-		    cp[4] = (sa.in.sin_addr.s_addr >> 0) & 0xFF;
+cp[4] = (sa.in.sin_addr.s_addr >> 0) & 0xFF;
-		    alen = 4;
+alen = 4;
-		}
+}
 # endif /* AF_INET */
 # ifdef AF_INET6
-		if (myDomain == @symbol(inet6)) {
+if (myDomain == @symbol(inet6)) {
-		    if (objSize < sizeof(sa.in6.sin6_addr.s6_addr))
+if (objSize < sizeof(sa.in6.sin6_addr.s6_addr))
-			goto bad;
+goto bad;
-		    bcopy(sa.in6.sin6_addr.s6_addr, cp, sizeof(sa.in6.sin6_addr.s6_addr));
+bcopy(sa.in6.sin6_addr.s6_addr, cp, sizeof(sa.in6.sin6_addr.s6_addr));
-		    alen = sizeof(sa.in6.sin6_addr.s6_addr);
+alen = sizeof(sa.in6.sin6_addr.s6_addr);
-		}
+}
 # endif /* AF_INET6 */
 # ifdef AF_APPLETALK
-		if (myDomain == @symbol(appletalk)) {
+if (myDomain == @symbol(appletalk)) {
-		    if (objSize < 3)
+if (objSize < 3)
-			goto bad;
+goto bad;
-		    cp[0] = (sa.at.sat_addr.s_net >> 8) & 0xFF;
+cp[0] = (sa.at.sat_addr.s_net >> 8) & 0xFF;
-		    cp[2] = (sa.at.sat_addr.s_net) & 0xFF;
+cp[2] = (sa.at.sat_addr.s_net) & 0xFF;
-		    cp[3] = (sa.at.sat_addr.s_node) & 0xFF;
+cp[3] = (sa.at.sat_addr.s_node) & 0xFF;
-		    alen = 3;
+alen = 3;
-		}
+}
 # endif /* AF_APPLETALK */
-		/*
+/*
-		 * XXXX add addressing stuff for other domains here ...
+* XXXX add addressing stuff for other domains here ...
-		 */
+*/
 # ifdef AF_X25
-		if (myDomain == @symbol(x25)) {
+if (myDomain == @symbol(x25)) {
-		}
+}
 # endif
 # ifdef AF_AX25
-		if (myDomain == @symbol(ax25)) {
+if (myDomain == @symbol(ax25)) {
-		}
+}
 # endif
 # ifdef AF_NS
-		if ((myDomain == @symbol(ns))
+if ((myDomain == @symbol(ns))
-		 || (myDomain == @symbol(xns))) {
+|| (myDomain == @symbol(xns))) {
-		}
+}
 # endif
 # ifdef AF_SNA
-		if (myDomain == @symbol(sna)) {
+if (myDomain == @symbol(sna)) {
-		}
+}
 # endif
 # ifdef AF_RAW
-		if (myDomain == @symbol(raw)) {
+if (myDomain == @symbol(raw)) {
-		}
+}
 # endif
 # ifdef AF_ISO
-		if (myDomain == @symbol(iso)) {
+if (myDomain == @symbol(iso)) {
-		}
+}
 # endif
 # ifdef AF_DECnet
-		if (myDomain == @symbol(decnet)) {
+if (myDomain == @symbol(decnet)) {
-		}
+}
 # endif
 # ifdef AF_NETBIOS
-		if (myDomain == @symbol(netbios)) {
+if (myDomain == @symbol(netbios)) {
-		}
+}
 # endif
 # ifdef AF_IPX
-		if (myDomain == @symbol(ipx)) {
+if (myDomain == @symbol(ipx)) {
-		}
+}
 # endif
 # ifdef AF_BRIDGE
-		if (myDomain == @symbol(bridge)) {
+if (myDomain == @symbol(bridge)) {
-		}
+}
 # endif
 # ifdef AF_BSC
-		if (myDomain == @symbol(bsc)) {
+if (myDomain == @symbol(bsc)) {
-		}
+}
 # endif
 # ifdef AF_ROSE
-		if (myDomain == @symbol(rose)) {
+if (myDomain == @symbol(rose)) {
-		}
+}
 # endif
 # ifdef AF_IRDA
-		if (myDomain == @symbol(irda)) {
+if (myDomain == @symbol(irda)) {
-		}
+}
 # endif
 # if defined(AF_CCITT) && (AF_CCITT != AF_X25)
-		if (myDomain == @symbol(ccitt)) {
+if (myDomain == @symbol(ccitt)) {
-		}
+}
 # endif
-		addrLen = __MKSMALLINT(alen);
+addrLen = __MKSMALLINT(alen);
-	    }
+}
-	}
+}
-	if (n < 0) {
+if (n < 0) {
-	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
+__INST(lastErrorNumber) = __MKSMALLINT(errno);
-	}
+}
-	nReceived = __MKSMALLINT(n);
+nReceived = __MKSMALLINT(n);
 }
 #endif
 bad: ;
 %}.
 nReceived notNil ifTrue:[
-	nReceived < 0 ifTrue:[
+nReceived < 0 ifTrue:[
-	    'Socket [warning]: ' infoPrint.
+'Socket [warning]: ' infoPrint.
-	    (OperatingSystem errorTextForNumber:lastErrorNumber) infoPrintCR.
+(OperatingSystem errorTextForNumber:lastErrorNumber) infoPrintCR.
-	].
+].
-	addrLen notNil ifTrue:[
+addrLen notNil ifTrue:[
-	    anAddressBuffer class isBytes ifTrue:[
+(anAddressBuffer isKindOf:SocketAddress) ifFalse:[
-		"/ can be a ByteArray for ST/X compatibility
+"/ can be a ByteArray for ST/X compatibility
-		anAddressBuffer replaceFrom:1 to:addrLen with:addrBytes
+anAddressBuffer replaceFrom:1 to:addrLen with:addrBytes
-	    ] ifFalse:[
+] ifTrue:[
-		"/ can be a SocketAddress for ST-80 compatibility
+"/ can be a SocketAddress for ST-80 compatibility
-		anAddressBuffer hostAddress:(addrBytes copyTo:addrLen)
+anAddressBuffer hostAddress:(addrBytes copyTo:addrLen)
-	    ].
+].
-	].
+].
-	^ nReceived
+^ nReceived
 ].
 "
 arrive here if you try to receive into an invalid buffer
 (i.e. not ByteArray-like),
 or if the addressBuffer is nonNil AND not a ByteArray/String
 |addrBytes addrLen nReceived portNo|
 "/ addressBuffer can be a byteArray (last 2 bytes are portNo, msb-first)
 "/ or (better) an instance of SocketAddress
 "/
-anAddressBuffer class isBytes ifTrue:[
+(anAddressBuffer isKindOf:SocketAddress) ifFalse:[
-	domain == #inet ifTrue:[
+domain == #inet ifTrue:[
-	    addrBytes := anAddressBuffer copyFrom:1 to:4.
+addrBytes := anAddressBuffer copyFrom:1 to:4.
-	    portNo := ((anAddressBuffer at:5) bitShift:8)
+portNo := ((anAddressBuffer at:5) bitShift:8)
-		      + (anAddressBuffer at:6).
++ (anAddressBuffer at:6).
-	] ifFalse:[
+] ifFalse:[
-	    domain == #appletalk ifTrue:[
+domain == #appletalk ifTrue:[
-		addrBytes := anAddressBuffer copyFrom:1 to:3.
+addrBytes := anAddressBuffer copyFrom:1 to:3.
-		portNo := ((anAddressBuffer at:5) bitShift:8)
+portNo := ((anAddressBuffer at:5) bitShift:8)
-			  + (anAddressBuffer at:6).
++ (anAddressBuffer at:6).
-	    ].
+].
-	].
+].
-] ifFalse:[
+] ifTrue:[
-	addrBytes := anAddressBuffer hostAddress.
+addrBytes := anAddressBuffer hostAddress.
-	portNo := anAddressBuffer port.
+portNo := anAddressBuffer port.
 ].
 %{
 #ifndef NO_SOCKET
 OBJ oClass;
 OBJ fp = __INST(filePointer);
 _flags = __longIntVal(flags);
 if ((fp != nil)
 && __isSmallInteger(startIndex)
 && __isSmallInteger(count)) {
-	sock = fileno(__FILEVal(fp));
+sock = fileno(__FILEVal(fp));
-	if (addrBytes == nil) {
+if (addrBytes == nil) {
-	    alen = 0;
+alen = 0;
-	    saPtr = (struct sockaddr *)0;
+saPtr = (struct sockaddr *)0;
-	} else {
+} else {
-	    if (! __isByteArray(addrBytes)) goto bad;
+if (! __isByteArray(addrBytes)) goto bad;
-	    cp = (char *)__ByteArrayInstPtr(addrBytes)->ba_element;
+cp = (char *)__ByteArrayInstPtr(addrBytes)->ba_element;
-	    n = __byteArraySize(addrBytes);
+n = __byteArraySize(addrBytes);
-	    if (alen < n) n = alen;
+if (alen < n) n = alen;
 # ifdef DGRAM_DEBUG
-	    printf("address is %d bytes ... %d.%d.%d.%d", n, cp[0], cp[1], cp[2], cp[3]);
+printf("address is %d bytes ... %d.%d.%d.%d", n, cp[0], cp[1], cp[2], cp[3]);
 # endif
-	    bcopy(cp, &sa.in.sin_addr.s_addr, n);
+bcopy(cp, &sa.in.sin_addr.s_addr, n);
 # ifdef AF_INET
-	    if (__INST(domain) == @symbol(inet)) {
+if (__INST(domain) == @symbol(inet)) {
-		sa.in.sin_family = AF_INET;
+sa.in.sin_family = AF_INET;
-		sa.in.sin_port = htons((u_short) __intVal(portNo));
+sa.in.sin_port = htons((u_short) __intVal(portNo));
-	    }
+}
 # endif
 # ifdef AF_INET6
-	    if (__INST(domain) == @symbol(inet6)) {
+if (__INST(domain) == @symbol(inet6)) {
-		sa.in6.sin6_family = AF_INET6;
+sa.in6.sin6_family = AF_INET6;
-		sa.in6.sin6_port = htons((u_short) __intVal(portNo));
+sa.in6.sin6_port = htons((u_short) __intVal(portNo));
-	    }
+}
 # endif
 # ifdef AF_APPLETALK
-	    if (__INST(domain) == @symbol(appletalk)) {
+if (__INST(domain) == @symbol(appletalk)) {
-		sa.at.sat_family = AF_APPLETALK;
+sa.at.sat_family = AF_APPLETALK;
-		sa.at.sat_port = __intVal(portNo);
+sa.at.sat_port = __intVal(portNo);
-	    }
+}
 # endif
 # ifdef AF_IRDA
-	    if (__INST(domain) == @symbol(irda)) {
+if (__INST(domain) == @symbol(irda)) {
-	    }
+}
 # endif
-	}
+}
-	oClass = __Class(aDataBuffer);
+oClass = __Class(aDataBuffer);
-	switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-	    case BYTEARRAY:
+case BYTEARRAY:
-		offs = __intVal(startIndex) - 1;
+offs = __intVal(startIndex) - 1;
-		break;
+break;
-	    case WORDARRAY:
+case WORDARRAY:
-	    case SWORDARRAY:
+case SWORDARRAY:
-		offs = (__intVal(startIndex) - 1) * 2;
+offs = (__intVal(startIndex) - 1) * 2;
-		break;
+break;
-	    case LONGARRAY:
+case LONGARRAY:
-	    case SLONGARRAY:
+case SLONGARRAY:
-		offs = (__intVal(startIndex) - 1) * 4;
+offs = (__intVal(startIndex) - 1) * 4;
-		break;
+break;
-	    case LONGLONGARRAY:
+case LONGLONGARRAY:
-	    case SLONGLONGARRAY:
+case SLONGLONGARRAY:
-		offs = (__intVal(startIndex) - 1) * 8;
+offs = (__intVal(startIndex) - 1) * 8;
 # ifdef __NEED_LONGLONG_ALIGN
-		offs += 4;
+offs += 4;
 # endif
-	    case FLOATARRAY:
+case FLOATARRAY:
-		offs = (__intVal(startIndex) - 1) * sizeof(float);
+offs = (__intVal(startIndex) - 1) * sizeof(float);
-		break;
+break;
-	    case DOUBLEARRAY:
+case DOUBLEARRAY:
-		offs = (__intVal(startIndex) - 1) * sizeof(double);
+offs = (__intVal(startIndex) - 1) * sizeof(double);
 # ifdef __NEED_DOUBLE_ALIGN
-		offs += 4;
+offs += 4;
 # endif
-		break;
+break;
-	    default:
+default:
-		goto bad;
+goto bad;
-	}
+}
-	nBytes = __intVal(count);
+nBytes = __intVal(count);
-	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(aDataBuffer) - nInstBytes;
+objSize = __qSize(aDataBuffer) - nInstBytes;
-	cp = (char *)__InstPtr(aDataBuffer) + nInstBytes;
+cp = (char *)__InstPtr(aDataBuffer) + nInstBytes;
-	cp += offs;
+cp += offs;
-	if ((offs + nBytes) > objSize) {
+if ((offs + nBytes) > objSize) {
 # ifdef DGRAM_DEBUG
-	    printf("cut off ...\n");
+printf("cut off ...\n");
 # endif
-	    nBytes = objSize - offs;
+nBytes = objSize - offs;
-	}
+}
-	norder = htonl(sa.in.sin_addr.s_addr);
+norder = htonl(sa.in.sin_addr.s_addr);
 # ifdef DGRAM_DEBUG
-	printf("sending %d bytes ... to ", nBytes);
+printf("sending %d bytes ... to ", nBytes);
-	printf("%d.%d.%d.%d\n",
+printf("%d.%d.%d.%d\n",
-		    (norder >> 24) & 0xFF,
+(norder >> 24) & 0xFF,
-		    (norder >> 16) & 0xFF,
+(norder >> 16) & 0xFF,
-		    (norder >> 8) & 0xFF,
+(norder >> 8) & 0xFF,
-		    norder & 0xFF);
+norder & 0xFF);
 # endif
-	__BEGIN_INTERRUPTABLE__
+__BEGIN_INTERRUPTABLE__
-	do {
+do {
-	    n = sendto(sock, cp, nBytes, _flags, saPtr, alen);
+n = sendto(sock, cp, nBytes, _flags, saPtr, alen);
-	} while ((n < 0) && (errno == EINTR));
+} while ((n < 0) && (errno == EINTR));
-	__END_INTERRUPTABLE__
+__END_INTERRUPTABLE__
-	if (n < 0) {
+if (n < 0) {
-	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
+__INST(lastErrorNumber) = __MKSMALLINT(errno);
-	}
+}
-	RETURN (__MKSMALLINT(n));
+RETURN (__MKSMALLINT(n));
 }
 #endif
 bad: ;
 %}.
 "
 ! !
 !Socket class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.146 2000-03-24 12:50:17 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.147 2000-05-08 13:57:42 cg Exp $'
 ! !

changeset 888	a868b0e54a2b
parent 887	2b2dc6b59b5a
child 896	2ca43149a20e