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.115 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.119 by root, Fri Aug 24 00:26:10 2007 UTC

… …
129} 129}
130 130
131static void 131static void
132clear_map (player *pl) 132clear_map (player *pl)
133{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135 137
136 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
137 139
138 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
… …
246{ 248{
247 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248} 250}
249 251
250void 252void
253client::mapinfo_queue_clear ()
254{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i);
257
258 mapinfo_queue.clear ();
259}
260
261bool
262client::mapinfo_try (char *buf)
263{
264 char *token = buf;
265 buf += strlen (buf) + 9;
266
267 // initial map and its origin
268 maptile *map = pl->ob->map;
269 int mapx = pl->ns->mapx / 2 - pl->ob->x;
270 int mapy = pl->ns->mapy / 2 - pl->ob->y;
271 int max_distance = 8; // limit maximum path length to something generous
272
273 while (*buf && map && max_distance)
274 {
275 int dir = *buf++ - '1';
276
277 if (dir >= 0 && dir <= 3)
278 {
279 if (!map->tile_path [dir])
280 map = 0;
281 else if (map->tile_available (dir))
282 {
283 maptile *neigh = map->tile_map [dir];
284
285 switch (dir)
286 {
287 case 0: mapy -= neigh->height; break;
288 case 2: mapy += map ->height; break;
289 case 3: mapx -= neigh->width ; break;
290 case 1: mapx += map ->width ; break;
291 }
292
293 map = neigh;
294 --max_distance;
295 }
296 else
297 return 0;
298 }
299 else
300 max_distance = 0;
301 }
302
303 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path[0])
306 send_packet_printf ("mapinfo %s nomap", token);
307 else
308 {
309 int flags = 0;
310
311 if (map->tile_path[0]) flags |= 1;
312 if (map->tile_path[1]) flags |= 2;
313 if (map->tile_path[2]) flags |= 4;
314 if (map->tile_path[3]) flags |= 8;
315
316 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
317 }
318
319 return 1;
320}
321
322void
323client::mapinfo_queue_run ()
324{
325 if (mapinfo_queue.empty () || !pl)
326 return;
327
328 for (int i = 0; i < mapinfo_queue.size (); ++i)
329 if (mapinfo_try (mapinfo_queue [i]))
330 {
331 free (mapinfo_queue [i]);
332 mapinfo_queue.erase (i);
333 }
334 else
335 ++i;
336}
337
338void
251MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
252{ 340{
253 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
254 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
255 343
256 char bigbuf[MAX_BUF], *token;
257
258 token = buf; 344 char *token = buf;
259 // copy token 345
260 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
261 return; 347 return;
262 348
263 *buf++ = 0;
264
265 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
266 { 350 {
267 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
268 353
269 // initial map and its origin 354#if 0
270 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
271 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
272 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
273 int mapy = pl->ns->mapy / 2 - pl->ob->y;
274 int max_distance = 8; // limit maximum path length to something generous
275
276 while (*buf && map && max_distance)
277 {
278 int dir = *buf++;
279
280 switch (dir)
281 {
282 case '1':
283 dx = 0;
284 dy = -1;
285 map = map->xy_find (dx, dy);
286 map && (mapy -= map->height);
287 break;
288 case '2':
289 mapx += map->width;
290 dx = map->width;
291 dy = 0;
292 map = map->xy_find (dx, dy);
293 break;
294 case '3':
295 mapy += map->height;
296 dx = 0;
297 dy = map->height;
298 map = map->xy_find (dx, dy);
299 break;
300 case '4':
301 dx = -1;
302 dy = 0;
303 map = map->xy_find (dx, dy);
304 map && (mapx -= map->width);
305 break;
306 }
307
308 --max_distance;
309 }
310
311 if (!max_distance)
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
313 else if (map && map->path[0])
314 {
315 int flags = 0;
316
317 if (map->tile_path[0]) flags |= 1;
318 if (map->tile_path[1]) flags |= 2;
319 if (map->tile_path[2]) flags |= 4;
320 if (map->tile_path[3]) flags |= 8;
321
322 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
323 }
324 else 358 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
326 } 361 }
327 else 362 else
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330 pl->ns->send_packet (bigbuf);
331} 364}
332 365
333/** This is the Setup cmd */ 366/** This is the Setup cmd */
334void 367void
335SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
… …
931 964
932 if (!ns.faces_sent[face_num]) 965 if (!ns.faces_sent[face_num])
933 if (ob) 966 if (ob)
934 ns.send_faces (ob); 967 ns.send_faces (ob);
935 else 968 else
936 ns.send_face (face_num); 969 ns.send_face (face_num, 10);
937 970
938 sl << uint16 (face_num); 971 sl << uint16 (face_num);
939 return 1; 972 return 1;
940 } 973 }
941 974
… …
1388 sl << "replyinfo skill_info\n"; 1421 sl << "replyinfo skill_info\n";
1389 1422
1390 for (int i = 1; i < NUM_SKILLS; i++) 1423 for (int i = 1; i < NUM_SKILLS; i++)
1391 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1424 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1392 1425
1393 if (sl.length () >= MAXSOCKBUF) 1426 if (sl.length () > MAXSOCKBUF)
1394 { 1427 {
1395 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396 fatal (0); 1429 fatal (0);
1397 } 1430 }
1398 1431
… …
1411 sl << "replyinfo spell_paths\n"; 1444 sl << "replyinfo spell_paths\n";
1412 1445
1413 for (int i = 0; i < NRSPELLPATHS; i++) 1446 for (int i = 0; i < NRSPELLPATHS; i++)
1414 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415 1448
1416 if (sl.length () >= MAXSOCKBUF) 1449 if (sl.length () > MAXSOCKBUF)
1417 { 1450 {
1418 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419 fatal (0); 1452 fatal (0);
1420 } 1453 }
1421 1454
… …
1529 if (!spell->face) 1562 if (!spell->face)
1530 { 1563 {
1531 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1564 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1532 spell->face = face_find ("burnout.x11", blank_face); 1565 spell->face = face_find ("burnout.x11", blank_face);
1533 } 1566 }
1567
1568 pl->ns->send_face (spell->face);
1534 1569
1535 /* send the current values */ 1570 /* send the current values */
1536 sl << uint32 (spell->count) 1571 sl << uint32 (spell->count)
1537 << uint16 (spell->level) 1572 << uint16 (spell->level)
1538 << uint16 (spell->casting_time) 1573 << uint16 (spell->casting_time)
… …
1574 * bytes and 3 strings (because that is the spec) so we need to 1609 * bytes and 3 strings (because that is the spec) so we need to
1575 * check that the length of those 3 strings, plus the 23 bytes, 1610 * check that the length of those 3 strings, plus the 23 bytes,
1576 * won't take us over the length limit for the socket, if it does, 1611 * won't take us over the length limit for the socket, if it does,
1577 * we need to send what we already have, and restart packet formation 1612 * we need to send what we already have, and restart packet formation
1578 */ 1613 */
1614 if (spell->type != SPELL)
1615 continue;
1616
1579 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1617 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580 * to show add_spell is 26 bytes + 2 strings. However, the overun 1618 * to show add_spell is 26 bytes + 2 strings. However, the overun
1581 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1619 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1582 * like it will fix this 1620 * like it will fix this
1583 */ 1621 */
1584 if (spell->type != SPELL)
1585 continue;
1586
1587 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1622 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1588 { 1623 {
1624 pl->ns->flush_fx ();
1589 pl->ns->send_packet (sl); 1625 pl->ns->send_packet (sl);
1590 1626
1591 sl.reset (); 1627 sl.reset ();
1592 sl << "addspell "; 1628 sl << "addspell ";
1593 } 1629 }
… …
1601 return; 1637 return;
1602 } 1638 }
1603 else 1639 else
1604 append_spell (pl, sl, spell); 1640 append_spell (pl, sl, spell);
1605 1641
1606 if (sl.length () >= MAXSOCKBUF) 1642 if (sl.length () > MAXSOCKBUF)
1607 { 1643 {
1608 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1644 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609 fatal (0); 1645 fatal (0);
1610 } 1646 }
1611 1647
1612 /* finally, we can send the packet */ 1648 /* finally, we can send the packet */
1649 pl->ns->flush_fx ();
1613 pl->ns->send_packet (sl); 1650 pl->ns->send_packet (sl);
1614} 1651}
1615 1652

Diff Legend

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