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.13 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.22 by pippijn, Thu Mar 1 12:28: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
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{
43
44 uint8 *data; /**< image data */ 46 uint8 *data; /**< image data */
45 uint16 datalen; /**< length of the xpm data */ 47 uint16 datalen; /**< length of the xpm data */
46 uint32 checksum; /**< Checksum of face data */ 48 uint32 checksum; /**< Checksum of face data */
47} FaceInfo; 49} FaceInfo;
48 50
49/** Information about one face set */ 51/** Information about one face set */
50typedef struct 52typedef struct
51{ 53{
52
53 char *prefix; /**< */ 54 char *prefix; /**< */
54 char *fullname; 55 char *fullname;
55 56
56 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 */
57 char *size; 58 char *size;
… …
88 if (facesets[num].prefix) 89 if (facesets[num].prefix)
89 { 90 {
90 for (q = 0; q < nrofpixmaps; q++) 91 for (q = 0; q < nrofpixmaps; q++)
91 if (facesets[num].faces[q].data) 92 if (facesets[num].faces[q].data)
92 free (facesets[num].faces[q].data); 93 free (facesets[num].faces[q].data);
94
93 free (facesets[num].prefix); 95 free (facesets[num].prefix);
94 free (facesets[num].fullname); 96 free (facesets[num].fullname);
95 free (facesets[num].size); 97 free (facesets[num].size);
96 free (facesets[num].extension); 98 free (facesets[num].extension);
97 free (facesets[num].comment); 99 free (facesets[num].comment);
… …
127 if (!facesets[faceset].prefix) 129 if (!facesets[faceset].prefix)
128 { 130 {
129 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);
130 return 0; /* use default set */ 132 return 0; /* use default set */
131 } 133 }
134
132 if (facesets[faceset].faces[imageno].data) 135 if (facesets[faceset].faces[imageno].data)
133 return faceset; 136 return faceset;
137
134 return get_face_fallback (facesets[faceset].fallback, imageno); 138 return get_face_fallback (facesets[faceset].fallback, imageno);
135} 139}
136 140
137/** 141/**
138 * Checks fallback are correctly defined. 142 * Checks fallback are correctly defined.
… …
154 if (!facesets[fallback].prefix) 158 if (!facesets[fallback].prefix)
155 { 159 {
156 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);
157 abort (); 161 abort ();
158 } 162 }
163
159 togo--; 164 togo--;
160 if (togo == 0) 165 if (togo == 0)
161 { 166 {
162 LOG (llevError, "Infinite loop found in facesets. aborting.\n"); 167 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
163 abort (); 168 abort ();
164 } 169 }
170
165 check_faceset_fallback (fallback, togo); 171 check_faceset_fallback (fallback, togo);
166} 172}
167 173
168#define MAX_IMAGE_SIZE 10000 174#define MAX_IMAGE_SIZE 10000
169 175
… …
181 * Function largely rewritten May 2000 to be more general purpose. 187 * Function largely rewritten May 2000 to be more general purpose.
182 * 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,
183 * 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
184 * to do such. 190 * to do such.
185 */ 191 */
186
187void 192void
188read_client_images (void) 193read_client_images (void)
189{ 194{
190 char filename[400]; 195 char filename[400];
191 char buf[HUGE_BUF]; 196 char buf[HUGE_BUF];
… …
198 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL) 203 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
199 { 204 {
200 LOG (llevError, "Unable to open %s\n", filename); 205 LOG (llevError, "Unable to open %s\n", filename);
201 abort (); 206 abort ();
202 } 207 }
208
203 while (fgets (buf, HUGE_BUF - 1, infile) != NULL) 209 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
204 { 210 {
205 badline = 0; 211 badline = 0;
206 212
207 if (buf[0] == '#') 213 if (buf[0] == '#')
208 continue; 214 continue;
215
209 if (!(cps[0] = strtok (buf, ":"))) 216 if (!(cps[0] = strtok (buf, ":")))
210 badline = 1; 217 badline = 1;
218
211 for (i = 1; i < 7; i++) 219 for (i = 1; i < 7; i++)
212 {
213 if (!(cps[i] = strtok (NULL, ":"))) 220 if (!(cps[i] = strtok (NULL, ":")))
214 badline = 1; 221 badline = 1;
215 } 222
216 if (badline) 223 if (badline)
217 {
218 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);
219 }
220 else 225 else
221 { 226 {
222 len = atoi (cps[0]); 227 len = atoi (cps[0]);
223 if (len >= MAX_FACE_SETS) 228 if (len >= MAX_FACE_SETS)
224 { 229 {
… …
231 facesets[len].size = strdup (cps[4]); 236 facesets[len].size = strdup (cps[4]);
232 facesets[len].extension = strdup (cps[5]); 237 facesets[len].extension = strdup (cps[5]);
233 facesets[len].comment = strdup (cps[6]); 238 facesets[len].comment = strdup (cps[6]);
234 } 239 }
235 } 240 }
241
236 close_and_delete (infile, compressed); 242 close_and_delete (infile, compressed);
243
237 for (i = 0; i < MAX_FACE_SETS; i++) 244 for (i = 0; i < MAX_FACE_SETS; i++)
238 { 245 {
239 if (facesets[i].prefix) 246 if (facesets[i].prefix)
240 check_faceset_fallback (i, MAX_FACE_SETS); 247 check_faceset_fallback (i, MAX_FACE_SETS);
241 } 248 }
249
242 /* Loaded the faceset information - now need to load up the 250 /* Loaded the faceset information - now need to load up the
243 * actual faces. 251 * actual faces.
244 */ 252 */
245 253
246 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++) 254 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
247 { 255 {
248 /* if prefix is not set, this is not used */ 256 /* if prefix is not set, this is not used */
249 if (!facesets[fileno].prefix) 257 if (!facesets[fileno].prefix)
250 continue; 258 continue;
259
251 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo)); 260 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
252 261
253 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno); 262 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
254 LOG (llevDebug, "Loading image file %s\n", filename); 263 LOG (llevDebug, "Loading image file %s\n", filename);
255 264
256 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL) 265 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
257 { 266 {
258 LOG (llevError, "Unable to open %s\n", filename); 267 LOG (llevError, "Unable to open %s\n", filename);
259 abort (); 268 abort ();
260 } 269 }
270
261 while (fgets (buf, HUGE_BUF - 1, infile) != NULL) 271 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
262 { 272 {
263 if (strncmp (buf, "IMAGE ", 6) != 0) 273 if (strncmp (buf, "IMAGE ", 6) != 0)
264 { 274 {
265 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);
266 abort (); 276 abort ();
267 } 277 }
278
268 num = atoi (buf + 6); 279 num = atoi (buf + 6);
269 if (num < 0 || num >= nrofpixmaps) 280 if (num < 0 || num >= nrofpixmaps)
270 { 281 {
271 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);
272 abort (); 283 abort ();
273 } 284 }
285
274 /* Skip accross the number data */ 286 /* Skip accross the number data */
275 for (cp = buf + 6; *cp != ' '; cp++); 287 for (cp = buf + 6; *cp != ' '; cp++)
288 ;
289
276 len = atoi (cp); 290 len = atoi (cp);
277 if (len == 0 || len > MAX_IMAGE_SIZE) 291 if (len == 0 || len > MAX_IMAGE_SIZE)
278 { 292 {
279 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);
280 abort (); 294 abort ();
281 } 295 }
296
282 /* 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
283 * is embedded in the image file, so just ignore it. 298 * is embedded in the image file, so just ignore it.
284 */ 299 */
285 facesets[fileno].faces[num].datalen = len; 300 facesets[fileno].faces[num].datalen = len;
286 facesets[fileno].faces[num].data = (uint8 *) malloc (len); 301 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
287 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)
288 { 303 {
289 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);
290 abort (); 305 abort ();
291 } 306 }
292 facesets[fileno].faces[num].checksum = 0; 307
308 crc32 chksum;
309
293 for (i = 0; i < len; i++) 310 for (i = 0; i < len; i++)
294 { 311 chksum (facesets[fileno].faces[num].data[i]);
295 ROTATE_RIGHT (facesets[fileno].faces[num].checksum); 312
296 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
297 facesets[fileno].faces[num].checksum &= 0xffffffff; 313 facesets[fileno].faces[num].checksum = chksum;
298 }
299 } 314 }
315
300 close_and_delete (infile, compressed); 316 close_and_delete (infile, compressed);
301 } /* For fileno < MAX_FACE_SETS */ 317 } /* For fileno < MAX_FACE_SETS */
302} 318}
303 319
304/** 320/**
305 * Client tells us what type of faces it wants. Also sets 321 * Client tells us what type of faces it wants. Also sets
306 * the caching attribute. 322 * the caching attribute.
307 * 323 *
308 */ 324 */
309
310void 325void
311SetFaceMode (char *buf, int len, client *ns) 326SetFaceMode (char *buf, int len, client *ns)
312{ 327{
313 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);
314 329
315 if (mode == CF_FACE_NONE) 330 if (mode == CF_FACE_NONE)
316 ns->facecache = 1; 331 ns->facecache = 1;
317 else if (mode != CF_FACE_PNG) 332 else if (mode != CF_FACE_PNG)
318 {
319 packet sl;
320 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");
321 ns->send_packet (sl);
322 }
323 334
324 if (mask) 335 if (mask)
325 ns->facecache = 1; 336 ns->facecache = 1;
326} 337}
327 338
328/** 339/**
329 * Client has requested pixmap that it somehow missed getting. 340 * Client has requested pixmap that it somehow missed getting.
330 * This will be called often if the client is 341 * This will be called often if the client is
331 * caching images. 342 * caching images.
332 */ 343 */
333
334void 344void
335SendFaceCmd (char *buff, int len, client * ns) 345SendFaceCmd (char *buf, int len, client *ns)
336{ 346{
337 long tmpnum = atoi (buff); 347 uint16 facenum = atoi (buf);
338 short facenum = tmpnum & 0xffff;
339 348
340 if (facenum != 0) 349 if (facenum != 0)
341 esrv_send_face (ns, facenum, 1); 350 esrv_send_face (ns, facenum, 1);
342} 351}
343 352
… …
347 * 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 -
348 * 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
349 * 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,
350 * 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.
351 */ 360 */
352
353void 361void
354esrv_send_face (client *ns, short face_num, int nocache) 362esrv_send_face (client *ns, short face_num, int nocache)
355{ 363{
356 char fallback; 364 char fallback;
357 365
… …
405 * and the image_info file information. See the doc/Developers/protocol 413 * and the image_info file information. See the doc/Developers/protocol
406 * if you want further detail. 414 * if you want further detail.
407 */ 415 */
408 416
409void 417void
410send_image_info (client * ns, char *params) 418send_image_info (client *ns, char *params)
411{ 419{
412 packet sl; 420 packet sl;
413 421
414 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);
415 423
416 for (int i = 0; i < MAX_FACE_SETS; i++) 424 for (int i = 0; i < MAX_FACE_SETS; i++)
417 if (facesets[i].prefix) 425 if (facesets[i].prefix)
418 sl.printf ("%d:%s:%s:%d:%s:%s:%s", 426 sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
419 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback, 427 facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
420 facesets[i].size, facesets[i].extension, facesets[i].comment); 428 facesets[i].size , facesets[i].extension, facesets[i].comment);
421 429
422 ns->send_packet (sl); 430 ns->send_packet (sl);
423} 431}
424 432
425/** 433/**
… …
430 * For each image in [start..stop] sends 438 * For each image in [start..stop] sends
431 * - checksum 439 * - checksum
432 * - name 440 * - name
433 */ 441 */
434void 442void
435send_image_sums (client * ns, char *params) 443send_image_sums (client *ns, char *params)
436{ 444{
437 int start, stop; 445 int start, stop;
438 char *cp, buf[MAX_BUF]; 446 char *cp;
439 447
440 packet sl; 448 packet sl;
441 449
442 start = atoi (params); 450 start = atoi (params);
443 for (cp = params; *cp != '\0'; cp++) 451 for (cp = params; *cp != '\0'; cp++)

Diff Legend

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