--- deliantra/server/include/network.h	2007/09/30 20:22:18	1.19
+++ deliantra/server/include/network.h	2009/10/12 14:00:58	1.24
@@ -1,24 +1,25 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and 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>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /* This file defines various flags that both the new client and
@@ -201,7 +202,8 @@
 
   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
@@ -211,7 +213,8 @@
 
   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
@@ -221,7 +224,8 @@
 
   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
@@ -289,7 +293,7 @@
   packet &operator <<(const data16 &v);
 
   packet &operator <<(const char *v);
-  packet &operator <<(const shstr &sh) { return *this << data (&sh, sh.length ()); }
+  packet &operator <<(shstr_tmp sh) { return *this << data (sh); }
   packet &operator <<(const std::string &s) { return *this << data (s.data (), s.size ()); }
 
   void vprintf (const char *format, va_list ap);