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

Diff Legend

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