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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.22 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.31 by root, Mon Jan 15 02:39:41 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
3		3
		4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
5		6
6	This program is free software; you can redistribute it and/or modify	7	This program is free software; you can redistribute it and/or modify
7	it under the terms of the GNU General Public License as published by	8	it under the terms of the GNU General Public License as published by
8	the Free Software Foundation; either version 2 of the License, or	9	the Free Software Foundation; either version 2 of the License, or
40		41
41	#ifdef __linux__	42	#ifdef __linux__
42	# include <sys/types.h>	43	# include <sys/types.h>
43	# include <sys/socket.h>	44	# include <sys/socket.h>
44	# include <netinet/in.h>	45	# include <netinet/in.h>
45	# define TCP_HZ 1000 // sorry...
46	# include <netinet/tcp.h>	46	# include <netinet/tcp.h>
47	#endif	47	#endif
48		48
49	// use a really low timeout, as it doesn't cost any bandwidth, and you can	49	// use a really low timeout, as it doesn't cost any bandwidth, and you can
50	// easily die in 20 seconds...	50	// easily die in 20 seconds...
51	#define SOCKET_TIMEOUT1 10	51	#define SOCKET_TIMEOUT1 10 * 1000
52	#define SOCKET_TIMEOUT2 20	52	#define SOCKET_TIMEOUT2 20 * 1000
53		53
54	void	54	void
55	client::flush ()	55	client::flush ()
56	{	56	{
		57	if (destroyed ())
		58	return;
		59
57	#ifdef __linux__	60	#ifdef __linux__
58	// check time of last ack, and, if too old, kill connection	61	// check time of last ack, and, if too old, kill connection
59	struct tcp_info tcpi;	62	struct tcp_info tcpi;
60	socklen_t len = sizeof (tcpi);	63	socklen_t len = sizeof (tcpi);
61		64
…		…
64	unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;	67	unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
65		68
66	rtt = tcpi.tcpi_rtt;	69	rtt = tcpi.tcpi_rtt;
67	rttvar = tcpi.tcpi_rttvar;	70	rttvar = tcpi.tcpi_rttvar;
68		71
69	if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s	72	if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 < diff && diff < 0x80000000UL // ack delayed for 20s
70	&& SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s	73	&& SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s
71	{	74	{
72	LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,	75	LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
73	(unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);	76	(unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
74	status = Ns_Dead;	77	destroy ();
75	}	78	}
76	}	79	}
77	#endif	80	#endif
78		81
79	/**	82	/**
…		…
111	#endif	114	#endif
112	}	115	}
113	else if (res == 0)	116	else if (res == 0)
114	{	117	{
115	LOG (llevError, "socket write failed, connection closed.\n");	118	LOG (llevError, "socket write failed, connection closed.\n");
116	status = Ns_Dead;	119	destroy ();
117	return;	120	return;
118	}	121	}
119	else if (errno == EINTR)	122	else if (errno == EINTR)
120	{	123	{
121	// just retry	124	// just retry
…		…
128	return;	131	return;
129	}	132	}
130	else	133	else
131	{	134	{
132	LOG (llevError, "socket write failed: %s\n", strerror (errno));	135	LOG (llevError, "socket write failed: %s\n", strerror (errno));
133	status = Ns_Dead;	136	destroy ();
134	return;	137	return;
135	}	138	}
136	}	139	}
137		140
138	socket_ev.poll (socket_ev.poll () & ~PE_W);	141	socket_ev.poll (socket_ev.poll () & ~PE_W);
139	}	142	}
140		143
		144	/******************************************************************************
		145	*
		146	* Start of read routines.
		147	*
		148	******************************************************************************/
		149
		150	int
		151	client::next_packet ()
		152	{
		153	if (inbuf_len >= 2)
		154	{
		155	int pkt_len = (inbuf [0] << 8) \| inbuf [1];
		156
		157	if (inbuf_len >= 2 + pkt_len)
		158	return 2 + pkt_len;
		159
		160	if (inbuf_len == sizeof (inbuf))
		161	{
		162	send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
		163	destroy ();
		164	return -1;
		165	}
		166	}
		167
		168	return 0;
		169	}
		170
		171	void
		172	client::skip_packet (int len)
		173	{
		174	inbuf_len -= len;
		175	memmove (inbuf, inbuf + len, inbuf_len);
		176	}
		177
141	/***********************************************************************	178	/*****************************************************************************
142	*	179	* Start of command dispatch area.
143	* packet functions/utilities	180	* The commands here are protocol commands.
144	*
145	**********************************************************************/	181	****************************************************************************/
146		182
147	packet &packet::operator <<(const data &v)	183	// SocketCommand, PlayingCommand, should not exist with those ugly casts
		184	#define SC(cb) (void )static_cast<void ()(char , int, client )>(cb),
		185	#define PC(cb) (void )static_cast<void ()(char , int, player )>(cb), PF_PLAYER \|
		186
		187	/**
		188	* Dispatch table for the server.
		189	*/
		190	static struct packet_type packets[] = {
		191	{"ncom", PC(NewPlayerCmd) PF_PLAYING },
		192	{"command", PC(PlayerCmd) PF_PLAYING },
		193
		194	{"examine", PC(ExamineCmd) PF_PLAYING },
		195	{"apply", PC(ApplyCmd) PF_PLAYING },
		196	{"lookat", PC(LookAt) PF_PLAYING },
		197	{"lock", PC(LockItem) PF_PLAYING },
		198	{"mark", PC(MarkItem) PF_PLAYING },
		199	{"move", PC(MoveCmd) PF_PLAYING },
		200	{"ext", PC(ExtCmd) 0 }, /* CF+ */
		201	{"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */
		202	{"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
		203
		204	{"reply", SC(ReplyCmd) 0 },
		205	{"exti", SC(ExtiCmd) 0 }, /* CF+ */
		206	{"addme", SC(AddMeCmd) 0 },
		207	{"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
		208	{"requestinfo", SC(RequestInfo) 0 },
		209	{"setfacemode", SC(SetFaceMode) 0 },
		210	{"setsound", SC(SetSound) 0 },
		211	{"setup", SC(SetUp) 0 },
		212	{"version", SC(VersionCmd) 0 },
		213	{"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /Added: tchize /
		214	{"toggleextendedtext", SC(ToggleExtendedText) 0 }, /Added: tchize /
		215	{"asksmooth", SC(AskSmooth) 0 }, /Added: tchize (smoothing technologies) /
		216	};
		217
		218	bool
		219	client::may_execute (const packet_type *pkt) const
148	{	220	{
149	if (room () < v.len)	221	return (!(pkt->flags & PF_PLAYER) \|\| pl)
150	reset ();	222	&& (!(pkt->flags & PF_PLAYING) \|\| state == ST_PLAYING);
		223	}
		224
		225	void
		226	client::execute (const packet_type pkt, char data, int datalen)
		227	{
		228	if (may_execute (pkt))
		229	{
		230	//TODO: only one format
		231	if (pkt->flags & PF_PLAYER)
		232	((void ()(char , int, player ))pkt->cb)((char )data, datalen, pl);
		233	else
		234	((void ()(char , int, client ))pkt->cb)((char )data, datalen, this);
		235	}
151	else	236	else
		237	send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
		238	}
		239
		240	bool
		241	client::handle_packet ()
		242	{
		243	int pkt_len = next_packet ();
		244
		245	if (!pkt_len)
		246	return false;
		247	else if (pkt_len < 0)
		248	{
		249	LOG (llevError, "read error on player %s\n",
		250	pl && pl->ob ? &pl->ob->name : "[anonymous]");
		251	destroy ();
		252	return false;
152	{	253	}
153	if (v.len)	254
		255	inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
		256
		257	/* First, break out beginning word. There are at least
		258	* a few commands that do not have any paremeters. If
		259	* we get such a command, don't worry about trying
		260	* to break it up.
		261	*/
		262	int datalen;
		263	char data = strchr ((char )inbuf + 2, ' ');
		264
		265	if (data)
		266	{
		267	*data++ = 0;
		268	datalen = pkt_len - (data - (char *)inbuf);
		269	}
		270	else
		271	{
		272	data = (char *)inbuf + 2; // better read garbage than segfault
		273	datalen = 0;
		274	}
		275
		276	for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
		277	if (!strcmp ((char *)inbuf + 2, pkt->name))
154	{	278	{
155	memcpy (cur, v.ptr, v.len);	279	if (pkt->flags & PF_PLAYER)
156	cur += v.len;	280	queue_command (pkt, data, datalen);
		281	else
		282	execute (pkt, data, datalen);
		283
		284	goto next_packet;
157	}	285	}
		286
		287	// If we get here, we didn't find a valid command.
		288	send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2);
		289	next_packet:
		290	skip_packet (pkt_len);
		291
		292	// input buffer has space again
		293	socket_ev.poll (socket_ev.poll () \| PE_R);
		294
		295	return true;
		296	}
		297
		298	// callback called when socket is either readable or writable
		299	void
		300	client::socket_cb (iow &w, int got)
		301	{
		302	//TODO remove when we have better socket cleanup logic
		303	if (destroyed ())
158	}	304	{
159		305	socket_ev.poll (0);
160	return *this;	306	return;
161	}
162
163	packet &packet::operator <<(const data8 &v)
164	{
165	unsigned int len = min (v.len, 0x00FF);
166	return *this << uint8 (len) << data (v.ptr, len);
167	}
168
169	packet &packet::operator <<(const data16 &v)
170	{
171	unsigned int len = min (v.len, 0xFFFF);
172	return *this << uint16 (len) << data (v.ptr, len);
173	}
174
175	packet &packet::operator <<(const char *v)
176	{
177	return *this << data (v, strlen (v ? v : 0));
178	}
179
180	void
181	packet::printf (const char *format, ...)
182	{
183	int size = room ();
184
185	va_list ap;
186	va_start (ap, format);
187	int len = vsnprintf ((char *)cur, size, format, ap);
188	va_end (ap);
189
190	if (len >= size)
191	return reset ();
192
193	cur += len;
194	}
195
196	/******************************************************************************
197	*
198	* Start of read routines.
199	*
200	******************************************************************************/
201
202	int
203	client::read_packet ()
204	{
205	for (;;)
206	{	307	}
207	if (inbuf_len >= 2)
208	{
209	unsigned int pkt_len = (inbuf [0] << 8) \| inbuf [1];
210		308
211	if (inbuf_len >= 2 + pkt_len)	309	if (got & PE_W)
212	return pkt_len + 2;	310	{
213	}	311	write_outputbuffer ();
		312
		313	if (!outputbuffer.len)
		314	socket_ev.poll (socket_ev.poll () & ~PE_W);
		315	}
		316
		317	if (got & PE_R)
		318	{
		319	//TODO: rate-limit tcp connection in better ways, important
214		320
215	int amount = sizeof (inbuf) - inbuf_len;	321	int amount = sizeof (inbuf) - inbuf_len;
216		322
217	if (amount <= 0)	323	if (!amount)
218	{	324	{
219	LOG (llevError, "packet too large");//TODO	325	// input buffer full
		326	socket_ev.poll (socket_ev.poll () & ~PE_R);
220	return -1;	327	return;
221	}	328	}
222		329
223	amount = read (fd, inbuf + inbuf_len, amount);	330	amount = read (fd, inbuf + inbuf_len, amount);
224		331
225	if (!amount)	332	if (!amount)
226	{	333	{
227	status = Ns_Dead;	334	destroy ();
228	return -1;	335	return;
229	}	336	}
230	else if (amount < 0)	337	else if (amount < 0)
231	{	338	{
232	if (errno != EAGAIN && errno != EINTR)	339	if (errno != EAGAIN && errno != EINTR)
233	{	340	{
234	LOG (llevError, "read error: %s\n", strerror (errno));	341	LOG (llevError, "read error: %s\n", strerror (errno));
		342	destroy ();
235	return -1;	343	return;
236	}	344	}
237		345
238	return 0;	346	// should not be here, normally
		347	}
		348	else
239	}	349	{
240
241	inbuf_len += amount;	350	inbuf_len += amount;
242		351
243	cst_tot.ibytes += amount;	352	cst_tot.ibytes += amount;
244	cst_lst.ibytes += amount;	353	cst_lst.ibytes += amount;
245	}
246	}
247		354
		355	cmd_ev.start ();
		356	}
		357	}
		358	}
		359
		360	// called whenever we have additional commands to process
248	void	361	void
249	client::skip_packet (int len)	362	client::cmd_cb (iw &w)
250	{	363	{
251	inbuf_len -= len;	364	if (handle_packet ())
252	memmove (inbuf, inbuf + len, inbuf_len);	365	w.start ();
		366	else
		367	flush ();
253	}	368	}
254		369
255	/*******************************************************************************	370	/*******************************************************************************
256	*	371	*
257	* Start of write related routines.	372	* Start of write related routines.
…		…
269	{	384	{
270	char buf = (char )buf_;	385	char buf = (char )buf_;
271	char *pos = buf;	386	char *pos = buf;
272	int amt = 0;	387	int amt = 0;
273		388
274	if (status == Ns_Dead \|\| !buf)	389	if (destroyed () \|\| !buf)
275	{
276	LOG (llevDebug, "Write_To_Socket called with dead socket\n");
277	return;	390	return;
278	}
279		391
280	if ((len + outputbuffer.len) > SOCKETBUFSIZE)	392	if (len + outputbuffer.len > SOCKETBUFSIZE)
281	{	393	{
282	LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd);	394	LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
283	status = Ns_Dead;	395	destroy ();
284	return;	396	return;
285	}	397	}
286		398
287	int avail, end;	399	int avail, end;
288		400
…		…
306	}	418	}
307		419
308	outputbuffer.len += len;	420	outputbuffer.len += len;
309	}	421	}
310		422
311	void
312	client::socket_cb (iow &w, int got)
313	{
314	write_outputbuffer ();
315
316	if (!outputbuffer.len)
317	socket_ev.poll (socket_ev.poll () & ~PE_W);
318	}
319
320	/**	423	/**
321	* Takes a string of data, and writes it out to the socket. A very handy	424	* Takes a string of data, and writes it out to the socket. A very handy
322	* shortcut function.	425	* shortcut function.
323	*/	426	*/
324	void	427	void
325	client::send_packet (packet &sl)	428	client::send_packet (packet &sl)
326	{	429	{
327	if (status == Ns_Dead)	430	if (destroyed ())
328	return;	431	return;
329		432
330	if (sl.length () >= MAXSOCKBUF)	433	if (sl.length () >= MAXSOCKBUF)
331	{	434	{
332	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());	435	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
…		…
358		461
359	void	462	void
360	client::send_packet (const char *buf)	463	client::send_packet (const char *buf)
361	{	464	{
362	send_packet (buf, strlen (buf));	465	send_packet (buf, strlen (buf));
		466	}
		467
		468	void
		469	client::send_packet_printf (const char *format, ...)
		470	{
		471	packet sl;
		472
		473	va_list ap;
		474	va_start (ap, format);
		475	sl.vprintf (format, ap);
		476	va_end (ap);
		477
		478	send_packet (sl);
		479	}
		480
		481	/***********************************************************************
		482	*
		483	* packet functions/utilities
		484	*
		485	**********************************************************************/
		486
		487	packet::packet (const char *name)
		488	{
		489	reset ();
		490
		491	int len = strlen (name);
		492	memcpy (cur, name, len); cur += len;
		493	*cur++ = ' ';
		494	}
		495
		496	packet &packet::operator <<(const data &v)
		497	{
		498	if (room () < v.len)
		499	reset ();
		500	else
		501	{
		502	if (v.len)
		503	{
		504	memcpy (cur, v.ptr, v.len);
		505	cur += v.len;
		506	}
		507	}
		508
		509	return *this;
		510	}
		511
		512	packet &packet::operator <<(const data8 &v)
		513	{
		514	unsigned int len = min (v.len, 0x00FF);
		515	return *this << uint8 (len) << data (v.ptr, len);
		516	}
		517
		518	packet &packet::operator <<(const data16 &v)
		519	{
		520	unsigned int len = min (v.len, 0xFFFF);
		521	return *this << uint16 (len) << data (v.ptr, len);
		522	}
		523
		524	packet &packet::operator <<(const char *v)
		525	{
		526	return *this << data (v, strlen (v ? v : 0));
		527	}
		528
		529	void
		530	packet::vprintf (const char *format, va_list ap)
		531	{
		532	int size = room ();
		533
		534	int len = vsnprintf ((char *)cur, size, format, ap);
		535
		536	if (len >= size)
		537	return reset ();
		538
		539	cur += len;
363	}	540	}
364		541
365	/******************************************************************************	542	/******************************************************************************
366	*	543	*
367	* statistics logging functions.	544	* statistics logging functions.

Diff Legend

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

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.22 by root, Fri Dec 15 19:59:20 2006 UTC vs. Revision 1.31 by root, Mon Jan 15 02:39:41 2007 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.22 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.31 by root, Mon Jan 15 02:39:41 2007 UTC