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.11 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.50 by root, Tue Jul 24 04:55:34 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 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>
22*/ 22 */
23 23
24/** \file 24/** \file
25 * Image related communication 25 * Image related communication
26 * 26 *
27 * \date 2003-12-02 27 * \date 2003-12-02
… …
33 */ 33 */
34 34
35#include <global.h> 35#include <global.h>
36#include <sproto.h> 36#include <sproto.h>
37 37
38#include <newclient.h> 38#include "crc.h"
39#include <newserver.h>
40#include <loader.h>
41
42#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */
43
44/** Information about one image */
45typedef struct FaceInfo
46{
47
48 uint8 *data; /**< image data */
49
50 uint16 datalen; /**< length of the xpm data */
51
52 uint32 checksum; /**< Checksum of face data */
53} FaceInfo;
54
55/** Information about one face set */
56typedef struct
57{
58
59 char *prefix; /**< */
60 char *fullname;
61
62 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
63 char *size;
64 char *extension;
65 char *comment;
66
67 FaceInfo *faces; /**< images in this faceset */
68} FaceSets;
69
70static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */
71
72/**
73 * Checks specified faceset is valid
74 * \param fsn faceset number
75 */
76int
77is_valid_faceset (int fsn)
78{
79 if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix)
80 return TRUE;
81 return FALSE;
82}
83
84/**
85 * Frees all faceset information
86 */
87void
88free_socket_images (void)
89{
90 int num, q;
91
92 for (num = 0; num < MAX_FACE_SETS; num++)
93 {
94 if (facesets[num].prefix)
95 {
96 for (q = 0; q < nrofpixmaps; q++)
97 if (facesets[num].faces[q].data)
98 free (facesets[num].faces[q].data);
99 free (facesets[num].prefix);
100 free (facesets[num].fullname);
101 free (facesets[num].size);
102 free (facesets[num].extension);
103 free (facesets[num].comment);
104 free (facesets[num].faces);
105 }
106 }
107}
108
109/**
110 * This returns the set we will actually use when sending
111 * a face. This is used because the image files may be sparse.
112 * This function is recursive. imageno is the face number we are
113 * trying to send
114 *
115 * If face is not found in specified faceset, tries with 'fallback' faceset.
116 *
117 * \param faceset faceset to check
118 * \param imageno image number
119 *
120 */
121static int
122get_face_fallback (int faceset, int imageno)
123{
124 /* faceset 0 is supposed to have every image, so just return. Doing
125 * so also prevents infinite loops in the case if it not having
126 * the face, but in that case, we are likely to crash when we try
127 * to access the data, but that is probably preferable to an infinite
128 * loop.
129 */
130 if (faceset == 0)
131 return 0;
132
133 if (!facesets[faceset].prefix)
134 {
135 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
136 return 0; /* use default set */
137 }
138 if (facesets[faceset].faces[imageno].data)
139 return faceset;
140 return get_face_fallback (facesets[faceset].fallback, imageno);
141}
142
143/**
144 * Checks fallback are correctly defined.
145 * This is a simple recursive function that makes sure the fallbacks
146 * are all proper (eg, the fall back to defined sets, and also
147 * eventually fall back to 0). At the top level, togo is set to MAX_FACE_SETS,
148 * if togo gets to zero, it means we have a loop.
149 * This is only run when we first load the facesets.
150 */
151static void
152check_faceset_fallback (int faceset, int togo)
153{
154 int fallback = facesets[faceset].fallback;
155
156 /* proper case - falls back to base set */
157 if (fallback == 0)
158 return;
159
160 if (!facesets[fallback].prefix)
161 {
162 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
163 abort ();
164 }
165 togo--;
166 if (togo == 0)
167 {
168 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
169 abort ();
170 }
171 check_faceset_fallback (fallback, togo);
172}
173 39
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 */
192
193void
194read_client_images (void)
195{
196 char filename[400];
197 char buf[HUGE_BUF];
198 char *cp, *cps[7];
199 FILE *infile;
200 int num, len, compressed, fileno, i, badline;
201
202 memset (facesets, 0, sizeof (facesets));
203 sprintf (filename, "%s/image_info", settings.datadir);
204 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
205 {
206 LOG (llevError, "Unable to open %s\n", filename);
207 abort ();
208 }
209 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
210 {
211 badline = 0;
212
213 if (buf[0] == '#')
214 continue;
215 if (!(cps[0] = strtok (buf, ":")))
216 badline = 1;
217 for (i = 1; i < 7; i++)
218 {
219 if (!(cps[i] = strtok (NULL, ":")))
220 badline = 1;
221 }
222 if (badline)
223 {
224 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
225 }
226 else
227 {
228 len = atoi (cps[0]);
229 if (len >= MAX_FACE_SETS)
230 {
231 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
232 abort ();
233 }
234 facesets[len].prefix = strdup_local (cps[1]);
235 facesets[len].fullname = strdup_local (cps[2]);
236 facesets[len].fallback = atoi (cps[3]);
237 facesets[len].size = strdup_local (cps[4]);
238 facesets[len].extension = strdup_local (cps[5]);
239 facesets[len].comment = strdup_local (cps[6]);
240 }
241 }
242 close_and_delete (infile, compressed);
243 for (i = 0; i < MAX_FACE_SETS; i++)
244 {
245 if (facesets[i].prefix)
246 check_faceset_fallback (i, MAX_FACE_SETS);
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 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
258
259 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
260 LOG (llevDebug, "Loading image file %s\n", filename);
261
262 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
263 {
264 LOG (llevError, "Unable to open %s\n", filename);
265 abort ();
266 }
267 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
268 {
269 if (strncmp (buf, "IMAGE ", 6) != 0)
270 {
271 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
272 abort ();
273 }
274 num = atoi (buf + 6);
275 if (num < 0 || num >= nrofpixmaps)
276 {
277 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
278 abort ();
279 }
280 /* Skip accross the number data */
281 for (cp = buf + 6; *cp != ' '; cp++);
282 len = atoi (cp);
283 if (len == 0 || len > MAX_IMAGE_SIZE)
284 {
285 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
286 abort ();
287 }
288 /* We don't actualy care about the name of the image that
289 * is embedded in the image file, so just ignore it.
290 */
291 facesets[fileno].faces[num].datalen = len;
292 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
293 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
294 {
295 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
296 abort ();
297 }
298 facesets[fileno].faces[num].checksum = 0;
299 for (i = 0; i < len; i++)
300 {
301 ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
302 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
303 facesets[fileno].faces[num].checksum &= 0xffffffff;
304 }
305 }
306 close_and_delete (infile, compressed);
307 } /* For fileno < MAX_FACE_SETS */
308}
309 41
310/** 42/**
311 * Client tells us what type of faces it wants. Also sets 43 * Client tells us what type of faces it wants. Also sets
312 * the caching attribute. 44 * the caching attribute.
313 * 45 *
314 */ 46 */
315
316void 47void
317SetFaceMode (char *buf, int len, client_socket *ns) 48SetFaceMode (char *buf, int len, client *ns)
318{ 49{
319 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE); 50 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
320 51
321 if (mode == CF_FACE_NONE) 52 if (mode == CF_FACE_NONE)
322 ns->facecache = 1; 53 ns->facecache = 1;
323 else if (mode != CF_FACE_PNG) 54 else if (mode != CF_FACE_PNG)
324 {
325 packet sl;
326 sl.printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png"); 55 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
327 ns->send_packet (sl);
328 }
329 56
330 if (mask) 57 if (mask)
331 ns->facecache = 1; 58 ns->facecache = 1;
332} 59}
333 60
334/** 61/**
335 * Client has requested pixmap that it somehow missed getting. 62 * client requested an image. send it rate-limited
336 * This will be called often if the client is 63 * before flushing.
337 * caching images.
338 */ 64 */
339
340void 65void
341SendFaceCmd (char *buff, int len, client_socket * ns) 66AskFaceCmd (char *buf, int len, client *ns)
342{ 67{
343 long tmpnum = atoi (buff); 68 int idx = 0, pri = 0;
344 short facenum = tmpnum & 0xffff;
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.
353 * If nocache is true (nonzero), ignore the cache setting from the client - 158 * If nocache is true (nonzero), ignore the cache setting from the client -
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 */
358
359void 163void
360esrv_send_face (client_socket *ns, short face_num, int nocache) 164client::send_face (faceidx facenum, int pri)
361{ 165{
362 char fallback; 166 // never send face 0. ever. it does not exist.
167 if (!facenum)
168 return;
363 169
364 if (face_num <= 0 || face_num >= nrofpixmaps) 170 faceinfo *f = face_info (facenum);
171
172 if (!f)
365 { 173 {
366 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 174 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
367 return; 175 return;
368 } 176 }
369 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
370 packet sl; 200 packet sl;
371 fallback = get_face_fallback (ns->faceset, face_num);
372 201
373 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 }
374 { 226 }
375 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);
376 return; 294 return;
377 } 295 }
296
297 //TODO: check type here?
378 298
379 if (ns->facecache && !nocache) 299 if (force_image_newmap)
380 { 300 force_newmap = true;
381 sl << (ns->image2 ? "face2 " : "face1 ")
382 << uint16 (face_num);
383 301
384 if (ns->image2) 302 packet sl;
385 sl << uint8 (fallback);
386 303
387 sl << uint32 (facesets[fallback].faces[face_num].checksum)
388 << new_faces[face_num].name;
389
390 ns->send_packet (sl);
391 }
392 else
393 {
394 sl << (ns->image2 ? "image2 " : "image ") 304 sl << (image2 ? "image2 " : "image ")
395 << uint32 (face_num); 305 << uint32 (facenum);
396 306
397 if (ns->image2) 307 if (image2)
398 sl << uint8 (fallback); 308 sl << uint8 (0);
399 309
400 sl << uint32 (facesets[fallback].faces[face_num].datalen) 310 sl << uint32 (d->data.size ())
401 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 311 << data (d->data.data (), d->data.size ());
402 312
403 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)
404 } 326 {
327 animation &anim = animations [ob->animation_id];
405 328
406 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;
407} 371}
408 372
409/** 373/**
410 * Sends the number of images, checksum of the face file, 374 * Sends the number of images, checksum of the face file,
411 * and the image_info file information. See the doc/Developers/protocol 375 * and the image_info file information. See the doc/Developers/protocol
412 * if you want further detail. 376 * if you want further detail.
413 */ 377 */
414
415void 378void
416send_image_info (client_socket * ns, char *params) 379send_image_info (client *ns, char *params)
417{ 380{
418 packet sl; 381 packet sl;
419 382
420 sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, 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);
421 385
422 for (int i = 0; i < MAX_FACE_SETS; i++) 386 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
423 if (facesets[i].prefix)
424 sl.printf ("%d:%s:%s:%d:%s:%s:%s",
425 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
426 facesets[i].size, facesets[i].extension, facesets[i].comment);
427 387
428 ns->send_packet (sl); 388 ns->send_packet (sl);
429} 389}
430 390
431/** 391/**
… …
436 * For each image in [start..stop] sends 396 * For each image in [start..stop] sends
437 * - checksum 397 * - checksum
438 * - name 398 * - name
439 */ 399 */
440void 400void
441send_image_sums (client_socket * ns, char *params) 401send_image_sums (client *ns, char *params)
442{ 402{
443 int start, stop; 403 int start, stop;
444 char *cp, buf[MAX_BUF]; 404 char *cp;
445 405
446 packet sl; 406 packet sl;
447 407
448 start = atoi (params); 408 start = atoi (params);
449 for (cp = params; *cp != '\0'; cp++) 409 for (cp = params; *cp != '\0'; cp++)
450 if (*cp == ' ') 410 if (*cp == ' ')
451 break; 411 break;
452 412
453 stop = atoi (cp); 413 stop = atoi (cp);
454 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 414 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
455 { 415 {
456 sl.printf ("replyinfo image_sums %d %d", start, stop); 416 sl.printf ("replyinfo image_sums %d %d", start, stop);
457 ns->send_packet (sl); 417 ns->send_packet (sl);
458 sl.reset (); 418 sl.reset ();
459 return; 419 return;
460 } 420 }
461 421
462 sl.printf ("replyinfo image_sums %d %d ", start, stop); 422 sl.printf ("replyinfo image_sums %d %d ", start, stop);
463 423
464 for (int i = start; i <= stop; i++) 424 for (int i = start; i <= stop && i < faces.size (); i++)
465 { 425 {
466 ns->faces_sent[i] |= NS_FACESENT_FACE; 426 ns->faces_sent[i] = true;
467 427
468 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;
469 432
470 sl << uint16 (i) 433 sl << uint16 (i)
471 << uint32 (facesets[qq].faces[i].checksum) 434 << uint32 (0) // checksum
472 << uint8 (qq) 435 << uint8 (ns->faceset);
473 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1); 436
437 print_facename (sl, *d); sl << uint8 (0);
474 } 438 }
475 439
476 /* 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.
477 * 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
478 * 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
479 * support. 443 * support.
480 */ 444 */
445 //TODO: taken care of above, should simply abort or make sure the above code is correct
481 if (sl.length () >= MAXSOCKBUF) 446 if (sl.length () >= MAXSOCKBUF)
482 { 447 {
483 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);
484 abort (); 449 abort ();
485 } 450 }

Diff Legend

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