[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.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	Socket_Flush (client_socket * ns)	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);
62		61
63	if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))	62	if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
64	{	63	{
65	unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;	64	unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
		65
		66	rtt = tcpi.tcpi_rtt;
		67	rttvar = tcpi.tcpi_rttvar;
66		68
67	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
68	&& 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
69	{	71	{
70	LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd,	72	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);	73	(unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
72	ns->status = Ns_Dead;	74	destroy ();
73	}	75	}
74	}	76	}
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	77	#endif
81	}
82		78
		79	/**
		80	* Writes data to socket.
		81	*
		82	* When the socket is clear to write, and we have backlogged data, this
		83	* is called to write it out.
		84	*/
		85
		86	if (!outputbuffer.len \|\| socket_ev.poll () & PE_W)
		87	return;
		88
		89	write_outputbuffer ();
		90	}
		91
		92	void
		93	client::write_outputbuffer ()
		94	{
		95	while (outputbuffer.len)
		96	{
		97	int res = write (fd, outputbuffer.data + outputbuffer.start,
		98	min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
		99
		100	if (res > 0)
		101	{
		102	outputbuffer.start += res;
		103	/* wrap back to start of buffer */
		104	if (outputbuffer.start == SOCKETBUFSIZE)
		105	outputbuffer.start = 0;
		106
		107	outputbuffer.len -= res;
		108	#ifdef CS_LOGSTATS
		109	cst_tot.obytes += res;
		110	cst_lst.obytes += res;
		111	#endif
		112	}
		113	else if (res == 0)
		114	{
		115	LOG (llevError, "socket write failed, connection closed.\n");
		116	destroy ();
		117	return;
		118	}
		119	else if (errno == EINTR)
		120	{
		121	// just retry
		122	}
		123	else if (errno == EAGAIN)
		124	{
		125	// delay till ready
		126	socket_ev.poll (socket_ev.poll () \| PE_W);
		127	socket_ev.start ();
		128	return;
		129	}
		130	else
		131	{
		132	LOG (llevError, "socket write failed: %s\n", strerror (errno));
		133	destroy ();
		134	return;
		135	}
		136	}
		137
		138	socket_ev.poll (socket_ev.poll () & ~PE_W);
		139	}
		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
83	/***********************************************************************	175	/*****************************************************************************
84	*	176	* Start of command dispatch area.
85	* packet functions/utilities	177	* The commands here are protocol commands.
86	*
87	**********************************************************************/	178	****************************************************************************/
88		179
89	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
90	{	217	{
91	if (room () < v.len)	218	return (!(pkt->flags & PF_PLAYER) \|\| pl)
92	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	}
93	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;
94	{	250	}
95	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))
96	{	275	{
97	memcpy (cur, v.ptr, v.len);	276	if (pkt->flags & PF_IMMEDIATE)
98	cur += v.len;	277	execute (pkt, data, datalen);
		278	else
		279	queue_command (pkt, data, datalen);
		280
		281	goto next_packet;
99	}	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)
100	}	304	{
101		305	socket_ev.poll (0);
102	return *this;	306	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	{	307	}
149	if (inbuf_len >= 2)
150	{
151	unsigned int pkt_len = (inbuf [0] << 8) \| inbuf [1];
152		308
153	if (inbuf_len >= 2 + pkt_len)	309	if (got & PE_W)
154	return pkt_len + 2;	310	{
155	}	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
156		320
157	int amount = sizeof (inbuf) - inbuf_len;	321	int amount = sizeof (inbuf) - inbuf_len;
158		322
159	if (amount <= 0)	323	if (!amount)
160	{	324	{
161	LOG (llevError, "packet too large");//TODO	325	// input buffer full
		326	socket_ev.poll (socket_ev.poll () & ~PE_R);
162	return -1;	327	return;
163	}	328	}
164		329
165	amount = read (fd, inbuf + inbuf_len, amount);	330	amount = read (fd, inbuf + inbuf_len, amount);
166		331
167	if (!amount)	332	if (!amount)
168	{	333	{
169	status = Ns_Dead;	334	destroy ();
170	return -1;	335	return;
171	}	336	}
172	else if (amount < 0)	337	else if (amount < 0)
173	{	338	{
174	if (errno != EAGAIN && errno != EINTR)	339	if (errno != EAGAIN && errno != EINTR)
175	{	340	{
176	LOG (llevError, "read error: %s", strerror (errno));	341	LOG (llevError, "read error: %s\n", strerror (errno));
		342	destroy ();
177	return -1;	343	return;
178	}	344	}
179		345
180	return 0;	346	// should not be here, normally
		347	}
		348	else
181	}	349	{
182
183	inbuf_len += amount;	350	inbuf_len += amount;
184		351
185	cst_tot.ibytes += amount;	352	cst_tot.ibytes += amount;
186	cst_lst.ibytes += amount;	353	cst_lst.ibytes += amount;
187	}
188	}
189		354
		355	cmd_ev.start ();
		356	}
		357	}
		358	}
		359
		360	// called whenever we have additional commands to process
190	void	361	void
191	client_socket::skip_packet (int len)	362	client::cmd_cb (iw &w)
192	{	363	{
193	inbuf_len -= len;	364	if (handle_packet () \|\| handle_command ())
194	memmove (inbuf, inbuf + len, inbuf_len);	365	w.start ();
		366	else
		367	flush ();
195	}	368	}
196		369
197	/*******************************************************************************	370	/*******************************************************************************
198	*	371	*
199	* Start of write related routines.	372	* Start of write related routines.
…		…
204	* Adds data to a socket buffer for whatever reason.	377	* Adds data to a socket buffer for whatever reason.
205	*	378	*
206	* 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
207	* data, and len is the number of bytes to add.	380	* data, and len is the number of bytes to add.
208	*/	381	*/
209		382	void
210	static void	383	client::send (void *buf_, int len)
211	add_to_buffer (client_socket ns, char buf, int len)
212	{	384	{
		385	char buf = (char )buf_;
		386	char *pos = buf;
		387	int amt = 0;
		388
		389	if (status == Ns_Dead \|\| !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
213	int avail, end;	399	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		400
222	/* 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
223	* currently in use is actually data + end -1	402	* currently in use is actually data + end -1
224	*/	403	*/
225
226	end = ns->outputbuffer.start + ns->outputbuffer.len;	404	end = outputbuffer.start + outputbuffer.len;
227	/* The buffer is already in a wrapped state, so adjust end */	405	/* The buffer is already in a wrapped state, so adjust end */
228	if (end >= SOCKETBUFSIZE)	406	if (end >= SOCKETBUFSIZE)
229	end -= SOCKETBUFSIZE;	407	end -= SOCKETBUFSIZE;
230		408
231	avail = SOCKETBUFSIZE - end;	409	avail = SOCKETBUFSIZE - end;
232		410
233	/* We can all fit it behind the current data without wrapping */	411	/* We can all fit it behind the current data without wrapping */
234	if (avail >= len)	412	if (avail >= len)
235	memcpy (ns->outputbuffer.data + end, buf, len);	413	memcpy (outputbuffer.data + end, buf, len);
236	else	414	else
237	{	415	{
238	memcpy (ns->outputbuffer.data + end, buf, avail);	416	memcpy (outputbuffer.data + end, buf, avail);
239	memcpy (ns->outputbuffer.data, buf + avail, len - avail);	417	memcpy (outputbuffer.data, buf + avail, len - avail);
240	}	418	}
241		419
242	ns->outputbuffer.len += len;	420	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	}	421	}
374		422
375	/**	423	/**
376	* 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
377	* shortcut function.	425	* shortcut function.
378	*/	426	*/
379
380	void	427	void
381	client_socket::send_packet (packet &sl)	428	client::send_packet (packet &sl)
382	{	429	{
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)	430	if (status == Ns_Dead)
413	return;	431	return;
414		432
415	if (msg->length () >= MAXSOCKBUF)	433	if (sl.length () >= MAXSOCKBUF)
416	{	434	{
417	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->length ());	435	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	436	/* Almost certainly we've overflowed a buffer, so quit now to make
419	* it easier to debug.	437	* it easier to debug.
420	*/	438	*/
421	abort ();	439	abort ();
422	}	440	}
423		441
424	sbuf[0] = ((uint32) (msg->length ()) >> 8);	442	if (!sl.length ())
425	sbuf[1] = ((uint32) (msg->length ()) );	443	return;
426		444
427	//TODO: single write, or writev	445	assert (sl.hdrlen == 2);
428	ns->send (sbuf, 2);	446
429	ns->send (msg->buf, msg->length ());	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::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;
430	}	531	}
431		532
432	/******************************************************************************	533	/******************************************************************************
433	*	534	*
434	* 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.18 by root, Thu Dec 14 05:09:32 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.18 by root, Thu Dec 14 05:09:32 2006 UTC vs.
Revision 1.23 by root, Sat Dec 16 03:08:26 2006 UTC