[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.60 by root, Mon Oct 1 01:09:10 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 1992 Frank Tore Johansen	5	* Copyright (©) 1992,2007 Frank Tore Johansen
5		6	*
6	This program is free software; you can redistribute it and/or modify	7	* Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
18	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19
20	The author can be reached via e-mail to mark@pyramid.com
21	*/
22
23	/**
24	* \file
25	* Low-level socket-related functions.
26	*	19	*
27	* \date 2003-12-02	20	* The authors can be reached via e-mail to <crossfire@schmorp.de>
28	*
29	* Contains some base functions that both the client and server
30	* can use. As such, depending what we are being compiled for will
31	* determine what we can include. the client is designed have
32	* CFCLIENT defined as part of its compile flags.
33	*/	21	*/
34		22
35	using namespace std;	23	using namespace std;
36		24
37	#include <global.h>	25	#include <global.h>
38	#include <newclient.h>
39	#include <sproto.h>	26	#include <sproto.h>
40	#include <cstdarg>	27	#include <cstdarg>
41		28
42	#ifdef __linux__	29	#if HAVE_TCP_INFO
43	# include <sys/types.h>	30	# include <sys/types.h>
44	# include <sys/socket.h>	31	# include <sys/socket.h>
45	# include <netinet/in.h>	32	# include <netinet/in.h>
46	# define TCP_HZ 1000 // sorry...
47	# include <netinet/tcp.h>	33	# include <netinet/tcp.h>
48	#endif	34	#endif
49		35
50	// use a really low timeout, as it doesn't cost any bandwidth, and you can	36	// force a packet when idle for more than this many seconds,
51	// easily die in 20 seconds...	37	// forcing an ack regularly.
52	#define SOCKET_TIMEOUT1 10	38	#define IDLE_PING 2.
53	#define SOCKET_TIMEOUT2 20
54		39
55	void	40	void
56	client_socket::flush ()	41	client::flush ()
57	{	42	{
58	#ifdef __linux__	43	if (destroyed ())
59	// check time of last ack, and, if too old, kill connection	44	return;
60	struct tcp_info tcpi;
61	socklen_t len = sizeof (tcpi);
62
63	if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
64	{
65	unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
66
67	rtt = tcpi.tcpi_rtt;
68	rttvar = tcpi.tcpi_rttvar;
69
70	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
72	{
73	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);
75	status = Ns_Dead;
76	}
77	}
78	#endif
79		45
80	/**	46	/**
81	* Writes data to socket.	47	* Writes data to socket.
82	*	48	*
83	* When the socket is clear to write, and we have backlogged data, this	49	* When the socket is clear to write, and we have backlogged data, this
84	* is called to write it out.	50	* is called to write it out.
85	*/	51	*/
86		52
87	if (!outputbuffer.len \|\| socket_ev.poll () & PE_W)	53	// write a nop to the socket at least every IDLE_NOP seconds.
		54	if (!outputbuffer.len)
		55	{
		56	if (last_send + IDLE_PING <= NOW && pl && pl->active)
		57	{
		58	// this is a bit ugly, but map1/map1a seem to be the only
		59	// nop'able commands and they are quite small.
		60	packet sl (mapmode == Map1Cmd ? "map1" : "map1a");
		61	send_packet (sl);
		62	}
		63	else
		64	return;
		65	}
		66
		67	if (socket_ev.poll () & PE_W)
88	return;	68	return;
89		69
		70	last_send = NOW;
90	write_outputbuffer ();	71	write_outputbuffer ();
91	}	72	}
92		73
93	void	74	void
94	client_socket::write_outputbuffer ()	75	client::write_outputbuffer ()
95	{	76	{
96	while (outputbuffer.len)	77	while (outputbuffer.len)
97	{	78	{
98	int res = write (fd, outputbuffer.data + outputbuffer.start,	79	int res = write (fd, outputbuffer.data + outputbuffer.start,
99	min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));	80	min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
104	/* wrap back to start of buffer */	85	/* wrap back to start of buffer */
105	if (outputbuffer.start == SOCKETBUFSIZE)	86	if (outputbuffer.start == SOCKETBUFSIZE)
106	outputbuffer.start = 0;	87	outputbuffer.start = 0;
107		88
108	outputbuffer.len -= res;	89	outputbuffer.len -= res;
109	#ifdef CS_LOGSTATS
110	cst_tot.obytes += res;
111	cst_lst.obytes += res;
112	#endif
113	}	90	}
114	else if (res == 0)	91	else if (res == 0)
115	{	92	{
116	LOG (llevError, "socket write failed, connection closed.\n");	93	LOG (llevError, "socket write failed, connection closed.\n");
117	status = Ns_Dead;	94	destroy ();
118	return;	95	return;
119	}	96	}
120	else if (errno == EINTR)	97	else if (errno == EINTR)
121	{	98	{
122	// just retry	99	// just retry
…		…
129	return;	106	return;
130	}	107	}
131	else	108	else
132	{	109	{
133	LOG (llevError, "socket write failed: %s\n", strerror (errno));	110	LOG (llevError, "socket write failed: %s\n", strerror (errno));
134	status = Ns_Dead;	111	destroy ();
135	return;	112	return;
136	}	113	}
137	}	114	}
138		115
139	socket_ev.poll (socket_ev.poll () & ~PE_W);	116	socket_ev.poll (socket_ev.poll () & ~PE_W);
140	}	117	}
141		118
		119	/******************************************************************************
		120	*
		121	* Start of read routines.
		122	*
		123	******************************************************************************/
		124
		125	int
		126	client::next_packet ()
		127	{
		128	if (inbuf_len >= 2)
		129	{
		130	int pkt_len = (inbuf [0] << 8) \| inbuf [1];
		131
		132	if (inbuf_len >= 2 + pkt_len)
		133	return 2 + pkt_len;
		134
		135	if (inbuf_len == sizeof (inbuf))
		136	{
		137	send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED \| NDI_REPLY);
		138	destroy ();
		139	return -1;
		140	}
		141	}
		142
		143	return 0;
		144	}
		145
		146	void
		147	client::skip_packet (int len)
		148	{
		149	inbuf_len -= len;
		150	memmove (inbuf, inbuf + len, inbuf_len);
		151	}
		152
142	/***********************************************************************	153	/*****************************************************************************
143	*	154	* Start of command dispatch area.
144	* packet functions/utilities	155	* The commands here are protocol commands.
145	*
146	**********************************************************************/	156	****************************************************************************/
147		157
148	packet &packet::operator <<(const data &v)	158	// SocketCommand, PlayingCommand, should not exist with those ugly casts
		159	#define SC(cb) (void )static_cast<void ()(char , int, client )>(cb),
		160	#define PC(cb) (void )static_cast<void ()(char , int, player )>(cb), PF_PLAYER \|
		161
		162	/**
		163	* Dispatch table for the server.
		164	*/
		165	static struct packet_type packets[] = {
		166	{"ncom", PC(NewPlayerCmd) PF_PLAYING \| PF_COMMAND6 },
		167	{"command", PC(PlayerCmd) PF_PLAYING \| PF_COMMAND0 },
		168
		169	{"examine", PC(ExamineCmd) PF_PLAYING },
		170	{"ex", PC(ExCmd) PF_PLAYING },
		171	{"apply", PC(ApplyCmd) PF_PLAYING },
		172	{"lookat", PC(LookAt) PF_PLAYING },
		173	{"lock", PC(LockItem) PF_PLAYING },
		174	{"mark", PC(MarkItem) PF_PLAYING },
		175	{"move", PC(MoveCmd) PF_PLAYING },
		176	{"ext", PC(ExtCmd) 0 }, // CF+
		177	{"mapredraw", PC(MapRedrawCmd) 0 },
		178	{"mapinfo", PC(MapInfoCmd) 0 }, // CF+
		179
		180	{"reply", SC(ReplyCmd) 0 },
		181	{"exti", SC(ExtiCmd) 0 }, // CF+
		182	{"addme", SC(AddMeCmd) 0 },
		183	{"askface", SC(AskFaceCmd) 0 },
		184	{"requestinfo", SC(RequestInfo) 0 },
		185	{"setfacemode", SC(SetFaceMode) 0 },
		186	{"setsound", SC(SetSound) 0 },
		187	{"setup", SC(SetUp) 0 },
		188	{"version", SC(VersionCmd) 0 },
		189	{"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /Added: tchize /
		190	{"toggleextendedtext", SC(ToggleExtendedText) 0 }, /Added: tchize /
		191	{"asksmooth", SC(AskSmooth) 0 }, /Added: tchize (smoothing technologies) /
		192	};
		193
		194	bool
		195	client::may_execute (const packet_type *pkt) const
149	{	196	{
150	if (room () < v.len)	197	return (!(pkt->flags & PF_PLAYER) \|\| pl)
151	reset ();	198	&& (!(pkt->flags & PF_PLAYING) \|\| state == ST_PLAYING);
		199	}
		200
		201	// HACK: some commands currently should be executed
		202	// even when the player is frozen. this hack detects
		203	// those commands. it should be folded into may_execute,
		204	// but kept seperate to emphasise the hack aspect, i.e.
		205	// do it better, then remove.
		206	static bool
		207	always_immediate (const client ns, const packet_type pkt, const char *data, int len)
		208	{
		209	if (!(pkt->flags & (PF_COMMAND0 \| PF_COMMAND6)))
		210	return false;
		211
		212	if (!ns->pl \|\| !ns->pl->ob \|\| !ns->pl->ob->map)
		213	return false;
		214
		215	if (pkt->flags & PF_COMMAND6)
		216	{
		217	data += 6;
		218	len -= 6;
		219	}
		220
		221	if (len > 4 && !strncmp (data, "say " , 4))
		222	return true;
		223	if (len > 5 && !strncmp (data, "chat ", 5))
		224	return true;
		225
		226	return false;
		227	}
		228
		229	void
		230	client::execute (const packet_type pkt, char data, int datalen)
		231	{
		232	if (may_execute (pkt) \|\| always_immediate (this, pkt, data, datalen))
		233	{
		234	//TODO: only one format
		235	if (pkt->flags & PF_PLAYER)
		236	((void ()(char , int, player ))pkt->cb)((char )data, datalen, pl);
		237	else
		238	((void ()(char , int, client ))pkt->cb)((char )data, datalen, this);
		239	}
152	else	240	else
		241	send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED \| NDI_REPLY, pkt->name);
		242	}
		243
		244	bool
		245	client::handle_packet ()
		246	{
		247	int pkt_len = next_packet ();
		248
		249	if (!pkt_len)
		250	return false;
		251	else if (pkt_len < 0)
		252	{
		253	LOG (llevError, "read error on player %s\n",
		254	pl && pl->ob ? &pl->ob->name : "[anonymous]");
		255	destroy ();
		256	return false;
153	{	257	}
154	if (v.len)	258
		259	inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
		260
		261	/* First, break out beginning word. There are at least
		262	* a few commands that do not have any paremeters. If
		263	* we get such a command, don't worry about trying
		264	* to break it up.
		265	*/
		266	int datalen;
		267	char data = strchr ((char )inbuf + 2, ' ');
		268
		269	if (data)
		270	{
		271	*data++ = 0;
		272	datalen = pkt_len - (data - (char *)inbuf);
		273	}
		274	else
		275	{
		276	data = (char *)inbuf + 2; // better read garbage than segfault
		277	datalen = 0;
		278	}
		279
		280	for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
		281	if (!strcmp ((char *)inbuf + 2, pkt->name))
155	{	282	{
156	memcpy (cur, v.ptr, v.len);	283	if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
157	cur += v.len;	284	queue_command (pkt, data, datalen);
		285	else
		286	execute (pkt, data, datalen);
		287
		288	goto next_packet;
158	}	289	}
		290
		291	// If we get here, we didn't find a valid command.
		292	send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED \| NDI_REPLY, (char *)inbuf + 2);
		293	next_packet:
		294	skip_packet (pkt_len);
		295
		296	// input buffer has space again
		297	socket_ev.poll (socket_ev.poll () \| PE_R);
		298
		299	return true;
		300	}
		301
		302	// callback called when socket is either readable or writable
		303	void
		304	client::socket_cb (iow &w, int got)
		305	{
		306	//TODO remove when we have better socket cleanup logic
		307	if (destroyed ())
159	}	308	{
160		309	socket_ev.poll (0);
161	return *this;	310	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	{	311	}
208	if (inbuf_len >= 2)
209	{
210	unsigned int pkt_len = (inbuf [0] << 8) \| inbuf [1];
211		312
212	if (inbuf_len >= 2 + pkt_len)	313	if (got & PE_W)
213	return pkt_len + 2;	314	{
214	}	315	write_outputbuffer ();
		316
		317	if (!outputbuffer.len)
		318	socket_ev.poll (socket_ev.poll () & ~PE_W);
		319	}
		320
		321	if (got & PE_R)
		322	{
		323	//TODO: rate-limit tcp connection in better ways, important
215		324
216	int amount = sizeof (inbuf) - inbuf_len;	325	int amount = sizeof (inbuf) - inbuf_len;
217		326
218	if (amount <= 0)	327	if (!amount)
219	{	328	{
220	LOG (llevError, "packet too large");//TODO	329	// input buffer full
		330	socket_ev.poll (socket_ev.poll () & ~PE_R);
221	return -1;	331	return;
222	}	332	}
223		333
224	amount = read (fd, inbuf + inbuf_len, amount);	334	amount = read (fd, inbuf + inbuf_len, amount);
225		335
226	if (!amount)	336	if (!amount)
227	{	337	{
228	status = Ns_Dead;	338	destroy ();
229	return -1;	339	return;
230	}	340	}
231	else if (amount < 0)	341	else if (amount < 0)
232	{	342	{
233	if (errno != EAGAIN && errno != EINTR)	343	if (errno != EAGAIN && errno != EINTR)
234	{	344	{
235	LOG (llevError, "read error: %s\n", strerror (errno));	345	LOG (llevError, "read error: %s\n", strerror (errno));
		346	destroy ();
236	return -1;	347	return;
237	}	348	}
238		349
239	return 0;	350	// should not be here, normally
		351	}
		352	else
240	}	353	{
241
242	inbuf_len += amount;	354	inbuf_len += amount;
243		355
244	cst_tot.ibytes += amount;	356	if (handle_packet ())
245	cst_lst.ibytes += amount;	357	{
246	}	358	while (handle_packet ())
247	}	359	;
248		360
249	void	361	flush ();
250	client_socket::skip_packet (int len)	362	}
251	{	363	}
252	inbuf_len -= len;	364	}
253	memmove (inbuf, inbuf + len, inbuf_len);
254	}	365	}
255		366
256	/*******************************************************************************	367	/*******************************************************************************
257	*	368	*
258	* Start of write related routines.	369	* Start of write related routines.
…		…
264	*	375	*
265	* ns is the socket we are adding the data to, buf is the start of the	376	* 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.	377	* data, and len is the number of bytes to add.
267	*/	378	*/
268	void	379	void
269	client_socket::send (void *buf_, int len)	380	client::send (void *buf_, int len)
270	{	381	{
271	char buf = (char )buf_;	382	char buf = (char )buf_;
272	char *pos = buf;
273	int amt = 0;
274		383
275	if (status == Ns_Dead \|\| !buf)	384	if (destroyed () \|\| !buf)
276	{
277	LOG (llevDebug, "Write_To_Socket called with dead socket\n");
278	return;	385	return;
279	}
280		386
281	if ((len + outputbuffer.len) > SOCKETBUFSIZE)	387	if (len + outputbuffer.len > SOCKETBUFSIZE)
282	{	388	{
283	LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd);	389	LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
284	status = Ns_Dead;	390	// shutdown the socket, this is safer than destroying it immediately
		391	// as lots of code in the callchain might still access the map etc.
		392	shutdown (fd, SHUT_RDWR);
285	return;	393	return;
286	}	394	}
287		395
288	int avail, end;	396	int avail, end;
289		397
…		…
307	}	415	}
308		416
309	outputbuffer.len += len;	417	outputbuffer.len += len;
310	}	418	}
311		419
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	/**	420	/**
322	* Takes a string of data, and writes it out to the socket. A very handy	421	* Takes a string of data, and writes it out to the socket. A very handy
323	* shortcut function.	422	* shortcut function.
324	*/	423	*/
325	void	424	void
326	client_socket::send_packet (packet &sl)	425	client::send_packet (packet &sl)
327	{	426	{
328	if (status == Ns_Dead)	427	if (destroyed ())
329	return;	428	return;
330		429
331	if (sl.length () >= MAXSOCKBUF)	430	if (sl.length () > MAXSOCKBUF)
332	{	431	{
333	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());	432	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
334	/* Almost certainly we've overflowed a buffer, so quit now to make	433	/* Almost certainly we've overflowed a buffer, so quit now to make
335	* it easier to debug.	434	* it easier to debug.
336	*/	435	*/
…		…
347		446
348	send (sl.buf_, sl.length () + sl.hdrlen);	447	send (sl.buf_, sl.length () + sl.hdrlen);
349	}	448	}
350		449
351	void	450	void
352	client_socket::send_packet (const char *buf, int len)	451	client::send_packet (const char *buf, int len)
353	{	452	{
354	packet sl;	453	packet sl;
355		454
356	sl << data (buf, len);	455	sl << data (buf, len);
357	send_packet (sl);	456	send_packet (sl);
358	}	457	}
359		458
360	void	459	void
361	client_socket::send_packet (const char *buf)	460	client::send_packet (const char *buf)
362	{	461	{
363	send_packet (buf, strlen (buf));	462	send_packet (buf, strlen (buf));
364	}	463	}
365		464
		465	void
		466	client::send_packet_printf (const char *format, ...)
		467	{
		468	packet sl;
		469
		470	va_list ap;
		471	va_start (ap, format);
		472	sl.vprintf (format, ap);
		473	va_end (ap);
		474
		475	send_packet (sl);
		476	}
		477
		478	// returns true when the message needs special (read: perl) treatment
		479	static bool
		480	msg_is_special (const char *msg)
		481	{
		482	return msg [strcspn (msg, "<[&\n")];
		483	}
		484
		485	void
		486	client::send_msg (int color, const char type, const char msg)
		487	{
		488	if (!msg \|\| !type) // it can happen (for example, missing attack messages cause this)
		489	{
		490	LOG (logBacktrace \| llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
		491	return;
		492	}
		493
		494	int len = strlen (msg);
		495
		496	if (msg_is_special (msg) \|\| (type [0] == 'c' && type [1] == '/') \|\| len > (MAXSOCKBUF - 128))
		497	cfperl_send_msg (this, color, type, msg);
		498	else if (can_msg)
		499	send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
		500	else if (color < 0)
		501	return; // client cannot handle this
		502	else
		503	send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
		504	}
		505
		506	void
		507	client::send_drawinfo (const char *msg, int flags)
		508	{
		509	send_msg (flags, "log", msg);
		510	}
		511
366	/******************************************************************************	512	/***********************************************************************
367	*	513	*
368	* statistics logging functions.	514	* packet functions/utilities
369	*	515	*
370	******************************************************************************/	516	**********************************************************************/
371		517
372	#ifdef CS_LOGSTATS	518	packet::packet (const char *name)
373
374	/* cst_tot is for the life of the server, cst_last is for the last series of
375	* stats
376	*/
377	CS_Stats cst_tot, cst_lst;
378
379	/**
380	* Writes out the gathered stats. We clear cst_lst.
381	*/
382	void
383	write_cs_stats (void)
384	{	519	{
385	time_t now = time (NULL);	520	reset ();
386		521
387	/* If no connections recently, don't both to log anything */	522	int len = strlen (name);
388	if (cst_lst.ibytes == 0 && cst_lst.obytes == 0)	523	memcpy (cur, name, len); cur += len;
389	return;	524	*cur++ = ' ';
390
391	/* CSSTAT is put in so scripts can easily find the line */
392	LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
393	ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
394	now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
395	cst_lst.ibytes = 0;
396	cst_lst.obytes = 0;
397	cst_lst.time_start = now;
398	}	525	}
399	#endif
400		526
		527	packet &packet::operator <<(const ber32 v)
		528	{
		529	enum { maxlen = 32 / 7 + 1};
		530	uint8 buf[maxlen];
		531	uint8 *p = buf + maxlen;
		532	uint32 val = v.val;
		533
		534	*--p = val & 0x7F;
		535
		536	while (val > 0x7F)
		537	{
		538	val >>= 7;
		539	*--p = (val & 0x7F) \| 0x80;
		540	}
		541
		542	return *this << data (p, buf + maxlen - p);
		543	}
		544
		545	packet &packet::operator <<(const data &v)
		546	{
		547	if (room () < v.len)
		548	reset ();
		549	else
		550	{
		551	if (v.len)
		552	{
		553	memcpy (cur, v.ptr, v.len);
		554	cur += v.len;
		555	}
		556	}
		557
		558	return *this;
		559	}
		560
		561	packet &packet::operator <<(const data8 &v)
		562	{
		563	unsigned int len = min (v.len, 0x00FF);
		564	return *this << uint8 (len) << data (v.ptr, len);
		565	}
		566
		567	packet &packet::operator <<(const data16 &v)
		568	{
		569	unsigned int len = min (v.len, 0xFFFF);
		570	return *this << uint16 (len) << data (v.ptr, len);
		571	}
		572
		573	packet &packet::operator <<(const char *v)
		574	{
		575	return *this << data (v, strlen (v ? v : 0));
		576	}
		577
		578	void
		579	packet::vprintf (const char *format, va_list ap)
		580	{
		581	int size = room ();
		582
		583	int len = vsnprintf ((char *)cur, size, format, ap);
		584
		585	if (len >= size)
		586	return reset ();
		587
		588	cur += len;
		589	}
		590

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.60 by root, Mon Oct 1 01:09:10 2007 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.60 by root, Mon Oct 1 01:09:10 2007 UTC