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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.21 by root, Fri Dec 15 00:14:13 2006 UTC vs.
Revision 1.23 by root, Sat Dec 16 03:08:26 2006 UTC

…		…
33	*/	33	*/
34		34
35	using namespace std;	35	using namespace std;
36		36
37	#include <global.h>	37	#include <global.h>
38	#include <newclient.h>
39	#include <sproto.h>	38	#include <sproto.h>
40	#include <cstdarg>	39	#include <cstdarg>
41		40
42	#ifdef __linux__	41	#ifdef __linux__
43	# include <sys/types.h>	42	# include <sys/types.h>
…		…
51	// easily die in 20 seconds...	50	// easily die in 20 seconds...
52	#define SOCKET_TIMEOUT1 10	51	#define SOCKET_TIMEOUT1 10
53	#define SOCKET_TIMEOUT2 20	52	#define SOCKET_TIMEOUT2 20
54		53
55	void	54	void
56	client_socket::flush ()	55	client::flush ()
57	{	56	{
58	#ifdef __linux__	57	#ifdef __linux__
59	// check time of last ack, and, if too old, kill connection	58	// check time of last ack, and, if too old, kill connection
60	struct tcp_info tcpi;	59	struct tcp_info tcpi;
61	socklen_t len = sizeof (tcpi);	60	socklen_t len = sizeof (tcpi);
…		…
70	if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s	69	if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s
71	&& SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s	70	&& SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s
72	{	71	{
73	LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,	72	LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
74	(unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);	73	(unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
75	status = Ns_Dead;	74	destroy ();
76	}	75	}
77	}	76	}
78	#endif	77	#endif
79		78
80	/**	79	/**
…		…
89		88
90	write_outputbuffer ();	89	write_outputbuffer ();
91	}	90	}
92		91
93	void	92	void
94	client_socket::write_outputbuffer ()	93	client::write_outputbuffer ()
95	{	94	{
96	while (outputbuffer.len)	95	while (outputbuffer.len)
97	{	96	{
98	int res = write (fd, outputbuffer.data + outputbuffer.start,	97	int res = write (fd, outputbuffer.data + outputbuffer.start,
99	min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));	98	min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
…		…
112	#endif	111	#endif
113	}	112	}
114	else if (res == 0)	113	else if (res == 0)
115	{	114	{
116	LOG (llevError, "socket write failed, connection closed.\n");	115	LOG (llevError, "socket write failed, connection closed.\n");
117	status = Ns_Dead;	116	destroy ();
118	return;	117	return;
119	}	118	}
120	else if (errno == EINTR)	119	else if (errno == EINTR)
121	{	120	{
122	// just retry	121	// just retry
…		…
129	return;	128	return;
130	}	129	}
131	else	130	else
132	{	131	{
133	LOG (llevError, "socket write failed: %s\n", strerror (errno));	132	LOG (llevError, "socket write failed: %s\n", strerror (errno));
134	status = Ns_Dead;	133	destroy ();
135	return;	134	return;
136	}	135	}
137	}	136	}
138		137
139	socket_ev.poll (socket_ev.poll () & ~PE_W);	138	socket_ev.poll (socket_ev.poll () & ~PE_W);
140	}	139	}
141		140
		141	/******************************************************************************
		142	*
		143	* Start of read routines.
		144	*
		145	******************************************************************************/
		146
		147	int
		148	client::next_packet ()
		149	{
		150	if (inbuf_len >= 2)
		151	{
		152	int pkt_len = (inbuf [0] << 8) \| inbuf [1];
		153
		154	if (inbuf_len >= 2 + pkt_len)
		155	return 2 + pkt_len;
		156
		157	if (inbuf_len == sizeof (inbuf))
		158	{
		159	send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
		160	destroy ();
		161	return -1;
		162	}
		163	}
		164
		165	return 0;
		166	}
		167
		168	void
		169	client::skip_packet (int len)
		170	{
		171	inbuf_len -= len;
		172	memmove (inbuf, inbuf + len, inbuf_len);
		173	}
		174
142	/***********************************************************************	175	/*****************************************************************************
143	*	176	* Start of command dispatch area.
144	* packet functions/utilities	177	* The commands here are protocol commands.
145	*
146	**********************************************************************/	178	****************************************************************************/
147		179
148	packet &packet::operator <<(const data &v)	180	// SocketCommand, PlayingCommand, should not exist with those ugly casts
		181	#define SC(cb) (void )static_cast<void ()(char , int, client )>(cb),
		182	#define PC(cb) (void )static_cast<void ()(char , int, player )>(cb), PF_PLAYER \|
		183
		184	/**
		185	* Dispatch table for the server.
		186	*/
		187	static struct packet_type packets[] = {
		188	{"ncom", PC(NewPlayerCmd) PF_PLAYING },
		189	{"command", PC(PlayerCmd) PF_PLAYING },
		190
		191	{"examine", PC(ExamineCmd) PF_PLAYING },
		192	{"apply", PC(ApplyCmd) PF_PLAYING },
		193	{"reply", PC(ReplyCmd) PF_IMMEDIATE },
		194	{"lookat", PC(LookAt) PF_PLAYING },
		195	{"lock", PC(LockItem) PF_PLAYING },
		196	{"mark", PC(MarkItem) PF_PLAYING },
		197	{"move", PC(MoveCmd) PF_PLAYING },
		198	{"exti", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */
		199	{"ext", PC(ExtCmd) 0 }, /* CF+ */
		200	{"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */
		201	{"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
		202
		203	{"addme", SC(AddMeCmd) PF_IMMEDIATE },
		204	{"askface", SC(SendFaceCmd) PF_IMMEDIATE }, /* Added: phil */
		205	{"requestinfo", SC(RequestInfo) PF_IMMEDIATE },
		206	{"setfacemode", SC(SetFaceMode) PF_IMMEDIATE },
		207	{"setsound", SC(SetSound) PF_IMMEDIATE },
		208	{"setup", SC(SetUp) PF_IMMEDIATE },
		209	{"version", SC(VersionCmd) PF_IMMEDIATE },
		210	{"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /Added: tchize /
		211	{"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /Added: tchize /
		212	{"asksmooth", SC(AskSmooth) PF_IMMEDIATE }, /Added: tchize (smoothing technologies) /
		213	};
		214
		215	bool
		216	client::may_execute (const packet_type *pkt) const
149	{	217	{
150	if (room () < v.len)	218	return (!(pkt->flags & PF_PLAYER) \|\| pl)
151	reset ();	219	&& (!(pkt->flags & PF_PLAYING) \|\| (pl && pl->state == ST_PLAYING));
		220	}
		221
		222	void
		223	client::execute (const packet_type pkt, char data, int datalen)
		224	{
		225	if (may_execute (pkt))
		226	{
		227	//TODO: only one format
		228	if (pkt->flags & PF_PLAYER)
		229	((void ()(char , int, player ))pkt->cb)((char )data, datalen, pl);
		230	else
		231	((void ()(char , int, client ))pkt->cb)((char )data, datalen, this);
		232	}
152	else	233	else
		234	send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
		235	}
		236
		237	bool
		238	client::handle_packet ()
		239	{
		240	int pkt_len = next_packet ();
		241
		242	if (!pkt_len)
		243	return false;
		244	else if (pkt_len < 0)
		245	{
		246	LOG (llevError, "read error on player %s\n",
		247	pl && pl->ob ? &pl->ob->name : "[anonymous]");
		248	destroy ();
		249	return false;
153	{	250	}
154	if (v.len)	251
		252	inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
		253
		254	/* First, break out beginning word. There are at least
		255	* a few commands that do not have any paremeters. If
		256	* we get such a command, don't worry about trying
		257	* to break it up.
		258	*/
		259	int datalen;
		260	char data = strchr ((char )inbuf + 2, ' ');
		261
		262	if (data)
		263	{
		264	*data++ = 0;
		265	datalen = pkt_len - (data - (char *)inbuf);
		266	}
		267	else
		268	{
		269	data = (char *)inbuf + 2; // better read garbage than segfault
		270	datalen = 0;
		271	}
		272
		273	for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
		274	if (!strcmp ((char *)inbuf + 2, pkt->name))
155	{	275	{
156	memcpy (cur, v.ptr, v.len);	276	if (pkt->flags & PF_IMMEDIATE)
157	cur += v.len;	277	execute (pkt, data, datalen);
		278	else
		279	queue_command (pkt, data, datalen);
		280
		281	goto next_packet;
158	}	282	}
		283
		284	/* If we get here, we didn't find a valid command. Logging
		285	* this might be questionable, because a broken client/malicious
		286	* user could certainly send a whole bunch of invalid commands.
		287	*/
		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 (status == Ns_Dead)
159	}	304	{
160		305	socket_ev.poll (0);
161	return *this;	306	return;
162	}
163
164	packet &packet::operator <<(const data8 &v)
165	{
166	unsigned int len = min (v.len, 0x00FF);
167	return *this << uint8 (len) << data (v.ptr, len);
168	}
169
170	packet &packet::operator <<(const data16 &v)
171	{
172	unsigned int len = min (v.len, 0xFFFF);
173	return *this << uint16 (len) << data (v.ptr, len);
174	}
175
176	packet &packet::operator <<(const char *v)
177	{
178	return *this << data (v, strlen (v ? v : 0));
179	}
180
181	void
182	packet::printf (const char *format, ...)
183	{
184	int size = room ();
185
186	va_list ap;
187	va_start (ap, format);
188	int len = vsnprintf ((char *)cur, size, format, ap);
189	va_end (ap);
190
191	if (len >= size)
192	return reset ();
193
194	cur += len;
195	}
196
197	/******************************************************************************
198	*
199	* Start of read routines.
200	*
201	******************************************************************************/
202
203	int
204	client_socket::read_packet ()
205	{
206	for (;;)
207	{	307	}
208	if (inbuf_len >= 2)
209	{
210	unsigned int pkt_len = (inbuf [0] << 8) \| inbuf [1];
211		308
212	if (inbuf_len >= 2 + pkt_len)	309	if (got & PE_W)
213	return pkt_len + 2;	310	{
214	}	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
215		320
216	int amount = sizeof (inbuf) - inbuf_len;	321	int amount = sizeof (inbuf) - inbuf_len;
217		322
218	if (amount <= 0)	323	if (!amount)
219	{	324	{
220	LOG (llevError, "packet too large");//TODO	325	// input buffer full
		326	socket_ev.poll (socket_ev.poll () & ~PE_R);
221	return -1;	327	return;
222	}	328	}
223		329
224	amount = read (fd, inbuf + inbuf_len, amount);	330	amount = read (fd, inbuf + inbuf_len, amount);
225		331
226	if (!amount)	332	if (!amount)
227	{	333	{
228	status = Ns_Dead;	334	destroy ();
229	return -1;	335	return;
230	}	336	}
231	else if (amount < 0)	337	else if (amount < 0)
232	{	338	{
233	if (errno != EAGAIN && errno != EINTR)	339	if (errno != EAGAIN && errno != EINTR)
234	{	340	{
235	LOG (llevError, "read error: %s\n", strerror (errno));	341	LOG (llevError, "read error: %s\n", strerror (errno));
		342	destroy ();
236	return -1;	343	return;
237	}	344	}
238		345
239	return 0;	346	// should not be here, normally
		347	}
		348	else
240	}	349	{
241
242	inbuf_len += amount;	350	inbuf_len += amount;
243		351
244	cst_tot.ibytes += amount;	352	cst_tot.ibytes += amount;
245	cst_lst.ibytes += amount;	353	cst_lst.ibytes += amount;
246	}
247	}
248		354
		355	cmd_ev.start ();
		356	}
		357	}
		358	}
		359
		360	// called whenever we have additional commands to process
249	void	361	void
250	client_socket::skip_packet (int len)	362	client::cmd_cb (iw &w)
251	{	363	{
252	inbuf_len -= len;	364	if (handle_packet () \|\| handle_command ())
253	memmove (inbuf, inbuf + len, inbuf_len);	365	w.start ();
		366	else
		367	flush ();
254	}	368	}
255		369
256	/*******************************************************************************	370	/*******************************************************************************
257	*	371	*
258	* Start of write related routines.	372	* Start of write related routines.
…		…
264	*	378	*
265	* ns is the socket we are adding the data to, buf is the start of the	379	* ns is the socket we are adding the data to, buf is the start of the
266	* data, and len is the number of bytes to add.	380	* data, and len is the number of bytes to add.
267	*/	381	*/
268	void	382	void
269	client_socket::send (void *buf_, int len)	383	client::send (void *buf_, int len)
270	{	384	{
271	char buf = (char )buf_;	385	char buf = (char )buf_;
272	char *pos = buf;	386	char *pos = buf;
273	int amt = 0;	387	int amt = 0;
274		388
275	if (status == Ns_Dead \|\| !buf)	389	if (status == Ns_Dead \|\| !buf)
276	{
277	LOG (llevDebug, "Write_To_Socket called with dead socket\n");
278	return;	390	return;
279	}
280		391
281	if ((len + outputbuffer.len) > SOCKETBUFSIZE)	392	if ((len + outputbuffer.len) > SOCKETBUFSIZE)
282	{	393	{
283	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);
284	status = Ns_Dead;	395	destroy ();
285	return;	396	return;
286	}	397	}
287		398
288	int avail, end;	399	int avail, end;
289		400
…		…
307	}	418	}
308		419
309	outputbuffer.len += len;	420	outputbuffer.len += len;
310	}	421	}
311		422
312	void
313	client_socket::socket_cb (iow &w, int got)
314	{
315	write_outputbuffer ();
316
317	if (!outputbuffer.len)
318	socket_ev.poll (socket_ev.poll () & ~PE_W);
319	}
320
321	/**	423	/**
322	* 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
323	* shortcut function.	425	* shortcut function.
324	*/	426	*/
325	void	427	void
326	client_socket::send_packet (packet &sl)	428	client::send_packet (packet &sl)
327	{	429	{
328	if (status == Ns_Dead)	430	if (status == Ns_Dead)
329	return;	431	return;
330		432
331	if (sl.length () >= MAXSOCKBUF)	433	if (sl.length () >= MAXSOCKBUF)
…		…
347		449
348	send (sl.buf_, sl.length () + sl.hdrlen);	450	send (sl.buf_, sl.length () + sl.hdrlen);
349	}	451	}
350		452
351	void	453	void
352	client_socket::send_packet (const char *buf, int len)	454	client::send_packet (const char *buf, int len)
353	{	455	{
354	packet sl;	456	packet sl;
355		457
356	sl << data (buf, len);	458	sl << data (buf, len);
357	send_packet (sl);	459	send_packet (sl);
358	}	460	}
359		461
360	void	462	void
361	client_socket::send_packet (const char *buf)	463	client::send_packet (const char *buf)
362	{	464	{
363	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::operator <<(const data &v)
		488	{
		489	if (room () < v.len)
		490	reset ();
		491	else
		492	{
		493	if (v.len)
		494	{
		495	memcpy (cur, v.ptr, v.len);
		496	cur += v.len;
		497	}
		498	}
		499
		500	return *this;
		501	}
		502
		503	packet &packet::operator <<(const data8 &v)
		504	{
		505	unsigned int len = min (v.len, 0x00FF);
		506	return *this << uint8 (len) << data (v.ptr, len);
		507	}
		508
		509	packet &packet::operator <<(const data16 &v)
		510	{
		511	unsigned int len = min (v.len, 0xFFFF);
		512	return *this << uint16 (len) << data (v.ptr, len);
		513	}
		514
		515	packet &packet::operator <<(const char *v)
		516	{
		517	return *this << data (v, strlen (v ? v : 0));
		518	}
		519
		520	void
		521	packet::vprintf (const char *format, va_list ap)
		522	{
		523	int size = room ();
		524
		525	int len = vsnprintf ((char *)cur, size, format, ap);
		526
		527	if (len >= size)
		528	return reset ();
		529
		530	cur += len;
364	}	531	}
365		532
366	/******************************************************************************	533	/******************************************************************************
367	*	534	*
368	* statistics logging functions.	535	* statistics logging functions.

Diff Legend

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

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.21 by root, Fri Dec 15 00:14:13 2006 UTC vs. Revision 1.23 by root, Sat Dec 16 03:08:26 2006 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.21 by root, Fri Dec 15 00:14:13 2006 UTC vs.
Revision 1.23 by root, Sat Dec 16 03:08:26 2006 UTC