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

Diff Legend

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