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.33 by root, Wed Mar 14 16:23:26 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;
… …
97 86
98 for (num = 0; num < MAX_FACE_SETS; num++) 87 for (num = 0; num < MAX_FACE_SETS; num++)
99 { 88 {
100 if (facesets[num].prefix) 89 if (facesets[num].prefix)
101 { 90 {
102 for (q = 0; q < nrofpixmaps; q++) 91 for (q = 0; q < faces.size (); 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
182/**
183 * Loads all the image types into memory.
184 *
185 * This way, we can easily send them to the client. We should really do something
186 * better than abort on any errors - on the other hand, these are all fatal
187 * to the server (can't work around them), but the abort just seems a bit
188 * messy (exit would probably be better.)
189 *
190 * Couple of notes: We assume that the faces are in a continous block.
191 * This works fine for now, but this could perhaps change in the future
192 *
193 * 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,
195 * it is just data it needs to allocate. As such, the code is written
196 * to do such.
197 */
198
199void
200read_client_images (void)
201{
202 char filename[400];
203 char buf[HUGE_BUF];
204 char *cp, *cps[7];
205 FILE *infile;
206 int num, len, compressed, fileno, i, badline;
207
208 memset (facesets, 0, sizeof (facesets));
209 sprintf (filename, "%s/image_info", settings.datadir);
210 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
211 {
212 LOG (llevError, "Unable to open %s\n", filename);
213 abort ();
214 }
215 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
216 {
217 badline = 0;
218
219 if (buf[0] == '#')
220 continue;
221 if (!(cps[0] = strtok (buf, ":")))
222 badline = 1;
223 for (i = 1; i < 7; i++)
224 {
225 if (!(cps[i] = strtok (NULL, ":")))
226 badline = 1;
227 }
228 if (badline)
229 {
230 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
231 }
232 else
233 {
234 len = atoi (cps[0]);
235 if (len >= MAX_FACE_SETS)
236 {
237 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
238 abort ();
239 }
240 facesets[len].prefix = strdup_local (cps[1]);
241 facesets[len].fullname = strdup_local (cps[2]);
242 facesets[len].fallback = atoi (cps[3]);
243 facesets[len].size = strdup_local (cps[4]);
244 facesets[len].extension = strdup_local (cps[5]);
245 facesets[len].comment = strdup_local (cps[6]);
246 }
247 }
248 close_and_delete (infile, compressed);
249 for (i = 0; i < MAX_FACE_SETS; i++)
250 {
251 if (facesets[i].prefix)
252 check_faceset_fallback (i, MAX_FACE_SETS);
253 }
254 /* Loaded the faceset information - now need to load up the
255 * actual faces.
256 */
257
258 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
259 {
260 /* if prefix is not set, this is not used */
261 if (!facesets[fileno].prefix)
262 continue;
263 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
264
265 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
266 LOG (llevDebug, "Loading image file %s\n", filename);
267
268 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
269 {
270 LOG (llevError, "Unable to open %s\n", filename);
271 abort ();
272 }
273 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
274 {
275 if (strncmp (buf, "IMAGE ", 6) != 0)
276 {
277 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
278 abort ();
279 }
280 num = atoi (buf + 6);
281 if (num < 0 || num >= nrofpixmaps)
282 {
283 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
284 abort ();
285 }
286 /* Skip accross the number data */
287 for (cp = buf + 6; *cp != ' '; cp++);
288 len = atoi (cp);
289 if (len == 0 || len > MAX_IMAGE_SIZE)
290 {
291 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
292 abort ();
293 }
294 /* We don't actualy care about the name if the image that
295 * is embedded in the image file, so just ignore it.
296 */
297 facesets[fileno].faces[num].datalen = len;
298 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
299 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
300 {
301 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
302 abort ();
303 }
304 facesets[fileno].faces[num].checksum = 0;
305 for (i = 0; i < len; i++)
306 {
307 ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
308 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
309 facesets[fileno].faces[num].checksum &= 0xffffffff;
310 }
311 }
312 close_and_delete (infile, compressed);
313 } /* For fileno < MAX_FACE_SETS */
314}
315 175
316/** 176/**
317 * Client tells us what type of faces it wants. Also sets 177 * Client tells us what type of faces it wants. Also sets
318 * the caching attribute. 178 * the caching attribute.
319 * 179 *
320 */ 180 */
321
322void 181void
323SetFaceMode (char *buf, int len, NewSocket * ns) 182SetFaceMode (char *buf, int len, client *ns)
324{ 183{
325 char tmp[256];
326
327 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);
328 185
329 if (mode == CF_FACE_NONE) 186 if (mode == CF_FACE_NONE)
330 {
331 ns->facecache = 1; 187 ns->facecache = 1;
332 }
333 else if (mode != CF_FACE_PNG) 188 else if (mode != CF_FACE_PNG)
334 {
335 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");
336 Write_String_To_Socket (ns, tmp, strlen (tmp)); 190
337#ifdef ESRV_DEBUG
338 LOG (llevDebug, "SetFaceMode: Invalid mode from client: %d\n", mode);
339#endif
340 }
341 if (mask) 191 if (mask)
342 {
343 ns->facecache = 1; 192 ns->facecache = 1;
344 }
345} 193}
346 194
347/** 195/**
348 * Client has requested pixmap that it somehow missed getting. 196 * Client has requested pixmap that it somehow missed getting.
349 * This will be called often if the client is 197 * This will be called often if the client is
350 * caching images. 198 * caching images.
351 */ 199 */
352
353void 200void
354SendFaceCmd (char *buff, int len, NewSocket * ns) 201SendFaceCmd (char *buf, int len, client *ns)
355{ 202{
356 long tmpnum = atoi (buff); 203 ns->send_image (atoi (buf));
357 short facenum = tmpnum & 0xffff; 204}
358 205
359 if (facenum != 0) 206// how lame
360 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;
361} 230}
362 231
363/** 232/**
364 * 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
365 * nothing gets sent in bitmap mode. 234 * nothing gets sent in bitmap mode.
366 * 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 -
367 * 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
368 * 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,
369 * 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.
370 */ 239 */
371
372void 240void
373esrv_send_face (NewSocket * ns, short face_num, int nocache) 241client::send_face (faceidx facenum)
374{ 242{
375 SockList sl; 243 // never send face 0. ever. it does not exist.
376 char fallback; 244 if (!facenum)
245 return;
377 246
378 if (face_num <= 0 || face_num >= nrofpixmaps) 247 const facedata *d = face_data (facenum, faceset);
248
249 if (!d)
379 { 250 {
380 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 251 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
381 return; 252 return;
382 } 253 }
383 254
384 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 255 if (faces_sent[facenum])
385 fallback = get_face_fallback (ns->faceset, face_num); 256 return;
386 257
387 if (facesets[fallback].faces[face_num].data == NULL) 258 faces_sent[facenum] = true;
259
260 if (!facecache)
261 {
262 send_drawinfo (
263 "*** Please enable image/face caching in preferences or use a client that supports it.\n",
264 NDI_RED
265 );
266 return send_image (facenum);
388 { 267 }
389 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 268
269 packet sl;
270
271 if (force_face0)
272 sl << "face " << uint16 (facenum);
273 else if (image2)
274 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
275 else
276 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
277
278 // how lame
279 print_facename (sl, *d);
280 send_packet (sl);
281
282 faceinfo *f = face_info (facenum);
283 if (f->smooth && EMI_smooth)
284 {
285 send_face (f->smooth);
286
287 packet sl ("smooth");
288
289 sl << uint16 (facenum)
290 << uint16 (f->smooth);
291
292 send_packet (sl);
293 }
294}
295
296void
297client::send_image (faceidx facenum)
298{
299 // never send face 0. ever. it does not exist.
300 if (!facenum)
301 return;
302
303 const facedata *d = face_data (facenum, faceset);
304
305 if (!d)
306 {
307 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
390 return; 308 return;
391 } 309 }
392 310
393 if (ns->facecache && !nocache) 311 packet sl;
394 { 312
313 sl << (image2 ? "image2 " : "image ")
314 << uint32 (facenum);
315
395 if (ns->image2) 316 if (image2)
396 strcpy ((char *) sl.buf, "face2 "); 317 sl << uint8 (0);
397 else if (ns->sc_version >= 1026)
398 strcpy ((char *) sl.buf, "face1 ");
399 else
400 strcpy ((char *) sl.buf, "face ");
401 318
402 sl.len = strlen ((const char *) sl.buf); 319 sl << uint32 (d->data.size ())
403 SockList_AddShort (&sl, face_num); 320 << data (d->data.data (), d->data.size ());
404 if (ns->image2) 321
405 SockList_AddChar (&sl, fallback); 322 send_packet (sl);
406 if (ns->sc_version >= 1026) 323}
407 SockList_AddInt (&sl, facesets[fallback].faces[face_num].checksum); 324
408 strcpy ((char *) sl.buf + sl.len, new_faces[face_num].name); 325// send all faces of this object to the client
409 sl.len += strlen (new_faces[face_num].name); 326// this uses more bandwidth initially, but makes
410 Send_With_Handling (ns, &sl); 327// animations look much smoother, and every client
328// is supposed to do client-side caching anyways.
329void
330client::send_faces (object *ob)
331{
332 send_face (ob->face);
333
334 if (ob->animation_id)
411 } 335 {
412 else 336 animation &anim = animations [ob->animation_id];
337
338 for (int i = 0; i < anim.num_animations; i++)
339 send_face (anim.faces [i]);
413 { 340 }
414 if (ns->image2) 341}
415 strcpy ((char *) sl.buf, "image2 "); 342
416 else 343/**
417 strcpy ((char *) sl.buf, "image "); 344 * Need to send an animation sequence to the client.
418 sl.len = strlen ((char *) sl.buf); 345 * We will send appropriate face commands to the client if we haven't
419 SockList_AddInt (&sl, face_num); 346 * sent them the face yet (this can become quite costly in terms of
420 if (ns->image2) 347 * how much we are sending - on the other hand, this should only happen
421 SockList_AddChar (&sl, fallback); 348 * when the player logs in and picks stuff up.
422 SockList_AddInt (&sl, facesets[fallback].faces[face_num].datalen); 349 */
423 memcpy (sl.buf + sl.len, facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 350void
424 sl.len += facesets[fallback].faces[face_num].datalen; 351client::send_animation (short anim_num)
425 Send_With_Handling (ns, &sl); 352{
353 /* Do some checking on the anim_num we got. Note that the animations
354 * are added in contigous order, so if the number is in the valid
355 * range, it must be a valid animation.
356 */
357 if (anim_num < 0 || anim_num > num_animations)
426 } 358 {
427 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 359 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
428 free (sl.buf); 360 return;
361 }
362
363 packet sl ("anim");
364
365 sl << uint16 (anim_num)
366 << uint16 (0); /* flags - not used right now */
367
368 /* Build up the list of faces. Also, send any information (ie, the
369 * the face itself) down to the client.
370 */
371 for (int i = 0; i < animations[anim_num].num_animations; i++)
372 {
373 send_face (animations[anim_num].faces[i]);
374 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
375 }
376
377 send_packet (sl);
378
379 anims_sent[anim_num] = 1;
429} 380}
430 381
431/** 382/**
432 * Sends the number of images, checksum of the face file, 383 * Sends the number of images, checksum of the face file,
433 * and the image_info file information. See the doc/Developers/protocol 384 * and the image_info file information. See the doc/Developers/protocol
434 * if you want further detail. 385 * if you want further detail.
435 */ 386 */
436
437void 387void
438send_image_info (NewSocket * ns, char *params) 388send_image_info (client *ns, char *params)
439{ 389{
440 SockList sl; 390 packet sl;
441 int i;
442 391
443 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 392 //TODO: second parameter is a checksum, but it makes no sense in this current framework
393 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
444 394
445 sprintf ((char *) sl.buf, "replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 395 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
446 for (i = 0; i < MAX_FACE_SETS; i++) 396
447 { 397 ns->send_packet (sl);
448 if (facesets[i].prefix)
449 {
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,
452 facesets[i].size, facesets[i].extension, facesets[i].comment);
453 }
454 }
455 sl.len = strlen ((const char *) sl.buf);
456 Send_With_Handling (ns, &sl);
457 free (sl.buf);
458} 398}
459 399
460/** 400/**
461 * Sends requested face information. 401 * Sends requested face information.
462 * \param ns socket to send to 402 * \param ns socket to send to
… …
465 * For each image in [start..stop] sends 405 * For each image in [start..stop] sends
466 * - checksum 406 * - checksum
467 * - name 407 * - name
468 */ 408 */
469void 409void
470send_image_sums (NewSocket * ns, char *params) 410send_image_sums (client *ns, char *params)
471{ 411{
472 int start, stop; 412 int start, stop;
473 short i;
474 char qq; 413 char *cp;
475 char *cp, buf[MAX_BUF];
476 SockList sl;
477 414
478 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 415 packet sl;
479 416
480 start = atoi (params); 417 start = atoi (params);
481 for (cp = params; *cp != '\0'; cp++) 418 for (cp = params; *cp != '\0'; cp++)
482 if (*cp == ' ') 419 if (*cp == ' ')
483 break; 420 break;
484 421
485 stop = atoi (cp); 422 stop = atoi (cp);
486 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 423 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
487 { 424 {
488 sprintf (buf, "replyinfo image_sums %d %d", start, stop); 425 sl.printf ("replyinfo image_sums %d %d", start, stop);
489 cs_write_string (ns, buf, strlen (buf)); 426 ns->send_packet (sl);
427 sl.reset ();
490 return; 428 return;
491 } 429 }
430
492 sprintf ((char *) sl.buf, "replyinfo image_sums %d %d ", start, stop); 431 sl.printf ("replyinfo image_sums %d %d ", start, stop);
493 432
494 sl.len = strlen ((const char *) sl.buf); 433 for (int i = start; i <= stop && i < faces.size (); i++)
495
496 for (i = start; i <= stop; i++)
497 {
498 SockList_AddShort (&sl, i);
499 ns->faces_sent[i] |= NS_FACESENT_FACE;
500
501 qq = get_face_fallback (ns->faceset, i);
502 SockList_AddInt (&sl, facesets[qq].faces[i].checksum);
503 SockList_AddChar (&sl, qq);
504
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 } 434 {
435 ns->faces_sent[i] = true;
436
437 const facedata *d = face_data (i, ns->faceset);
438
439 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
440 break;
441
442 sl << uint16 (i)
443 << uint32 (0) // checksum
444 << uint8 (ns->faceset);
445
446 print_facename (sl, *d); sl << uint8 (0);
447 }
448
511 /* It would make more sense to catch this pre-emptively in the code above. 449 /* 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 450 * 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 451 * size to less than 1000, since that is what we claim the protocol would
514 * support. 452 * support.
515 */ 453 */
454 //TODO: taken care of above, should simply abort or make sure the above code is correct
516 if (sl.len >= MAXSOCKBUF) 455 if (sl.length () >= MAXSOCKBUF)
517 { 456 {
518 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 457 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
519 abort (); 458 abort ();
520 } 459 }
521 Send_With_Handling (ns, &sl); 460
522 free (sl.buf); 461 ns->send_packet (sl);
523} 462}
463

Diff Legend

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