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.22 by pippijn, Thu Mar 1 12:28:17 2007 UTC vs.
Revision 1.41 by root, Thu Apr 12 14:18:06 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 */
192void
193read_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 */
325void 181void
… …
342 * caching images. 198 * caching images.
343 */ 199 */
344void 200void
345SendFaceCmd (char *buf, int len, client *ns) 201SendFaceCmd (char *buf, int len, client *ns)
346{ 202{
347 uint16 facenum = atoi (buf); 203 ns->send_image (atoi (buf));
204}
348 205
349 if (facenum != 0) 206// how lame
350 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;
351} 230}
352 231
353/** 232/**
354 * 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
355 * nothing gets sent in bitmap mode. 234 * nothing gets sent in bitmap mode.
… …
357 * 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
358 * 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,
359 * 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.
360 */ 239 */
361void 240void
362esrv_send_face (client *ns, short face_num, int nocache) 241client::send_face (faceidx facenum)
363{ 242{
364 char fallback; 243 // never send face 0. ever. it does not exist.
244 if (!facenum)
245 return;
365 246
366 if (face_num <= 0 || face_num >= nrofpixmaps) 247 const facedata *d = face_data (facenum, faceset);
248
249 if (!d)
367 { 250 {
368 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 251 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
369 return; 252 return;
370 } 253 }
371 254
255 if (faces_sent[facenum])
256 return;
257
258 faces_sent[facenum] = true;
259
260 // if for some reason we let a client without face caching connect,
261 // we better support that decision here and implement it.
262 if (!facecache)
263 return send_image (facenum);
264
265 if (fxix)
266 {
267 fxface.push_back (facenum);
268 return;
269 }
270
372 packet sl; 271 packet sl;
373 fallback = get_face_fallback (ns->faceset, face_num);
374 272
375 if (facesets[fallback].faces[face_num].data == NULL) 273 if (force_face0)
274 sl << "face " << uint16 (facenum);
275 else if (image2)
276 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
277 else
278 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
279
280 // how lame
281 print_facename (sl, *d);
282 send_packet (sl);
283
284 if (EMI_smooth)
285 {
286 faceinfo *f = face_info (facenum);
287
288 if (f->smooth)
289 {
290 send_face (f->smooth);
291
292 packet sl ("smooth");
293
294 sl << uint16 (facenum)
295 << uint16 (f->smooth);
296
297 send_packet (sl);
298 }
376 { 299 }
377 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 300}
301
302void client::flush_fx ()
303{
304 while (!fxface.empty ())
305 {
306 packet fx ("fx");
307 packet sx ("sx");
308
309 do
310 {
311 faceidx facenum = fxface.back (); fxface.pop_back ();
312
313 const facedata *d = face_data (facenum, faceset);
314
315 if (d)
316 {
317 fx << ber32 (facenum)
318 << data8 (d->chksum, CHKSUM_SIZE);
319
320 if (smoothing)
321 {
322 faceinfo *f = face_info (facenum);
323
324 if (f->smooth)
325 {
326 send_face (f->smooth);
327 sx << ber32 (facenum)
328 << ber32 (f->smooth)
329 << ber32 (f->smoothlevel);
330 }
331 }
332 }
333 }
334 while (!fxface.empty ()
335 && fx.room () > ber32::size + CHKSUM_SIZE + 1
336 && sx.room () > ber32::size * 3);
337
338 send_packet (fx);
339 if (sx.length () > 3) send_packet (sx);
340 }
341}
342
343void
344client::send_image (faceidx facenum)
345{
346 // never send face 0. ever. it does not exist.
347 if (!facenum)
348 return;
349
350 const facedata *d = face_data (facenum, faceset);
351
352 if (!d)
353 {
354 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
378 return; 355 return;
379 } 356 }
380 357
381 if (ns->facecache && !nocache) 358 faces_sent[facenum] = true;
382 {
383 sl << (ns->image2 ? "face2 " : "face1 ")
384 << uint16 (face_num);
385 359
386 if (ns->image2) 360 if (force_image_newmap)
387 sl << uint8 (fallback); 361 force_newmap = true;
388 362
389 sl << uint32 (facesets[fallback].faces[face_num].checksum) 363 packet sl;
390 << new_faces[face_num].name;
391 364
392 ns->send_packet (sl);
393 }
394 else
395 {
396 sl << (ns->image2 ? "image2 " : "image ") 365 sl << (image2 ? "image2 " : "image ")
397 << uint32 (face_num); 366 << uint32 (facenum);
398 367
399 if (ns->image2) 368 if (image2)
400 sl << uint8 (fallback); 369 sl << uint8 (0);
401 370
402 sl << uint32 (facesets[fallback].faces[face_num].datalen) 371 sl << uint32 (d->data.size ())
403 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 372 << data (d->data.data (), d->data.size ());
404 373
405 ns->send_packet (sl); 374 send_packet (sl);
375}
376
377// send all faces of this object to the client
378// this uses more bandwidth initially, but makes
379// animations look much smoother, and every client
380// is supposed to do client-side caching anyways.
381void
382client::send_faces (object *ob)
383{
384 send_face (ob->face);
385
386 if (ob->animation_id)
406 } 387 {
388 animation &anim = animations [ob->animation_id];
407 389
408 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 390 for (int i = 0; i < anim.num_animations; i++)
391 send_face (anim.faces [i]);
392 }
393}
394
395/**
396 * Need to send an animation sequence to the client.
397 * We will send appropriate face commands to the client if we haven't
398 * sent them the face yet (this can become quite costly in terms of
399 * how much we are sending - on the other hand, this should only happen
400 * when the player logs in and picks stuff up.
401 */
402void
403client::send_animation (short anim_num)
404{
405 /* Do some checking on the anim_num we got. Note that the animations
406 * are added in contigous order, so if the number is in the valid
407 * range, it must be a valid animation.
408 */
409 if (anim_num < 0 || anim_num >= animations.size ())
410 {
411 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
412 return;
413 }
414
415 packet sl ("anim");
416
417 sl << uint16 (anim_num)
418 << uint16 (0); /* flags - not used right now */
419
420 /* Build up the list of faces. Also, send any information (ie, the
421 * the face itself) down to the client.
422 */
423 for (int i = 0; i < animations[anim_num].num_animations; i++)
424 {
425 send_face (animations[anim_num].faces[i]);
426 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
427 }
428
429 send_packet (sl);
430
431 anims_sent[anim_num] = 1;
409} 432}
410 433
411/** 434/**
412 * Sends the number of images, checksum of the face file, 435 * Sends the number of images, checksum of the face file,
413 * and the image_info file information. See the doc/Developers/protocol 436 * and the image_info file information. See the doc/Developers/protocol
414 * if you want further detail. 437 * if you want further detail.
415 */ 438 */
416
417void 439void
418send_image_info (client *ns, char *params) 440send_image_info (client *ns, char *params)
419{ 441{
420 packet sl; 442 packet sl;
421 443
422 sl.printf ("replyinfo image_info\n%d\n%u\n", nrofpixmaps - 1, (unsigned int)bmaps_checksum); 444 //TODO: second parameter is a checksum, but it makes no sense in this current framework
445 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
423 446
424 for (int i = 0; i < MAX_FACE_SETS; i++) 447 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 448
430 ns->send_packet (sl); 449 ns->send_packet (sl);
431} 450}
432 451
433/** 452/**
… …
451 for (cp = params; *cp != '\0'; cp++) 470 for (cp = params; *cp != '\0'; cp++)
452 if (*cp == ' ') 471 if (*cp == ' ')
453 break; 472 break;
454 473
455 stop = atoi (cp); 474 stop = atoi (cp);
456 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 475 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
457 { 476 {
458 sl.printf ("replyinfo image_sums %d %d", start, stop); 477 sl.printf ("replyinfo image_sums %d %d", start, stop);
459 ns->send_packet (sl); 478 ns->send_packet (sl);
460 sl.reset (); 479 sl.reset ();
461 return; 480 return;
462 } 481 }
463 482
464 sl.printf ("replyinfo image_sums %d %d ", start, stop); 483 sl.printf ("replyinfo image_sums %d %d ", start, stop);
465 484
466 for (int i = start; i <= stop; i++) 485 for (int i = start; i <= stop && i < faces.size (); i++)
467 { 486 {
468 ns->faces_sent[i] |= NS_FACESENT_FACE; 487 ns->faces_sent[i] = true;
469 488
470 int qq = get_face_fallback (ns->faceset, i); 489 const facedata *d = face_data (i, ns->faceset);
490
491 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
492 break;
471 493
472 sl << uint16 (i) 494 sl << uint16 (i)
473 << uint32 (facesets[qq].faces[i].checksum) 495 << uint32 (0) // checksum
474 << uint8 (qq) 496 << uint8 (ns->faceset);
475 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1); 497
498 print_facename (sl, *d); sl << uint8 (0);
476 } 499 }
477 500
478 /* It would make more sense to catch this pre-emptively in the code above. 501 /* It would make more sense to catch this pre-emptively in the code above.
479 * however, if this really happens, we probably just want to cut down the 502 * however, if this really happens, we probably just want to cut down the
480 * size to less than 1000, since that is what we claim the protocol would 503 * size to less than 1000, since that is what we claim the protocol would
481 * support. 504 * support.
482 */ 505 */
506 //TODO: taken care of above, should simply abort or make sure the above code is correct
483 if (sl.length () >= MAXSOCKBUF) 507 if (sl.length () >= MAXSOCKBUF)
484 { 508 {
485 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); 509 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
486 abort (); 510 abort ();
487 } 511 }

Diff Legend

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