hg/stx-libbasic: comparison UnixOperatingSystem.st

equal deleted inserted replaced

-:608194431b5e
+:055d0bcf41ec
 "
 !
 getNetworkAddresses
 "return a dictionary filled with
-	key -> name of interface
+key -> name of interface
-	value -> the socket adress of the interface
+value -> the socket adress of the interface
 for each interface"
 |addressArray nameArray noOfIf retDictionary error|
 noOfIf := 0.
 ** Open an INET socket
 */
 afinet_socket = socket(AF_INET, SOCK_DGRAM, 0);
 if (afinet_socket < 0) {
-	error = __MKSTRING("Cannot open socket");
+error = __MKSTRING("Cannot open socket");
-	goto bad;
+goto bad;
 }
 /*
 ** Get the list of network interfaces
 */
 ifc.ifc_len = sizeof (buf);
 ifc.ifc_buf = (caddr_t) buf;
 if (ioctl (afinet_socket, SIOCGIFCONF, (caddr_t) &ifc) < 0) {
-	close(afinet_socket);
+close(afinet_socket);
-	error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
+error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
-	goto bad;
+goto bad;
 }
 n_ifs = ifc.ifc_len / sizeof (struct ifreq);
 nameArray    = __ARRAY_NEW_INT(n_ifs);
 addressArray = __ARRAY_NEW_INT(n_ifs);
 if (nameArray == nil || addressArray == nil) {
-	/* Creating a string wouldn/t work here */
+/* Creating a string wouldn/t work here */
-	error = @symbol(allocationFailure);
+error = @symbol(allocationFailure);
-	goto bad;
+goto bad;
 }
 /*
 ** Iterate of the list of the system's netif. Find all
 ** active interfaces and their ethernet addresses
 */
 countOfIf = 0;
 for (i=0, ifr = ifc.ifc_req; i < n_ifs; i++, ifr++) {
-	/*
+/*
-	** Get Flags for this interface
+** Get Flags for this interface
-	*/
+*/
-	memcpy(&ifreq, ifr, sizeof(ifreq));
+memcpy(&ifreq, ifr, sizeof(ifreq));
-	/*
+/*
-	** Get address for this interface
+** Get address for this interface
-	*/
+*/
-	memcpy(&ifreq, ifr, sizeof(ifreq));
+memcpy(&ifreq, ifr, sizeof(ifreq));
-	if (ioctl (afinet_socket, SIOCGIFADDR, &ifreq) >= 0) {
+if (ioctl (afinet_socket, SIOCGIFADDR, &ifreq) >= 0) {
-	    t = __MKBYTEARRAY((char *)&ifreq.ifr_addr, sizeof(ifreq.ifr_addr));
+t = __MKBYTEARRAY((char *)&ifreq.ifr_addr, sizeof(ifreq.ifr_addr));
-	    __arrayVal(addressArray)[countOfIf] = t; __STORE(addressArray, t);
+__arrayVal(addressArray)[countOfIf] = t; __STORE(addressArray, t);
-	    t = __MKSTRING(&ifreq.ifr_name);
+t = __MKSTRING(&ifreq.ifr_name);
-	    __arrayVal(nameArray)[countOfIf] = t; __STORE(nameArray, t);
+__arrayVal(nameArray)[countOfIf] = t; __STORE(nameArray, t);
-	    countOfIf += 1;
+countOfIf += 1;
-	}
+}
 }
 noOfIf = __mkSmallInteger(countOfIf);
 bad:
 if (afinet_socket >= 0)
-	close(afinet_socket);
+close(afinet_socket);
 #else
 error = @symbol(notSupported);
 #endif /* defined(SIOCGIFADDR) */
 %}.
 retDictionary := Dictionary new:noOfIf.
 error notNil ifTrue:[
-	self primitiveFailed:error.
+self primitiveFailed:error.
-	"return empty dictionary if proceed from error"
+"return empty dictionary if proceed from error"
-	^  retDictionary.
+^  retDictionary.
 ].
 1 to:noOfIf do:[:cnt|
-	retDictionary at:(nameArray at:cnt) put:(SocketAddress fromBytes:(addressArray at:cnt)).
+"take the first address, if there is more than one!!"
+retDictionary at:(nameArray at:cnt) ifAbsentPut:(SocketAddress fromBytes:(addressArray at:cnt)).
 ].
 ^ retDictionary
 "
 ! !
 !UnixOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.285 2012-10-03 14:51:45 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.286 2012-10-08 12:34:01 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.285 2012-10-03 14:51:45 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.286 2012-10-08 12:34:01 stefan Exp $'
 ! !
 UnixOperatingSystem initialize!
 UnixOperatingSystem::FileDescriptorHandle initialize!

changeset 14377	055d0bcf41ec
parent 14376	608194431b5e
child 14435	fc486e748569