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.3 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.10 by root, Wed Dec 13 02:55:51 2006 UTC

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

Diff Legend

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