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.19 by root, Thu Feb 15 18:09:34 2007 UTC vs.
Revision 1.33 by root, Wed Mar 14 16:23:26 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 */
42typedef struct FaceInfo 44typedef 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 */
190void
191read_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 */
322void 181void
… …
339 * caching images. 198 * caching images.
340 */ 199 */
341void 200void
342SendFaceCmd (char *buf, int len, client *ns) 201SendFaceCmd (char *buf, int len, client *ns)
343{ 202{
344 uint16 facenum = atoi (buf); 203 ns->send_image (atoi (buf));
204}
345 205
346 if (facenum != 0) 206// how lame
347 esrv_send_face (ns, facenum, 1); 207static void print_facename (packet &sl, const facedata &d)
208{
209 for (int i = 0; i < CHKSUM_SIZE; ++i)
210 sl.printf ("%02x", d.chksum [i]);
211}
212
213// gcfclient uses the server-provided checksum for comparison, but always
214// writes a broken checksum to its cache file, so we have to provide
215// gcfclient with the same broken (and useless) checksum just to have it
216// cache the image despite its bugs.
217static uint32 gcfclient_checksum (const facedata *d)
218{
219 uint32 csum = 0;
220
221 for (std::string::const_iterator i = d->data.begin ();
222 i != d->data.end ();
223 ++i)
224 {
225 csum = rotate_right (csum);
226 csum += *(uint8 *)&*i;
227 }
228
229 return csum;
348} 230}
349 231
350/** 232/**
351 * Sends a face to a client if they are in pixmap mode 233 * Sends a face to a client if they are in pixmap mode
352 * nothing gets sent in bitmap mode. 234 * nothing gets sent in bitmap mode.
… …
354 * this is needed for the askface, in which we really do want to send the 236 * 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, 237 * 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. 238 * we look at the facecache, and if set, send the image name.
357 */ 239 */
358void 240void
359esrv_send_face (client *ns, short face_num, int nocache) 241client::send_face (faceidx facenum)
360{ 242{
361 char fallback; 243 // never send face 0. ever. it does not exist.
244 if (!facenum)
245 return;
362 246
363 if (face_num <= 0 || face_num >= nrofpixmaps) 247 const facedata *d = face_data (facenum, faceset);
248
249 if (!d)
364 { 250 {
365 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 251 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
366 return; 252 return;
367 } 253 }
368 254
255 if (faces_sent[facenum])
256 return;
257
258 faces_sent[facenum] = true;
259
260 if (!facecache)
261 {
262 send_drawinfo (
263 "*** Please enable image/face caching in preferences or use a client that supports it.\n",
264 NDI_RED
265 );
266 return send_image (facenum);
267 }
268
369 packet sl; 269 packet sl;
370 fallback = get_face_fallback (ns->faceset, face_num);
371 270
372 if (facesets[fallback].faces[face_num].data == NULL) 271 if (force_face0)
272 sl << "face " << uint16 (facenum);
273 else if (image2)
274 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
275 else
276 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
277
278 // how lame
279 print_facename (sl, *d);
280 send_packet (sl);
281
282 faceinfo *f = face_info (facenum);
283 if (f->smooth && EMI_smooth)
284 {
285 send_face (f->smooth);
286
287 packet sl ("smooth");
288
289 sl << uint16 (facenum)
290 << uint16 (f->smooth);
291
292 send_packet (sl);
373 { 293 }
374 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 294}
295
296void
297client::send_image (faceidx facenum)
298{
299 // never send face 0. ever. it does not exist.
300 if (!facenum)
301 return;
302
303 const facedata *d = face_data (facenum, faceset);
304
305 if (!d)
306 {
307 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
375 return; 308 return;
376 } 309 }
377 310
378 if (ns->facecache && !nocache) 311 packet sl;
379 {
380 sl << (ns->image2 ? "face2 " : "face1 ")
381 << uint16 (face_num);
382 312
383 if (ns->image2)
384 sl << uint8 (fallback);
385
386 sl << uint32 (facesets[fallback].faces[face_num].checksum)
387 << new_faces[face_num].name;
388
389 ns->send_packet (sl);
390 }
391 else
392 {
393 sl << (ns->image2 ? "image2 " : "image ") 313 sl << (image2 ? "image2 " : "image ")
394 << uint32 (face_num); 314 << uint32 (facenum);
395 315
396 if (ns->image2) 316 if (image2)
397 sl << uint8 (fallback); 317 sl << uint8 (0);
398 318
399 sl << uint32 (facesets[fallback].faces[face_num].datalen) 319 sl << uint32 (d->data.size ())
400 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 320 << data (d->data.data (), d->data.size ());
401 321
402 ns->send_packet (sl); 322 send_packet (sl);
323}
324
325// send all faces of this object to the client
326// this uses more bandwidth initially, but makes
327// animations look much smoother, and every client
328// is supposed to do client-side caching anyways.
329void
330client::send_faces (object *ob)
331{
332 send_face (ob->face);
333
334 if (ob->animation_id)
403 } 335 {
336 animation &anim = animations [ob->animation_id];
404 337
405 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 338 for (int i = 0; i < anim.num_animations; i++)
339 send_face (anim.faces [i]);
340 }
341}
342
343/**
344 * Need to send an animation sequence to the client.
345 * We will send appropriate face commands to the client if we haven't
346 * sent them the face yet (this can become quite costly in terms of
347 * how much we are sending - on the other hand, this should only happen
348 * when the player logs in and picks stuff up.
349 */
350void
351client::send_animation (short anim_num)
352{
353 /* Do some checking on the anim_num we got. Note that the animations
354 * are added in contigous order, so if the number is in the valid
355 * range, it must be a valid animation.
356 */
357 if (anim_num < 0 || anim_num > num_animations)
358 {
359 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
360 return;
361 }
362
363 packet sl ("anim");
364
365 sl << uint16 (anim_num)
366 << uint16 (0); /* flags - not used right now */
367
368 /* Build up the list of faces. Also, send any information (ie, the
369 * the face itself) down to the client.
370 */
371 for (int i = 0; i < animations[anim_num].num_animations; i++)
372 {
373 send_face (animations[anim_num].faces[i]);
374 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
375 }
376
377 send_packet (sl);
378
379 anims_sent[anim_num] = 1;
406} 380}
407 381
408/** 382/**
409 * Sends the number of images, checksum of the face file, 383 * Sends the number of images, checksum of the face file,
410 * and the image_info file information. See the doc/Developers/protocol 384 * and the image_info file information. See the doc/Developers/protocol
411 * if you want further detail. 385 * if you want further detail.
412 */ 386 */
413
414void 387void
415send_image_info (client *ns, char *params) 388send_image_info (client *ns, char *params)
416{ 389{
417 packet sl; 390 packet sl;
418 391
419 sl.printf ("replyinfo image_info\n%d\n%u\n", nrofpixmaps - 1, (unsigned int)bmaps_checksum); 392 //TODO: second parameter is a checksum, but it makes no sense in this current framework
393 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
420 394
421 for (int i = 0; i < MAX_FACE_SETS; i++) 395 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 396
427 ns->send_packet (sl); 397 ns->send_packet (sl);
428} 398}
429 399
430/** 400/**
… …
438 */ 408 */
439void 409void
440send_image_sums (client *ns, char *params) 410send_image_sums (client *ns, char *params)
441{ 411{
442 int start, stop; 412 int start, stop;
443 char *cp, buf[MAX_BUF]; 413 char *cp;
444 414
445 packet sl; 415 packet sl;
446 416
447 start = atoi (params); 417 start = atoi (params);
448 for (cp = params; *cp != '\0'; cp++) 418 for (cp = params; *cp != '\0'; cp++)
449 if (*cp == ' ') 419 if (*cp == ' ')
450 break; 420 break;
451 421
452 stop = atoi (cp); 422 stop = atoi (cp);
453 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 423 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
454 { 424 {
455 sl.printf ("replyinfo image_sums %d %d", start, stop); 425 sl.printf ("replyinfo image_sums %d %d", start, stop);
456 ns->send_packet (sl); 426 ns->send_packet (sl);
457 sl.reset (); 427 sl.reset ();
458 return; 428 return;
459 } 429 }
460 430
461 sl.printf ("replyinfo image_sums %d %d ", start, stop); 431 sl.printf ("replyinfo image_sums %d %d ", start, stop);
462 432
463 for (int i = start; i <= stop; i++) 433 for (int i = start; i <= stop && i < faces.size (); i++)
464 { 434 {
465 ns->faces_sent[i] |= NS_FACESENT_FACE; 435 ns->faces_sent[i] = true;
466 436
467 int qq = get_face_fallback (ns->faceset, i); 437 const facedata *d = face_data (i, ns->faceset);
438
439 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
440 break;
468 441
469 sl << uint16 (i) 442 sl << uint16 (i)
470 << uint32 (facesets[qq].faces[i].checksum) 443 << uint32 (0) // checksum
471 << uint8 (qq) 444 << uint8 (ns->faceset);
472 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1); 445
446 print_facename (sl, *d); sl << uint8 (0);
473 } 447 }
474 448
475 /* It would make more sense to catch this pre-emptively in the code above. 449 /* 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 450 * 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 451 * size to less than 1000, since that is what we claim the protocol would
478 * support. 452 * support.
479 */ 453 */
454 //TODO: taken care of above, should simply abort or make sure the above code is correct
480 if (sl.length () >= MAXSOCKBUF) 455 if (sl.length () >= MAXSOCKBUF)
481 { 456 {
482 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); 457 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
483 abort (); 458 abort ();
484 } 459 }

Diff Legend

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