ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.108 by root, Sat Jun 9 20:51:45 2007 UTC vs.
Revision 1.130 by root, Tue May 20 03:14:19 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
130} 129}
131 130
132static void 131static void
133clear_map (player *pl) 132clear_map (player *pl)
134{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 137
137 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
138 139
139 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
… …
146static void 147static void
147check_map_change (player *pl) 148check_map_change (player *pl)
148{ 149{
149 client &socket = *pl->ns; 150 client &socket = *pl->ns;
150 object *ob = pl->observe; 151 object *ob = pl->observe;
152
153 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map)
155 {
156 rv_vector rv;
157
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159
160 // manhattan distance is very handy here
161 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
162 {
163 socket.current_map = ob->map;
164 socket.current_x = ob->x;
165 socket.current_y = ob->y;
166
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset ();
169 }
170 }
151 171
152 if (socket.current_map != ob->map || socket.force_newmap) 172 if (socket.current_map != ob->map || socket.force_newmap)
153 { 173 {
154 clear_map (pl); 174 clear_map (pl);
155 socket.current_map = ob->map; 175 socket.current_map = ob->map;
… …
191 socket.current_y = ob->y; 211 socket.current_y = ob->y;
192 212
193 region *reg = ob->region (); 213 region *reg = ob->region ();
194 if (socket.current_region != reg) 214 if (socket.current_region != reg)
195 { 215 {
216 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196 socket.current_region = reg; 217 socket.current_region = reg;
197 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198 } 218 }
199} 219}
200 220
201/** 221/**
202 * RequestInfo is sort of a meta command. There is some specific 222 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 223 * request of information, but we call other functions to provide
204 * that information. 224 * that information.
205 */ 225 */
206void 226void
207RequestInfo (char *buf, int len, client * ns) 227RequestInfo (char *buf, int len, client *ns)
208{ 228{
209 char *params = NULL, *cp; 229 char *params;
210
211 /* No match */
212 char bigbuf[MAX_BUF];
213 int slen;
214
215 /* Set up replyinfo before we modify any of the buffers - this is used
216 * if we don't find a match.
217 */
218 strcpy (bigbuf, "replyinfo ");
219 slen = strlen (bigbuf);
220 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221 230
222 /* find the first space, make it null, and update the 231 /* find the first space, make it null, and update the
223 * params pointer. 232 * params pointer.
224 */ 233 */
225 for (cp = buf; *cp != '\0'; cp++) 234 for (params = buf; *params; params++)
226 if (*cp == ' ') 235 if (*params == ' ')
227 { 236 {
228 *cp = '\0';
229 params = cp + 1; 237 *params++ = 0;
230 break; 238 break;
231 } 239 }
232 240
233 if (!strcmp (buf, "image_info")) 241 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params); 242 send_image_info (ns, params);
… …
237 else if (!strcmp (buf, "skill_info")) 245 else if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 246 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 247 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 248 send_spell_paths (ns, params);
241 else 249 else
242 ns->send_packet (bigbuf, len); 250 {
251 // undo tokenisation above and send replyinfo with the request unchanged
252 if (*params)
253 *--params = ' ';
254
255 ns->send_packet_printf ("replyinfo %s", buf);
256 }
243} 257}
244 258
245void 259void
246ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
247{ 261{
… …
250 264
251void 265void
252ExtiCmd (char *buf, int len, client *ns) 266ExtiCmd (char *buf, int len, client *ns)
253{ 267{
254 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272client::mapinfo_queue_clear ()
273{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i);
276
277 mapinfo_queue.clear ();
278}
279
280bool
281client::mapinfo_try (char *buf)
282{
283 char *token = buf;
284 buf += strlen (buf) + 9;
285
286 // initial map and its origin
287 maptile *map = pl->observe->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y;
290 int max_distance = 8; // limit maximum path length to something generous
291
292 while (*buf && map && max_distance)
293 {
294 int dir = *buf++ - '1';
295
296 if (dir >= 0 && dir <= 3)
297 {
298 if (!map->tile_path [dir])
299 map = 0;
300 else if (map->tile_available (dir, false))
301 {
302 maptile *neigh = map->tile_map [dir];
303
304 switch (dir)
305 {
306 case 0: mapy -= neigh->height; break;
307 case 2: mapy += map ->height; break;
308 case 3: mapx -= neigh->width ; break;
309 case 1: mapx += map ->width ; break;
310 }
311
312 map = neigh;
313 --max_distance;
314 }
315 else
316 return 0;
317 }
318 else
319 max_distance = 0;
320 }
321
322 if (!max_distance)
323 send_packet_printf ("mapinfo %s error", token);
324 else if (!map || !map->path)
325 send_packet_printf ("mapinfo %s nomap", token);
326 else
327 {
328 int flags = 0;
329
330 if (map->tile_path[0]) flags |= 1;
331 if (map->tile_path[1]) flags |= 2;
332 if (map->tile_path[2]) flags |= 4;
333 if (map->tile_path[3]) flags |= 8;
334
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 }
337
338 return 1;
339}
340
341void
342client::mapinfo_queue_run ()
343{
344 if (mapinfo_queue.empty () || !pl)
345 return;
346
347 for (int i = 0; i < mapinfo_queue.size (); ++i)
348 if (mapinfo_try (mapinfo_queue [i]))
349 {
350 free (mapinfo_queue [i]);
351 mapinfo_queue.erase (i);
352 }
353 else
354 ++i;
255} 355}
256 356
257void 357void
258MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
259{ 359{
260 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
262 362
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 363 char *token = buf;
266 // copy token 364
267 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
268 return; 366 return;
269 367
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
273 { 369 {
274 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
275 372
276 // initial map and its origin 373#if 0
277 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 376 free (copy);
280 int mapy = pl->ns->mapy / 2 - pl->ob->y;
281 int max_distance = 8; // limit maximum path length to something generous
282
283 while (*buf && map && max_distance)
284 {
285 int dir = *buf++;
286
287 switch (dir)
288 {
289 case '1':
290 dx = 0;
291 dy = -1;
292 map = map->xy_find (dx, dy);
293 map && (mapy -= map->height);
294 break;
295 case '2':
296 mapx += map->width;
297 dx = map->width;
298 dy = 0;
299 map = map->xy_find (dx, dy);
300 break;
301 case '3':
302 mapy += map->height;
303 dx = 0;
304 dy = map->height;
305 map = map->xy_find (dx, dy);
306 break;
307 case '4':
308 dx = -1;
309 dy = 0;
310 map = map->xy_find (dx, dy);
311 map && (mapx -= map->width);
312 break;
313 }
314
315 --max_distance;
316 }
317
318 if (!max_distance)
319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320 else if (map && map->path[0])
321 {
322 int flags = 0;
323
324 if (map->tile_path[0]) flags |= 1;
325 if (map->tile_path[1]) flags |= 2;
326 if (map->tile_path[2]) flags |= 4;
327 if (map->tile_path[3]) flags |= 8;
328
329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330 }
331 else 377 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
333 } 380 }
334 else 381 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 383}
339 384
340/** This is the Setup cmd */ 385/** This is the Setup cmd */
341void 386void
342SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
… …
471 516
472 ns->send_packet (cmdback); 517 ns->send_packet (cmdback);
473} 518}
474 519
475/** 520/**
476 * client requested an image. send it rate-limited
477 * before flushing.
478 */
479void
480AskFaceCmd (char *buf, int len, client *ns)
481{
482 ns->askface.push_back (atoi (buf));
483}
484
485/**
486 * Tells client the picture it has to use
487 * to smooth a picture number given as argument.
488 */
489void
490AskSmooth (char *buf, int len, client *ns)
491{
492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
494}
495
496/**
497 * This handles the general commands from the client (ie, north, fire, cast, 521 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 522 * etc.)
499 */ 523 */
500void 524void
501PlayerCmd (char *buf, int len, player *pl) 525PlayerCmd (char *buf, int len, player *pl)
… …
533void 557void
534NewPlayerCmd (char *buf, int len, player *pl) 558NewPlayerCmd (char *buf, int len, player *pl)
535{ 559{
536 if (len <= 6) 560 if (len <= 6)
537 { 561 {
538 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 562 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
539 return; 563 return;
540 } 564 }
541 565
542 uint16 cmdid = net_uint16 ((uint8 *)buf); 566 uint16 cmdid = net_uint16 ((uint8 *)buf);
543 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 567 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
681 * syntax is: move (to) (tag) (nrof) 705 * syntax is: move (to) (tag) (nrof)
682 */ 706 */
683void 707void
684MoveCmd (char *buf, int len, player *pl) 708MoveCmd (char *buf, int len, player *pl)
685{ 709{
686 int vals[3], i; 710 int to, tag, nrof;
687 711
688 /* A little funky here. We only cycle for 2 records, because 712 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
689 * we obviously are not going to find a space after the third
690 * record. Perhaps we should just replace this with a
691 * sscanf?
692 */
693 for (i = 0; i < 2; i++)
694 { 713 {
695 vals[i] = atoi (buf);
696
697 if (!(buf = strchr (buf, ' ')))
698 {
699 LOG (llevError, "Incomplete move command: %s\n", buf); 714 LOG (llevError, "Incomplete move command: %s\n", buf);
700 return; 715 return;
701 }
702
703 buf++;
704 } 716 }
705 717
706 vals[2] = atoi (buf); 718 esrv_move_object (pl->ob, to, tag, nrof);
707
708/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
709 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
710} 719}
711 720
712/****************************************************************************** 721/******************************************************************************
713 * 722 *
714 * Start of commands the server sends to the client. 723 * Start of commands the server sends to the client.
… …
747 756
748 //TODO: maybe golem should become the current_weapon, quite simply? 757 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem) 758 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name; 759 buf << " Golem*: " << pl->golem->name;
751 760
761 buf << '\0';
752 buf.linearise (obuf); 762 buf.linearise (obuf);
753 obuf [buf.size ()] = 0;
754} 763}
755 764
756#define AddIfInt64(Old,New,Type) if (Old != New) {\ 765#define AddIfInt64(Old,New,Type) if (Old != New) {\
757 Old = New; \ 766 Old = New; \
758 sl << uint8 (Type) << uint64 (New); \ 767 sl << uint8 (Type) << uint64 (New); \
… …
881 890
882/** 891/**
883 * Tells the client that here is a player it should start using. 892 * Tells the client that here is a player it should start using.
884 */ 893 */
885void 894void
886esrv_new_player (player *pl, uint32 weight) 895esrv_new_player (player *pl)
887{ 896{
897 sint32 weight = pl->ob->client_weight ();
898
888 packet sl ("player"); 899 packet sl ("player");
889 900
890 sl << uint32 (pl->ob->count) 901 sl << uint32 (pl->ob->count)
891 << uint32 (weight) 902 << uint32 (weight)
892 << uint32 (pl->ob->face) 903 << uint32 (pl->ob->face)
… …
959 970
960 if (!ns.faces_sent[face_num]) 971 if (!ns.faces_sent[face_num])
961 if (ob) 972 if (ob)
962 ns.send_faces (ob); 973 ns.send_faces (ob);
963 else 974 else
964 ns.send_face (face_num); 975 ns.send_face (face_num, 10);
965 976
966 sl << uint16 (face_num); 977 sl << uint16 (face_num);
967 return 1; 978 return 1;
968 } 979 }
969 980
… …
1026 1037
1027 /* If player is just joining the game, he isn't here yet, so the map 1038 /* If player is just joining the game, he isn't here yet, so the map
1028 * can get swapped out. If so, don't try to send them a map. All will 1039 * can get swapped out. If so, don't try to send them a map. All will
1029 * be OK once they really log in. 1040 * be OK once they really log in.
1030 */ 1041 */
1031 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1042 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1032 return; 1043 return;
1033 1044
1034 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1035 int estartlen, eoldlen; 1046 int estartlen, eoldlen;
1036 uint8 eentrysize; 1047 uint8 eentrysize;
… …
1124 1135
1125 if (!m) 1136 if (!m)
1126 { 1137 {
1127 nx = x; ny = y; m = plmap; 1138 nx = x; ny = y; m = plmap;
1128 1139
1129 if (!xy_normalise (m, nx, ny)) 1140 if (xy_normalise (m, nx, ny))
1141 m->touch ();
1142 else
1130 m = 0; 1143 m = 0;
1131 } 1144 }
1132 1145
1133 int emask, mask; 1146 int emask, mask;
1134 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
… …
1151 } 1164 }
1152 1165
1153 continue; 1166 continue;
1154 } 1167 }
1155 1168
1156 m->touch ();
1157
1158 int d = pl->blocked_los[ax][ay]; 1169 int d = pl->blocked_los[ax][ay];
1159 1170
1160 if (d > 3) 1171 if (d > 3)
1161 { 1172 {
1162 1173
… …
1237 uint8 flags = 0; 1248 uint8 flags = 0;
1238 tag_t player = 0; 1249 tag_t player = 0;
1239 1250
1240 // send hp information, if applicable 1251 // send hp information, if applicable
1241 if (object *op = ms.faces_obj [0]) 1252 if (object *op = ms.faces_obj [0])
1253 if (op->is_head () && !op->invisible)
1242 { 1254 {
1243 if (op->head || op->invisible) 1255 if (op->stats.maxhp > op->stats.hp
1244 ; // do not show 1256 && op->stats.maxhp > 0
1245 else if (op->type == PLAYER 1257 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0
1246 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1259 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1247 {
1248 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1249 { 1260 {
1250 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1251 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1262 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1252 } 1263 }
1253 }
1254 1264
1255 if (op->msg && op->msg[0] == '@') 1265 if (op->msg && op->msg[0] == '@')
1256 flags |= 1; 1266 flags |= 1;
1257 1267
1258 if (op->type == PLAYER && op != ob) 1268 if (op->type == PLAYER && op != ob)
1259 player = op->count; 1269 player = op->count;
1260 } 1270 }
1261 1271
1262 if (lastcell.stat_hp != stat_hp) 1272 if (lastcell.stat_hp != stat_hp)
1263 { 1273 {
1264 lastcell.stat_hp = stat_hp; 1274 lastcell.stat_hp = stat_hp;
1265 1275
… …
1416 sl << "replyinfo skill_info\n"; 1426 sl << "replyinfo skill_info\n";
1417 1427
1418 for (int i = 1; i < NUM_SKILLS; i++) 1428 for (int i = 1; i < NUM_SKILLS; i++)
1419 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1429 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1420 1430
1421 if (sl.length () >= MAXSOCKBUF) 1431 if (sl.length () > MAXSOCKBUF)
1422 { 1432 {
1423 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1433 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1424 fatal (0); 1434 fatal (0);
1425 } 1435 }
1426 1436
… …
1439 sl << "replyinfo spell_paths\n"; 1449 sl << "replyinfo spell_paths\n";
1440 1450
1441 for (int i = 0; i < NRSPELLPATHS; i++) 1451 for (int i = 0; i < NRSPELLPATHS; i++)
1442 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1452 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1443 1453
1444 if (sl.length () >= MAXSOCKBUF) 1454 if (sl.length () > MAXSOCKBUF)
1445 { 1455 {
1446 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1456 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1447 fatal (0); 1457 fatal (0);
1448 } 1458 }
1449 1459
… …
1557 if (!spell->face) 1567 if (!spell->face)
1558 { 1568 {
1559 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1569 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1560 spell->face = face_find ("burnout.x11", blank_face); 1570 spell->face = face_find ("burnout.x11", blank_face);
1561 } 1571 }
1572
1573 pl->ns->send_face (spell->face);
1562 1574
1563 /* send the current values */ 1575 /* send the current values */
1564 sl << uint32 (spell->count) 1576 sl << uint32 (spell->count)
1565 << uint16 (spell->level) 1577 << uint16 (spell->level)
1566 << uint16 (spell->casting_time) 1578 << uint16 (spell->casting_time)
… …
1602 * bytes and 3 strings (because that is the spec) so we need to 1614 * bytes and 3 strings (because that is the spec) so we need to
1603 * check that the length of those 3 strings, plus the 23 bytes, 1615 * check that the length of those 3 strings, plus the 23 bytes,
1604 * won't take us over the length limit for the socket, if it does, 1616 * won't take us over the length limit for the socket, if it does,
1605 * we need to send what we already have, and restart packet formation 1617 * we need to send what we already have, and restart packet formation
1606 */ 1618 */
1619 if (spell->type != SPELL)
1620 continue;
1621
1607 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1622 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1608 * to show add_spell is 26 bytes + 2 strings. However, the overun 1623 * to show add_spell is 26 bytes + 2 strings. However, the overun
1609 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1624 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1610 * like it will fix this 1625 * like it will fix this
1611 */ 1626 */
1612 if (spell->type != SPELL)
1613 continue;
1614
1615 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1627 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1616 { 1628 {
1629 pl->ns->flush_fx ();
1617 pl->ns->send_packet (sl); 1630 pl->ns->send_packet (sl);
1618 1631
1619 sl.reset (); 1632 sl.reset ();
1620 sl << "addspell "; 1633 sl << "addspell ";
1621 } 1634 }
… …
1629 return; 1642 return;
1630 } 1643 }
1631 else 1644 else
1632 append_spell (pl, sl, spell); 1645 append_spell (pl, sl, spell);
1633 1646
1634 if (sl.length () >= MAXSOCKBUF) 1647 if (sl.length () > MAXSOCKBUF)
1635 { 1648 {
1636 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1649 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1637 fatal (0); 1650 fatal (0);
1638 } 1651 }
1639 1652
1640 /* finally, we can send the packet */ 1653 /* finally, we can send the packet */
1654 pl->ns->flush_fx ();
1641 pl->ns->send_packet (sl); 1655 pl->ns->send_packet (sl);
1642} 1656}
1643 1657

Diff Legend

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