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.12 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.23 by root, Sat Mar 10 19:48:17 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
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 */
45typedef struct FaceInfo 44typedef 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 */
56typedef struct 52typedef 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;
… …
94 if (facesets[num].prefix) 89 if (facesets[num].prefix)
95 { 90 {
96 for (q = 0; q < nrofpixmaps; q++) 91 for (q = 0; q < nrofpixmaps; 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 175
… …
187 * Function largely rewritten May 2000 to be more general purpose. 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, 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 189 * it is just data it needs to allocate. As such, the code is written
190 * to do such. 190 * to do such.
191 */ 191 */
192
193void 192void
194read_client_images (void) 193read_client_images (void)
195{ 194{
196 char filename[400]; 195 char filename[400];
197 char buf[HUGE_BUF]; 196 char buf[HUGE_BUF];
… …
204 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL) 203 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
205 { 204 {
206 LOG (llevError, "Unable to open %s\n", filename); 205 LOG (llevError, "Unable to open %s\n", filename);
207 abort (); 206 abort ();
208 } 207 }
208
209 while (fgets (buf, HUGE_BUF - 1, infile) != NULL) 209 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
210 { 210 {
211 badline = 0; 211 badline = 0;
212 212
213 if (buf[0] == '#') 213 if (buf[0] == '#')
214 continue; 214 continue;
215
215 if (!(cps[0] = strtok (buf, ":"))) 216 if (!(cps[0] = strtok (buf, ":")))
216 badline = 1; 217 badline = 1;
218
217 for (i = 1; i < 7; i++) 219 for (i = 1; i < 7; i++)
218 {
219 if (!(cps[i] = strtok (NULL, ":"))) 220 if (!(cps[i] = strtok (NULL, ":")))
220 badline = 1; 221 badline = 1;
221 } 222
222 if (badline) 223 if (badline)
223 {
224 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf); 224 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
225 }
226 else 225 else
227 { 226 {
228 len = atoi (cps[0]); 227 len = atoi (cps[0]);
229 if (len >= MAX_FACE_SETS) 228 if (len >= MAX_FACE_SETS)
230 { 229 {
… …
237 facesets[len].size = strdup (cps[4]); 236 facesets[len].size = strdup (cps[4]);
238 facesets[len].extension = strdup (cps[5]); 237 facesets[len].extension = strdup (cps[5]);
239 facesets[len].comment = strdup (cps[6]); 238 facesets[len].comment = strdup (cps[6]);
240 } 239 }
241 } 240 }
241
242 close_and_delete (infile, compressed); 242 close_and_delete (infile, compressed);
243
243 for (i = 0; i < MAX_FACE_SETS; i++) 244 for (i = 0; i < MAX_FACE_SETS; i++)
244 { 245 {
245 if (facesets[i].prefix) 246 if (facesets[i].prefix)
246 check_faceset_fallback (i, MAX_FACE_SETS); 247 check_faceset_fallback (i, MAX_FACE_SETS);
247 } 248 }
249
248 /* Loaded the faceset information - now need to load up the 250 /* Loaded the faceset information - now need to load up the
249 * actual faces. 251 * actual faces.
250 */ 252 */
251 253
252 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++) 254 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
253 { 255 {
254 /* if prefix is not set, this is not used */ 256 /* if prefix is not set, this is not used */
255 if (!facesets[fileno].prefix) 257 if (!facesets[fileno].prefix)
256 continue; 258 continue;
259
257 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo)); 260 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
258 261
259 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno); 262 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
260 LOG (llevDebug, "Loading image file %s\n", filename); 263 LOG (llevDebug, "Loading image file %s\n", filename);
261 264
262 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL) 265 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
263 { 266 {
264 LOG (llevError, "Unable to open %s\n", filename); 267 LOG (llevError, "Unable to open %s\n", filename);
265 abort (); 268 abort ();
266 } 269 }
270
267 while (fgets (buf, HUGE_BUF - 1, infile) != NULL) 271 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
268 { 272 {
269 if (strncmp (buf, "IMAGE ", 6) != 0) 273 if (strncmp (buf, "IMAGE ", 6) != 0)
270 { 274 {
271 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf); 275 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
272 abort (); 276 abort ();
273 } 277 }
278
274 num = atoi (buf + 6); 279 num = atoi (buf + 6);
275 if (num < 0 || num >= nrofpixmaps) 280 if (num < 0 || num >= nrofpixmaps)
276 { 281 {
277 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf); 282 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
278 abort (); 283 abort ();
279 } 284 }
285
280 /* Skip accross the number data */ 286 /* Skip accross the number data */
281 for (cp = buf + 6; *cp != ' '; cp++); 287 for (cp = buf + 6; *cp != ' '; cp++)
288 ;
289
282 len = atoi (cp); 290 len = atoi (cp);
283 if (len == 0 || len > MAX_IMAGE_SIZE) 291 if (len == 0 || len > MAX_IMAGE_SIZE)
284 { 292 {
285 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf); 293 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
286 abort (); 294 abort ();
287 } 295 }
296
288 /* We don't actualy care about the name of the image that 297 /* We don't actualy care about the name of the image that
289 * is embedded in the image file, so just ignore it. 298 * is embedded in the image file, so just ignore it.
290 */ 299 */
291 facesets[fileno].faces[num].datalen = len; 300 facesets[fileno].faces[num].datalen = len;
292 facesets[fileno].faces[num].data = (uint8 *) malloc (len); 301 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
293 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1) 302 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
294 { 303 {
295 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf); 304 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
296 abort (); 305 abort ();
297 } 306 }
298 facesets[fileno].faces[num].checksum = 0; 307
308 crc32 chksum;
309
299 for (i = 0; i < len; i++) 310 for (i = 0; i < len; i++)
300 { 311 chksum (facesets[fileno].faces[num].data[i]);
301 ROTATE_RIGHT (facesets[fileno].faces[num].checksum); 312
302 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
303 facesets[fileno].faces[num].checksum &= 0xffffffff; 313 facesets[fileno].faces[num].checksum = chksum;
304 }
305 } 314 }
315
306 close_and_delete (infile, compressed); 316 close_and_delete (infile, compressed);
307 } /* For fileno < MAX_FACE_SETS */ 317 } /* For fileno < MAX_FACE_SETS */
308} 318}
309 319
310/** 320/**
311 * Client tells us what type of faces it wants. Also sets 321 * Client tells us what type of faces it wants. Also sets
312 * the caching attribute. 322 * the caching attribute.
313 * 323 *
314 */ 324 */
315
316void 325void
317SetFaceMode (char *buf, int len, client_socket *ns) 326SetFaceMode (char *buf, int len, client *ns)
318{ 327{
319 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE); 328 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
320 329
321 if (mode == CF_FACE_NONE) 330 if (mode == CF_FACE_NONE)
322 ns->facecache = 1; 331 ns->facecache = 1;
323 else if (mode != CF_FACE_PNG) 332 else if (mode != CF_FACE_PNG)
324 {
325 packet sl;
326 sl.printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png"); 333 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
327 ns->send_packet (sl);
328 }
329 334
330 if (mask) 335 if (mask)
331 ns->facecache = 1; 336 ns->facecache = 1;
332} 337}
333 338
334/** 339/**
335 * Client has requested pixmap that it somehow missed getting. 340 * Client has requested pixmap that it somehow missed getting.
336 * This will be called often if the client is 341 * This will be called often if the client is
337 * caching images. 342 * caching images.
338 */ 343 */
339
340void 344void
341SendFaceCmd (char *buff, int len, client_socket * ns) 345SendFaceCmd (char *buf, int len, client *ns)
342{ 346{
343 long tmpnum = atoi (buff); 347 uint16 facenum = atoi (buf);
344 short facenum = tmpnum & 0xffff;
345 348
346 if (facenum != 0) 349 if (facenum != 0)
347 esrv_send_face (ns, facenum, 1); 350 esrv_send_face (ns, facenum, 1);
348} 351}
349 352
… …
353 * If nocache is true (nonzero), ignore the cache setting from the client - 356 * If nocache is true (nonzero), ignore the cache setting from the client -
354 * this is needed for the askface, in which we really do want to send the 357 * this is needed for the askface, in which we really do want to send the
355 * face (and askface is the only place that should be setting it). Otherwise, 358 * face (and askface is the only place that should be setting it). Otherwise,
356 * we look at the facecache, and if set, send the image name. 359 * we look at the facecache, and if set, send the image name.
357 */ 360 */
358
359void 361void
360esrv_send_face (client_socket *ns, short face_num, int nocache) 362esrv_send_face (client *ns, short face_num, int nocache)
361{ 363{
362 char fallback; 364 char fallback;
363 365
364 if (face_num <= 0 || face_num >= nrofpixmaps) 366 if (face_num <= 0 || face_num >= nrofpixmaps)
365 { 367 {
… …
411 * and the image_info file information. See the doc/Developers/protocol 413 * and the image_info file information. See the doc/Developers/protocol
412 * if you want further detail. 414 * if you want further detail.
413 */ 415 */
414 416
415void 417void
416send_image_info (client_socket * ns, char *params) 418send_image_info (client *ns, char *params)
417{ 419{
418 packet sl; 420 packet sl;
419 421
420 sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 422 sl.printf ("replyinfo image_info\n%d\n%u\n", nrofpixmaps - 1, (unsigned int)bmaps_checksum);
421 423
422 for (int i = 0; i < MAX_FACE_SETS; i++) 424 for (int i = 0; i < MAX_FACE_SETS; i++)
423 if (facesets[i].prefix) 425 if (facesets[i].prefix)
424 sl.printf ("%d:%s:%s:%d:%s:%s:%s", 426 sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
425 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback, 427 facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
426 facesets[i].size, facesets[i].extension, facesets[i].comment); 428 facesets[i].size , facesets[i].extension, facesets[i].comment);
427 429
428 ns->send_packet (sl); 430 ns->send_packet (sl);
429} 431}
430 432
431/** 433/**
… …
436 * For each image in [start..stop] sends 438 * For each image in [start..stop] sends
437 * - checksum 439 * - checksum
438 * - name 440 * - name
439 */ 441 */
440void 442void
441send_image_sums (client_socket * ns, char *params) 443send_image_sums (client *ns, char *params)
442{ 444{
443 int start, stop; 445 int start, stop;
444 char *cp, buf[MAX_BUF]; 446 char *cp;
445 447
446 packet sl; 448 packet sl;
447 449
448 start = atoi (params); 450 start = atoi (params);
449 for (cp = params; *cp != '\0'; cp++) 451 for (cp = params; *cp != '\0'; cp++)
… …
464 for (int i = start; i <= stop; i++) 466 for (int i = start; i <= stop; i++)
465 { 467 {
466 ns->faces_sent[i] |= NS_FACESENT_FACE; 468 ns->faces_sent[i] |= NS_FACESENT_FACE;
467 469
468 int qq = get_face_fallback (ns->faceset, i); 470 int qq = get_face_fallback (ns->faceset, i);
471
472 if (sl.room () < 2 + 4 + 1 + new_faces[i].name.length () + 1)
473 break;
469 474
470 sl << uint16 (i) 475 sl << uint16 (i)
471 << uint32 (facesets[qq].faces[i].checksum) 476 << uint32 (facesets[qq].faces[i].checksum)
472 << uint8 (qq) 477 << uint8 (qq)
473 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1); 478 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1);
… …
476 /* It would make more sense to catch this pre-emptively in the code above. 481 /* It would make more sense to catch this pre-emptively in the code above.
477 * however, if this really happens, we probably just want to cut down the 482 * however, if this really happens, we probably just want to cut down the
478 * size to less than 1000, since that is what we claim the protocol would 483 * size to less than 1000, since that is what we claim the protocol would
479 * support. 484 * support.
480 */ 485 */
486 //TODO: taken care of above, should simply abort or make sure the above code is correct
481 if (sl.length () >= MAXSOCKBUF) 487 if (sl.length () >= MAXSOCKBUF)
482 { 488 {
483 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); 489 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
484 abort (); 490 abort ();
485 } 491 }

Diff Legend

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