--- deliantra/server/socket/request.C 2007/06/09 20:51:45 1.108
+++ deliantra/server/socket/request.C 2007/07/29 19:11:47 1.118
@@ -1,23 +1,22 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
*
* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
* Copyright (©) 2001,2007 Mark Wedel
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*
* The authors can be reached via e-mail to
*/
@@ -193,8 +192,8 @@
region *reg = ob->region ();
if (socket.current_region != reg)
{
+ INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
socket.current_region = reg;
- socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname);
}
}
@@ -204,29 +203,17 @@
* that information.
*/
void
-RequestInfo (char *buf, int len, client * ns)
+RequestInfo (char *buf, int len, client *ns)
{
- char *params = NULL, *cp;
-
- /* No match */
- char bigbuf[MAX_BUF];
- int slen;
-
- /* Set up replyinfo before we modify any of the buffers - this is used
- * if we don't find a match.
- */
- strcpy (bigbuf, "replyinfo ");
- slen = strlen (bigbuf);
- safe_strcat (bigbuf, buf, &slen, MAX_BUF);
+ char *params;
/* find the first space, make it null, and update the
* params pointer.
*/
- for (cp = buf; *cp != '\0'; cp++)
- if (*cp == ' ')
+ for (params = buf; *params; params++)
+ if (*params == ' ')
{
- *cp = '\0';
- params = cp + 1;
+ *params++ = 0;
break;
}
@@ -239,7 +226,13 @@
else if (!strcmp (buf, "spell_paths"))
send_spell_paths (ns, params);
else
- ns->send_packet (bigbuf, len);
+ {
+ // undo tokenisation above and send replyinfo with the request unchanged
+ if (*params)
+ *--params = ' ';
+
+ ns->send_packet_printf ("replyinfo %s", buf);
+ }
}
void
@@ -473,27 +466,6 @@
}
/**
- * client requested an image. send it rate-limited
- * before flushing.
- */
-void
-AskFaceCmd (char *buf, int len, client *ns)
-{
- ns->askface.push_back (atoi (buf));
-}
-
-/**
- * Tells client the picture it has to use
- * to smooth a picture number given as argument.
- */
-void
-AskSmooth (char *buf, int len, client *ns)
-{
- ns->send_face (atoi (buf));
- ns->flush_fx ();
-}
-
-/**
* This handles the general commands from the client (ie, north, fire, cast,
* etc.)
*/
@@ -535,7 +507,7 @@
{
if (len <= 6)
{
- LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
+ LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
return;
}
@@ -749,8 +721,8 @@
if (pl->golem)
buf << " Golem*: " << pl->golem->name;
+ buf << '\0';
buf.linearise (obuf);
- obuf [buf.size ()] = 0;
}
#define AddIfInt64(Old,New,Type) if (Old != New) {\
@@ -961,7 +933,7 @@
if (ob)
ns.send_faces (ob);
else
- ns.send_face (face_num);
+ ns.send_face (face_num, 10);
sl << uint16 (face_num);
return 1;
@@ -1418,7 +1390,7 @@
for (int i = 1; i < NUM_SKILLS; i++)
sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
- if (sl.length () >= MAXSOCKBUF)
+ if (sl.length () > MAXSOCKBUF)
{
LOG (llevError, "Buffer overflow in send_skill_info!\n");
fatal (0);
@@ -1441,7 +1413,7 @@
for (int i = 0; i < NRSPELLPATHS; i++)
sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
- if (sl.length () >= MAXSOCKBUF)
+ if (sl.length () > MAXSOCKBUF)
{
LOG (llevError, "Buffer overflow in send_spell_paths!\n");
fatal (0);
@@ -1560,6 +1532,8 @@
spell->face = face_find ("burnout.x11", blank_face);
}
+ pl->ns->send_face (spell->face);
+
/* send the current values */
sl << uint32 (spell->count)
<< uint16 (spell->level)
@@ -1604,16 +1578,17 @@
* won't take us over the length limit for the socket, if it does,
* we need to send what we already have, and restart packet formation
*/
+ if (spell->type != SPELL)
+ continue;
+
/* Seeing crashes by overflowed buffers. Quick arithemetic seems
* to show add_spell is 26 bytes + 2 strings. However, the overun
* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
* like it will fix this
*/
- if (spell->type != SPELL)
- continue;
-
- if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
+ if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
{
+ pl->ns->flush_fx ();
pl->ns->send_packet (sl);
sl.reset ();
@@ -1631,13 +1606,14 @@
else
append_spell (pl, sl, spell);
- if (sl.length () >= MAXSOCKBUF)
+ if (sl.length () > MAXSOCKBUF)
{
LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
fatal (0);
}
/* finally, we can send the packet */
+ pl->ns->flush_fx ();
pl->ns->send_packet (sl);
}