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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.31 by root, Mon Jan 15 02:39:41 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs. Revision 1.31 by root, Mon Jan 15 02:39:41 2007 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.31 by root, Mon Jan 15 02:39:41 2007 UTC