[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.173 by root, Thu Apr 15 00:37:24 2010 UTC vs.
Revision 1.197 by root, Sat Dec 1 20:22:13 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero 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.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 //+GPL
  * \file
  * Client handling.
  *
  * \date 2003-12-02
  *
  * This file implements all of the goo on the server side for handling
  * clients.  It's got a bunch of global variables for keeping track of
  * each of the clients.
  *
  * Note:  All functions that are used to process data from the client
  * have the prototype of (char *data, int datalen, int client_num).  This
  * way, we can use one dispatch table.
  *
   pl->ns->mapinfo_queue_clear ();
   memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
   pl->ns->force_newmap = false;
-  if (pl->ns->newmapcmd == 1)
-    pl->ns->send_packet ("newmap");
+  pl->ns->send_packet ("newmap");
   pl->ns->floorbox_reset ();
 }
 static void
 send_map_info (player *pl)
   client &socket = *pl->ns;
   object *ob = pl->viewpoint;
   if (socket.mapinfocmd)
     {
-      if (ob->map && ob->map->path[0])
+      if (ob->map && ob->map->path)
         {
           int flags = 0;
+          // due to historical glitches, the bit ordering and map index ordering differs
-          if (ob->map->tile_path[0]) flags |= 1;
+          if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
-          if (ob->map->tile_path[1]) flags |= 2;
+          if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
-          if (ob->map->tile_path[2]) flags |= 4;
+          if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
-          if (ob->map->tile_path[3]) flags |= 8;
+          if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
+          // these two are debatable
+          if (ob->map->tile_path [TILE_UP   ]) flags |= 0x10;
+          if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
           socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
                                      flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
                                      ob->map->width, ob->map->height, &ob->map->path);
         }
     {
       INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
       socket.current_region = reg;
     }
-  // first try to aovid a full newmap on tiled map scrolls
+  // first try to avoid a full newmap on tiled map scrolls
   if (socket.current_map != ob->map && !socket.force_newmap)
     {
       rv_vector rv;
       get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
   for (int i = 0; i < skillvec.size (); ++i)
     sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
   if (sl.length () > MAXSOCKBUF)
-    {
-      LOG (llevError, "Buffer overflow in send_skill_info!\n");
+    cleanup ("buffer overflow in send_skill_info!");
-      fatal (0);
-    }
   ns->send_packet (sl);
 }
 /**
   for (int i = 0; i < NRSPELLPATHS; i++)
     sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
   if (sl.length () > MAXSOCKBUF)
-    {
-      LOG (llevError, "Buffer overflow in send_spell_paths!\n");
+    cleanup ("buffer overflow in send_spell_paths!");
-      fatal (0);
-    }
   ns->send_packet (sl);
 }
 /**
  * RequestInfo is sort of a meta command. There is some specific
  * request of information, but we call other functions to provide
  * that information.
+ * requestinfo is completely deprecated, use resource exti request
+ * and the fxix or http protocols.
  */
 void
 RequestInfo (char *buf, int len, client *ns)
 {
   char *params;
 //-GPL
 void
 client::mapinfo_queue_clear ()
 {
-  for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
+  for (auto &&i : mapinfo_queue)
-    free (*i);
+    free (i);
   mapinfo_queue.clear ();
 }
 bool
   while (*buf && map && max_distance)
     {
       int dir = *buf++ - '1';
-      if (dir >= 0 && dir <= 3)
+      // due to historical glitches, the mapinfo index and tile index differs
+      static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
+      // maybe we should only allow the four flat directions
+      if (IN_RANGE_EXC (dir, 0, ecb_array_length (dirmap)))
         {
+          dir = dirmap [dir];
           if (!map->tile_path [dir])
             map = 0;
           else if (map->tile_available (dir, false))
             {
               maptile *neigh = map->tile_map [dir];
     send_packet_printf ("mapinfo %s nomap", token);
   else
     {
       int flags = 0;
+      // due to historical glitches, the bit ordering and map index ordering differs
-      if (map->tile_path[0]) flags |= 1;
+      if (map->tile_path [TILE_NORTH]) flags |= 0x01;
-      if (map->tile_path[1]) flags |= 2;
+      if (map->tile_path [TILE_EAST ]) flags |= 0x02;
-      if (map->tile_path[2]) flags |= 4;
+      if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
-      if (map->tile_path[3]) flags |= 8;
+      if (map->tile_path [TILE_WEST ]) flags |= 0x08;
+      // these two are debatable
+      if (map->tile_path [TILE_UP   ]) flags |= 0x10;
+      if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
       send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
     }
   return 1;
    * Cleaning up the input should probably be done first - all actions
    * for the command that issued the count should be done before any other
    * commands.
    */
   pl->count = 0;
-}
-/**
- * This handles the general commands from the client (ie, north, fire, cast,
- * etc.).  It is a lot like PlayerCmd above, but is called with the
- * 'ncom' method which gives more information back to the client so it
- * can throttle.
- */
-void
-NewPlayerCmd (char *buf, int len, player *pl)
-{
-  if (len <= 6)
-    {
-      LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
-      return;
-    }
-  uint16 cmdid  = net_uint16 ((uint8 *)buf);
-  sint32 repeat = net_sint32 ((uint8 *)buf + 2);
-  /* -1 is special - no repeat, but don't update */
-  if (repeat != -1)
-    pl->count = repeat;
-  buf += 6; //len -= 6;
-  execute_newserver_command (pl->ob, buf);
-  /* Perhaps something better should be done with a left over count.
-   * Cleaning up the input should probably be done first - all actions
-   * for the command that issued the count should be done before any other
-   * commands.
-   */
-  pl->count = 0;
-  //TODO: schmorp thinks whatever this calculates, it makes no sense at all
-  int time = pl->ob->has_active_speed ()
-             ? (int) (MAX_TIME / pl->ob->speed)
-             : MAX_TIME * 100;
-  /* Send confirmation of command execution now */
-  packet sl ("comc");
-  sl << uint16 (cmdid) << uint32 (time);
-  pl->ns->send_packet (sl);
 }
 /** This is a reply to a previous query. */
 void
 ReplyCmd (char *buf, int len, client *ns)
  * commands for now.
  */
 void
 esrv_update_stats (player *pl)
 {
-  char buf[MAX_BUF];
-  uint16 flags;
   client *ns = pl->ns;
   if (!ns)
     return;
   object *ob = pl->observe;
   AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED, 1.f / TICK);
   AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
   AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
   AddIfInt   (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
-  flags = (opl->fire_on ? SF_FIREON : 0)
+  int flags = (opl->fire_on ? SF_FIREON : 0)
-        | (opl->run_on  ? SF_RUNON  : 0);
+            | (opl->run_on  ? SF_RUNON  : 0);
   AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
   for (int i = 0; i < NROFATTACKS; i++)
     /* Skip ones we won't send */
       AddIfInt (ns->last_path_attuned,  ob->path_attuned,  CS_STAT_SPELL_ATTUNE);
       AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
       AddIfInt (ns->last_path_denied,   ob->path_denied,   CS_STAT_SPELL_DENY);
     }
+  char buf[MAX_BUF];
   rangetostring (opl, buf);  /* we want use the new fire & run system in new client */
   AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
   set_title (ob, buf);
   AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
   /* Nothing changed */
   return 0;
 }
-//-GPL
-// prefetch (and touch) all maps within a specific distancd
-static void
-prefetch_surrounding_maps (maptile *map, int distance)
-{
-  map->touch ();
-  if (--distance)
-    for (int dir = 4; dir--; )
-      if (const shstr &path = map->tile_path [dir])
-        if (maptile *&neigh = map->tile_map [dir])
-          prefetch_surrounding_maps (neigh, distance);
-        else
-          neigh = maptile::find_async (path, map);
-}
-// prefetch a generous area around the player
-static void
-prefetch_surrounding_maps (object *op)
-{
-  prefetch_surrounding_maps (op->map, 3);
-}
-//+GPL
 /**
  * Draws client map.
  */
 void
 draw_client_map (player *pl)
   /* If player is just joining the game, he isn't here yet, so the map
    * can get swapped out.  If so, don't try to send them a map.  All will
    * be OK once they really log in.
    */
-  if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
+  if (!ob->map || ob->map->state != MAP_ACTIVE)
     return;
   int startlen, oldlen;
   check_map_change (pl);
-  prefetch_surrounding_maps (pl->ob);
+  pl->ob->prefetch_surrounding_maps ();
   /* do LOS after calls to update_position */
   /* unfortunately, we need to udpate los when observing, currently */
   if (pl->do_los || pl->viewpoint != pl->ob)
     {
    * look like.
    */
   client &socket = *pl->ns;
-  packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
+  packet sl ("map1a");
   startlen = sl.length ();
   int hx = socket.mapx / 2;
   int hy = socket.mapy / 2;
       {
         /* This block deals with spaces that are not visible for whatever
          * reason. Still may need to send the head for this space.
          */
         if (lastcell.count != -1
             || lastcell.faces[0]
             || lastcell.faces[1]
             || lastcell.faces[2]
             || lastcell.stat_hp
             || lastcell.flags
             || lastcell.player)
           sl << uint16 (mask);
         /* properly clear a previously sent big face */
         map_clearcell (&lastcell, -1);
 /* appends the spell *spell to the Socklist we will send the data to. */
 static void
 append_spell (player *pl, packet &sl, object *spell)
 {
-  int i, skill = 0;
+  int skill = 0;
   if (!(spell->name))
     {
       LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
       return;
      << uint16 (spell->cached_grace)
      << uint16 (spell->cached_eat)
      << uint8  (skill)
      << uint32 (spell->path_attuned)
      << uint32 (spell->face)
-     << data8  (spell->name)
+     << data8  (spell->name);
+  if (pl->ns->monitor_spells < 2)
-     << data16 (spell->msg);
+     sl << data16 (spell->msg);
 }
 /**
  * This tells the client to add the spell *ob, if *ob is NULL, then add
  * all spells in the player's inventory.
  */
 void
 esrv_add_spells (player *pl, object *spell)
 {
   if (!spell)
     {
       for (spell = pl->ob->inv; spell; spell = spell->below)
         {
           /* were we to simply keep appending data here, we could exceed
            * MAXSOCKBUF if the player has enough spells to add, we know that
            * append_spells will always append 19 data bytes, plus 4 length
            * bytes and 3 strings (because that is the spec) so we need to
            * check that the length of those 3 strings, plus the 23 bytes,
            * 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
     }
   else
     append_spell (pl, sl, spell);
   if (sl.length () > MAXSOCKBUF)
-    {
-      LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
+    cleanup ("buffer overflow in esrv_add_spells!");
-      fatal (0);
-    }
   /* finally, we can send the packet */
   pl->ns->flush_fx ();
   pl->ns->send_packet (sl);
 }

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.173 by root, Thu Apr 15 00:37:24 2010 UTC vs. Revision 1.197 by root, Sat Dec 1 20:22:13 2018 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.173 by root, Thu Apr 15 00:37:24 2010 UTC vs.
Revision 1.197 by root, Sat Dec 1 20:22:13 2018 UTC