--- deliantra/server/socket/init.C 2006/08/21 07:13:32 1.4 +++ deliantra/server/socket/init.C 2006/12/14 21:46:34 1.18 @@ -1,9 +1,4 @@ /* - * static char *rcsid_init_c = - * "$Id: init.C,v 1.4 2006/08/21 07:13:32 root Exp $"; - */ - -/* CrossFire, A Multiplayer game for X-windows Copyright (C) 2001 Mark Wedel @@ -23,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - The author can be reached via e-mail to crossfire-devel@real-time.com + The author can be reached via e-mail to */ /** @@ -39,255 +34,118 @@ #include -#ifndef __CEXTRACT__ #include -#endif -#ifndef WIN32 /* ---win32 exclude include files */ #include #include #include #include #include -#endif /* win32 */ #ifdef HAVE_UNISTD_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #include -Socket_Info socket_info; -NewSocket *init_sockets; +sockvec client_sockets; /** * Initializes a connection. Really, it just sets up the data structure, * socket setup is handled elsewhere. We do send a version to the * client. */ -void InitConnection(NewSocket *ns, const char *from_ip) +client_socket::client_socket (int fd, const char *peername) +: fd (fd), host (strdup (peername)), + socket_ev (this, &client_socket::socket_cb) { - SockList sl; - char buf[256]; - int bufsize=65535; /*Supposed absolute upper limit */ - int oldbufsize; - int buflen=sizeof(int); + { + struct linger linger_opt; -#ifdef WIN32 /* ***WIN32 SOCKET: init win32 non blocking socket */ - int temp = 1; + linger_opt.l_onoff = 0; + linger_opt.l_linger = 0; - 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 */ + if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger))) + LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); + } - if (getsockopt(ns->fd,SOL_SOCKET,SO_SNDBUF, (char*)&oldbufsize, (socklen_t*) &buflen)==-1) - 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); - } - } - buflen=sizeof(oldbufsize); - getsockopt(ns->fd,SOL_SOCKET,SO_SNDBUF, (char*)&oldbufsize, (socklen_t*) &buflen); -#ifdef ESRV_DEBUG - LOG(llevDebug, "Socket buffer size now %d bytes\n", oldbufsize); -#endif + { + int bufsize = 65535; /*Supposed absolute upper limit */ + int oldbufsize; + int buflen = sizeof (int); - ns->faceset = 0; - ns->facecache = 0; - ns->image2 = 0; - ns->sound = 0; - ns->exp64 = 0; - ns->monitor_spells = 0; - 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; - ns->itemcmd = 1; /* Default is version item1 command*/ - ns->ext_mapinfos=0; /*extendedmapinfo datas*/ - ns->EMI_smooth=0; - ns->look_position = 0; - ns->update_look = 0; - ns->has_readable_type = 0; - ns->supported_readables = 0; - ns->monitor_spells = 0; - ns->mapinfocmd = 0; - ns->extcmd = 0; - ns->extmap = 0; - - /* we should really do some checking here - if total clients overflows - * we need to do something more intelligent, because client id's will start - * duplicating (not likely in normal cases, but malicous attacks that - * just open and close connections could get this total up. - */ - ns->inbuf.len=0; - ns->inbuf.buf= (unsigned char*) malloc( sizeof( unsigned char ) * MAXSOCKBUF ); - /* Basic initialization. Needed because we do a check in - * HandleClient for oldsocketmode without checking the - * length of data. - */ - memset( ns->inbuf.buf, 0, sizeof( unsigned char ) * MAXSOCKBUF ); - memset(&ns->lastmap,0,sizeof(struct Map)); - memset(ns->faces_sent, 0, ns->faces_sent_len*sizeof(*ns->faces_sent)); - memset(&ns->anims_sent,0,sizeof(ns->anims_sent)); - memset(&ns->stats,0,sizeof(struct statsinfo)); - /* Do this so we don't send a face command for the client for - * this face. Face 0 is sent to the client to say clear - * face information. - */ - ns->faces_sent[0] = NS_FACESENT_FACE; - - ns->outputbuffer.start=0; - ns->outputbuffer.len=0; - ns->can_write=1; - ns->password_fails = 0; - - ns->current_map = 0; - ns->current_x = 0; - ns->current_y = 0; - ns->client[0] = 0; - ns->buggy_mapscroll = 0; - - ns->sent_scroll=0; - ns->host=strdup_local(from_ip); - sprintf((char*)buf, "version %d %d %s\n", VERSION_CS,VERSION_SC, VERSION_INFO); - sl.buf=(unsigned char*)buf; - sl.len=strlen((char*)buf); - Send_With_Handling(ns, &sl); -#ifdef CS_LOGSTATS - if (socket_info.nconns>cst_tot.max_conn) - cst_tot.max_conn = socket_info.nconns; - if (socket_info.nconns>cst_lst.max_conn) - cst_lst.max_conn = socket_info.nconns; + if (fcntl (fd, F_SETFL, O_NONBLOCK) == -1) + LOG (llevError, "InitConnection: Error on fcntl.\n"); + + if (getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1) + oldbufsize = 0; + + if (oldbufsize < bufsize) + if (setsockopt (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 (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); + } + + mapmode = Map0Cmd; + darkness = 1; + status = Ns_Add; + mapx = 11; + mapy = 11; + itemcmd = 1; /* Default is version item1 command */ + + faces_sent_len = nrofpixmaps; + faces_sent = (uint8 *)calloc (nrofpixmaps, sizeof (*faces_sent)); + if (!faces_sent) + fatal (OUT_OF_MEMORY); + + /* Do this so we don't send a face command for the client for + * this face. Face 0 is sent to the client to say clear + * face information. + */ + faces_sent[0] = NS_FACESENT_FACE; + + socket_ev.fd (fd); + + // initialisation done, kick it! + + { + packet sl; + sl.printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); + send_packet (sl); + flush (); + } + +#if 0//TODO + socket_info.nconns++; + if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns; + if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns; #endif } +client_socket::~client_socket () +{ + status = Ns_Dead; +} /** This sets up the socket and reads all the image information into memory. */ -void init_ericserver(void) +void +init_ericserver (void) { - struct sockaddr_in insock; - 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; - socket_info.nconns=0; - -#ifdef CS_LOGSTATS - memset(&cst_tot, 0, sizeof(CS_Stats)); - memset(&cst_lst, 0, sizeof(CS_Stats)); - cst_tot.time_start=time(NULL); - cst_lst.time_start=time(NULL); -#endif - - LOG(llevDebug,"Initialize new client/server data\n"); - socket_info.nconns = 1; - init_sockets = (NewSocket *) malloc(sizeof(NewSocket)); - init_sockets[0].faces_sent = NULL; /* unused */ - socket_info.allocated_sockets=1; - - protox = getprotobyname("tcp"); - if (protox==NULL) { - 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); - } - insock.sin_family = AF_INET; - insock.sin_port = htons(settings.csport); - insock.sin_addr.s_addr = htonl(INADDR_ANY); + struct sockaddr_in insock; + struct linger linger_opt; - 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_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 - * 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 + memset (&cst_tot, 0, sizeof (CS_Stats)); + memset (&cst_lst, 0, sizeof (CS_Stats)); + cst_tot.time_start = time (NULL); + cst_lst.time_start = time (NULL); - 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)); - } -#endif + LOG (llevDebug, "Initialize new client/server data\n"); - 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)); -#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_local(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(); + read_client_images (); } @@ -298,11 +156,11 @@ ******************************************************************************/ /** Free's all the memory that ericserver allocates. */ -void free_all_newserver(void) -{ - LOG(llevDebug,"Freeing all new client/server information.\n"); - free_socket_images(); - free(init_sockets); +void +free_all_newserver (void) +{ + LOG (llevDebug, "Freeing all new client/server information.\n"); + free_socket_images (); } /** @@ -312,34 +170,48 @@ * update the list */ -void free_newsocket(NewSocket *ns) +void +free_newsocket (client_socket *ns) { -#ifdef WIN32 /* ***win32: closesocket in windows style */ - shutdown(ns->fd,SD_BOTH); - if (closesocket(ns->fd)) { -#else - if (close(ns->fd)) { -#endif /* win32 */ + if (ns->fd >= 0) + 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); + if (ns->stats.range) + free (ns->stats.range); + + if (ns->stats.title) + free (ns->stats.title); + + free (ns->host); + + ns->fd = -1; + ns->stats.range = 0; + ns->stats.title = 0; + ns->host = 0; } /** Sends the 'goodbye' command to the player, and closes connection. */ -void final_free_player(player *pl) +void +final_free_player (player *pl) +{ + pl->socket->send_packet ("goodbye"); + free_newsocket (pl->socket); + free_player (pl); +} + +bool +add_client_socket (int fd, const char *peername) { - cs_write_string(&pl->socket, "goodbye", 8); - free_newsocket(&pl->socket); - free_player(pl); + if (checkbanned (NULL, peername)) + { + LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); + return false; + } + else + { + client_socket *ns = new client_socket (dup (fd), peername); + client_sockets.push_back (ns); + return true; + } }