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.49 by root, Thu Jul 12 18:48:54 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** \file 24/** \file
25 * Image related communication 25 * Image related communication
26 * 26 *
27 * \date 2003-12-02 27 * \date 2003-12-02
… …
33 */ 33 */
34 34
35#include <global.h> 35#include <global.h>
36#include <sproto.h> 36#include <sproto.h>
37 37
38#include "crc.h"
39
38#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */ 40#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */
39 41
40/** Information about one image */ 42/** Information about one image */
41typedef struct FaceInfo 43typedef struct FaceInfo
42{ 44{
43
44 uint8 *data; /**< image data */ 45 uint8 *data; /**< image data */
45 uint16 datalen; /**< length of the xpm data */ 46 uint16 datalen; /**< length of the xpm data */
46 uint32 checksum; /**< Checksum of face data */ 47 uint32 checksum; /**< Checksum of face data */
47} FaceInfo; 48} FaceInfo;
48 49
49/** Information about one face set */ 50/** Information about one face set */
50typedef struct 51typedef struct
51{ 52{
52
53 char *prefix; /**< */ 53 char *prefix; /**< */
54 char *fullname; 54 char *fullname;
55 55
56 uint8 fallback; /**< faceset to use when an image is not found in this faceset */ 56 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
57 char *size; 57 char *size;
… …
85 85
86 for (num = 0; num < MAX_FACE_SETS; num++) 86 for (num = 0; num < MAX_FACE_SETS; num++)
87 { 87 {
88 if (facesets[num].prefix) 88 if (facesets[num].prefix)
89 { 89 {
90 for (q = 0; q < nrofpixmaps; q++) 90 for (q = 0; q < faces.size (); q++)
91 if (facesets[num].faces[q].data) 91 if (facesets[num].faces[q].data)
92 free (facesets[num].faces[q].data); 92 free (facesets[num].faces[q].data);
93
93 free (facesets[num].prefix); 94 free (facesets[num].prefix);
94 free (facesets[num].fullname); 95 free (facesets[num].fullname);
95 free (facesets[num].size); 96 free (facesets[num].size);
96 free (facesets[num].extension); 97 free (facesets[num].extension);
97 free (facesets[num].comment); 98 free (facesets[num].comment);
… …
127 if (!facesets[faceset].prefix) 128 if (!facesets[faceset].prefix)
128 { 129 {
129 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset); 130 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
130 return 0; /* use default set */ 131 return 0; /* use default set */
131 } 132 }
133
132 if (facesets[faceset].faces[imageno].data) 134 if (facesets[faceset].faces[imageno].data)
133 return faceset; 135 return faceset;
136
134 return get_face_fallback (facesets[faceset].fallback, imageno); 137 return get_face_fallback (facesets[faceset].fallback, imageno);
135} 138}
136 139
137/** 140/**
138 * Checks fallback are correctly defined. 141 * Checks fallback are correctly defined.
… …
154 if (!facesets[fallback].prefix) 157 if (!facesets[fallback].prefix)
155 { 158 {
156 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback); 159 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
157 abort (); 160 abort ();
158 } 161 }
162
159 togo--; 163 togo--;
160 if (togo == 0) 164 if (togo == 0)
161 { 165 {
162 LOG (llevError, "Infinite loop found in facesets. aborting.\n"); 166 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
163 abort (); 167 abort ();
164 } 168 }
169
165 check_faceset_fallback (fallback, togo); 170 check_faceset_fallback (fallback, togo);
166} 171}
167 172
168#define MAX_IMAGE_SIZE 10000 173#define MAX_IMAGE_SIZE 10000
169
170/**
171 * Loads all the image types into memory.
172 *
173 * This way, we can easily send them to the client. We should really do something
174 * better than abort on any errors - on the other hand, these are all fatal
175 * to the server (can't work around them), but the abort just seems a bit
176 * messy (exit would probably be better.)
177 *
178 * Couple of notes: We assume that the faces are in a continous block.
179 * This works fine for now, but this could perhaps change in the future
180 *
181 * 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,
183 * it is just data it needs to allocate. As such, the code is written
184 * to do such.
185 */
186
187void
188read_client_images (void)
189{
190 char filename[400];
191 char buf[HUGE_BUF];
192 char *cp, *cps[7];
193 FILE *infile;
194 int num, len, compressed, fileno, i, badline;
195
196 memset (facesets, 0, sizeof (facesets));
197 sprintf (filename, "%s/image_info", settings.datadir);
198 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
199 {
200 LOG (llevError, "Unable to open %s\n", filename);
201 abort ();
202 }
203 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
204 {
205 badline = 0;
206
207 if (buf[0] == '#')
208 continue;
209 if (!(cps[0] = strtok (buf, ":")))
210 badline = 1;
211 for (i = 1; i < 7; i++)
212 {
213 if (!(cps[i] = strtok (NULL, ":")))
214 badline = 1;
215 }
216 if (badline)
217 {
218 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
219 }
220 else
221 {
222 len = atoi (cps[0]);
223 if (len >= MAX_FACE_SETS)
224 {
225 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
226 abort ();
227 }
228 facesets[len].prefix = strdup (cps[1]);
229 facesets[len].fullname = strdup (cps[2]);
230 facesets[len].fallback = atoi (cps[3]);
231 facesets[len].size = strdup (cps[4]);
232 facesets[len].extension = strdup (cps[5]);
233 facesets[len].comment = strdup (cps[6]);
234 }
235 }
236 close_and_delete (infile, compressed);
237 for (i = 0; i < MAX_FACE_SETS; i++)
238 {
239 if (facesets[i].prefix)
240 check_faceset_fallback (i, MAX_FACE_SETS);
241 }
242 /* Loaded the faceset information - now need to load up the
243 * actual faces.
244 */
245
246 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
247 {
248 /* if prefix is not set, this is not used */
249 if (!facesets[fileno].prefix)
250 continue;
251 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
252
253 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
254 LOG (llevDebug, "Loading image file %s\n", filename);
255
256 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
257 {
258 LOG (llevError, "Unable to open %s\n", filename);
259 abort ();
260 }
261 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
262 {
263 if (strncmp (buf, "IMAGE ", 6) != 0)
264 {
265 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
266 abort ();
267 }
268 num = atoi (buf + 6);
269 if (num < 0 || num >= nrofpixmaps)
270 {
271 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
272 abort ();
273 }
274 /* Skip accross the number data */
275 for (cp = buf + 6; *cp != ' '; cp++);
276 len = atoi (cp);
277 if (len == 0 || len > MAX_IMAGE_SIZE)
278 {
279 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
280 abort ();
281 }
282 /* We don't actualy care about the name of the image that
283 * is embedded in the image file, so just ignore it.
284 */
285 facesets[fileno].faces[num].datalen = len;
286 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
287 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
288 {
289 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
290 abort ();
291 }
292 facesets[fileno].faces[num].checksum = 0;
293 for (i = 0; i < len; i++)
294 {
295 ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
296 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
297 facesets[fileno].faces[num].checksum &= 0xffffffff;
298 }
299 }
300 close_and_delete (infile, compressed);
301 } /* For fileno < MAX_FACE_SETS */
302}
303 174
304/** 175/**
305 * Client tells us what type of faces it wants. Also sets 176 * Client tells us what type of faces it wants. Also sets
306 * the caching attribute. 177 * the caching attribute.
307 * 178 *
308 */ 179 */
309
310void 180void
311SetFaceMode (char *buf, int len, client *ns) 181SetFaceMode (char *buf, int len, client *ns)
312{ 182{
313 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE); 183 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
314 184
315 if (mode == CF_FACE_NONE) 185 if (mode == CF_FACE_NONE)
316 ns->facecache = 1; 186 ns->facecache = 1;
317 else if (mode != CF_FACE_PNG) 187 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"); 188 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
321 ns->send_packet (sl);
322 }
323 189
324 if (mask) 190 if (mask)
325 ns->facecache = 1; 191 ns->facecache = 1;
326} 192}
327 193
328/** 194/**
329 * Client has requested pixmap that it somehow missed getting. 195 * client requested an image. send it rate-limited
330 * This will be called often if the client is 196 * before flushing.
331 * caching images.
332 */ 197 */
333
334void 198void
335SendFaceCmd (char *buff, int len, client * ns) 199AskFaceCmd (char *buf, int len, client *ns)
336{ 200{
337 long tmpnum = atoi (buff); 201 int idx = 0, pri = 0;
338 short facenum = tmpnum & 0xffff;
339 202
340 if (facenum != 0) 203 sscanf (buf, "%d %d", &idx, &pri);
341 esrv_send_face (ns, facenum, 1); 204
205 const facedata *d = face_data (idx, ns->faceset);
206
207 if (!d)
208 return; // doh
209
210 client::ixsend ix;
211
212 ix.pri = pri;
213 ix.idx = idx;
214 ix.ofs = d->data.size ();
215
216 auto (pos, ns->ixface.end ());
217
218 if (ns->fxix < 2)
219 {
220 // gcfclient does not support prioritising, older cfplus versions
221 // do not support interleaved transfers.
222 if (!ns->ixface.empty ())
223 pos = ns->ixface.end () - 1;
224 }
225 else
226 {
227 // the by far most common case will be to insert
228 // near the end, so little looping.
229 while (pos != ns->ixface.begin ())
230 {
231 --pos;
232
233 // sort within 2k bins, to slightly prefer smaller images
234 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
235 {
236 ++pos;
237 break;
238 }
239 }
240 }
241
242 ns->ixface.insert (pos, ix);
243
244#if 0
245 for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
246 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs);
247 fprintf (stderr, "\n");
248#endif
249}
250
251/**
252 * Tells client the picture it has to use
253 * to smooth a picture number given as argument.
254 */
255void
256AskSmooth (char *buf, int len, client *ns)
257{
258 ns->send_face (atoi (buf));
259 ns->flush_fx ();
260}
261
262// how lame
263static void print_facename (packet &sl, const facedata &d)
264{
265 for (int i = 0; i < CHKSUM_SIZE; ++i)
266 sl.printf ("%02x", d.chksum [i]);
267}
268
269// gcfclient uses the server-provided checksum for comparison, but always
270// writes a broken checksum to its cache file, so we have to provide
271// gcfclient with the same broken (and useless) checksum just to have it
272// cache the image despite its bugs.
273static uint32 gcfclient_checksum (const facedata *d)
274{
275 uint32 csum = 0;
276
277 for (std::string::const_iterator i = d->data.begin ();
278 i != d->data.end ();
279 ++i)
280 {
281 csum = rotate_right (csum);
282 csum += *(uint8 *)&*i;
283 }
284
285 return csum;
342} 286}
343 287
344/** 288/**
345 * Sends a face to a client if they are in pixmap mode 289 * Sends a face to a client if they are in pixmap mode
346 * nothing gets sent in bitmap mode. 290 * nothing gets sent in bitmap mode.
347 * If nocache is true (nonzero), ignore the cache setting from the client - 291 * 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 292 * 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, 293 * 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. 294 * we look at the facecache, and if set, send the image name.
351 */ 295 */
352
353void 296void
354esrv_send_face (client *ns, short face_num, int nocache) 297client::send_face (faceidx facenum)
355{ 298{
356 char fallback; 299 // never send face 0. ever. it does not exist.
300 if (!facenum)
301 return;
357 302
358 if (face_num <= 0 || face_num >= nrofpixmaps) 303 const facedata *d = face_data (facenum, faceset);
304
305 if (!d)
359 { 306 {
360 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 307 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
361 return; 308 return;
362 } 309 }
363 310
311 faceinfo *f = face_info (facenum);
312
313 // refuse tos end non-image faces
314 if (f->type)
315 return;
316
317 if (!must_send_face (facenum))
318 return;
319
320 // if for some reason we let a client without face caching connect,
321 // we better support that decision here and implement it.
322 if (!facecache)
323 return send_image (facenum);
324
325 if (fxix)
326 {
327 fxface.push_back (facenum);
328 return;
329 }
330
364 packet sl; 331 packet sl;
365 fallback = get_face_fallback (ns->faceset, face_num);
366 332
367 if (facesets[fallback].faces[face_num].data == NULL) 333 if (force_face0)
334 sl << "face " << uint16 (facenum);
335 else if (image2)
336 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
337 else
338 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
339
340 // how lame
341 print_facename (sl, *d);
342 send_packet (sl);
343
344 if (EMI_smooth)
345 {
346 if (f->smooth)
347 {
348 send_face (f->smooth);
349
350 packet sl ("smooth");
351
352 sl << uint16 (facenum)
353 << uint16 (f->smooth);
354
355 send_packet (sl);
356 }
368 { 357 }
369 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 358}
359
360void client::flush_fx ()
361{
362 while (!fxface.empty ())
363 {
364 packet fx ("fx");
365 packet sx ("sx");
366
367 do
368 {
369 faceidx facenum = fxface.back (); fxface.pop_back ();
370
371 const facedata *d = face_data (facenum, faceset);
372
373 if (d)
374 {
375 fx << ber32 (facenum)
376 << data8 (d->chksum, CHKSUM_SIZE);
377
378 if (smoothing)
379 {
380 faceinfo *f = face_info (facenum);
381
382 if (f->smooth)
383 {
384 send_face (f->smooth);
385 sx << ber32 (facenum)
386 << ber32 (f->smooth)
387 << ber32 (f->smoothlevel);
388 }
389 }
390 }
391 }
392 while (!fxface.empty ()
393 && fx.room () > ber32::size + CHKSUM_SIZE + 1
394 && sx.room () > ber32::size * 3);
395
396 send_packet (fx);
397 if (sx.length () > 3) send_packet (sx);
398 }
399}
400
401void
402client::send_image (faceidx facenum)
403{
404 // never send face 0. ever. it does not exist.
405 if (!facenum)
406 return;
407
408 const facedata *d = face_data (facenum, faceset);
409
410 faces_sent[facenum] = true;
411
412 if (!d)
413 {
414 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
370 return; 415 return;
371 } 416 }
417
418 //TODO: check type here?
372 419
373 if (ns->facecache && !nocache) 420 if (force_image_newmap)
374 { 421 force_newmap = true;
375 sl << (ns->image2 ? "face2 " : "face1 ")
376 << uint16 (face_num);
377 422
378 if (ns->image2) 423 packet sl;
379 sl << uint8 (fallback);
380 424
381 sl << uint32 (facesets[fallback].faces[face_num].checksum)
382 << new_faces[face_num].name;
383
384 ns->send_packet (sl);
385 }
386 else
387 {
388 sl << (ns->image2 ? "image2 " : "image ") 425 sl << (image2 ? "image2 " : "image ")
389 << uint32 (face_num); 426 << uint32 (facenum);
390 427
391 if (ns->image2) 428 if (image2)
392 sl << uint8 (fallback); 429 sl << uint8 (0);
393 430
394 sl << uint32 (facesets[fallback].faces[face_num].datalen) 431 sl << uint32 (d->data.size ())
395 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 432 << data (d->data.data (), d->data.size ());
396 433
397 ns->send_packet (sl); 434 send_packet (sl);
435}
436
437// send all faces of this object to the client
438// this uses more bandwidth initially, but makes
439// animations look much smoother, and every client
440// is supposed to do client-side caching anyways.
441void
442client::send_faces (object *ob)
443{
444 send_face (ob->face);
445
446 if (ob->animation_id)
398 } 447 {
448 animation &anim = animations [ob->animation_id];
399 449
400 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 450 for (int i = 0; i < anim.num_animations; i++)
451 send_face (anim.faces [i]);
452 }
453}
454
455/**
456 * Need to send an animation sequence to the client.
457 * We will send appropriate face commands to the client if we haven't
458 * sent them the face yet (this can become quite costly in terms of
459 * how much we are sending - on the other hand, this should only happen
460 * when the player logs in and picks stuff up.
461 */
462void
463client::send_animation (short anim_num)
464{
465 /* Do some checking on the anim_num we got. Note that the animations
466 * are added in contigous order, so if the number is in the valid
467 * range, it must be a valid animation.
468 */
469 if (anim_num < 0 || anim_num >= animations.size ())
470 {
471 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
472 return;
473 }
474
475 packet sl ("anim");
476
477 sl << uint16 (anim_num)
478 << uint16 (0); /* flags - not used right now */
479
480 /* Build up the list of faces. Also, send any information (ie, the
481 * the face itself) down to the client.
482 */
483 for (int i = 0; i < animations[anim_num].num_animations; i++)
484 {
485 send_face (animations[anim_num].faces[i]);
486 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
487 }
488
489 send_packet (sl);
490
491 anims_sent[anim_num] = 1;
401} 492}
402 493
403/** 494/**
404 * Sends the number of images, checksum of the face file, 495 * Sends the number of images, checksum of the face file,
405 * and the image_info file information. See the doc/Developers/protocol 496 * and the image_info file information. See the doc/Developers/protocol
406 * if you want further detail. 497 * if you want further detail.
407 */ 498 */
408
409void 499void
410send_image_info (client * ns, char *params) 500send_image_info (client *ns, char *params)
411{ 501{
412 packet sl; 502 packet sl;
413 503
414 sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 504 //TODO: second parameter is a checksum, but it makes no sense in this current framework
505 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
415 506
416 for (int i = 0; i < MAX_FACE_SETS; i++) 507 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
417 if (facesets[i].prefix)
418 sl.printf ("%d:%s:%s:%d:%s:%s:%s",
419 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
420 facesets[i].size, facesets[i].extension, facesets[i].comment);
421 508
422 ns->send_packet (sl); 509 ns->send_packet (sl);
423} 510}
424 511
425/** 512/**
… …
430 * For each image in [start..stop] sends 517 * For each image in [start..stop] sends
431 * - checksum 518 * - checksum
432 * - name 519 * - name
433 */ 520 */
434void 521void
435send_image_sums (client * ns, char *params) 522send_image_sums (client *ns, char *params)
436{ 523{
437 int start, stop; 524 int start, stop;
438 char *cp, buf[MAX_BUF]; 525 char *cp;
439 526
440 packet sl; 527 packet sl;
441 528
442 start = atoi (params); 529 start = atoi (params);
443 for (cp = params; *cp != '\0'; cp++) 530 for (cp = params; *cp != '\0'; cp++)
444 if (*cp == ' ') 531 if (*cp == ' ')
445 break; 532 break;
446 533
447 stop = atoi (cp); 534 stop = atoi (cp);
448 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 535 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
449 { 536 {
450 sl.printf ("replyinfo image_sums %d %d", start, stop); 537 sl.printf ("replyinfo image_sums %d %d", start, stop);
451 ns->send_packet (sl); 538 ns->send_packet (sl);
452 sl.reset (); 539 sl.reset ();
453 return; 540 return;
454 } 541 }
455 542
456 sl.printf ("replyinfo image_sums %d %d ", start, stop); 543 sl.printf ("replyinfo image_sums %d %d ", start, stop);
457 544
458 for (int i = start; i <= stop; i++) 545 for (int i = start; i <= stop && i < faces.size (); i++)
459 { 546 {
460 ns->faces_sent[i] |= NS_FACESENT_FACE; 547 ns->faces_sent[i] = true;
461 548
462 int qq = get_face_fallback (ns->faceset, i); 549 const facedata *d = face_data (i, ns->faceset);
550
551 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
552 break;
463 553
464 sl << uint16 (i) 554 sl << uint16 (i)
465 << uint32 (facesets[qq].faces[i].checksum) 555 << uint32 (0) // checksum
466 << uint8 (qq) 556 << uint8 (ns->faceset);
467 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1); 557
558 print_facename (sl, *d); sl << uint8 (0);
468 } 559 }
469 560
470 /* It would make more sense to catch this pre-emptively in the code above. 561 /* It would make more sense to catch this pre-emptively in the code above.
471 * however, if this really happens, we probably just want to cut down the 562 * however, if this really happens, we probably just want to cut down the
472 * size to less than 1000, since that is what we claim the protocol would 563 * size to less than 1000, since that is what we claim the protocol would
473 * support. 564 * support.
474 */ 565 */
566 //TODO: taken care of above, should simply abort or make sure the above code is correct
475 if (sl.length () >= MAXSOCKBUF) 567 if (sl.length () >= MAXSOCKBUF)
476 { 568 {
477 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); 569 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
478 abort (); 570 abort ();
479 } 571 }

Diff Legend

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