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

Diff Legend

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