Socket.st
changeset 796 c9f6b3b667fb
parent 790 6f58d65fac5e
child 798 8922e97cbe0e
--- a/Socket.st	Sat Aug 28 22:55:02 1999 +0200
+++ b/Socket.st	Wed Sep 01 08:11:15 1999 +0200
@@ -1202,30 +1202,30 @@
 
     sa.sin_family = -1;
     if (__bothSmallInteger(b1, b2) && __bothSmallInteger(b3, b4)) {
-	bzero(&sa, sizeof(sa)) ;
-	sa.sin_addr.s_addr = _intVal(b1) & 0xFF;
-	sa.sin_addr.s_addr = (sa.sin_addr.s_addr << 8) | (_intVal(b2) & 0xFF);
-	sa.sin_addr.s_addr = (sa.sin_addr.s_addr << 8) | (_intVal(b3) & 0xFF);
-	sa.sin_addr.s_addr = (sa.sin_addr.s_addr << 8) | (_intVal(b4) & 0xFF);
-	sa.sin_addr.s_addr = htonl(sa.sin_addr.s_addr);    
-	sa.sin_family = AF_INET;
-	/* do we know the host's address? */
-	GETHOSTBYADDR(hp, (char *) &sa.sin_addr.s_addr, sizeof(sa.sin_addr.s_addr), AF_INET);
-	if (hp == NULL) {
-	    DBGPRINTF(("SOCKET: unknown address: %d.%d.%d.%d\n", 
-		       _intVal(b1), _intVal(b2), _intVal(b3), _intVal(b4)));
-	} else {
-	    sa.sin_family = hp->h_addrtype;
-	}
+        bzero(&sa, sizeof(sa)) ;
+        sa.sin_addr.s_addr = _intVal(b1) & 0xFF;
+        sa.sin_addr.s_addr = (sa.sin_addr.s_addr << 8) | (_intVal(b2) & 0xFF);
+        sa.sin_addr.s_addr = (sa.sin_addr.s_addr << 8) | (_intVal(b3) & 0xFF);
+        sa.sin_addr.s_addr = (sa.sin_addr.s_addr << 8) | (_intVal(b4) & 0xFF);
+        sa.sin_addr.s_addr = htonl(sa.sin_addr.s_addr);    
+        sa.sin_family = AF_INET;
+        /* do we know the host's address? */
+        GETHOSTBYADDR(hp, (char *) &sa, sizeof(sa), AF_INET);
+        if (hp == NULL) {
+            DBGPRINTF(("SOCKET: unknown address: %d.%d.%d.%d\n", 
+                       _intVal(b1), _intVal(b2), _intVal(b3), _intVal(b4)));
+        } else {
+            sa.sin_family = hp->h_addrtype;
+        }
     }
 
     /* if the addressing family is not AF_INET, Return nil */
     if (sa.sin_family != AF_INET) {
-	RETURN ( nil );
+        RETURN ( nil );
     }
 
     if (hp != NULL) {
-	RETURN (__MKSTRING(hp->h_name));
+        RETURN (__MKSTRING(hp->h_name));
     }
 
     /*
@@ -1243,6 +1243,7 @@
      Socket ipAddressOfHost:'porty'
      Socket hostWithIpAddress:(Socket ipAddressOfHost:'porty') 
      Socket hostWithIpAddress:#[1 2 3 4]  
+     Socket hostWithIpAddress:#[127 0 0 1]  
      Socket hostWithIpAddress:(Socket ipAddressOfHost:'1.2.3.4')  
      "
 !
@@ -1263,36 +1264,36 @@
     sa.sin_family = -1;
 
     if (__isString(aHostName)) {
-	bzero(&sa, sizeof(sa)) ;
-	if ((addr = inet_addr((char *) __stringVal(aHostName))) != -1) {
-	    /* is Internet addr in octet notation */
-	    bcopy(&addr, (char *) &sa.sin_addr, sizeof(addr)); 
-	    sa.sin_family = AF_INET;
-	} else {
-	    /* do we know the host's address? */
-	    GETHOSTBYNAME(hp, __stringVal(aHostName))
-	    if (hp == NULL) {
-		DBGPRINTF(("SOCKET: unknown host: %s\n", __stringVal(aHostName)));
-		RETURN ( nil );
-	    }
-	    bcopy(hp->h_addr, (char *) &sa.sin_addr, hp->h_length) ;
-	    sa.sin_family = hp->h_addrtype;
-	}
+        bzero(&sa, sizeof(sa)) ;
+        if ((addr = inet_addr((char *) __stringVal(aHostName))) != -1) {
+            /* is Internet addr in octet notation */
+            bcopy(&addr, (char *) &sa.sin_addr, sizeof(addr)); 
+            sa.sin_family = AF_INET;
+        } else {
+            /* do we know the host's address? */
+            GETHOSTBYNAME(hp, __stringVal(aHostName))
+            if (hp == NULL) {
+                DBGPRINTF(("SOCKET: unknown host: %s\n", __stringVal(aHostName)));
+                RETURN ( nil );
+            }
+            bcopy(hp->h_addr, (char *) &sa.sin_addr, hp->h_length) ;
+            sa.sin_family = hp->h_addrtype;
+        }
     }
 
     /* if the addressing family is not AF_INET, Return nil */
     if (sa.sin_family != AF_INET) {
-	DBGPRINTF(("SOCKET: not an internet host\n"));
-	RETURN ( nil );
+        DBGPRINTF(("SOCKET: not an internet host\n"));
+        RETURN ( nil );
     }
 
     sa.sin_addr.s_addr = ntohl(sa.sin_addr.s_addr);    
     rslt = __BYTEARRAY_NEW_INT(4);
     if (rslt != nil) {
-	__ByteArrayInstPtr(rslt)->ba_element[0] = (sa.sin_addr.s_addr >> 24) & 0xFF;
-	__ByteArrayInstPtr(rslt)->ba_element[1] = (sa.sin_addr.s_addr >> 16) & 0xFF;
-	__ByteArrayInstPtr(rslt)->ba_element[2] = (sa.sin_addr.s_addr >> 8) & 0xFF;
-	__ByteArrayInstPtr(rslt)->ba_element[3] = (sa.sin_addr.s_addr >> 0) & 0xFF;
+        __ByteArrayInstPtr(rslt)->ba_element[0] = (sa.sin_addr.s_addr >> 24) & 0xFF;
+        __ByteArrayInstPtr(rslt)->ba_element[1] = (sa.sin_addr.s_addr >> 16) & 0xFF;
+        __ByteArrayInstPtr(rslt)->ba_element[2] = (sa.sin_addr.s_addr >> 8) & 0xFF;
+        __ByteArrayInstPtr(rslt)->ba_element[3] = (sa.sin_addr.s_addr >> 0) & 0xFF;
        RETURN (rslt);
     }
 #endif
@@ -1300,10 +1301,8 @@
     ^ nil
 
     "
-     Socket ipAddressOfHost:'clam' 
-     Socket ipAddressOfHost:'porty'    
-     Socket ipAddressOfHost:'axept'    
-     Socket ipAddressOfHost:'axept'    
+     Socket ipAddressOfHost:'localhost' 
+     Socket ipAddressOfHost:'exept'    
      Socket ipAddressOfHost:'1.2.3.4'    
      Socket ipAddressOfHost:'193.15.16.17'    
      Socket ipAddressOfHost:'josef'     
@@ -4193,5 +4192,5 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.124 1999-08-11 14:42:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.125 1999-09-01 06:11:15 stefan Exp $'
 ! !