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.112 by root, Sun Jul 1 05:00:20 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)
… …
190 socket.current_y = ob->y; 192 socket.current_y = ob->y;
191 193
192 region *reg = ob->region (); 194 region *reg = ob->region ();
193 if (socket.current_region != reg) 195 if (socket.current_region != reg)
194 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
195 socket.current_region = reg; 198 socket.current_region = reg;
196 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
197 } 199 }
198} 200}
199 201
200/** 202/**
201 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
202 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
203 * that information. 205 * that information.
204 */ 206 */
205void 207void
206RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
207{ 209{
208 char *params = NULL, *cp; 210 char *params;
209
210 /* No match */
211 char bigbuf[MAX_BUF];
212 int slen;
213
214 /* Set up replyinfo before we modify any of the buffers - this is used
215 * if we don't find a match.
216 */
217 strcpy (bigbuf, "replyinfo ");
218 slen = strlen (bigbuf);
219 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
220 211
221 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
222 * params pointer. 213 * params pointer.
223 */ 214 */
224 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
225 if (*cp == ' ') 216 if (*params == ' ')
226 { 217 {
227 *cp = '\0';
228 params = cp + 1; 218 *params++ = 0;
229 break; 219 break;
230 } 220 }
231 221
232 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
233 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
236 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
237 send_skill_info (ns, params); 227 send_skill_info (ns, params);
238 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
239 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
240 else 230 else
241 ns->send_packet (bigbuf, len); 231 {
232 // undo tokenisation above and send replyinfo with the request unchanged
233 if (*params)
234 *--params = ' ';
235
236 ns->send_packet_printf ("replyinfo %s", buf);
237 }
242} 238}
243 239
244void 240void
245ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
246{ 242{
… …
249 245
250void 246void
251ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
252{ 248{
253 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250}
251
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;
254} 336}
255 337
256void 338void
257MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
258{ 340{
259 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
260 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
261 343
262 char bigbuf[MAX_BUF], *token;
263
264 token = buf; 344 char *token = buf;
265 // copy token 345
266 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
267 return; 347 return;
268 348
269 *buf++ = 0;
270
271 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
272 { 350 {
273 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
274 353
275 // initial map and its origin 354#if 0
276 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
277 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
278 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
279 int mapy = pl->ns->mapy / 2 - pl->ob->y;
280 int max_distance = 8; // limit maximum path length to something generous
281
282 while (*buf && map && max_distance)
283 {
284 int dir = *buf++;
285
286 switch (dir)
287 {
288 case '1':
289 dx = 0;
290 dy = -1;
291 map = map->xy_find (dx, dy);
292 map && (mapy -= map->height);
293 break;
294 case '2':
295 mapx += map->width;
296 dx = map->width;
297 dy = 0;
298 map = map->xy_find (dx, dy);
299 break;
300 case '3':
301 mapy += map->height;
302 dx = 0;
303 dy = map->height;
304 map = map->xy_find (dx, dy);
305 break;
306 case '4':
307 dx = -1;
308 dy = 0;
309 map = map->xy_find (dx, dy);
310 map && (mapx -= map->width);
311 break;
312 }
313
314 --max_distance;
315 }
316
317 if (!max_distance)
318 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
319 else if (map && map->path[0])
320 {
321 int flags = 0;
322
323 if (map->tile_path[0]) flags |= 1;
324 if (map->tile_path[1]) flags |= 2;
325 if (map->tile_path[2]) flags |= 4;
326 if (map->tile_path[3]) flags |= 8;
327
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
329 }
330 else 358 else
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
332 } 361 }
333 else 362 else
334 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
335
336 pl->ns->send_packet (bigbuf);
337} 364}
338 365
339/** This is the Setup cmd */ 366/** This is the Setup cmd */
340void 367void
341SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
… …
511void 538void
512NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
513{ 540{
514 if (len <= 6) 541 if (len <= 6)
515 { 542 {
516 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 543 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
517 return; 544 return;
518 } 545 }
519 546
520 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
521 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
937 964
938 if (!ns.faces_sent[face_num]) 965 if (!ns.faces_sent[face_num])
939 if (ob) 966 if (ob)
940 ns.send_faces (ob); 967 ns.send_faces (ob);
941 else 968 else
942 ns.send_face (face_num); 969 ns.send_face (face_num, 10);
943 970
944 sl << uint16 (face_num); 971 sl << uint16 (face_num);
945 return 1; 972 return 1;
946 } 973 }
947 974
… …
1394 sl << "replyinfo skill_info\n"; 1421 sl << "replyinfo skill_info\n";
1395 1422
1396 for (int i = 1; i < NUM_SKILLS; i++) 1423 for (int i = 1; i < NUM_SKILLS; i++)
1397 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]);
1398 1425
1399 if (sl.length () >= MAXSOCKBUF) 1426 if (sl.length () > MAXSOCKBUF)
1400 { 1427 {
1401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1402 fatal (0); 1429 fatal (0);
1403 } 1430 }
1404 1431
… …
1417 sl << "replyinfo spell_paths\n"; 1444 sl << "replyinfo spell_paths\n";
1418 1445
1419 for (int i = 0; i < NRSPELLPATHS; i++) 1446 for (int i = 0; i < NRSPELLPATHS; i++)
1420 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1421 1448
1422 if (sl.length () >= MAXSOCKBUF) 1449 if (sl.length () > MAXSOCKBUF)
1423 { 1450 {
1424 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1425 fatal (0); 1452 fatal (0);
1426 } 1453 }
1427 1454
… …
1535 if (!spell->face) 1562 if (!spell->face)
1536 { 1563 {
1537 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);
1538 spell->face = face_find ("burnout.x11", blank_face); 1565 spell->face = face_find ("burnout.x11", blank_face);
1539 } 1566 }
1567
1568 pl->ns->send_face (spell->face);
1540 1569
1541 /* send the current values */ 1570 /* send the current values */
1542 sl << uint32 (spell->count) 1571 sl << uint32 (spell->count)
1543 << uint16 (spell->level) 1572 << uint16 (spell->level)
1544 << uint16 (spell->casting_time) 1573 << uint16 (spell->casting_time)
… …
1580 * 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
1581 * 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,
1582 * 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,
1583 * 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
1584 */ 1613 */
1614 if (spell->type != SPELL)
1615 continue;
1616
1585 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1617 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1586 * 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
1587 * 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
1588 * like it will fix this 1620 * like it will fix this
1589 */ 1621 */
1590 if (spell->type != SPELL)
1591 continue;
1592
1593 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))))
1594 { 1623 {
1624 pl->ns->flush_fx ();
1595 pl->ns->send_packet (sl); 1625 pl->ns->send_packet (sl);
1596 1626
1597 sl.reset (); 1627 sl.reset ();
1598 sl << "addspell "; 1628 sl << "addspell ";
1599 } 1629 }
… …
1607 return; 1637 return;
1608 } 1638 }
1609 else 1639 else
1610 append_spell (pl, sl, spell); 1640 append_spell (pl, sl, spell);
1611 1641
1612 if (sl.length () >= MAXSOCKBUF) 1642 if (sl.length () > MAXSOCKBUF)
1613 { 1643 {
1614 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1644 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1615 fatal (0); 1645 fatal (0);
1616 } 1646 }
1617 1647
1618 /* finally, we can send the packet */ 1648 /* finally, we can send the packet */
1649 pl->ns->flush_fx ();
1619 pl->ns->send_packet (sl); 1650 pl->ns->send_packet (sl);
1620} 1651}
1621 1652

Diff Legend

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