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.3 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.23 by root, Sat Mar 10 19:48:17 2007 UTC

1
2/* 1/*
3 * static char *rcsid_init_c = 2 * CrossFire, A Multiplayer game
4 * "$Id: image.C,v 1.3 2006/09/10 13:43:33 root Exp $";
5 */ 3 *
6 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
12 7 *
13 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
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
16 (at your option) any later version. 11 * (at your option) any later version.
17 12 *
18 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,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 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
24 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 21 *
27 The author can be reached via e-mail to crossfire-devel@real-time.com 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
28*/ 23 */
29 24
30/** \file 25/** \file
31 * Image related communication 26 * Image related communication
32 * 27 *
33 * \date 2003-12-02 28 * \date 2003-12-02
… …
39 */ 34 */
40 35
41#include <global.h> 36#include <global.h>
42#include <sproto.h> 37#include <sproto.h>
43 38
44#include <newclient.h> 39#include "crc.h"
45#include <newserver.h>
46#include <loader.h>
47 40
48#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 */
49 42
50/** Information about one image */ 43/** Information about one image */
51typedef struct FaceInfo 44typedef struct FaceInfo
52{ 45{
53
54 uint8 *data; /**< image data */ 46 uint8 *data; /**< image data */
55
56 uint16 datalen; /**< length of the xpm data */ 47 uint16 datalen; /**< length of the xpm data */
57
58 uint32 checksum; /**< Checksum of face data */ 48 uint32 checksum; /**< Checksum of face data */
59} FaceInfo; 49} FaceInfo;
60 50
61/** Information about one face set */ 51/** Information about one face set */
62typedef struct 52typedef struct
63{ 53{
64
65 char *prefix; /**< */ 54 char *prefix; /**< */
66 char *fullname; 55 char *fullname;
67 56
68 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 */
69 char *size; 58 char *size;
… …
100 if (facesets[num].prefix) 89 if (facesets[num].prefix)
101 { 90 {
102 for (q = 0; q < nrofpixmaps; q++) 91 for (q = 0; q < nrofpixmaps; q++)
103 if (facesets[num].faces[q].data) 92 if (facesets[num].faces[q].data)
104 free (facesets[num].faces[q].data); 93 free (facesets[num].faces[q].data);
94
105 free (facesets[num].prefix); 95 free (facesets[num].prefix);
106 free (facesets[num].fullname); 96 free (facesets[num].fullname);
107 free (facesets[num].size); 97 free (facesets[num].size);
108 free (facesets[num].extension); 98 free (facesets[num].extension);
109 free (facesets[num].comment); 99 free (facesets[num].comment);
… …
139 if (!facesets[faceset].prefix) 129 if (!facesets[faceset].prefix)
140 { 130 {
141 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);
142 return 0; /* use default set */ 132 return 0; /* use default set */
143 } 133 }
134
144 if (facesets[faceset].faces[imageno].data) 135 if (facesets[faceset].faces[imageno].data)
145 return faceset; 136 return faceset;
137
146 return get_face_fallback (facesets[faceset].fallback, imageno); 138 return get_face_fallback (facesets[faceset].fallback, imageno);
147} 139}
148 140
149/** 141/**
150 * Checks fallback are correctly defined. 142 * Checks fallback are correctly defined.
… …
166 if (!facesets[fallback].prefix) 158 if (!facesets[fallback].prefix)
167 { 159 {
168 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);
169 abort (); 161 abort ();
170 } 162 }
163
171 togo--; 164 togo--;
172 if (togo == 0) 165 if (togo == 0)
173 { 166 {
174 LOG (llevError, "Infinite loop found in facesets. aborting.\n"); 167 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
175 abort (); 168 abort ();
176 } 169 }
170
177 check_faceset_fallback (fallback, togo); 171 check_faceset_fallback (fallback, togo);
178} 172}
179 173
180#define MAX_IMAGE_SIZE 10000 174#define MAX_IMAGE_SIZE 10000
181 175
… …
193 * Function largely rewritten May 2000 to be more general purpose. 187 * Function largely rewritten May 2000 to be more general purpose.
194 * The server itself does not care what the image data is - to the server, 188 * The server itself does not care what the image data is - to the server,
195 * it is just data it needs to allocate. As such, the code is written 189 * it is just data it needs to allocate. As such, the code is written
196 * to do such. 190 * to do such.
197 */ 191 */
198
199void 192void
200read_client_images (void) 193read_client_images (void)
201{ 194{
202 char filename[400]; 195 char filename[400];
203 char buf[HUGE_BUF]; 196 char buf[HUGE_BUF];
… …
210 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL) 203 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
211 { 204 {
212 LOG (llevError, "Unable to open %s\n", filename); 205 LOG (llevError, "Unable to open %s\n", filename);
213 abort (); 206 abort ();
214 } 207 }
208
215 while (fgets (buf, HUGE_BUF - 1, infile) != NULL) 209 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
216 { 210 {
217 badline = 0; 211 badline = 0;
218 212
219 if (buf[0] == '#') 213 if (buf[0] == '#')
220 continue; 214 continue;
215
221 if (!(cps[0] = strtok (buf, ":"))) 216 if (!(cps[0] = strtok (buf, ":")))
222 badline = 1; 217 badline = 1;
218
223 for (i = 1; i < 7; i++) 219 for (i = 1; i < 7; i++)
224 {
225 if (!(cps[i] = strtok (NULL, ":"))) 220 if (!(cps[i] = strtok (NULL, ":")))
226 badline = 1; 221 badline = 1;
227 } 222
228 if (badline) 223 if (badline)
229 {
230 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf); 224 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
231 }
232 else 225 else
233 { 226 {
234 len = atoi (cps[0]); 227 len = atoi (cps[0]);
235 if (len >= MAX_FACE_SETS) 228 if (len >= MAX_FACE_SETS)
236 { 229 {
237 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS); 230 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
238 abort (); 231 abort ();
239 } 232 }
240 facesets[len].prefix = strdup_local (cps[1]); 233 facesets[len].prefix = strdup (cps[1]);
241 facesets[len].fullname = strdup_local (cps[2]); 234 facesets[len].fullname = strdup (cps[2]);
242 facesets[len].fallback = atoi (cps[3]); 235 facesets[len].fallback = atoi (cps[3]);
243 facesets[len].size = strdup_local (cps[4]); 236 facesets[len].size = strdup (cps[4]);
244 facesets[len].extension = strdup_local (cps[5]); 237 facesets[len].extension = strdup (cps[5]);
245 facesets[len].comment = strdup_local (cps[6]); 238 facesets[len].comment = strdup (cps[6]);
246 } 239 }
247 } 240 }
241
248 close_and_delete (infile, compressed); 242 close_and_delete (infile, compressed);
243
249 for (i = 0; i < MAX_FACE_SETS; i++) 244 for (i = 0; i < MAX_FACE_SETS; i++)
250 { 245 {
251 if (facesets[i].prefix) 246 if (facesets[i].prefix)
252 check_faceset_fallback (i, MAX_FACE_SETS); 247 check_faceset_fallback (i, MAX_FACE_SETS);
253 } 248 }
249
254 /* Loaded the faceset information - now need to load up the 250 /* Loaded the faceset information - now need to load up the
255 * actual faces. 251 * actual faces.
256 */ 252 */
257 253
258 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++) 254 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
259 { 255 {
260 /* if prefix is not set, this is not used */ 256 /* if prefix is not set, this is not used */
261 if (!facesets[fileno].prefix) 257 if (!facesets[fileno].prefix)
262 continue; 258 continue;
259
263 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo)); 260 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
264 261
265 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno); 262 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
266 LOG (llevDebug, "Loading image file %s\n", filename); 263 LOG (llevDebug, "Loading image file %s\n", filename);
267 264
268 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL) 265 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
269 { 266 {
270 LOG (llevError, "Unable to open %s\n", filename); 267 LOG (llevError, "Unable to open %s\n", filename);
271 abort (); 268 abort ();
272 } 269 }
270
273 while (fgets (buf, HUGE_BUF - 1, infile) != NULL) 271 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
274 { 272 {
275 if (strncmp (buf, "IMAGE ", 6) != 0) 273 if (strncmp (buf, "IMAGE ", 6) != 0)
276 { 274 {
277 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf); 275 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
278 abort (); 276 abort ();
279 } 277 }
278
280 num = atoi (buf + 6); 279 num = atoi (buf + 6);
281 if (num < 0 || num >= nrofpixmaps) 280 if (num < 0 || num >= nrofpixmaps)
282 { 281 {
283 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf); 282 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
284 abort (); 283 abort ();
285 } 284 }
285
286 /* Skip accross the number data */ 286 /* Skip accross the number data */
287 for (cp = buf + 6; *cp != ' '; cp++); 287 for (cp = buf + 6; *cp != ' '; cp++)
288 ;
289
288 len = atoi (cp); 290 len = atoi (cp);
289 if (len == 0 || len > MAX_IMAGE_SIZE) 291 if (len == 0 || len > MAX_IMAGE_SIZE)
290 { 292 {
291 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf); 293 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
292 abort (); 294 abort ();
293 } 295 }
296
294 /* We don't actualy care about the name if the image that 297 /* We don't actualy care about the name of the image that
295 * is embedded in the image file, so just ignore it. 298 * is embedded in the image file, so just ignore it.
296 */ 299 */
297 facesets[fileno].faces[num].datalen = len; 300 facesets[fileno].faces[num].datalen = len;
298 facesets[fileno].faces[num].data = (uint8 *) malloc (len); 301 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
299 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1) 302 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
300 { 303 {
301 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf); 304 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
302 abort (); 305 abort ();
303 } 306 }
304 facesets[fileno].faces[num].checksum = 0; 307
308 crc32 chksum;
309
305 for (i = 0; i < len; i++) 310 for (i = 0; i < len; i++)
306 { 311 chksum (facesets[fileno].faces[num].data[i]);
307 ROTATE_RIGHT (facesets[fileno].faces[num].checksum); 312
308 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
309 facesets[fileno].faces[num].checksum &= 0xffffffff; 313 facesets[fileno].faces[num].checksum = chksum;
310 }
311 } 314 }
315
312 close_and_delete (infile, compressed); 316 close_and_delete (infile, compressed);
313 } /* For fileno < MAX_FACE_SETS */ 317 } /* For fileno < MAX_FACE_SETS */
314} 318}
315 319
316/** 320/**
317 * Client tells us what type of faces it wants. Also sets 321 * Client tells us what type of faces it wants. Also sets
318 * the caching attribute. 322 * the caching attribute.
319 * 323 *
320 */ 324 */
321
322void 325void
323SetFaceMode (char *buf, int len, NewSocket * ns) 326SetFaceMode (char *buf, int len, client *ns)
324{ 327{
325 char tmp[256];
326
327 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE); 328 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
328 329
329 if (mode == CF_FACE_NONE) 330 if (mode == CF_FACE_NONE)
330 {
331 ns->facecache = 1; 331 ns->facecache = 1;
332 }
333 else if (mode != CF_FACE_PNG) 332 else if (mode != CF_FACE_PNG)
334 {
335 sprintf (tmp, "drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png"); 333 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
336 Write_String_To_Socket (ns, tmp, strlen (tmp)); 334
337#ifdef ESRV_DEBUG
338 LOG (llevDebug, "SetFaceMode: Invalid mode from client: %d\n", mode);
339#endif
340 }
341 if (mask) 335 if (mask)
342 {
343 ns->facecache = 1; 336 ns->facecache = 1;
344 }
345} 337}
346 338
347/** 339/**
348 * Client has requested pixmap that it somehow missed getting. 340 * Client has requested pixmap that it somehow missed getting.
349 * This will be called often if the client is 341 * This will be called often if the client is
350 * caching images. 342 * caching images.
351 */ 343 */
352
353void 344void
354SendFaceCmd (char *buff, int len, NewSocket * ns) 345SendFaceCmd (char *buf, int len, client *ns)
355{ 346{
356 long tmpnum = atoi (buff); 347 uint16 facenum = atoi (buf);
357 short facenum = tmpnum & 0xffff;
358 348
359 if (facenum != 0) 349 if (facenum != 0)
360 esrv_send_face (ns, facenum, 1); 350 esrv_send_face (ns, facenum, 1);
361} 351}
362 352
… …
366 * If nocache is true (nonzero), ignore the cache setting from the client - 356 * If nocache is true (nonzero), ignore the cache setting from the client -
367 * this is needed for the askface, in which we really do want to send the 357 * this is needed for the askface, in which we really do want to send the
368 * face (and askface is the only place that should be setting it). Otherwise, 358 * face (and askface is the only place that should be setting it). Otherwise,
369 * we look at the facecache, and if set, send the image name. 359 * we look at the facecache, and if set, send the image name.
370 */ 360 */
371
372void 361void
373esrv_send_face (NewSocket * ns, short face_num, int nocache) 362esrv_send_face (client *ns, short face_num, int nocache)
374{ 363{
375 SockList sl;
376 char fallback; 364 char fallback;
377 365
378 if (face_num <= 0 || face_num >= nrofpixmaps) 366 if (face_num <= 0 || face_num >= nrofpixmaps)
379 { 367 {
380 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 368 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);
381 return; 369 return;
382 } 370 }
383 371
384 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 372 packet sl;
385 fallback = get_face_fallback (ns->faceset, face_num); 373 fallback = get_face_fallback (ns->faceset, face_num);
386 374
387 if (facesets[fallback].faces[face_num].data == NULL) 375 if (facesets[fallback].faces[face_num].data == NULL)
388 { 376 {
389 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 377 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);
390 return; 378 return;
391 } 379 }
392 380
393 if (ns->facecache && !nocache) 381 if (ns->facecache && !nocache)
394 { 382 {
383 sl << (ns->image2 ? "face2 " : "face1 ")
384 << uint16 (face_num);
385
395 if (ns->image2) 386 if (ns->image2)
396 strcpy ((char *) sl.buf, "face2 "); 387 sl << uint8 (fallback);
397 else if (ns->sc_version >= 1026) 388
398 strcpy ((char *) sl.buf, "face1 "); 389 sl << uint32 (facesets[fallback].faces[face_num].checksum)
390 << new_faces[face_num].name;
391
392 ns->send_packet (sl);
393 }
399 else 394 else
400 strcpy ((char *) sl.buf, "face "); 395 {
396 sl << (ns->image2 ? "image2 " : "image ")
397 << uint32 (face_num);
401 398
402 sl.len = strlen ((const char *) sl.buf);
403 SockList_AddShort (&sl, face_num);
404 if (ns->image2) 399 if (ns->image2)
405 SockList_AddChar (&sl, fallback); 400 sl << uint8 (fallback);
406 if (ns->sc_version >= 1026) 401
407 SockList_AddInt (&sl, facesets[fallback].faces[face_num].checksum);
408 strcpy ((char *) sl.buf + sl.len, new_faces[face_num].name);
409 sl.len += strlen (new_faces[face_num].name);
410 Send_With_Handling (ns, &sl);
411 }
412 else
413 {
414 if (ns->image2)
415 strcpy ((char *) sl.buf, "image2 ");
416 else
417 strcpy ((char *) sl.buf, "image ");
418 sl.len = strlen ((char *) sl.buf);
419 SockList_AddInt (&sl, face_num);
420 if (ns->image2)
421 SockList_AddChar (&sl, fallback);
422 SockList_AddInt (&sl, facesets[fallback].faces[face_num].datalen); 402 sl << uint32 (facesets[fallback].faces[face_num].datalen)
423 memcpy (sl.buf + sl.len, facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 403 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
424 sl.len += facesets[fallback].faces[face_num].datalen; 404
425 Send_With_Handling (ns, &sl); 405 ns->send_packet (sl);
426 } 406 }
407
427 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 408 ns->faces_sent[face_num] |= NS_FACESENT_FACE;
428 free (sl.buf);
429} 409}
430 410
431/** 411/**
432 * Sends the number of images, checksum of the face file, 412 * Sends the number of images, checksum of the face file,
433 * and the image_info file information. See the doc/Developers/protocol 413 * and the image_info file information. See the doc/Developers/protocol
434 * if you want further detail. 414 * if you want further detail.
435 */ 415 */
436 416
437void 417void
438send_image_info (NewSocket * ns, char *params) 418send_image_info (client *ns, char *params)
439{ 419{
440 SockList sl; 420 packet sl;
441 int i;
442 421
443 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
444
445 sprintf ((char *) sl.buf, "replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 422 sl.printf ("replyinfo image_info\n%d\n%u\n", nrofpixmaps - 1, (unsigned int)bmaps_checksum);
423
446 for (i = 0; i < MAX_FACE_SETS; i++) 424 for (int i = 0; i < MAX_FACE_SETS; i++)
447 {
448 if (facesets[i].prefix) 425 if (facesets[i].prefix)
449 { 426 sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
450 sprintf ((char *) sl.buf + strlen ((const char *) sl.buf), "%d:%s:%s:%d:%s:%s:%s",
451 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback, 427 facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
452 facesets[i].size, facesets[i].extension, facesets[i].comment); 428 facesets[i].size , facesets[i].extension, facesets[i].comment);
453 } 429
454 } 430 ns->send_packet (sl);
455 sl.len = strlen ((const char *) sl.buf);
456 Send_With_Handling (ns, &sl);
457 free (sl.buf);
458} 431}
459 432
460/** 433/**
461 * Sends requested face information. 434 * Sends requested face information.
462 * \param ns socket to send to 435 * \param ns socket to send to
… …
465 * For each image in [start..stop] sends 438 * For each image in [start..stop] sends
466 * - checksum 439 * - checksum
467 * - name 440 * - name
468 */ 441 */
469void 442void
470send_image_sums (NewSocket * ns, char *params) 443send_image_sums (client *ns, char *params)
471{ 444{
472 int start, stop; 445 int start, stop;
473 short i;
474 char qq; 446 char *cp;
475 char *cp, buf[MAX_BUF];
476 SockList sl;
477 447
478 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 448 packet sl;
479 449
480 start = atoi (params); 450 start = atoi (params);
481 for (cp = params; *cp != '\0'; cp++) 451 for (cp = params; *cp != '\0'; cp++)
482 if (*cp == ' ') 452 if (*cp == ' ')
483 break; 453 break;
484 454
485 stop = atoi (cp); 455 stop = atoi (cp);
486 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 456 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps)
487 { 457 {
488 sprintf (buf, "replyinfo image_sums %d %d", start, stop); 458 sl.printf ("replyinfo image_sums %d %d", start, stop);
489 cs_write_string (ns, buf, strlen (buf)); 459 ns->send_packet (sl);
460 sl.reset ();
490 return; 461 return;
491 } 462 }
463
492 sprintf ((char *) sl.buf, "replyinfo image_sums %d %d ", start, stop); 464 sl.printf ("replyinfo image_sums %d %d ", start, stop);
493 465
494 sl.len = strlen ((const char *) sl.buf);
495
496 for (i = start; i <= stop; i++) 466 for (int i = start; i <= stop; i++)
497 { 467 {
498 SockList_AddShort (&sl, i);
499 ns->faces_sent[i] |= NS_FACESENT_FACE; 468 ns->faces_sent[i] |= NS_FACESENT_FACE;
500 469
501 qq = get_face_fallback (ns->faceset, i); 470 int qq = get_face_fallback (ns->faceset, i);
471
472 if (sl.room () < 2 + 4 + 1 + new_faces[i].name.length () + 1)
473 break;
474
475 sl << uint16 (i)
502 SockList_AddInt (&sl, facesets[qq].faces[i].checksum); 476 << uint32 (facesets[qq].faces[i].checksum)
503 SockList_AddChar (&sl, qq); 477 << uint8 (qq)
504 478 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1);
505 qq = strlen (new_faces[i].name);
506 SockList_AddChar (&sl, (char) (qq + 1));
507 strcpy ((char *) sl.buf + sl.len, new_faces[i].name);
508 sl.len += qq;
509 SockList_AddChar (&sl, 0);
510 } 479 }
480
511 /* It would make more sense to catch this pre-emptively in the code above. 481 /* It would make more sense to catch this pre-emptively in the code above.
512 * however, if this really happens, we probably just want to cut down the 482 * however, if this really happens, we probably just want to cut down the
513 * size to less than 1000, since that is what we claim the protocol would 483 * size to less than 1000, since that is what we claim the protocol would
514 * support. 484 * support.
515 */ 485 */
486 //TODO: taken care of above, should simply abort or make sure the above code is correct
516 if (sl.len >= MAXSOCKBUF) 487 if (sl.length () >= MAXSOCKBUF)
517 { 488 {
518 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 489 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
519 abort (); 490 abort ();
520 } 491 }
521 Send_With_Handling (ns, &sl); 492
522 free (sl.buf); 493 ns->send_packet (sl);
523} 494}
495

Diff Legend

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