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.5 by root, Sat Sep 9 21:48:29 2006 UTC vs.
Revision 1.6 by root, Sun Sep 10 13:43:33 2006 UTC

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

Diff Legend

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