--- deliantra/server/include/network.h	2006/12/15 20:08:45	1.3
+++ deliantra/server/include/network.h	2007/07/01 05:00:18	1.14
@@ -1,26 +1,25 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 1992 Frank Tore Johansen
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 2005, 2006 The Crossfire+ Development Team
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your 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
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at crossfire@schmorp.de
-*/
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your 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
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
 
 /* This file defines various flags that both the new client and
  * newserver uses.  These should never be changed, only expanded.
@@ -41,27 +40,22 @@
  */
 
 
-#ifndef NEWCLIENT_H
-#define NEWCLIENT_H
+#ifndef NETWORK_H
+#define NETWORK_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.
+#include <cstdarg>
+
+/* 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 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 CS_QUERY_SINGLECHAR 0x2	/* Single character response expected */
 #define CS_QUERY_HIDEINPUT 0x4	/* Hide input being entered */
 
-#define CS_SAY_NORMAL	0x1	/* Normal say command */
-#define CS_SAY_SHOUT	0x2	/* Text is shouted. */
-#define CS_SAY_GSAY	0x4	/* Text is group say command */
-
 /* These are multiplication values that should be used when changing 
  * floats to ints, and vice version.  MULTI is integer representatin
  * (float to int), MULTF is float, for going from int to float.
@@ -265,6 +259,14 @@
   data16 (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
 };
 
+struct ber32
+{
+  enum { size = 5 }; // maximum length of an encoded ber32
+  uint32 val;
+
+  ber32 (uint32 val) : val (val) { }
+};
+
 /* Contains the base information we use to make up a packet we want to send. */
 struct packet
 {
@@ -276,7 +278,12 @@
   uint8 *cur;
   uint8 buf_ [hdrlen + bufsize + 256];
 
-  packet () { reset (); }
+  packet ()
+  {
+    reset ();
+  }
+
+  packet (const char *name);
 
   uint8  operator [](unsigned int i) const { return buf_ [i + hdrlen]; }
   uint8 &operator [](unsigned int i)       { return buf_ [i + hdrlen]; }
@@ -301,14 +308,25 @@
   packet &operator <<(sint64 v) { return *this << (uint64)v; }
 
   // checked
+  packet &operator <<(const ber32 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 ()); }
+  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, ...)
+  {
+    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]; }
@@ -316,15 +334,5 @@
 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