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

Comparing deliantra/server/include/network.h (file contents):
Revision 1.10 by root, Tue Apr 10 09:35:23 2007 UTC vs.
Revision 1.26 by root, Sat Nov 7 18:30:05 2009 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation; either version 2 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program; if not, write to the Free Software
+ * and the GNU General Public License along with this program. If not, see
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* This file defines various flags that both the new client and
  * newserver uses.  These should never be changed, only expanded.
  * Changing them will likely cause all old clients to not work properly.
  * or server area.  But keeping one common file should make things
  * more reliable, as both the client and server will definately be
  * talking about the same values.
  */
 #ifndef NETWORK_H
 #define NETWORK_H
+//+GPL
 #include <cstdarg>
+#include "compiler.h"
 /* Maximum size of any packet we expect.
  *
- * The size must be the same in the server and the client (stupid), and its also NOT
+ * The size must be the same in the server and the client (stupid).
- * the maximum buffer size as one would expect, but the maximum buffer size + 1.
+ * TODO: make the actual network configurable per client and use 2**16.
  */
-#define MAXSOCKBUF 10240
+#define MAXSOCKBUF 10239
 #define CS_QUERY_YESNO	0x1	/* Yes/no question */
 #define CS_QUERY_SINGLECHAR 0x2	/* Single character response expected */
 #define CS_QUERY_HIDEINPUT 0x4	/* Hide input being entered */
  * server thinks the fireon & runon states are.
  */
 #define SF_FIREON   0x01
 #define SF_RUNON    0x02
-/* The following are the color flags passed to new_draw_info.
- *
- * We also set up some control flags
- *
- * NDI = New Draw Info
- */
-/* Color specifications - note these match the order in xutil.c */
-/* Note 2:  Black, the default color, is 0.  Thus, it does not need to
- * be implicitly specified.
- */
-#define NDI_BLACK	0
-#define NDI_WHITE	1
-#define NDI_NAVY	2
-#define NDI_RED		3
-#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 */
-#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 */
-                                /* 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 */
 /* Flags for the item command */
 enum {a_none, a_readied, a_wielded, a_worn, a_active, a_applied};
 #define F_APPLIED       0x000F
 #define F_LOCATION      0x00F0
 #define F_UNPAID        0x0200
 #define F_MAGIC         0x0400
 #define F_CURSED        0x0800
 #define UPD_SP_DAMAGE	0x04
 #define SOUND_NORMAL	0
 #define SOUND_SPELL	1
+//-GPL
 struct data
 {
   unsigned int len;
   const void *ptr;
   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) { }
+  data   (shstr_tmp sh)    : len (sh.length ()), ptr ((void *)&sh) { }
+  data   (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 struct data8
 {
   unsigned int len;
   const void *ptr;
   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) { }
+  data8  (shstr_tmp sh)    : len (sh.length ()), ptr ((void *)&sh) { }
+  data8  (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 struct data16
 {
   unsigned int len;
   const void *ptr;
   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) { }
+  data16 (shstr_tmp sh)    : len (sh.length ()), ptr ((void *)&sh) { }
+  data16 (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 struct ber32
 {
   enum { size = 5 }; // maximum length of an encoded ber32
   uint32 val;
   ber32 (uint32 val) : val (val) { }
+  static int encoded_size (uint32 val)
+  {
+    if (val >= (1 << 7*4)) return 5;
+    if (val >= (1 << 7*3)) return 4;
+    if (val >= (1 << 7*2)) return 3;
+    if (val >= (1 << 7*1)) return 2;
+    return 1;
+  }
 };
 /* Contains the base information we use to make up a packet we want to send. */
 struct packet
 {
   packet &operator <<(const data   &v);
   packet &operator <<(const data8  &v);
   packet &operator <<(const data16 &v);
   packet &operator <<(const char *v);
+  packet &operator <<(shstr_tmp sh) { return *this << data (sh); }
-  packet &operator <<(const shstr &sh) { return *this << data (&sh, sh.length ()); }
+  packet &operator <<(const std::string &s) { return *this << data (s.data (), s.size ()); }
   void vprintf (const char *format, va_list ap);
-  void printf (const char *format, ...)
+  void printf (const char *format, ...) attribute ((format (printf, 2, 3)))
   {
     va_list ap;
     va_start (ap, format);
     vprintf (format, ap);
     va_end (ap);
 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)); }
-struct CS_Stats
-{
-  int	  ibytes;	/* ibytes, obytes are bytes in, out */
-  int	  obytes;
-  short   max_conn;	/* Maximum connections received */
-  time_t  time_start;	/* When we started logging this */
-};
-extern CS_Stats cst_tot, cst_lst;
 #endif

Diff Legend

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

Comparing deliantra/server/include/network.h (file contents): Revision 1.10 by root, Tue Apr 10 09:35:23 2007 UTC vs. Revision 1.26 by root, Sat Nov 7 18:30:05 2009 UTC

Diff Legend

Comparing deliantra/server/include/network.h (file contents):
Revision 1.10 by root, Tue Apr 10 09:35:23 2007 UTC vs.
Revision 1.26 by root, Sat Nov 7 18:30:05 2009 UTC