--- deliantra/server/socket/init.C 2006/08/21 07:13:32 1.4 +++ deliantra/server/socket/init.C 2006/08/29 08:01:38 1.5 @@ -1,6 +1,6 @@ /* * static char *rcsid_init_c = - * "$Id: init.C,v 1.4 2006/08/21 07:13:32 root Exp $"; + * "$Id: init.C,v 1.5 2006/08/29 08:01:38 root Exp $"; */ /* @@ -76,25 +76,25 @@ int buflen=sizeof(int); #ifdef WIN32 /* ***WIN32 SOCKET: init win32 non blocking socket */ - int temp = 1; + int temp = 1; - if(ioctlsocket(ns->fd, FIONBIO , &temp) == -1) - LOG(llevError,"InitConnection: Error on ioctlsocket.\n"); + if(ioctlsocket(ns->fd, FIONBIO , &temp) == -1) + LOG(llevError,"InitConnection: Error on ioctlsocket.\n"); #else if (fcntl(ns->fd, F_SETFL, O_NONBLOCK)==-1) { - LOG(llevError,"InitConnection: Error on fcntl.\n"); + LOG(llevError,"InitConnection: Error on fcntl.\n"); } #endif /* end win32 */ if (getsockopt(ns->fd,SOL_SOCKET,SO_SNDBUF, (char*)&oldbufsize, (socklen_t*) &buflen)==-1) - oldbufsize=0; + oldbufsize=0; if (oldbufsizefd,SOL_SOCKET,SO_SNDBUF, (char*)&bufsize, sizeof(&bufsize))) { - LOG(llevError,"InitConnection: setsockopt unable to set output buf size to %d\n", bufsize); - } + if(setsockopt(ns->fd,SOL_SOCKET,SO_SNDBUF, (char*)&bufsize, sizeof(&bufsize))) { + LOG(llevError,"InitConnection: setsockopt unable to set output buf size to %d\n", bufsize); + } } buflen=sizeof(oldbufsize); getsockopt(ns->fd,SOL_SOCKET,SO_SNDBUF, (char*)&oldbufsize, (socklen_t*) &buflen); @@ -169,9 +169,9 @@ Send_With_Handling(ns, &sl); #ifdef CS_LOGSTATS if (socket_info.nconns>cst_tot.max_conn) - cst_tot.max_conn = socket_info.nconns; + cst_tot.max_conn = socket_info.nconns; if (socket_info.nconns>cst_lst.max_conn) - cst_lst.max_conn = socket_info.nconns; + cst_lst.max_conn = socket_info.nconns; #endif } @@ -184,12 +184,12 @@ struct linger linger_opt; #ifdef WIN32 /* ***win32 - we init a windows socket */ - WSADATA w; + WSADATA w; - socket_info.max_filedescriptor = 1; /* used in select, ignored in winsockets */ - WSAStartup (0x0101,&w); /* this setup all socket stuff */ - /* ill include no error tests here, winsocket 1.1 should always work */ - /* except some old win95 versions without tcp/ip stack */ + socket_info.max_filedescriptor = 1; /* used in select, ignored in winsockets */ + WSAStartup (0x0101,&w); /* this setup all socket stuff */ + /* ill include no error tests here, winsocket 1.1 should always work */ + /* except some old win95 versions without tcp/ip stack */ #else /* non windows */ #ifdef HAVE_SYSCONF @@ -222,13 +222,13 @@ protox = getprotobyname("tcp"); if (protox==NULL) { - LOG(llevError,"init_ericserver: Error getting protox\n"); - return; + LOG(llevError,"init_ericserver: Error getting protox\n"); + return; } init_sockets[0].fd = socket(PF_INET, SOCK_STREAM, protox->p_proto); if (init_sockets[0].fd == -1) { - LOG(llevError, "Cannot create socket: %s\n", strerror_local(errno)); - exit(-1); + LOG(llevError, "Cannot create socket: %s\n", strerror_local(errno)); + exit(-1); } insock.sin_family = AF_INET; insock.sin_port = htons(settings.csport); @@ -238,7 +238,7 @@ linger_opt.l_linger = 0; if(setsockopt(init_sockets[0].fd,SOL_SOCKET,SO_LINGER,(char *) &linger_opt, sizeof(struct linger))) { - LOG(llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror_local(errno)); + LOG(llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror_local(errno)); } /* Would be nice to have an autoconf check for this. It appears that * these functions are both using the same calling syntax, just one @@ -253,38 +253,38 @@ #ifdef WIN32 char tmp = 1; #else - int tmp =1; + int tmp =1; #endif - if(setsockopt(init_sockets[0].fd,SOL_SOCKET,SO_REUSEADDR, &tmp, sizeof(tmp))) { - LOG(llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror_local(errno)); - } + if(setsockopt(init_sockets[0].fd,SOL_SOCKET,SO_REUSEADDR, &tmp, sizeof(tmp))) { + LOG(llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror_local(errno)); + } } #else if(setsockopt(init_sockets[0].fd,SOL_SOCKET,SO_REUSEADDR,(char *)NULL,0)) { - LOG(llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror_local(errno)); + LOG(llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror_local(errno)); } #endif if (bind(init_sockets[0].fd,(struct sockaddr *)&insock,sizeof(insock)) == (-1)) { - LOG(llevError, "Cannot bind socket to port %d: %s\n", ntohs(insock.sin_port), strerror_local(errno)); + LOG(llevError, "Cannot bind socket to port %d: %s\n", ntohs(insock.sin_port), strerror_local(errno)); #ifdef WIN32 /* ***win32: close() -> closesocket() */ - shutdown(init_sockets[0].fd,SD_BOTH); - closesocket(init_sockets[0].fd); + shutdown(init_sockets[0].fd,SD_BOTH); + closesocket(init_sockets[0].fd); #else - close(init_sockets[0].fd); + close(init_sockets[0].fd); #endif /* win32 */ - exit(-1); + exit(-1); } if (listen(init_sockets[0].fd,5) == (-1)) { - LOG(llevError, "Cannot listen on socket: %s\n", strerror_local(errno)); + LOG(llevError, "Cannot listen on socket: %s\n", strerror_local(errno)); #ifdef WIN32 /* ***win32: close() -> closesocket() */ - shutdown(init_sockets[0].fd,SD_BOTH); - closesocket(init_sockets[0].fd); + shutdown(init_sockets[0].fd,SD_BOTH); + closesocket(init_sockets[0].fd); #else - close(init_sockets[0].fd); + close(init_sockets[0].fd); #endif /* win32 */ - exit(-1); + exit(-1); } init_sockets[0].status=Ns_Add; read_client_images(); @@ -315,22 +315,22 @@ void free_newsocket(NewSocket *ns) { #ifdef WIN32 /* ***win32: closesocket in windows style */ - shutdown(ns->fd,SD_BOTH); + shutdown(ns->fd,SD_BOTH); if (closesocket(ns->fd)) { #else if (close(ns->fd)) { #endif /* win32 */ #ifdef ESRV_DEBUG - LOG(llevDebug,"Error closing socket %d\n", ns->fd); + LOG(llevDebug,"Error closing socket %d\n", ns->fd); #endif } if (ns->stats.range) - free(ns->stats.range); + free(ns->stats.range); if (ns->stats.title) free(ns->stats.title); if (ns->comment) - free(ns->comment); + free(ns->comment); free(ns->host); free(ns->inbuf.buf); }