ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/init.C
(Generate patch)

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.18 by root, Thu Dec 14 21:46:34 2006 UTC vs.
Revision 1.22 by root, Sat Dec 16 21:40:26 2006 UTC

… …
39#include <sys/time.h> 39#include <sys/time.h>
40#include <sys/socket.h> 40#include <sys/socket.h>
41#include <netinet/in.h> 41#include <netinet/in.h>
42#include <netdb.h> 42#include <netdb.h>
43 43
44#ifdef HAVE_UNISTD_H
45# include <unistd.h> 44#include <unistd.h>
46#endif 45#include <arpa/inet.h>
47 46
48#ifdef HAVE_ARPA_INET_H
49# include <arpa/inet.h>
50#endif
51#include <newserver.h>
52
53sockvec client_sockets; 47sockvec clients;
54 48
55/** 49/**
56 * Initializes a connection. Really, it just sets up the data structure, 50 * Initializes a connection. Really, it just sets up the data structure,
57 * socket setup is handled elsewhere. We do send a version to the 51 * socket setup is handled elsewhere. We do send a version to the
58 * client. 52 * client.
59 */ 53 */
60client_socket::client_socket (int fd, const char *peername) 54client::client (int fd, const char *peername)
61: fd (fd), host (strdup (peername)), 55: fd (fd), host (strdup (peername)),
62 socket_ev (this, &client_socket::socket_cb) 56 socket_ev (this, &client::socket_cb),
57 cmd_ev (this, &client::cmd_cb)
63{ 58{
64 { 59 {
65 struct linger linger_opt; 60 struct linger linger_opt;
66 61
67 linger_opt.l_onoff = 0; 62 linger_opt.l_onoff = 0;
… …
95 status = Ns_Add; 90 status = Ns_Add;
96 mapx = 11; 91 mapx = 11;
97 mapy = 11; 92 mapy = 11;
98 itemcmd = 1; /* Default is version item1 command */ 93 itemcmd = 1; /* Default is version item1 command */
99 94
100 faces_sent_len = nrofpixmaps; 95 faces_sent = salloc<uint8> (nrofpixmaps, 0);
101 faces_sent = (uint8 *)calloc (nrofpixmaps, sizeof (*faces_sent));
102 if (!faces_sent)
103 fatal (OUT_OF_MEMORY);
104 96
105 /* Do this so we don't send a face command for the client for 97 /* Do this so we don't send a face command for the client for
106 * this face. Face 0 is sent to the client to say clear 98 * this face. Face 0 is sent to the client to say clear
107 * face information. 99 * face information.
108 */ 100 */
109 faces_sent[0] = NS_FACESENT_FACE; 101 faces_sent[0] = NS_FACESENT_FACE;
110 102
103 // socket I/O is low priority
104 // we prefer to have the server run instead of handling client requests
105 socket_ev.prio (PE_PRIO_NORMAL + 1);
111 socket_ev.fd (fd); 106 socket_ev.fd (fd);
107 socket_ev.poll (PE_R);
108
109 // command handling is even lower priority
110 // that way no client can monopolise the server
111 cmd_ev.prio (PE_PRIO_NORMAL + 2);
112 112
113 // initialisation done, kick it! 113 // initialisation done, kick it!
114
115 {
116 packet sl;
117 sl.printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 114 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
118 send_packet (sl);
119 flush (); 115 flush ();
120 }
121 116
122#if 0//TODO 117#if 0//TODO
123 socket_info.nconns++; 118 socket_info.nconns++;
124 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns; 119 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
125 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns; 120 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
126#endif 121#endif
127} 122}
128 123
129client_socket::~client_socket () 124client::~client ()
125{
126 if (pl)
127 pl->socket = 0;
128
129 if (fd >= 0)
130 close (fd);
131
132 free (faces_sent);
133 free (stats.range);
134 free (stats.title);
135 free (host);
136}
137
138void
139client::destroy ()
130{ 140{
131 status = Ns_Dead; 141 status = Ns_Dead;
142 socket_ev.suspend ();
143 cmd_ev.suspend ();
132} 144}
133 145
134/** This sets up the socket and reads all the image information into memory. */ 146/** This sets up the socket and reads all the image information into memory. */
135void 147void
136init_ericserver (void) 148init_ericserver (void)
137{ 149{
138 struct sockaddr_in insock;
139 struct linger linger_opt;
140
141 memset (&cst_tot, 0, sizeof (CS_Stats));
142 memset (&cst_lst, 0, sizeof (CS_Stats));
143 cst_tot.time_start = time (NULL); 150 cst_tot.time_start = time (NULL);
144 cst_lst.time_start = time (NULL); 151 cst_lst.time_start = time (NULL);
145 152
146 LOG (llevDebug, "Initialize new client/server data\n"); 153 LOG (llevDebug, "Initialize new client/server data\n");
147 154
… …
161{ 168{
162 LOG (llevDebug, "Freeing all new client/server information.\n"); 169 LOG (llevDebug, "Freeing all new client/server information.\n");
163 free_socket_images (); 170 free_socket_images ();
164} 171}
165 172
166/**
167 * Frees a socket.
168 * Basically, all we need to do here is free all data structures that
169 * might be associated with the socket. It is up to the caller to
170 * update the list
171 */
172
173void
174free_newsocket (client_socket *ns)
175{
176 if (ns->fd >= 0)
177 close (ns->fd);
178
179 if (ns->stats.range)
180 free (ns->stats.range);
181
182 if (ns->stats.title)
183 free (ns->stats.title);
184
185 free (ns->host);
186
187 ns->fd = -1;
188 ns->stats.range = 0;
189 ns->stats.title = 0;
190 ns->host = 0;
191}
192
193/** Sends the 'goodbye' command to the player, and closes connection. */ 173/** Sends the 'goodbye' command to the player, and closes connection. */
194void 174void
195final_free_player (player *pl) 175final_free_player (player *pl)
196{ 176{
197 pl->socket->send_packet ("goodbye");
198 free_newsocket (pl->socket);
199 free_player (pl); 177 free_player (pl);
200} 178}
201 179
202bool 180bool
203add_client_socket (int fd, const char *peername) 181add_client (int fd, const char *peername)
204{ 182{
205 if (checkbanned (NULL, peername)) 183 if (checkbanned (NULL, peername))
206 { 184 {
207 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 185 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
208 return false; 186 return false;
209 } 187 }
210 else 188 else
211 { 189 {
212 client_socket *ns = new client_socket (dup (fd), peername); 190 client *ns = new client (dup (fd), peername);
213 client_sockets.push_back (ns); 191 clients.push_back (ns);
214 return true; 192 return true;
215 } 193 }
216} 194}
217 195

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines