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.12 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.47 by root, Thu Jul 12 08:40:14 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 <newclient.h> 38#include "crc.h"
39#include <newserver.h>
40#include <loader.h>
41 39
42#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 */
43 41
44/** Information about one image */ 42/** Information about one image */
45typedef struct FaceInfo 43typedef struct FaceInfo
46{ 44{
47
48 uint8 *data; /**< image data */ 45 uint8 *data; /**< image data */
49
50 uint16 datalen; /**< length of the xpm data */ 46 uint16 datalen; /**< length of the xpm data */
51
52 uint32 checksum; /**< Checksum of face data */ 47 uint32 checksum; /**< Checksum of face data */
53} FaceInfo; 48} FaceInfo;
54 49
55/** Information about one face set */ 50/** Information about one face set */
56typedef struct 51typedef struct
57{ 52{
58
59 char *prefix; /**< */ 53 char *prefix; /**< */
60 char *fullname; 54 char *fullname;
61 55
62 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 */
63 char *size; 57 char *size;
… …
91 85
92 for (num = 0; num < MAX_FACE_SETS; num++) 86 for (num = 0; num < MAX_FACE_SETS; num++)
93 { 87 {
94 if (facesets[num].prefix) 88 if (facesets[num].prefix)
95 { 89 {
96 for (q = 0; q < nrofpixmaps; q++) 90 for (q = 0; q < faces.size (); q++)
97 if (facesets[num].faces[q].data) 91 if (facesets[num].faces[q].data)
98 free (facesets[num].faces[q].data); 92 free (facesets[num].faces[q].data);
93
99 free (facesets[num].prefix); 94 free (facesets[num].prefix);
100 free (facesets[num].fullname); 95 free (facesets[num].fullname);
101 free (facesets[num].size); 96 free (facesets[num].size);
102 free (facesets[num].extension); 97 free (facesets[num].extension);
103 free (facesets[num].comment); 98 free (facesets[num].comment);
… …
133 if (!facesets[faceset].prefix) 128 if (!facesets[faceset].prefix)
134 { 129 {
135 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);
136 return 0; /* use default set */ 131 return 0; /* use default set */
137 } 132 }
133
138 if (facesets[faceset].faces[imageno].data) 134 if (facesets[faceset].faces[imageno].data)
139 return faceset; 135 return faceset;
136
140 return get_face_fallback (facesets[faceset].fallback, imageno); 137 return get_face_fallback (facesets[faceset].fallback, imageno);
141} 138}
142 139
143/** 140/**
144 * Checks fallback are correctly defined. 141 * Checks fallback are correctly defined.
… …
160 if (!facesets[fallback].prefix) 157 if (!facesets[fallback].prefix)
161 { 158 {
162 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);
163 abort (); 160 abort ();
164 } 161 }
162
165 togo--; 163 togo--;
166 if (togo == 0) 164 if (togo == 0)
167 { 165 {
168 LOG (llevError, "Infinite loop found in facesets. aborting.\n"); 166 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
169 abort (); 167 abort ();
170 } 168 }
169
171 check_faceset_fallback (fallback, togo); 170 check_faceset_fallback (fallback, togo);
172} 171}
173 172
174#define MAX_IMAGE_SIZE 10000 173#define MAX_IMAGE_SIZE 10000
175
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 */
192
193void
194read_client_images (void)
195{
196 char filename[400];
197 char buf[HUGE_BUF];
198 char *cp, *cps[7];
199 FILE *infile;
200 int num, len, compressed, fileno, i, badline;
201
202 memset (facesets, 0, sizeof (facesets));
203 sprintf (filename, "%s/image_info", settings.datadir);
204 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
205 {
206 LOG (llevError, "Unable to open %s\n", filename);
207 abort ();
208 }
209 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
210 {
211 badline = 0;
212
213 if (buf[0] == '#')
214 continue;
215 if (!(cps[0] = strtok (buf, ":")))
216 badline = 1;
217 for (i = 1; i < 7; i++)
218 {
219 if (!(cps[i] = strtok (NULL, ":")))
220 badline = 1;
221 }
222 if (badline)
223 {
224 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
225 }
226 else
227 {
228 len = atoi (cps[0]);
229 if (len >= MAX_FACE_SETS)
230 {
231 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
232 abort ();
233 }
234 facesets[len].prefix = strdup (cps[1]);
235 facesets[len].fullname = strdup (cps[2]);
236 facesets[len].fallback = atoi (cps[3]);
237 facesets[len].size = strdup (cps[4]);
238 facesets[len].extension = strdup (cps[5]);
239 facesets[len].comment = strdup (cps[6]);
240 }
241 }
242 close_and_delete (infile, compressed);
243 for (i = 0; i < MAX_FACE_SETS; i++)
244 {
245 if (facesets[i].prefix)
246 check_faceset_fallback (i, MAX_FACE_SETS);
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 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
258
259 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
260 LOG (llevDebug, "Loading image file %s\n", filename);
261
262 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
263 {
264 LOG (llevError, "Unable to open %s\n", filename);
265 abort ();
266 }
267 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
268 {
269 if (strncmp (buf, "IMAGE ", 6) != 0)
270 {
271 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
272 abort ();
273 }
274 num = atoi (buf + 6);
275 if (num < 0 || num >= nrofpixmaps)
276 {
277 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
278 abort ();
279 }
280 /* Skip accross the number data */
281 for (cp = buf + 6; *cp != ' '; cp++);
282 len = atoi (cp);
283 if (len == 0 || len > MAX_IMAGE_SIZE)
284 {
285 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
286 abort ();
287 }
288 /* We don't actualy care about the name of the image that
289 * is embedded in the image file, so just ignore it.
290 */
291 facesets[fileno].faces[num].datalen = len;
292 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
293 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
294 {
295 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
296 abort ();
297 }
298 facesets[fileno].faces[num].checksum = 0;
299 for (i = 0; i < len; i++)
300 {
301 ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
302 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
303 facesets[fileno].faces[num].checksum &= 0xffffffff;
304 }
305 }
306 close_and_delete (infile, compressed);
307 } /* For fileno < MAX_FACE_SETS */
308}
309 174
310/** 175/**
311 * Client tells us what type of faces it wants. Also sets 176 * Client tells us what type of faces it wants. Also sets
312 * the caching attribute. 177 * the caching attribute.
313 * 178 *
314 */ 179 */
315
316void 180void
317SetFaceMode (char *buf, int len, client_socket *ns) 181SetFaceMode (char *buf, int len, client *ns)
318{ 182{
319 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);
320 184
321 if (mode == CF_FACE_NONE) 185 if (mode == CF_FACE_NONE)
322 ns->facecache = 1; 186 ns->facecache = 1;
323 else if (mode != CF_FACE_PNG) 187 else if (mode != CF_FACE_PNG)
324 {
325 packet sl;
326 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");
327 ns->send_packet (sl);
328 }
329 189
330 if (mask) 190 if (mask)
331 ns->facecache = 1; 191 ns->facecache = 1;
332} 192}
333 193
334/** 194/**
335 * Client has requested pixmap that it somehow missed getting. 195 * client requested an image. send it rate-limited
336 * This will be called often if the client is 196 * before flushing.
337 * caching images.
338 */ 197 */
339
340void 198void
341SendFaceCmd (char *buff, int len, client_socket * ns) 199AskFaceCmd (char *buf, int len, client *ns)
342{ 200{
343 long tmpnum = atoi (buff); 201 int idx = 0, pri = 0;
344 short facenum = tmpnum & 0xffff;
345 202
346 if (facenum != 0) 203 sscanf (buf, "%d %d", &idx, &pri);
347 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;
348} 286}
349 287
350/** 288/**
351 * 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
352 * nothing gets sent in bitmap mode. 290 * nothing gets sent in bitmap mode.
353 * 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 -
354 * 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
355 * 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,
356 * 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.
357 */ 295 */
358
359void 296void
360esrv_send_face (client_socket *ns, short face_num, int nocache) 297client::send_face (faceidx facenum)
361{ 298{
362 char fallback; 299 // never send face 0. ever. it does not exist.
300 if (!facenum)
301 return;
363 302
364 if (face_num <= 0 || face_num >= nrofpixmaps) 303 const facedata *d = face_data (facenum, faceset);
304
305 if (!d)
365 { 306 {
366 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 307 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
367 return; 308 return;
368 } 309 }
369 310
311 if (!must_send_face (facenum))
312 return;
313
314 // if for some reason we let a client without face caching connect,
315 // we better support that decision here and implement it.
316 if (!facecache)
317 return send_image (facenum);
318
319 if (fxix)
320 {
321 fxface.push_back (facenum);
322 return;
323 }
324
370 packet sl; 325 packet sl;
371 fallback = get_face_fallback (ns->faceset, face_num);
372 326
373 if (facesets[fallback].faces[face_num].data == NULL) 327 if (force_face0)
328 sl << "face " << uint16 (facenum);
329 else if (image2)
330 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
331 else
332 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
333
334 // how lame
335 print_facename (sl, *d);
336 send_packet (sl);
337
338 if (EMI_smooth)
339 {
340 faceinfo *f = face_info (facenum);
341
342 if (f->smooth)
343 {
344 send_face (f->smooth);
345
346 packet sl ("smooth");
347
348 sl << uint16 (facenum)
349 << uint16 (f->smooth);
350
351 send_packet (sl);
352 }
374 { 353 }
375 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 354}
355
356void client::flush_fx ()
357{
358 while (!fxface.empty ())
359 {
360 packet fx ("fx");
361 packet sx ("sx");
362
363 do
364 {
365 faceidx facenum = fxface.back (); fxface.pop_back ();
366
367 const facedata *d = face_data (facenum, faceset);
368
369 if (d)
370 {
371 fx << ber32 (facenum)
372 << data8 (d->chksum, CHKSUM_SIZE);
373
374 if (smoothing)
375 {
376 faceinfo *f = face_info (facenum);
377
378 if (f->smooth)
379 {
380 send_face (f->smooth);
381 sx << ber32 (facenum)
382 << ber32 (f->smooth)
383 << ber32 (f->smoothlevel);
384 }
385 }
386 }
387 }
388 while (!fxface.empty ()
389 && fx.room () > ber32::size + CHKSUM_SIZE + 1
390 && sx.room () > ber32::size * 3);
391
392 send_packet (fx);
393 if (sx.length () > 3) send_packet (sx);
394 }
395}
396
397void
398client::send_image (faceidx facenum)
399{
400 // never send face 0. ever. it does not exist.
401 if (!facenum)
402 return;
403
404 const facedata *d = face_data (facenum, faceset);
405
406 faces_sent[facenum] = true;
407
408 if (!d)
409 {
410 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
376 return; 411 return;
377 } 412 }
413
414 //TODO: check type here?
378 415
379 if (ns->facecache && !nocache) 416 if (force_image_newmap)
380 { 417 force_newmap = true;
381 sl << (ns->image2 ? "face2 " : "face1 ")
382 << uint16 (face_num);
383 418
384 if (ns->image2) 419 packet sl;
385 sl << uint8 (fallback);
386 420
387 sl << uint32 (facesets[fallback].faces[face_num].checksum)
388 << new_faces[face_num].name;
389
390 ns->send_packet (sl);
391 }
392 else
393 {
394 sl << (ns->image2 ? "image2 " : "image ") 421 sl << (image2 ? "image2 " : "image ")
395 << uint32 (face_num); 422 << uint32 (facenum);
396 423
397 if (ns->image2) 424 if (image2)
398 sl << uint8 (fallback); 425 sl << uint8 (0);
399 426
400 sl << uint32 (facesets[fallback].faces[face_num].datalen) 427 sl << uint32 (d->data.size ())
401 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 428 << data (d->data.data (), d->data.size ());
402 429
403 ns->send_packet (sl); 430 send_packet (sl);
431}
432
433// send all faces of this object to the client
434// this uses more bandwidth initially, but makes
435// animations look much smoother, and every client
436// is supposed to do client-side caching anyways.
437void
438client::send_faces (object *ob)
439{
440 send_face (ob->face);
441
442 if (ob->animation_id)
404 } 443 {
444 animation &anim = animations [ob->animation_id];
405 445
406 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 446 for (int i = 0; i < anim.num_animations; i++)
447 send_face (anim.faces [i]);
448 }
449}
450
451/**
452 * Need to send an animation sequence to the client.
453 * We will send appropriate face commands to the client if we haven't
454 * sent them the face yet (this can become quite costly in terms of
455 * how much we are sending - on the other hand, this should only happen
456 * when the player logs in and picks stuff up.
457 */
458void
459client::send_animation (short anim_num)
460{
461 /* Do some checking on the anim_num we got. Note that the animations
462 * are added in contigous order, so if the number is in the valid
463 * range, it must be a valid animation.
464 */
465 if (anim_num < 0 || anim_num >= animations.size ())
466 {
467 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
468 return;
469 }
470
471 packet sl ("anim");
472
473 sl << uint16 (anim_num)
474 << uint16 (0); /* flags - not used right now */
475
476 /* Build up the list of faces. Also, send any information (ie, the
477 * the face itself) down to the client.
478 */
479 for (int i = 0; i < animations[anim_num].num_animations; i++)
480 {
481 send_face (animations[anim_num].faces[i]);
482 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
483 }
484
485 send_packet (sl);
486
487 anims_sent[anim_num] = 1;
407} 488}
408 489
409/** 490/**
410 * Sends the number of images, checksum of the face file, 491 * Sends the number of images, checksum of the face file,
411 * and the image_info file information. See the doc/Developers/protocol 492 * and the image_info file information. See the doc/Developers/protocol
412 * if you want further detail. 493 * if you want further detail.
413 */ 494 */
414
415void 495void
416send_image_info (client_socket * ns, char *params) 496send_image_info (client *ns, char *params)
417{ 497{
418 packet sl; 498 packet sl;
419 499
420 sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 500 //TODO: second parameter is a checksum, but it makes no sense in this current framework
501 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
421 502
422 for (int i = 0; i < MAX_FACE_SETS; i++) 503 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",
425 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
426 facesets[i].size, facesets[i].extension, facesets[i].comment);
427 504
428 ns->send_packet (sl); 505 ns->send_packet (sl);
429} 506}
430 507
431/** 508/**
… …
436 * For each image in [start..stop] sends 513 * For each image in [start..stop] sends
437 * - checksum 514 * - checksum
438 * - name 515 * - name
439 */ 516 */
440void 517void
441send_image_sums (client_socket * ns, char *params) 518send_image_sums (client *ns, char *params)
442{ 519{
443 int start, stop; 520 int start, stop;
444 char *cp, buf[MAX_BUF]; 521 char *cp;
445 522
446 packet sl; 523 packet sl;
447 524
448 start = atoi (params); 525 start = atoi (params);
449 for (cp = params; *cp != '\0'; cp++) 526 for (cp = params; *cp != '\0'; cp++)
450 if (*cp == ' ') 527 if (*cp == ' ')
451 break; 528 break;
452 529
453 stop = atoi (cp); 530 stop = atoi (cp);
454 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 531 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
455 { 532 {
456 sl.printf ("replyinfo image_sums %d %d", start, stop); 533 sl.printf ("replyinfo image_sums %d %d", start, stop);
457 ns->send_packet (sl); 534 ns->send_packet (sl);
458 sl.reset (); 535 sl.reset ();
459 return; 536 return;
460 } 537 }
461 538
462 sl.printf ("replyinfo image_sums %d %d ", start, stop); 539 sl.printf ("replyinfo image_sums %d %d ", start, stop);
463 540
464 for (int i = start; i <= stop; i++) 541 for (int i = start; i <= stop && i < faces.size (); i++)
465 { 542 {
466 ns->faces_sent[i] |= NS_FACESENT_FACE; 543 ns->faces_sent[i] = true;
467 544
468 int qq = get_face_fallback (ns->faceset, i); 545 const facedata *d = face_data (i, ns->faceset);
546
547 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
548 break;
469 549
470 sl << uint16 (i) 550 sl << uint16 (i)
471 << uint32 (facesets[qq].faces[i].checksum) 551 << uint32 (0) // checksum
472 << uint8 (qq) 552 << uint8 (ns->faceset);
473 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1); 553
554 print_facename (sl, *d); sl << uint8 (0);
474 } 555 }
475 556
476 /* It would make more sense to catch this pre-emptively in the code above. 557 /* 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 558 * 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 559 * size to less than 1000, since that is what we claim the protocol would
479 * support. 560 * support.
480 */ 561 */
562 //TODO: taken care of above, should simply abort or make sure the above code is correct
481 if (sl.length () >= MAXSOCKBUF) 563 if (sl.length () >= MAXSOCKBUF)
482 { 564 {
483 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); 565 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
484 abort (); 566 abort ();
485 } 567 }

Diff Legend

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