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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.6 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.43 by root, Sun Jul 1 04:08:14 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.6 by root, Wed Dec 13 21:27:09 2006 UTC vs. Revision 1.43 by root, Sun Jul 1 04:08:14 2007 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.6 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.43 by root, Sun Jul 1 04:08:14 2007 UTC