[ViewVC] Diff of: cvs/deliantra/server/socket/loop.C

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.5 by root, Sat Sep 9 21:48:29 2006 UTC vs.
Revision 1.8 by pippijn, Mon Dec 11 19:46:47 2006 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/loop.C (file contents): Revision 1.5 by root, Sat Sep 9 21:48:29 2006 UTC vs. Revision 1.8 by pippijn, Mon Dec 11 19:46:47 2006 UTC

Diff Legend

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.5 by root, Sat Sep 9 21:48:29 2006 UTC vs.
Revision 1.8 by pippijn, Mon Dec 11 19:46:47 2006 UTC