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.48 by root, Thu Jul 12 18:48:20 2007 UTC

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

Diff Legend

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