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.19 by root, Thu Feb 15 18:09:34 2007 UTC vs.
Revision 1.50 by root, Tue Jul 24 04:55:34 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** \file 24/** \file
26 * Image related communication 25 * Image related communication
27 * 26 *
… …
34 */ 33 */
35 34
36#include <global.h> 35#include <global.h>
37#include <sproto.h> 36#include <sproto.h>
38 37
39#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */ 38#include "crc.h"
40
41/** Information about one image */
42typedef struct FaceInfo
43{
44 uint8 *data; /**< image data */
45 uint16 datalen; /**< length of the xpm data */
46 uint32 checksum; /**< Checksum of face data */
47} FaceInfo;
48
49/** Information about one face set */
50typedef struct
51{
52 char *prefix; /**< */
53 char *fullname;
54
55 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
56 char *size;
57 char *extension;
58 char *comment;
59
60 FaceInfo *faces; /**< images in this faceset */
61} FaceSets;
62
63static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */
64
65/**
66 * Checks specified faceset is valid
67 * \param fsn faceset number
68 */
69int
70is_valid_faceset (int fsn)
71{
72 if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix)
73 return TRUE;
74 return FALSE;
75}
76
77/**
78 * Frees all faceset information
79 */
80void
81free_socket_images (void)
82{
83 int num, q;
84
85 for (num = 0; num < MAX_FACE_SETS; num++)
86 {
87 if (facesets[num].prefix)
88 {
89 for (q = 0; q < nrofpixmaps; q++)
90 if (facesets[num].faces[q].data)
91 free (facesets[num].faces[q].data);
92
93 free (facesets[num].prefix);
94 free (facesets[num].fullname);
95 free (facesets[num].size);
96 free (facesets[num].extension);
97 free (facesets[num].comment);
98 free (facesets[num].faces);
99 }
100 }
101}
102
103/**
104 * This returns the set we will actually use when sending
105 * a face. This is used because the image files may be sparse.
106 * This function is recursive. imageno is the face number we are
107 * trying to send
108 *
109 * If face is not found in specified faceset, tries with 'fallback' faceset.
110 *
111 * \param faceset faceset to check
112 * \param imageno image number
113 *
114 */
115static int
116get_face_fallback (int faceset, int imageno)
117{
118 /* faceset 0 is supposed to have every image, so just return. Doing
119 * so also prevents infinite loops in the case if it not having
120 * the face, but in that case, we are likely to crash when we try
121 * to access the data, but that is probably preferable to an infinite
122 * loop.
123 */
124 if (faceset == 0)
125 return 0;
126
127 if (!facesets[faceset].prefix)
128 {
129 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
130 return 0; /* use default set */
131 }
132
133 if (facesets[faceset].faces[imageno].data)
134 return faceset;
135
136 return get_face_fallback (facesets[faceset].fallback, imageno);
137}
138
139/**
140 * Checks fallback are correctly defined.
141 * This is a simple recursive function that makes sure the fallbacks
142 * are all proper (eg, the fall back to defined sets, and also
143 * eventually fall back to 0). At the top level, togo is set to MAX_FACE_SETS,
144 * if togo gets to zero, it means we have a loop.
145 * This is only run when we first load the facesets.
146 */
147static void
148check_faceset_fallback (int faceset, int togo)
149{
150 int fallback = facesets[faceset].fallback;
151
152 /* proper case - falls back to base set */
153 if (fallback == 0)
154 return;
155
156 if (!facesets[fallback].prefix)
157 {
158 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
159 abort ();
160 }
161
162 togo--;
163 if (togo == 0)
164 {
165 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
166 abort ();
167 }
168
169 check_faceset_fallback (fallback, togo);
170}
171 39
172#define MAX_IMAGE_SIZE 10000 40#define MAX_IMAGE_SIZE 10000
173
174/**
175 * Loads all the image types into memory.
176 *
177 * This way, we can easily send them to the client. We should really do something
178 * better than abort on any errors - on the other hand, these are all fatal
179 * to the server (can't work around them), but the abort just seems a bit
180 * messy (exit would probably be better.)
181 *
182 * Couple of notes: We assume that the faces are in a continous block.
183 * This works fine for now, but this could perhaps change in the future
184 *
185 * Function largely rewritten May 2000 to be more general purpose.
186 * The server itself does not care what the image data is - to the server,
187 * it is just data it needs to allocate. As such, the code is written
188 * to do such.
189 */
190void
191read_client_images (void)
192{
193 char filename[400];
194 char buf[HUGE_BUF];
195 char *cp, *cps[7];
196 FILE *infile;
197 int num, len, compressed, fileno, i, badline;
198
199 memset (facesets, 0, sizeof (facesets));
200 sprintf (filename, "%s/image_info", settings.datadir);
201 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
202 {
203 LOG (llevError, "Unable to open %s\n", filename);
204 abort ();
205 }
206
207 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
208 {
209 badline = 0;
210
211 if (buf[0] == '#')
212 continue;
213
214 if (!(cps[0] = strtok (buf, ":")))
215 badline = 1;
216
217 for (i = 1; i < 7; i++)
218 if (!(cps[i] = strtok (NULL, ":")))
219 badline = 1;
220
221 if (badline)
222 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
223 else
224 {
225 len = atoi (cps[0]);
226 if (len >= MAX_FACE_SETS)
227 {
228 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
229 abort ();
230 }
231 facesets[len].prefix = strdup (cps[1]);
232 facesets[len].fullname = strdup (cps[2]);
233 facesets[len].fallback = atoi (cps[3]);
234 facesets[len].size = strdup (cps[4]);
235 facesets[len].extension = strdup (cps[5]);
236 facesets[len].comment = strdup (cps[6]);
237 }
238 }
239
240 close_and_delete (infile, compressed);
241
242 for (i = 0; i < MAX_FACE_SETS; i++)
243 {
244 if (facesets[i].prefix)
245 check_faceset_fallback (i, MAX_FACE_SETS);
246 }
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
258 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
259
260 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
261 LOG (llevDebug, "Loading image file %s\n", filename);
262
263 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
264 {
265 LOG (llevError, "Unable to open %s\n", filename);
266 abort ();
267 }
268
269 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
270 {
271 if (strncmp (buf, "IMAGE ", 6) != 0)
272 {
273 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
274 abort ();
275 }
276
277 num = atoi (buf + 6);
278 if (num < 0 || num >= nrofpixmaps)
279 {
280 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
281 abort ();
282 }
283
284 /* Skip accross the number data */
285 for (cp = buf + 6; *cp != ' '; cp++);
286 len = atoi (cp);
287 if (len == 0 || len > MAX_IMAGE_SIZE)
288 {
289 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
290 abort ();
291 }
292
293 /* We don't actualy care about the name of the image that
294 * is embedded in the image file, so just ignore it.
295 */
296 facesets[fileno].faces[num].datalen = len;
297 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
298 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
299 {
300 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
301 abort ();
302 }
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
313 close_and_delete (infile, compressed);
314 } /* For fileno < MAX_FACE_SETS */
315}
316 41
317/** 42/**
318 * Client tells us what type of faces it wants. Also sets 43 * Client tells us what type of faces it wants. Also sets
319 * the caching attribute. 44 * the caching attribute.
320 * 45 *
… …
332 if (mask) 57 if (mask)
333 ns->facecache = 1; 58 ns->facecache = 1;
334} 59}
335 60
336/** 61/**
337 * Client has requested pixmap that it somehow missed getting. 62 * client requested an image. send it rate-limited
338 * This will be called often if the client is 63 * before flushing.
339 * caching images.
340 */ 64 */
341void 65void
342SendFaceCmd (char *buf, int len, client *ns) 66AskFaceCmd (char *buf, int len, client *ns)
343{ 67{
344 uint16 facenum = atoi (buf); 68 int idx = 0, pri = 0;
345 69
346 if (facenum != 0) 70 sscanf (buf, "%d %d", &idx, &pri);
347 esrv_send_face (ns, facenum, 1); 71
72 const facedata *d = face_data (idx, ns->faceset);
73
74 if (!d)
75 return; // doh
76
77 client::ixsend ix;
78
79 ix.pri = pri;
80 ix.idx = idx;
81 ix.ofs = d->data.size ();
82
83 auto (pos, ns->ixface.end ());
84
85 if (ns->fxix < 2)
86 {
87 // gcfclient does not support prioritising, older cfplus versions
88 // do not support interleaved transfers.
89 if (!ns->ixface.empty ())
90 pos = ns->ixface.end () - 1;
91 }
92 else
93 {
94 // the by far most common case will be to insert
95 // near the end, so little looping.
96 while (pos != ns->ixface.begin ())
97 {
98 --pos;
99
100 // sort within 2k bins, to slightly prefer smaller images
101 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
102 {
103 ++pos;
104 break;
105 }
106 }
107 }
108
109 ns->ixface.insert (pos, ix);
110
111#if 0
112 for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
113 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs);
114 fprintf (stderr, "\n");
115#endif
116}
117
118/**
119 * Tells client the picture it has to use
120 * to smooth a picture number given as argument.
121 */
122void
123AskSmooth (char *buf, int len, client *ns)
124{
125 ns->send_face (atoi (buf), -100);
126 ns->flush_fx ();
127}
128
129// how lame
130static void print_facename (packet &sl, const facedata &d)
131{
132 for (int i = 0; i < CHKSUM_SIZE; ++i)
133 sl.printf ("%02x", d.chksum [i]);
134}
135
136// gcfclient uses the server-provided checksum for comparison, but always
137// writes a broken checksum to its cache file, so we have to provide
138// gcfclient with the same broken (and useless) checksum just to have it
139// cache the image despite its bugs.
140static uint32 gcfclient_checksum (const facedata *d)
141{
142 uint32 csum = 0;
143
144 for (std::string::const_iterator i = d->data.begin ();
145 i != d->data.end ();
146 ++i)
147 {
148 csum = rotate_right (csum);
149 csum += *(uint8 *)&*i;
150 }
151
152 return csum;
348} 153}
349 154
350/** 155/**
351 * Sends a face to a client if they are in pixmap mode 156 * Sends a face to a client if they are in pixmap mode
352 * nothing gets sent in bitmap mode. 157 * nothing gets sent in bitmap mode.
… …
354 * this is needed for the askface, in which we really do want to send the 159 * this is needed for the askface, in which we really do want to send the
355 * face (and askface is the only place that should be setting it). Otherwise, 160 * face (and askface is the only place that should be setting it). Otherwise,
356 * we look at the facecache, and if set, send the image name. 161 * we look at the facecache, and if set, send the image name.
357 */ 162 */
358void 163void
359esrv_send_face (client *ns, short face_num, int nocache) 164client::send_face (faceidx facenum, int pri)
360{ 165{
361 char fallback; 166 // never send face 0. ever. it does not exist.
167 if (!facenum)
168 return;
362 169
363 if (face_num <= 0 || face_num >= nrofpixmaps) 170 faceinfo *f = face_info (facenum);
171
172 if (!f)
364 { 173 {
365 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 174 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
366 return; 175 return;
367 } 176 }
368 177
178 // refuse to send non-image faces
179 if (!fx_want [f->type])
180 return;
181
182 if (faces_sent [facenum])
183 return;
184
185 faces_sent[facenum] = true;
186
187 // if for some reason we let a client without face caching connect,
188 // we better support that decision here and implement it.
189 if (!facecache)
190 return send_image (facenum);
191
192 if (fxix)
193 {
194 fxface.push_back (facenum);
195 return;
196 }
197
198 const facedata *d = f->data (faceset);
199
369 packet sl; 200 packet sl;
370 fallback = get_face_fallback (ns->faceset, face_num);
371 201
372 if (facesets[fallback].faces[face_num].data == NULL) 202 if (force_face0)
203 sl << "face " << uint16 (facenum);
204 else if (image2)
205 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
206 else
207 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
208
209 // how lame
210 print_facename (sl, *d);
211 send_packet (sl);
212
213 if (EMI_smooth)
214 {
215 if (f->smooth)
216 {
217 send_face (f->smooth);
218
219 packet sl ("smooth");
220
221 sl << uint16 (facenum)
222 << uint16 (f->smooth);
223
224 send_packet (sl);
225 }
373 { 226 }
374 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 227}
228
229void client::flush_fx ()
230{
231 while (!fxface.empty ())
232 {
233 packet fx ("fx");
234 packet sx ("sx");
235 int type = 0;
236
237 do
238 {
239 faceidx facenum = fxface.back (); fxface.pop_back ();
240
241 if (const faceinfo *f = face_info (facenum))
242 {
243 if (f->type != type)
244 {
245 type = f->type;
246
247 fx << ber32 (0)
248 << uint8 (1) << uint8 (type);
249 }
250
251 const facedata *d = f->data (faceset);
252
253 fx << ber32 (facenum)
254 << data8 (d->chksum, CHKSUM_SIZE);
255
256 if (smoothing)
257 {
258 faceinfo *f = face_info (facenum);
259
260 if (f->smooth)
261 {
262 send_face (f->smooth, -110);
263
264 sx << ber32 (facenum)
265 << ber32 (f->smooth)
266 << ber32 (f->smoothlevel);
267 }
268 }
269 }
270 }
271 while (!fxface.empty ()
272 && fx.room () > ber32::size + CHKSUM_SIZE + 1 + 3 /* type switch */
273 && sx.room () > ber32::size * 3);
274
275 send_packet (fx);
276 if (sx.length () > 3) send_packet (sx);
277 }
278}
279
280void
281client::send_image (faceidx facenum)
282{
283 // never send face 0. ever. it does not exist.
284 if (!facenum)
285 return;
286
287 const facedata *d = face_data (facenum, faceset);
288
289 faces_sent[facenum] = true;
290
291 if (!d)
292 {
293 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
375 return; 294 return;
376 } 295 }
296
297 //TODO: check type here?
377 298
378 if (ns->facecache && !nocache) 299 if (force_image_newmap)
379 { 300 force_newmap = true;
380 sl << (ns->image2 ? "face2 " : "face1 ")
381 << uint16 (face_num);
382 301
383 if (ns->image2) 302 packet sl;
384 sl << uint8 (fallback);
385 303
386 sl << uint32 (facesets[fallback].faces[face_num].checksum)
387 << new_faces[face_num].name;
388
389 ns->send_packet (sl);
390 }
391 else
392 {
393 sl << (ns->image2 ? "image2 " : "image ") 304 sl << (image2 ? "image2 " : "image ")
394 << uint32 (face_num); 305 << uint32 (facenum);
395 306
396 if (ns->image2) 307 if (image2)
397 sl << uint8 (fallback); 308 sl << uint8 (0);
398 309
399 sl << uint32 (facesets[fallback].faces[face_num].datalen) 310 sl << uint32 (d->data.size ())
400 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 311 << data (d->data.data (), d->data.size ());
401 312
402 ns->send_packet (sl); 313 send_packet (sl);
314}
315
316// send all faces of this object to the client
317// this uses more bandwidth initially, but makes
318// animations look much smoother, and every client
319// is supposed to do client-side caching anyways.
320void
321client::send_faces (object *ob)
322{
323 send_face (ob->face, 10);
324
325 if (ob->animation_id)
403 } 326 {
327 animation &anim = animations [ob->animation_id];
404 328
405 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 329 for (int i = 0; i < anim.num_animations; i++)
330 send_face (anim.faces [i], -10);
331 }
332}
333
334/**
335 * Need to send an animation sequence to the client.
336 * We will send appropriate face commands to the client if we haven't
337 * sent them the face yet (this can become quite costly in terms of
338 * how much we are sending - on the other hand, this should only happen
339 * when the player logs in and picks stuff up.
340 */
341void
342client::send_animation (short anim_num)
343{
344 /* Do some checking on the anim_num we got. Note that the animations
345 * are added in contigous order, so if the number is in the valid
346 * range, it must be a valid animation.
347 */
348 if (anim_num < 0 || anim_num >= animations.size ())
349 {
350 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
351 return;
352 }
353
354 packet sl ("anim");
355
356 sl << uint16 (anim_num)
357 << uint16 (0); /* flags - not used right now */
358
359 /* Build up the list of faces. Also, send any information (ie, the
360 * the face itself) down to the client.
361 */
362 for (int i = 0; i < animations[anim_num].num_animations; i++)
363 {
364 send_face (animations[anim_num].faces[i], -20);
365 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
366 }
367
368 send_packet (sl);
369
370 anims_sent[anim_num] = 1;
406} 371}
407 372
408/** 373/**
409 * Sends the number of images, checksum of the face file, 374 * Sends the number of images, checksum of the face file,
410 * and the image_info file information. See the doc/Developers/protocol 375 * and the image_info file information. See the doc/Developers/protocol
411 * if you want further detail. 376 * if you want further detail.
412 */ 377 */
413
414void 378void
415send_image_info (client *ns, char *params) 379send_image_info (client *ns, char *params)
416{ 380{
417 packet sl; 381 packet sl;
418 382
419 sl.printf ("replyinfo image_info\n%d\n%u\n", nrofpixmaps - 1, (unsigned int)bmaps_checksum); 383 //TODO: second parameter is a checksum, but it makes no sense in this current framework
384 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
420 385
421 for (int i = 0; i < MAX_FACE_SETS; i++) 386 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
422 if (facesets[i].prefix)
423 sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
424 facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
425 facesets[i].size , facesets[i].extension, facesets[i].comment);
426 387
427 ns->send_packet (sl); 388 ns->send_packet (sl);
428} 389}
429 390
430/** 391/**
… …
438 */ 399 */
439void 400void
440send_image_sums (client *ns, char *params) 401send_image_sums (client *ns, char *params)
441{ 402{
442 int start, stop; 403 int start, stop;
443 char *cp, buf[MAX_BUF]; 404 char *cp;
444 405
445 packet sl; 406 packet sl;
446 407
447 start = atoi (params); 408 start = atoi (params);
448 for (cp = params; *cp != '\0'; cp++) 409 for (cp = params; *cp != '\0'; cp++)
449 if (*cp == ' ') 410 if (*cp == ' ')
450 break; 411 break;
451 412
452 stop = atoi (cp); 413 stop = atoi (cp);
453 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 414 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
454 { 415 {
455 sl.printf ("replyinfo image_sums %d %d", start, stop); 416 sl.printf ("replyinfo image_sums %d %d", start, stop);
456 ns->send_packet (sl); 417 ns->send_packet (sl);
457 sl.reset (); 418 sl.reset ();
458 return; 419 return;
459 } 420 }
460 421
461 sl.printf ("replyinfo image_sums %d %d ", start, stop); 422 sl.printf ("replyinfo image_sums %d %d ", start, stop);
462 423
463 for (int i = start; i <= stop; i++) 424 for (int i = start; i <= stop && i < faces.size (); i++)
464 { 425 {
465 ns->faces_sent[i] |= NS_FACESENT_FACE; 426 ns->faces_sent[i] = true;
466 427
467 int qq = get_face_fallback (ns->faceset, i); 428 const facedata *d = face_data (i, ns->faceset);
429
430 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
431 break;
468 432
469 sl << uint16 (i) 433 sl << uint16 (i)
470 << uint32 (facesets[qq].faces[i].checksum) 434 << uint32 (0) // checksum
471 << uint8 (qq) 435 << uint8 (ns->faceset);
472 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1); 436
437 print_facename (sl, *d); sl << uint8 (0);
473 } 438 }
474 439
475 /* It would make more sense to catch this pre-emptively in the code above. 440 /* It would make more sense to catch this pre-emptively in the code above.
476 * however, if this really happens, we probably just want to cut down the 441 * however, if this really happens, we probably just want to cut down the
477 * size to less than 1000, since that is what we claim the protocol would 442 * size to less than 1000, since that is what we claim the protocol would
478 * support. 443 * support.
479 */ 444 */
445 //TODO: taken care of above, should simply abort or make sure the above code is correct
480 if (sl.length () >= MAXSOCKBUF) 446 if (sl.length () >= MAXSOCKBUF)
481 { 447 {
482 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); 448 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
483 abort (); 449 abort ();
484 } 450 }

Diff Legend

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