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.5 by root, Sun Oct 8 16:51:51 2006 UTC vs.
Revision 1.41 by root, Thu Apr 12 14:18:06 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** \file 25/** \file
25 * Image related communication 26 * Image related communication
26 * 27 *
27 * \date 2003-12-02 28 * \date 2003-12-02
… …
33 */ 34 */
34 35
35#include <global.h> 36#include <global.h>
36#include <sproto.h> 37#include <sproto.h>
37 38
38#include <newclient.h> 39#include "crc.h"
39#include <newserver.h>
40#include <loader.h>
41 40
42#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 */
43 42
44/** Information about one image */ 43/** Information about one image */
45typedef struct FaceInfo 44typedef struct FaceInfo
46{ 45{
47
48 uint8 *data; /**< image data */ 46 uint8 *data; /**< image data */
49
50 uint16 datalen; /**< length of the xpm data */ 47 uint16 datalen; /**< length of the xpm data */
51
52 uint32 checksum; /**< Checksum of face data */ 48 uint32 checksum; /**< Checksum of face data */
53} FaceInfo; 49} FaceInfo;
54 50
55/** Information about one face set */ 51/** Information about one face set */
56typedef struct 52typedef struct
57{ 53{
58
59 char *prefix; /**< */ 54 char *prefix; /**< */
60 char *fullname; 55 char *fullname;
61 56
62 uint8 fallback; /**< faceset to use when an image is not found in this faceset */ 57 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
63 char *size; 58 char *size;
… …
91 86
92 for (num = 0; num < MAX_FACE_SETS; num++) 87 for (num = 0; num < MAX_FACE_SETS; num++)
93 { 88 {
94 if (facesets[num].prefix) 89 if (facesets[num].prefix)
95 { 90 {
96 for (q = 0; q < nrofpixmaps; q++) 91 for (q = 0; q < faces.size (); q++)
97 if (facesets[num].faces[q].data) 92 if (facesets[num].faces[q].data)
98 free (facesets[num].faces[q].data); 93 free (facesets[num].faces[q].data);
94
99 free (facesets[num].prefix); 95 free (facesets[num].prefix);
100 free (facesets[num].fullname); 96 free (facesets[num].fullname);
101 free (facesets[num].size); 97 free (facesets[num].size);
102 free (facesets[num].extension); 98 free (facesets[num].extension);
103 free (facesets[num].comment); 99 free (facesets[num].comment);
… …
133 if (!facesets[faceset].prefix) 129 if (!facesets[faceset].prefix)
134 { 130 {
135 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset); 131 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
136 return 0; /* use default set */ 132 return 0; /* use default set */
137 } 133 }
134
138 if (facesets[faceset].faces[imageno].data) 135 if (facesets[faceset].faces[imageno].data)
139 return faceset; 136 return faceset;
137
140 return get_face_fallback (facesets[faceset].fallback, imageno); 138 return get_face_fallback (facesets[faceset].fallback, imageno);
141} 139}
142 140
143/** 141/**
144 * Checks fallback are correctly defined. 142 * Checks fallback are correctly defined.
… …
160 if (!facesets[fallback].prefix) 158 if (!facesets[fallback].prefix)
161 { 159 {
162 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback); 160 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
163 abort (); 161 abort ();
164 } 162 }
163
165 togo--; 164 togo--;
166 if (togo == 0) 165 if (togo == 0)
167 { 166 {
168 LOG (llevError, "Infinite loop found in facesets. aborting.\n"); 167 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
169 abort (); 168 abort ();
170 } 169 }
170
171 check_faceset_fallback (fallback, togo); 171 check_faceset_fallback (fallback, togo);
172} 172}
173 173
174#define MAX_IMAGE_SIZE 10000 174#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_local (cps[1]);
235 facesets[len].fullname = strdup_local (cps[2]);
236 facesets[len].fallback = atoi (cps[3]);
237 facesets[len].size = strdup_local (cps[4]);
238 facesets[len].extension = strdup_local (cps[5]);
239 facesets[len].comment = strdup_local (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 175
310/** 176/**
311 * Client tells us what type of faces it wants. Also sets 177 * Client tells us what type of faces it wants. Also sets
312 * the caching attribute. 178 * the caching attribute.
313 * 179 *
314 */ 180 */
315
316void 181void
317SetFaceMode (char *buf, int len, NewSocket * ns) 182SetFaceMode (char *buf, int len, client *ns)
318{ 183{
319 char tmp[256];
320
321 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE); 184 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
322 185
323 if (mode == CF_FACE_NONE) 186 if (mode == CF_FACE_NONE)
324 {
325 ns->facecache = 1; 187 ns->facecache = 1;
326 }
327 else if (mode != CF_FACE_PNG) 188 else if (mode != CF_FACE_PNG)
328 {
329 sprintf (tmp, "drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png"); 189 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
330 Write_String_To_Socket (ns, tmp, strlen (tmp)); 190
331#ifdef ESRV_DEBUG
332 LOG (llevDebug, "SetFaceMode: Invalid mode from client: %d\n", mode);
333#endif
334 }
335 if (mask) 191 if (mask)
336 {
337 ns->facecache = 1; 192 ns->facecache = 1;
338 }
339} 193}
340 194
341/** 195/**
342 * Client has requested pixmap that it somehow missed getting. 196 * Client has requested pixmap that it somehow missed getting.
343 * This will be called often if the client is 197 * This will be called often if the client is
344 * caching images. 198 * caching images.
345 */ 199 */
346
347void 200void
348SendFaceCmd (char *buff, int len, NewSocket * ns) 201SendFaceCmd (char *buf, int len, client *ns)
349{ 202{
350 long tmpnum = atoi (buff); 203 ns->send_image (atoi (buf));
351 short facenum = tmpnum & 0xffff; 204}
352 205
353 if (facenum != 0) 206// how lame
354 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;
355} 230}
356 231
357/** 232/**
358 * 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
359 * nothing gets sent in bitmap mode. 234 * nothing gets sent in bitmap mode.
360 * If nocache is true (nonzero), ignore the cache setting from the client - 235 * If nocache is true (nonzero), ignore the cache setting from the client -
361 * 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
362 * 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,
363 * 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.
364 */ 239 */
365
366void 240void
367esrv_send_face (NewSocket * ns, short face_num, int nocache) 241client::send_face (faceidx facenum)
368{ 242{
369 SockList sl; 243 // never send face 0. ever. it does not exist.
370 char fallback; 244 if (!facenum)
245 return;
371 246
372 if (face_num <= 0 || face_num >= nrofpixmaps) 247 const facedata *d = face_data (facenum, faceset);
248
249 if (!d)
373 { 250 {
374 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 251 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
375 return; 252 return;
376 } 253 }
377 254
378 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 255 if (faces_sent[facenum])
379 fallback = get_face_fallback (ns->faceset, face_num); 256 return;
380 257
381 if (facesets[fallback].faces[face_num].data == NULL) 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)
382 { 266 {
383 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 267 fxface.push_back (facenum);
384 return; 268 return;
385 } 269 }
386 270
387 if (ns->facecache && !nocache) 271 packet sl;
388 {
389 if (ns->image2)
390 strcpy ((char *) sl.buf, "face2 ");
391 else if (ns->sc_version >= 1026)
392 strcpy ((char *) sl.buf, "face1 ");
393 else
394 strcpy ((char *) sl.buf, "face ");
395 272
396 sl.len = strlen ((const char *) sl.buf); 273 if (force_face0)
397 SockList_AddShort (&sl, face_num); 274 sl << "face " << uint16 (facenum);
398 if (ns->image2) 275 else if (image2)
399 SockList_AddChar (&sl, fallback); 276 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
400 if (ns->sc_version >= 1026)
401 SockList_AddInt (&sl, facesets[fallback].faces[face_num].checksum);
402 strcpy ((char *) sl.buf + sl.len, new_faces[face_num].name);
403 sl.len += strlen (new_faces[face_num].name);
404 Send_With_Handling (ns, &sl);
405 }
406 else 277 else
407 { 278 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
408 if (ns->image2) 279
409 strcpy ((char *) sl.buf, "image2 "); 280 // how lame
410 else 281 print_facename (sl, *d);
411 strcpy ((char *) sl.buf, "image "); 282 send_packet (sl);
412 sl.len = strlen ((char *) sl.buf); 283
413 SockList_AddInt (&sl, face_num); 284 if (EMI_smooth)
414 if (ns->image2)
415 SockList_AddChar (&sl, fallback);
416 SockList_AddInt (&sl, facesets[fallback].faces[face_num].datalen);
417 memcpy (sl.buf + sl.len, facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
418 sl.len += facesets[fallback].faces[face_num].datalen;
419 Send_With_Handling (ns, &sl);
420 } 285 {
421 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 286 faceinfo *f = face_info (facenum);
422 free (sl.buf); 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 }
299 }
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);
355 return;
356 }
357
358 faces_sent[facenum] = true;
359
360 if (force_image_newmap)
361 force_newmap = true;
362
363 packet sl;
364
365 sl << (image2 ? "image2 " : "image ")
366 << uint32 (facenum);
367
368 if (image2)
369 sl << uint8 (0);
370
371 sl << uint32 (d->data.size ())
372 << data (d->data.data (), d->data.size ());
373
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)
387 {
388 animation &anim = animations [ob->animation_id];
389
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;
423} 432}
424 433
425/** 434/**
426 * Sends the number of images, checksum of the face file, 435 * Sends the number of images, checksum of the face file,
427 * and the image_info file information. See the doc/Developers/protocol 436 * and the image_info file information. See the doc/Developers/protocol
428 * if you want further detail. 437 * if you want further detail.
429 */ 438 */
430
431void 439void
432send_image_info (NewSocket * ns, char *params) 440send_image_info (client *ns, char *params)
433{ 441{
434 SockList sl; 442 packet sl;
435 int i;
436 443
437 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 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);
438 446
439 sprintf ((char *) sl.buf, "replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 447 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
440 for (i = 0; i < MAX_FACE_SETS; i++) 448
441 { 449 ns->send_packet (sl);
442 if (facesets[i].prefix)
443 {
444 sprintf ((char *) sl.buf + strlen ((const char *) sl.buf), "%d:%s:%s:%d:%s:%s:%s",
445 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
446 facesets[i].size, facesets[i].extension, facesets[i].comment);
447 }
448 }
449 sl.len = strlen ((const char *) sl.buf);
450 Send_With_Handling (ns, &sl);
451 free (sl.buf);
452} 450}
453 451
454/** 452/**
455 * Sends requested face information. 453 * Sends requested face information.
456 * \param ns socket to send to 454 * \param ns socket to send to
… …
459 * For each image in [start..stop] sends 457 * For each image in [start..stop] sends
460 * - checksum 458 * - checksum
461 * - name 459 * - name
462 */ 460 */
463void 461void
464send_image_sums (NewSocket * ns, char *params) 462send_image_sums (client *ns, char *params)
465{ 463{
466 int start, stop; 464 int start, stop;
467 short i;
468 char qq; 465 char *cp;
469 char *cp, buf[MAX_BUF];
470 SockList sl;
471 466
472 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 467 packet sl;
473 468
474 start = atoi (params); 469 start = atoi (params);
475 for (cp = params; *cp != '\0'; cp++) 470 for (cp = params; *cp != '\0'; cp++)
476 if (*cp == ' ') 471 if (*cp == ' ')
477 break; 472 break;
478 473
479 stop = atoi (cp); 474 stop = atoi (cp);
480 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 475 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
481 { 476 {
482 sprintf (buf, "replyinfo image_sums %d %d", start, stop); 477 sl.printf ("replyinfo image_sums %d %d", start, stop);
483 cs_write_string (ns, buf, strlen (buf)); 478 ns->send_packet (sl);
479 sl.reset ();
484 return; 480 return;
485 } 481 }
482
486 sprintf ((char *) sl.buf, "replyinfo image_sums %d %d ", start, stop); 483 sl.printf ("replyinfo image_sums %d %d ", start, stop);
487 484
488 sl.len = strlen ((const char *) sl.buf); 485 for (int i = start; i <= stop && i < faces.size (); i++)
489
490 for (i = start; i <= stop; i++)
491 {
492 SockList_AddShort (&sl, i);
493 ns->faces_sent[i] |= NS_FACESENT_FACE;
494
495 qq = get_face_fallback (ns->faceset, i);
496 SockList_AddInt (&sl, facesets[qq].faces[i].checksum);
497 SockList_AddChar (&sl, qq);
498
499 qq = strlen (new_faces[i].name);
500 SockList_AddChar (&sl, (char) (qq + 1));
501 strcpy ((char *) sl.buf + sl.len, new_faces[i].name);
502 sl.len += qq;
503 SockList_AddChar (&sl, 0);
504 } 486 {
487 ns->faces_sent[i] = true;
488
489 const facedata *d = face_data (i, ns->faceset);
490
491 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
492 break;
493
494 sl << uint16 (i)
495 << uint32 (0) // checksum
496 << uint8 (ns->faceset);
497
498 print_facename (sl, *d); sl << uint8 (0);
499 }
500
505 /* 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.
506 * 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
507 * 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
508 * support. 504 * support.
509 */ 505 */
506 //TODO: taken care of above, should simply abort or make sure the above code is correct
510 if (sl.len >= MAXSOCKBUF) 507 if (sl.length () >= MAXSOCKBUF)
511 { 508 {
512 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 509 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
513 abort (); 510 abort ();
514 } 511 }
515 Send_With_Handling (ns, &sl); 512
516 free (sl.buf); 513 ns->send_packet (sl);
517} 514}
515

Diff Legend

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