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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.23 by root, Sat Mar 10 19:48:17 2007 UTC vs.
Revision 1.24 by root, Sun Mar 11 02:12:45 2007 UTC

…		…
86		86
87	for (num = 0; num < MAX_FACE_SETS; num++)	87	for (num = 0; num < MAX_FACE_SETS; num++)
88	{	88	{
89	if (facesets[num].prefix)	89	if (facesets[num].prefix)
90	{	90	{
91	for (q = 0; q < nrofpixmaps; q++)	91	for (q = 0; q < faces.size (); q++)
92	if (facesets[num].faces[q].data)	92	if (facesets[num].faces[q].data)
93	free (facesets[num].faces[q].data);	93	free (facesets[num].faces[q].data);
94		94
95	free (facesets[num].prefix);	95	free (facesets[num].prefix);
96	free (facesets[num].fullname);	96	free (facesets[num].fullname);
…		…
172	}	172	}
173		173
174	#define MAX_IMAGE_SIZE 10000	174	#define MAX_IMAGE_SIZE 10000
175		175
176	/**	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	void
193	read_client_images (void)
194	{
195	char filename[400];
196	char buf[HUGE_BUF];
197	char cp, cps[7];
198	FILE *infile;
199	int num, len, compressed, fileno, i, badline;
200
201	memset (facesets, 0, sizeof (facesets));
202	sprintf (filename, "%s/image_info", settings.datadir);
203	if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
204	{
205	LOG (llevError, "Unable to open %s\n", filename);
206	abort ();
207	}
208
209	while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
210	{
211	badline = 0;
212
213	if (buf[0] == '#')
214	continue;
215
216	if (!(cps[0] = strtok (buf, ":")))
217	badline = 1;
218
219	for (i = 1; i < 7; i++)
220	if (!(cps[i] = strtok (NULL, ":")))
221	badline = 1;
222
223	if (badline)
224	LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
225	else
226	{
227	len = atoi (cps[0]);
228	if (len >= MAX_FACE_SETS)
229	{
230	LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
231	abort ();
232	}
233	facesets[len].prefix = strdup (cps[1]);
234	facesets[len].fullname = strdup (cps[2]);
235	facesets[len].fallback = atoi (cps[3]);
236	facesets[len].size = strdup (cps[4]);
237	facesets[len].extension = strdup (cps[5]);
238	facesets[len].comment = strdup (cps[6]);
239	}
240	}
241
242	close_and_delete (infile, compressed);
243
244	for (i = 0; i < MAX_FACE_SETS; i++)
245	{
246	if (facesets[i].prefix)
247	check_faceset_fallback (i, MAX_FACE_SETS);
248	}
249
250	/* Loaded the faceset information - now need to load up the
251	* actual faces.
252	*/
253
254	for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
255	{
256	/* if prefix is not set, this is not used */
257	if (!facesets[fileno].prefix)
258	continue;
259
260	facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
261
262	sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
263	LOG (llevDebug, "Loading image file %s\n", filename);
264
265	if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
266	{
267	LOG (llevError, "Unable to open %s\n", filename);
268	abort ();
269	}
270
271	while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
272	{
273	if (strncmp (buf, "IMAGE ", 6) != 0)
274	{
275	LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
276	abort ();
277	}
278
279	num = atoi (buf + 6);
280	if (num < 0 \|\| num >= nrofpixmaps)
281	{
282	LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
283	abort ();
284	}
285
286	/* Skip accross the number data */
287	for (cp = buf + 6; *cp != ' '; cp++)
288	;
289
290	len = atoi (cp);
291	if (len == 0 \|\| len > MAX_IMAGE_SIZE)
292	{
293	LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
294	abort ();
295	}
296
297	/* We don't actualy care about the name of the image that
298	* is embedded in the image file, so just ignore it.
299	*/
300	facesets[fileno].faces[num].datalen = len;
301	facesets[fileno].faces[num].data = (uint8 *) malloc (len);
302	if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
303	{
304	LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
305	abort ();
306	}
307
308	crc32 chksum;
309
310	for (i = 0; i < len; i++)
311	chksum (facesets[fileno].faces[num].data[i]);
312
313	facesets[fileno].faces[num].checksum = chksum;
314	}
315
316	close_and_delete (infile, compressed);
317	} /* For fileno < MAX_FACE_SETS */
318	}
319
320	/**
321	* Client tells us what type of faces it wants. Also sets	177	* Client tells us what type of faces it wants. Also sets
322	* the caching attribute.	178	* the caching attribute.
323	*	179	*
324	*/	180	*/
325	void	181	void
…		…
346	{	202	{
347	uint16 facenum = atoi (buf);	203	uint16 facenum = atoi (buf);
348		204
349	if (facenum != 0)	205	if (facenum != 0)
350	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	sl.printf ("%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
		213	"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
		214	d.chksum [ 0], d.chksum [ 1], d.chksum [ 2], d.chksum [ 3],
		215	d.chksum [ 4], d.chksum [ 5], d.chksum [ 6], d.chksum [ 7],
		216	d.chksum [ 8], d.chksum [ 9], d.chksum [10], d.chksum [11],
		217	d.chksum [12], d.chksum [13], d.chksum [14], d.chksum [15]);
351	}	218	}
352		219
353	/**	220	/**
354	* Sends a face to a client if they are in pixmap mode	221	* Sends a face to a client if they are in pixmap mode
355	* nothing gets sent in bitmap mode.	222	* nothing gets sent in bitmap mode.
…		…
359	* we look at the facecache, and if set, send the image name.	226	* we look at the facecache, and if set, send the image name.
360	*/	227	*/
361	void	228	void
362	esrv_send_face (client *ns, short face_num, int nocache)	229	esrv_send_face (client *ns, short face_num, int nocache)
363	{	230	{
364	char fallback;
365
366	if (face_num <= 0 \|\| face_num >= nrofpixmaps)	231	if (face_num <= 0 \|\| face_num >= faces.size ())
367	{	232	{
368	LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);	233	LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);
369	return;	234	return;
370	}	235	}
371		236
		237	const facedata *d = face_data (face_num, ns->faceset);
		238
372	packet sl;	239	packet sl;
373	fallback = get_face_fallback (ns->faceset, face_num);
374
375	if (facesets[fallback].faces[face_num].data == NULL)
376	{
377	LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);
378	return;
379	}
380		240
381	if (ns->facecache && !nocache)	241	if (ns->facecache && !nocache)
382	{	242	{
383	sl << (ns->image2 ? "face2 " : "face1 ")	243	sl << (ns->image2 ? "face2 " : "face1 ")
384	<< uint16 (face_num);	244	<< uint16 (face_num);
385		245
386	if (ns->image2)	246	if (ns->image2)
387	sl << uint8 (fallback);	247	sl << uint8 (0);
388		248
389	sl << uint32 (facesets[fallback].faces[face_num].checksum)	249	sl << uint32 (0);
390	<< new_faces[face_num].name;	250
		251	// how lame
		252	print_facename (sl, *d);
391		253
392	ns->send_packet (sl);	254	ns->send_packet (sl);
393	}	255	}
394	else	256	else
395	{	257	{
396	sl << (ns->image2 ? "image2 " : "image ")	258	sl << (ns->image2 ? "image2 " : "image ")
397	<< uint32 (face_num);	259	<< uint32 (face_num);
398		260
399	if (ns->image2)	261	if (ns->image2)
400	sl << uint8 (fallback);	262	sl << uint8 (0);
401		263
402	sl << uint32 (facesets[fallback].faces[face_num].datalen)	264	sl << uint32 (d->data.size ())
403	<< data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);	265	<< data (d->data.data (), d->data.size ());
404		266
405	ns->send_packet (sl);	267	ns->send_packet (sl);
406	}	268	}
407		269
408	ns->faces_sent[face_num] \|= NS_FACESENT_FACE;	270	ns->faces_sent[face_num] \|= NS_FACESENT_FACE;
…		…
417	void	279	void
418	send_image_info (client ns, char params)	280	send_image_info (client ns, char params)
419	{	281	{
420	packet sl;	282	packet sl;
421		283
422	sl.printf ("replyinfo image_info\n%d\n%u\n", nrofpixmaps - 1, (unsigned int)bmaps_checksum);	284	//TODO: second parameter is a checksum, but it makes no sense in this current framework
		285	sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
423		286
424	for (int i = 0; i < MAX_FACE_SETS; i++)	287	sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
425	if (facesets[i].prefix)
426	sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
427	facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
428	facesets[i].size , facesets[i].extension, facesets[i].comment);
429		288
430	ns->send_packet (sl);	289	ns->send_packet (sl);
431	}	290	}
432		291
433	/**	292	/**
…		…
451	for (cp = params; *cp != '\0'; cp++)	310	for (cp = params; *cp != '\0'; cp++)
452	if (*cp == ' ')	311	if (*cp == ' ')
453	break;	312	break;
454		313
455	stop = atoi (cp);	314	stop = atoi (cp);
456	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= nrofpixmaps)	315	if (stop < start \|\| *cp == '\0' \|\| (stop - start) > 1000 \|\| stop >= MAX_FACES)
457	{	316	{
458	sl.printf ("replyinfo image_sums %d %d", start, stop);	317	sl.printf ("replyinfo image_sums %d %d", start, stop);
459	ns->send_packet (sl);	318	ns->send_packet (sl);
460	sl.reset ();	319	sl.reset ();
461	return;	320	return;
462	}	321	}
463		322
464	sl.printf ("replyinfo image_sums %d %d ", start, stop);	323	sl.printf ("replyinfo image_sums %d %d ", start, stop);
465		324
466	for (int i = start; i <= stop; i++)	325	for (int i = start; i <= stop && i < faces.size (); i++)
467	{	326	{
468	ns->faces_sent[i] \|= NS_FACESENT_FACE;	327	ns->faces_sent[i] \|= NS_FACESENT_FACE;
469		328
470	int qq = get_face_fallback (ns->faceset, i);	329	const facedata *d = face_data (i, ns->faceset);
471		330
472	if (sl.room () < 2 + 4 + 1 + new_faces[i].name.length () + 1)	331	if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
473	break;	332	break;
474		333
475	sl << uint16 (i)	334	sl << uint16 (i)
476	<< uint32 (facesets[qq].faces[i].checksum)	335	<< uint32 (0) // checksum
477	<< uint8 (qq)	336	<< uint8 (ns->faceset);
478	<< data8 (&new_faces[i].name, new_faces[i].name.length () + 1);	337
		338	print_facename (sl, *d); sl << uint8 (0);
479	}	339	}
480		340
481	/* It would make more sense to catch this pre-emptively in the code above.	341	/* It would make more sense to catch this pre-emptively in the code above.
482	* however, if this really happens, we probably just want to cut down the	342	* however, if this really happens, we probably just want to cut down the
483	* size to less than 1000, since that is what we claim the protocol would	343	* size to less than 1000, since that is what we claim the protocol would

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.23 by root, Sat Mar 10 19:48:17 2007 UTC vs. Revision 1.24 by root, Sun Mar 11 02:12:45 2007 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.23 by root, Sat Mar 10 19:48:17 2007 UTC vs.
Revision 1.24 by root, Sun Mar 11 02:12:45 2007 UTC