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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.19 by root, Thu Feb 15 18:09:34 2007 UTC vs.
Revision 1.26 by root, Mon Mar 12 23:45:10 2007 UTC

…		…
34	*/	34	*/
35		35
36	#include <global.h>	36	#include <global.h>
37	#include <sproto.h>	37	#include <sproto.h>
38		38
		39	#include "crc.h"
		40
39	#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 /
40		42
41	/** Information about one image */	43	/** Information about one image */
42	typedef struct FaceInfo	44	typedef struct FaceInfo
43	{	45	{
…		…
84		86
85	for (num = 0; num < MAX_FACE_SETS; num++)	87	for (num = 0; num < MAX_FACE_SETS; num++)
86	{	88	{
87	if (facesets[num].prefix)	89	if (facesets[num].prefix)
88	{	90	{
89	for (q = 0; q < nrofpixmaps; q++)	91	for (q = 0; q < faces.size (); q++)
90	if (facesets[num].faces[q].data)	92	if (facesets[num].faces[q].data)
91	free (facesets[num].faces[q].data);	93	free (facesets[num].faces[q].data);
92		94
93	free (facesets[num].prefix);	95	free (facesets[num].prefix);
94	free (facesets[num].fullname);	96	free (facesets[num].fullname);
…		…
170	}	172	}
171		173
172	#define MAX_IMAGE_SIZE 10000	174	#define MAX_IMAGE_SIZE 10000
173		175
174	/**	176	/**
175	* Loads all the image types into memory.
176	*
177	* This way, we can easily send them to the client. We should really do something
178	* better than abort on any errors - on the other hand, these are all fatal
179	* to the server (can't work around them), but the abort just seems a bit
180	* messy (exit would probably be better.)
181	*
182	* Couple of notes: We assume that the faces are in a continous block.
183	* This works fine for now, but this could perhaps change in the future
184	*
185	* Function largely rewritten May 2000 to be more general purpose.
186	* The server itself does not care what the image data is - to the server,
187	* it is just data it needs to allocate. As such, the code is written
188	* to do such.
189	*/
190	void
191	read_client_images (void)
192	{
193	char filename[400];
194	char buf[HUGE_BUF];
195	char cp, cps[7];
196	FILE *infile;
197	int num, len, compressed, fileno, i, badline;
198
199	memset (facesets, 0, sizeof (facesets));
200	sprintf (filename, "%s/image_info", settings.datadir);
201	if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
202	{
203	LOG (llevError, "Unable to open %s\n", filename);
204	abort ();
205	}
206
207	while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
208	{
209	badline = 0;
210
211	if (buf[0] == '#')
212	continue;
213
214	if (!(cps[0] = strtok (buf, ":")))
215	badline = 1;
216
217	for (i = 1; i < 7; i++)
218	if (!(cps[i] = strtok (NULL, ":")))
219	badline = 1;
220
221	if (badline)
222	LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
223	else
224	{
225	len = atoi (cps[0]);
226	if (len >= MAX_FACE_SETS)
227	{
228	LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
229	abort ();
230	}
231	facesets[len].prefix = strdup (cps[1]);
232	facesets[len].fullname = strdup (cps[2]);
233	facesets[len].fallback = atoi (cps[3]);
234	facesets[len].size = strdup (cps[4]);
235	facesets[len].extension = strdup (cps[5]);
236	facesets[len].comment = strdup (cps[6]);
237	}
238	}
239
240	close_and_delete (infile, compressed);
241
242	for (i = 0; i < MAX_FACE_SETS; i++)
243	{
244	if (facesets[i].prefix)
245	check_faceset_fallback (i, MAX_FACE_SETS);
246	}
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
258	facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
259
260	sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
261	LOG (llevDebug, "Loading image file %s\n", filename);
262
263	if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
264	{
265	LOG (llevError, "Unable to open %s\n", filename);
266	abort ();
267	}
268
269	while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
270	{
271	if (strncmp (buf, "IMAGE ", 6) != 0)
272	{
273	LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
274	abort ();
275	}
276
277	num = atoi (buf + 6);
278	if (num < 0 \|\| num >= nrofpixmaps)
279	{
280	LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
281	abort ();
282	}
283
284	/* Skip accross the number data */
285	for (cp = buf + 6; *cp != ' '; cp++);
286	len = atoi (cp);
287	if (len == 0 \|\| len > MAX_IMAGE_SIZE)
288	{
289	LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
290	abort ();
291	}
292
293	/* We don't actualy care about the name of the image that
294	* is embedded in the image file, so just ignore it.
295	*/
296	facesets[fileno].faces[num].datalen = len;
297	facesets[fileno].faces[num].data = (uint8 *) malloc (len);
298	if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
299	{
300	LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
301	abort ();
302	}
303
304	facesets[fileno].faces[num].checksum = 0;
305	for (i = 0; i < len; i++)
306	{
307	rotate_right (facesets[fileno].faces[num].checksum);
308	facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
309	facesets[fileno].faces[num].checksum &= 0xffffffff;
310	}
311	}
312
313	close_and_delete (infile, compressed);
314	} /* For fileno < MAX_FACE_SETS */
315	}
316
317	/**
318	* Client tells us what type of faces it wants. Also sets	177	* Client tells us what type of faces it wants. Also sets
319	* the caching attribute.	178	* the caching attribute.
320	*	179	*
321	*/	180	*/
322	void	181	void
…		…
343	{	202	{
344	uint16 facenum = atoi (buf);	203	uint16 facenum = atoi (buf);
345		204
346	if (facenum != 0)	205	if (facenum != 0)
347	esrv_send_face (ns, facenum, 1);	206	esrv_send_face (ns, facenum, 1);
		207	}
		208
		209	// how lame
		210	static void print_facename (packet &sl, const facedata &d)
		211	{
		212	for (int i = 0; i < CHKSUM_SIZE; ++i)
		213	sl.printf ("%02x", d.chksum [i]);
		214	}
		215
		216	// gcfclient uses the server-provided checksum for comparison,
		217	// but always wrotes a broken checksum to its cache file, so we
		218	// have to provide gcfclient with a useless checksum just to
		219	// have to cache the image despite its bugs.
		220	static uint32 gcfclient_checksum (const facedata *d)
		221	{
		222	uint32 csum = 0;
		223
		224	for (std::string::const_iterator i = d->data.begin ();
		225	i != d->data.end ();
		226	++i)
		227	{
		228	csum = rotate_right (csum);
		229	csum += (uint8 )&*i;
		230	}
		231
		232	return csum;
348	}	233	}
349		234
350	/**	235	/**
351	* Sends a face to a client if they are in pixmap mode	236	* Sends a face to a client if they are in pixmap mode
352	* nothing gets sent in bitmap mode.	237	* nothing gets sent in bitmap mode.
…		…
356	* we look at the facecache, and if set, send the image name.	241	* we look at the facecache, and if set, send the image name.
357	*/	242	*/
358	void	243	void
359	esrv_send_face (client *ns, short face_num, int nocache)	244	esrv_send_face (client *ns, short face_num, int nocache)
360	{	245	{
361	char fallback;
362
363	if (face_num <= 0 \|\| face_num >= nrofpixmaps)	246	if (face_num <= 0 \|\| face_num >= faces.size ())
364	{	247	{
365	LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);	248	LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);
366	return;	249	return;
367	}	250	}
368		251
		252	const facedata *d = face_data (face_num, ns->faceset);
		253
369	packet sl;	254	packet sl;
370	fallback = get_face_fallback (ns->faceset, face_num);
371
372	if (facesets[fallback].faces[face_num].data == NULL)
373	{
374	LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);
375	return;
376	}
377		255
378	if (ns->facecache && !nocache)	256	if (ns->facecache && !nocache)
379	{	257	{
380	sl << (ns->image2 ? "face2 " : "face1 ")	258	if (ns->force_face0)
381	<< uint16 (face_num);	259	sl << "face " << uint16 (face_num);
382
383	if (ns->image2)	260	else if (ns->image2)
384	sl << uint8 (fallback);	261	sl << "face2 " << uint16 (face_num) << uint8 (0) << uint32 (ns->force_bad_checksum ? gcfclient_checksum (d) : 0);
		262	else
		263	sl << "face1 " << uint16 (face_num) << uint32 (ns->force_bad_checksum ? gcfclient_checksum (d) : 0);
385		264
386	sl << uint32 (facesets[fallback].faces[face_num].checksum)	265	// how lame
387	<< new_faces[face_num].name;	266	print_facename (sl, *d);
388		267
389	ns->send_packet (sl);	268	ns->send_packet (sl);
390	}	269	}
391	else	270	else
392	{	271	{
		272	fprintf (stderr, "image %s %d\n", &faces [face_num].name, nocache);//D
393	sl << (ns->image2 ? "image2 " : "image ")	273	sl << (ns->image2 ? "image2 " : "image ")
394	<< uint32 (face_num);	274	<< uint32 (face_num);
395		275
396	if (ns->image2)	276	if (ns->image2)
397	sl << uint8 (fallback);	277	sl << uint8 (0);
398		278
399	sl << uint32 (facesets[fallback].faces[face_num].datalen)	279	sl << uint32 (d->data.size ())
400	<< data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);	280	<< data (d->data.data (), d->data.size ());
401		281
402	ns->send_packet (sl);	282	ns->send_packet (sl);
403	}	283	}
404		284
405	ns->faces_sent[face_num] \|= NS_FACESENT_FACE;	285	ns->faces_sent[face_num] \|= NS_FACESENT_FACE;
…		…
414	void	294	void
415	send_image_info (client ns, char params)	295	send_image_info (client ns, char params)
416	{	296	{
417	packet sl;	297	packet sl;
418		298
419	sl.printf ("replyinfo image_info\n%d\n%u\n", nrofpixmaps - 1, (unsigned int)bmaps_checksum);	299	//TODO: second parameter is a checksum, but it makes no sense in this current framework
		300	sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
420		301
421	for (int i = 0; i < MAX_FACE_SETS; i++)	302	sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
422	if (facesets[i].prefix)
423	sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
424	facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
425	facesets[i].size , facesets[i].extension, facesets[i].comment);
426		303
427	ns->send_packet (sl);	304	ns->send_packet (sl);
428	}	305	}
429		306
430	/**	307	/**
…		…
438	*/	315	*/
439	void	316	void
440	send_image_sums (client ns, char params)	317	send_image_sums (client ns, char params)
441	{	318	{
442	int start, stop;	319	int start, stop;
443	char *cp, buf[MAX_BUF];	320	char *cp;
444		321
445	packet sl;	322	packet sl;
446		323
447	start = atoi (params);	324	start = atoi (params);
448	for (cp = params; *cp != '\0'; cp++)	325	for (cp = params; *cp != '\0'; cp++)
449	if (*cp == ' ')	326	if (*cp == ' ')
450	break;	327	break;
451		328
452	stop = atoi (cp);	329	stop = atoi (cp);
453	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= nrofpixmaps)	330	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= MAX_FACES)
454	{	331	{
455	sl.printf ("replyinfo image_sums %d %d", start, stop);	332	sl.printf ("replyinfo image_sums %d %d", start, stop);
456	ns->send_packet (sl);	333	ns->send_packet (sl);
457	sl.reset ();	334	sl.reset ();
458	return;	335	return;
459	}	336	}
460		337
461	sl.printf ("replyinfo image_sums %d %d ", start, stop);	338	sl.printf ("replyinfo image_sums %d %d ", start, stop);
462		339
463	for (int i = start; i <= stop; i++)	340	for (int i = start; i <= stop && i < faces.size (); i++)
464	{	341	{
465	ns->faces_sent[i] \|= NS_FACESENT_FACE;	342	ns->faces_sent[i] \|= NS_FACESENT_FACE;
466		343
467	int qq = get_face_fallback (ns->faceset, i);	344	const facedata *d = face_data (i, ns->faceset);
		345
		346	if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
		347	break;
468		348
469	sl << uint16 (i)	349	sl << uint16 (i)
470	<< uint32 (facesets[qq].faces[i].checksum)	350	<< uint32 (0) // checksum
471	<< uint8 (qq)	351	<< uint8 (ns->faceset);
472	<< data8 (&new_faces[i].name, new_faces[i].name.length () + 1);	352
		353	print_facename (sl, *d); sl << uint8 (0);
473	}	354	}
474		355
475	/* It would make more sense to catch this pre-emptively in the code above.	356	/* It would make more sense to catch this pre-emptively in the code above.
476	* however, if this really happens, we probably just want to cut down the	357	* however, if this really happens, we probably just want to cut down the
477	* size to less than 1000, since that is what we claim the protocol would	358	* size to less than 1000, since that is what we claim the protocol would
478	* support.	359	* support.
479	*/	360	*/
		361	//TODO: taken care of above, should simply abort or make sure the above code is correct
480	if (sl.length () >= MAXSOCKBUF)	362	if (sl.length () >= MAXSOCKBUF)
481	{	363	{
482	LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);	364	LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
483	abort ();	365	abort ();
484	}	366	}

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.19 by root, Thu Feb 15 18:09:34 2007 UTC vs. Revision 1.26 by root, Mon Mar 12 23:45:10 2007 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.19 by root, Thu Feb 15 18:09:34 2007 UTC vs.
Revision 1.26 by root, Mon Mar 12 23:45:10 2007 UTC