hg/stx-libbasic: comparison UnixOperatingSystem.st

equal deleted inserted replaced

-:48222edbd770
+:38541f2887de
 "Created: 23.12.1995 / 14:19:20 / cg"
 !
 getNetworkAddressInfo
-"return a dictionary filled with
+"return a Dictionary of network interface information.
-	key -> name of interface
+key -> name of interface
-	value -> the socket adress of the interface
+value -> a Set of network address
-for each interface"
+information for the interface - a dictionaries containing the
+information about the configuration of each interface in the system.
+The dictionary keys are:
+#address
+#netmask
+#flags
+#destAddress"
 |returnArray addressArray nameArray noOfIf retDictionary error retIndex|
 noOfIf := 0.
 int n_ifa = 0;
 int retI = 0;
 OBJ t;
 if (getifaddrs(&ifap) < 0) {
-	error = __MKSTRING("getifaddrs() failed");
+error = __MKSTRING("getifaddrs() failed");
-	goto out;
+goto out;
 }
 for (ifaLoop = ifap; ifaLoop != 0; ifaLoop = ifaLoop->ifa_next) n_ifa++;
 returnArray = __ARRAY_NEW_INT(n_ifa*5);
 if (returnArray == 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;
 }
 for (ifaLoop = ifap; ifaLoop != 0; ifaLoop = ifaLoop->ifa_next) {
-	int family, len;
+int family, len;
-	if (ifaLoop->ifa_addr == 0)
+if (ifaLoop->ifa_addr == 0)
-	       continue;
+continue;
-	family = ifaLoop->ifa_addr->sa_family;
+family = ifaLoop->ifa_addr->sa_family;
-	switch (family) {
+switch (family) {
-	case AF_INET:
+case AF_INET:
-	    len = sizeof(struct sockaddr_in);
+len = sizeof(struct sockaddr_in);
-	    break;
+break;
-	case AF_INET6:
+case AF_INET6:
-	    len = sizeof(struct sockaddr_in6);
+len = sizeof(struct sockaddr_in6);
-	    break;
+break;
 #if 0
-	case AF_PACKET:
+case AF_PACKET:
-	    len = sizeof(sockaddr_ll);
+len = sizeof(sockaddr_ll);
-	    break;
+break;
 #endif
-	default:
+default:
-	    /* skip */
+/* skip */
-	    continue;
+continue;
-	};
+};
-	t = __MKSTRING(ifaLoop->ifa_name);
+t = __MKSTRING(ifaLoop->ifa_name);
-	__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
-	t = __MKUINT(ifaLoop->ifa_flags);
+t = __MKUINT(ifaLoop->ifa_flags);
-	__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
-	t = __MKBYTEARRAY((char *)ifaLoop->ifa_addr, len);
+t = __MKBYTEARRAY((char *)ifaLoop->ifa_addr, len);
-	__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
-	if (ifaLoop->ifa_netmask != 0) {
+if (ifaLoop->ifa_netmask != 0) {
-	    t = __MKBYTEARRAY((char *)ifaLoop->ifa_netmask, len);
+t = __MKBYTEARRAY((char *)ifaLoop->ifa_netmask, len);
-	    __arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
+__arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
-	}
+}
-	retI++;
+retI++;
-	if (ifaLoop->ifa_dstaddr != 0) {
+if (ifaLoop->ifa_dstaddr != 0) {
-	    t = __MKBYTEARRAY((char *)ifaLoop->ifa_dstaddr, len);
+t = __MKBYTEARRAY((char *)ifaLoop->ifa_dstaddr, len);
-	    __arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
+__arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
-	}
+}
-	retI++;
+retI++;
 }
 noOfIf = __mkSmallInteger(n_ifa);
 bad:
 ** Open an INET socket
 */
 afinet_socket = socket(AF_INET, SOCK_DGRAM, 0);
 if (afinet_socket < 0) {
-	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 address for this interface
+** Get address for this interface
-	*/
+*/
-	memset (&ifreq, 0, sizeof(ifreq));
+memset (&ifreq, 0, sizeof(ifreq));
-	memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
+memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
-	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++;
+countOfIf++;
-	} else {
+} else {
-	    fprintf(stderr, "SIOCGIFADDR failed: %s\n", errno);
+fprintf(stderr, "SIOCGIFADDR failed: %s\n", errno);
-	}
+}
-	error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
+error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
 }
 noOfIf = __mkSmallInteger(countOfIf);
 bad:
 if (afinet_socket >= 0)
-	close(afinet_socket);
+close(afinet_socket);
 #else
 error = @symbol(notSupported);
 #endif /* defined(SIOCGIFADDR) */
 out:;
 %}.
 retDictionary := Dictionary new:noOfIf.
 error notNil ifTrue:[
-	self primitiveFailed:error.
+self primitiveFailed:error.
-	"return empty dictionary if proceeding from error"
+"return empty dictionary if proceeding from error"
-	^  retDictionary.
+^  retDictionary.
 ].
 retIndex := 1.
 1 to:noOfIf do:[:cnt|
-	|name addressBytes set dict|
+|name addressBytes set dict|
-	name := returnArray at:retIndex.
+name := returnArray at:retIndex.
-	addressBytes := returnArray at:retIndex+2.
+addressBytes := returnArray at:retIndex+2.
-	addressBytes notNil ifTrue:[
+addressBytes notNil ifTrue:[
-	    set := retDictionary at:name ifAbsentPut:[Set new].
+set := retDictionary at:name ifAbsentPut:[Set new].
-	    dict := Dictionary new:5.
+dict := Dictionary new:5.
-	    dict at:#flags put:(returnArray at:retIndex+1).
+dict at:#flags put:(returnArray at:retIndex+1).
-	    dict at:#address put:(SocketAddress fromBytes:addressBytes).
+dict at:#address put:(SocketAddress fromBytes:addressBytes).
-	    addressBytes := returnArray at:retIndex+3.
+addressBytes := returnArray at:retIndex+3.
-	    addressBytes notNil ifTrue:[
+addressBytes notNil ifTrue:[
-		dict at:#netMask put:(SocketAddress fromBytes:addressBytes).
+dict at:#netMask put:(SocketAddress fromBytes:addressBytes).
-	    ].
+].
-	    addressBytes := returnArray at:retIndex+4.
+addressBytes := returnArray at:retIndex+4.
-	    addressBytes notNil ifTrue:[
+addressBytes notNil ifTrue:[
-		dict at:#destAddress put:(SocketAddress fromBytes:addressBytes).
+dict at:#destAddress put:(SocketAddress fromBytes:addressBytes).
-	    ].
+].
-	    set add:dict.
+set add:dict.
-	].
+].
-	retIndex := retIndex + 5.
+retIndex := retIndex + 5.
 ].
 ^ retDictionary
 "
 ! !
 !UnixOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.329 2013-07-08 19:27:29 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.330 2013-07-10 08:23:04 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.329 2013-07-08 19:27:29 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.330 2013-07-10 08:23:04 stefan Exp $'
 ! !
 UnixOperatingSystem initialize!
 UnixOperatingSystem::FileDescriptorHandle initialize!

changeset 15508	38541f2887de
parent 15492	626feb0ef3a5
child 15513	17c13e65f96a