ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/image.C
(Generate patch)

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.15 by root, Sat Dec 16 22:14:42 2006 UTC vs.
Revision 1.27 by root, Mon Mar 12 23:45:37 2007 UTC

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

Diff Legend

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