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

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.2 by root, Thu Aug 24 13:13:49 2006 UTC vs.
Revision 1.16 by root, Thu Dec 14 22:45:41 2006 UTC

1
2/*
3 * static char *rcsid_loop_c =
4 * "$Id: loop.C,v 1.2 2006/08/24 13:13:49 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 4 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
22 16
23 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 20
27 The author can be reached via e-mail to crossfire-devel@real-time.com 21 The author can be reached via e-mail to <crossfire@schmorp.de>
28*/ 22*/
29 23
30/** 24/**
31 * \file 25 * \file
32 * Main client/server loops. 26 * Main client/server loops.
… …
38 * The reading of data is handled in ericserver.c 32 * The reading of data is handled in ericserver.c
39 */ 33 */
40 34
41 35
42#include <global.h> 36#include <global.h>
43#ifndef __CEXTRACT__
44#include <sproto.h> 37#include <sproto.h>
45#include <sockproto.h> 38#include <sockproto.h>
46#endif
47 39
48#ifndef WIN32 /* ---win32 exclude unix headers */
49#include <sys/types.h> 40#include <sys/types.h>
50#include <sys/time.h> 41#include <sys/time.h>
51#include <sys/socket.h> 42#include <sys/socket.h>
52#include <netinet/in.h> 43#include <netinet/in.h>
53#include <netdb.h> 44#include <netdb.h>
54#endif /* end win32 */
55 45
56#ifdef HAVE_UNISTD_H
57#include <unistd.h> 46#include <unistd.h>
58#endif
59
60#ifdef HAVE_ARPA_INET_H
61#include <arpa/inet.h> 47#include <arpa/inet.h>
62#endif
63 48
64#include <loader.h> 49#include <loader.h>
65#include <newserver.h> 50#include <newserver.h>
66 51
67/***************************************************************************** 52/*****************************************************************************
… …
75 * before player joins, and those happen after the player has joined. 60 * before player joins, and those happen after the player has joined.
76 * As such, we have function types that might be called, so 61 * As such, we have function types that might be called, so
77 * we end up having 2 tables. 62 * we end up having 2 tables.
78 */ 63 */
79 64
80typedef void (*func_uint8_int_ns) (char*, int, NewSocket *); 65typedef void (*func_uint8_int_ns) (char *, int, client_socket *);
81 66
82struct NsCmdMapping { 67struct NsCmdMapping
68{
83 const char *cmdname; 69 const char *cmdname;
84 func_uint8_int_ns cmdproc; 70 func_uint8_int_ns cmdproc;
71 uint8 flag;
85}; 72};
86 73
87typedef void (*func_uint8_int_pl)(char*, int, player *); 74typedef void (*func_uint8_int_pl) (char *, int, player *);
88struct PlCmdMapping { 75struct PlCmdMapping
76{
89 const char *cmdname; 77 const char *cmdname;
90 func_uint8_int_pl cmdproc; 78 func_uint8_int_pl cmdproc;
91 uint8 flag; 79 uint8 flag;
92}; 80};
93 81
94/** 82/**
95 * Dispatch table for the server. 83 * Dispatch table for the server.
96 * 84 *
… …
103 * to cast it here instead of a bunch of times in the function itself. 91 * to cast it here instead of a bunch of times in the function itself.
104 * flag is 1 if the player must be in the playing state to issue the 92 * flag is 1 if the player must be in the playing state to issue the
105 * command, 0 if they can issue it at any time. 93 * command, 0 if they can issue it at any time.
106 */ 94 */
107static struct PlCmdMapping plcommands[] = { 95static struct PlCmdMapping plcommands[] = {
108 { "examine", ExamineCmd, 1}, 96 {"examine", ExamineCmd, 1},
109 { "apply", ApplyCmd, 1}, 97 {"apply", ApplyCmd, 1},
110 { "move", MoveCmd, 1}, 98 {"move", MoveCmd, 1},
111 { "reply", ReplyCmd, 0}, 99 {"reply", ReplyCmd, 0},
112 { "command", PlayerCmd, 1}, 100 {"command", PlayerCmd, 1},
113 { "ncom", (func_uint8_int_pl)NewPlayerCmd, 1}, 101 {"ncom", (func_uint8_int_pl) NewPlayerCmd, 1},
114 { "lookat", LookAt, 1}, 102 {"lookat", LookAt, 1},
115 { "lock", (func_uint8_int_pl)LockItem, 1}, 103 {"lock", (func_uint8_int_pl) LockItem, 1},
116 { "mark", (func_uint8_int_pl)MarkItem, 1}, 104 {"mark", (func_uint8_int_pl) MarkItem, 1},
117 { "mapredraw", MapRedrawCmd, 0}, /* Added: phil */ 105 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */
118 { "mapinfo", MapInfoCmd, 2}, /* CF+ */ 106 {"mapinfo", MapInfoCmd, 2}, /* CF+ */
119 { "ext", ExtCmd, 2}, /* CF+ */ 107 {"ext", ExtCmd, 2}, /* CF+ */
120 { NULL, NULL, 0} /* terminator */ 108 { 0 } /* terminator */
121}; 109};
122 110
123/** Face-related commands */ 111/** Face-related commands */
124static struct NsCmdMapping nscommands[] = { 112static struct NsCmdMapping nscommands[] = {
125 { "addme", AddMeCmd }, 113 {"addme", AddMeCmd, 2},
126 { "askface", SendFaceCmd}, /* Added: phil */ 114 {"askface", SendFaceCmd}, /* Added: phil */
127 { "requestinfo", RequestInfo}, 115 {"requestinfo", RequestInfo},
128 { "setfacemode", SetFaceMode}, 116 {"setfacemode", SetFaceMode, 2},
129 { "setsound", SetSound}, 117 {"setsound", SetSound, 2},
130 { "setup", SetUp}, 118 {"setup", SetUp, 2},
131 { "version", VersionCmd }, 119 {"version", VersionCmd, 2},
132 { "toggleextendedinfos", ToggleExtendedInfos}, /*Added: tchize*/ 120 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
133 { "toggleextendedtext", ToggleExtendedText}, /*Added: tchize*/ 121 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
134 { "asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies)*/ 122 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
135 { NULL, NULL} /* terminator (I, II & III)*/ 123 { 0 } /* terminator (I, II & III) */
136}; 124};
137 125
138/** 126/**
139 * RequestInfo is sort of a meta command. There is some specific 127 * RequestInfo is sort of a meta command. There is some specific
140 * request of information, but we call other functions to provide 128 * request of information, but we call other functions to provide
141 * that information. 129 * that information.
142 */ 130 */
131void
143void RequestInfo(char *buf, int len, NewSocket *ns) 132RequestInfo (char *buf, int len, client_socket * ns)
144{ 133{
145 char *params=NULL, *cp; 134 char *params = NULL, *cp;
135
146 /* No match */ 136 /* No match */
147 char bigbuf[MAX_BUF]; 137 char bigbuf[MAX_BUF];
148 int slen; 138 int slen;
149 139
150 /* Set up replyinfo before we modify any of the buffers - this is used 140 /* Set up replyinfo before we modify any of the buffers - this is used
151 * if we don't find a match. 141 * if we don't find a match.
152 */ 142 */
153 strcpy(bigbuf,"replyinfo "); 143 strcpy (bigbuf, "replyinfo ");
154 slen = strlen(bigbuf); 144 slen = strlen (bigbuf);
155 safe_strcat(bigbuf, buf, &slen, MAX_BUF); 145 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
156 146
157 /* find the first space, make it null, and update the 147 /* find the first space, make it null, and update the
158 * params pointer. 148 * params pointer.
159 */ 149 */
160 for (cp = buf; *cp != '\0'; cp++) 150 for (cp = buf; *cp != '\0'; cp++)
161 if (*cp==' ') { 151 if (*cp == ' ')
152 {
162 *cp = '\0'; 153 *cp = '\0';
163 params = cp + 1; 154 params = cp + 1;
164 break; 155 break;
165 } 156 }
166 if (!strcmp(buf, "image_info")) send_image_info(ns, params); 157
167 else if (!strcmp(buf,"image_sums")) send_image_sums(ns, params); 158 if (!strcmp (buf, "image_info"))
168 else if (!strcmp(buf,"skill_info")) send_skill_info(ns, params); 159 send_image_info (ns, params);
169 else if (!strcmp(buf,"spell_paths")) send_spell_paths(ns, params); 160 else if (!strcmp (buf, "image_sums"))
170 else Write_String_To_Socket(ns, bigbuf, len); 161 send_image_sums (ns, params);
162 else if (!strcmp (buf, "skill_info"))
163 send_skill_info (ns, params);
164 else if (!strcmp (buf, "spell_paths"))
165 send_spell_paths (ns, params);
166 else
167 ns->send_packet (bigbuf, len);
171} 168}
172
173/**
174 * Handles old socket format.
175 */
176void Handle_Oldsocket(NewSocket *ns)
177{
178 int stat,i;
179 CommFunc command;
180 char buf[MAX_BUF],*cp;
181 object ob;
182 player pl;
183
184 /* This is not the most efficient block, but keeps the code simpler -
185 * we basically read a byte at a time until we get a newline, error,
186 * or no more characters to read.
187 */
188 do {
189 /* hack to disable old socket mode without creating too many conflicts */
190 if (1 || ns->inbuf.len >= MAXSOCKBUF-1) {
191 ns->status = Ns_Dead;
192 LOG(llevDebug, "Old input socket sent too much data without newline\n");
193 return;
194 }
195#ifdef WIN32 /* ***win32: change oldsocket read() to recv() */
196 stat = recv(ns->fd, ns->inbuf.buf + ns->inbuf.len, 1,0);
197
198 if (stat==-1 && WSAGetLastError() !=WSAEWOULDBLOCK) {
199#else
200 do {
201 stat = read(ns->fd, ns->inbuf.buf + ns->inbuf.len, 1);
202 } while ((stat<0) && (errno == EINTR));
203
204 if (stat<0 && errno != EAGAIN && errno !=EWOULDBLOCK) {
205#endif
206 LOG(llevError, "Cannot read from socket: %s\n", strerror_local(errno));
207 ns->status = Ns_Dead;
208 return;
209 }
210 if (stat == 0) return;
211 } while (ns->inbuf.buf[ns->inbuf.len++]!='\n');
212
213 ns->inbuf.buf[ns->inbuf.len]=0;
214
215 cp = strchr((const char*)ns->inbuf.buf, ' ');
216 if (cp) {
217 /* Replace the space with a null, skip any more spaces */
218 *cp++=0;
219 while (isspace(*cp)) cp++;
220 }
221
222 /* Strip off all spaces and control characters from end of line */
223 for (i=ns->inbuf.len-1; i>=0; i--) {
224 if (ns->inbuf.buf[i]<=32) ns->inbuf.buf[i]=0;
225 else break;
226 }
227 ns->inbuf.len=0; /* reset for next read */
228
229 /* If just a return, don't do anything */
230 if (ns->inbuf.buf[0] == 0) return;
231 if (!strcasecmp((const char*)ns->inbuf.buf,"quit")) {
232 ns->status = Ns_Dead;
233 return;
234 }
235 if (!strcasecmp((const char*)ns->inbuf.buf, "listen")) {
236 if (cp) {
237 char *buf="Socket switched to listen mode\n";
238
239 free(ns->comment);
240 ns->comment = strdup_local(cp);
241 ns->old_mode = Old_Listen;
242 cs_write_string(ns, buf, strlen(buf));
243 } else {
244 char *buf="Need to supply a comment/url to listen\n";
245 cs_write_string(ns, buf, strlen(buf));
246 }
247 return;
248 }
249 if (!strcasecmp((const char*)ns->inbuf.buf, "name")) {
250 char *cp1=NULL;
251 if (cp) cp1= strchr(cp, ' ');
252 if (cp1) {
253 *cp1++ = 0;
254 while (isspace(*cp1)) cp1++;
255 }
256 if (!cp || !cp1) {
257 char *buf="Need to provide a name/password to name\n";
258 cs_write_string(ns, buf, strlen(buf));
259 return;
260 }
261
262 if (verify_player(cp, cp1)==0) {
263 char *buf="Welcome back\n";
264 free(ns->comment);
265 ns->comment = strdup_local(cp);
266 ns->old_mode = Old_Player;
267 cs_write_string(ns, buf, strlen(buf));
268 }
269 else if (verify_player(cp, cp1)==2) {
270 ns->password_fails++;
271 if (ns->password_fails >= MAX_PASSWORD_FAILURES) {
272 char *buf="You failed to log in too many times, you will now be kicked.\n";
273 LOG(llevInfo, "A player connecting from %s in oldsocketmode has been dropped for password failure\n",
274 ns->host);
275 cs_write_string(ns, buf, strlen(buf));
276 ns->status = Ns_Dead;
277 }
278 else {
279 char *buf="Could not login you in. Check your name and password.\n";
280 cs_write_string(ns, buf, strlen(buf));
281 }
282 }
283 else {
284 char *buf="Could not login you in. Check your name and password.\n";
285 cs_write_string(ns, buf, strlen(buf));
286 }
287 return;
288 }
289
290 command = find_oldsocket_command((char*)ns->inbuf.buf);
291 if (!command && ns->old_mode==Old_Player) {
292 command = find_oldsocket_command2((char*)ns->inbuf.buf);
293 }
294 if (!command) {
295 snprintf(buf, sizeof(buf), "Could not find command: %s\n", ns->inbuf.buf);
296 cs_write_string(ns, buf, strlen(buf));
297 return;
298 }
299
300 /* This is a bit of a hack, but works. Basically, we make some
301 * fake object and player pointers and give at it.
302 * This works as long as the functions we are calling don't need
303 * to do anything to the object structure (ie, they are only
304 * outputting information and not actually updating anything much.)
305 */
306 ob.contr = &pl;
307 pl.ob = &ob;
308 ob.type = PLAYER;
309 pl.listening = 10;
310 pl.socket = *ns;
311 pl.outputs_count = 1;
312 ob.name = ns->comment;
313
314 command(&ob, cp);
315}
316
317 169
318/** 170/**
319 * Handle client input. 171 * Handle client input.
320 * 172 *
321 * HandleClient is actually not named really well - we only get here once 173 * HandleClient is actually not named really well - we only get here once
… …
323 * sock is the output socket information. pl is the player associated 175 * sock is the output socket information. pl is the player associated
324 * with this socket, null if no player (one of the init_sockets for just 176 * with this socket, null if no player (one of the init_sockets for just
325 * starting a connection) 177 * starting a connection)
326 */ 178 */
327 179
180void
328void HandleClient(NewSocket *ns, player *pl) 181HandleClient (client_socket *ns, player *pl)
329{ 182{
330 int len=0,i,cnt;
331 char *data;
332
333 /* Loop through this - maybe we have several complete packets here. */ 183 /* Loop through this - maybe we have several complete packets here. */
334 // limit to a few commands only, though, as to not monopolise the server 184 // limit to a few commands only, though, as to not monopolise the server
335 for (cnt = 16; cnt--; ) { 185 for (int repeat = 16; repeat--;)
186 {
336 /* If it is a player, and they don't have any speed left, we 187 /* If it is a player, and they don't have any speed left, we
337 * return, and will read in the data when they do have time. 188 * return, and will read in the data when they do have time.
338 */ 189 */
339 if (pl && pl->state==ST_PLAYING && pl->ob != NULL && pl->ob->speed_left < 0) { 190 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)
340 return; 191 return;
341 }
342
343 if (ns->status == Ns_Old) {
344 Handle_Oldsocket(ns);
345 return;
346 }
347 i=SockList_ReadPacket(ns->fd, &ns->inbuf, MAXSOCKBUF-1);
348 /* Special hack - let the user switch to old mode if in the Ns_Add
349 * phase. Don't demand they add in the special length bytes
350 */
351 if (ns->status == Ns_Add) {
352 if (!strncasecmp((const char*)ns->inbuf.buf,"oldsocketmode", 13)) {
353 ns->status = Ns_Old;
354 ns->inbuf.len=0;
355 cs_write_string(ns, "Switched to old socket mode\n", 28);
356 LOG(llevDebug,"Switched socket to old socket mode\n");
357 return;
358 }
359 }
360 192
361 if (i<0) { 193 int pkt_len = ns->read_packet ();
362#ifdef ESRV_DEBUG 194
363 LOG(llevDebug,"HandleClient: Read error on connection player %s\n", (pl?pl->ob->name:"None")); 195 if (pkt_len < 0)
364#endif 196 {
197 LOG (llevError, "read error on player %s\n", &pl->ob->name);
365 /* Caller will take care of cleaning this up */ 198 /* Caller will take care of cleaning this up */
366 ns->status =Ns_Dead; 199 ns->status = Ns_Dead;
367 return; 200 return;
368 } 201 }
202 else if (pkt_len == 0)
369 /* Still dont have a full packet */ 203 /* Still dont have a full packet */
370 if (i==0) return; 204 return;
371 205
372// //D//TODO//temporarily log long commands
373// if (ns->inbuf.len >= 40 && pl && pl->ob)
374// LOG (llevDebug, "HandleClient: long comamnd from <%s,%s> %d<%s>\n", pl->ob->name, ns->host, ns->inbuf.len, ns->inbuf.buf + 2);
375
376 /* First, break out beginning word. There are at least 206 /* First, break out beginning word. There are at least
377 * a few commands that do not have any paremeters. If 207 * a few commands that do not have any paremeters. If
378 * we get such a command, don't worry about trying 208 * we get such a command, don't worry about trying
379 * to break it up. 209 * to break it up.
380 */ 210 */
381 data = (char *)strchr((char*)ns->inbuf.buf +2, ' '); 211 int datalen;
382 if (data) { 212 char *data = strchr ((char *)ns->inbuf + 2, ' ');
383 *data='\0';
384 data++;
385 len = ns->inbuf.len - (data - (char*)ns->inbuf.buf);
386 }
387 else len=0;
388 213
214 if (data)
215 {
216 *data++ = 0;
217 datalen = pkt_len - (data - (char *)ns->inbuf);
218 }
219 else
220 {
221 data = (char *)ns->inbuf + 2; // better read garbage than segfault
222 datalen = 0;
223 }
224
389 ns->inbuf.buf[ns->inbuf.len]='\0'; /* Terminate buffer - useful for string data */ 225 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
226
390 for (i=0; nscommands[i].cmdname !=NULL; i++) { 227 for (int i = 0; nscommands[i].cmdname; i++)
228 {
391 if (strcmp((char*)ns->inbuf.buf+2,nscommands[i].cmdname)==0) { 229 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname))
392 nscommands[i].cmdproc((char*)data,len,ns); 230 {
393 ns->inbuf.len=0; 231 nscommands[i].cmdproc (data, datalen, ns);
232 ns->skip_packet (pkt_len);
394 return;//D// not doing this causes random memory corruption 233 //D// not doing this causes random memory corruption
234 if (nscommands[i].flag & 2)
395 goto next_packet; 235 goto next_packet;
396 } 236 return;
397 } 237 }
238 }
239
398 /* Player must be in the playing state or the flag on the 240 /* Player must be in the playing state or the flag on the
399 * the command must be zero for the user to use the command - 241 * the command must be zero for the user to use the command -
400 * otherwise, a player cam save, be in the play_again state, and 242 * otherwise, a player cam save, be in the play_again state, and
401 * the map they were on gets swapped out, yet things that try to look 243 * the map they were on gets swapped out, yet things that try to look
402 * at the map causes a crash. If the command is valid, but 244 * at the map causes a crash. If the command is valid, but
403 * one they can't use, we still swallow it up. 245 * one they can't use, we still swallow it up.
404 */ 246 */
405 if (pl) for (i=0; plcommands[i].cmdname !=NULL; i++) { 247 if (pl)
248 for (int i = 0; plcommands[i].cmdname; i++)
249 {
406 if (strcmp((char*)ns->inbuf.buf+2,plcommands[i].cmdname)==0) { 250 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname))
251 {
407 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 252 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
408 plcommands[i].cmdproc((char*)data,len,pl); 253 plcommands[i].cmdproc ((char *) data, datalen, pl);
409 ns->inbuf.len=0; 254
255 ns->skip_packet (pkt_len);
410 //D// not doing this causes random memory corruption 256 //D// not doing this causes random memory corruption
411 if (plcommands[i].flag & 2) 257 if (plcommands[i].flag & 2)
412 goto next_packet; 258 goto next_packet;
259
413 return; 260 return;
414 } 261 }
415 } 262 }
263
416 /* If we get here, we didn't find a valid command. Logging 264 /* If we get here, we didn't find a valid command. Logging
417 * this might be questionable, because a broken client/malicious 265 * this might be questionable, because a broken client/malicious
418 * user could certainly send a whole bunch of invalid commands. 266 * user could certainly send a whole bunch of invalid commands.
419 */ 267 */
420 LOG(llevDebug,"Bad command from client (%s)\n",ns->inbuf.buf+2); 268 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
269 ns->skip_packet (pkt_len);
421 next_packet: 270 next_packet:
422 ; 271 ;
423 } 272 }
424} 273}
425 274
275void
276flush_sockets (void)
277{
278 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
279 if ((*i)->status != Ns_Dead)
280 (*i)->flush ();
281}
426 282
427/*****************************************************************************
428 *
429 * Low level socket looping - select calls and watchdog udp packet
430 * sending.
431 *
432 ******************************************************************************/
433
434#ifdef WATCHDOG
435/** 283/**
436 * Tell watchdog that we are still alive
437 *
438 * I put the function here since we should hopefully already be getting
439 * all the needed include files for socket support
440 */
441
442void watchdog(void)
443{
444 static int fd=-1;
445 static struct sockaddr_in insock;
446
447 if (fd==-1)
448 {
449 struct protoent *protoent;
450
451 if ((protoent=getprotobyname("udp"))==NULL ||
452 (fd=socket(PF_INET, SOCK_DGRAM, protoent->p_proto))==-1)
453 {
454 return;
455 }
456 insock.sin_family=AF_INET;
457 insock.sin_port=htons((unsigned short)13325);
458 insock.sin_addr.s_addr=inet_addr("127.0.0.1");
459 }
460 sendto(fd,(void *)&fd,1,0,(struct sockaddr *)&insock,sizeof(insock));
461}
462#endif
463
464void flush_sockets(void)
465{
466 player *pl;
467
468 for (pl = first_player; pl != NULL; pl = pl->next)
469 if (pl->socket.status != Ns_Dead)
470 Socket_Flush (&pl->socket);
471}
472
473/**
474 * This checks the sockets for input and exceptions, does the right thing. 284 * This checks the sockets for input, does the right thing.
475 * 285 *
476 * A bit of this code is grabbed out of socket.c 286 * A bit of this code is grabbed out of socket.c
477 * There are 2 lists we need to look through - init_sockets is a list 287 * There are 2 lists we need to look through - init_sockets is a list
478 * 288 *
479 */ 289 */
290void
480void doeric_server(void) 291doeric_server (void)
481{ 292{
482 int i, pollret; 293 int i, pollret;
483 fd_set tmp_read, tmp_exceptions, tmp_write; 294 fd_set tmp_read;
484 struct sockaddr_in addr; 295 struct sockaddr_in addr;
485 socklen_t addrlen=sizeof(struct sockaddr); 296 socklen_t addrlen = sizeof (struct sockaddr);
486 player *pl, *next; 297 player *pl, *next;
298 int maxfd = 0;
487 299
488#ifdef CS_LOGSTATS 300#ifdef CS_LOGSTATS
489 if ((time(NULL)-cst_lst.time_start)>=CS_LOGTIME) 301 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
490 write_cs_stats(); 302 write_cs_stats ();
491#endif 303#endif
492 304
493 FD_ZERO(&tmp_read); 305 /* Go through the players. Let the loop set the next pl value,
494 FD_ZERO(&tmp_write); 306 * since we may remove some
495 FD_ZERO(&tmp_exceptions); 307 */
308 //TODO: must be handled cleanly elsewhere
309 for (pl = first_player; pl; )
310 {
311 player *npl = pl->next;
496 312
497 for(i=0;i<socket_info.allocated_sockets;i++) { 313 //TODO: must be handled cleanly elsewhere
498 if (init_sockets[i].status == Ns_Dead) { 314 if (pl->socket->status == Ns_Dead)
499 free_newsocket(&init_sockets[i]); 315 {
500 init_sockets[i].status = Ns_Avail; 316 save_player (pl->ob, 0);
501 socket_info.nconns--; 317
502 } else if (init_sockets[i].status != Ns_Avail){ 318 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
503 FD_SET((uint32)init_sockets[i].fd, &tmp_read); 319 {
504 FD_SET((uint32)init_sockets[i].fd, &tmp_write); 320 terminate_all_pets (pl->ob);
505 FD_SET((uint32)init_sockets[i].fd, &tmp_exceptions); 321 pl->ob->remove ();
506 } 322 }
323
324 leave (pl, 1);
325 final_free_player (pl);
326 }
327
328 pl = npl;
507 } 329 }
508 330
509 /* Go through the players. Let the loop set the next pl value, 331 FD_ZERO (&tmp_read);
510 * since we may remove some
511 */
512 for (pl=first_player; pl!=NULL; ) {
513 if (pl->socket.status == Ns_Dead) {
514 player *npl=pl->next;
515 332
516 save_player(pl->ob, 0); 333 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); )
517 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) { 334 {
518 terminate_all_pets(pl->ob); 335 client_socket *s = *i;
519 remove_ob(pl->ob); 336
520 } 337 if (s->status == Ns_Dead)
521 leave(pl,1); 338 {
522 final_free_player(pl); 339 client_sockets.erase (i);
523 pl=npl; 340 delete s;
524 } 341 }
525 else { 342 else
526 FD_SET((uint32)pl->socket.fd, &tmp_read); 343 {
527 FD_SET((uint32)pl->socket.fd, &tmp_write); 344 if (s->fd > maxfd) maxfd = s->fd;
528 FD_SET((uint32)pl->socket.fd, &tmp_exceptions); 345
529 pl=pl->next; 346 FD_SET (s->fd, &tmp_read);
530 } 347
348 ++i;
349 }
531 } 350 }
532 351
533 /* Reset timeout each time, since some OS's will change the values on 352 struct timeval timeout;
534 * the return from select. 353
535 */ 354 timeout.tv_sec = 0;
536 socket_info.timeout.tv_sec = 0;
537 socket_info.timeout.tv_usec = 0; 355 timeout.tv_usec = 0;
538 356
539 pollret= select(socket_info.max_filedescriptor, &tmp_read, &tmp_write, 357 pollret = select (maxfd + 1,
540 &tmp_exceptions, &socket_info.timeout); 358 &tmp_read, 0, 0,
359 &timeout);
541 360
542 if (pollret==-1) { 361 if (pollret == -1)
362 {
543 LOG(llevError, "select failed: %s\n", strerror_local(errno)); 363 LOG (llevError, "select failed: %s\n", strerror (errno));
544 return; 364 return;
545 } 365 }
546 366
547 /* We need to do some of the processing below regardless */ 367 /* We need to do some of the processing below regardless */
548/* if (!pollret) return;*/
549 368
550 /* Following adds a new connection */
551 if (pollret && FD_ISSET(init_sockets[0].fd, &tmp_read)) {
552 int newsocknum=0;
553
554#ifdef ESRV_DEBUG
555 LOG(llevDebug,"doeric_server: New Connection\n");
556#endif
557 /* If this is the case, all sockets currently in used */
558 if (socket_info.allocated_sockets <= socket_info.nconns) {
559 init_sockets = (NewSocket *) realloc(init_sockets,sizeof(NewSocket)*(socket_info.nconns+1));
560 if (!init_sockets) fatal(OUT_OF_MEMORY);
561 newsocknum = socket_info.allocated_sockets;
562 socket_info.allocated_sockets++;
563 init_sockets[newsocknum].faces_sent_len = nrofpixmaps;
564 init_sockets[newsocknum].faces_sent = (uint8*) malloc(nrofpixmaps*sizeof(*init_sockets[newsocknum].faces_sent));
565 if (!init_sockets[newsocknum].faces_sent) fatal(OUT_OF_MEMORY);
566 init_sockets[newsocknum].status = Ns_Avail;
567 }
568 else {
569 int j;
570
571 for (j=1; j<socket_info.allocated_sockets; j++)
572 if (init_sockets[j].status == Ns_Avail) {
573 newsocknum=j;
574 break;
575 }
576 }
577 init_sockets[newsocknum].fd=accept(init_sockets[0].fd, (struct sockaddr *)&addr, &addrlen);
578 if (init_sockets[newsocknum].fd==-1) {
579 LOG(llevError, "accept failed: %s\n", strerror_local(errno));
580 }
581 else {
582 char buf[MAX_BUF];
583 long ip;
584 NewSocket *ns;
585
586 ns = &init_sockets[newsocknum];
587
588 ip = ntohl(addr.sin_addr.s_addr);
589 sprintf(buf, "%ld.%ld.%ld.%ld", (ip>>24)&255, (ip>>16)&255, (ip>>8)&255, ip&255);
590
591 if (checkbanned(NULL, buf)) {
592 LOG(llevInfo, "Banned host tried to connect: [%s]\n", buf);
593 close(init_sockets[newsocknum].fd);
594 init_sockets[newsocknum].fd = -1;
595 }
596 else {
597 InitConnection(ns, buf);
598 socket_info.nconns++;
599 }
600 }
601 }
602
603 /* Check for any exceptions/input on the sockets */ 369 /* Check for any input on the sockets */
604 if (pollret) for(i=1;i<socket_info.allocated_sockets;i++) { 370 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
605 if (init_sockets[i].status == Ns_Avail) continue;
606 if (FD_ISSET(init_sockets[i].fd,&tmp_exceptions)) {
607 free_newsocket(&init_sockets[i]);
608 init_sockets[i].status = Ns_Avail;
609 socket_info.nconns--;
610 continue;
611 }
612 if (FD_ISSET(init_sockets[i].fd, &tmp_read)) {
613 HandleClient(&init_sockets[i], NULL);
614 }
615 if (FD_ISSET(init_sockets[i].fd, &tmp_write)) {
616 init_sockets[i].can_write=1;
617 }
618 } 371 {
372 client_socket *s = *i;
373 player *pl = s->pl;
619 374
620 /* This does roughly the same thing, but for the players now */ 375 //TODO: disassociate handleclient from socket readin
621 for (pl=first_player; pl!=NULL; pl=next) { 376 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
622
623 next=pl->next;
624 if (pl->socket.status==Ns_Dead) continue;
625
626 if (FD_ISSET(pl->socket.fd,&tmp_write)) {
627 if (!pl->socket.can_write) {
628#if 0
629 LOG(llevDebug,"Player %s socket now write enabled\n", pl->ob->name);
630#endif
631 pl->socket.can_write=1;
632 write_socket_buffer(&pl->socket);
633 }
634 /* if we get an error on the write_socket buffer, no reason to
635 * continue on this socket.
636 */
637 if (pl->socket.status==Ns_Dead) continue;
638 }
639 else pl->socket.can_write=0;
640
641 if (FD_ISSET(pl->socket.fd,&tmp_exceptions)) {
642 save_player(pl->ob, 0);
643 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) {
644 terminate_all_pets(pl->ob);
645 remove_ob(pl->ob);
646 }
647 leave(pl,1);
648 final_free_player(pl);
649 }
650 else {
651 HandleClient(&pl->socket, pl); 377 HandleClient (s, pl);
652 /* If the player has left the game, then the socket status
653 * will be set to this be the leave function. We don't
654 * need to call leave again, as it has already been called
655 * once.
656 */
657 if (pl->socket.status==Ns_Dead) {
658 save_player(pl->ob, 0);
659 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) {
660 terminate_all_pets(pl->ob);
661 remove_ob(pl->ob);
662 }
663 leave(pl,1);
664 final_free_player(pl);
665 } else {
666 378
379 //TODO: should not be done here, either
380 if (s->status != Ns_Dead && pl)
381 {
667 /* Update the players stats once per tick. More efficient than 382 /* Update the players stats once per tick. More efficient than
668 * sending them whenever they change, and probably just as useful 383 * sending them whenever they change, and probably just as useful
669 */ 384 */
670 esrv_update_stats(pl); 385 esrv_update_stats (pl);
671 if (pl->last_weight != -1 && pl->last_weight != WEIGHT(pl->ob)) { 386 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
387 {
672 esrv_update_item(UPD_WEIGHT, pl->ob, pl->ob); 388 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
673 if(pl->last_weight != WEIGHT(pl->ob)) 389 if (pl->last_weight != WEIGHT (pl->ob))
674 LOG(llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", (unsigned long)pl->last_weight, WEIGHT(pl->ob)); 390 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
675 } 391 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
392 }
393
676 /* draw_client_map does sanity checking that map is 394 /* draw_client_map does sanity checking that map is
677 * valid, so don't do it here. 395 * valid, so don't do it here.
678 */ 396 */
679 draw_client_map(pl->ob); 397 draw_client_map (pl->ob);
680 if (pl->socket.update_look) esrv_draw_look(pl->ob); 398 if (s->update_look)
681 } 399 esrv_draw_look (pl->ob);
682 } 400 }
683 } 401 }
684} 402}
403

Diff Legend

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