[ViewVC] Diff of: cvs/deliantra/server/include/newclient.h

Comparing deliantra/server/include/newclient.h (file contents):
Revision 1.2 by root, Mon Mar 13 20:45:39 2006 UTC vs.
Revision 1.14 by root, Thu Dec 14 01:30:52 2006 UTC

-/*
- * static char *rcsid_newclient_h =
- *   "$Id: newclient.h,v 1.2 2006/03/13 20:45:39 root Exp $";
- */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 #define NEWCLIENT_H
 /* Maximum size of any packet we expect.  Using this makes it so we don't need to
  * allocated and deallocated the same buffer over and over again and the price
  * of using a bit of extra memory.  It also makes the code simpler.
+ *
+ * The size must be the same in the server and the client (stupid), and its also NOT
+ * the maximum buffer size as one would expect, but the maximum buffer size + 1.
  */
 #define MAXSOCKBUF 10240
 #define CS_QUERY_YESNO	0x1	/* Yes/no question */
 #define NDI_ORANGE	4
 #define NDI_BLUE	5	/* Actually, it is Dodger Blue */
 #define NDI_DK_ORANGE	6	/* DarkOrange2 */
 #define NDI_GREEN	7	/* SeaGreen */
 #define NDI_LT_GREEN	8	/* DarkSeaGreen,  which is actually paler */
-				/* Than seagreen - also background color */
+                                /* Than seagreen - also background color */
 #define NDI_GREY	9
 #define NDI_BROWN	10	/* Sienna */
 #define NDI_GOLD	11
 #define NDI_TAN		12	/* Khaki */
 #define NDI_MAX_COLOR	12	/* Last value in */
 #define NDI_COLOR_MASK	0xff	/* Gives lots of room for expansion - we are */
-				/* using an int anyways, so we have the space */
+                                /* using an int anyways, so we have the space */
-				/* to still do all the flags */
+                                /* to still do all the flags */
 #define NDI_UNIQUE	0x100	/* Print this out immediately, don't buffer */
 #define NDI_ALL		0x200	/* Inform all players of this message */
  * are color informatin.  For now, only high bit information we need
  * is floor information.
  */
 #define FACE_FLOOR	0x80
 #define FACE_WALL	0x40	/* Or'd into the color value by the server
-				 * right before sending.
+                                 * right before sending.
-				 */
+                                 */
 #define FACE_COLOR_MASK	0xf
 #define UPD_LOCATION	0x01
 #define UPD_FLAGS	0x02
 #define UPD_WEIGHT	0x04
 #define UPD_SP_DAMAGE	0x04
 #define SOUND_NORMAL	0
 #define SOUND_SPELL	1
+struct data
+{
+  const void *ptr;
+  unsigned int len;
+  data   (const void *ptr, int len) : len (len), ptr (ptr) { }
+  data   (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
+  data   (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+};
+struct data8
+{
+  const void *ptr;
+  unsigned int len;
+  data8  (const void *ptr, int len) : len (len), ptr (ptr) { }
+  data8  (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
+  data8  (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+};
+struct data16
+{
+  const void *ptr;
+  unsigned int len;
+  data16 (const void *ptr, int len) : len (len), ptr (ptr) { }
+  data16 (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
+  data16 (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+};
 /* Contains the base information we use to make up a packet we want to send. */
-typedef struct SockList {
+struct packet
+{
+  packet () : len (0) { }
+  void reset () { len = 0; }
+  int length () const { return len; }
+  packet &operator <<(uint8  v) { buf [len++] = v; return *this; }
+  packet &operator <<(uint16 v) { return *this << uint8  (v >>  8) << uint8  (v); }
+  packet &operator <<(uint32 v) { return *this << uint16 (v >> 16) << uint16 (v); }
+  packet &operator <<(uint64 v) { return *this << uint32 (v >> 32) << uint32 (v); }
+  packet &operator <<(sint8  v) { return *this << (uint8 )v; }
+  packet &operator <<(sint16 v) { return *this << (uint16)v; }
+  packet &operator <<(sint32 v) { return *this << (uint32)v; }
+  packet &operator <<(sint64 v) { return *this << (uint64)v; }
+  packet &operator <<(const data   &v);
+  packet &operator <<(const data8  &v);
+  packet &operator <<(const data16 &v);
+  packet &operator <<(const char *v);
+  packet &operator <<(const shstr &sh) { return *this << data (&sh, sh.length ()); }
+  void printf (const char *format, ...);
+public:
+  uint8 buf [MAXSOCKBUF];
-    int len;
+  int len;
-    unsigned char *buf;
+};
-} SockList;
+inline uint16 net_uint16 (uint8 *data) { return (data [0] << 8) | data [1]; }
+inline uint32 net_uint32 (uint8 *data) { return (net_uint16 (data) << 16) | net_uint16 (data + 2); }
+inline sint16 net_sint16 (uint8 *data) { return sint16 (net_uint16 (data)); }
+inline sint16 net_sint32 (uint8 *data) { return sint32 (net_uint32 (data)); }
-typedef struct CS_Stats {
+struct CS_Stats
+{
-    int	    ibytes;	/* ibytes, obytes are bytes in, out */
+  int	  ibytes;	/* ibytes, obytes are bytes in, out */
-    int	    obytes;
+  int	  obytes;
-    short   max_conn;	/* Maximum connections received */
+  short   max_conn;	/* Maximum connections received */
-    time_t  time_start;	/* When we started logging this */
+  time_t  time_start;	/* When we started logging this */
-} CS_Stats;
+};
 extern CS_Stats cst_tot, cst_lst;
 #endif

Diff Legend

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

Comparing deliantra/server/include/newclient.h (file contents): Revision 1.2 by root, Mon Mar 13 20:45:39 2006 UTC vs. Revision 1.14 by root, Thu Dec 14 01:30:52 2006 UTC

Diff Legend

Comparing deliantra/server/include/newclient.h (file contents):
Revision 1.2 by root, Mon Mar 13 20:45:39 2006 UTC vs.
Revision 1.14 by root, Thu Dec 14 01:30:52 2006 UTC