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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.9 by root, Wed Dec 13 18:08:02 2006 UTC vs.
Revision 1.27 by root, Wed Dec 20 01:19:11 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>
		39	#include <cstdarg>
40		40
41	#ifdef __linux__	41	#ifdef __linux__
42	# include <sys/types.h>	42	# include <sys/types.h>
43	# include <sys/socket.h>	43	# include <sys/socket.h>
44	# include <netinet/in.h>	44	# include <netinet/in.h>
45	# define TCP_HZ 1000 // sorry...
46	# include <netinet/tcp.h>	45	# include <netinet/tcp.h>
47	#endif	46	#endif
48		47
49	// 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
50	// easily die in 20 seconds...	49	// easily die in 20 seconds...
51	#define SOCKET_TIMEOUT1 10	50	#define SOCKET_TIMEOUT1 10 * 1000
52	#define SOCKET_TIMEOUT2 20	51	#define SOCKET_TIMEOUT2 20 * 1000
53		52
54	void	53	void
55	Socket_Flush (NewSocket * ns)	54	client::flush ()
56	{	55	{
57	#ifdef __linux__	56	#ifdef __linux__
58	// check time of last ack, and, if too old, kill connection	57	// check time of last ack, and, if too old, kill connection
59	struct tcp_info tcpi;	58	struct tcp_info tcpi;
60	socklen_t len = sizeof (tcpi);	59	socklen_t len = sizeof (tcpi);
61		60
62	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))
63	{	62	{
64	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;
65		64
		65	rtt = tcpi.tcpi_rtt;
		66	rttvar = tcpi.tcpi_rttvar;
		67
66	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
67	&& 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
68	{	70	{
69	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,
70	(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);
71	ns->status = Ns_Dead;	73	destroy ();
72	}	74	}
73	}	75	}
74
75	int val;
76
77	val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
78	val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
79	#endif	76	#endif
80	}
81		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
82	/***********************************************************************	174	/*****************************************************************************
83	*	175	* Start of command dispatch area.
84	* SockList functions/utilities	176	* The commands here are protocol commands.
85	*
86	**********************************************************************/	177	****************************************************************************/
87		178
88	SockList &SockList::operator <<(const data8 &v)	179	// SocketCommand, PlayingCommand, should not exist with those ugly casts
89	{	180	#define SC(cb) (void )static_cast<void ()(char , int, client )>(cb),
90	*this << uint8 (v.len);	181	#define PC(cb) (void )static_cast<void ()(char , int, player )>(cb), PF_PLAYER \|
91		182
92	memcpy (buf + len, v.data, v.len);	183	/**
93	len += v.len;	184	* Dispatch table for the server.
94
95	return *this;
96	}
97
98	SockList &SockList::operator <<(const data16 &v)
99	{
100	*this << uint16 (v.len);
101
102	memcpy (buf + len, v.data, v.len);
103	len += v.len;
104
105	return *this;
106	}
107
108	/* Basically does the reverse of SockList_AddInt, but on
109	* strings instead. Same for the GetShort, but for 16 bits.
110	*/	185	*/
111	int	186	static struct packet_type packets[] = {
112	GetInt_String (unsigned char *data)	187	{"ncom", PC(NewPlayerCmd) PF_PLAYING },
113	{	188	{"command", PC(PlayerCmd) PF_PLAYING },
114	return ((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]);
115	}
116		189
117	short	190	{"examine", PC(ExamineCmd) PF_PLAYING },
118	GetShort_String (unsigned char *data)	191	{"apply", PC(ApplyCmd) PF_PLAYING },
119	{	192	{"reply", PC(ReplyCmd) 0 },
120	return ((data[0] << 8) + data[1]);	193	{"lookat", PC(LookAt) PF_PLAYING },
121	}	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+ */
122		200
123	/******************************************************************************	201	{"exti", SC(ExtiCmd) 0 }, /* CF+ */
124	*	202	{"addme", SC(AddMeCmd) 0 },
125	* Start of read routines.	203	{"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
126	*	204	{"requestinfo", SC(RequestInfo) 0 },
127	******************************************************************************/	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	};
128		213
129	/**	214	bool
130	* This reads from fd and puts the data in sl. We return true if we think	215	client::may_execute (const packet_type *pkt) const
131	* we have a full packet, 0 if we have a partial packet. The only processing
132	* we do is remove the intial size value. len (As passed) is the size of the
133	* buffer allocated in the socklist. We make the assumption the buffer is
134	* at least 2 bytes long.
135	*/
136
137	int
138	SockList_ReadPacket (int fd, SockList * sl, int len)
139	{	216	{
140	int stat, toread;	217	return (!(pkt->flags & PF_PLAYER) \|\| pl)
		218	&& (!(pkt->flags & PF_PLAYING) \|\| (pl && pl->state == ST_PLAYING));
		219	}
141		220
142	/* Sanity check - shouldn't happen */	221	void
143	if (sl->len < 0)	222	client::execute (const packet_type pkt, char data, int datalen)
144	{	223	{
145	abort ();	224	if (may_execute (pkt))
146	}	225	{
147	/* We already have a partial packet */	226	//TODO: only one format
148	if (sl->len < 2)	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);
149	{	231	}
150	do	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;
		249	}
		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))
151	{	274	{
152	stat = read (fd, sl->buf + sl->len, 2 - sl->len);	275	if (pkt->flags & PF_PLAYER)
		276	queue_command (pkt, data, datalen);
		277	else
		278	execute (pkt, data, datalen);
		279
		280	goto next_packet;
		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)
		300	{
		301	socket_ev.poll (0);
		302	return;
		303	}
		304
		305	if (got & PE_W)
		306	{
		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
		316
		317	int amount = sizeof (inbuf) - inbuf_len;
		318
		319	if (!amount)
153	}	320	{
154	while ((stat == -1) && (errno == EINTR));	321	// input buffer full
155		322	socket_ev.poll (socket_ev.poll () & ~PE_R);
156	if (stat < 0)	323	return;
157	{	324	}
158	/* In non blocking mode, EAGAIN is set when there is no	325
159	* data available.	326	amount = read (fd, inbuf + inbuf_len, amount);
160	*/	327
		328	if (!amount)
		329	{
		330	destroy ();
		331	return;
		332	}
		333	else if (amount < 0)
		334	{
161	if (errno != EAGAIN && errno != EWOULDBLOCK)	335	if (errno != EAGAIN && errno != EINTR)
162	{	336	{
163	LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno));	337	LOG (llevError, "read error: %s\n", strerror (errno));
		338	destroy ();
		339	return;
164	}	340	}
165	return 0; /Error /
166	}
167	if (stat == 0)
168	return -1;
169	sl->len += stat;
170	#ifdef CS_LOGSTATS
171	cst_tot.ibytes += stat;
172	cst_lst.ibytes += stat;
173	#endif
174	if (stat < 2)
175	return 0; /* Still don't have a full packet */
176	}
177	/* Figure out how much more data we need to read. Add 2 from the
178	* end of this - size header information is not included.
179	*/
180	toread = 2 + (sl->buf[0] << 8) + sl->buf[1] - sl->len;
181	if ((toread + sl->len) >= len)
182	{
183	LOG (llevError, "SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n", toread + sl->len, len);
184	/* Quick hack in case for 'oldsocketmode' input. If we are
185	* closing the socket anyways, then reading this extra 100 bytes
186	* shouldn't hurt.
187	*/
188	read (fd, sl->buf + 2, 100);
189		341
190	/* return error so the socket is closed */	342	// should not be here, normally
191	return -1;
192	}
193	do
194	{
195	do
196	{	343	}
197	stat = read (fd, sl->buf + sl->len, toread);	344	else
198	}	345	{
199	while ((stat < 0) && (errno == EINTR));	346	inbuf_len += amount;
200	if (stat < 0)	347
		348	cst_tot.ibytes += amount;
		349	cst_lst.ibytes += amount;
		350
		351	cmd_ev.start ();
201	{	352	}
202
203	if (errno != EAGAIN && errno != EWOULDBLOCK)
204	{
205	LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno));
206	}
207	return 0; /Error /
208	}
209	if (stat == 0)
210	return -1;
211	sl->len += stat;
212	#ifdef CS_LOGSTATS
213	cst_tot.ibytes += stat;
214	cst_lst.ibytes += stat;
215	#endif
216	toread -= stat;
217	if (toread == 0)
218	return 1;
219	if (toread < 0)
220	{
221	LOG (llevError, "SockList_ReadPacket: Read more bytes than desired.\n");
222	return 1;
223	}
224	}	353	}
225	while (toread > 0);	354	}
226	return 0;	355
		356	// called whenever we have additional commands to process
		357	void
		358	client::cmd_cb (iw &w)
		359	{
		360	if (handle_packet ())
		361	w.start ();
		362	else
		363	flush ();
227	}	364	}
228		365
229	/*******************************************************************************	366	/*******************************************************************************
230	*	367	*
231	* Start of write related routines.	368	* Start of write related routines.
…		…
236	* Adds data to a socket buffer for whatever reason.	373	* Adds data to a socket buffer for whatever reason.
237	*	374	*
238	* 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
239	* data, and len is the number of bytes to add.	376	* data, and len is the number of bytes to add.
240	*/	377	*/
241		378	void
242	static void	379	client::send (void *buf_, int len)
243	add_to_buffer (NewSocket * ns, char *buf, int len)
244	{	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
245	int avail, end;	395	int avail, end;
246
247	if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
248	{
249	LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
250	ns->status = Ns_Dead;
251	return;
252	}
253		396
254	/* 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
255	* currently in use is actually data + end -1	398	* currently in use is actually data + end -1
256	*/	399	*/
257
258	end = ns->outputbuffer.start + ns->outputbuffer.len;	400	end = outputbuffer.start + outputbuffer.len;
259	/* The buffer is already in a wrapped state, so adjust end */	401	/* The buffer is already in a wrapped state, so adjust end */
260	if (end >= SOCKETBUFSIZE)	402	if (end >= SOCKETBUFSIZE)
261	end -= SOCKETBUFSIZE;	403	end -= SOCKETBUFSIZE;
262		404
263	avail = SOCKETBUFSIZE - end;	405	avail = SOCKETBUFSIZE - end;
264		406
265	/* We can all fit it behind the current data without wrapping */	407	/* We can all fit it behind the current data without wrapping */
266	if (avail >= len)	408	if (avail >= len)
267	memcpy (ns->outputbuffer.data + end, buf, len);	409	memcpy (outputbuffer.data + end, buf, len);
268	else	410	else
269	{	411	{
270	memcpy (ns->outputbuffer.data + end, buf, avail);	412	memcpy (outputbuffer.data + end, buf, avail);
271	memcpy (ns->outputbuffer.data, buf + avail, len - avail);	413	memcpy (outputbuffer.data, buf + avail, len - avail);
272	}	414	}
273		415
274	ns->outputbuffer.len += len;	416	outputbuffer.len += len;
275	#if 0
276	LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
277	#endif
278	}	417	}
279
280	/**
281	* Writes data to socket.
282	*
283	* When the socket is clear to write, and we have backlogged data, this
284	* is called to write it out.
285	*/
286	void
287	write_socket_buffer (NewSocket * ns)
288	{
289	int amt, max;
290
291	if (ns->outputbuffer.len == 0)
292	{
293	LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
294	return;
295	}
296
297	do
298	{
299	max = SOCKETBUFSIZE - ns->outputbuffer.start;
300	if (ns->outputbuffer.len < max)
301	max = ns->outputbuffer.len;
302
303	do
304	{
305	amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
306	}
307	while ((amt < 0) && (errno == EINTR));
308
309	if (amt < 0)
310	{ /* We got an error */
311
312	if (errno != EWOULDBLOCK)
313	{
314	LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
315	ns->status = Ns_Dead;
316	return;
317	}
318	else
319	{ /* EWOULDBLOCK */
320	/* can't write it, so store it away. */
321	ns->can_write = 0;
322	return;
323	}
324	}
325	ns->outputbuffer.start += amt;
326	/* wrap back to start of buffer */
327	if (ns->outputbuffer.start == SOCKETBUFSIZE)
328	ns->outputbuffer.start = 0;
329	ns->outputbuffer.len -= amt;
330	#ifdef CS_LOGSTATS
331	cst_tot.obytes += amt;
332	cst_lst.obytes += amt;
333	#endif
334	}
335	while (ns->outputbuffer.len > 0);
336	}
337
338	/**
339	* This writes data to the socket. - It is very low level -
340	* all we try and do is write out the data to the socket
341	* provided (ns). buf is the data to write, len is the number
342	* of bytes to write. IT doesn't return anything - rather, it
343	* updates the ns structure if we get an error.
344	*/
345	void
346	Write_To_Socket (NewSocket * ns, char *buf, int len)
347	{
348	int amt = 0;
349	char *pos = buf;
350
351	if (ns->status == Ns_Dead \|\| !buf)
352	{
353	LOG (llevDebug, "Write_To_Socket called with dead socket\n");
354	return;
355	}
356
357	#ifndef __GNU__ /* This caused problems on Hurd */
358	if (!ns->can_write)
359	{
360	add_to_buffer (ns, buf, len);
361	return;
362	}
363	#endif
364	/* If we manage to write more than we wanted, take it as a bonus */
365	while (len > 0)
366	{
367
368	do
369	{
370	amt = write (ns->fd, pos, len);
371	}
372	while ((amt < 0) && (errno == EINTR));
373
374	if (amt < 0)
375	{ /* We got an error */
376	if (errno != EWOULDBLOCK)
377	{
378	LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
379	errno, strerror (errno));
380	ns->status = Ns_Dead;
381	return;
382	}
383	else
384	{ /* EWOULDBLOCK */
385	/* can't write it, so store it away. */
386	add_to_buffer (ns, pos, len);
387	ns->can_write = 0;
388	return;
389	}
390	}
391	/* amt gets set to 0 above in blocking code, so we do this as
392	* an else if to make sure we don't reprocess it.
393	*/
394	else if (amt == 0)
395	{
396	LOG (llevError, "Write_To_Socket: No data written out.\n");
397	}
398	len -= amt;
399	pos += amt;
400	#ifdef CS_LOGSTATS
401	cst_tot.obytes += amt;
402	cst_lst.obytes += amt;
403	#endif
404	}
405	}
406
407		418
408	/**	419	/**
409	* 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
410	* shortcut function.	421	* shortcut function.
411	*/	422	*/
412	void	423	void
413	cs_write_string (NewSocket * ns, const char *buf, int len)	424	client::send_packet (packet &sl)
414	{	425	{
415	SockList sl;
416
417	sl.len = len;
418	sl.buf = (unsigned char *) buf;
419	Send_With_Handling (ns, &sl);
420	}
421
422
423	/**
424	* Calls Write_To_Socket to send data to the client.
425	*
426	* The only difference in this function is that we take a SockList
427	*, and we prepend the length information.
428	*/
429	void
430	Send_With_Handling (NewSocket * ns, SockList * msg)
431	{
432	unsigned char sbuf[4];
433
434	if (ns->status == Ns_Dead \|\| !msg)	426	if (status == Ns_Dead)
435	return;	427	return;
436		428
437	if (msg->len >= MAXSOCKBUF)	429	if (sl.length () >= MAXSOCKBUF)
438	{	430	{
439	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len);	431	LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
440	/* 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
441	* it easier to debug.	433	* it easier to debug.
442	*/	434	*/
443	abort ();	435	abort ();
444	}	436	}
445	sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF;
446	sbuf[1] = ((uint32) (msg->len)) & 0xFF;
447	if (ns->status != Ns_Old)
448	Write_To_Socket (ns, (char *) sbuf, 2);
449	Write_To_Socket (ns, (char *) msg->buf, msg->len);
450	}
451		437
452	/**	438	if (!sl.length ())
453	* Takes a string of data, and writes it out to the socket. A very handy	439	return;
454	* shortcut function.	440
		441	assert (sl.hdrlen == 2);
		442
		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	/***********************************************************************
455	*/	478	*
456	void	479	* packet functions/utilities
457	Write_String_To_Socket (NewSocket * ns, char *buf, int len)	480	*
458	{	481	**********************************************************************/
459	SockList sl;
460		482
461	sl.len = len;	483	packet::packet (const char *name)
462	sl.buf = (unsigned char *) buf;	484	{
463	Send_With_Handling (ns, &sl);	485	reset ();
464	}
465		486
		487	int len = strlen (name);
		488	memcpy (cur, name, len); cur += len;
		489	*cur++ = ' ';
		490	}
		491
		492	packet &packet::operator <<(const data &v)
		493	{
		494	if (room () < v.len)
		495	reset ();
		496	else
		497	{
		498	if (v.len)
		499	{
		500	memcpy (cur, v.ptr, v.len);
		501	cur += v.len;
		502	}
		503	}
		504
		505	return *this;
		506	}
		507
		508	packet &packet::operator <<(const data8 &v)
		509	{
		510	unsigned int len = min (v.len, 0x00FF);
		511	return *this << uint8 (len) << data (v.ptr, len);
		512	}
		513
		514	packet &packet::operator <<(const data16 &v)
		515	{
		516	unsigned int len = min (v.len, 0xFFFF);
		517	return *this << uint16 (len) << data (v.ptr, len);
		518	}
		519
		520	packet &packet::operator <<(const char *v)
		521	{
		522	return *this << data (v, strlen (v ? v : 0));
		523	}
		524
		525	void
		526	packet::vprintf (const char *format, va_list ap)
		527	{
		528	int size = room ();
		529
		530	int len = vsnprintf ((char *)cur, size, format, ap);
		531
		532	if (len >= size)
		533	return reset ();
		534
		535	cur += len;
		536	}
466		537
467	/******************************************************************************	538	/******************************************************************************
468	*	539	*
469	* statistics logging functions.	540	* statistics logging functions.
470	*	541	*
…		…
493	LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",	564	LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
494	ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,	565	ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
495	now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);	566	now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
496	cst_lst.ibytes = 0;	567	cst_lst.ibytes = 0;
497	cst_lst.obytes = 0;	568	cst_lst.obytes = 0;
498	cst_lst.max_conn = socket_info.nconns;
499	cst_lst.time_start = now;	569	cst_lst.time_start = now;
500	}	570	}
501	#endif	571	#endif
502		572

Diff Legend

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

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.9 by root, Wed Dec 13 18:08:02 2006 UTC vs. Revision 1.27 by root, Wed Dec 20 01:19:11 2006 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.9 by root, Wed Dec 13 18:08:02 2006 UTC vs.
Revision 1.27 by root, Wed Dec 20 01:19:11 2006 UTC