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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.15 by root, Sat Dec 16 22:14:42 2006 UTC vs.
Revision 1.57 by root, Fri Dec 26 10:44:17 2008 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/** \file	24	/** \file
25	* Image related communication	25	* Image related communication
26	*	26	*
27	* \date 2003-12-02	27	* \date 2003-12-02
33	*/	33	*/
34		34
35	#include <global.h>	35	#include <global.h>
36	#include <sproto.h>	36	#include <sproto.h>
37		37
38	#define MAX_FACE_SETS 20 /*< Maximum number of image sets the program will handle /	38	#include "crc.h"
39
40	/** Information about one image */
41	typedef struct FaceInfo
42	{
43	uint8 data; /< image data /
44	uint16 datalen; /*< length of the xpm data /
45	uint32 checksum; /*< Checksum of face data /
46	} FaceInfo;
47
48	/** Information about one face set */
49	typedef struct
50	{
51	char prefix; /< /
52	char *fullname;
53
54	uint8 fallback; /*< faceset to use when an image is not found in this faceset /
55	char *size;
56	char *extension;
57	char *comment;
58
59	FaceInfo faces; /< images in this faceset /
60	} FaceSets;
61
62	static FaceSets facesets[MAX_FACE_SETS]; /*< All facesets /
63
64	/**
65	* Checks specified faceset is valid
66	* \param fsn faceset number
67	*/
68	int
69	is_valid_faceset (int fsn)
70	{
71	if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix)
72	return TRUE;
73	return FALSE;
74	}
75
76	/**
77	* Frees all faceset information
78	*/
79	void
80	free_socket_images (void)
81	{
82	int num, q;
83
84	for (num = 0; num < MAX_FACE_SETS; num++)
85	{
86	if (facesets[num].prefix)
87	{
88	for (q = 0; q < nrofpixmaps; q++)
89	if (facesets[num].faces[q].data)
90	free (facesets[num].faces[q].data);
91
92	free (facesets[num].prefix);
93	free (facesets[num].fullname);
94	free (facesets[num].size);
95	free (facesets[num].extension);
96	free (facesets[num].comment);
97	free (facesets[num].faces);
98	}
99	}
100	}
101
102	/**
103	* This returns the set we will actually use when sending
104	* a face. This is used because the image files may be sparse.
105	* This function is recursive. imageno is the face number we are
106	* trying to send
107	*
108	* If face is not found in specified faceset, tries with 'fallback' faceset.
109	*
110	* \param faceset faceset to check
111	* \param imageno image number
112	*
113	*/
114	static int
115	get_face_fallback (int faceset, int imageno)
116	{
117	/* faceset 0 is supposed to have every image, so just return. Doing
118	* so also prevents infinite loops in the case if it not having
119	* the face, but in that case, we are likely to crash when we try
120	* to access the data, but that is probably preferable to an infinite
121	* loop.
122	*/
123	if (faceset == 0)
124	return 0;
125
126	if (!facesets[faceset].prefix)
127	{
128	LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
129	return 0; /* use default set */
130	}
131
132	if (facesets[faceset].faces[imageno].data)
133	return faceset;
134
135	return get_face_fallback (facesets[faceset].fallback, imageno);
136	}
137
138	/**
139	* Checks fallback are correctly defined.
140	* This is a simple recursive function that makes sure the fallbacks
141	* are all proper (eg, the fall back to defined sets, and also
142	* eventually fall back to 0). At the top level, togo is set to MAX_FACE_SETS,
143	* if togo gets to zero, it means we have a loop.
144	* This is only run when we first load the facesets.
145	*/
146	static void
147	check_faceset_fallback (int faceset, int togo)
148	{
149	int fallback = facesets[faceset].fallback;
150
151	/* proper case - falls back to base set */
152	if (fallback == 0)
153	return;
154
155	if (!facesets[fallback].prefix)
156	{
157	LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
158	abort ();
159	}
160
161	togo--;
162	if (togo == 0)
163	{
164	LOG (llevError, "Infinite loop found in facesets. aborting.\n");
165	abort ();
166	}
167
168	check_faceset_fallback (fallback, togo);
169	}
170		39
171	#define MAX_IMAGE_SIZE 10000	40	#define MAX_IMAGE_SIZE 10000
172
173	/**
174	* Loads all the image types into memory.
175	*
176	* This way, we can easily send them to the client. We should really do something
177	* better than abort on any errors - on the other hand, these are all fatal
178	* to the server (can't work around them), but the abort just seems a bit
179	* messy (exit would probably be better.)
180	*
181	* Couple of notes: We assume that the faces are in a continous block.
182	* This works fine for now, but this could perhaps change in the future
183	*
184	* Function largely rewritten May 2000 to be more general purpose.
185	* The server itself does not care what the image data is - to the server,
186	* it is just data it needs to allocate. As such, the code is written
187	* to do such.
188	*/
189	void
190	read_client_images (void)
191	{
192	char filename[400];
193	char buf[HUGE_BUF];
194	char cp, cps[7];
195	FILE *infile;
196	int num, len, compressed, fileno, i, badline;
197
198	memset (facesets, 0, sizeof (facesets));
199	sprintf (filename, "%s/image_info", settings.datadir);
200	if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
201	{
202	LOG (llevError, "Unable to open %s\n", filename);
203	abort ();
204	}
205
206	while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
207	{
208	badline = 0;
209
210	if (buf[0] == '#')
211	continue;
212
213	if (!(cps[0] = strtok (buf, ":")))
214	badline = 1;
215
216	for (i = 1; i < 7; i++)
217	if (!(cps[i] = strtok (NULL, ":")))
218	badline = 1;
219
220	if (badline)
221	LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
222	else
223	{
224	len = atoi (cps[0]);
225	if (len >= MAX_FACE_SETS)
226	{
227	LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
228	abort ();
229	}
230	facesets[len].prefix = strdup (cps[1]);
231	facesets[len].fullname = strdup (cps[2]);
232	facesets[len].fallback = atoi (cps[3]);
233	facesets[len].size = strdup (cps[4]);
234	facesets[len].extension = strdup (cps[5]);
235	facesets[len].comment = strdup (cps[6]);
236	}
237	}
238
239	close_and_delete (infile, compressed);
240
241	for (i = 0; i < MAX_FACE_SETS; i++)
242	{
243	if (facesets[i].prefix)
244	check_faceset_fallback (i, MAX_FACE_SETS);
245	}
246
247	/* Loaded the faceset information - now need to load up the
248	* actual faces.
249	*/
250
251	for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
252	{
253	/* if prefix is not set, this is not used */
254	if (!facesets[fileno].prefix)
255	continue;
256
257	facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
258
259	sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
260	LOG (llevDebug, "Loading image file %s\n", filename);
261
262	if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
263	{
264	LOG (llevError, "Unable to open %s\n", filename);
265	abort ();
266	}
267
268	while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
269	{
270	if (strncmp (buf, "IMAGE ", 6) != 0)
271	{
272	LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
273	abort ();
274	}
275
276	num = atoi (buf + 6);
277	if (num < 0 \|\| num >= nrofpixmaps)
278	{
279	LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
280	abort ();
281	}
282
283	/* Skip accross the number data */
284	for (cp = buf + 6; *cp != ' '; cp++);
285	len = atoi (cp);
286	if (len == 0 \|\| len > MAX_IMAGE_SIZE)
287	{
288	LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
289	abort ();
290	}
291
292	/* We don't actualy care about the name of the image that
293	* is embedded in the image file, so just ignore it.
294	*/
295	facesets[fileno].faces[num].datalen = len;
296	facesets[fileno].faces[num].data = (uint8 *) malloc (len);
297	if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
298	{
299	LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
300	abort ();
301	}
302
303	facesets[fileno].faces[num].checksum = 0;
304	for (i = 0; i < len; i++)
305	{
306	ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
307	facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
308	facesets[fileno].faces[num].checksum &= 0xffffffff;
309	}
310	}
311
312	close_and_delete (infile, compressed);
313	} /* For fileno < MAX_FACE_SETS */
314	}
315		41
316	/**	42	/**
317	* Client tells us what type of faces it wants. Also sets	43	* Client tells us what type of faces it wants. Also sets
318	* the caching attribute.	44	* the caching attribute.
319	*	45	*
…		…
331	if (mask)	57	if (mask)
332	ns->facecache = 1;	58	ns->facecache = 1;
333	}	59	}
334		60
335	/**	61	/**
336	* Client has requested pixmap that it somehow missed getting.	62	* client requested an image. send it rate-limited
337	* This will be called often if the client is	63	* before flushing.
338	* caching images.
339	*/	64	*/
340	void	65	void
341	SendFaceCmd (char buf, int len, client ns)	66	AskFaceCmd (char buf, int len, client ns)
342	{	67	{
343	uint16 facenum = atoi (buf);	68	int idx = 0, pri = 0;
344		69
345	if (facenum != 0)	70	sscanf (buf, "%d %d", &idx, &pri);
346	esrv_send_face (ns, facenum, 1);	71
		72	//TODO: somehow fetch default priority from send_fx here
		73
		74	const facedata *d = face_data (idx, ns->faceset);
		75
		76	if (!d)
		77	return; // doh
		78
		79	client::ixsend ix;
		80
		81	ix.pri = pri;
		82	ix.idx = idx;
		83	ix.ofs = d->data.size ();
		84
		85	auto (pos, ns->ixface.end ());
		86
		87	if (ns->fxix < 2)
		88	{
		89	// gcfclient does not support prioritising, older cfplus versions
		90	// do not support interleaved transfers.
		91	if (!ns->ixface.empty ())
		92	pos = ns->ixface.end () - 1;
		93	}
		94	else
		95	{
		96	// the by far most common case will be to insert
		97	// near the end, so little looping.
		98	while (pos != ns->ixface.begin ())
		99	{
		100	--pos;
		101
		102	// sort within 2k bins, to slightly prefer smaller images
		103	if (pri > pos->pri \|\| (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
		104	{
		105	++pos;
		106	break;
		107	}
		108	}
		109	}
		110
		111	ns->ixface.insert (pos, ix);
		112
		113	#if 0
		114	for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
		115	fprintf (stderr, "<%d,%d> ", i->pri, i->ofs);
		116	fprintf (stderr, "\n");
		117	#endif
		118	}
		119
		120	/**
		121	* Tells client the picture it has to use
		122	* to smooth a picture number given as argument.
		123	*/
		124	void
		125	AskSmooth (char buf, int len, client ns)
		126	{
		127	ns->send_face (atoi (buf), -100);
		128	ns->flush_fx ();
		129	}
		130
		131	// how lame
		132	static void print_facename (packet &sl, const facedata &d)
		133	{
		134	for (int i = 0; i < CHKSUM_SIZE; ++i)
		135	sl.printf ("%02x", d.chksum [i]);
		136	}
		137
		138	// gcfclient uses the server-provided checksum for comparison, but always
		139	// writes a broken checksum to its cache file, so we have to provide
		140	// gcfclient with the same broken (and useless) checksum just to have it
		141	// cache the image despite its bugs.
		142	static uint32 gcfclient_checksum (const facedata *d)
		143	{
		144	uint32 csum = 0;
		145
		146	for (std::string::const_iterator i = d->data.begin ();
		147	i != d->data.end ();
		148	++i)
		149	{
		150	csum = rotate_right (csum);
		151	csum += (uint8 )&*i;
		152	}
		153
		154	return csum;
347	}	155	}
348		156
349	/**	157	/**
350	* Sends a face to a client if they are in pixmap mode	158	* Sends a face to a client if they are in pixmap mode
351	* nothing gets sent in bitmap mode.	159	* nothing gets sent in bitmap mode.
…		…
353	* this is needed for the askface, in which we really do want to send the	161	* this is needed for the askface, in which we really do want to send the
354	* face (and askface is the only place that should be setting it). Otherwise,	162	* face (and askface is the only place that should be setting it). Otherwise,
355	* we look at the facecache, and if set, send the image name.	163	* we look at the facecache, and if set, send the image name.
356	*/	164	*/
357	void	165	void
358	esrv_send_face (client *ns, short face_num, int nocache)	166	client::send_face (faceidx facenum, int pri)
359	{	167	{
360	char fallback;	168	// never send face 0. ever. it does not exist.
		169	if (!facenum)
		170	return;
361		171
362	if (face_num <= 0 \|\| face_num >= nrofpixmaps)	172	faceinfo *f = face_info (facenum);
		173
		174	if (!f)
363	{	175	{
364	LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);	176	LOG (llevError \| logBacktrace, "client::send_face (%d) out of bounds??\n", facenum);
365	return;	177	return;
366	}	178	}
367		179
		180	// refuse to send non-image faces
		181	if (!fx_want [f->type])
		182	return;
		183
		184	if (faces_sent [facenum])
		185	return;
		186
		187	faces_sent[facenum] = true;
		188
		189	// if for some reason we let a client without face caching connect,
		190	// we better support that decision here and implement it.
		191	if (!facecache)
		192	return send_image (facenum);
		193
		194	if (fxix)
		195	{
		196	fxface.push_back (facenum);
		197	return;
		198	}
		199
		200	const facedata *d = f->data (faceset);
		201
368	packet sl;	202	packet sl;
369	fallback = get_face_fallback (ns->faceset, face_num);
370		203
371	if (facesets[fallback].faces[face_num].data == NULL)	204	if (force_face0)
		205	sl << "face " << uint16 (facenum);
		206	else if (image2)
		207	sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
		208	else
		209	sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
		210
		211	// how lame
		212	print_facename (sl, *d);
		213	send_packet (sl);
		214	}
		215
		216	void client::flush_fx ()
		217	{
		218	while (!fxface.empty ())
		219	{
		220	packet fx ("fx");
		221	packet sx ("sx");
		222	int type = 0;
		223
		224	do
		225	{
		226	faceidx facenum = fxface.back (); fxface.pop_back ();
		227
		228	if (const faceinfo *f = face_info (facenum))
		229	{
		230	if (f->type != type)
		231	{
		232	type = f->type;
		233
		234	fx << ber32 (0)
		235	<< uint8 (1) << uint8 (type);
		236	}
		237
		238	const facedata *d = f->data (faceset);
		239
		240	fx << ber32 (facenum)
		241	<< data8 (d->chksum, CHKSUM_SIZE);
		242
		243	if (smoothing)
		244	{
		245	faceinfo *f = face_info (facenum);
		246
		247	if (f->smooth)
		248	{
		249	send_face (f->smooth, -110);
		250
		251	sx << ber32 (facenum)
		252	<< ber32 (f->smooth)
		253	<< ber32 (f->smoothlevel);
		254	}
		255	}
		256	}
		257	}
		258	while (!fxface.empty ()
		259	&& fx.room () > ber32::size + CHKSUM_SIZE + 1 + 3 /* type switch */
		260	&& sx.room () > ber32::size * 3);
		261
		262	send_packet (fx);
		263	if (sx.length () > 3) send_packet (sx);
372	{	264	}
373	LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);	265	}
		266
		267	void
		268	client::send_image (faceidx facenum)
		269	{
		270	// never send face 0. ever. it does not exist.
		271	if (!facenum)
		272	return;
		273
		274	const facedata *d = face_data (facenum, faceset);
		275
		276	faces_sent[facenum] = true;
		277
		278	if (!d)
		279	{
		280	LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
374	return;	281	return;
375	}	282	}
		283
		284	if (force_image_newmap)
		285	force_newmap = true;
376		286
377	if (ns->facecache && !nocache)	287	packet sl;
378	{
379	sl << (ns->image2 ? "face2 " : "face1 ")
380	<< uint16 (face_num);
381		288
382	if (ns->image2)
383	sl << uint8 (fallback);
384
385	sl << uint32 (facesets[fallback].faces[face_num].checksum)
386	<< new_faces[face_num].name;
387
388	ns->send_packet (sl);
389	}
390	else
391	{
392	sl << (ns->image2 ? "image2 " : "image ")	289	sl << (image2 ? "image2 " : "image ")
393	<< uint32 (face_num);	290	<< uint32 (facenum);
394		291
395	if (ns->image2)	292	if (image2)
396	sl << uint8 (fallback);	293	sl << uint8 (0);
397		294
398	sl << uint32 (facesets[fallback].faces[face_num].datalen)	295	sl << uint32 (d->data.size ())
399	<< data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);	296	<< data (d->data.data (), d->data.size ());
400		297
401	ns->send_packet (sl);	298	send_packet (sl);
		299	}
		300
		301	// send all faces of this object to the client
		302	// this uses more bandwidth initially, but makes
		303	// animations look much smoother, and every client
		304	// is supposed to do client-side caching anyways.
		305	void
		306	client::send_faces (object *ob)
		307	{
		308	send_face (ob->face, 10);
		309
		310	if (ob->animation_id)
402	}	311	{
		312	animation &anim = animations [ob->animation_id];
403		313
404	ns->faces_sent[face_num] \|= NS_FACESENT_FACE;	314	for (int i = 0; i < anim.num_animations; i++)
		315	send_face (anim.faces [i], -10);
		316	}
		317	}
		318
		319	/**
		320	* Need to send an animation sequence to the client.
		321	* We will send appropriate face commands to the client if we haven't
		322	* sent them the face yet (this can become quite costly in terms of
		323	* how much we are sending - on the other hand, this should only happen
		324	* when the player logs in and picks stuff up.
		325	*/
		326	void
		327	client::send_animation (short anim_num)
		328	{
		329	/* Do some checking on the anim_num we got. Note that the animations
		330	* are added in contigous order, so if the number is in the valid
		331	* range, it must be a valid animation.
		332	*/
		333	if (anim_num < 0 \|\| anim_num >= animations.size ())
		334	{
		335	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
		336	return;
		337	}
		338
		339	packet sl ("anim");
		340
		341	sl << uint16 (anim_num)
		342	<< uint16 (0); /* flags - not used right now */
		343
		344	/* Build up the list of faces. Also, send any information (ie, the
		345	* the face itself) down to the client.
		346	*/
		347	for (int i = 0; i < animations[anim_num].num_animations; i++)
		348	{
		349	send_face (animations[anim_num].faces[i], -20);
		350	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
		351	}
		352
		353	send_packet (sl);
		354
		355	anims_sent[anim_num] = 1;
405	}	356	}
406		357
407	/**	358	/**
408	* Sends the number of images, checksum of the face file,	359	* Sends the number of images, checksum of the face file,
409	* and the image_info file information. See the doc/Developers/protocol	360	* and the image_info file information. See the doc/Developers/protocol
410	* if you want further detail.	361	* if you want further detail.
411	*/	362	*/
412
413	void	363	void
414	send_image_info (client ns, char params)	364	send_image_info (client ns, char params)
415	{	365	{
416	packet sl;	366	packet sl;
417		367
418	sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum);	368	//TODO: second parameter is a checksum, but it makes no sense in this current framework
		369	sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
419		370
420	for (int i = 0; i < MAX_FACE_SETS; i++)	371	sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
421	if (facesets[i].prefix)
422	sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
423	facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
424	facesets[i].size , facesets[i].extension, facesets[i].comment);
425		372
426	ns->send_packet (sl);	373	ns->send_packet (sl);
427	}	374	}
428		375
429	/**	376	/**
…		…
437	*/	384	*/
438	void	385	void
439	send_image_sums (client ns, char params)	386	send_image_sums (client ns, char params)
440	{	387	{
441	int start, stop;	388	int start, stop;
442	char *cp, buf[MAX_BUF];	389	char *cp;
443		390
444	packet sl;	391	packet sl;
445		392
446	start = atoi (params);	393	start = atoi (params);
447	for (cp = params; *cp != '\0'; cp++)	394	for (cp = params; *cp != '\0'; cp++)
448	if (*cp == ' ')	395	if (*cp == ' ')
449	break;	396	break;
450		397
451	stop = atoi (cp);	398	stop = atoi (cp);
452	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= nrofpixmaps)	399	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= MAX_FACES)
453	{	400	{
454	sl.printf ("replyinfo image_sums %d %d", start, stop);	401	sl.printf ("replyinfo image_sums %d %d", start, stop);
455	ns->send_packet (sl);	402	ns->send_packet (sl);
456	sl.reset ();	403	sl.reset ();
457	return;	404	return;
458	}	405	}
459		406
460	sl.printf ("replyinfo image_sums %d %d ", start, stop);	407	sl.printf ("replyinfo image_sums %d %d ", start, stop);
461		408
462	for (int i = start; i <= stop; i++)	409	for (int i = start; i <= stop && i < faces.size (); i++)
463	{	410	if (const faceinfo *f = face_info (i))
464	ns->faces_sent[i] \|= NS_FACESENT_FACE;	411	if (ns->fx_want [f->type])
		412	{
		413	ns->faces_sent[i] = true;
465		414
466	int qq = get_face_fallback (ns->faceset, i);	415	const facedata *d = f->data (ns->faceset);
467		416
		417	if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
		418	break;
		419
468	sl << uint16 (i)	420	sl << uint16 (i)
469	<< uint32 (facesets[qq].faces[i].checksum)	421	<< uint32 (0) // checksum
470	<< uint8 (qq)	422	<< uint8 (ns->faceset);
471	<< data8 (&new_faces[i].name, new_faces[i].name.length () + 1);	423
472	}	424	print_facename (sl, *d); sl << uint8 (0);
		425	}
473		426
474	/* It would make more sense to catch this pre-emptively in the code above.	427	/* It would make more sense to catch this pre-emptively in the code above.
475	* however, if this really happens, we probably just want to cut down the	428	* however, if this really happens, we probably just want to cut down the
476	* size to less than 1000, since that is what we claim the protocol would	429	* size to less than 1000, since that is what we claim the protocol would
477	* support.	430	* support.
478	*/	431	*/
		432	//TODO: taken care of above, should simply abort or make sure the above code is correct
479	if (sl.length () >= MAXSOCKBUF)	433	if (sl.length () > MAXSOCKBUF)
480	{	434	{
481	LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);	435	LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
482	abort ();	436	abort ();
483	}	437	}
484		438

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.15 by root, Sat Dec 16 22:14:42 2006 UTC vs. Revision 1.57 by root, Fri Dec 26 10:44:17 2008 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.15 by root, Sat Dec 16 22:14:42 2006 UTC vs.
Revision 1.57 by root, Fri Dec 26 10:44:17 2008 UTC