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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.29 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.33 by root, Thu Dec 14 01:21:58 2006 UTC

 {
   struct Map newmap;
   int x, y, mx, my;
   {
-    char buf[MAXSOCKBUF];
+    packet sl;
-    sprintf (buf, "map_scroll %d %d", dx, dy);
+    sl.printf ("map_scroll %d %d", dx, dy);
-    Write_String_To_Socket (ns, buf, strlen (buf));
+    ns->send_packet (sl);
   }
   /* If we are using the Map1aCmd, we may in fact send
    * head information that is outside the viewable map.
    * So set the mx,my to the max value we want to
   NewSocket & socket = pl->socket;
   memset (&socket.lastmap, 0, sizeof (socket.lastmap));
   if (socket.newmapcmd == 1)
-    Write_String_To_Socket (&socket, "newmap", 6);
+    socket.send_packet ("newmap");
   socket.update_look = 1;
   socket.look_position = 0;
 }
                         flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
             }
           else
             snprintf (buf, MAX_BUF, "mapinfo current");
-          Write_String_To_Socket (&socket, buf, strlen (buf));
+          socket.send_packet (buf);
         }
     }
   else if (socket.current_x != ob->x || socket.current_y != ob->y)
     {
       int dx = ob->x - socket.current_x;
         snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
     }
   else
     snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
-  Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf));
+  pl->socket.send_packet (bigbuf);
 }
 /** This is the Setup cmd - easy first implementation */
 void
 SetUp (char *buf, int len, NewSocket * ns)
    *
    * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
    * The client then must sort this out
    */
-  LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
+  //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
   strcpy (cmdback, "setup");
-  for (s = 0; s < len;)
+  for (s = 0; s < len; )
     {
       cmd = &buf[s];
       /* find the next space, and put a null there */
-      for (; buf[s] && buf[s] != ' '; s++);
+      for (; buf[s] && buf[s] != ' '; s++)
+        ;
       buf[s++] = 0;
       while (buf[s] == ' ')
         s++;
       if (s >= len)
         break;
       param = &buf[s];
-      for (; buf[s] && buf[s] != ' '; s++);
+      for (; buf[s] && buf[s] != ' '; s++)
+        ;
       buf[s++] = 0;
       while (buf[s] == ' ')
         s++;
       slen = strlen (cmdback);
       safe_strcat (cmdback, " ", &slen, HUGE_BUF);
            * report a failure to the client.
            */
           safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
         }
     }                           /* for processing all the setup commands */
   LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
-  Write_String_To_Socket (ns, cmdback, strlen (cmdback));
+  ns->send_packet (cmdback);
 }
 /**
  * The client has requested to be added to the game.
  * This is what takes care of it.  We tell the client how things worked out.
 {
   Settings oldsettings;
   oldsettings = settings;
   if (ns->status != Ns_Add || add_player (ns))
-    {
+    ns->send_packet ("addme_failed");
-      Write_String_To_Socket (ns, "addme_failed", 12);
-    }
   else
     {
       /* Basically, the add_player copies the socket structure into
        * the player structure, so this one (which is from init_sockets)
        * is not needed anymore.  The write below should still work, as the
        * stuff in ns is still relevant.
        */
-      Write_String_To_Socket (ns, "addme_success", 13);
+      ns->send_packet ("addme_success");
       socket_info.nconns--;
       ns->status = Ns_Avail;
     }
   settings = oldsettings;
 }
 /** Reply to ExtendedInfos command */
 void
     {
       strcat (cmdback, " ");
       strcat (cmdback, "smoothing");
     }
-  Write_String_To_Socket (ns, cmdback, strlen (cmdback));
+  ns->send_packet (cmdback);
 }
 /*
 #define MSG_TYPE_BOOK            1
 #define MSG_TYPE_CARD            2
         strcat (cmdback, " ");
         snprintf (temp, sizeof (temp), "%d", i);
         strcat (cmdback, temp);
       }
-  Write_String_To_Socket (ns, cmdback, strlen (cmdback));
+  ns->send_packet (cmdback);
 }
 /**
  * A lot like the old AskSmooth (in fact, now called by AskSmooth).
  * Basically, it makes no sense to wait for the client to request a
   if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
     esrv_send_face (ns, smoothface, 0);
   ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "smooth "
      << uint16 (face)
      << uint16 (smoothface);
   Send_With_Handling (ns, &sl);
-  sl.free ();
 }
  /**
   * Tells client the picture it has to use
   * to smooth a picture number given as argument.
 void
 NewPlayerCmd (uint8 * buf, int len, player *pl)
 {
   int time, repeat;
   char command[MAX_BUF];
-  short packet;
+  int pktlen;
   if (len < 7)
     {
       LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
       return;
     }
-  packet = GetShort_String (buf);
+  pktlen = net_uint16 (buf);
-  repeat = GetInt_String (buf + 2);
+  repeat = net_uint32 (buf + 2);
   /* -1 is special - no repeat, but don't update */
   if (repeat != -1)
     pl->count = repeat;
   if ((len - 4) >= MAX_BUF)
   else
     time = (int) (MAX_TIME / FABS (pl->ob->speed));
   /* Send confirmation of command execution now */
-  SockList sl (MAXSOCKBUF);
+  packet sl;
-  sl << "comc " << uint16 (packet) << uint32 (time);
+  sl << "comc " << uint16 (pktlen) << uint32 (time);
   Send_With_Handling (&pl->socket, &sl);
-  sl.free ();
 }
 /** This is a reply to a previous query. */
 void
        */
       if (ns->sc_version < 1026)
         {
           sprintf (version_warning, "drawinfo %d %s", NDI_RED,
                    "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
-          Write_String_To_Socket (ns, version_warning, strlen (version_warning));
+          ns->send_packet (version_warning);
         }
     }
 }
 send_query (NewSocket * ns, uint8 flags, char *text)
 {
   char buf[MAX_BUF];
   sprintf (buf, "query %d %s", flags, text ? text : "");
-  Write_String_To_Socket (ns, buf, strlen (buf));
+  ns->send_packet (buf);
 }
 #define AddIfInt64(Old,New,Type) if (Old != New) {\
                         Old = New; \
                         sl << uint8 (Type) << uint64 (New); \
 esrv_update_stats (player *pl)
 {
   char buf[MAX_BUF];
   uint16 flags;
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "stats ";
   if (pl->ob != NULL)
     {
       AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
       LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
 #endif
       Send_With_Handling (&pl->socket, &sl);
     }
-  sl.free ();
 }
 /**
  * Tells the client that here is a player it should start using.
  */
 void
 esrv_new_player (player *pl, uint32 weight)
 {
   pl->last_weight = weight;
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "player ";
   sl << uint32 (pl->ob->count)
      << uint32 (weight)
      << uint32 (pl->ob->face->number)
      << data8  (pl->ob->name);
   Send_With_Handling (&pl->socket, &sl);
-  sl.free ();
   SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
 }
 /**
  * Need to send an animation sequence to the client.
     {
       LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
       return;
     }
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "anim "
      << uint16 (anim_num)
      << uint16 (0); /* flags - not used right now */
         esrv_send_face (ns, animations[anim_num].faces[i], 0);
       sl << uint16 (animations[anim_num].faces[i]);   /* flags - not used right now */
     }
   Send_With_Handling (ns, &sl);
-  sl.free ();
   ns->anims_sent[anim_num] = 1;
 }
 esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
 {
   static long frames, bytes, tbytes, tframes;
   char *cur;
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "map ";
   cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
   sl.len = cur - (char *) sl.buf;
       memcpy (&ns->lastmap, newmap, sizeof (struct Map));
       Send_With_Handling (ns, &sl);
       ns->sent_scroll = 0;
     }
-  sl.free ();
 }
 /** Clears a map cell */
 static void
  * needs to get sent - if so, it adds the data, sending the head
  * if needed, and returning 1.  If this no data needs to get
  * sent, it returns zero.
  */
 static int
-check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer)
+check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer)
 {
   short face_num;
   if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
     face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
   else
     face_num = 0;
   if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
     {
-      SockList_AddShort (&sl, face_num);
+      sl << uint16 (face_num);
       if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
         esrv_send_face (&ns, face_num, 0);
       heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
       ns.lastmap.cells[ax][ay].faces[layer] = face_num;
  * the case, it seems to make more sense to have these layer values
  * actually match.
  */
 static int
-update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
+update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
 {
   object *ob, *head;
   uint16 face_num;
   int bx, by, i;
  * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
  * take.
  */
 static inline int
-update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
+update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
 {
   object *ob;
   int smoothlevel;              /* old face_num; */
   ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
   NewSocket &socket = pl->contr->socket;
   check_map_change (pl->contr);
-  SockList sl  (MAXSOCKBUF);
+  packet sl;
-  SockList esl (MAXSOCKBUF);
+  packet esl;
   sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
   startlen = sl.len;
   /*Extendedmapinfo structure initialisation */
   if (sl.len > startlen || socket.sent_scroll)
     {
       Send_With_Handling (&socket, &sl);
       socket.sent_scroll = 0;
     }
-  sl.free ();
-  esl.free ();
 }
 /**
  * Draws client map.
  */
 /*****************************************************************************/
 void
 send_plugin_custom_message (object *pl, char *buf)
 {
-  cs_write_string (&pl->contr->socket, buf, strlen (buf));
+  pl->contr->socket.send_packet (buf);
 }
 /**
  * This sends the skill number to name mapping.  We ignore
  * the params - we always send the same info no matter what.
  */
 void
 send_skill_info (NewSocket *ns, char *params)
 {
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "replyinfo skill_info\n";
   for (int i = 1; i < NUM_SKILLS; i++)
     sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
       LOG (llevError, "Buffer overflow in send_skill_info!\n");
       fatal (0);
     }
   Send_With_Handling (ns, &sl);
-  sl.free ();
 }
 /**
  * This sends the spell path to name mapping.  We ignore
  * the params - we always send the same info no matter what.
  */
 void
 send_spell_paths (NewSocket * ns, char *params)
 {
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "replyinfo spell_paths\n";
   for (int i = 0; i < NRSPELLPATHS; i++)
     sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
       LOG (llevError, "Buffer overflow in send_spell_paths!\n");
       fatal (0);
     }
   Send_With_Handling (ns, &sl);
-  sl.free ();
 }
 /**
  * This looks for any spells the player may have that have changed their stats.
  * it then sends an updspell packet for each spell that has changed in this way
               flags |= UPD_SP_DAMAGE;
             }
           if (flags)
             {
-              SockList sl (MAXSOCKBUF);
+              packet sl;
               sl << "updspell "
                  << uint8 (flags)
                  << uint32 (spell->count);
               if (flags & UPD_SP_MANA  ) sl << uint16 (spell->last_sp);
               if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
               if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
               Send_With_Handling (&pl->socket, &sl);
-              sl.free ();
             }
         }
     }
 }
     {
       LOG (llevError, "Invalid call to esrv_remove_spell");
       return;
     }
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "delspell "
      << uint32 (spell->count);
   Send_With_Handling (&pl->socket, &sl);
-  sl.free ();
 }
 /* appends the spell *spell to the Socklist we will send the data to. */
 static void
-append_spell (player *pl, SockList &sl, object *spell)
+append_spell (player *pl, packet &sl, object *spell)
 {
   int len, i, skill = 0;
   if (!(spell->name))
     {
     }
   if (!pl->socket.monitor_spells)
     return;
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl << "addspell ";
   if (!spell)
     {
     }
   /* finally, we can send the packet */
   Send_With_Handling (&pl->socket, &sl);
-  sl.free ();
 }

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.29 by root, Wed Dec 13 21:27:09 2006 UTC vs. Revision 1.33 by root, Thu Dec 14 01:21:58 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.29 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.33 by root, Thu Dec 14 01:21:58 2006 UTC