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.17 by root, Fri Jan 19 17:50:11 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>
44#include <newserver.h>
45#include <loader.h>
46
47#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */ 39#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */
48 40
49/** Information about one image */ 41/** Information about one image */
50typedef struct FaceInfo { 42typedef struct FaceInfo
43{
51 uint8 *data; /**< image data */ 44 uint8 *data; /**< image data */
52 uint16 datalen; /**< length of the xpm data */ 45 uint16 datalen; /**< length of the xpm data */
53 uint32 checksum; /**< Checksum of face data */ 46 uint32 checksum; /**< Checksum of face data */
54} FaceInfo; 47} FaceInfo;
55 48
56/** Information about one face set */ 49/** Information about one face set */
57typedef struct { 50typedef struct
51{
58 char *prefix; /**< */ 52 char *prefix; /**< */
59 char *fullname; 53 char *fullname;
54
60 uint8 fallback; /**< faceset to use when an image is not found in this faceset */ 55 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
61 char *size; 56 char *size;
62 char *extension; 57 char *extension;
63 char *comment; 58 char *comment;
59
64 FaceInfo *faces; /**< images in this faceset */ 60 FaceInfo *faces; /**< images in this faceset */
65} FaceSets; 61} FaceSets;
66 62
67static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */ 63static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */
68 64
69/** 65/**
70 * Checks specified faceset is valid 66 * Checks specified faceset is valid
71 * \param fsn faceset number 67 * \param fsn faceset number
72 */ 68 */
69int
73int is_valid_faceset(int fsn) 70is_valid_faceset (int fsn)
74{ 71{
75 if (fsn >=0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix) return TRUE; 72 if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix)
73 return TRUE;
76 return FALSE; 74 return FALSE;
77} 75}
78 76
79/** 77/**
80 * Frees all faceset information 78 * Frees all faceset information
81 */ 79 */
80void
82void free_socket_images(void) 81free_socket_images (void)
83{ 82{
84 int num,q; 83 int num, q;
85 84
86 for(num=0;num<MAX_FACE_SETS; num++) { 85 for (num = 0; num < MAX_FACE_SETS; num++)
86 {
87 if (facesets[num].prefix) { 87 if (facesets[num].prefix)
88 {
88 for (q=0; q<nrofpixmaps; q++) 89 for (q = 0; q < nrofpixmaps; q++)
89 if (facesets[num].faces[q].data) free(facesets[num].faces[q].data); 90 if (facesets[num].faces[q].data)
91 free (facesets[num].faces[q].data);
92
90 free(facesets[num].prefix); 93 free (facesets[num].prefix);
91 free(facesets[num].fullname); 94 free (facesets[num].fullname);
92 free(facesets[num].size); 95 free (facesets[num].size);
93 free(facesets[num].extension); 96 free (facesets[num].extension);
94 free(facesets[num].comment); 97 free (facesets[num].comment);
95 free(facesets[num].faces); 98 free (facesets[num].faces);
96 } 99 }
97 } 100 }
98} 101}
99 102
100/** 103/**
101 * This returns the set we will actually use when sending 104 * This returns the set we will actually use when sending
… …
107 * 110 *
108 * \param faceset faceset to check 111 * \param faceset faceset to check
109 * \param imageno image number 112 * \param imageno image number
110 * 113 *
111 */ 114 */
115static int
112static int get_face_fallback(int faceset, int imageno) 116get_face_fallback (int faceset, int imageno)
113{ 117{
114 /* faceset 0 is supposed to have every image, so just return. Doing 118 /* 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 119 * 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 120 * 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 121 * to access the data, but that is probably preferable to an infinite
118 * loop. 122 * loop.
119 */ 123 */
120 if (faceset==0) return 0; 124 if (faceset == 0)
125 return 0;
121 126
122 if (!facesets[faceset].prefix) { 127 if (!facesets[faceset].prefix)
128 {
123 LOG(llevError,"get_face_fallback called with unused set (%d)?\n", faceset); 129 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset);
124 return 0; /* use default set */ 130 return 0; /* use default set */
125 } 131 }
132
126 if (facesets[faceset].faces[imageno].data) return faceset; 133 if (facesets[faceset].faces[imageno].data)
134 return faceset;
135
127 return get_face_fallback(facesets[faceset].fallback, imageno); 136 return get_face_fallback (facesets[faceset].fallback, imageno);
128} 137}
129 138
130/** 139/**
131 * Checks fallback are correctly defined. 140 * Checks fallback are correctly defined.
132 * This is a simple recursive function that makes sure the fallbacks 141 * This is a simple recursive function that makes sure the fallbacks
133 * are all proper (eg, the fall back to defined sets, and also 142 * 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, 143 * 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. 144 * if togo gets to zero, it means we have a loop.
136 * This is only run when we first load the facesets. 145 * This is only run when we first load the facesets.
137 */ 146 */
147static void
138static void check_faceset_fallback(int faceset, int togo) 148check_faceset_fallback (int faceset, int togo)
139{ 149{
140 int fallback = facesets[faceset].fallback; 150 int fallback = facesets[faceset].fallback;
141 151
142 /* proper case - falls back to base set */ 152 /* proper case - falls back to base set */
143 if (fallback == 0) return; 153 if (fallback == 0)
154 return;
144 155
145 if (!facesets[fallback].prefix) { 156 if (!facesets[fallback].prefix)
157 {
146 LOG(llevError,"Face set %d falls to non set faceset %d\n", faceset, fallback); 158 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
147 abort(); 159 abort ();
148 } 160 }
161
149 togo--; 162 togo--;
150 if (togo == 0) { 163 if (togo == 0)
164 {
151 LOG(llevError,"Infinite loop found in facesets. aborting.\n"); 165 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
152 abort(); 166 abort ();
153 } 167 }
168
154 check_faceset_fallback(fallback, togo); 169 check_faceset_fallback (fallback, togo);
155} 170}
156 171
157#define MAX_IMAGE_SIZE 10000 172#define MAX_IMAGE_SIZE 10000
158 173
159/** 174/**
… …
170 * Function largely rewritten May 2000 to be more general purpose. 185 * 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, 186 * 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 187 * it is just data it needs to allocate. As such, the code is written
173 * to do such. 188 * to do such.
174 */ 189 */
175 190void
176void read_client_images(void) 191read_client_images (void)
177{ 192{
178 char filename[400]; 193 char filename[400];
179 char buf[HUGE_BUF]; 194 char buf[HUGE_BUF];
180 char *cp, *cps[7]; 195 char *cp, *cps[7];
181 FILE *infile; 196 FILE *infile;
182 int num,len,compressed, fileno,i, badline; 197 int num, len, compressed, fileno, i, badline;
183 198
184 memset(facesets, 0, sizeof(facesets)); 199 memset (facesets, 0, sizeof (facesets));
185 sprintf(filename,"%s/image_info",settings.datadir); 200 sprintf (filename, "%s/image_info", settings.datadir);
186 if ((infile=open_and_uncompress(filename, 0, &compressed))==NULL) { 201 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
202 {
187 LOG(llevError,"Unable to open %s\n", filename); 203 LOG (llevError, "Unable to open %s\n", filename);
188 abort(); 204 abort ();
189 } 205 }
206
190 while (fgets(buf, HUGE_BUF-1, infile)!=NULL) { 207 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
191 badline=0; 208 {
209 badline = 0;
192 210
193 if (buf[0] == '#') continue; 211 if (buf[0] == '#')
212 continue;
213
194 if (!(cps[0] = strtok(buf, ":"))) badline=1; 214 if (!(cps[0] = strtok (buf, ":")))
195 for (i=1; i<7; i++) { 215 badline = 1;
216
217 for (i = 1; i < 7; i++)
196 if (!(cps[i] = strtok(NULL, ":"))) badline=1; 218 if (!(cps[i] = strtok (NULL, ":")))
197 } 219 badline = 1;
198 if (badline) { 220
221 if (badline)
199 LOG(llevError,"Bad line in image_info file, ignoring line:\n %s", buf); 222 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
200 } else { 223 else
224 {
201 len = atoi(cps[0]); 225 len = atoi (cps[0]);
202 if (len >=MAX_FACE_SETS) { 226 if (len >= MAX_FACE_SETS)
227 {
203 LOG(llevError,"To high a setnum in image_info file: %d > %d\n", 228 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
204 len, MAX_FACE_SETS); 229 abort ();
205 abort(); 230 }
206 }
207 facesets[len].prefix = strdup_local(cps[1]); 231 facesets[len].prefix = strdup (cps[1]);
208 facesets[len].fullname = strdup_local(cps[2]); 232 facesets[len].fullname = strdup (cps[2]);
209 facesets[len].fallback = atoi(cps[3]); 233 facesets[len].fallback = atoi (cps[3]);
210 facesets[len].size = strdup_local(cps[4]); 234 facesets[len].size = strdup (cps[4]);
211 facesets[len].extension = strdup_local(cps[5]); 235 facesets[len].extension = strdup (cps[5]);
212 facesets[len].comment = strdup_local(cps[6]); 236 facesets[len].comment = strdup (cps[6]);
213 } 237 }
214 } 238 }
239
215 close_and_delete(infile,compressed); 240 close_and_delete (infile, compressed);
241
216 for (i=0; i<MAX_FACE_SETS; i++) { 242 for (i = 0; i < MAX_FACE_SETS; i++)
217 if (facesets[i].prefix) check_faceset_fallback(i, MAX_FACE_SETS);
218 } 243 {
244 if (facesets[i].prefix)
245 check_faceset_fallback (i, MAX_FACE_SETS);
246 }
247
219 /* Loaded the faceset information - now need to load up the 248 /* Loaded the faceset information - now need to load up the
220 * actual faces. 249 * actual faces.
221 */ 250 */
222 251
223 for (fileno=0; fileno<MAX_FACE_SETS; fileno++) { 252 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
253 {
224 /* if prefix is not set, this is not used */ 254 /* if prefix is not set, this is not used */
225 if (!facesets[fileno].prefix) continue; 255 if (!facesets[fileno].prefix)
256 continue;
257
226 facesets[fileno].faces = (FaceInfo *) calloc(nrofpixmaps, sizeof(FaceInfo)); 258 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
227 259
228 sprintf(filename,"%s/crossfire.%d",settings.datadir, fileno); 260 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
229 LOG(llevDebug,"Loading image file %s\n", filename); 261 LOG (llevDebug, "Loading image file %s\n", filename);
230 262
231 if ((infile = open_and_uncompress(filename,0,&compressed))==NULL) { 263 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
264 {
232 LOG(llevError,"Unable to open %s\n", filename); 265 LOG (llevError, "Unable to open %s\n", filename);
233 abort(); 266 abort ();
234 } 267 }
268
235 while(fgets(buf, HUGE_BUF-1, infile)!=NULL) { 269 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
270 {
236 if(strncmp(buf,"IMAGE ",6)!=0) { 271 if (strncmp (buf, "IMAGE ", 6) != 0)
272 {
237 LOG(llevError,"read_client_images:Bad image line - not IMAGE, instead\n%s",buf); 273 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
238 abort(); 274 abort ();
239 } 275 }
276
240 num = atoi(buf+6); 277 num = atoi (buf + 6);
241 if (num<0 || num>=nrofpixmaps) { 278 if (num < 0 || num >= nrofpixmaps)
279 {
242 LOG(llevError,"read_client_images: Image num %d not in 0..%d\n%s", 280 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
243 num,nrofpixmaps,buf); 281 abort ();
244 abort(); 282 }
245 } 283
246 /* Skip accross the number data */ 284 /* Skip accross the number data */
247 for (cp=buf+6; *cp!=' '; cp++) ; 285 for (cp = buf + 6; *cp != ' '; cp++);
248 len = atoi(cp); 286 len = atoi (cp);
249 if (len==0 || len>MAX_IMAGE_SIZE) { 287 if (len == 0 || len > MAX_IMAGE_SIZE)
250 LOG(llevError,"read_client_images: length not valid: %d > %d \n%s", 288 {
251 len,MAX_IMAGE_SIZE,buf); 289 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
252 abort(); 290 abort ();
253 } 291 }
292
254 /* We don't actualy care about the name if the image that 293 /* We don't actualy care about the name of the image that
255 * is embedded in the image file, so just ignore it. 294 * is embedded in the image file, so just ignore it.
256 */ 295 */
257 facesets[fileno].faces[num].datalen = len; 296 facesets[fileno].faces[num].datalen = len;
258 facesets[fileno].faces[num].data = (uint8*) malloc(len); 297 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
259 if ((i=fread(facesets[fileno].faces[num].data, len, 1, infile))!=1) { 298 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
299 {
260 LOG(llevError,"read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", 300 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); 301 abort ();
262 abort(); 302 }
263 } 303
264 facesets[fileno].faces[num].checksum=0; 304 facesets[fileno].faces[num].checksum = 0;
265 for (i=0; i<len; i++) { 305 for (i = 0; i < len; i++)
306 {
266 ROTATE_RIGHT(facesets[fileno].faces[num].checksum); 307 ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
267 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i]; 308 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
268 facesets[fileno].faces[num].checksum &= 0xffffffff; 309 facesets[fileno].faces[num].checksum &= 0xffffffff;
269 } 310 }
270 } 311 }
312
271 close_and_delete(infile,compressed); 313 close_and_delete (infile, compressed);
272 } /* For fileno < MAX_FACE_SETS */ 314 } /* For fileno < MAX_FACE_SETS */
273} 315}
274 316
275/** 317/**
276 * Client tells us what type of faces it wants. Also sets 318 * Client tells us what type of faces it wants. Also sets
277 * the caching attribute. 319 * the caching attribute.
278 * 320 *
279 */ 321 */
280 322void
281void SetFaceMode(char *buf, int len, NewSocket *ns) 323SetFaceMode (char *buf, int len, client *ns)
282{ 324{
283 char tmp[256];
284
285 int mask =(atoi(buf) & CF_FACE_CACHE), mode=(atoi(buf) & ~CF_FACE_CACHE); 325 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
286 326
287 if (mode==CF_FACE_NONE) { 327 if (mode == CF_FACE_NONE)
288 ns->facecache=1; 328 ns->facecache = 1;
289 } else if (mode!=CF_FACE_PNG) { 329 else if (mode != CF_FACE_PNG)
290 sprintf(tmp,"drawinfo %d %s", NDI_RED,"Warning - send unsupported face mode. Will use Png"); 330 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)); 331
292#ifdef ESRV_DEBUG
293 LOG(llevDebug,"SetFaceMode: Invalid mode from client: %d\n", mode);
294#endif
295 }
296 if (mask) { 332 if (mask)
297 ns->facecache=1; 333 ns->facecache = 1;
298 }
299} 334}
300 335
301/** 336/**
302 * Client has requested pixmap that it somehow missed getting. 337 * Client has requested pixmap that it somehow missed getting.
303 * This will be called often if the client is 338 * This will be called often if the client is
304 * caching images. 339 * caching images.
305 */ 340 */
306 341void
307void SendFaceCmd(char *buff, int len, NewSocket *ns) 342SendFaceCmd (char *buf, int len, client *ns)
308{ 343{
309 long tmpnum = atoi(buff); 344 uint16 facenum = atoi (buf);
310 short facenum=tmpnum & 0xffff;
311 345
312 if(facenum!=0) 346 if (facenum != 0)
313 esrv_send_face(ns, facenum,1); 347 esrv_send_face (ns, facenum, 1);
314} 348}
315 349
316/** 350/**
317 * Sends a face to a client if they are in pixmap mode 351 * Sends a face to a client if they are in pixmap mode
318 * nothing gets sent in bitmap mode. 352 * nothing gets sent in bitmap mode.
319 * If nocache is true (nonzero), ignore the cache setting from the client - 353 * 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 354 * 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, 355 * 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. 356 * we look at the facecache, and if set, send the image name.
323 */ 357 */
324 358void
325void esrv_send_face(NewSocket *ns,short face_num, int nocache) 359esrv_send_face (client *ns, short face_num, int nocache)
326{ 360{
327 SockList sl;
328 char fallback; 361 char fallback;
329 362
330 if (face_num <= 0 || face_num >= nrofpixmaps) { 363 if (face_num <= 0 || face_num >= nrofpixmaps)
364 {
331 LOG(llevError,"esrv_send_face (%d) out of bounds??\n",face_num); 365 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);
332 return; 366 return;
333 } 367 }
334 368
335 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 369 packet sl;
336 fallback = get_face_fallback(ns->faceset, face_num); 370 fallback = get_face_fallback (ns->faceset, face_num);
337 371
338 if (facesets[fallback].faces[face_num].data == NULL) { 372 if (facesets[fallback].faces[face_num].data == NULL)
373 {
339 LOG(llevError,"esrv_send_face: faces[%d].data == NULL\n",face_num); 374 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);
340 return; 375 return;
341 } 376 }
342 377
343 if (ns->facecache && !nocache) { 378 if (ns->facecache && !nocache)
379 {
380 sl << (ns->image2 ? "face2 " : "face1 ")
381 << uint16 (face_num);
382
344 if (ns->image2) 383 if (ns->image2)
345 strcpy((char*)sl.buf, "face2 "); 384 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 385
351 sl.len=strlen((const char*)sl.buf); 386 sl << uint32 (facesets[fallback].faces[face_num].checksum)
352 SockList_AddShort(&sl, face_num); 387 << new_faces[face_num].name;
388
389 ns->send_packet (sl);
390 }
391 else
392 {
393 sl << (ns->image2 ? "image2 " : "image ")
394 << uint32 (face_num);
395
353 if (ns->image2) 396 if (ns->image2)
354 SockList_AddChar(&sl, fallback); 397 sl << uint8 (fallback);
355 if (ns->sc_version >= 1026) 398
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; 399 sl << uint32 (facesets[fallback].faces[face_num].datalen)
374 Send_With_Handling(ns, &sl); 400 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
401
402 ns->send_packet (sl);
375 } 403 }
404
376 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 405 ns->faces_sent[face_num] |= NS_FACESENT_FACE;
377 free(sl.buf);
378} 406}
379 407
380/** 408/**
381 * Sends the number of images, checksum of the face file, 409 * Sends the number of images, checksum of the face file,
382 * and the image_info file information. See the doc/Developers/protocol 410 * and the image_info file information. See the doc/Developers/protocol
383 * if you want further detail. 411 * if you want further detail.
384 */ 412 */
385 413
414void
386void send_image_info(NewSocket *ns, char *params) 415send_image_info (client *ns, char *params)
387{ 416{
388 SockList sl; 417 packet sl;
389 int i;
390 418
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); 419 sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum);
420
394 for (i=0; i<MAX_FACE_SETS; i++) { 421 for (int i = 0; i < MAX_FACE_SETS; i++)
395 if (facesets[i].prefix) { 422 if (facesets[i].prefix)
396 sprintf((char*)sl.buf + strlen((const char*)sl.buf), "%d:%s:%s:%d:%s:%s:%s", 423 sl.printf ("%d:%s:%s:%d:%s:%s:%s", i,
397 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback, 424 facesets[i].prefix, facesets[i].fullname , facesets[i].fallback,
398 facesets[i].size, facesets[i].extension, facesets[i].comment); 425 facesets[i].size , facesets[i].extension, facesets[i].comment);
399 } 426
400 } 427 ns->send_packet (sl);
401 sl.len = strlen((const char*)sl.buf);
402 Send_With_Handling(ns, &sl);
403 free(sl.buf);
404} 428}
405 429
406/** 430/**
407 * Sends requested face information. 431 * Sends requested face information.
408 * \param ns socket to send to 432 * \param ns socket to send to
… …
410 * 434 *
411 * For each image in [start..stop] sends 435 * For each image in [start..stop] sends
412 * - checksum 436 * - checksum
413 * - name 437 * - name
414 */ 438 */
439void
415void send_image_sums(NewSocket *ns, char *params) 440send_image_sums (client *ns, char *params)
416{ 441{
417 int start, stop; 442 int start, stop;
418 short i;
419 char qq;
420 char *cp, buf[MAX_BUF]; 443 char *cp, buf[MAX_BUF];
421 SockList sl;
422 444
423 sl.buf = (unsigned char *) malloc(MAXSOCKBUF); 445 packet sl;
424 446
425 start = atoi(params); 447 start = atoi (params);
426 for (cp = params; *cp != '\0'; cp++) 448 for (cp = params; *cp != '\0'; cp++)
427 if (*cp == ' ') break; 449 if (*cp == ' ')
450 break;
428 451
429 stop = atoi(cp); 452 stop = atoi (cp);
430 if (stop < start || *cp == '\0' || (stop-start)>1000 || stop >= nrofpixmaps) { 453 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps)
454 {
455 sl.printf ("replyinfo image_sums %d %d", start, stop);
456 ns->send_packet (sl);
457 sl.reset ();
458 return;
459 }
460
431 sprintf(buf,"replyinfo image_sums %d %d", start, stop); 461 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 462
437 sl.len = strlen((const char*)sl.buf);
438
439 for (i=start; i<=stop; i++) { 463 for (int i = start; i <= stop; i++)
440 SockList_AddShort(&sl, i); 464 {
441 ns->faces_sent[i] |= NS_FACESENT_FACE; 465 ns->faces_sent[i] |= NS_FACESENT_FACE;
442 466
443 qq = get_face_fallback(ns->faceset, i); 467 int qq = get_face_fallback (ns->faceset, i);
444 SockList_AddInt(&sl, facesets[qq].faces[i].checksum);
445 SockList_AddChar(&sl, qq);
446 468
447 qq = strlen(new_faces[i].name); 469 sl << uint16 (i)
448 SockList_AddChar(&sl, ( char )( qq + 1 )); 470 << uint32 (facesets[qq].faces[i].checksum)
449 strcpy((char*)sl.buf + sl.len, new_faces[i].name); 471 << uint8 (qq)
450 sl.len += qq; 472 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1);
451 SockList_AddChar(&sl, 0);
452 } 473 }
474
453 /* It would make more sense to catch this pre-emptively in the code above. 475 /* 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 476 * 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 477 * size to less than 1000, since that is what we claim the protocol would
456 * support. 478 * support.
457 */ 479 */
458 if (sl.len >= MAXSOCKBUF) { 480 if (sl.length () >= MAXSOCKBUF)
481 {
459 LOG(llevError,"send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 482 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
460 abort(); 483 abort ();
461 } 484 }
462 Send_With_Handling(ns, &sl); 485
463 free(sl.buf); 486 ns->send_packet (sl);
464} 487}
488

Diff Legend

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