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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.18 by root, Thu Dec 14 05:09:32 2006 UTC vs.
Revision 1.26 by root, Tue Dec 19 04:58:05 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>
44	# include <sys/socket.h>	43	# include <sys/socket.h>
45	# include <netinet/in.h>	44	# include <netinet/in.h>
46	# define TCP_HZ 1000 // sorry...
47	# include <netinet/tcp.h>	45	# include <netinet/tcp.h>
48	#endif	46	#endif
49		47
50	// use a really low timeout, as it doesn't cost any bandwidth, and you can	48	// use a really low timeout, as it doesn't cost any bandwidth, and you can
51	// easily die in 20 seconds...	49	// easily die in 20 seconds...
52	#define SOCKET_TIMEOUT1 10	50	#define SOCKET_TIMEOUT1 10 * 1000
53	#define SOCKET_TIMEOUT2 20	51	#define SOCKET_TIMEOUT2 20 * 1000
54		52
55	void	53	void
56	Socket_Flush (client_socket * ns)	54	client::flush ()
57	{	55	{
58	#ifdef __linux__	56	#ifdef __linux__
59	// check time of last ack, and, if too old, kill connection	57	// check time of last ack, and, if too old, kill connection
60	struct tcp_info tcpi;	58	struct tcp_info tcpi;
61	socklen_t len = sizeof (tcpi);	59	socklen_t len = sizeof (tcpi);
62		60
63	if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))	61	if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
64	{	62	{
65	unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;	63	unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
66		64
		65	rtt = tcpi.tcpi_rtt;
		66	rttvar = tcpi.tcpi_rttvar;
		67
67	if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s	68	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	69	&& SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s
69	{	70	{
70	LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd,	71	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);	72	(unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
72	ns->status = Ns_Dead;	73	destroy ();
73	}	74	}
74	}	75	}
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	76	#endif
81	}
82		77
		78	/**
		79	* Writes data to socket.
		80	*
		81	* When the socket is clear to write, and we have backlogged data, this
		82	* is called to write it out.
		83	*/
		84
		85	if (!outputbuffer.len \|\| socket_ev.poll () & PE_W)
		86	return;
		87
		88	write_outputbuffer ();
		89	}
		90
		91	void
		92	client::write_outputbuffer ()
		93	{
		94	while (outputbuffer.len)
		95	{
		96	int res = write (fd, outputbuffer.data + outputbuffer.start,
		97	min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
		98
		99	if (res > 0)
		100	{
		101	outputbuffer.start += res;
		102	/* wrap back to start of buffer */
		103	if (outputbuffer.start == SOCKETBUFSIZE)
		104	outputbuffer.start = 0;
		105
		106	outputbuffer.len -= res;
		107	#ifdef CS_LOGSTATS
		108	cst_tot.obytes += res;
		109	cst_lst.obytes += res;
		110	#endif
		111	}
		112	else if (res == 0)
		113	{
		114	LOG (llevError, "socket write failed, connection closed.\n");
		115	destroy ();
		116	return;
		117	}
		118	else if (errno == EINTR)
		119	{
		120	// just retry
		121	}
		122	else if (errno == EAGAIN)
		123	{
		124	// delay till ready
		125	socket_ev.poll (socket_ev.poll () \| PE_W);
		126	socket_ev.start ();
		127	return;
		128	}
		129	else
		130	{
		131	LOG (llevError, "socket write failed: %s\n", strerror (errno));
		132	destroy ();
		133	return;
		134	}
		135	}
		136
		137	socket_ev.poll (socket_ev.poll () & ~PE_W);
		138	}
		139
		140	/******************************************************************************
		141	*
		142	* Start of read routines.
		143	*
		144	******************************************************************************/
		145
		146	int
		147	client::next_packet ()
		148	{
		149	if (inbuf_len >= 2)
		150	{
		151	int pkt_len = (inbuf [0] << 8) \| inbuf [1];
		152
		153	if (inbuf_len >= 2 + pkt_len)
		154	return 2 + pkt_len;
		155
		156	if (inbuf_len == sizeof (inbuf))
		157	{
		158	send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
		159	destroy ();
		160	return -1;
		161	}
		162	}
		163
		164	return 0;
		165	}
		166
		167	void
		168	client::skip_packet (int len)
		169	{
		170	inbuf_len -= len;
		171	memmove (inbuf, inbuf + len, inbuf_len);
		172	}
		173
83	/***********************************************************************	174	/*****************************************************************************
84	*	175	* Start of command dispatch area.
85	* packet functions/utilities	176	* The commands here are protocol commands.
86	*
87	**********************************************************************/	177	****************************************************************************/
88		178
89	packet &packet::operator <<(const data &v)	179	// SocketCommand, PlayingCommand, should not exist with those ugly casts
		180	#define SC(cb) (void )static_cast<void ()(char , int, client )>(cb),
		181	#define PC(cb) (void )static_cast<void ()(char , int, player )>(cb), PF_PLAYER \|
		182
		183	/**
		184	* Dispatch table for the server.
		185	*/
		186	static struct packet_type packets[] = {
		187	{"ncom", PC(NewPlayerCmd) PF_PLAYING },
		188	{"command", PC(PlayerCmd) PF_PLAYING },
		189
		190	{"examine", PC(ExamineCmd) PF_PLAYING },
		191	{"apply", PC(ApplyCmd) PF_PLAYING },
		192	{"reply", PC(ReplyCmd) 0 },
		193	{"lookat", PC(LookAt) PF_PLAYING },
		194	{"lock", PC(LockItem) PF_PLAYING },
		195	{"mark", PC(MarkItem) PF_PLAYING },
		196	{"move", PC(MoveCmd) PF_PLAYING },
		197	{"ext", PC(ExtCmd) 0 }, /* CF+ */
		198	{"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */
		199	{"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
		200
		201	{"exti", SC(ExtiCmd) 0 }, /* CF+ */
		202	{"addme", SC(AddMeCmd) 0 },
		203	{"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
		204	{"requestinfo", SC(RequestInfo) 0 },
		205	{"setfacemode", SC(SetFaceMode) 0 },
		206	{"setsound", SC(SetSound) 0 },
		207	{"setup", SC(SetUp) 0 },
		208	{"version", SC(VersionCmd) 0 },
		209	{"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /Added: tchize /
		210	{"toggleextendedtext", SC(ToggleExtendedText) 0 }, /Added: tchize /
		211	{"asksmooth", SC(AskSmooth) 0 }, /Added: tchize (smoothing technologies) /
		212	};
		213
		214	bool
		215	client::may_execute (const packet_type *pkt) const
90	{	216	{
91	if (room () < v.len)	217	return (!(pkt->flags & PF_PLAYER) \|\| pl)
92	reset ();	218	&& (!(pkt->flags & PF_PLAYING) \|\| (pl && pl->state == ST_PLAYING));
		219	}
		220
		221	void
		222	client::execute (const packet_type pkt, char data, int datalen)
		223	{
		224	if (may_execute (pkt))
		225	{
		226	//TODO: only one format
		227	if (pkt->flags & PF_PLAYER)
		228	((void ()(char , int, player ))pkt->cb)((char )data, datalen, pl);
		229	else
		230	((void ()(char , int, client ))pkt->cb)((char )data, datalen, this);
		231	}
93	else	232	else
		233	send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
		234	}
		235
		236	bool
		237	client::handle_packet ()
		238	{
		239	int pkt_len = next_packet ();
		240
		241	if (!pkt_len)
		242	return false;
		243	else if (pkt_len < 0)
		244	{
		245	LOG (llevError, "read error on player %s\n",
		246	pl && pl->ob ? &pl->ob->name : "[anonymous]");
		247	destroy ();
		248	return false;
94	{	249	}
95	if (v.len)	250
		251	inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
		252
		253	/* First, break out beginning word. There are at least
		254	* a few commands that do not have any paremeters. If
		255	* we get such a command, don't worry about trying
		256	* to break it up.
		257	*/
		258	int datalen;
		259	char data = strchr ((char )inbuf + 2, ' ');
		260
		261	if (data)
		262	{
		263	*data++ = 0;
		264	datalen = pkt_len - (data - (char *)inbuf);
		265	}
		266	else
		267	{
		268	data = (char *)inbuf + 2; // better read garbage than segfault
		269	datalen = 0;
		270	}
		271
		272	for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
		273	if (!strcmp ((char *)inbuf + 2, pkt->name))
96	{	274	{
97	memcpy (cur, v.ptr, v.len);	275	if (pkt->flags & PF_PLAYER)
98	cur += v.len;	276	queue_command (pkt, data, datalen);
		277	else
		278	execute (pkt, data, datalen);
		279
		280	goto next_packet;
99	}	281	}
		282
		283	// If we get here, we didn't find a valid command.
		284	send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2);
		285	next_packet:
		286	skip_packet (pkt_len);
		287
		288	// input buffer has space again
		289	socket_ev.poll (socket_ev.poll () \| PE_R);
		290
		291	return true;
		292	}
		293
		294	// callback called when socket is either readable or writable
		295	void
		296	client::socket_cb (iow &w, int got)
		297	{
		298	//TODO remove when we have better socket cleanup logic
		299	if (status == Ns_Dead)
100	}	300	{
101		301	socket_ev.poll (0);
102	return *this;	302	return;
103	}
104
105	packet &packet::operator <<(const data8 &v)
106	{
107	unsigned int len = min (v.len, 0x00FF);
108	return *this << uint8 (len) << data (v.ptr, len);
109	}
110
111	packet &packet::operator <<(const data16 &v)
112	{
113	unsigned int len = min (v.len, 0xFFFF);
114	return *this << uint16 (len) << data (v.ptr, len);
115	}
116
117	packet &packet::operator <<(const char *v)
118	{
119	return *this << data (v, strlen (v ? v : 0));
120	}
121
122	void
123	packet::printf (const char *format, ...)
124	{
125	int size = room ();
126
127	va_list ap;
128	va_start (ap, format);
129	int len = vsnprintf ((char *)cur, size, format, ap);
130	va_end (ap);
131
132	if (len >= size)
133	return reset ();
134
135	cur += len;
136	}
137
138	/******************************************************************************
139	*
140	* Start of read routines.
141	*
142	******************************************************************************/
143
144	int
145	client_socket::read_packet ()
146	{
147	for (;;)
148	{	303	}
149	if (inbuf_len >= 2)
150	{
151	unsigned int pkt_len = (inbuf [0] << 8) \| inbuf [1];
152		304
153	if (inbuf_len >= 2 + pkt_len)	305	if (got & PE_W)
154	return pkt_len + 2;	306	{
155	}	307	write_outputbuffer ();
		308
		309	if (!outputbuffer.len)
		310	socket_ev.poll (socket_ev.poll () & ~PE_W);
		311	}
		312
		313	if (got & PE_R)
		314	{
		315	//TODO: rate-limit tcp connection in better ways, important
156		316
157	int amount = sizeof (inbuf) - inbuf_len;	317	int amount = sizeof (inbuf) - inbuf_len;
158		318
159	if (amount <= 0)	319	if (!amount)
160	{	320	{
161	LOG (llevError, "packet too large");//TODO	321	// input buffer full
		322	socket_ev.poll (socket_ev.poll () & ~PE_R);
162	return -1;	323	return;
163	}	324	}
164		325
165	amount = read (fd, inbuf + inbuf_len, amount);	326	amount = read (fd, inbuf + inbuf_len, amount);
166		327
167	if (!amount)	328	if (!amount)
168	{	329	{
169	status = Ns_Dead;	330	destroy ();
170	return -1;	331	return;
171	}	332	}
172	else if (amount < 0)	333	else if (amount < 0)
173	{	334	{
174	if (errno != EAGAIN && errno != EINTR)	335	if (errno != EAGAIN && errno != EINTR)
175	{	336	{
176	LOG (llevError, "read error: %s", strerror (errno));	337	LOG (llevError, "read error: %s\n", strerror (errno));
		338	destroy ();
177	return -1;	339	return;
178	}	340	}
179		341
180	return 0;	342	// should not be here, normally
		343	}
		344	else
181	}	345	{
182
183	inbuf_len += amount;	346	inbuf_len += amount;
184		347
185	cst_tot.ibytes += amount;	348	cst_tot.ibytes += amount;
186	cst_lst.ibytes += amount;	349	cst_lst.ibytes += amount;
187	}
188	}
189		350
		351	cmd_ev.start ();
		352	}
		353	}
		354	}
		355
		356	// called whenever we have additional commands to process
190	void	357	void
191	client_socket::skip_packet (int len)	358	client::cmd_cb (iw &w)
192	{	359	{
193	inbuf_len -= len;	360	if (handle_packet ())
194	memmove (inbuf, inbuf + len, inbuf_len);	361	w.start ();
		362	else
		363	flush ();
195	}	364	}
196		365
197	/*******************************************************************************	366	/*******************************************************************************
198	*	367	*
199	* Start of write related routines.	368	* Start of write related routines.
…		…
204	* Adds data to a socket buffer for whatever reason.	373	* Adds data to a socket buffer for whatever reason.
205	*	374	*
206	* ns is the socket we are adding the data to, buf is the start of the	375	* ns is the socket we are adding the data to, buf is the start of the
207	* data, and len is the number of bytes to add.	376	* data, and len is the number of bytes to add.
208	*/	377	*/
209		378	void
210	static void	379	client::send (void *buf_, int len)
211	add_to_buffer (client_socket ns, char buf, int len)
212	{	380	{
		381	char buf = (char )buf_;
		382	char *pos = buf;
		383	int amt = 0;
		384
		385	if (status == Ns_Dead \|\| !buf)
		386	return;
		387
		388	if ((len + outputbuffer.len) > SOCKETBUFSIZE)
		389	{
		390	LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
		391	destroy ();
		392	return;
		393	}
		394
213	int avail, end;	395	int avail, end;
214
215	if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
216	{
217	LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
218	ns->status = Ns_Dead;
219	return;
220	}
221		396
222	/* data + end is where we start putting the new data. The last byte	397	/* data + end is where we start putting the new data. The last byte
223	* currently in use is actually data + end -1	398	* currently in use is actually data + end -1
224	*/	399	*/
225
226	end = ns->outputbuffer.start + ns->outputbuffer.len;	400	end = outputbuffer.start + outputbuffer.len;
227	/* The buffer is already in a wrapped state, so adjust end */	401	/* The buffer is already in a wrapped state, so adjust end */
228	if (end >= SOCKETBUFSIZE)	402	if (end >= SOCKETBUFSIZE)
229	end -= SOCKETBUFSIZE;	403	end -= SOCKETBUFSIZE;
230		404
231	avail = SOCKETBUFSIZE - end;	405	avail = SOCKETBUFSIZE - end;
232		406
233	/* We can all fit it behind the current data without wrapping */	407	/* We can all fit it behind the current data without wrapping */
234	if (avail >= len)	408	if (avail >= len)
235	memcpy (ns->outputbuffer.data + end, buf, len);	409	memcpy (outputbuffer.data + end, buf, len);
236	else	410	else
237	{	411	{
238	memcpy (ns->outputbuffer.data + end, buf, avail);	412	memcpy (outputbuffer.data + end, buf, avail);
239	memcpy (ns->outputbuffer.data, buf + avail, len - avail);	413	memcpy (outputbuffer.data, buf + avail, len - avail);
240	}	414	}
241		415
242	ns->outputbuffer.len += len;	416	outputbuffer.len += len;
243	#if 0
244	LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
245	#endif
246	}
247
248	/**
249	* Writes data to socket.
250	*
251	* When the socket is clear to write, and we have backlogged data, this
252	* is called to write it out.
253	*/
254	void
255	write_socket_buffer (client_socket * ns)
256	{
257	int amt, max;
258
259	if (ns->outputbuffer.len == 0)
260	{
261	LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
262	return;
263	}
264
265	do
266	{
267	max = SOCKETBUFSIZE - ns->outputbuffer.start;
268	if (ns->outputbuffer.len < max)
269	max = ns->outputbuffer.len;
270
271	do
272	{
273	amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
274	}
275	while ((amt < 0) && (errno == EINTR));
276
277	if (amt < 0)
278	{ /* We got an error */
279
280	if (errno != EWOULDBLOCK)
281	{
282	LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
283	ns->status = Ns_Dead;
284	return;
285	}
286	else
287	{ /* EWOULDBLOCK */
288	/* can't write it, so store it away. */
289	ns->can_write = 0;
290	return;
291	}
292	}
293	ns->outputbuffer.start += amt;
294	/* wrap back to start of buffer */
295	if (ns->outputbuffer.start == SOCKETBUFSIZE)
296	ns->outputbuffer.start = 0;
297	ns->outputbuffer.len -= amt;
298	#ifdef CS_LOGSTATS
299	cst_tot.obytes += amt;
300	cst_lst.obytes += amt;
301	#endif
302	}
303	while (ns->outputbuffer.len > 0);
304	}
305
306	/**
307	* This writes data to the socket. - It is very low level -
308	* all we try and do is write out the data to the socket
309	* provided (ns). buf is the data to write, len is the number
310	* of bytes to write. IT doesn't return anything - rather, it
311	* updates the ns structure if we get an error.
312	*/
313	void
314	client_socket::send (void *buf_, int len)
315	{
316	char buf = (char )buf_;
317	char *pos = buf;
318	int amt = 0;
319
320	if (status == Ns_Dead \|\| !buf)
321	{
322	LOG (llevDebug, "Write_To_Socket called with dead socket\n");
323	return;
324	}
325
326	#ifndef __GNU__ /* This caused problems on Hurd */
327	if (!can_write)
328	{
329	add_to_buffer (this, buf, len);
330	return;
331	}
332	#endif
333
334	/* If we manage to write more than we wanted, take it as a bonus */
335	while (len > 0)
336	{
337	do
338	{
339	amt = write (fd, pos, len);
340	}
341	while ((amt < 0) && (errno == EINTR));
342
343	if (amt < 0)
344	{ /* We got an error */
345	if (errno != EWOULDBLOCK)
346	{
347	LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
348	errno, strerror (errno));
349	status = Ns_Dead;
350	return;
351	}
352	else
353	{ /* EWOULDBLOCK */
354	/* can't write it, so store it away. */
355	add_to_buffer (this, pos, len);
356	can_write = 0;
357	return;
358	}
359	}
360	/* amt gets set to 0 above in blocking code, so we do this as
361	* an else if to make sure we don't reprocess it.
362	*/
363	else if (amt == 0)
364	LOG (llevError, "Write_To_Socket: No data written out.\n");
365
366	len -= amt;
367	pos += amt;
368	#ifdef CS_LOGSTATS
369	cst_tot.obytes += amt;
370	cst_lst.obytes += amt;
371	#endif
372	}
373	}	417	}
374		418
375	/**	419	/**
376	* Takes a string of data, and writes it out to the socket. A very handy	420	* Takes a string of data, and writes it out to the socket. A very handy
377	* shortcut function.	421	* shortcut function.
378	*/	422	*/
379
380	void	423	void
381	client_socket::send_packet (packet &sl)	424	client::send_packet (packet &sl)
382	{	425	{
383	Send_With_Handling (this, &sl);
384	}
385
386	void
387	client_socket::send_packet (const char *buf, int len)
388	{
389	packet sl;
390
391	sl << data (buf, len);
392	send_packet (sl);
393	}
394
395	void
396	client_socket::send_packet (const char *buf)
397	{
398	send_packet (buf, strlen (buf));
399	}
400
401	/**
402	* Calls Write_To_Socket to send data to the client.
403	*
404	* The only difference in this function is that we take a packet
405	*, and we prepend the length information.
406	*/
407	void
408	Send_With_Handling (client_socket ns, packet msg)
409	{
410	unsigned char sbuf[4];
411
412	if (ns->status == Ns_Dead \|\| !msg)	426	if (status == Ns_Dead)
413	return;	427	return;
414		428
415	if (msg->length () >= MAXSOCKBUF)	429	if (sl.length () >= MAXSOCKBUF)
416	{	430	{
417	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->length ());	431	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
418	/* Almost certainly we've overflowed a buffer, so quite now to make	432	/* Almost certainly we've overflowed a buffer, so quit now to make
419	* it easier to debug.	433	* it easier to debug.
420	*/	434	*/
421	abort ();	435	abort ();
422	}	436	}
423		437
424	sbuf[0] = ((uint32) (msg->length ()) >> 8);	438	if (!sl.length ())
425	sbuf[1] = ((uint32) (msg->length ()) );	439	return;
426		440
427	//TODO: single write, or writev	441	assert (sl.hdrlen == 2);
428	ns->send (sbuf, 2);	442
429	ns->send (msg->buf, msg->length ());	443	sl.buf_ [0] = sl.length () >> 8;
		444	sl.buf_ [1] = sl.length () ;
		445
		446	send (sl.buf_, sl.length () + sl.hdrlen);
		447	}
		448
		449	void
		450	client::send_packet (const char *buf, int len)
		451	{
		452	packet sl;
		453
		454	sl << data (buf, len);
		455	send_packet (sl);
		456	}
		457
		458	void
		459	client::send_packet (const char *buf)
		460	{
		461	send_packet (buf, strlen (buf));
		462	}
		463
		464	void
		465	client::send_packet_printf (const char *format, ...)
		466	{
		467	packet sl;
		468
		469	va_list ap;
		470	va_start (ap, format);
		471	sl.vprintf (format, ap);
		472	va_end (ap);
		473
		474	send_packet (sl);
		475	}
		476
		477	/***********************************************************************
		478	*
		479	* packet functions/utilities
		480	*
		481	**********************************************************************/
		482
		483	packet &packet::operator <<(const data &v)
		484	{
		485	if (room () < v.len)
		486	reset ();
		487	else
		488	{
		489	if (v.len)
		490	{
		491	memcpy (cur, v.ptr, v.len);
		492	cur += v.len;
		493	}
		494	}
		495
		496	return *this;
		497	}
		498
		499	packet &packet::operator <<(const data8 &v)
		500	{
		501	unsigned int len = min (v.len, 0x00FF);
		502	return *this << uint8 (len) << data (v.ptr, len);
		503	}
		504
		505	packet &packet::operator <<(const data16 &v)
		506	{
		507	unsigned int len = min (v.len, 0xFFFF);
		508	return *this << uint16 (len) << data (v.ptr, len);
		509	}
		510
		511	packet &packet::operator <<(const char *v)
		512	{
		513	return *this << data (v, strlen (v ? v : 0));
		514	}
		515
		516	void
		517	packet::vprintf (const char *format, va_list ap)
		518	{
		519	int size = room ();
		520
		521	int len = vsnprintf ((char *)cur, size, format, ap);
		522
		523	if (len >= size)
		524	return reset ();
		525
		526	cur += len;
430	}	527	}
431		528
432	/******************************************************************************	529	/******************************************************************************
433	*	530	*
434	* statistics logging functions.	531	* statistics logging functions.

Diff Legend

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

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.18 by root, Thu Dec 14 05:09:32 2006 UTC vs. Revision 1.26 by root, Tue Dec 19 04:58:05 2006 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.18 by root, Thu Dec 14 05:09:32 2006 UTC vs.
Revision 1.26 by root, Tue Dec 19 04:58:05 2006 UTC