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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.5 by root, Sun Oct 8 16:51:51 2006 UTC vs.
Revision 1.44 by root, Sun Jul 1 05:00:20 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_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		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, NewSocket ns)	181	SetFaceMode (char buf, int len, client ns)
318	{	182	{
319	char tmp[256];
320
321	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);
322		184
323	if (mode == CF_FACE_NONE)	185	if (mode == CF_FACE_NONE)
324	{
325	ns->facecache = 1;	186	ns->facecache = 1;
326	}
327	else if (mode != CF_FACE_PNG)	187	else if (mode != CF_FACE_PNG)
328	{
329	sprintf (tmp, "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");
330	Write_String_To_Socket (ns, tmp, strlen (tmp));	189
331	#ifdef ESRV_DEBUG
332	LOG (llevDebug, "SetFaceMode: Invalid mode from client: %d\n", mode);
333	#endif
334	}
335	if (mask)	190	if (mask)
336	{
337	ns->facecache = 1;	191	ns->facecache = 1;
		192	}
		193
		194	/**
		195	* client requested an image. send it rate-limited
		196	* before flushing.
		197	*/
		198	void
		199	AskFaceCmd (char buf, int len, client ns)
		200	{
		201	int idx = 0, pri = 0;
		202
		203	sscanf (buf, "%d %d", &idx, &pri);
		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	// the by far most common case will be to insert
		217	// right at the end, so no looping.
		218	auto (i, ns->ixface.end ());
		219	for (; i != ns->ixface.begin (); )
		220	if (pri >= (--i)->pri)
		221	break;
		222
		223	ns->ixface.insert (i, ix);
		224	}
		225
		226	/**
		227	* Tells client the picture it has to use
		228	* to smooth a picture number given as argument.
		229	*/
		230	void
		231	AskSmooth (char buf, int len, client ns)
		232	{
		233	ns->send_face (atoi (buf));
		234	ns->flush_fx ();
		235	}
		236
		237	// how lame
		238	static void print_facename (packet &sl, const facedata &d)
		239	{
		240	for (int i = 0; i < CHKSUM_SIZE; ++i)
		241	sl.printf ("%02x", d.chksum [i]);
		242	}
		243
		244	// gcfclient uses the server-provided checksum for comparison, but always
		245	// writes a broken checksum to its cache file, so we have to provide
		246	// gcfclient with the same broken (and useless) checksum just to have it
		247	// cache the image despite its bugs.
		248	static uint32 gcfclient_checksum (const facedata *d)
		249	{
		250	uint32 csum = 0;
		251
		252	for (std::string::const_iterator i = d->data.begin ();
		253	i != d->data.end ();
		254	++i)
338	}	255	{
339	}	256	csum = rotate_right (csum);
		257	csum += (uint8 )&*i;
		258	}
340		259
341	/**	260	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	}	261	}
356		262
357	/**	263	/**
358	* Sends a face to a client if they are in pixmap mode	264	* Sends a face to a client if they are in pixmap mode
359	* nothing gets sent in bitmap mode.	265	* nothing gets sent in bitmap mode.
360	* If nocache is true (nonzero), ignore the cache setting from the client -	266	* 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	267	* 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,	268	* 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.	269	* we look at the facecache, and if set, send the image name.
364	*/	270	*/
365
366	void	271	void
367	esrv_send_face (NewSocket * ns, short face_num, int nocache)	272	client::send_face (faceidx facenum)
368	{	273	{
369	SockList sl;	274	// never send face 0. ever. it does not exist.
370	char fallback;	275	if (!facenum)
		276	return;
371		277
372	if (face_num <= 0 \|\| face_num >= nrofpixmaps)	278	const facedata *d = face_data (facenum, faceset);
		279
		280	if (!d)
373	{	281	{
374	LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);	282	LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
375	return;	283	return;
376	}	284	}
377		285
378	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	286	if (faces_sent[facenum])
379	fallback = get_face_fallback (ns->faceset, face_num);	287	return;
380		288
381	if (facesets[fallback].faces[face_num].data == NULL)	289	faces_sent[facenum] = true;
		290
		291	// if for some reason we let a client without face caching connect,
		292	// we better support that decision here and implement it.
		293	if (!facecache)
		294	return send_image (facenum);
		295
		296	if (fxix)
382	{	297	{
383	LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);	298	fxface.push_back (facenum);
384	return;	299	return;
385	}	300	}
386		301
387	if (ns->facecache && !nocache)	302	packet sl;
388	{
389	if (ns->image2)
390	strcpy ((char *) sl.buf, "face2 ");
391	else if (ns->sc_version >= 1026)
392	strcpy ((char *) sl.buf, "face1 ");
393	else
394	strcpy ((char *) sl.buf, "face ");
395		303
396	sl.len = strlen ((const char *) sl.buf);	304	if (force_face0)
397	SockList_AddShort (&sl, face_num);	305	sl << "face " << uint16 (facenum);
398	if (ns->image2)	306	else if (image2)
399	SockList_AddChar (&sl, fallback);	307	sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
400	if (ns->sc_version >= 1026)
401	SockList_AddInt (&sl, facesets[fallback].faces[face_num].checksum);
402	strcpy ((char *) sl.buf + sl.len, new_faces[face_num].name);
403	sl.len += strlen (new_faces[face_num].name);
404	Send_With_Handling (ns, &sl);
405	}
406	else	308	else
407	{	309	sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
408	if (ns->image2)	310
409	strcpy ((char *) sl.buf, "image2 ");	311	// how lame
410	else	312	print_facename (sl, *d);
411	strcpy ((char *) sl.buf, "image ");	313	send_packet (sl);
412	sl.len = strlen ((char *) sl.buf);	314
413	SockList_AddInt (&sl, face_num);	315	if (EMI_smooth)
414	if (ns->image2)
415	SockList_AddChar (&sl, fallback);
416	SockList_AddInt (&sl, facesets[fallback].faces[face_num].datalen);
417	memcpy (sl.buf + sl.len, facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
418	sl.len += facesets[fallback].faces[face_num].datalen;
419	Send_With_Handling (ns, &sl);
420	}	316	{
421	ns->faces_sent[face_num] \|= NS_FACESENT_FACE;	317	faceinfo *f = face_info (facenum);
422	free (sl.buf);	318
		319	if (f->smooth)
		320	{
		321	send_face (f->smooth);
		322
		323	packet sl ("smooth");
		324
		325	sl << uint16 (facenum)
		326	<< uint16 (f->smooth);
		327
		328	send_packet (sl);
		329	}
		330	}
		331	}
		332
		333	void client::flush_fx ()
		334	{
		335	while (!fxface.empty ())
		336	{
		337	packet fx ("fx");
		338	packet sx ("sx");
		339
		340	do
		341	{
		342	faceidx facenum = fxface.back (); fxface.pop_back ();
		343
		344	const facedata *d = face_data (facenum, faceset);
		345
		346	if (d)
		347	{
		348	fx << ber32 (facenum)
		349	<< data8 (d->chksum, CHKSUM_SIZE);
		350
		351	if (smoothing)
		352	{
		353	faceinfo *f = face_info (facenum);
		354
		355	if (f->smooth)
		356	{
		357	send_face (f->smooth);
		358	sx << ber32 (facenum)
		359	<< ber32 (f->smooth)
		360	<< ber32 (f->smoothlevel);
		361	}
		362	}
		363	}
		364	}
		365	while (!fxface.empty ()
		366	&& fx.room () > ber32::size + CHKSUM_SIZE + 1
		367	&& sx.room () > ber32::size * 3);
		368
		369	send_packet (fx);
		370	if (sx.length () > 3) send_packet (sx);
		371	}
		372	}
		373
		374	void
		375	client::send_image (faceidx facenum)
		376	{
		377	// never send face 0. ever. it does not exist.
		378	if (!facenum)
		379	return;
		380
		381	const facedata *d = face_data (facenum, faceset);
		382
		383	faces_sent[facenum] = true;
		384
		385	if (!d)
		386	{
		387	LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
		388	return;
		389	}
		390
		391	//TODO: check type here?
		392
		393	if (force_image_newmap)
		394	force_newmap = true;
		395
		396	packet sl;
		397
		398	sl << (image2 ? "image2 " : "image ")
		399	<< uint32 (facenum);
		400
		401	if (image2)
		402	sl << uint8 (0);
		403
		404	sl << uint32 (d->data.size ())
		405	<< data (d->data.data (), d->data.size ());
		406
		407	send_packet (sl);
		408	}
		409
		410	// send all faces of this object to the client
		411	// this uses more bandwidth initially, but makes
		412	// animations look much smoother, and every client
		413	// is supposed to do client-side caching anyways.
		414	void
		415	client::send_faces (object *ob)
		416	{
		417	send_face (ob->face);
		418
		419	if (ob->animation_id)
		420	{
		421	animation &anim = animations [ob->animation_id];
		422
		423	for (int i = 0; i < anim.num_animations; i++)
		424	send_face (anim.faces [i]);
		425	}
		426	}
		427
		428	/**
		429	* Need to send an animation sequence to the client.
		430	* We will send appropriate face commands to the client if we haven't
		431	* sent them the face yet (this can become quite costly in terms of
		432	* how much we are sending - on the other hand, this should only happen
		433	* when the player logs in and picks stuff up.
		434	*/
		435	void
		436	client::send_animation (short anim_num)
		437	{
		438	/* Do some checking on the anim_num we got. Note that the animations
		439	* are added in contigous order, so if the number is in the valid
		440	* range, it must be a valid animation.
		441	*/
		442	if (anim_num < 0 \|\| anim_num >= animations.size ())
		443	{
		444	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
		445	return;
		446	}
		447
		448	packet sl ("anim");
		449
		450	sl << uint16 (anim_num)
		451	<< uint16 (0); /* flags - not used right now */
		452
		453	/* Build up the list of faces. Also, send any information (ie, the
		454	* the face itself) down to the client.
		455	*/
		456	for (int i = 0; i < animations[anim_num].num_animations; i++)
		457	{
		458	send_face (animations[anim_num].faces[i]);
		459	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
		460	}
		461
		462	send_packet (sl);
		463
		464	anims_sent[anim_num] = 1;
423	}	465	}
424		466
425	/**	467	/**
426	* Sends the number of images, checksum of the face file,	468	* Sends the number of images, checksum of the face file,
427	* and the image_info file information. See the doc/Developers/protocol	469	* and the image_info file information. See the doc/Developers/protocol
428	* if you want further detail.	470	* if you want further detail.
429	*/	471	*/
430
431	void	472	void
432	send_image_info (NewSocket * ns, char *params)	473	send_image_info (client ns, char params)
433	{	474	{
434	SockList sl;	475	packet sl;
435	int i;
436		476
437	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	477	//TODO: second parameter is a checksum, but it makes no sense in this current framework
		478	sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
438		479
439	sprintf ((char *) sl.buf, "replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum);	480	sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
440	for (i = 0; i < MAX_FACE_SETS; i++)	481
441	{	482	ns->send_packet (sl);
442	if (facesets[i].prefix)
443	{
444	sprintf ((char ) sl.buf + strlen ((const char ) sl.buf), "%d:%s:%s:%d:%s:%s:%s",
445	i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
446	facesets[i].size, facesets[i].extension, facesets[i].comment);
447	}
448	}
449	sl.len = strlen ((const char *) sl.buf);
450	Send_With_Handling (ns, &sl);
451	free (sl.buf);
452	}	483	}
453		484
454	/**	485	/**
455	* Sends requested face information.	486	* Sends requested face information.
456	* \param ns socket to send to	487	* \param ns socket to send to
…		…
459	* For each image in [start..stop] sends	490	* For each image in [start..stop] sends
460	* - checksum	491	* - checksum
461	* - name	492	* - name
462	*/	493	*/
463	void	494	void
464	send_image_sums (NewSocket * ns, char *params)	495	send_image_sums (client ns, char params)
465	{	496	{
466	int start, stop;	497	int start, stop;
467	short i;
468	char qq;	498	char *cp;
469	char *cp, buf[MAX_BUF];
470	SockList sl;
471		499
472	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	500	packet sl;
473		501
474	start = atoi (params);	502	start = atoi (params);
475	for (cp = params; *cp != '\0'; cp++)	503	for (cp = params; *cp != '\0'; cp++)
476	if (*cp == ' ')	504	if (*cp == ' ')
477	break;	505	break;
478		506
479	stop = atoi (cp);	507	stop = atoi (cp);
480	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= nrofpixmaps)	508	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= MAX_FACES)
481	{	509	{
482	sprintf (buf, "replyinfo image_sums %d %d", start, stop);	510	sl.printf ("replyinfo image_sums %d %d", start, stop);
483	cs_write_string (ns, buf, strlen (buf));	511	ns->send_packet (sl);
		512	sl.reset ();
484	return;	513	return;
485	}	514	}
		515
486	sprintf ((char *) sl.buf, "replyinfo image_sums %d %d ", start, stop);	516	sl.printf ("replyinfo image_sums %d %d ", start, stop);
487		517
488	sl.len = strlen ((const char *) sl.buf);	518	for (int i = start; i <= stop && i < faces.size (); i++)
489
490	for (i = start; i <= stop; i++)
491	{
492	SockList_AddShort (&sl, i);
493	ns->faces_sent[i] \|= NS_FACESENT_FACE;
494
495	qq = get_face_fallback (ns->faceset, i);
496	SockList_AddInt (&sl, facesets[qq].faces[i].checksum);
497	SockList_AddChar (&sl, qq);
498
499	qq = strlen (new_faces[i].name);
500	SockList_AddChar (&sl, (char) (qq + 1));
501	strcpy ((char *) sl.buf + sl.len, new_faces[i].name);
502	sl.len += qq;
503	SockList_AddChar (&sl, 0);
504	}	519	{
		520	ns->faces_sent[i] = true;
		521
		522	const facedata *d = face_data (i, ns->faceset);
		523
		524	if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
		525	break;
		526
		527	sl << uint16 (i)
		528	<< uint32 (0) // checksum
		529	<< uint8 (ns->faceset);
		530
		531	print_facename (sl, *d); sl << uint8 (0);
		532	}
		533
505	/* It would make more sense to catch this pre-emptively in the code above.	534	/* It would make more sense to catch this pre-emptively in the code above.
506	* however, if this really happens, we probably just want to cut down the	535	* however, if this really happens, we probably just want to cut down the
507	* size to less than 1000, since that is what we claim the protocol would	536	* size to less than 1000, since that is what we claim the protocol would
508	* support.	537	* support.
509	*/	538	*/
		539	//TODO: taken care of above, should simply abort or make sure the above code is correct
510	if (sl.len >= MAXSOCKBUF)	540	if (sl.length () >= MAXSOCKBUF)
511	{	541	{
512	LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF);	542	LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
513	abort ();	543	abort ();
514	}	544	}
515	Send_With_Handling (ns, &sl);	545
516	free (sl.buf);	546	ns->send_packet (sl);
517	}	547	}
		548

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.5 by root, Sun Oct 8 16:51:51 2006 UTC vs. Revision 1.44 by root, Sun Jul 1 05:00:20 2007 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.5 by root, Sun Oct 8 16:51:51 2006 UTC vs.
Revision 1.44 by root, Sun Jul 1 05:00:20 2007 UTC