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.6 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.58 by root, Sat Dec 27 01:25:00 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** \file 24/** \file
25 * Image related communication 25 * Image related communication
26 * 26 *
27 * \date 2003-12-02 27 * \date 2003-12-02
… …
33 */ 33 */
34 34
35#include <global.h> 35#include <global.h>
36#include <sproto.h> 36#include <sproto.h>
37 37
38#include <newclient.h> 38#include "crc.h"
39#include <newserver.h>
40#include <loader.h>
41 39
42#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */ 40#define MAX_IMAGE_SIZE 10000
43 41
44/** Information about one image */
45typedef struct FaceInfo
46{
47
48 uint8 *data; /**< image data */
49
50 uint16 datalen; /**< length of the xpm data */
51
52 uint32 checksum; /**< Checksum of face data */
53} FaceInfo;
54
55/** Information about one face set */
56typedef struct
57{
58
59 char *prefix; /**< */
60 char *fullname;
61
62 uint8 fallback; /**< faceset to use when an image is not found in this faceset */
63 char *size;
64 char *extension;
65 char *comment;
66
67 FaceInfo *faces; /**< images in this faceset */
68} FaceSets;
69
70static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */
71
72/** 42/**
73 * Checks specified faceset is valid 43 * client requested an image. send it rate-limited
74 * \param fsn faceset number 44 * before flushing.
75 */ 45 */
76int
77is_valid_faceset (int fsn)
78{
79 if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix)
80 return TRUE;
81 return FALSE;
82}
83
84/**
85 * Frees all faceset information
86 */
87void 46void
88free_socket_images (void) 47AskFaceCmd (char *buf, int len, client *ns)
89{ 48{
90 int num, q; 49 int idx = 0, pri = 0;
91 50
92 for (num = 0; num < MAX_FACE_SETS; num++) 51 sscanf (buf, "%d %d", &idx, &pri);
52
53 //TODO: somehow fetch default priority from send_fx here
54
55 const facedata *d = face_data (idx, ns->faceset);
56
57 if (!d)
58 return; // doh
59
60 client::ixsend ix;
61
62 ix.pri = pri;
63 ix.idx = idx;
64 ix.ofs = d->data.size ();
65
66 auto (pos, ns->ixface.end ());
67
68 // the by far most common case will be to insert
69 // near the end, so little looping.
70 while (pos != ns->ixface.begin ())
93 { 71 {
94 if (facesets[num].prefix) 72 --pos;
73
74 // sort within 2k bins, to slightly prefer smaller images
75 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
95 { 76 {
96 for (q = 0; q < nrofpixmaps; q++) 77 ++pos;
97 if (facesets[num].faces[q].data) 78 break;
98 free (facesets[num].faces[q].data);
99 free (facesets[num].prefix);
100 free (facesets[num].fullname);
101 free (facesets[num].size);
102 free (facesets[num].extension);
103 free (facesets[num].comment);
104 free (facesets[num].faces);
105 } 79 }
106 } 80 }
107}
108 81
109/** 82 ns->ixface.insert (pos, ix);
110 * This returns the set we will actually use when sending
111 * a face. This is used because the image files may be sparse.
112 * This function is recursive. imageno is the face number we are
113 * trying to send
114 *
115 * If face is not found in specified faceset, tries with 'fallback' faceset.
116 *
117 * \param faceset faceset to check
118 * \param imageno image number
119 *
120 */
121static int
122get_face_fallback (int faceset, int imageno)
123{
124 /* faceset 0 is supposed to have every image, so just return. Doing
125 * so also prevents infinite loops in the case if it not having
126 * the face, but in that case, we are likely to crash when we try
127 * to access the data, but that is probably preferable to an infinite
128 * loop.
129 */
130 if (faceset == 0)
131 return 0;
132 83
133 if (!facesets[faceset].prefix) 84#if 0
134 { 85 for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
135 LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset); 86 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs);
136 return 0; /* use default set */ 87 fprintf (stderr, "\n");
137 }
138 if (facesets[faceset].faces[imageno].data)
139 return faceset;
140 return get_face_fallback (facesets[faceset].fallback, imageno);
141}
142
143/**
144 * Checks fallback are correctly defined.
145 * This is a simple recursive function that makes sure the fallbacks
146 * are all proper (eg, the fall back to defined sets, and also
147 * eventually fall back to 0). At the top level, togo is set to MAX_FACE_SETS,
148 * if togo gets to zero, it means we have a loop.
149 * This is only run when we first load the facesets.
150 */
151static void
152check_faceset_fallback (int faceset, int togo)
153{
154 int fallback = facesets[faceset].fallback;
155
156 /* proper case - falls back to base set */
157 if (fallback == 0)
158 return;
159
160 if (!facesets[fallback].prefix)
161 {
162 LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback);
163 abort ();
164 }
165 togo--;
166 if (togo == 0)
167 {
168 LOG (llevError, "Infinite loop found in facesets. aborting.\n");
169 abort ();
170 }
171 check_faceset_fallback (fallback, togo);
172}
173
174#define MAX_IMAGE_SIZE 10000
175
176/**
177 * Loads all the image types into memory.
178 *
179 * This way, we can easily send them to the client. We should really do something
180 * better than abort on any errors - on the other hand, these are all fatal
181 * to the server (can't work around them), but the abort just seems a bit
182 * messy (exit would probably be better.)
183 *
184 * Couple of notes: We assume that the faces are in a continous block.
185 * This works fine for now, but this could perhaps change in the future
186 *
187 * Function largely rewritten May 2000 to be more general purpose.
188 * The server itself does not care what the image data is - to the server,
189 * it is just data it needs to allocate. As such, the code is written
190 * to do such.
191 */
192
193void
194read_client_images (void)
195{
196 char filename[400];
197 char buf[HUGE_BUF];
198 char *cp, *cps[7];
199 FILE *infile;
200 int num, len, compressed, fileno, i, badline;
201
202 memset (facesets, 0, sizeof (facesets));
203 sprintf (filename, "%s/image_info", settings.datadir);
204 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
205 {
206 LOG (llevError, "Unable to open %s\n", filename);
207 abort ();
208 }
209 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
210 {
211 badline = 0;
212
213 if (buf[0] == '#')
214 continue;
215 if (!(cps[0] = strtok (buf, ":")))
216 badline = 1;
217 for (i = 1; i < 7; i++)
218 {
219 if (!(cps[i] = strtok (NULL, ":")))
220 badline = 1;
221 }
222 if (badline)
223 {
224 LOG (llevError, "Bad line in image_info file, ignoring line:\n %s", buf);
225 }
226 else
227 {
228 len = atoi (cps[0]);
229 if (len >= MAX_FACE_SETS)
230 {
231 LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
232 abort ();
233 }
234 facesets[len].prefix = strdup_local (cps[1]);
235 facesets[len].fullname = strdup_local (cps[2]);
236 facesets[len].fallback = atoi (cps[3]);
237 facesets[len].size = strdup_local (cps[4]);
238 facesets[len].extension = strdup_local (cps[5]);
239 facesets[len].comment = strdup_local (cps[6]);
240 }
241 }
242 close_and_delete (infile, compressed);
243 for (i = 0; i < MAX_FACE_SETS; i++)
244 {
245 if (facesets[i].prefix)
246 check_faceset_fallback (i, MAX_FACE_SETS);
247 }
248 /* Loaded the faceset information - now need to load up the
249 * actual faces.
250 */
251
252 for (fileno = 0; fileno < MAX_FACE_SETS; fileno++)
253 {
254 /* if prefix is not set, this is not used */
255 if (!facesets[fileno].prefix)
256 continue;
257 facesets[fileno].faces = (FaceInfo *) calloc (nrofpixmaps, sizeof (FaceInfo));
258
259 sprintf (filename, "%s/crossfire.%d", settings.datadir, fileno);
260 LOG (llevDebug, "Loading image file %s\n", filename);
261
262 if ((infile = open_and_uncompress (filename, 0, &compressed)) == NULL)
263 {
264 LOG (llevError, "Unable to open %s\n", filename);
265 abort ();
266 }
267 while (fgets (buf, HUGE_BUF - 1, infile) != NULL)
268 {
269 if (strncmp (buf, "IMAGE ", 6) != 0)
270 {
271 LOG (llevError, "read_client_images:Bad image line - not IMAGE, instead\n%s", buf);
272 abort ();
273 }
274 num = atoi (buf + 6);
275 if (num < 0 || num >= nrofpixmaps)
276 {
277 LOG (llevError, "read_client_images: Image num %d not in 0..%d\n%s", num, nrofpixmaps, buf);
278 abort ();
279 }
280 /* Skip accross the number data */
281 for (cp = buf + 6; *cp != ' '; cp++);
282 len = atoi (cp);
283 if (len == 0 || len > MAX_IMAGE_SIZE)
284 {
285 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
286 abort ();
287 }
288 /* We don't actualy care about the name of the image that
289 * is embedded in the image file, so just ignore it.
290 */
291 facesets[fileno].faces[num].datalen = len;
292 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
293 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)
294 {
295 LOG (llevError, "read_client_images: Did not read desired amount of data, wanted %d, got %d\n%s", len, i, buf);
296 abort ();
297 }
298 facesets[fileno].faces[num].checksum = 0;
299 for (i = 0; i < len; i++)
300 {
301 ROTATE_RIGHT (facesets[fileno].faces[num].checksum);
302 facesets[fileno].faces[num].checksum += facesets[fileno].faces[num].data[i];
303 facesets[fileno].faces[num].checksum &= 0xffffffff;
304 }
305 }
306 close_and_delete (infile, compressed);
307 } /* For fileno < MAX_FACE_SETS */
308}
309
310/**
311 * Client tells us what type of faces it wants. Also sets
312 * the caching attribute.
313 *
314 */
315
316void
317SetFaceMode (char *buf, int len, NewSocket * ns)
318{
319 char tmp[256];
320
321 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
322
323 if (mode == CF_FACE_NONE)
324 {
325 ns->facecache = 1;
326 }
327 else if (mode != CF_FACE_PNG)
328 {
329 sprintf (tmp, "drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
330 Write_String_To_Socket (ns, tmp, strlen (tmp));
331#ifdef ESRV_DEBUG
332 LOG (llevDebug, "SetFaceMode: Invalid mode from client: %d\n", mode);
333#endif 88#endif
334 }
335 if (mask)
336 {
337 ns->facecache = 1;
338 }
339}
340
341/**
342 * Client has requested pixmap that it somehow missed getting.
343 * This will be called often if the client is
344 * caching images.
345 */
346
347void
348SendFaceCmd (char *buff, int len, NewSocket * ns)
349{
350 long tmpnum = atoi (buff);
351 short facenum = tmpnum & 0xffff;
352
353 if (facenum != 0)
354 esrv_send_face (ns, facenum, 1);
355} 89}
356 90
357/** 91/**
358 * Sends a face to a client if they are in pixmap mode 92 * Sends a face to a client if they are in pixmap mode
359 * nothing gets sent in bitmap mode. 93 * nothing gets sent in bitmap mode.
360 * If nocache is true (nonzero), ignore the cache setting from the client - 94 * If nocache is true (nonzero), ignore the cache setting from the client -
361 * this is needed for the askface, in which we really do want to send the 95 * this is needed for the askface, in which we really do want to send the
362 * face (and askface is the only place that should be setting it). Otherwise, 96 * face (and askface is the only place that should be setting it). Otherwise,
363 * we look at the facecache, and if set, send the image name. 97 * we look at the facecache, and if set, send the image name.
364 */ 98 */
365
366void 99void
367esrv_send_face (NewSocket *ns, short face_num, int nocache) 100client::send_face (faceidx facenum, int pri)
368{ 101{
369 char fallback; 102 // never send face 0. ever. it does not exist.
103 if (!facenum)
104 return;
370 105
371 if (face_num <= 0 || face_num >= nrofpixmaps) 106 faceinfo *f = face_info (facenum);
107
108 if (!f)
372 { 109 {
373 LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num); 110 LOG (llevError | logBacktrace, "client::send_face (%d) out of bounds??\n", facenum);
374 return; 111 return;
375 } 112 }
376 113
377 SockList sl (MAXSOCKBUF); 114 // refuse to send non-image faces
378 fallback = get_face_fallback (ns->faceset, face_num); 115 if (!fx_want [f->type])
116 return;
379 117
380 if (facesets[fallback].faces[face_num].data == NULL) 118 if (faces_sent [facenum])
119 return;
120
121 faces_sent[facenum] = true;
122
123 fxface.push_back (facenum);
124}
125
126void client::flush_fx ()
127{
128 while (!fxface.empty ())
129 {
130 packet fx ("fx");
131 packet sx ("sx");
132 int type = 0;
133
134 do
135 {
136 faceidx facenum = fxface.back (); fxface.pop_back ();
137
138 if (const faceinfo *f = face_info (facenum))
139 {
140 if (f->type != type)
141 {
142 type = f->type;
143
144 fx << ber32 (0)
145 << uint8 (1) << uint8 (type);
146 }
147
148 const facedata *d = f->data (faceset);
149
150 fx << ber32 (facenum)
151 << data8 (d->chksum, CHKSUM_SIZE);
152
153 if (smoothing)
154 {
155 faceinfo *f = face_info (facenum);
156
157 if (f->smooth)
158 {
159 send_face (f->smooth, -110);
160
161 sx << ber32 (facenum)
162 << ber32 (f->smooth)
163 << ber32 (f->smoothlevel);
164 }
165 }
166 }
167 }
168 while (!fxface.empty ()
169 && fx.room () > ber32::size + CHKSUM_SIZE + 1 + 3 /* type switch */
170 && sx.room () > ber32::size * 3);
171
172 send_packet (fx);
173 if (sx.length () > 3) send_packet (sx);
381 { 174 }
382 LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num); 175}
176
177// send all faces of this object to the client
178// this uses more bandwidth initially, but makes
179// animations look much smoother, and every client
180// is supposed to do client-side caching anyways.
181void
182client::send_faces (object *ob)
183{
184 send_face (ob->face, 10);
185
186 if (ob->animation_id)
187 {
188 animation &anim = animations [ob->animation_id];
189
190 for (int i = 0; i < anim.num_animations; i++)
191 send_face (anim.faces [i], -10);
192 }
193}
194
195/**
196 * Need to send an animation sequence to the client.
197 * We will send appropriate face commands to the client if we haven't
198 * sent them the face yet (this can become quite costly in terms of
199 * how much we are sending - on the other hand, this should only happen
200 * when the player logs in and picks stuff up.
201 */
202void
203client::send_animation (short anim_num)
204{
205 /* Do some checking on the anim_num we got. Note that the animations
206 * are added in contigous order, so if the number is in the valid
207 * range, it must be a valid animation.
208 */
209 if (anim_num < 0 || anim_num >= animations.size ())
210 {
211 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
383 return; 212 return;
384 } 213 }
385 214
386 if (ns->facecache && !nocache) 215 packet sl ("anim");
387 {
388 sl << (ns->image2 ? "face2 " : "face1 ")
389 << uint16 (face_num);
390 216
391 if (ns->image2) 217 sl << uint16 (anim_num)
392 sl << uint8 (fallback); 218 << uint16 (0); /* flags - not used right now */
393 219
394 sl << uint32 (facesets[fallback].faces[face_num].checksum) 220 /* Build up the list of faces. Also, send any information (ie, the
395 << new_faces[face_num].name; 221 * the face itself) down to the client.
396 222 */
397 Send_With_Handling (ns, &sl); 223 for (int i = 0; i < animations[anim_num].num_animations; i++)
398 } 224 {
399 else 225 send_face (animations[anim_num].faces[i], -20);
226 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
400 { 227 }
401 sl << (ns->image2 ? "image2 " : "image ")
402 << uint32 (face_num);
403 228
404 if (ns->image2) 229 send_packet (sl);
405 sl << uint8 (fallback);
406 230
407 sl << uint32 (facesets[fallback].faces[face_num].datalen) 231 anims_sent[anim_num] = 1;
408 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
409
410 Send_With_Handling (ns, &sl);
411 }
412
413 ns->faces_sent[face_num] |= NS_FACESENT_FACE;
414 sl.free ();
415} 232}
416 233
417/** 234/**
418 * Sends the number of images, checksum of the face file, 235 * Sends the number of images, checksum of the face file,
419 * and the image_info file information. See the doc/Developers/protocol 236 * and the image_info file information. See the doc/Developers/protocol
420 * if you want further detail. 237 * if you want further detail.
421 */ 238 */
422
423void 239void
424send_image_info (NewSocket * ns, char *params) 240send_image_info (client *ns, char *params)
425{ 241{
426 SockList sl (MAXSOCKBUF); 242 packet sl;
427 243
428 sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum); 244 //TODO: second parameter is a checksum, but it makes no sense in this current framework
245 sl.printf ("replyinfo image_info\n%d\n%u\n", MAX_FACES, 0);
429 246
430 for (int i = 0; i < MAX_FACE_SETS; i++) 247 sl << "0:base:standard:0:32x32:none:The old 32x32 faceset.\n";
431 if (facesets[i].prefix)
432 sl.printf ("%d:%s:%s:%d:%s:%s:%s",
433 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
434 facesets[i].size, facesets[i].extension, facesets[i].comment);
435 248
436 Send_With_Handling (ns, &sl); 249 ns->send_packet (sl);
437 sl.free ();
438} 250}
439 251
440/** 252/**
441 * Sends requested face information. 253 * Sends requested face information.
442 * \param ns socket to send to 254 * \param ns socket to send to
… …
445 * For each image in [start..stop] sends 257 * For each image in [start..stop] sends
446 * - checksum 258 * - checksum
447 * - name 259 * - name
448 */ 260 */
449void 261void
450send_image_sums (NewSocket * ns, char *params) 262send_image_sums (client *ns, char *params)
451{ 263{
452 int start, stop; 264 int start, stop;
453 char *cp, buf[MAX_BUF]; 265 char *cp;
454 266
455 SockList sl (MAXSOCKBUF); 267 packet sl;
456 268
457 start = atoi (params); 269 start = atoi (params);
458 for (cp = params; *cp != '\0'; cp++) 270 for (cp = params; *cp != '\0'; cp++)
459 if (*cp == ' ') 271 if (*cp == ' ')
460 break; 272 break;
461 273
462 stop = atoi (cp); 274 stop = atoi (cp);
463 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps) 275 if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= MAX_FACES)
464 { 276 {
465 sprintf (buf, "replyinfo image_sums %d %d", start, stop); 277 sl.printf ("replyinfo image_sums %d %d", start, stop);
466 cs_write_string (ns, buf, strlen (buf)); 278 ns->send_packet (sl);
279 sl.reset ();
467 return; 280 return;
468 } 281 }
469 282
470 sl.printf ("replyinfo image_sums %d %d ", start, stop); 283 sl.printf ("replyinfo image_sums %d %d ", start, stop);
471 284
472 for (int i = start; i <= stop; i++) 285 for (int i = start; i <= stop && i < faces.size (); i++)
473 { 286 if (const faceinfo *f = face_info (i))
474 ns->faces_sent[i] |= NS_FACESENT_FACE; 287 if (ns->fx_want [f->type])
288 {
289 ns->faces_sent[i] = true;
475 290
476 int qq = get_face_fallback (ns->faceset, i); 291 const facedata *d = f->data (ns->faceset);
477 292
293 if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
294 break;
295
478 sl << uint16 (i) 296 sl << uint16 (i)
479 << uint32 (facesets[qq].faces[i].checksum) 297 << uint32 (0) // checksum
298 << uint8 (ns->faceset);
299
300 for (int i = 0; i < CHKSUM_SIZE; ++i)
301 sl.printf ("%02x", d->chksum [i]);
302
480 << uint8 (qq) 303 sl << uint8 (0);
481 << data8 (&new_faces[i].name, new_faces[i].name.length () + 1); 304 }
482 }
483 305
484 /* It would make more sense to catch this pre-emptively in the code above. 306 /* It would make more sense to catch this pre-emptively in the code above.
485 * however, if this really happens, we probably just want to cut down the 307 * however, if this really happens, we probably just want to cut down the
486 * size to less than 1000, since that is what we claim the protocol would 308 * size to less than 1000, since that is what we claim the protocol would
487 * support. 309 * support.
488 */ 310 */
311 //TODO: taken care of above, should simply abort or make sure the above code is correct
489 if (sl.len >= MAXSOCKBUF) 312 if (sl.length () > MAXSOCKBUF)
490 { 313 {
491 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF); 314 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
492 abort (); 315 abort ();
493 } 316 }
494 317
495 Send_With_Handling (ns, &sl); 318 ns->send_packet (sl);
496 sl.free ();
497} 319}
498 320

Diff Legend

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