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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.6 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.13 by root, Fri Dec 15 19:59:20 2006 UTC

  */
 #include <global.h>
 #include <sproto.h>
-#include <newclient.h>
-#include <newserver.h>
-#include <loader.h>
 #define MAX_FACE_SETS	20  /**< Maximum number of image sets the program will handle */
 /** Information about one image */
 typedef struct FaceInfo
 {
   uint8 *data;              /**< image data */
   uint16 datalen;           /**< length of the xpm data */
   uint32 checksum;          /**< Checksum of face data */
 } FaceInfo;
 /** Information about one face set */
 typedef struct
           if (len >= MAX_FACE_SETS)
             {
               LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
               abort ();
             }
-          facesets[len].prefix = strdup_local (cps[1]);
+          facesets[len].prefix = strdup (cps[1]);
-          facesets[len].fullname = strdup_local (cps[2]);
+          facesets[len].fullname = strdup (cps[2]);
           facesets[len].fallback = atoi (cps[3]);
-          facesets[len].size = strdup_local (cps[4]);
+          facesets[len].size = strdup (cps[4]);
-          facesets[len].extension = strdup_local (cps[5]);
+          facesets[len].extension = strdup (cps[5]);
-          facesets[len].comment = strdup_local (cps[6]);
+          facesets[len].comment = strdup (cps[6]);
         }
     }
   close_and_delete (infile, compressed);
   for (i = 0; i < MAX_FACE_SETS; i++)
     {
  * the caching attribute.
  *
  */
 void
-SetFaceMode (char *buf, int len, NewSocket * ns)
+SetFaceMode (char *buf, int len, client *ns)
 {
-  char tmp[256];
   int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
   if (mode == CF_FACE_NONE)
-    {
-      ns->facecache = 1;
+    ns->facecache = 1;
-    }
   else if (mode != CF_FACE_PNG)
     {
+      packet sl;
-      sprintf (tmp, "drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode.  Will use Png");
+      sl.printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode.  Will use Png");
-      Write_String_To_Socket (ns, tmp, strlen (tmp));
+      ns->send_packet (sl);
-#ifdef ESRV_DEBUG
-      LOG (llevDebug, "SetFaceMode: Invalid mode from client: %d\n", mode);
-#endif
     }
   if (mask)
-    {
-      ns->facecache = 1;
+    ns->facecache = 1;
-    }
 }
 /**
  * Client has requested pixmap that it somehow missed getting.
  * This will be called often if the client is
  * caching images.
  */
 void
-SendFaceCmd (char *buff, int len, NewSocket * ns)
+SendFaceCmd (char *buff, int len, client * ns)
 {
   long tmpnum = atoi (buff);
   short facenum = tmpnum & 0xffff;
   if (facenum != 0)
  * face (and askface is the only place that should be setting it).  Otherwise,
  * we look at the facecache, and if set, send the image name.
  */
 void
-esrv_send_face (NewSocket *ns, short face_num, int nocache)
+esrv_send_face (client *ns, short face_num, int nocache)
 {
   char fallback;
   if (face_num <= 0 || face_num >= nrofpixmaps)
     {
       LOG (llevError, "esrv_send_face (%d) out of bounds??\n", face_num);
       return;
     }
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   fallback = get_face_fallback (ns->faceset, face_num);
   if (facesets[fallback].faces[face_num].data == NULL)
     {
       LOG (llevError, "esrv_send_face: faces[%d].data == NULL\n", face_num);
         sl << uint8 (fallback);
       sl << uint32 (facesets[fallback].faces[face_num].checksum)
          << new_faces[face_num].name;
-      Send_With_Handling (ns, &sl);
+      ns->send_packet (sl);
     }
   else
     {
       sl << (ns->image2 ? "image2 " : "image ")
          << uint32 (face_num);
         sl << uint8 (fallback);
       sl << uint32 (facesets[fallback].faces[face_num].datalen)
          << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
-      Send_With_Handling (ns, &sl);
+      ns->send_packet (sl);
     }
   ns->faces_sent[face_num] |= NS_FACESENT_FACE;
-  sl.free ();
 }
 /**
  * Sends the number of images, checksum of the face file,
  * and the image_info file information.  See the doc/Developers/protocol
  * if you want further detail.
  */
 void
-send_image_info (NewSocket * ns, char *params)
+send_image_info (client * ns, char *params)
 {
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum);
   for (int i = 0; i < MAX_FACE_SETS; i++)
     if (facesets[i].prefix)
       sl.printf ("%d:%s:%s:%d:%s:%s:%s",
                  i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
                  facesets[i].size, facesets[i].extension, facesets[i].comment);
-  Send_With_Handling (ns, &sl);
+  ns->send_packet (sl);
-  sl.free ();
 }
 /**
  * Sends requested face information.
  * \param ns socket to send to
  * For each image in [start..stop] sends
  *  - checksum
  *  - name
  */
 void
-send_image_sums (NewSocket * ns, char *params)
+send_image_sums (client * ns, char *params)
 {
   int start, stop;
   char *cp, buf[MAX_BUF];
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   start = atoi (params);
   for (cp = params; *cp != '\0'; cp++)
     if (*cp == ' ')
       break;
   stop = atoi (cp);
   if (stop < start || *cp == '\0' || (stop - start) > 1000 || stop >= nrofpixmaps)
     {
-      sprintf (buf, "replyinfo image_sums %d %d", start, stop);
+      sl.printf ("replyinfo image_sums %d %d", start, stop);
-      cs_write_string (ns, buf, strlen (buf));
+      ns->send_packet (sl);
+      sl.reset ();
       return;
     }
   sl.printf ("replyinfo image_sums %d %d ", start, stop);
   /* It would make more sense to catch this pre-emptively in the code above.
    * however, if this really happens, we probably just want to cut down the
    * size to less than 1000, since that is what we claim the protocol would
    * support.
    */
-  if (sl.len >= MAXSOCKBUF)
+  if (sl.length () >= MAXSOCKBUF)
     {
-      LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF);
+      LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
       abort ();
     }
-  Send_With_Handling (ns, &sl);
+  ns->send_packet (sl);
-  sl.free ();
 }

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.6 by root, Wed Dec 13 21:27:09 2006 UTC vs. Revision 1.13 by root, Fri Dec 15 19:59:20 2006 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.6 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.13 by root, Fri Dec 15 19:59:20 2006 UTC