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.54 by root, Thu Aug 30 08:34:40 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
48#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */
49
50/** Information about one image */
51typedef struct FaceInfo
52{
53
54 uint8 *data; /**< image data */
55
56 uint16 datalen; /**< length of the xpm data */
57
58 uint32 checksum; /**< Checksum of face data */
59} FaceInfo;
60
61/** Information about one face set */
62typedef struct
63{
64
65 char *prefix; /**< */
66 char *fullname;
67
68 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
69 char *size;
70 char *extension;
71 char *comment;
72
73 FaceInfo *faces; /**< images in this faceset */
74} FaceSets;
75
76static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */
77
78/**
79 * Checks specified faceset is valid
80 * \param fsn faceset number
81 */
82int
83is_valid_faceset (int fsn)
84{
85 if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix)
86 return TRUE;
87 return FALSE;
88}
89
90/**
91 * Frees all faceset information
92 */
93void
94free_socket_images (void)
95{
96 int num, q;
97
98 for (num = 0; num < MAX_FACE_SETS; num++)
99 {
100 if (facesets[num].prefix)
101 {
102 for (q = 0; q < nrofpixmaps; q++)
103 if (facesets[num].faces[q].data)
104 free (facesets[num].faces[q].data);
105 free (facesets[num].prefix);
106 free (facesets[num].fullname);
107 free (facesets[num].size);
108 free (facesets[num].extension);
109 free (facesets[num].comment);
110 free (facesets[num].faces);
111 }
112 }
113}
114
115/**
116 * This returns the set we will actually use when sending
117 * a face. This is used because the image files may be sparse.
118 * This function is recursive. imageno is the face number we are
119 * trying to send
120 *
121 * If face is not found in specified faceset, tries with 'fallback' faceset.
122 *
123 * \param faceset faceset to check
124 * \param imageno image number
125 *
126 */
127static int
128get_face_fallback (int faceset, int imageno)
129{
130 /* faceset 0 is supposed to have every image, so just return. Doing
131 * so also prevents infinite loops in the case if it not having
132 * the face, but in that case, we are likely to crash when we try
133 * to access the data, but that is probably preferable to an infinite
134 * loop.
135 */
136 if (faceset == 0)
137 return 0;
138
139 if (!facesets[faceset].prefix)
140 {
141 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
142 return 0; /* use default set */
143 }
144 if (facesets[faceset].faces[imageno].data)
145 return faceset;
146 return get_face_fallback (facesets[faceset].fallback, imageno);
147}
148
149/**
150 * Checks fallback are correctly defined.
151 * This is a simple recursive function that makes sure the fallbacks
152 * are all proper (eg, the fall back to defined sets, and also
153 * eventually fall back to 0). At the top level, togo is set to MAX_FACE_SETS,
154 * if togo gets to zero, it means we have a loop.
155 * This is only run when we first load the facesets.
156 */
157static void
158check_faceset_fallback (int faceset, int togo)
159{
160 int fallback = facesets[faceset].fallback;
161
162 /* proper case - falls back to base set */
163 if (fallback == 0)
164 return;
165
166 if (!facesets[fallback].prefix)
167 {
168 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
169 abort ();
170 }
171 togo--;
172 if (togo == 0)
173 {
174 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
175 abort ();
176 }
177 check_faceset_fallback (fallback, togo);
178}
179 39
180#define MAX_IMAGE_SIZE 10000 40#define MAX_IMAGE_SIZE 10000
181
182/**
183 * Loads all the image types into memory.
184 *
185 * This way, we can easily send them to the client. We should really do something
186 * better than abort on any errors - on the other hand, these are all fatal
187 * to the server (can't work around them), but the abort just seems a bit
188 * messy (exit would probably be better.)
189 *
190 * Couple of notes: We assume that the faces are in a continous block.
191 * This works fine for now, but this could perhaps change in the future
192 *
193 * Function largely rewritten May 2000 to be more general purpose.
194 * The server itself does not care what the image data is - to the server,
195 * it is just data it needs to allocate. As such, the code is written
196 * to do such.
197 */
198
199void
200read_client_images (void)
201{
202 char filename[400];
203 char buf[HUGE_BUF];
204 char *cp, *cps[7];
205 FILE *infile;
206 int num, len, compressed, fileno, i, badline;
207
208 memset (facesets, 0, sizeof (facesets));
209 sprintf (filename, "%s/image_info", settings.datadir);
210 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
211 {
212 LOG (llevError, "Unable to open %s\n", filename);
213 abort ();
214 }
215 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
216 {
217 badline = 0;
218
219 if (buf[0] == '#')
220 continue;
221 if (!(cps[0] = strtok (buf, ":")))
222 badline = 1;
223 for (i = 1; i < 7; i++)
224 {
225 if (!(cps[i] = strtok (NULL, ":")))
226 badline = 1;
227 }
228 if (badline)
229 {
230 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
231 }
232 else
233 {
234 len = atoi (cps[0]);
235 if (len >= MAX_FACE_SETS)
236 {
237 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
238 abort ();
239 }
240 facesets[len].prefix = strdup_local (cps[1]);
241 facesets[len].fullname = strdup_local (cps[2]);
242 facesets[len].fallback = atoi (cps[3]);
243 facesets[len].size = strdup_local (cps[4]);
244 facesets[len].extension = strdup_local (cps[5]);
245 facesets[len].comment = strdup_local (cps[6]);
246 }
247 }
248 close_and_delete (infile, compressed);
249 for (i = 0; i < MAX_FACE_SETS; i++)
250 {
251 if (facesets[i].prefix)
252 check_faceset_fallback (i, MAX_FACE_SETS);
253 }
254 /* Loaded the faceset information - now need to load up the
255 * actual faces.
256 */
257
258 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
259 {
260 /* if prefix is not set, this is not used */
261 if (!facesets[fileno].prefix)
262 continue;
263 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
264
265 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
266 LOG (llevDebug, "Loading image file %s\n", filename);
267
268 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
269 {
270 LOG (llevError, "Unable to open %s\n", filename);
271 abort ();
272 }
273 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
274 {
275 if (strncmp (buf, "IMAGE ", 6) != 0)
276 {
277 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
278 abort ();
279 }
280 num = atoi (buf + 6);
281 if (num < 0 || num >= nrofpixmaps)
282 {
283 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
284 abort ();
285 }
286 /* Skip accross the number data */
287 for (cp = buf + 6; *cp != ' '; cp++);
288 len = atoi (cp);
289 if (len == 0 || len > MAX_IMAGE_SIZE)
290 {
291 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
292 abort ();
293 }
294 /* We don't actualy care about the name if the image that
295 * is embedded in the image file, so just ignore it.
296 */
297 facesets[fileno].faces[num].datalen = len;
298 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
299 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
300 {
301 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
302 abort ();
303 }
304 facesets[fileno].faces[num].checksum = 0;
305 for (i = 0; i < len; i++)
306 {
307 ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
308 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
309 facesets[fileno].faces[num].checksum &= 0xffffffff;
310 }
311 }
312 close_and_delete (infile, compressed);
313 } /* For fileno < MAX_FACE_SETS */
314}
315 41
316/** 42/**
317 * Client tells us what type of faces it wants. Also sets 43 * Client tells us what type of faces it wants. Also sets
318 * the caching attribute. 44 * the caching attribute.
319 * 45 *
320 */ 46 */
321
322void 47void
323SetFaceMode (char *buf, int len, NewSocket * ns) 48SetFaceMode (char *buf, int len, client *ns)
324{ 49{
325 char tmp[256];
326
327 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);
328 51
329 if (mode == CF_FACE_NONE) 52 if (mode == CF_FACE_NONE)
330 {
331 ns->facecache = 1; 53 ns->facecache = 1;
332 }
333 else if (mode != CF_FACE_PNG) 54 else if (mode != CF_FACE_PNG)
334 {
335 sprintf (tmp, "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");
336 Write_String_To_Socket (ns, tmp, strlen (tmp)); 56
337#ifdef ESRV_DEBUG 57 if (mask)
338 LOG (llevDebug, "SetFaceMode: Invalid mode from client: %d\n", mode); 58 ns->facecache = 1;
59}
60
61/**
62 * client requested an image. send it rate-limited
63 * before flushing.
64 */
65void
66AskFaceCmd (char *buf, int len, client *ns)
67{
68 int idx = 0, pri = 0;
69
70 sscanf (buf, "%d %d", &idx, &pri);
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");
339#endif 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)
340 } 149 {
341 if (mask) 150 csum = rotate_right (csum);
151 csum += *(uint8 *)&*i;
342 { 152 }
343 ns->facecache = 1;
344 }
345}
346 153
347/** 154 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} 155}
362 156
363/** 157/**
364 * 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
365 * nothing gets sent in bitmap mode. 159 * nothing gets sent in bitmap mode.
366 * If nocache is true (nonzero), ignore the cache setting from the client - 160 * 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 161 * 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, 162 * 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. 163 * we look at the facecache, and if set, send the image name.
370 */ 164 */
371
372void 165void
373esrv_send_face (NewSocket * ns, short face_num, int nocache) 166client::send_face (faceidx facenum, int pri)
374{ 167{
375 SockList sl; 168 // never send face 0. ever. it does not exist.
376 char fallback; 169 if (!facenum)
170 return;
377 171
378 if (face_num <= 0 || face_num >= nrofpixmaps) 172 faceinfo *f = face_info (facenum);
173
174 if (!f)
379 { 175 {
380 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 176 LOG (llevError | logBacktrace, "client::send_face (%d) out of bounds??\n", facenum);
381 return; 177 return;
382 } 178 }
383 179
384 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 180 // refuse to send non-image faces
385 fallback = get_face_fallback (ns->faceset, face_num); 181 if (!fx_want [f->type])
182 return;
386 183
387 if (facesets[fallback].faces[face_num].data == NULL) 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)
388 { 195 {
389 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 196 fxface.push_back (facenum);
390 return; 197 return;
391 } 198 }
392 199
393 if (ns->facecache && !nocache) 200 const facedata *d = f->data (faceset);
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 201
402 sl.len = strlen ((const char *) sl.buf); 202 packet sl;
403 SockList_AddShort (&sl, face_num); 203
404 if (ns->image2) 204 if (force_face0)
405 SockList_AddChar (&sl, fallback); 205 sl << "face " << uint16 (facenum);
406 if (ns->sc_version >= 1026) 206 else if (image2)
407 SockList_AddInt (&sl, facesets[fallback].faces[face_num].checksum); 207 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
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 208 else
413 { 209 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
414 if (ns->image2) 210
415 strcpy ((char *) sl.buf, "image2 "); 211 // how lame
416 else 212 print_facename (sl, *d);
417 strcpy ((char *) sl.buf, "image "); 213 send_packet (sl);
418 sl.len = strlen ((char *) sl.buf); 214
419 SockList_AddInt (&sl, face_num); 215 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 } 216 {
427 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 217 if (f->smooth)
428 free (sl.buf); 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 }
228 }
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);
296 return;
297 }
298
299 if (force_image_newmap)
300 force_newmap = true;
301
302 packet sl;
303
304 sl << (image2 ? "image2 " : "image ")
305 << uint32 (facenum);
306
307 if (image2)
308 sl << uint8 (0);
309
310 sl << uint32 (d->data.size ())
311 << data (d->data.data (), d->data.size ());
312
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)
326 {
327 animation &anim = animations [ob->animation_id];
328
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;
429} 371}
430 372
431/** 373/**
432 * Sends the number of images, checksum of the face file, 374 * Sends the number of images, checksum of the face file,
433 * and the image_info file information. See the doc/Developers/protocol 375 * and the image_info file information. See the doc/Developers/protocol
434 * if you want further detail. 376 * if you want further detail.
435 */ 377 */
436
437void 378void
438send_image_info (NewSocket * ns, char *params) 379send_image_info (client *ns, char *params)
439{ 380{
440 SockList sl; 381 packet sl;
441 int i;
442 382
443 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 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);
444 385
445 sprintf ((char *) sl.buf, "replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 386 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
446 for (i = 0; i < MAX_FACE_SETS; i++) 387
447 { 388 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} 389}
459 390
460/** 391/**
461 * Sends requested face information. 392 * Sends requested face information.
462 * \param ns socket to send to 393 * \param ns socket to send to
… …
465 * For each image in [start..stop] sends 396 * For each image in [start..stop] sends
466 * - checksum 397 * - checksum
467 * - name 398 * - name
468 */ 399 */
469void 400void
470send_image_sums (NewSocket * ns, char *params) 401send_image_sums (client *ns, char *params)
471{ 402{
472 int start, stop; 403 int start, stop;
473 short i;
474 char qq; 404 char *cp;
475 char *cp, buf[MAX_BUF];
476 SockList sl;
477 405
478 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 406 packet sl;
479 407
480 start = atoi (params); 408 start = atoi (params);
481 for (cp = params; *cp != '\0'; cp++) 409 for (cp = params; *cp != '\0'; cp++)
482 if (*cp == ' ') 410 if (*cp == ' ')
483 break; 411 break;
484 412
485 stop = atoi (cp); 413 stop = atoi (cp);
486 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 414 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
487 { 415 {
488 sprintf (buf, "replyinfo image_sums %d %d", start, stop); 416 sl.printf ("replyinfo image_sums %d %d", start, stop);
489 cs_write_string (ns, buf, strlen (buf)); 417 ns->send_packet (sl);
418 sl.reset ();
490 return; 419 return;
491 } 420 }
421
492 sprintf ((char *) sl.buf, "replyinfo image_sums %d %d ", start, stop); 422 sl.printf ("replyinfo image_sums %d %d ", start, stop);
493 423
494 sl.len = strlen ((const char *) sl.buf); 424 for (int i = start; i <= stop && i < faces.size (); i++)
425 if (const faceinfo *f = face_info (i))
426 if (ns->fx_want [f->type])
427 {
428 ns->faces_sent[i] = true;
495 429
496 for (i = start; i <= stop; i++) 430 const facedata *d = f->data (ns->faceset);
497 {
498 SockList_AddShort (&sl, i);
499 ns->faces_sent[i] |= NS_FACESENT_FACE;
500 431
501 qq = get_face_fallback (ns->faceset, i); 432 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
502 SockList_AddInt (&sl, facesets[qq].faces[i].checksum); 433 break;
503 SockList_AddChar (&sl, qq);
504 434
505 qq = strlen (new_faces[i].name); 435 sl << uint16 (i)
506 SockList_AddChar (&sl, (char) (qq + 1)); 436 << uint32 (0) // checksum
507 strcpy ((char *) sl.buf + sl.len, new_faces[i].name); 437 << uint8 (ns->faceset);
508 sl.len += qq; 438
509 SockList_AddChar (&sl, 0); 439 print_facename (sl, *d); sl << uint8 (0);
510 } 440 }
441
511 /* 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.
512 * 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
513 * 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
514 * support. 445 * support.
515 */ 446 */
447 //TODO: taken care of above, should simply abort or make sure the above code is correct
516 if (sl.len >= MAXSOCKBUF) 448 if (sl.length () > MAXSOCKBUF)
517 { 449 {
518 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 450 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
519 abort (); 451 abort ();
520 } 452 }
521 Send_With_Handling (ns, &sl); 453
522 free (sl.buf); 454 ns->send_packet (sl);
523} 455}
456

Diff Legend

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