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.2 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.3 by root, Sun Sep 10 13:43:33 2006 UTC

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

Diff Legend

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