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.1 by elmex, Sun Aug 13 17:16:05 2006 UTC vs.
Revision 1.56 by root, Tue May 6 16:55:26 2008 UTC

1/* 1/*
2 * static char *rcsid_init_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: image.C,v 1.1 2006/08/13 17:16:05 elmex Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
13 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
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 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
23 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
25 21 * The authors can be reached via e-mail to <support@deliantra.net>
26 The author can be reached via e-mail to crossfire-devel@real-time.com
27*/ 22 */
28 23
29/** \file 24/** \file
30 * Image related communication 25 * Image related communication
31 * 26 *
32 * \date 2003-12-02 27 * \date 2003-12-02
… …
38 */ 33 */
39 34
40#include <global.h> 35#include <global.h>
41#include <sproto.h> 36#include <sproto.h>
42 37
43#include <newclient.h> 38#include "crc.h"
44#include <newserver.h>
45#include <loader.h>
46
47#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */
48
49/** Information about one image */
50typedef struct FaceInfo {
51 uint8 *data; /**< image data */
52 uint16 datalen; /**< length of the xpm data */
53 uint32 checksum; /**< Checksum of face data */
54} FaceInfo;
55
56/** Information about one face set */
57typedef struct {
58 char *prefix; /**< */
59 char *fullname;
60 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
61 char *size;
62 char *extension;
63 char *comment;
64 FaceInfo *faces; /**< images in this faceset */
65} FaceSets;
66
67static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */
68
69/**
70 * Checks specified faceset is valid
71 * \param fsn faceset number
72 */
73int is_valid_faceset(int fsn)
74{
75 if (fsn >=0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix) return TRUE;
76 return FALSE;
77}
78
79/**
80 * Frees all faceset information
81 */
82void free_socket_images(void)
83{
84 int num,q;
85
86 for(num=0;num<MAX_FACE_SETS; num++) {
87 if (facesets[num].prefix) {
88 for (q=0; q<nrofpixmaps; q++)
89 if (facesets[num].faces[q].data) free(facesets[num].faces[q].data);
90 free(facesets[num].prefix);
91 free(facesets[num].fullname);
92 free(facesets[num].size);
93 free(facesets[num].extension);
94 free(facesets[num].comment);
95 free(facesets[num].faces);
96 }
97 }
98}
99
100/**
101 * This returns the set we will actually use when sending
102 * a face. This is used because the image files may be sparse.
103 * This function is recursive. imageno is the face number we are
104 * trying to send
105 *
106 * If face is not found in specified faceset, tries with 'fallback' faceset.
107 *
108 * \param faceset faceset to check
109 * \param imageno image number
110 *
111 */
112static int get_face_fallback(int faceset, int imageno)
113{
114 /* faceset 0 is supposed to have every image, so just return. Doing
115 * so also prevents infinite loops in the case if it not having
116 * the face, but in that case, we are likely to crash when we try
117 * to access the data, but that is probably preferable to an infinite
118 * loop.
119 */
120 if (faceset==0) return 0;
121
122 if (!facesets[faceset].prefix) {
123 LOG(llevError,"get_face_fallback called with unused set (%d)?\n", faceset);
124 return 0; /* use default set */
125 }
126 if (facesets[faceset].faces[imageno].data) return faceset;
127 return get_face_fallback(facesets[faceset].fallback, imageno);
128}
129
130/**
131 * Checks fallback are correctly defined.
132 * This is a simple recursive function that makes sure the fallbacks
133 * are all proper (eg, the fall back to defined sets, and also
134 * eventually fall back to 0). At the top level, togo is set to MAX_FACE_SETS,
135 * if togo gets to zero, it means we have a loop.
136 * This is only run when we first load the facesets.
137 */
138static void check_faceset_fallback(int faceset, int togo)
139{
140 int fallback = facesets[faceset].fallback;
141
142 /* proper case - falls back to base set */
143 if (fallback == 0) return;
144
145 if (!facesets[fallback].prefix) {
146 LOG(llevError,"Face set %d falls to non set faceset %d\n", faceset, fallback);
147 abort();
148 }
149 togo--;
150 if (togo == 0) {
151 LOG(llevError,"Infinite loop found in facesets. aborting.\n");
152 abort();
153 }
154 check_faceset_fallback(fallback, togo);
155}
156 39
157#define MAX_IMAGE_SIZE 10000 40#define MAX_IMAGE_SIZE 10000
158
159/**
160 * Loads all the image types into memory.
161 *
162 * This way, we can easily send them to the client. We should really do something
163 * better than abort on any errors - on the other hand, these are all fatal
164 * to the server (can't work around them), but the abort just seems a bit
165 * messy (exit would probably be better.)
166 *
167 * Couple of notes: We assume that the faces are in a continous block.
168 * This works fine for now, but this could perhaps change in the future
169 *
170 * Function largely rewritten May 2000 to be more general purpose.
171 * The server itself does not care what the image data is - to the server,
172 * it is just data it needs to allocate. As such, the code is written
173 * to do such.
174 */
175
176void read_client_images(void)
177{
178 char filename[400];
179 char buf[HUGE_BUF];
180 char *cp, *cps[7];
181 FILE *infile;
182 int num,len,compressed, fileno,i, badline;
183
184 memset(facesets, 0, sizeof(facesets));
185 sprintf(filename,"%s/image_info",settings.datadir);
186 if ((infile=open_and_uncompress(filename, 0, &compressed))==NULL) {
187 LOG(llevError,"Unable to open %s\n", filename);
188 abort();
189 }
190 while (fgets(buf, HUGE_BUF-1, infile)!=NULL) {
191 badline=0;
192
193 if (buf[0] == '#') continue;
194 if (!(cps[0] = strtok(buf, ":"))) badline=1;
195 for (i=1; i<7; i++) {
196 if (!(cps[i] = strtok(NULL, ":"))) badline=1;
197 }
198 if (badline) {
199 LOG(llevError,"Bad line in image_info file, ignoring line:\n %s", buf);
200 } else {
201 len = atoi(cps[0]);
202 if (len >=MAX_FACE_SETS) {
203 LOG(llevError,"To high a setnum in image_info file: %d > %d\n",
204 len, MAX_FACE_SETS);
205 abort();
206 }
207 facesets[len].prefix = strdup_local(cps[1]);
208 facesets[len].fullname = strdup_local(cps[2]);
209 facesets[len].fallback = atoi(cps[3]);
210 facesets[len].size = strdup_local(cps[4]);
211 facesets[len].extension = strdup_local(cps[5]);
212 facesets[len].comment = strdup_local(cps[6]);
213 }
214 }
215 close_and_delete(infile,compressed);
216 for (i=0; i<MAX_FACE_SETS; i++) {
217 if (facesets[i].prefix) check_faceset_fallback(i, MAX_FACE_SETS);
218 }
219 /* Loaded the faceset information - now need to load up the
220 * actual faces.
221 */
222
223 for (fileno=0; fileno<MAX_FACE_SETS; fileno++) {
224 /* if prefix is not set, this is not used */
225 if (!facesets[fileno].prefix) continue;
226 facesets[fileno].faces = (FaceInfo *) calloc(nrofpixmaps, sizeof(FaceInfo));
227
228 sprintf(filename,"%s/crossfire.%d",settings.datadir, fileno);
229 LOG(llevDebug,"Loading image file %s\n", filename);
230
231 if ((infile = open_and_uncompress(filename,0,&compressed))==NULL) {
232 LOG(llevError,"Unable to open %s\n", filename);
233 abort();
234 }
235 while(fgets(buf, HUGE_BUF-1, infile)!=NULL) {
236 if(strncmp(buf,"IMAGE ",6)!=0) {
237 LOG(llevError,"read_client_images:Bad image line - not IMAGE, instead\n%s",buf);
238 abort();
239 }
240 num = atoi(buf+6);
241 if (num<0 || num>=nrofpixmaps) {
242 LOG(llevError,"read_client_images: Image num %d not in 0..%d\n%s",
243 num,nrofpixmaps,buf);
244 abort();
245 }
246 /* Skip accross the number data */
247 for (cp=buf+6; *cp!=' '; cp++) ;
248 len = atoi(cp);
249 if (len==0 || len>MAX_IMAGE_SIZE) {
250 LOG(llevError,"read_client_images: length not valid: %d > %d \n%s",
251 len,MAX_IMAGE_SIZE,buf);
252 abort();
253 }
254 /* We don't actualy care about the name if the image that
255 * is embedded in the image file, so just ignore it.
256 */
257 facesets[fileno].faces[num].datalen = len;
258 facesets[fileno].faces[num].data = (uint8*) malloc(len);
259 if ((i=fread(facesets[fileno].faces[num].data, len, 1, infile))!=1) {
260 LOG(llevError,"read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s",
261 len, i, buf);
262 abort();
263 }
264 facesets[fileno].faces[num].checksum=0;
265 for (i=0; i<len; i++) {
266 ROTATE_RIGHT(facesets[fileno].faces[num].checksum);
267 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
268 facesets[fileno].faces[num].checksum &= 0xffffffff;
269 }
270 }
271 close_and_delete(infile,compressed);
272 } /* For fileno < MAX_FACE_SETS */
273}
274 41
275/** 42/**
276 * Client tells us what type of faces it wants. Also sets 43 * Client tells us what type of faces it wants. Also sets
277 * the caching attribute. 44 * the caching attribute.
278 * 45 *
279 */ 46 */
280 47void
281void SetFaceMode(char *buf, int len, NewSocket *ns) 48SetFaceMode (char *buf, int len, client *ns)
282{ 49{
283 char tmp[256];
284
285 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);
286 51
287 if (mode==CF_FACE_NONE) { 52 if (mode == CF_FACE_NONE)
288 ns->facecache=1; 53 ns->facecache = 1;
289 } else if (mode!=CF_FACE_PNG) { 54 else if (mode != CF_FACE_PNG)
290 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");
291 Write_String_To_Socket(ns, tmp, strlen(tmp)); 56
292#ifdef ESRV_DEBUG 57 if (mask)
293 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");
294#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)
295 } 149 {
296 if (mask) { 150 csum = rotate_right (csum);
297 ns->facecache=1; 151 csum += *(uint8 *)&*i;
298 } 152 }
299}
300 153
301/** 154 return csum;
302 * Client has requested pixmap that it somehow missed getting.
303 * This will be called often if the client is
304 * caching images.
305 */
306
307void SendFaceCmd(char *buff, int len, NewSocket *ns)
308{
309 long tmpnum = atoi(buff);
310 short facenum=tmpnum & 0xffff;
311
312 if(facenum!=0)
313 esrv_send_face(ns, facenum,1);
314} 155}
315 156
316/** 157/**
317 * 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
318 * nothing gets sent in bitmap mode. 159 * nothing gets sent in bitmap mode.
319 * 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 -
320 * 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
321 * 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,
322 * 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.
323 */ 164 */
324 165void
325void esrv_send_face(NewSocket *ns,short face_num, int nocache) 166client::send_face (faceidx facenum, int pri)
326{ 167{
327 SockList sl; 168 // never send face 0. ever. it does not exist.
328 char fallback; 169 if (!facenum)
170 return;
329 171
330 if (face_num <= 0 || face_num >= nrofpixmaps) { 172 faceinfo *f = face_info (facenum);
173
174 if (!f)
175 {
176 LOG (llevError | logBacktrace, "client::send_face (%d) out of bounds??\n", facenum);
177 return;
178 }
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
202 packet sl;
203
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 }
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 {
331 LOG(llevError,"esrv_send_face (%d) out of bounds??\n",face_num); 350 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
332 return; 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++)
333 } 363 {
334 364 send_face (animations[anim_num].faces[i], -20);
335 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 365 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
336 fallback = get_face_fallback(ns->faceset, face_num);
337
338 if (facesets[fallback].faces[face_num].data == NULL) {
339 LOG(llevError,"esrv_send_face: faces[%d].data == NULL\n",face_num);
340 return;
341 } 366 }
342 367
343 if (ns->facecache && !nocache) { 368 send_packet (sl);
344 if (ns->image2)
345 strcpy((char*)sl.buf, "face2 ");
346 else if (ns->sc_version >= 1026)
347 strcpy((char*)sl.buf, "face1 ");
348 else
349 strcpy((char*)sl.buf, "face ");
350 369
351 sl.len=strlen((const char*)sl.buf); 370 anims_sent[anim_num] = 1;
352 SockList_AddShort(&sl, face_num);
353 if (ns->image2)
354 SockList_AddChar(&sl, fallback);
355 if (ns->sc_version >= 1026)
356 SockList_AddInt(&sl, facesets[fallback].faces[face_num].checksum);
357 strcpy((char*)sl.buf + sl.len, new_faces[face_num].name);
358 sl.len += strlen(new_faces[face_num].name);
359 Send_With_Handling(ns, &sl);
360 }
361 else {
362 if (ns->image2)
363 strcpy((char*)sl.buf, "image2 ");
364 else
365 strcpy((char*)sl.buf, "image ");
366 sl.len=strlen((char*)sl.buf);
367 SockList_AddInt(&sl, face_num);
368 if (ns->image2)
369 SockList_AddChar(&sl, fallback);
370 SockList_AddInt(&sl, facesets[fallback].faces[face_num].datalen);
371 memcpy(sl.buf+sl.len, facesets[fallback].faces[face_num].data,
372 facesets[fallback].faces[face_num].datalen);
373 sl.len += facesets[fallback].faces[face_num].datalen;
374 Send_With_Handling(ns, &sl);
375 }
376 ns->faces_sent[face_num] |= NS_FACESENT_FACE;
377 free(sl.buf);
378} 371}
379 372
380/** 373/**
381 * Sends the number of images, checksum of the face file, 374 * Sends the number of images, checksum of the face file,
382 * and the image_info file information. See the doc/Developers/protocol 375 * and the image_info file information. See the doc/Developers/protocol
383 * if you want further detail. 376 * if you want further detail.
384 */ 377 */
385 378void
386void send_image_info(NewSocket *ns, char *params) 379send_image_info (client *ns, char *params)
387{ 380{
388 SockList sl; 381 packet sl;
389 int i;
390 382
391 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);
392 385
393 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";
394 for (i=0; i<MAX_FACE_SETS; i++) { 387
395 if (facesets[i].prefix) { 388 ns->send_packet (sl);
396 sprintf((char*)sl.buf + strlen((const char*)sl.buf), "%d:%s:%s:%d:%s:%s:%s",
397 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
398 facesets[i].size, facesets[i].extension, facesets[i].comment);
399 }
400 }
401 sl.len = strlen((const char*)sl.buf);
402 Send_With_Handling(ns, &sl);
403 free(sl.buf);
404} 389}
405 390
406/** 391/**
407 * Sends requested face information. 392 * Sends requested face information.
408 * \param ns socket to send to 393 * \param ns socket to send to
… …
410 * 395 *
411 * For each image in [start..stop] sends 396 * For each image in [start..stop] sends
412 * - checksum 397 * - checksum
413 * - name 398 * - name
414 */ 399 */
400void
415void send_image_sums(NewSocket *ns, char *params) 401send_image_sums (client *ns, char *params)
416{ 402{
417 int start, stop; 403 int start, stop;
418 short i; 404 char *cp;
419 char qq;
420 char *cp, buf[MAX_BUF];
421 SockList sl;
422 405
423 sl.buf = (unsigned char *) malloc(MAXSOCKBUF); 406 packet sl;
424 407
425 start = atoi(params); 408 start = atoi (params);
426 for (cp = params; *cp != '\0'; cp++) 409 for (cp = params; *cp != '\0'; cp++)
427 if (*cp == ' ') break; 410 if (*cp == ' ')
411 break;
428 412
429 stop = atoi(cp); 413 stop = atoi (cp);
430 if (stop < start || *cp == '\0' || (stop-start)>1000 || stop >= nrofpixmaps) { 414 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
415 {
416 sl.printf ("replyinfo image_sums %d %d", start, stop);
417 ns->send_packet (sl);
418 sl.reset ();
419 return;
420 }
421
431 sprintf(buf,"replyinfo image_sums %d %d", start, stop); 422 sl.printf ("replyinfo image_sums %d %d ", start, stop);
432 cs_write_string(ns, buf, strlen(buf));
433 return;
434 }
435 sprintf((char*)sl.buf,"replyinfo image_sums %d %d ", start, stop);
436 423
437 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;
438 429
439 for (i=start; i<=stop; i++) { 430 const facedata *d = f->data (ns->faceset);
440 SockList_AddShort(&sl, i);
441 ns->faces_sent[i] |= NS_FACESENT_FACE;
442 431
443 qq = get_face_fallback(ns->faceset, i); 432 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
444 SockList_AddInt(&sl, facesets[qq].faces[i].checksum); 433 break;
445 SockList_AddChar(&sl, qq);
446 434
447 qq = strlen(new_faces[i].name); 435 sl << uint16 (i)
448 SockList_AddChar(&sl, ( char )( qq + 1 )); 436 << uint32 (0) // checksum
449 strcpy((char*)sl.buf + sl.len, new_faces[i].name); 437 << uint8 (ns->faceset);
450 sl.len += qq; 438
451 SockList_AddChar(&sl, 0); 439 print_facename (sl, *d); sl << uint8 (0);
452 } 440 }
441
453 /* 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.
454 * 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
455 * 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
456 * support. 445 * support.
457 */ 446 */
447 //TODO: taken care of above, should simply abort or make sure the above code is correct
458 if (sl.len >= MAXSOCKBUF) { 448 if (sl.length () > MAXSOCKBUF)
449 {
459 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);
460 abort(); 451 abort ();
461 } 452 }
462 Send_With_Handling(ns, &sl); 453
463 free(sl.buf); 454 ns->send_packet (sl);
464} 455}
456

Diff Legend

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