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

Diff Legend

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