head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.10 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.8 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.6 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.4 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.3.0.40 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.38 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.36 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.34 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.32 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.30 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.28 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.26 pkgsrc-2008Q1:1.3.0.24 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.22 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.20 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.18 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.16 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.14 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.12 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.10 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.8 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.6 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.4 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 netbsd-1-4-RELEASE:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2009.11.26.17.04.18; author joerg; state dead; branches; next 1.3; 1.3 date 2005.05.29.14.38.33; author wiz; state Exp; branches; next 1.2; 1.2 date 2003.03.31.03.46.30; author jmc; state Exp; branches; next 1.1; 1.1 date 98.10.21.19.59.29; author garbled; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.10.21.19.59.29; author garbled; state Exp; branches; next ; desc @@ 1.4 log @Remove parallel/glunix. It fails in the patch phase on NetBSD 4 and later. After fixing that, it fails with C++ errors, so it couldn't have been build at least for 3 years. Assume noone cares. @ text @$NetBSD: patch-ab,v 1.3 2005/05/29 14:38:33 wiz Exp $ --- glunix/src/comm/ccomm_net.cc.orig 1997-10-15 21:24:52.000000000 +0200 +++ glunix/src/comm/ccomm_net.cc @@@@ -73,7 +73,8 @@@@ #include #include #include -#include +/*#include */ +#include #include "glib/types.h" #include "cdebug.h" @@@@ -258,7 +259,7 @@@@ Comm_GetIpByHostName(char *hostName) h = gethostbyname(hostName); if (!h) { - DE("Cannot resolve host name: %s\n", strerror(errno)); + DE("Cannot resolve host name: %s %s\n",hostName, strerror(errno)); // BUGBUG set error code return 0; } @@@@ -328,14 +329,15 @@@@ Comm_GetMyIpAddr(uint *ipPtr) } // Get my IP address - if (sysinfo(SI_HOSTNAME, hostName, sizeof(hostName)-1) < 0) { - DE("sysinfo(SI_HOSTNAME): %s\n", strerror(errno)); - *ipPtr = 0; - return False; - } +// if (sysinfo(SI_HOSTNAME, hostName, sizeof(hostName)-1) < 0) { +// DE("sysinfo(SI_HOSTNAME): %s\n", strerror(errno)); +// *ipPtr = 0; +// return False; +// } + gethostname(hostName,sizeof(hostName)); h = gethostbyname(hostName); if (!h) { - DE("Cannot resolve host name: %s\n", strerror(errno)); + DE("Cannot resolve host name: %s %s\n",hostName, strerror(errno)); // BUGBUG error code *ipPtr = 0; return False; @@@@ -365,7 +367,7 @@@@ Bool Comm_SocketGetPort(int sock, int *port) { struct sockaddr_in s; - int len; + socklen_t len; ASSERT(port != NULL); @@@@ -376,7 +378,11 @@@@ Comm_SocketGetPort(int sock, int *port) return False; } // use ntohs to convert it back to host order for pc's +#ifdef L_ENDIAN + *port = s.sin_port; +#else *port = ntohs(s.sin_port); +#endif return True; } @@@@ -397,7 +403,7 @@@@ int Comm_SocketGetPeerPort(int sock) { struct sockaddr_in s; - int len; + socklen_t len; len = sizeof(struct sockaddr_in); if (getpeername(sock, (struct sockaddr *)&s, &len) @@@@ -425,7 +431,7 @@@@ Bool Comm_SocketGetPeerIpAddr(int sock, uint *ipAddrPtr) { struct sockaddr_in s; - int len; + socklen_t len; ASSERT(ipAddrPtr != NULL); *ipAddrPtr = 0; @@@@ -435,8 +441,11 @@@@ Comm_SocketGetPeerIpAddr(int sock, uint DE("getpeername: %s\n", strerror(errno)); return False; } - +#ifdef L_ENDIAN + *ipAddrPtr = s.sin_addr.s_addr; +#else *ipAddrPtr = ntohl(s.sin_addr.s_addr); +#endif return True; } @@@@ -528,8 +537,13 @@@@ Comm_CreateListenSock(int port, int *soc // Bind the socket to a well-known port s.sin_family = AF_INET; +#ifdef L_ENDIAN + s.sin_port = port; + s.sin_addr.s_addr = INADDR_ANY; +#else s.sin_port = htons(port); s.sin_addr.s_addr = htonl(INADDR_ANY); +#endif val = bind(sock, (struct sockaddr *) &s, sizeof(s)); if (val < 0) { @@@@ -637,9 +651,13 @@@@ Comm_Connect(int *sockPtr, uint ipAddr, // Now connect to the requested host s.sin_family = AF_INET ; +#ifdef L_ENDIAN + s.sin_port = port; + s.sin_addr.s_addr = ipAddr; +#else s.sin_port = htons(port); s.sin_addr.s_addr = htonl(ipAddr); - +#endif if (connect(sock, (struct sockaddr *) &s, sizeof(s)) < 0) { if (errno == EINTR) { while(1) { @@@@ -700,7 +718,7 @@@@ Comm_Accept(int listenFd, int *newFd) { struct sockaddr_in s; int fd; - int addrLen; + socklen_t addrLen; ASSERT(newFd != NULL); *newFd = -1; @@@@ -754,7 +772,7 @@@@ Comm_SureWrite(int sock, void *bufPtr, i ASSERT(bufLen > 0); errno = 0; // BUGBUG, we should do this for ALL related funcs - for (; bufLen; bufLen -= val, bufPtr += val) { + for (; bufLen; bufLen -= val, (char *)bufPtr += val) { val = write(sock, (const char *)bufPtr, bufLen); writeErrno = errno; @@@@ -880,7 +898,7 @@@@ Comm_SureWriteV(int sock, struct iovec * vecLen--; } else { vecPtr[0].iov_len -= val; - vecPtr[0].iov_base += val; + (char *)vecPtr[0].iov_base += val; break; } } @@@@ -915,7 +933,7 @@@@ Comm_SureRead(int sock, void *bufPtr, in ASSERT(bufLen > 0); errno = 0; // BUGBUG, we should do this for ALL related funcs - for (; bufLen; bufLen -= val, bufPtr += val) { + for (; bufLen; bufLen -= val, (char *)bufPtr += val) { val = read(sock, (char *)bufPtr, bufLen); readErrno = errno; D9("Read from sock %d, bufPtr %08x, bufLen %d, bytes %d\n", @@@@ -1045,7 +1063,7 @@@@ Comm_SureReadV(int sock, struct iovec *v D3("Read fewer bytes than asked for:%d < %d\n", totRead, vecPtr[currVec].iov_len); vecPtr[currVec].iov_len -= val; - vecPtr[currVec].iov_base += val; + (char *)vecPtr[currVec].iov_base += val; break; } } @ 1.3 log @Make build, install and deinstall on NetBSD-2.0/i386. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $ @ 1.2 log @Lots of fixes (bad code in a lot of places) to make this compile and work @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ d3 2 a4 2 --- glunix/src/comm/ccomm_net.cc.orig Wed Oct 15 19:24:52 1997 +++ glunix/src/comm/ccomm_net.cc Sun Mar 30 21:48:41 2003 d15 1 a15 1 @@@@ -258,7 +259,7 @@@@ d24 1 a24 1 @@@@ -328,14 +329,15 @@@@ d46 1 a46 1 @@@@ -365,7 +367,7 @@@@ d55 1 a55 1 @@@@ -376,7 +378,11 @@@@ d67 1 a67 1 @@@@ -397,7 +403,7 @@@@ d76 1 a76 1 @@@@ -425,7 +431,7 @@@@ d85 1 a85 1 @@@@ -435,8 +441,11 @@@@ d98 1 a98 1 @@@@ -528,8 +537,13 @@@@ d112 1 a112 1 @@@@ -637,9 +651,13 @@@@ d127 1 a127 1 @@@@ -700,7 +718,7 @@@@ d136 1 a136 1 @@@@ -754,7 +772,7 @@@@ d145 1 a145 1 @@@@ -880,7 +898,7 @@@@ d154 1 a154 1 @@@@ -915,7 +933,7 @@@@ d163 1 a163 1 @@@@ -1045,7 +1063,7 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 3 --- glunix/src/comm/ccomm_net.cc.orig Wed Oct 15 12:24:52 1997 +++ glunix/src/comm/ccomm_net.cc Thu Apr 2 08:54:18 1998 @@@@ -75,3 +75,4 @@@@ d13 5 a17 1 @@@@ -260,3 +261,3 @@@@ d22 5 a26 1 @@@@ -330,10 +331,11 @@@@ d44 14 a57 1 @@@@ -378,3 +380,7 @@@@ d65 23 a87 1 @@@@ -437,4 +443,7 @@@@ d96 5 a100 1 @@@@ -530,4 +539,9 @@@@ d110 5 a114 1 @@@@ -639,5 +653,9 @@@@ d125 47 @ 1.1.1.1 log @Initial import of glunix-1.0a Thanks to Ross for all the help, and Alistair for fixing some brain damage. A Global Layer Unix for NOW. (Network Of Workstations) @ text @@