diff options
-rw-r--r-- | src/Utils.c | 82 |
1 files changed, 29 insertions, 53 deletions
diff --git a/src/Utils.c b/src/Utils.c index 03af45b..4f9bbcc 100644 --- a/src/Utils.c +++ b/src/Utils.c @@ -35,36 +35,12 @@ static char *rcsid = "$Header$"; CCTK_FILEVERSION(Development_Socket) -/* #if defined(ANSI) || defined(__STDC__) */ -#ifdef __STDC__ -/* -u_long htonl(u_long hostlong); -u_short htons(u_short hostshort); -u_long ntohl(u_long netlong); -u_short ntohs(u_short netshort); - -int inet_aton(const char *cp, struct in_addr *pin); -unsigned long inet_addr(const char *cp); -unsigned long inet_network(const char *cp); -char *inet_ntoa(struct in_addr in); -struct in_addr inet_makeaddr(int net, int lna); -unsigned long inet_lnaof(struct in_addr in); -unsigned long inet_netof(struct in_addr in); -*/ -#else -u_short htons(); -u_short ntohs(); -u_long inet_addr(); -#endif - /* SunOS doesn't know INADDR_NONE */ #ifndef INADDR_NONE #define INADDR_NONE (-1) #endif -extern int errno; - /*@@ @routine Socket_TCPOpenClientSock @date 1991 @@ -84,19 +60,19 @@ int Socket_TCPOpenClientSock(const char *hostname,int port) struct hostent *phe; /* struct servent *pse; */ struct protoent *ppe; - struct sockaddr_in sin; + struct sockaddr_in s_in; int s /*,type*/; - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_addr.s_addr=INADDR_ANY; - sin.sin_port = htons((u_short)port); + memset(&s_in, 0, sizeof(s_in)); + s_in.sin_family = AF_INET; + s_in.sin_addr.s_addr=INADDR_ANY; + s_in.sin_port = htons((u_short)port); if((phe=gethostbyname(hostname)) != NULL) { - memcpy(&sin.sin_addr, phe->h_addr, phe->h_length); + memcpy(&s_in.sin_addr, phe->h_addr, phe->h_length); } - else if((sin.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) + else if((s_in.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) { fprintf(stderr,"can\'t find host %s \n",hostname); } @@ -112,7 +88,7 @@ int Socket_TCPOpenClientSock(const char *hostname,int port) fprintf(stderr,"couldn\'t allocate socket on host %s: port %u\n",hostname,port); return s; } - if(connect(s,(struct sockaddr *)&sin, sizeof(sin)) < 0) + if(connect(s,(struct sockaddr *)&s_in, sizeof(s_in)) < 0) { perror(""); fprintf(stderr,"couldn\'t connect to host %s: port %u\n",hostname,port); @@ -141,19 +117,19 @@ int Socket_UDPOpenClientSock(const char *hostname,int port) struct hostent *phe; /* struct servent *pse; */ struct protoent *ppe; - struct sockaddr_in sin; + struct sockaddr_in s_in; int sock/*,type*/; - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_addr.s_addr=INADDR_ANY; - sin.sin_port = htons((u_short)port); + memset(&s_in, 0, sizeof(s_in)); + s_in.sin_family = AF_INET; + s_in.sin_addr.s_addr=INADDR_ANY; + s_in.sin_port = htons((u_short)port); if((phe=gethostbyname(hostname)) != NULL) { - memcpy(&sin.sin_addr, phe->h_addr, phe->h_length); + memcpy(&s_in.sin_addr, phe->h_addr, phe->h_length); } - else if((sin.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) + else if((s_in.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) { fprintf(stderr,"can\'t find host %s \n",hostname); } @@ -169,7 +145,7 @@ int Socket_UDPOpenClientSock(const char *hostname,int port) fprintf(stderr,"couldn\'t allocate socket on host %s: port %u\n",hostname,port); return sock; } - if(bind(sock,(struct sockaddr *)&sin,sizeof(sin)) <0) + if(bind(sock,(struct sockaddr *)&s_in,sizeof(s_in)) <0) { close(sock); perror("client: bind failed"); @@ -177,7 +153,7 @@ int Socket_UDPOpenClientSock(const char *hostname,int port) } - /* if(connect(s,(struct sockaddr *)&sin, sizeof(sin)) < 0) + /* if(connect(s,(struct sockaddr *)&s_in, sizeof(s_in)) < 0) {` perror(""); fprintf(stderr,"couldn\'t connect to host %s: port %u\n",hostname,port); @@ -205,13 +181,13 @@ int Socket_TCPOpenServerSock(int port) { /* struct servent *pse; */ struct protoent *ppe; - struct sockaddr_in sin; + struct sockaddr_in s_in; int s/*,type*/; const int on = 1; - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = INADDR_ANY; - sin.sin_port = htons((u_short)port); + memset(&s_in, 0, sizeof(s_in)); + s_in.sin_family = AF_INET; + s_in.sin_addr.s_addr = INADDR_ANY; + s_in.sin_port = htons((u_short)port); if((ppe=getprotobyname("tcp")) == NULL) { @@ -232,7 +208,7 @@ int Socket_TCPOpenServerSock(int port) close(s); return -1; } - if(bind(s,(struct sockaddr *)&sin, sizeof(sin)) < 0) + if(bind(s,(struct sockaddr *)&s_in, sizeof(s_in)) < 0) { fprintf (stderr, "couldn\'t bind to port %u: %s\n", port, strerror (errno)); close(s); @@ -263,12 +239,12 @@ int Socket_UDPOpenServerSock(int port) { /* struct servent *pse; */ struct protoent *ppe; - struct sockaddr_in sin; + struct sockaddr_in s_in; int s/*,type*/; - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = INADDR_ANY; - sin.sin_port = htons((u_short)port); + memset(&s_in, 0, sizeof(s_in)); + s_in.sin_family = AF_INET; + s_in.sin_addr.s_addr = INADDR_ANY; + s_in.sin_port = htons((u_short)port); if((ppe=getprotobyname("udp")) == 0) { @@ -281,7 +257,7 @@ int Socket_UDPOpenServerSock(int port) fprintf(stderr,"couldn\'t create socket on port %u\n",port); return s; } - if(bind(s,(struct sockaddr *)&sin, sizeof(sin)) < 0) + if(bind(s,(struct sockaddr *)&s_in, sizeof(s_in)) < 0) { fprintf(stderr,"couldn\'t bind to port %u\n",port); close(s); |