--- a/Socket.st Thu May 01 19:43:24 1997 +0200
+++ b/Socket.st Thu May 01 19:46:36 1997 +0200
@@ -338,6 +338,8 @@
TODO: cleanup historic leftovers, implement other than inet domain stuff.
(mhmh - how can I test those ?)
+ Help - could someone who has a linux machine connected to an appletalk
+ net please test this (and send bug fixes ...)
[author:]
Claus Gittinger
@@ -974,7 +976,7 @@
struct hostent *hp ;
long addr;
- sa.sin_family = -1;
+ sa.sat_family = -1;
if (__isString(aHostName)) {
bzero(&sa, sizeof(sa)) ;
@@ -1031,10 +1033,11 @@
bzero(&sa, sizeof(sa)) ;
sa.sat_addr.s_net = _intVal(b1) & 0xFF;
- sa.sin_addr.s_net = (sa.sat_addr.s_net << 8) | (_intVal(b2) & 0xFF);
- sa.sin_addr.s_net = htons(sa.sin_addr.s_net);
- sa.sin_addr.s_node = _intVal(b3) & 0xFF;
- sa.sin_family = AF_APPLETALK;
+ sa.sat_addr.s_net = (sa.sat_addr.s_net << 8) | (_intVal(b2) & 0xFF);
+ sa.sat_addr.s_net = htons(sa.sat_addr.s_net);
+ sa.sat_addr.s_node = _intVal(b3) & 0xFF;
+ sa.sat_family = AF_APPLETALK;
+
/* do we know the host's address? */
hp = gethostbyaddr((char *) &sa.sat_addr, sizeof(sa.sat_addr), AF_APPLETALK);
if (hp != NULL) {
@@ -2019,13 +2022,13 @@
* bit are the net.
*/
if (address == nil) {
- sa.at.sat_addr.at_addr.s_net = ATADDR_ANYNET;
- sa.at.sat_addr.at_addr.s_node = ATADDR_ANYNODE;
+ sa.at.sat_addr.s_net = ATADDR_ANYNET;
+ sa.at.sat_addr.s_node = ATADDR_ANYNODE;
} else {
if (__isInteger(address)) {
unsigned a = __longIntVal(address);
- sa.at.sat_addr.at_addr.s_net = htons((a >> 8) & 0xFFFF);
- sa.at.sat_addr.at_addr.s_node = htons(a & 0xFF);
+ sa.at.sat_addr.s_net = htons((a >> 8) & 0xFFFF);
+ sa.at.sat_addr.s_node = htons(a & 0xFF);
} else {
if (__isByteArray(address)) {
unsigned char *cp;
@@ -3373,5 +3376,5 @@
!Socket class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.88 1997-05-01 17:43:24 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.89 1997-05-01 17:46:36 cg Exp $'
! !