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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.31 by root, Thu Dec 14 00:23:59 2006 UTC vs.
Revision 1.32 by root, Thu Dec 14 01:12:35 2006 UTC

 {
   struct Map newmap;
   int x, y, mx, my;
   {
-    char buf[MAXSOCKBUF];
+    SockList sl (MAXSOCKBUF);
-    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);
+    sl.free ();
   }
   /* 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->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); \
 /*****************************************************************************/
 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.

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.31 by root, Thu Dec 14 00:23:59 2006 UTC vs. Revision 1.32 by root, Thu Dec 14 01:12:35 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.31 by root, Thu Dec 14 00:23:59 2006 UTC vs.
Revision 1.32 by root, Thu Dec 14 01:12:35 2006 UTC