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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.12 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.45 by root, Thu Jul 5 10:34:08 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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	* Crossfire TRT 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 author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors 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	#include <newclient.h>	38	#include "crc.h"
39	#include <newserver.h>
40	#include <loader.h>
41		39
42	#define MAX_FACE_SETS 20 /*< Maximum number of image sets the program will handle /	40	#define MAX_FACE_SETS 20 /*< Maximum number of image sets the program will handle /
43		41
44	/** Information about one image */	42	/** Information about one image */
45	typedef struct FaceInfo	43	typedef struct FaceInfo
46	{	44	{
47
48	uint8 data; /< image data /	45	uint8 data; /< image data /
49
50	uint16 datalen; /*< length of the xpm data /	46	uint16 datalen; /*< length of the xpm data /
51
52	uint32 checksum; /*< Checksum of face data /	47	uint32 checksum; /*< Checksum of face data /
53	} FaceInfo;	48	} FaceInfo;
54		49
55	/** Information about one face set */	50	/** Information about one face set */
56	typedef struct	51	typedef struct
57	{	52	{
58
59	char prefix; /< /	53	char prefix; /< /
60	char *fullname;	54	char *fullname;
61		55
62	uint8 fallback; /*< faceset to use when an image is not found in this faceset /	56	uint8 fallback; /*< faceset to use when an image is not found in this faceset /
63	char *size;	57	char *size;
…		…
91		85
92	for (num = 0; num < MAX_FACE_SETS; num++)	86	for (num = 0; num < MAX_FACE_SETS; num++)
93	{	87	{
94	if (facesets[num].prefix)	88	if (facesets[num].prefix)
95	{	89	{
96	for (q = 0; q < nrofpixmaps; q++)	90	for (q = 0; q < faces.size (); q++)
97	if (facesets[num].faces[q].data)	91	if (facesets[num].faces[q].data)
98	free (facesets[num].faces[q].data);	92	free (facesets[num].faces[q].data);
		93
99	free (facesets[num].prefix);	94	free (facesets[num].prefix);
100	free (facesets[num].fullname);	95	free (facesets[num].fullname);
101	free (facesets[num].size);	96	free (facesets[num].size);
102	free (facesets[num].extension);	97	free (facesets[num].extension);
103	free (facesets[num].comment);	98	free (facesets[num].comment);
…		…
133	if (!facesets[faceset].prefix)	128	if (!facesets[faceset].prefix)
134	{	129	{
135	LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);	130	LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
136	return 0; /* use default set */	131	return 0; /* use default set */
137	}	132	}
		133
138	if (facesets[faceset].faces[imageno].data)	134	if (facesets[faceset].faces[imageno].data)
139	return faceset;	135	return faceset;
		136
140	return get_face_fallback (facesets[faceset].fallback, imageno);	137	return get_face_fallback (facesets[faceset].fallback, imageno);
141	}	138	}
142		139
143	/**	140	/**
144	* Checks fallback are correctly defined.	141	* Checks fallback are correctly defined.
…		…
160	if (!facesets[fallback].prefix)	157	if (!facesets[fallback].prefix)
161	{	158	{
162	LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);	159	LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
163	abort ();	160	abort ();
164	}	161	}
		162
165	togo--;	163	togo--;
166	if (togo == 0)	164	if (togo == 0)
167	{	165	{
168	LOG (llevError, "Infinite loop found in facesets. aborting.\n");	166	LOG (llevError, "Infinite loop found in facesets. aborting.\n");
169	abort ();	167	abort ();
170	}	168	}
		169
171	check_faceset_fallback (fallback, togo);	170	check_faceset_fallback (fallback, togo);
172	}	171	}
173		172
174	#define MAX_IMAGE_SIZE 10000	173	#define MAX_IMAGE_SIZE 10000
175
176	/**
177	* Loads all the image types into memory.
178	*
179	* This way, we can easily send them to the client. We should really do something
180	* better than abort on any errors - on the other hand, these are all fatal
181	* to the server (can't work around them), but the abort just seems a bit
182	* messy (exit would probably be better.)
183	*
184	* Couple of notes: We assume that the faces are in a continous block.
185	* This works fine for now, but this could perhaps change in the future
186	*
187	* Function largely rewritten May 2000 to be more general purpose.
188	* The server itself does not care what the image data is - to the server,
189	* it is just data it needs to allocate. As such, the code is written
190	* to do such.
191	*/
192
193	void
194	read_client_images (void)
195	{
196	char filename[400];
197	char buf[HUGE_BUF];
198	char cp, cps[7];
199	FILE *infile;
200	int num, len, compressed, fileno, i, badline;
201
202	memset (facesets, 0, sizeof (facesets));
203	sprintf (filename, "%s/image_info", settings.datadir);
204	if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
205	{
206	LOG (llevError, "Unable to open %s\n", filename);
207	abort ();
208	}
209	while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
210	{
211	badline = 0;
212
213	if (buf[0] == '#')
214	continue;
215	if (!(cps[0] = strtok (buf, ":")))
216	badline = 1;
217	for (i = 1; i < 7; i++)
218	{
219	if (!(cps[i] = strtok (NULL, ":")))
220	badline = 1;
221	}
222	if (badline)
223	{
224	LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
225	}
226	else
227	{
228	len = atoi (cps[0]);
229	if (len >= MAX_FACE_SETS)
230	{
231	LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
232	abort ();
233	}
234	facesets[len].prefix = strdup (cps[1]);
235	facesets[len].fullname = strdup (cps[2]);
236	facesets[len].fallback = atoi (cps[3]);
237	facesets[len].size = strdup (cps[4]);
238	facesets[len].extension = strdup (cps[5]);
239	facesets[len].comment = strdup (cps[6]);
240	}
241	}
242	close_and_delete (infile, compressed);
243	for (i = 0; i < MAX_FACE_SETS; i++)
244	{
245	if (facesets[i].prefix)
246	check_faceset_fallback (i, MAX_FACE_SETS);
247	}
248	/* Loaded the faceset information - now need to load up the
249	* actual faces.
250	*/
251
252	for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
253	{
254	/* if prefix is not set, this is not used */
255	if (!facesets[fileno].prefix)
256	continue;
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	while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
268	{
269	if (strncmp (buf, "IMAGE ", 6) != 0)
270	{
271	LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
272	abort ();
273	}
274	num = atoi (buf + 6);
275	if (num < 0 \|\| num >= nrofpixmaps)
276	{
277	LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
278	abort ();
279	}
280	/* Skip accross the number data */
281	for (cp = buf + 6; *cp != ' '; cp++);
282	len = atoi (cp);
283	if (len == 0 \|\| len > MAX_IMAGE_SIZE)
284	{
285	LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
286	abort ();
287	}
288	/* We don't actualy care about the name of the image that
289	* is embedded in the image file, so just ignore it.
290	*/
291	facesets[fileno].faces[num].datalen = len;
292	facesets[fileno].faces[num].data = (uint8 *) malloc (len);
293	if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
294	{
295	LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
296	abort ();
297	}
298	facesets[fileno].faces[num].checksum = 0;
299	for (i = 0; i < len; i++)
300	{
301	ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
302	facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
303	facesets[fileno].faces[num].checksum &= 0xffffffff;
304	}
305	}
306	close_and_delete (infile, compressed);
307	} /* For fileno < MAX_FACE_SETS */
308	}
309		174
310	/**	175	/**
311	* Client tells us what type of faces it wants. Also sets	176	* Client tells us what type of faces it wants. Also sets
312	* the caching attribute.	177	* the caching attribute.
313	*	178	*
314	*/	179	*/
315
316	void	180	void
317	SetFaceMode (char buf, int len, client_socket ns)	181	SetFaceMode (char buf, int len, client ns)
318	{	182	{
319	int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);	183	int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
320		184
321	if (mode == CF_FACE_NONE)	185	if (mode == CF_FACE_NONE)
322	ns->facecache = 1;	186	ns->facecache = 1;
323	else if (mode != CF_FACE_PNG)	187	else if (mode != CF_FACE_PNG)
324	{
325	packet sl;
326	sl.printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");	188	ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
327	ns->send_packet (sl);
328	}
329		189
330	if (mask)	190	if (mask)
331	ns->facecache = 1;	191	ns->facecache = 1;
332	}	192	}
333		193
334	/**	194	/**
335	* Client has requested pixmap that it somehow missed getting.	195	* client requested an image. send it rate-limited
336	* This will be called often if the client is	196	* before flushing.
337	* caching images.
338	*/	197	*/
339
340	void	198	void
341	SendFaceCmd (char buff, int len, client_socket ns)	199	AskFaceCmd (char buf, int len, client ns)
342	{	200	{
343	long tmpnum = atoi (buff);	201	int idx = 0, pri = 0;
344	short facenum = tmpnum & 0xffff;
345		202
346	if (facenum != 0)	203	sscanf (buf, "%d %d", &idx, &pri);
347	esrv_send_face (ns, facenum, 1);	204
		205	const facedata *d = face_data (idx, ns->faceset);
		206
		207	if (!d)
		208	return; // doh
		209
		210	client::ixsend ix;
		211
		212	ix.pri = pri;
		213	ix.idx = idx;
		214	ix.ofs = d->data.size ();
		215
		216	// this is (hopefully) a temporary fix around older cfplus versions not
		217	// supporting interleaved transfers
		218	ns->ixface.insert (ns->ixface.begin (), ix);
		219
		220	#if 0
		221	// the by far most common case will be to insert
		222	// right at the end, so no looping.
		223	auto (i, ns->ixface.end ());
		224	for (; i != ns->ixface.begin (); )
		225	if (pri >= (--i)->pri)
		226	break;
		227
		228	ns->ixface.insert (i, ix);
		229	#endif
		230	}
		231
		232	/**
		233	* Tells client the picture it has to use
		234	* to smooth a picture number given as argument.
		235	*/
		236	void
		237	AskSmooth (char buf, int len, client ns)
		238	{
		239	ns->send_face (atoi (buf));
		240	ns->flush_fx ();
		241	}
		242
		243	// how lame
		244	static void print_facename (packet &sl, const facedata &d)
		245	{
		246	for (int i = 0; i < CHKSUM_SIZE; ++i)
		247	sl.printf ("%02x", d.chksum [i]);
		248	}
		249
		250	// gcfclient uses the server-provided checksum for comparison, but always
		251	// writes a broken checksum to its cache file, so we have to provide
		252	// gcfclient with the same broken (and useless) checksum just to have it
		253	// cache the image despite its bugs.
		254	static uint32 gcfclient_checksum (const facedata *d)
		255	{
		256	uint32 csum = 0;
		257
		258	for (std::string::const_iterator i = d->data.begin ();
		259	i != d->data.end ();
		260	++i)
		261	{
		262	csum = rotate_right (csum);
		263	csum += (uint8 )&*i;
		264	}
		265
		266	return csum;
348	}	267	}
349		268
350	/**	269	/**
351	* Sends a face to a client if they are in pixmap mode	270	* Sends a face to a client if they are in pixmap mode
352	* nothing gets sent in bitmap mode.	271	* nothing gets sent in bitmap mode.
353	* If nocache is true (nonzero), ignore the cache setting from the client -	272	* If nocache is true (nonzero), ignore the cache setting from the client -
354	* this is needed for the askface, in which we really do want to send the	273	* this is needed for the askface, in which we really do want to send the
355	* face (and askface is the only place that should be setting it). Otherwise,	274	* face (and askface is the only place that should be setting it). Otherwise,
356	* we look at the facecache, and if set, send the image name.	275	* we look at the facecache, and if set, send the image name.
357	*/	276	*/
358
359	void	277	void
360	esrv_send_face (client_socket *ns, short face_num, int nocache)	278	client::send_face (faceidx facenum)
361	{	279	{
362	char fallback;	280	// never send face 0. ever. it does not exist.
		281	if (!facenum)
		282	return;
363		283
364	if (face_num <= 0 \|\| face_num >= nrofpixmaps)	284	const facedata *d = face_data (facenum, faceset);
		285
		286	if (!d)
365	{	287	{
366	LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);	288	LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
367	return;	289	return;
368	}	290	}
369		291
		292	if (faces_sent[facenum])
		293	return;
		294
		295	faces_sent[facenum] = true;
		296
		297	// if for some reason we let a client without face caching connect,
		298	// we better support that decision here and implement it.
		299	if (!facecache)
		300	return send_image (facenum);
		301
		302	if (fxix)
		303	{
		304	fxface.push_back (facenum);
		305	return;
		306	}
		307
370	packet sl;	308	packet sl;
371	fallback = get_face_fallback (ns->faceset, face_num);
372		309
373	if (facesets[fallback].faces[face_num].data == NULL)	310	if (force_face0)
		311	sl << "face " << uint16 (facenum);
		312	else if (image2)
		313	sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
		314	else
		315	sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
		316
		317	// how lame
		318	print_facename (sl, *d);
		319	send_packet (sl);
		320
		321	if (EMI_smooth)
		322	{
		323	faceinfo *f = face_info (facenum);
		324
		325	if (f->smooth)
		326	{
		327	send_face (f->smooth);
		328
		329	packet sl ("smooth");
		330
		331	sl << uint16 (facenum)
		332	<< uint16 (f->smooth);
		333
		334	send_packet (sl);
		335	}
374	{	336	}
375	LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);	337	}
		338
		339	void client::flush_fx ()
		340	{
		341	while (!fxface.empty ())
		342	{
		343	packet fx ("fx");
		344	packet sx ("sx");
		345
		346	do
		347	{
		348	faceidx facenum = fxface.back (); fxface.pop_back ();
		349
		350	const facedata *d = face_data (facenum, faceset);
		351
		352	if (d)
		353	{
		354	fx << ber32 (facenum)
		355	<< data8 (d->chksum, CHKSUM_SIZE);
		356
		357	if (smoothing)
		358	{
		359	faceinfo *f = face_info (facenum);
		360
		361	if (f->smooth)
		362	{
		363	send_face (f->smooth);
		364	sx << ber32 (facenum)
		365	<< ber32 (f->smooth)
		366	<< ber32 (f->smoothlevel);
		367	}
		368	}
		369	}
		370	}
		371	while (!fxface.empty ()
		372	&& fx.room () > ber32::size + CHKSUM_SIZE + 1
		373	&& sx.room () > ber32::size * 3);
		374
		375	send_packet (fx);
		376	if (sx.length () > 3) send_packet (sx);
		377	}
		378	}
		379
		380	void
		381	client::send_image (faceidx facenum)
		382	{
		383	// never send face 0. ever. it does not exist.
		384	if (!facenum)
		385	return;
		386
		387	const facedata *d = face_data (facenum, faceset);
		388
		389	faces_sent[facenum] = true;
		390
		391	if (!d)
		392	{
		393	LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
376	return;	394	return;
377	}	395	}
		396
		397	//TODO: check type here?
378		398
379	if (ns->facecache && !nocache)	399	if (force_image_newmap)
380	{	400	force_newmap = true;
381	sl << (ns->image2 ? "face2 " : "face1 ")
382	<< uint16 (face_num);
383		401
384	if (ns->image2)	402	packet sl;
385	sl << uint8 (fallback);
386		403
387	sl << uint32 (facesets[fallback].faces[face_num].checksum)
388	<< new_faces[face_num].name;
389
390	ns->send_packet (sl);
391	}
392	else
393	{
394	sl << (ns->image2 ? "image2 " : "image ")	404	sl << (image2 ? "image2 " : "image ")
395	<< uint32 (face_num);	405	<< uint32 (facenum);
396		406
397	if (ns->image2)	407	if (image2)
398	sl << uint8 (fallback);	408	sl << uint8 (0);
399		409
400	sl << uint32 (facesets[fallback].faces[face_num].datalen)	410	sl << uint32 (d->data.size ())
401	<< data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);	411	<< data (d->data.data (), d->data.size ());
402		412
403	ns->send_packet (sl);	413	send_packet (sl);
		414	}
		415
		416	// send all faces of this object to the client
		417	// this uses more bandwidth initially, but makes
		418	// animations look much smoother, and every client
		419	// is supposed to do client-side caching anyways.
		420	void
		421	client::send_faces (object *ob)
		422	{
		423	send_face (ob->face);
		424
		425	if (ob->animation_id)
404	}	426	{
		427	animation &anim = animations [ob->animation_id];
405		428
406	ns->faces_sent[face_num] \|= NS_FACESENT_FACE;	429	for (int i = 0; i < anim.num_animations; i++)
		430	send_face (anim.faces [i]);
		431	}
		432	}
		433
		434	/**
		435	* Need to send an animation sequence to the client.
		436	* We will send appropriate face commands to the client if we haven't
		437	* sent them the face yet (this can become quite costly in terms of
		438	* how much we are sending - on the other hand, this should only happen
		439	* when the player logs in and picks stuff up.
		440	*/
		441	void
		442	client::send_animation (short anim_num)
		443	{
		444	/* Do some checking on the anim_num we got. Note that the animations
		445	* are added in contigous order, so if the number is in the valid
		446	* range, it must be a valid animation.
		447	*/
		448	if (anim_num < 0 \|\| anim_num >= animations.size ())
		449	{
		450	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
		451	return;
		452	}
		453
		454	packet sl ("anim");
		455
		456	sl << uint16 (anim_num)
		457	<< uint16 (0); /* flags - not used right now */
		458
		459	/* Build up the list of faces. Also, send any information (ie, the
		460	* the face itself) down to the client.
		461	*/
		462	for (int i = 0; i < animations[anim_num].num_animations; i++)
		463	{
		464	send_face (animations[anim_num].faces[i]);
		465	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
		466	}
		467
		468	send_packet (sl);
		469
		470	anims_sent[anim_num] = 1;
407	}	471	}
408		472
409	/**	473	/**
410	* Sends the number of images, checksum of the face file,	474	* Sends the number of images, checksum of the face file,
411	* and the image_info file information. See the doc/Developers/protocol	475	* and the image_info file information. See the doc/Developers/protocol
412	* if you want further detail.	476	* if you want further detail.
413	*/	477	*/
414
415	void	478	void
416	send_image_info (client_socket * ns, char *params)	479	send_image_info (client ns, char params)
417	{	480	{
418	packet sl;	481	packet sl;
419		482
420	sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum);	483	//TODO: second parameter is a checksum, but it makes no sense in this current framework
		484	sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
421		485
422	for (int i = 0; i < MAX_FACE_SETS; i++)	486	sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
423	if (facesets[i].prefix)
424	sl.printf ("%d:%s:%s:%d:%s:%s:%s",
425	i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
426	facesets[i].size, facesets[i].extension, facesets[i].comment);
427		487
428	ns->send_packet (sl);	488	ns->send_packet (sl);
429	}	489	}
430		490
431	/**	491	/**
…		…
436	* For each image in [start..stop] sends	496	* For each image in [start..stop] sends
437	* - checksum	497	* - checksum
438	* - name	498	* - name
439	*/	499	*/
440	void	500	void
441	send_image_sums (client_socket * ns, char *params)	501	send_image_sums (client ns, char params)
442	{	502	{
443	int start, stop;	503	int start, stop;
444	char *cp, buf[MAX_BUF];	504	char *cp;
445		505
446	packet sl;	506	packet sl;
447		507
448	start = atoi (params);	508	start = atoi (params);
449	for (cp = params; *cp != '\0'; cp++)	509	for (cp = params; *cp != '\0'; cp++)
450	if (*cp == ' ')	510	if (*cp == ' ')
451	break;	511	break;
452		512
453	stop = atoi (cp);	513	stop = atoi (cp);
454	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= nrofpixmaps)	514	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= MAX_FACES)
455	{	515	{
456	sl.printf ("replyinfo image_sums %d %d", start, stop);	516	sl.printf ("replyinfo image_sums %d %d", start, stop);
457	ns->send_packet (sl);	517	ns->send_packet (sl);
458	sl.reset ();	518	sl.reset ();
459	return;	519	return;
460	}	520	}
461		521
462	sl.printf ("replyinfo image_sums %d %d ", start, stop);	522	sl.printf ("replyinfo image_sums %d %d ", start, stop);
463		523
464	for (int i = start; i <= stop; i++)	524	for (int i = start; i <= stop && i < faces.size (); i++)
465	{	525	{
466	ns->faces_sent[i] \|= NS_FACESENT_FACE;	526	ns->faces_sent[i] = true;
467		527
468	int qq = get_face_fallback (ns->faceset, i);	528	const facedata *d = face_data (i, ns->faceset);
		529
		530	if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
		531	break;
469		532
470	sl << uint16 (i)	533	sl << uint16 (i)
471	<< uint32 (facesets[qq].faces[i].checksum)	534	<< uint32 (0) // checksum
472	<< uint8 (qq)	535	<< uint8 (ns->faceset);
473	<< data8 (&new_faces[i].name, new_faces[i].name.length () + 1);	536
		537	print_facename (sl, *d); sl << uint8 (0);
474	}	538	}
475		539
476	/* It would make more sense to catch this pre-emptively in the code above.	540	/* It would make more sense to catch this pre-emptively in the code above.
477	* however, if this really happens, we probably just want to cut down the	541	* however, if this really happens, we probably just want to cut down the
478	* size to less than 1000, since that is what we claim the protocol would	542	* size to less than 1000, since that is what we claim the protocol would
479	* support.	543	* support.
480	*/	544	*/
		545	//TODO: taken care of above, should simply abort or make sure the above code is correct
481	if (sl.length () >= MAXSOCKBUF)	546	if (sl.length () >= MAXSOCKBUF)
482	{	547	{
483	LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);	548	LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
484	abort ();	549	abort ();
485	}	550	}

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.12 by root, Thu Dec 14 22:45:41 2006 UTC vs. Revision 1.45 by root, Thu Jul 5 10:34:08 2007 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.12 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.45 by root, Thu Jul 5 10:34:08 2007 UTC