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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.14 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.32 by pippijn, Sat Jan 20 13:47:17 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
9	(at your option) any later version.	10	* (at your option) any later version.
10		11	*
11	This program is distributed in the hope that it will be useful,	12	* This program is distributed in the hope that it will be useful,
12	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	GNU General Public License for more details.	15	* GNU General Public License for more details.
15		16	*
16	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
17	along with this program; if not, write to the Free Software	18	* along with this program; if not, write to the Free Software
18	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19		20	*
20	The author can be reached via e-mail to mark@pyramid.com	21	* The author can be reached via e-mail to mark@pyramid.com
21	*/	22	*/
22		23
23	/**	24	/**
24	* \file	25	* \file
25	* Low-level socket-related functions.	26	* Low-level socket-related functions.
26	*	27	*
27	* \date 2003-12-02	28	* \date 2003-12-02
33	*/	34	*/
34		35
35	using namespace std;	36	using namespace std;
36		37
37	#include <global.h>	38	#include <global.h>
38	#include <newclient.h>
39	#include <sproto.h>	39	#include <sproto.h>
40	#include <cstdarg>	40	#include <cstdarg>
41		41
42	#ifdef __linux__	42	#ifdef __linux__
43	# include <sys/types.h>	43	# include <sys/types.h>
44	# include <sys/socket.h>	44	# include <sys/socket.h>
45	# include <netinet/in.h>	45	# include <netinet/in.h>
46	# define TCP_HZ 1000 // sorry...
47	# include <netinet/tcp.h>	46	# include <netinet/tcp.h>
48	#endif	47	#endif
49		48
50	// 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
51	// easily die in 20 seconds...	50	// easily die in 20 seconds...
52	#define SOCKET_TIMEOUT1 10	51	#define SOCKET_TIMEOUT1 10 * 1000
53	#define SOCKET_TIMEOUT2 20	52	#define SOCKET_TIMEOUT2 20 * 1000
54		53
55	void	54	void
56	Socket_Flush (NewSocket * ns)	55	client::flush ()
57	{	56	{
		57	if (destroyed ())
		58	return;
		59
58	#ifdef __linux__	60	#ifdef __linux__
59	// check time of last ack, and, if too old, kill connection	61	// check time of last ack, and, if too old, kill connection
60	struct tcp_info tcpi;	62	struct tcp_info tcpi;
61	socklen_t len = sizeof (tcpi);	63	socklen_t len = sizeof (tcpi);
62		64
63	if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))	65	if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
64	{	66	{
65	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;
66		68
		69	rtt = tcpi.tcpi_rtt;
		70	rttvar = tcpi.tcpi_rttvar;
		71
67	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
68	&& 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
69	{	74	{
70	LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd,	75	LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
71	(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);
72	ns->status = Ns_Dead;	77	destroy ();
73	}	78	}
74	}	79	}
75
76	int val;
77
78	val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
79	val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
80	#endif	80	#endif
81	}
82		81
83	/***********************************************************************	82	/**
84	*	83	* Writes data to socket.
85	* packet functions/utilities	84	*
86	*	85	* When the socket is clear to write, and we have backlogged data, this
87	**********************************************************************/	86	* is called to write it out.
		87	*/
88		88
89	packet &packet::operator <<(const data &v)	89	if (!outputbuffer.len \|\| socket_ev.poll () & PE_W)
		90	return;
		91
		92	write_outputbuffer ();
		93	}
		94
		95	void
		96	client::write_outputbuffer ()
90	{	97	{
91	if (v.len)	98	while (outputbuffer.len)
92	{
93	memcpy (buf + len, v.ptr, v.len);
94	len += v.len;
95	}	99	{
		100	int res = write (fd, outputbuffer.data + outputbuffer.start,
		101	min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
96		102
97	return *this;	103	if (res > 0)
98	}	104	{
		105	outputbuffer.start += res;
		106	/* wrap back to start of buffer */
		107	if (outputbuffer.start == SOCKETBUFSIZE)
		108	outputbuffer.start = 0;
99		109
100	packet &packet::operator <<(const data8 &v)	110	outputbuffer.len -= res;
101	{	111	#ifdef CS_LOGSTATS
102	unsigned int len = min (v.len, 0x00FF);	112	cst_tot.obytes += res;
103	return *this << uint8 (len) << data (v.ptr, len);	113	cst_lst.obytes += res;
104	}	114	#endif
		115	}
		116	else if (res == 0)
		117	{
		118	LOG (llevError, "socket write failed, connection closed.\n");
		119	destroy ();
		120	return;
		121	}
		122	else if (errno == EINTR)
		123	{
		124	// just retry
		125	}
		126	else if (errno == EAGAIN)
		127	{
		128	// delay till ready
		129	socket_ev.poll (socket_ev.poll () \| PE_W);
		130	socket_ev.start ();
		131	return;
		132	}
		133	else
		134	{
		135	LOG (llevError, "socket write failed: %s\n", strerror (errno));
		136	destroy ();
		137	return;
		138	}
		139	}
105		140
106	packet &packet::operator <<(const data16 &v)	141	socket_ev.poll (socket_ev.poll () & ~PE_W);
107	{
108	unsigned int len = min (v.len, 0xFFFF);
109	return *this << uint16 (len) << data (v.ptr, len);
110	}
111
112	packet &packet::operator <<(const char *v)
113	{
114	return *this << data (v, strlen (v ? v : 0));
115	}
116
117	void
118	packet::printf (const char *format, ...)
119	{
120	va_list ap;
121	va_start (ap, format);
122
123	len += vsnprintf ((char *)buf + len, MAXSOCKBUF, format, ap);
124
125	va_end (ap);
126	}	142	}
127		143
128	/******************************************************************************	144	/******************************************************************************
129	*	145	*
130	* Start of read routines.	146	* Start of read routines.
131	*	147	*
132	******************************************************************************/	148	******************************************************************************/
133		149
134	int	150	int
135	NewSocket::read_packet ()	151	client::next_packet ()
136	{	152	{
137	for (;;)
138	{
139	if (inbuf_len >= 2)	153	if (inbuf_len >= 2)
140	{	154	{
141	unsigned int pkt_len = (inbuf [0] << 8) \| inbuf [1];	155	int pkt_len = (inbuf [0] << 8) \| inbuf [1];
142		156
143	if (inbuf_len >= 2 + pkt_len)	157	if (inbuf_len >= 2 + pkt_len)
144	return pkt_len + 2;	158	return 2 + pkt_len;
		159
		160	if (inbuf_len == sizeof (inbuf))
145	}	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
		178	/*****************************************************************************
		179	* Start of command dispatch area.
		180	* The commands here are protocol commands.
		181	****************************************************************************/
		182
		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
		220	{
		221	return (!(pkt->flags & PF_PLAYER) \|\| pl)
		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	}
		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;
		253	}
		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))
		278	{
		279	if (pkt->flags & PF_PLAYER)
		280	queue_command (pkt, data, datalen);
		281	else
		282	execute (pkt, data, datalen);
		283
		284	goto next_packet;
		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 ())
		304	{
		305	socket_ev.poll (0);
		306	return;
		307	}
		308
		309	if (got & PE_W)
		310	{
		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
146		320
147	int amount = sizeof (inbuf) - inbuf_len;	321	int amount = sizeof (inbuf) - inbuf_len;
148		322
149	if (amount <= 0)	323	if (!amount)
150	{	324	{
151	LOG (llevError, "packet too large");//TODO	325	// input buffer full
		326	socket_ev.poll (socket_ev.poll () & ~PE_R);
152	return -1;	327	return;
153	}	328	}
154		329
155	amount = read (fd, inbuf + inbuf_len, amount);	330	amount = read (fd, inbuf + inbuf_len, amount);
156		331
157	if (!amount)	332	if (!amount)
158	{	333	{
159	status = Ns_Dead;	334	destroy ();
160	return -1;	335	return;
161	}	336	}
162	else if (amount < 0)	337	else if (amount < 0)
163	{	338	{
164	if (errno != EAGAIN && errno != EINTR)	339	if (errno != EAGAIN && errno != EINTR)
165	{	340	{
166	LOG (llevError, "read error: %s", strerror (errno));	341	LOG (llevError, "read error: %s\n", strerror (errno));
		342	destroy ();
167	return -1;	343	return;
168	}	344	}
169		345
170	return 0;	346	// should not be here, normally
		347	}
		348	else
171	}	349	{
172
173	inbuf_len += amount;	350	inbuf_len += amount;
174		351
175	cst_tot.ibytes += amount;	352	cst_tot.ibytes += amount;
176	cst_lst.ibytes += amount;	353	cst_lst.ibytes += amount;
177	}
178	}
179		354
		355	cmd_ev.start ();
		356	}
		357	}
		358	}
		359
		360	// called whenever we have additional commands to process
180	void	361	void
181	NewSocket::skip_packet (int len)	362	client::cmd_cb (iw &w)
182	{	363	{
183	inbuf_len -= len;	364	if (handle_packet ())
184	memmove (inbuf, inbuf + len, inbuf_len);	365	w.start ();
		366	else
		367	flush ();
185	}	368	}
186		369
187	/*******************************************************************************	370	/*******************************************************************************
188	*	371	*
189	* Start of write related routines.	372	* Start of write related routines.
…		…
194	* Adds data to a socket buffer for whatever reason.	377	* Adds data to a socket buffer for whatever reason.
195	*	378	*
196	* 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
197	* data, and len is the number of bytes to add.	380	* data, and len is the number of bytes to add.
198	*/	381	*/
199		382	void
200	static void	383	client::send (void *buf_, int len)
201	add_to_buffer (NewSocket ns, char buf, int len)
202	{	384	{
		385	char buf = (char )buf_;
		386	char *pos = buf;
		387	int amt = 0;
		388
		389	if (destroyed () \|\| !buf)
		390	return;
		391
		392	if (len + outputbuffer.len > SOCKETBUFSIZE)
		393	{
		394	LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
		395	destroy ();
		396	return;
		397	}
		398
203	int avail, end;	399	int avail, end;
204
205	if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
206	{
207	LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
208	ns->status = Ns_Dead;
209	return;
210	}
211		400
212	/* data + end is where we start putting the new data. The last byte	401	/* data + end is where we start putting the new data. The last byte
213	* currently in use is actually data + end -1	402	* currently in use is actually data + end -1
214	*/	403	*/
215
216	end = ns->outputbuffer.start + ns->outputbuffer.len;	404	end = outputbuffer.start + outputbuffer.len;
217	/* The buffer is already in a wrapped state, so adjust end */	405	/* The buffer is already in a wrapped state, so adjust end */
218	if (end >= SOCKETBUFSIZE)	406	if (end >= SOCKETBUFSIZE)
219	end -= SOCKETBUFSIZE;	407	end -= SOCKETBUFSIZE;
220		408
221	avail = SOCKETBUFSIZE - end;	409	avail = SOCKETBUFSIZE - end;
222		410
223	/* We can all fit it behind the current data without wrapping */	411	/* We can all fit it behind the current data without wrapping */
224	if (avail >= len)	412	if (avail >= len)
225	memcpy (ns->outputbuffer.data + end, buf, len);	413	memcpy (outputbuffer.data + end, buf, len);
226	else	414	else
227	{	415	{
228	memcpy (ns->outputbuffer.data + end, buf, avail);	416	memcpy (outputbuffer.data + end, buf, avail);
229	memcpy (ns->outputbuffer.data, buf + avail, len - avail);	417	memcpy (outputbuffer.data, buf + avail, len - avail);
230	}	418	}
231		419
232	ns->outputbuffer.len += len;	420	outputbuffer.len += len;
233	#if 0
234	LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
235	#endif
236	}
237
238	/**
239	* Writes data to socket.
240	*
241	* When the socket is clear to write, and we have backlogged data, this
242	* is called to write it out.
243	*/
244	void
245	write_socket_buffer (NewSocket * ns)
246	{
247	int amt, max;
248
249	if (ns->outputbuffer.len == 0)
250	{
251	LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
252	return;
253	}
254
255	do
256	{
257	max = SOCKETBUFSIZE - ns->outputbuffer.start;
258	if (ns->outputbuffer.len < max)
259	max = ns->outputbuffer.len;
260
261	do
262	{
263	amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
264	}
265	while ((amt < 0) && (errno == EINTR));
266
267	if (amt < 0)
268	{ /* We got an error */
269
270	if (errno != EWOULDBLOCK)
271	{
272	LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
273	ns->status = Ns_Dead;
274	return;
275	}
276	else
277	{ /* EWOULDBLOCK */
278	/* can't write it, so store it away. */
279	ns->can_write = 0;
280	return;
281	}
282	}
283	ns->outputbuffer.start += amt;
284	/* wrap back to start of buffer */
285	if (ns->outputbuffer.start == SOCKETBUFSIZE)
286	ns->outputbuffer.start = 0;
287	ns->outputbuffer.len -= amt;
288	#ifdef CS_LOGSTATS
289	cst_tot.obytes += amt;
290	cst_lst.obytes += amt;
291	#endif
292	}
293	while (ns->outputbuffer.len > 0);
294	}
295
296	/**
297	* This writes data to the socket. - It is very low level -
298	* all we try and do is write out the data to the socket
299	* provided (ns). buf is the data to write, len is the number
300	* of bytes to write. IT doesn't return anything - rather, it
301	* updates the ns structure if we get an error.
302	*/
303	void
304	Write_To_Socket (NewSocket * ns, char *buf, int len)
305	{
306	int amt = 0;
307	char *pos = buf;
308
309	if (ns->status == Ns_Dead \|\| !buf)
310	{
311	LOG (llevDebug, "Write_To_Socket called with dead socket\n");
312	return;
313	}
314
315	#ifndef __GNU__ /* This caused problems on Hurd */
316	if (!ns->can_write)
317	{
318	add_to_buffer (ns, buf, len);
319	return;
320	}
321	#endif
322	/* If we manage to write more than we wanted, take it as a bonus */
323	while (len > 0)
324	{
325
326	do
327	{
328	amt = write (ns->fd, pos, len);
329	}
330	while ((amt < 0) && (errno == EINTR));
331
332	if (amt < 0)
333	{ /* We got an error */
334	if (errno != EWOULDBLOCK)
335	{
336	LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
337	errno, strerror (errno));
338	ns->status = Ns_Dead;
339	return;
340	}
341	else
342	{ /* EWOULDBLOCK */
343	/* can't write it, so store it away. */
344	add_to_buffer (ns, pos, len);
345	ns->can_write = 0;
346	return;
347	}
348	}
349	/* amt gets set to 0 above in blocking code, so we do this as
350	* an else if to make sure we don't reprocess it.
351	*/
352	else if (amt == 0)
353	{
354	LOG (llevError, "Write_To_Socket: No data written out.\n");
355	}
356	len -= amt;
357	pos += amt;
358	#ifdef CS_LOGSTATS
359	cst_tot.obytes += amt;
360	cst_lst.obytes += amt;
361	#endif
362	}
363	}	421	}
364		422
365	/**	423	/**
366	* 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
367	* shortcut function.	425	* shortcut function.
368	*/	426	*/
369
370	void	427	void
371	NewSocket::send_packet (packet &sl)	428	client::send_packet (packet &sl)
372	{	429	{
373	Send_With_Handling (this, &sl);	430	if (destroyed ())
374	}
375
376	void
377	NewSocket::send_packet (const char *buf, int len)
378	{
379	packet sl;
380
381	sl << data (buf, len);
382	send_packet (sl);
383	}
384
385	void
386	NewSocket::send_packet (const char *buf)
387	{
388	send_packet (buf, strlen (buf));
389	}
390
391	/**
392	* Calls Write_To_Socket to send data to the client.
393	*
394	* The only difference in this function is that we take a packet
395	*, and we prepend the length information.
396	*/
397	void
398	Send_With_Handling (NewSocket ns, packet msg)
399	{
400	unsigned char sbuf[4];
401
402	if (ns->status == Ns_Dead \|\| !msg)
403	return;	431	return;
404		432
405	if (msg->len >= MAXSOCKBUF)	433	if (sl.length () >= MAXSOCKBUF)
406	{	434	{
407	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len);	435	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
408	/* Almost certainly we've overflowed a buffer, so quite now to make	436	/* Almost certainly we've overflowed a buffer, so quit now to make
409	* it easier to debug.	437	* it easier to debug.
410	*/	438	*/
411	abort ();	439	abort ();
412	}	440	}
413	sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF;	441
414	sbuf[1] = ((uint32) (msg->len)) & 0xFF;	442	if (!sl.length ())
415	if (ns->status != Ns_Old)	443	return;
416	Write_To_Socket (ns, (char *) sbuf, 2);	444
417	Write_To_Socket (ns, (char *) msg->buf, msg->len);	445	assert (sl.hdrlen == 2);
		446
		447	sl.buf_ [0] = sl.length () >> 8;
		448	sl.buf_ [1] = sl.length () ;
		449
		450	send (sl.buf_, sl.length () + sl.hdrlen);
		451	}
		452
		453	void
		454	client::send_packet (const char *buf, int len)
		455	{
		456	packet sl;
		457
		458	sl << data (buf, len);
		459	send_packet (sl);
		460	}
		461
		462	void
		463	client::send_packet (const char *buf)
		464	{
		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;
418	}	540	}
419		541
420	/******************************************************************************	542	/******************************************************************************
421	*	543	*
422	* statistics logging functions.	544	* statistics logging functions.
…		…
446	LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",	568	LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
447	ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,	569	ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
448	now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);	570	now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
449	cst_lst.ibytes = 0;	571	cst_lst.ibytes = 0;
450	cst_lst.obytes = 0;	572	cst_lst.obytes = 0;
451	cst_lst.max_conn = socket_info.nconns;
452	cst_lst.time_start = now;	573	cst_lst.time_start = now;
453	}	574	}
454	#endif	575	#endif
455		576

Diff Legend

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

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.14 by root, Thu Dec 14 01:21:58 2006 UTC vs. Revision 1.32 by pippijn, Sat Jan 20 13:47:17 2007 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.14 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.32 by pippijn, Sat Jan 20 13:47:17 2007 UTC