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.39 by root, Tue Apr 3 00:21:38 2007 UTC

1/* 1/*
2 * static char *rcsid_init_c = 2 * CrossFire, A Multiplayer game
3 * "$Id: image.C,v 1.1 2006/08/13 17:16:05 elmex Exp $";
4 */ 3 *
5 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 21 *
26 The author can be reached via e-mail to crossfire-devel@real-time.com 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
27*/ 23 */
28 24
29/** \file 25/** \file
30 * Image related communication 26 * Image related communication
31 * 27 *
32 * \date 2003-12-02 28 * \date 2003-12-02
… …
38 */ 34 */
39 35
40#include <global.h> 36#include <global.h>
41#include <sproto.h> 37#include <sproto.h>
42 38
43#include <newclient.h> 39#include "crc.h"
44#include <newserver.h>
45#include <loader.h>
46 40
47#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */ 41#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */
48 42
49/** Information about one image */ 43/** Information about one image */
50typedef struct FaceInfo { 44typedef struct FaceInfo
45{
51 uint8 *data; /**< image data */ 46 uint8 *data; /**< image data */
52 uint16 datalen; /**< length of the xpm data */ 47 uint16 datalen; /**< length of the xpm data */
53 uint32 checksum; /**< Checksum of face data */ 48 uint32 checksum; /**< Checksum of face data */
54} FaceInfo; 49} FaceInfo;
55 50
56/** Information about one face set */ 51/** Information about one face set */
57typedef struct { 52typedef struct
53{
58 char *prefix; /**< */ 54 char *prefix; /**< */
59 char *fullname; 55 char *fullname;
56
60 uint8 fallback; /**< faceset to use when an image is not found in this faceset */ 57 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
61 char *size; 58 char *size;
62 char *extension; 59 char *extension;
63 char *comment; 60 char *comment;
61
64 FaceInfo *faces; /**< images in this faceset */ 62 FaceInfo *faces; /**< images in this faceset */
65} FaceSets; 63} FaceSets;
66 64
67static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */ 65static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */
68 66
69/** 67/**
70 * Checks specified faceset is valid 68 * Checks specified faceset is valid
71 * \param fsn faceset number 69 * \param fsn faceset number
72 */ 70 */
71int
73int is_valid_faceset(int fsn) 72is_valid_faceset (int fsn)
74{ 73{
75 if (fsn >=0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix) return TRUE; 74 if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix)
75 return TRUE;
76 return FALSE; 76 return FALSE;
77} 77}
78 78
79/** 79/**
80 * Frees all faceset information 80 * Frees all faceset information
81 */ 81 */
82void
82void free_socket_images(void) 83free_socket_images (void)
83{ 84{
84 int num,q; 85 int num, q;
85 86
86 for(num=0;num<MAX_FACE_SETS; num++) { 87 for (num = 0; num < MAX_FACE_SETS; num++)
88 {
87 if (facesets[num].prefix) { 89 if (facesets[num].prefix)
88 for (q=0; q<nrofpixmaps; q++) 90 {
89 if (facesets[num].faces[q].data) free(facesets[num].faces[q].data); 91 for (q = 0; q < faces.size (); q++)
92 if (facesets[num].faces[q].data)
93 free (facesets[num].faces[q].data);
94
90 free(facesets[num].prefix); 95 free (facesets[num].prefix);
91 free(facesets[num].fullname); 96 free (facesets[num].fullname);
92 free(facesets[num].size); 97 free (facesets[num].size);
93 free(facesets[num].extension); 98 free (facesets[num].extension);
94 free(facesets[num].comment); 99 free (facesets[num].comment);
95 free(facesets[num].faces); 100 free (facesets[num].faces);
96 } 101 }
97 } 102 }
98} 103}
99 104
100/** 105/**
101 * This returns the set we will actually use when sending 106 * This returns the set we will actually use when sending
… …
107 * 112 *
108 * \param faceset faceset to check 113 * \param faceset faceset to check
109 * \param imageno image number 114 * \param imageno image number
110 * 115 *
111 */ 116 */
117static int
112static int get_face_fallback(int faceset, int imageno) 118get_face_fallback (int faceset, int imageno)
113{ 119{
114 /* faceset 0 is supposed to have every image, so just return. Doing 120 /* 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 121 * 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 122 * 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 123 * to access the data, but that is probably preferable to an infinite
118 * loop. 124 * loop.
119 */ 125 */
120 if (faceset==0) return 0; 126 if (faceset == 0)
127 return 0;
121 128
122 if (!facesets[faceset].prefix) { 129 if (!facesets[faceset].prefix)
130 {
123 LOG(llevError,"get_face_fallback called with unused set (%d)?\n", faceset); 131 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
124 return 0; /* use default set */ 132 return 0; /* use default set */
125 } 133 }
134
126 if (facesets[faceset].faces[imageno].data) return faceset; 135 if (facesets[faceset].faces[imageno].data)
136 return faceset;
137
127 return get_face_fallback(facesets[faceset].fallback, imageno); 138 return get_face_fallback (facesets[faceset].fallback, imageno);
128} 139}
129 140
130/** 141/**
131 * Checks fallback are correctly defined. 142 * Checks fallback are correctly defined.
132 * This is a simple recursive function that makes sure the fallbacks 143 * This is a simple recursive function that makes sure the fallbacks
133 * are all proper (eg, the fall back to defined sets, and also 144 * 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, 145 * 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. 146 * if togo gets to zero, it means we have a loop.
136 * This is only run when we first load the facesets. 147 * This is only run when we first load the facesets.
137 */ 148 */
149static void
138static void check_faceset_fallback(int faceset, int togo) 150check_faceset_fallback (int faceset, int togo)
139{ 151{
140 int fallback = facesets[faceset].fallback; 152 int fallback = facesets[faceset].fallback;
141 153
142 /* proper case - falls back to base set */ 154 /* proper case - falls back to base set */
143 if (fallback == 0) return; 155 if (fallback == 0)
156 return;
144 157
145 if (!facesets[fallback].prefix) { 158 if (!facesets[fallback].prefix)
159 {
146 LOG(llevError,"Face set %d falls to non set faceset %d\n", faceset, fallback); 160 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
147 abort(); 161 abort ();
148 } 162 }
163
149 togo--; 164 togo--;
150 if (togo == 0) { 165 if (togo == 0)
166 {
151 LOG(llevError,"Infinite loop found in facesets. aborting.\n"); 167 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
152 abort(); 168 abort ();
153 } 169 }
170
154 check_faceset_fallback(fallback, togo); 171 check_faceset_fallback (fallback, togo);
155} 172}
156 173
157#define MAX_IMAGE_SIZE 10000 174#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 175
275/** 176/**
276 * Client tells us what type of faces it wants. Also sets 177 * Client tells us what type of faces it wants. Also sets
277 * the caching attribute. 178 * the caching attribute.
278 * 179 *
279 */ 180 */
280 181void
281void SetFaceMode(char *buf, int len, NewSocket *ns) 182SetFaceMode (char *buf, int len, client *ns)
282{ 183{
283 char tmp[256];
284
285 int mask =(atoi(buf) & CF_FACE_CACHE), mode=(atoi(buf) & ~CF_FACE_CACHE); 184 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
286 185
287 if (mode==CF_FACE_NONE) { 186 if (mode == CF_FACE_NONE)
288 ns->facecache=1; 187 ns->facecache = 1;
289 } else if (mode!=CF_FACE_PNG) { 188 else if (mode != CF_FACE_PNG)
290 sprintf(tmp,"drawinfo %d %s", NDI_RED,"Warning - send unsupported face mode. Will use Png"); 189 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)); 190
292#ifdef ESRV_DEBUG
293 LOG(llevDebug,"SetFaceMode: Invalid mode from client: %d\n", mode);
294#endif
295 }
296 if (mask) { 191 if (mask)
297 ns->facecache=1; 192 ns->facecache = 1;
298 }
299} 193}
300 194
301/** 195/**
302 * Client has requested pixmap that it somehow missed getting. 196 * Client has requested pixmap that it somehow missed getting.
303 * This will be called often if the client is 197 * This will be called often if the client is
304 * caching images. 198 * caching images.
305 */ 199 */
306 200void
307void SendFaceCmd(char *buff, int len, NewSocket *ns) 201SendFaceCmd (char *buf, int len, client *ns)
308{ 202{
309 long tmpnum = atoi(buff); 203 ns->send_image (atoi (buf));
310 short facenum=tmpnum & 0xffff; 204}
311 205
312 if(facenum!=0) 206// how lame
313 esrv_send_face(ns, facenum,1); 207static void print_facename (packet &sl, const facedata &d)
208{
209 for (int i = 0; i < CHKSUM_SIZE; ++i)
210 sl.printf ("%02x", d.chksum [i]);
211}
212
213// gcfclient uses the server-provided checksum for comparison, but always
214// writes a broken checksum to its cache file, so we have to provide
215// gcfclient with the same broken (and useless) checksum just to have it
216// cache the image despite its bugs.
217static uint32 gcfclient_checksum (const facedata *d)
218{
219 uint32 csum = 0;
220
221 for (std::string::const_iterator i = d->data.begin ();
222 i != d->data.end ();
223 ++i)
224 {
225 csum = rotate_right (csum);
226 csum += *(uint8 *)&*i;
227 }
228
229 return csum;
314} 230}
315 231
316/** 232/**
317 * Sends a face to a client if they are in pixmap mode 233 * Sends a face to a client if they are in pixmap mode
318 * nothing gets sent in bitmap mode. 234 * nothing gets sent in bitmap mode.
319 * If nocache is true (nonzero), ignore the cache setting from the client - 235 * 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 236 * 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, 237 * 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. 238 * we look at the facecache, and if set, send the image name.
323 */ 239 */
324 240void
325void esrv_send_face(NewSocket *ns,short face_num, int nocache) 241client::send_face (faceidx facenum)
326{ 242{
327 SockList sl; 243 // never send face 0. ever. it does not exist.
328 char fallback; 244 if (!facenum)
245 return;
329 246
330 if (face_num <= 0 || face_num >= nrofpixmaps) { 247 const facedata *d = face_data (facenum, faceset);
248
249 if (!d)
250 {
331 LOG(llevError,"esrv_send_face (%d) out of bounds??\n",face_num); 251 LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
332 return; 252 return;
253 }
254
255 if (faces_sent[facenum])
256 return;
257
258 faces_sent[facenum] = true;
259
260 // if for some reason we let a client without face caching connect,
261 // we better support that decision here and implement it.
262 if (!facecache)
263 return send_image (facenum);
264
265 if (fxix)
333 } 266 {
267 fxface.push_back (facenum);
268 return;
269 }
334 270
335 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 271 packet sl;
336 fallback = get_face_fallback(ns->faceset, face_num);
337 272
338 if (facesets[fallback].faces[face_num].data == NULL) { 273 if (force_face0)
339 LOG(llevError,"esrv_send_face: faces[%d].data == NULL\n",face_num); 274 sl << "face " << uint16 (facenum);
340 return; 275 else if (image2)
276 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
277 else
278 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
279
280 // how lame
281 print_facename (sl, *d);
282 send_packet (sl);
283
284 faceinfo *f = face_info (facenum);
285 if (f->smooth && EMI_smooth)
341 } 286 {
287 send_face (f->smooth);
342 288
343 if (ns->facecache && !nocache) { 289 packet sl ("smooth");
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 290
351 sl.len=strlen((const char*)sl.buf); 291 sl << uint16 (facenum)
352 SockList_AddShort(&sl, face_num); 292 << uint16 (f->smooth);
353 if (ns->image2) 293
354 SockList_AddChar(&sl, fallback); 294 send_packet (sl);
355 if (ns->sc_version >= 1026) 295 }
356 SockList_AddInt(&sl, facesets[fallback].faces[face_num].checksum); 296}
357 strcpy((char*)sl.buf + sl.len, new_faces[face_num].name); 297
358 sl.len += strlen(new_faces[face_num].name); 298void client::flush_fx ()
359 Send_With_Handling(ns, &sl); 299{
300 while (!fxface.empty ())
360 } 301 {
361 else { 302 packet sl ("fx");
362 if (ns->image2) 303
363 strcpy((char*)sl.buf, "image2 "); 304 do
364 else 305 {
365 strcpy((char*)sl.buf, "image "); 306 faceidx facenum = fxface.back (); fxface.pop_back ();
366 sl.len=strlen((char*)sl.buf); 307
367 SockList_AddInt(&sl, face_num); 308 const facedata *d = face_data (facenum, faceset);
368 if (ns->image2) 309
369 SockList_AddChar(&sl, fallback); 310 if (d)
370 SockList_AddInt(&sl, facesets[fallback].faces[face_num].datalen); 311 {
371 memcpy(sl.buf+sl.len, facesets[fallback].faces[face_num].data, 312 sl << ber32 (facenum)
372 facesets[fallback].faces[face_num].datalen); 313 << data8 (d->chksum, CHKSUM_SIZE);
373 sl.len += facesets[fallback].faces[face_num].datalen; 314
374 Send_With_Handling(ns, &sl); 315 faceinfo *f = face_info (facenum);
316 if (f->smooth && EMI_smooth)
317 sl << ber32 (f->smooth);
318 }
319 }
320 while (!fxface.empty () && sl.room () > CHKSUM_SIZE + 8 + 8);
321
322 send_packet (sl);
323 }
324}
325
326void
327client::send_image (faceidx facenum)
328{
329 // never send face 0. ever. it does not exist.
330 if (!facenum)
331 return;
332
333 const facedata *d = face_data (facenum, faceset);
334
335 if (!d)
375 } 336 {
376 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 337 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
377 free(sl.buf); 338 return;
339 }
340
341 faces_sent[facenum] = true;
342
343 if (force_image_newmap)
344 force_newmap = true;
345
346 packet sl;
347
348 sl << (image2 ? "image2 " : "image ")
349 << uint32 (facenum);
350
351 if (image2)
352 sl << uint8 (0);
353
354 sl << uint32 (d->data.size ())
355 << data (d->data.data (), d->data.size ());
356
357 send_packet (sl);
358}
359
360// send all faces of this object to the client
361// this uses more bandwidth initially, but makes
362// animations look much smoother, and every client
363// is supposed to do client-side caching anyways.
364void
365client::send_faces (object *ob)
366{
367 send_face (ob->face);
368
369 if (ob->animation_id)
370 {
371 animation &anim = animations [ob->animation_id];
372
373 for (int i = 0; i < anim.num_animations; i++)
374 send_face (anim.faces [i]);
375 }
376}
377
378/**
379 * Need to send an animation sequence to the client.
380 * We will send appropriate face commands to the client if we haven't
381 * sent them the face yet (this can become quite costly in terms of
382 * how much we are sending - on the other hand, this should only happen
383 * when the player logs in and picks stuff up.
384 */
385void
386client::send_animation (short anim_num)
387{
388 /* Do some checking on the anim_num we got. Note that the animations
389 * are added in contigous order, so if the number is in the valid
390 * range, it must be a valid animation.
391 */
392 if (anim_num < 0 || anim_num > num_animations)
393 {
394 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
395 return;
396 }
397
398 packet sl ("anim");
399
400 sl << uint16 (anim_num)
401 << uint16 (0); /* flags - not used right now */
402
403 /* Build up the list of faces. Also, send any information (ie, the
404 * the face itself) down to the client.
405 */
406 for (int i = 0; i < animations[anim_num].num_animations; i++)
407 {
408 send_face (animations[anim_num].faces[i]);
409 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
410 }
411
412 send_packet (sl);
413
414 anims_sent[anim_num] = 1;
378} 415}
379 416
380/** 417/**
381 * Sends the number of images, checksum of the face file, 418 * Sends the number of images, checksum of the face file,
382 * and the image_info file information. See the doc/Developers/protocol 419 * and the image_info file information. See the doc/Developers/protocol
383 * if you want further detail. 420 * if you want further detail.
384 */ 421 */
385 422void
386void send_image_info(NewSocket *ns, char *params) 423send_image_info (client *ns, char *params)
387{ 424{
388 SockList sl; 425 packet sl;
389 int i;
390 426
391 sl.buf = (unsigned char *) malloc(MAXSOCKBUF); 427 //TODO: second parameter is a checksum, but it makes no sense in this current framework
428 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
392 429
393 sprintf((char*)sl.buf,"replyinfo image_info\n%d\n%d\n", nrofpixmaps-1, bmaps_checksum); 430 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
394 for (i=0; i<MAX_FACE_SETS; i++) { 431
395 if (facesets[i].prefix) { 432 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} 433}
405 434
406/** 435/**
407 * Sends requested face information. 436 * Sends requested face information.
408 * \param ns socket to send to 437 * \param ns socket to send to
… …
410 * 439 *
411 * For each image in [start..stop] sends 440 * For each image in [start..stop] sends
412 * - checksum 441 * - checksum
413 * - name 442 * - name
414 */ 443 */
444void
415void send_image_sums(NewSocket *ns, char *params) 445send_image_sums (client *ns, char *params)
416{ 446{
417 int start, stop; 447 int start, stop;
418 short i; 448 char *cp;
419 char qq;
420 char *cp, buf[MAX_BUF];
421 SockList sl;
422 449
423 sl.buf = (unsigned char *) malloc(MAXSOCKBUF); 450 packet sl;
424 451
425 start = atoi(params); 452 start = atoi (params);
426 for (cp = params; *cp != '\0'; cp++) 453 for (cp = params; *cp != '\0'; cp++)
427 if (*cp == ' ') break; 454 if (*cp == ' ')
455 break;
428 456
429 stop = atoi(cp); 457 stop = atoi (cp);
430 if (stop < start || *cp == '\0' || (stop-start)>1000 || stop >= nrofpixmaps) { 458 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
459 {
460 sl.printf ("replyinfo image_sums %d %d", start, stop);
461 ns->send_packet (sl);
462 sl.reset ();
463 return;
464 }
465
431 sprintf(buf,"replyinfo image_sums %d %d", start, stop); 466 sl.printf ("replyinfo image_sums %d %d ", start, stop);
432 cs_write_string(ns, buf, strlen(buf)); 467
433 return; 468 for (int i = start; i <= stop && i < faces.size (); i++)
434 } 469 {
435 sprintf((char*)sl.buf,"replyinfo image_sums %d %d ", start, stop); 470 ns->faces_sent[i] = true;
436 471
437 sl.len = strlen((const char*)sl.buf); 472 const facedata *d = face_data (i, ns->faceset);
438 473
439 for (i=start; i<=stop; i++) { 474 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
440 SockList_AddShort(&sl, i); 475 break;
441 ns->faces_sent[i] |= NS_FACESENT_FACE;
442 476
443 qq = get_face_fallback(ns->faceset, i); 477 sl << uint16 (i)
444 SockList_AddInt(&sl, facesets[qq].faces[i].checksum); 478 << uint32 (0) // checksum
445 SockList_AddChar(&sl, qq); 479 << uint8 (ns->faceset);
446 480
447 qq = strlen(new_faces[i].name); 481 print_facename (sl, *d); sl << uint8 (0);
448 SockList_AddChar(&sl, ( char )( qq + 1 ));
449 strcpy((char*)sl.buf + sl.len, new_faces[i].name);
450 sl.len += qq;
451 SockList_AddChar(&sl, 0);
452 } 482 }
483
453 /* It would make more sense to catch this pre-emptively in the code above. 484 /* 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 485 * 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 486 * size to less than 1000, since that is what we claim the protocol would
456 * support. 487 * support.
457 */ 488 */
489 //TODO: taken care of above, should simply abort or make sure the above code is correct
458 if (sl.len >= MAXSOCKBUF) { 490 if (sl.length () >= MAXSOCKBUF)
491 {
459 LOG(llevError,"send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 492 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
460 abort(); 493 abort ();
461 } 494 }
462 Send_With_Handling(ns, &sl); 495
463 free(sl.buf); 496 ns->send_packet (sl);
464} 497}
498

Diff Legend

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