--- deliantra/server/socket/init.C 2006/12/11 19:46:47 1.10 +++ deliantra/server/socket/init.C 2006/12/21 06:12:37 1.27 @@ -32,233 +32,161 @@ * The reading of data is handled in ericserver.c */ - #include -#ifndef __CEXTRACT__ -# include -#endif +#include #include #include #include #include +#include +#include #include -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifdef HAVE_ARPA_INET_H -# include -#endif -#include +#include +#include -Socket_Info socket_info; -NewSocket *init_sockets; +sockvec clients; /** * 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::client (int fd, const char *peername) +: fd (fd), host (strdup (peername)), + socket_ev (this, &client::socket_cb), + cmd_ev (this, &client::cmd_cb), + cc_inv (this), cc_other (this) { - SockList sl; - char buf[256]; - int bufsize = 65535; /*Supposed absolute upper limit */ - int oldbufsize; - int buflen = sizeof (int); + { + struct linger linger_opt; - if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1) - { - LOG (llevError, "InitConnection: Error on fcntl.\n"); - } + linger_opt.l_onoff = 0; + linger_opt.l_linger = 0; - 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); - } - } - 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); + if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger))) + LOG (llevError, "SO_LINGER: %s\n", strerror (errno)); + } + + { + int val = IPTOS_LOWDELAY; + + if (setsockopt (fd, IPPROTO_IP, IP_TOS, &val, sizeof (val))) + LOG (llevError, "IP_TOS: %s\n", strerror (errno)); + } + + { + int val = 1; + + if (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val))) + LOG (llevError, "TCP_NODELAY: %s\n", strerror (errno)); + } + +#ifdef __linux__ + { + int val; + + // set some very aggressive keepalive parameters + val = 10; + if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof (val))) + LOG (llevError, "TCP_KEEPIDLE: %s\n", strerror (errno)); + + val = 5; + if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof (val))) + LOG (llevError, "TCP_KEEPCNT: %s\n", strerror (errno)); + + val = 1; + if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof (val))) + LOG (llevError, "TCP_KEEPINTVL: %s\n", strerror (errno)); + } #endif - 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->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)); + { + int bufsize = 65535; /*Supposed absolute upper limit */ + int oldbufsize; + int buflen = sizeof (int); + + 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; + mapx = 11; + mapy = 11; + itemcmd = 1; /* Default is version item1 command */ + + faces_sent = salloc0 (nrofpixmaps); + /* 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; + 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; + // socket I/O is low priority + // we prefer to have the server run instead of handling client requests + socket_ev.prio (PE_PRIO_NORMAL + 1); + socket_ev.fd (fd); + socket_ev.poll (PE_R); + + // command handling is even lower priority + // that way no client can monopolise the server + cmd_ev.prio (PE_PRIO_NORMAL + 2); + + // initialisation done, kick it! + send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); + 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::~client () +{ + if (pl) + pl->socket = 0; + + if (fd >= 0) + close (fd); + + sfree (faces_sent, nrofpixmaps); + free (stats.range); + free (stats.title); + free (host); +} + +void +client::destroy () +{ + destroyed = true; + + socket_ev.suspend (); + cmd_ev.suspend (); +} /** This sets up the socket and reads all the image information into memory. */ void init_ericserver (void) { - struct sockaddr_in insock; - struct protoent *protox; - struct linger linger_opt; - -#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 - - 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 (errno)); - exit (-1); - } - insock.sin_family = AF_INET; - insock.sin_port = htons (settings.csport); - insock.sin_addr.s_addr = htonl (INADDR_ANY); - - 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)); - } - -/* 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 */ - { - int tmp = 1; - 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)); - close (init_sockets[0].fd); - exit (-1); - } - if (listen (init_sockets[0].fd, 5) == (-1)) - { - LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno)); - close (init_sockets[0].fd); - exit (-1); - } - init_sockets[0].status = Ns_Add; read_client_images (); } @@ -275,42 +203,33 @@ { LOG (llevDebug, "Freeing all new client/server information.\n"); free_socket_images (); - free (init_sockets); } -/** - * Frees a socket. - * Basically, all we need to do here is free all data structures that - * might be associated with the socket. It is up to the caller to - * update the list - */ - +/** Sends the 'goodbye' command to the player, and closes connection. */ void -free_newsocket (NewSocket * ns) +final_free_player (player *pl) { - if (close (ns->fd)) - { + free_player (pl); +} -#ifdef ESRV_DEBUG - LOG (llevDebug, "Error closing socket %d\n", ns->fd); -#endif +client * +client::create (int fd, const char *peername) +{ + if (checkbanned (NULL, peername)) + { + LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); + return 0; } + else + { + client *ns = new client (dup (fd), peername); + clients.push_back (ns); - if (ns->stats.range) - free (ns->stats.range); + ns->instantiate (); // effectively a nop right now - if (ns->stats.title) - free (ns->stats.title); + INVOKE_CLIENT (CONNECT, ns); - free (ns->host); - free (ns->inbuf.buf); + return ns; + } } -/** Sends the 'goodbye' command to the player, and closes connection. */ -void -final_free_player (player *pl) -{ - cs_write_string (&pl->socket, "goodbye", 8); - free_newsocket (&pl->socket); - free_player (pl); -}