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.48 by root, Thu Jul 12 18:48:20 2007 UTC

1
2/* 1/*
3 * static char *rcsid_init_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4 * "$Id: image.C,v 1.3 2006/09/10 13:43:33 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
12 7 *
13 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
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 3 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, see <http://www.gnu.org/licenses/>.
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
26
27 The author can be reached via e-mail to crossfire-devel@real-time.com 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
28*/ 22 */
29 23
30/** \file 24/** \file
31 * Image related communication 25 * Image related communication
32 * 26 *
33 * \date 2003-12-02 27 * \date 2003-12-02
… …
39 */ 33 */
40 34
41#include <global.h> 35#include <global.h>
42#include <sproto.h> 36#include <sproto.h>
43 37
44#include <newclient.h> 38#include "crc.h"
45#include <newserver.h>
46#include <loader.h>
47 39
48#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */ 40#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */
49 41
50/** Information about one image */ 42/** Information about one image */
51typedef struct FaceInfo 43typedef struct FaceInfo
52{ 44{
53
54 uint8 *data; /**< image data */ 45 uint8 *data; /**< image data */
55
56 uint16 datalen; /**< length of the xpm data */ 46 uint16 datalen; /**< length of the xpm data */
57
58 uint32 checksum; /**< Checksum of face data */ 47 uint32 checksum; /**< Checksum of face data */
59} FaceInfo; 48} FaceInfo;
60 49
61/** Information about one face set */ 50/** Information about one face set */
62typedef struct 51typedef struct
63{ 52{
64
65 char *prefix; /**< */ 53 char *prefix; /**< */
66 char *fullname; 54 char *fullname;
67 55
68 uint8 fallback; /**< faceset to use when an image is not found in this faceset */ 56 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
69 char *size; 57 char *size;
… …
97 85
98 for (num = 0; num < MAX_FACE_SETS; num++) 86 for (num = 0; num < MAX_FACE_SETS; num++)
99 { 87 {
100 if (facesets[num].prefix) 88 if (facesets[num].prefix)
101 { 89 {
102 for (q = 0; q < nrofpixmaps; q++) 90 for (q = 0; q < faces.size (); q++)
103 if (facesets[num].faces[q].data) 91 if (facesets[num].faces[q].data)
104 free (facesets[num].faces[q].data); 92 free (facesets[num].faces[q].data);
93
105 free (facesets[num].prefix); 94 free (facesets[num].prefix);
106 free (facesets[num].fullname); 95 free (facesets[num].fullname);
107 free (facesets[num].size); 96 free (facesets[num].size);
108 free (facesets[num].extension); 97 free (facesets[num].extension);
109 free (facesets[num].comment); 98 free (facesets[num].comment);
… …
139 if (!facesets[faceset].prefix) 128 if (!facesets[faceset].prefix)
140 { 129 {
141 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset); 130 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
142 return 0; /* use default set */ 131 return 0; /* use default set */
143 } 132 }
133
144 if (facesets[faceset].faces[imageno].data) 134 if (facesets[faceset].faces[imageno].data)
145 return faceset; 135 return faceset;
136
146 return get_face_fallback (facesets[faceset].fallback, imageno); 137 return get_face_fallback (facesets[faceset].fallback, imageno);
147} 138}
148 139
149/** 140/**
150 * Checks fallback are correctly defined. 141 * Checks fallback are correctly defined.
… …
166 if (!facesets[fallback].prefix) 157 if (!facesets[fallback].prefix)
167 { 158 {
168 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback); 159 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
169 abort (); 160 abort ();
170 } 161 }
162
171 togo--; 163 togo--;
172 if (togo == 0) 164 if (togo == 0)
173 { 165 {
174 LOG (llevError, "Infinite loop found in facesets. aborting.\n"); 166 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
175 abort (); 167 abort ();
176 } 168 }
169
177 check_faceset_fallback (fallback, togo); 170 check_faceset_fallback (fallback, togo);
178} 171}
179 172
180#define MAX_IMAGE_SIZE 10000 173#define MAX_IMAGE_SIZE 10000
181 174
182/** 175/**
183 * Loads all the image types into memory. 176 * Client tells us what type of faces it wants. Also sets
184 * 177 * the caching attribute.
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 */ 178 *
198 179 */
199void 180void
200read_client_images (void) 181SetFaceMode (char *buf, int len, client *ns)
201{ 182{
202 char filename[400]; 183 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
203 char buf[HUGE_BUF];
204 char *cp, *cps[7];
205 FILE *infile;
206 int num, len, compressed, fileno, i, badline;
207 184
208 memset (facesets, 0, sizeof (facesets)); 185 if (mode == CF_FACE_NONE)
209 sprintf (filename, "%s/image_info", settings.datadir); 186 ns->facecache = 1;
210 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL) 187 else if (mode != CF_FACE_PNG)
211 { 188 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
212 LOG (llevError, "Unable to open %s\n", filename); 189
213 abort (); 190 if (mask)
191 ns->facecache = 1;
192}
193
194/**
195 * client requested an image. send it rate-limited
196 * before flushing.
197 */
198void
199AskFaceCmd (char *buf, int len, client *ns)
200{
201 int idx = 0, pri = 0;
202
203 sscanf (buf, "%d %d", &idx, &pri);
204
205 const facedata *d = face_data (idx, ns->faceset);
206
207 if (!d)
208 return; // doh
209
210 client::ixsend ix;
211
212 ix.pri = pri;
213 ix.idx = idx;
214 ix.ofs = d->data.size ();
215
216 auto (pos, ns->ixface.end ());
217
218 if (ns->fxix < 2)
214 } 219 {
215 while (fgets (buf, HUGE_BUF - 1, infile) != NULL) 220 // gcfclient does not support prioritising, older cfplus versions
221 // do not support interleaved transfers.
222 if (!ns->ixface.empty ())
223 pos = ns->ixface.end () - 1;
216 { 224 }
217 badline = 0; 225 else
218 226 {
219 if (buf[0] == '#') 227 // the by far most common case will be to insert
220 continue; 228 // near the end, so little looping.
221 if (!(cps[0] = strtok (buf, ":"))) 229 while (pos != ns->ixface.begin ())
222 badline = 1;
223 for (i = 1; i < 7; i++)
224 { 230 {
225 if (!(cps[i] = strtok (NULL, ":"))) 231 --pos;
226 badline = 1; 232
227 } 233 // sort within 2k bins, to slightly prefer smaller images
228 if (badline) 234 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
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 { 235 {
237 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS); 236 ++pos;
238 abort (); 237 break;
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 } 238 }
311 } 239 }
312 close_and_delete (infile, compressed);
313 } /* For fileno < MAX_FACE_SETS */
314}
315
316/**
317 * Client tells us what type of faces it wants. Also sets
318 * the caching attribute.
319 *
320 */
321
322void
323SetFaceMode (char *buf, int len, NewSocket * ns)
324{
325 char tmp[256];
326
327 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
328
329 if (mode == CF_FACE_NONE)
330 { 240 }
331 ns->facecache = 1; 241
332 } 242 ns->ixface.insert (pos, ix);
333 else if (mode != CF_FACE_PNG) 243
334 { 244#if 0
335 sprintf (tmp, "drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png"); 245 for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
336 Write_String_To_Socket (ns, tmp, strlen (tmp)); 246 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs);
337#ifdef ESRV_DEBUG 247 fprintf (stderr, "\n");
338 LOG (llevDebug, "SetFaceMode: Invalid mode from client: %d\n", mode);
339#endif 248#endif
249}
250
251/**
252 * Tells client the picture it has to use
253 * to smooth a picture number given as argument.
254 */
255void
256AskSmooth (char *buf, int len, client *ns)
257{
258 ns->send_face (atoi (buf));
259 ns->flush_fx ();
260}
261
262// how lame
263static void print_facename (packet &sl, const facedata &d)
264{
265 for (int i = 0; i < CHKSUM_SIZE; ++i)
266 sl.printf ("%02x", d.chksum [i]);
267}
268
269// gcfclient uses the server-provided checksum for comparison, but always
270// writes a broken checksum to its cache file, so we have to provide
271// gcfclient with the same broken (and useless) checksum just to have it
272// cache the image despite its bugs.
273static uint32 gcfclient_checksum (const facedata *d)
274{
275 uint32 csum = 0;
276
277 for (std::string::const_iterator i = d->data.begin ();
278 i != d->data.end ();
279 ++i)
340 } 280 {
341 if (mask) 281 csum = rotate_right (csum);
282 csum += *(uint8 *)&*i;
342 { 283 }
343 ns->facecache = 1;
344 }
345}
346 284
347/** 285 return csum;
348 * Client has requested pixmap that it somehow missed getting.
349 * This will be called often if the client is
350 * caching images.
351 */
352
353void
354SendFaceCmd (char *buff, int len, NewSocket * ns)
355{
356 long tmpnum = atoi (buff);
357 short facenum = tmpnum & 0xffff;
358
359 if (facenum != 0)
360 esrv_send_face (ns, facenum, 1);
361} 286}
362 287
363/** 288/**
364 * Sends a face to a client if they are in pixmap mode 289 * Sends a face to a client if they are in pixmap mode
365 * nothing gets sent in bitmap mode. 290 * nothing gets sent in bitmap mode.
366 * If nocache is true (nonzero), ignore the cache setting from the client - 291 * 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 292 * 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, 293 * 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. 294 * we look at the facecache, and if set, send the image name.
370 */ 295 */
371
372void 296void
373esrv_send_face (NewSocket * ns, short face_num, int nocache) 297client::send_face (faceidx facenum)
374{ 298{
375 SockList sl; 299 // never send face 0. ever. it does not exist.
376 char fallback; 300 if (!facenum)
301 return;
377 302
378 if (face_num <= 0 || face_num >= nrofpixmaps) 303 const facedata *d = face_data (facenum, faceset);
304
305 if (!d)
379 { 306 {
380 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 307 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
381 return; 308 return;
382 } 309 }
383 310
384 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 311 // refuse tos end non-image faces
385 fallback = get_face_fallback (ns->faceset, face_num); 312 if (d->type)
313 return;
386 314
387 if (facesets[fallback].faces[face_num].data == NULL) 315 if (!must_send_face (facenum))
316 return;
317
318 // if for some reason we let a client without face caching connect,
319 // we better support that decision here and implement it.
320 if (!facecache)
321 return send_image (facenum);
322
323 if (fxix)
388 { 324 {
389 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 325 fxface.push_back (facenum);
390 return; 326 return;
391 } 327 }
392 328
393 if (ns->facecache && !nocache) 329 packet sl;
394 {
395 if (ns->image2)
396 strcpy ((char *) sl.buf, "face2 ");
397 else if (ns->sc_version >= 1026)
398 strcpy ((char *) sl.buf, "face1 ");
399 else
400 strcpy ((char *) sl.buf, "face ");
401 330
402 sl.len = strlen ((const char *) sl.buf); 331 if (force_face0)
403 SockList_AddShort (&sl, face_num); 332 sl << "face " << uint16 (facenum);
404 if (ns->image2) 333 else if (image2)
405 SockList_AddChar (&sl, fallback); 334 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
406 if (ns->sc_version >= 1026)
407 SockList_AddInt (&sl, facesets[fallback].faces[face_num].checksum);
408 strcpy ((char *) sl.buf + sl.len, new_faces[face_num].name);
409 sl.len += strlen (new_faces[face_num].name);
410 Send_With_Handling (ns, &sl);
411 }
412 else 335 else
413 { 336 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
414 if (ns->image2) 337
415 strcpy ((char *) sl.buf, "image2 "); 338 // how lame
416 else 339 print_facename (sl, *d);
417 strcpy ((char *) sl.buf, "image "); 340 send_packet (sl);
418 sl.len = strlen ((char *) sl.buf); 341
419 SockList_AddInt (&sl, face_num); 342 if (EMI_smooth)
420 if (ns->image2)
421 SockList_AddChar (&sl, fallback);
422 SockList_AddInt (&sl, facesets[fallback].faces[face_num].datalen);
423 memcpy (sl.buf + sl.len, facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
424 sl.len += facesets[fallback].faces[face_num].datalen;
425 Send_With_Handling (ns, &sl);
426 } 343 {
427 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 344 faceinfo *f = face_info (facenum);
428 free (sl.buf); 345
346 if (f->smooth)
347 {
348 send_face (f->smooth);
349
350 packet sl ("smooth");
351
352 sl << uint16 (facenum)
353 << uint16 (f->smooth);
354
355 send_packet (sl);
356 }
357 }
358}
359
360void client::flush_fx ()
361{
362 while (!fxface.empty ())
363 {
364 packet fx ("fx");
365 packet sx ("sx");
366
367 do
368 {
369 faceidx facenum = fxface.back (); fxface.pop_back ();
370
371 const facedata *d = face_data (facenum, faceset);
372
373 if (d)
374 {
375 fx << ber32 (facenum)
376 << data8 (d->chksum, CHKSUM_SIZE);
377
378 if (smoothing)
379 {
380 faceinfo *f = face_info (facenum);
381
382 if (f->smooth)
383 {
384 send_face (f->smooth);
385 sx << ber32 (facenum)
386 << ber32 (f->smooth)
387 << ber32 (f->smoothlevel);
388 }
389 }
390 }
391 }
392 while (!fxface.empty ()
393 && fx.room () > ber32::size + CHKSUM_SIZE + 1
394 && sx.room () > ber32::size * 3);
395
396 send_packet (fx);
397 if (sx.length () > 3) send_packet (sx);
398 }
399}
400
401void
402client::send_image (faceidx facenum)
403{
404 // never send face 0. ever. it does not exist.
405 if (!facenum)
406 return;
407
408 const facedata *d = face_data (facenum, faceset);
409
410 faces_sent[facenum] = true;
411
412 if (!d)
413 {
414 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
415 return;
416 }
417
418 //TODO: check type here?
419
420 if (force_image_newmap)
421 force_newmap = true;
422
423 packet sl;
424
425 sl << (image2 ? "image2 " : "image ")
426 << uint32 (facenum);
427
428 if (image2)
429 sl << uint8 (0);
430
431 sl << uint32 (d->data.size ())
432 << data (d->data.data (), d->data.size ());
433
434 send_packet (sl);
435}
436
437// send all faces of this object to the client
438// this uses more bandwidth initially, but makes
439// animations look much smoother, and every client
440// is supposed to do client-side caching anyways.
441void
442client::send_faces (object *ob)
443{
444 send_face (ob->face);
445
446 if (ob->animation_id)
447 {
448 animation &anim = animations [ob->animation_id];
449
450 for (int i = 0; i < anim.num_animations; i++)
451 send_face (anim.faces [i]);
452 }
453}
454
455/**
456 * Need to send an animation sequence to the client.
457 * We will send appropriate face commands to the client if we haven't
458 * sent them the face yet (this can become quite costly in terms of
459 * how much we are sending - on the other hand, this should only happen
460 * when the player logs in and picks stuff up.
461 */
462void
463client::send_animation (short anim_num)
464{
465 /* Do some checking on the anim_num we got. Note that the animations
466 * are added in contigous order, so if the number is in the valid
467 * range, it must be a valid animation.
468 */
469 if (anim_num < 0 || anim_num >= animations.size ())
470 {
471 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
472 return;
473 }
474
475 packet sl ("anim");
476
477 sl << uint16 (anim_num)
478 << uint16 (0); /* flags - not used right now */
479
480 /* Build up the list of faces. Also, send any information (ie, the
481 * the face itself) down to the client.
482 */
483 for (int i = 0; i < animations[anim_num].num_animations; i++)
484 {
485 send_face (animations[anim_num].faces[i]);
486 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
487 }
488
489 send_packet (sl);
490
491 anims_sent[anim_num] = 1;
429} 492}
430 493
431/** 494/**
432 * Sends the number of images, checksum of the face file, 495 * Sends the number of images, checksum of the face file,
433 * and the image_info file information. See the doc/Developers/protocol 496 * and the image_info file information. See the doc/Developers/protocol
434 * if you want further detail. 497 * if you want further detail.
435 */ 498 */
436
437void 499void
438send_image_info (NewSocket * ns, char *params) 500send_image_info (client *ns, char *params)
439{ 501{
440 SockList sl; 502 packet sl;
441 int i;
442 503
443 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 504 //TODO: second parameter is a checksum, but it makes no sense in this current framework
505 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
444 506
445 sprintf ((char *) sl.buf, "replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 507 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
446 for (i = 0; i < MAX_FACE_SETS; i++) 508
447 { 509 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} 510}
459 511
460/** 512/**
461 * Sends requested face information. 513 * Sends requested face information.
462 * \param ns socket to send to 514 * \param ns socket to send to
… …
465 * For each image in [start..stop] sends 517 * For each image in [start..stop] sends
466 * - checksum 518 * - checksum
467 * - name 519 * - name
468 */ 520 */
469void 521void
470send_image_sums (NewSocket * ns, char *params) 522send_image_sums (client *ns, char *params)
471{ 523{
472 int start, stop; 524 int start, stop;
473 short i;
474 char qq; 525 char *cp;
475 char *cp, buf[MAX_BUF];
476 SockList sl;
477 526
478 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 527 packet sl;
479 528
480 start = atoi (params); 529 start = atoi (params);
481 for (cp = params; *cp != '\0'; cp++) 530 for (cp = params; *cp != '\0'; cp++)
482 if (*cp == ' ') 531 if (*cp == ' ')
483 break; 532 break;
484 533
485 stop = atoi (cp); 534 stop = atoi (cp);
486 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 535 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
487 { 536 {
488 sprintf (buf, "replyinfo image_sums %d %d", start, stop); 537 sl.printf ("replyinfo image_sums %d %d", start, stop);
489 cs_write_string (ns, buf, strlen (buf)); 538 ns->send_packet (sl);
539 sl.reset ();
490 return; 540 return;
491 } 541 }
542
492 sprintf ((char *) sl.buf, "replyinfo image_sums %d %d ", start, stop); 543 sl.printf ("replyinfo image_sums %d %d ", start, stop);
493 544
494 sl.len = strlen ((const char *) sl.buf); 545 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 } 546 {
547 ns->faces_sent[i] = true;
548
549 const facedata *d = face_data (i, ns->faceset);
550
551 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
552 break;
553
554 sl << uint16 (i)
555 << uint32 (0) // checksum
556 << uint8 (ns->faceset);
557
558 print_facename (sl, *d); sl << uint8 (0);
559 }
560
511 /* It would make more sense to catch this pre-emptively in the code above. 561 /* 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 562 * 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 563 * size to less than 1000, since that is what we claim the protocol would
514 * support. 564 * support.
515 */ 565 */
566 //TODO: taken care of above, should simply abort or make sure the above code is correct
516 if (sl.len >= MAXSOCKBUF) 567 if (sl.length () >= MAXSOCKBUF)
517 { 568 {
518 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 569 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
519 abort (); 570 abort ();
520 } 571 }
521 Send_With_Handling (ns, &sl); 572
522 free (sl.buf); 573 ns->send_packet (sl);
523} 574}
575

Diff Legend

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