--- deliantra/server/socket/init.C 2006/09/14 22:34:05 1.8 +++ deliantra/server/socket/init.C 2006/12/13 02:55:51 1.11 @@ -34,16 +34,12 @@ #include -#ifndef __CEXTRACT__ -# include -#endif -#ifndef WIN32 /* ---win32 exclude include files */ -# include -# include -# include -# include -# include -#endif /* win32 */ +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include @@ -63,7 +59,7 @@ * client. */ void -InitConnection (NewSocket * ns, const char *from_ip) +InitConnection (NewSocket *ns, const char *from_ip) { SockList sl; char buf[256]; @@ -71,30 +67,16 @@ int oldbufsize; int buflen = sizeof (int); -#ifdef WIN32 /* ***WIN32 SOCKET: init win32 non blocking socket */ - int temp = 1; - - 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"); - } -#endif /* end win32 */ + LOG (llevError, "InitConnection: Error on fcntl.\n"); if (getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1) oldbufsize = 0; + if (oldbufsize < bufsize) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "Default buffer size was %d bytes, will reset it to %d\n", oldbufsize, bufsize); -#endif - 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); - } - } + 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); #ifdef ESRV_DEBUG @@ -110,8 +92,6 @@ ns->mapmode = Map0Cmd; ns->darkness = 1; ns->status = Ns_Add; - ns->comment = NULL; - ns->old_mode = (Old_Mode) 0; ns->mapx = 11; ns->mapy = 11; ns->newmapcmd = 0; @@ -183,25 +163,7 @@ struct protoent *protox; struct linger linger_opt; -#ifdef WIN32 /* ***win32 - we init a windows socket */ - 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 */ -#else /* non windows */ - -# ifdef HAVE_SYSCONF socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX); -# else -# ifdef HAVE_GETDTABLESIZE - socket_info.max_filedescriptor = getdtablesize (); -# else - "Unable to find usable function to get max filedescriptors"; -# endif -# endif -#endif /* win32 */ socket_info.timeout.tv_sec = 0; socket_info.timeout.tv_usec = 0; @@ -226,12 +188,14 @@ 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 (errno)); exit (-1); } + insock.sin_family = AF_INET; insock.sin_port = htons (settings.csport); insock.sin_addr.s_addr = htonl (INADDR_ANY); @@ -239,60 +203,29 @@ linger_opt.l_onoff = 0; 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 (errno)); - } + LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (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 - * of them needs extra valus passed. - */ -#if defined(__osf__) || defined(hpux) || defined(sgi) || defined(NeXT) || \ - defined(__sun__) || defined(__linux__) || defined(SVR4) || \ - defined(__FreeBSD__) || defined(__OpenBSD__) || \ - defined(WIN32) /* ---win32 add this here */ || \ - defined(__GNU__) /* HURD */ { -# ifdef WIN32 - char tmp = 1; -# else 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 (errno)); - } - } -#else - if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, (char *) NULL, 0)) - { LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (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 (errno)); -#ifdef WIN32 /* ***win32: close() -> closesocket() */ - shutdown (init_sockets[0].fd, SD_BOTH); - closesocket (init_sockets[0].fd); -#else close (init_sockets[0].fd); -#endif /* win32 */ exit (-1); } + if (listen (init_sockets[0].fd, 5) == (-1)) { LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno)); -#ifdef WIN32 /* ***win32: close() -> closesocket() */ - shutdown (init_sockets[0].fd, SD_BOTH); - closesocket (init_sockets[0].fd); -#else close (init_sockets[0].fd); -#endif /* win32 */ exit (-1); } + init_sockets[0].status = Ns_Add; read_client_images (); } @@ -321,27 +254,16 @@ */ void -free_newsocket (NewSocket * ns) +free_newsocket (NewSocket *ns) { -#ifdef WIN32 /* ***win32: closesocket in windows style */ - shutdown (ns->fd, SD_BOTH); - if (closesocket (ns->fd)) - { -#else - if (close (ns->fd)) - { -#endif /* win32 */ + close (ns->fd); -#ifdef ESRV_DEBUG - LOG (llevDebug, "Error closing socket %d\n", ns->fd); -#endif - } if (ns->stats.range) free (ns->stats.range); + if (ns->stats.title) free (ns->stats.title); - if (ns->comment) - free (ns->comment); + free (ns->host); free (ns->inbuf.buf); }