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.22 by pippijn, Thu Mar 1 12:28:17 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)
90 {
88 for (q=0; q<nrofpixmaps; q++) 91 for (q = 0; q < nrofpixmaps; q++)
89 if (facesets[num].faces[q].data) free(facesets[num].faces[q].data); 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 175
159/** 176/**
… …
170 * Function largely rewritten May 2000 to be more general purpose. 187 * 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, 188 * 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 189 * it is just data it needs to allocate. As such, the code is written
173 * to do such. 190 * to do such.
174 */ 191 */
175 192void
176void read_client_images(void) 193read_client_images (void)
177{ 194{
178 char filename[400]; 195 char filename[400];
179 char buf[HUGE_BUF]; 196 char buf[HUGE_BUF];
180 char *cp, *cps[7]; 197 char *cp, *cps[7];
181 FILE *infile; 198 FILE *infile;
182 int num,len,compressed, fileno,i, badline; 199 int num, len, compressed, fileno, i, badline;
183 200
184 memset(facesets, 0, sizeof(facesets)); 201 memset (facesets, 0, sizeof (facesets));
185 sprintf(filename,"%s/image_info",settings.datadir); 202 sprintf (filename, "%s/image_info", settings.datadir);
186 if ((infile=open_and_uncompress(filename, 0, &compressed))==NULL) { 203 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
204 {
187 LOG(llevError,"Unable to open %s\n", filename); 205 LOG (llevError, "Unable to open %s\n", filename);
188 abort(); 206 abort ();
189 } 207 }
208
190 while (fgets(buf, HUGE_BUF-1, infile)!=NULL) { 209 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
191 badline=0; 210 {
211 badline = 0;
192 212
193 if (buf[0] == '#') continue; 213 if (buf[0] == '#')
214 continue;
215
194 if (!(cps[0] = strtok(buf, ":"))) badline=1; 216 if (!(cps[0] = strtok (buf, ":")))
195 for (i=1; i<7; i++) { 217 badline = 1;
218
219 for (i = 1; i < 7; i++)
196 if (!(cps[i] = strtok(NULL, ":"))) badline=1; 220 if (!(cps[i] = strtok (NULL, ":")))
197 } 221 badline = 1;
198 if (badline) { 222
223 if (badline)
199 LOG(llevError,"Bad line in image_info file, ignoring line:\n %s", buf); 224 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
200 } else { 225 else
226 {
201 len = atoi(cps[0]); 227 len = atoi (cps[0]);
202 if (len >=MAX_FACE_SETS) { 228 if (len >= MAX_FACE_SETS)
229 {
203 LOG(llevError,"To high a setnum in image_info file: %d > %d\n", 230 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
204 len, MAX_FACE_SETS); 231 abort ();
205 abort(); 232 }
206 }
207 facesets[len].prefix = strdup_local(cps[1]); 233 facesets[len].prefix = strdup (cps[1]);
208 facesets[len].fullname = strdup_local(cps[2]); 234 facesets[len].fullname = strdup (cps[2]);
209 facesets[len].fallback = atoi(cps[3]); 235 facesets[len].fallback = atoi (cps[3]);
210 facesets[len].size = strdup_local(cps[4]); 236 facesets[len].size = strdup (cps[4]);
211 facesets[len].extension = strdup_local(cps[5]); 237 facesets[len].extension = strdup (cps[5]);
212 facesets[len].comment = strdup_local(cps[6]); 238 facesets[len].comment = strdup (cps[6]);
213 } 239 }
214 } 240 }
241
215 close_and_delete(infile,compressed); 242 close_and_delete (infile, compressed);
243
216 for (i=0; i<MAX_FACE_SETS; i++) { 244 for (i = 0; i < MAX_FACE_SETS; i++)
217 if (facesets[i].prefix) check_faceset_fallback(i, MAX_FACE_SETS);
218 } 245 {
246 if (facesets[i].prefix)
247 check_faceset_fallback (i, MAX_FACE_SETS);
248 }
249
219 /* Loaded the faceset information - now need to load up the 250 /* Loaded the faceset information - now need to load up the
220 * actual faces. 251 * actual faces.
221 */ 252 */
222 253
223 for (fileno=0; fileno<MAX_FACE_SETS; fileno++) { 254 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
255 {
224 /* if prefix is not set, this is not used */ 256 /* if prefix is not set, this is not used */
225 if (!facesets[fileno].prefix) continue; 257 if (!facesets[fileno].prefix)
258 continue;
259
226 facesets[fileno].faces = (FaceInfo *) calloc(nrofpixmaps, sizeof(FaceInfo)); 260 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
227 261
228 sprintf(filename,"%s/crossfire.%d",settings.datadir, fileno); 262 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
229 LOG(llevDebug,"Loading image file %s\n", filename); 263 LOG (llevDebug, "Loading image file %s\n", filename);
230 264
231 if ((infile = open_and_uncompress(filename,0,&compressed))==NULL) { 265 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
266 {
232 LOG(llevError,"Unable to open %s\n", filename); 267 LOG (llevError, "Unable to open %s\n", filename);
233 abort(); 268 abort ();
234 } 269 }
270
235 while(fgets(buf, HUGE_BUF-1, infile)!=NULL) { 271 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
272 {
236 if(strncmp(buf,"IMAGE ",6)!=0) { 273 if (strncmp (buf, "IMAGE ", 6) != 0)
274 {
237 LOG(llevError,"read_client_images:Bad image line - not IMAGE, instead\n%s",buf); 275 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
238 abort(); 276 abort ();
239 } 277 }
278
240 num = atoi(buf+6); 279 num = atoi (buf + 6);
241 if (num<0 || num>=nrofpixmaps) { 280 if (num < 0 || num >= nrofpixmaps)
281 {
242 LOG(llevError,"read_client_images: Image num %d not in 0..%d\n%s", 282 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
243 num,nrofpixmaps,buf); 283 abort ();
244 abort(); 284 }
245 } 285
246 /* Skip accross the number data */ 286 /* Skip accross the number data */
247 for (cp=buf+6; *cp!=' '; cp++) ; 287 for (cp = buf + 6; *cp != ' '; cp++)
288 ;
289
248 len = atoi(cp); 290 len = atoi (cp);
249 if (len==0 || len>MAX_IMAGE_SIZE) { 291 if (len == 0 || len > MAX_IMAGE_SIZE)
250 LOG(llevError,"read_client_images: length not valid: %d > %d \n%s", 292 {
251 len,MAX_IMAGE_SIZE,buf); 293 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
252 abort(); 294 abort ();
253 } 295 }
296
254 /* We don't actualy care about the name if the image that 297 /* We don't actualy care about the name of the image that
255 * is embedded in the image file, so just ignore it. 298 * is embedded in the image file, so just ignore it.
256 */ 299 */
257 facesets[fileno].faces[num].datalen = len; 300 facesets[fileno].faces[num].datalen = len;
258 facesets[fileno].faces[num].data = (uint8*) malloc(len); 301 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
259 if ((i=fread(facesets[fileno].faces[num].data, len, 1, infile))!=1) { 302 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
303 {
260 LOG(llevError,"read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", 304 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
261 len, i, buf); 305 abort ();
262 abort(); 306 }
263 } 307
308 crc32 chksum;
309
310 for (i = 0; i < len; i++)
311 chksum (facesets[fileno].faces[num].data[i]);
312
264 facesets[fileno].faces[num].checksum=0; 313 facesets[fileno].faces[num].checksum = chksum;
265 for (i=0; i<len; i++) { 314 }
266 ROTATE_RIGHT(facesets[fileno].faces[num].checksum); 315
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); 316 close_and_delete (infile, compressed);
272 } /* For fileno < MAX_FACE_SETS */ 317 } /* For fileno < MAX_FACE_SETS */
273} 318}
274 319
275/** 320/**
276 * Client tells us what type of faces it wants. Also sets 321 * Client tells us what type of faces it wants. Also sets
277 * the caching attribute. 322 * the caching attribute.
278 * 323 *
279 */ 324 */
280 325void
281void SetFaceMode(char *buf, int len, NewSocket *ns) 326SetFaceMode (char *buf, int len, client *ns)
282{ 327{
283 char tmp[256];
284
285 int mask =(atoi(buf) & CF_FACE_CACHE), mode=(atoi(buf) & ~CF_FACE_CACHE); 328 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
286 329
287 if (mode==CF_FACE_NONE) { 330 if (mode == CF_FACE_NONE)
288 ns->facecache=1; 331 ns->facecache = 1;
289 } else if (mode!=CF_FACE_PNG) { 332 else if (mode != CF_FACE_PNG)
290 sprintf(tmp,"drawinfo %d %s", NDI_RED,"Warning - send unsupported face mode. Will use Png"); 333 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)); 334
292#ifdef ESRV_DEBUG
293 LOG(llevDebug,"SetFaceMode: Invalid mode from client: %d\n", mode);
294#endif
295 }
296 if (mask) { 335 if (mask)
297 ns->facecache=1; 336 ns->facecache = 1;
298 }
299} 337}
300 338
301/** 339/**
302 * Client has requested pixmap that it somehow missed getting. 340 * Client has requested pixmap that it somehow missed getting.
303 * This will be called often if the client is 341 * This will be called often if the client is
304 * caching images. 342 * caching images.
305 */ 343 */
306 344void
307void SendFaceCmd(char *buff, int len, NewSocket *ns) 345SendFaceCmd (char *buf, int len, client *ns)
308{ 346{
309 long tmpnum = atoi(buff); 347 uint16 facenum = atoi (buf);
310 short facenum=tmpnum & 0xffff;
311 348
312 if(facenum!=0) 349 if (facenum != 0)
313 esrv_send_face(ns, facenum,1); 350 esrv_send_face (ns, facenum, 1);
314} 351}
315 352
316/** 353/**
317 * Sends a face to a client if they are in pixmap mode 354 * Sends a face to a client if they are in pixmap mode
318 * nothing gets sent in bitmap mode. 355 * nothing gets sent in bitmap mode.
319 * If nocache is true (nonzero), ignore the cache setting from the client - 356 * 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 357 * 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, 358 * 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. 359 * we look at the facecache, and if set, send the image name.
323 */ 360 */
324 361void
325void esrv_send_face(NewSocket *ns,short face_num, int nocache) 362esrv_send_face (client *ns, short face_num, int nocache)
326{ 363{
327 SockList sl;
328 char fallback; 364 char fallback;
329 365
330 if (face_num <= 0 || face_num >= nrofpixmaps) { 366 if (face_num <= 0 || face_num >= nrofpixmaps)
367 {
331 LOG(llevError,"esrv_send_face (%d) out of bounds??\n",face_num); 368 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);
332 return; 369 return;
333 } 370 }
334 371
335 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 372 packet sl;
336 fallback = get_face_fallback(ns->faceset, face_num); 373 fallback = get_face_fallback (ns->faceset, face_num);
337 374
338 if (facesets[fallback].faces[face_num].data == NULL) { 375 if (facesets[fallback].faces[face_num].data == NULL)
376 {
339 LOG(llevError,"esrv_send_face: faces[%d].data == NULL\n",face_num); 377 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);
340 return; 378 return;
341 } 379 }
342 380
343 if (ns->facecache && !nocache) { 381 if (ns->facecache && !nocache)
382 {
383 sl << (ns->image2 ? "face2 " : "face1 ")
384 << uint16 (face_num);
385
344 if (ns->image2) 386 if (ns->image2)
345 strcpy((char*)sl.buf, "face2 "); 387 sl << uint8 (fallback);
346 else if (ns->sc_version >= 1026)
347 strcpy((char*)sl.buf, "face1 ");
348 else
349 strcpy((char*)sl.buf, "face ");
350 388
351 sl.len=strlen((const char*)sl.buf); 389 sl << uint32 (facesets[fallback].faces[face_num].checksum)
352 SockList_AddShort(&sl, face_num); 390 << new_faces[face_num].name;
391
392 ns->send_packet (sl);
393 }
394 else
395 {
396 sl << (ns->image2 ? "image2 " : "image ")
397 << uint32 (face_num);
398
353 if (ns->image2) 399 if (ns->image2)
354 SockList_AddChar(&sl, fallback); 400 sl << uint8 (fallback);
355 if (ns->sc_version >= 1026) 401
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; 402 sl << uint32 (facesets[fallback].faces[face_num].datalen)
374 Send_With_Handling(ns, &sl); 403 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
404
405 ns->send_packet (sl);
375 } 406 }
407
376 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 408 ns->faces_sent[face_num] |= NS_FACESENT_FACE;
377 free(sl.buf);
378} 409}
379 410
380/** 411/**
381 * Sends the number of images, checksum of the face file, 412 * Sends the number of images, checksum of the face file,
382 * and the image_info file information. See the doc/Developers/protocol 413 * and the image_info file information. See the doc/Developers/protocol
383 * if you want further detail. 414 * if you want further detail.
384 */ 415 */
385 416
417void
386void send_image_info(NewSocket *ns, char *params) 418send_image_info (client *ns, char *params)
387{ 419{
388 SockList sl; 420 packet sl;
389 int i;
390 421
391 sl.buf = (unsigned char *) malloc(MAXSOCKBUF);
392
393 sprintf((char*)sl.buf,"replyinfo image_info\n%d\n%d\n", nrofpixmaps-1, bmaps_checksum); 422 sl.printf ("replyinfo image_info\n%d\n%u\n", nrofpixmaps - 1, (unsigned int)bmaps_checksum);
423
394 for (i=0; i<MAX_FACE_SETS; i++) { 424 for (int i = 0; i < MAX_FACE_SETS; i++)
395 if (facesets[i].prefix) { 425 if (facesets[i].prefix)
396 sprintf((char*)sl.buf + strlen((const char*)sl.buf), "%d:%s:%s:%d:%s:%s:%s", 426 sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
397 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback, 427 facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
398 facesets[i].size, facesets[i].extension, facesets[i].comment); 428 facesets[i].size , facesets[i].extension, facesets[i].comment);
399 } 429
400 } 430 ns->send_packet (sl);
401 sl.len = strlen((const char*)sl.buf);
402 Send_With_Handling(ns, &sl);
403 free(sl.buf);
404} 431}
405 432
406/** 433/**
407 * Sends requested face information. 434 * Sends requested face information.
408 * \param ns socket to send to 435 * \param ns socket to send to
… …
410 * 437 *
411 * For each image in [start..stop] sends 438 * For each image in [start..stop] sends
412 * - checksum 439 * - checksum
413 * - name 440 * - name
414 */ 441 */
442void
415void send_image_sums(NewSocket *ns, char *params) 443send_image_sums (client *ns, char *params)
416{ 444{
417 int start, stop; 445 int start, stop;
418 short i; 446 char *cp;
419 char qq;
420 char *cp, buf[MAX_BUF];
421 SockList sl;
422 447
423 sl.buf = (unsigned char *) malloc(MAXSOCKBUF); 448 packet sl;
424 449
425 start = atoi(params); 450 start = atoi (params);
426 for (cp = params; *cp != '\0'; cp++) 451 for (cp = params; *cp != '\0'; cp++)
427 if (*cp == ' ') break; 452 if (*cp == ' ')
453 break;
428 454
429 stop = atoi(cp); 455 stop = atoi (cp);
430 if (stop < start || *cp == '\0' || (stop-start)>1000 || stop >= nrofpixmaps) { 456 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps)
457 {
458 sl.printf ("replyinfo image_sums %d %d", start, stop);
459 ns->send_packet (sl);
460 sl.reset ();
461 return;
462 }
463
431 sprintf(buf,"replyinfo image_sums %d %d", start, stop); 464 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 465
437 sl.len = strlen((const char*)sl.buf);
438
439 for (i=start; i<=stop; i++) { 466 for (int i = start; i <= stop; i++)
440 SockList_AddShort(&sl, i); 467 {
441 ns->faces_sent[i] |= NS_FACESENT_FACE; 468 ns->faces_sent[i] |= NS_FACESENT_FACE;
442 469
443 qq = get_face_fallback(ns->faceset, i); 470 int qq = get_face_fallback (ns->faceset, i);
444 SockList_AddInt(&sl, facesets[qq].faces[i].checksum);
445 SockList_AddChar(&sl, qq);
446 471
447 qq = strlen(new_faces[i].name); 472 sl << uint16 (i)
448 SockList_AddChar(&sl, ( char )( qq + 1 )); 473 << uint32 (facesets[qq].faces[i].checksum)
449 strcpy((char*)sl.buf + sl.len, new_faces[i].name); 474 << uint8 (qq)
450 sl.len += qq; 475 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1);
451 SockList_AddChar(&sl, 0);
452 } 476 }
477
453 /* It would make more sense to catch this pre-emptively in the code above. 478 /* 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 479 * 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 480 * size to less than 1000, since that is what we claim the protocol would
456 * support. 481 * support.
457 */ 482 */
458 if (sl.len >= MAXSOCKBUF) { 483 if (sl.length () >= MAXSOCKBUF)
484 {
459 LOG(llevError,"send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 485 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
460 abort(); 486 abort ();
461 } 487 }
462 Send_With_Handling(ns, &sl); 488
463 free(sl.buf); 489 ns->send_packet (sl);
464} 490}
491

Diff Legend

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