From 8ee546013a40a21187b66bce011261a8d57ab40e Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Wed, 27 Apr 2011 12:26:37 +0200
Subject: [PATCH] enable_binary() is too essential to stay experimental

---
 src/comm.c     | 7 +------
 src/comm.h     | 2 --
 src/func_spec  | 2 --
 src/pkg-psyc.c | 9 ++++++++-
 src/pkg-tls.c  | 1 -
 src/version.sh | 2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/comm.c b/src/comm.c
index f67d871..2b73e90 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -3186,7 +3186,6 @@ get_message (char *buff, size_t *len)
                 inet_packets_in++;
                 inet_volume_in += l;
 #endif
-#ifdef USE_EXPERIMENTAL
 		/* Experimental support for
 		 * binary data streams, by fippo 2008
 		 */
@@ -3200,7 +3199,6 @@ get_message (char *buff, size_t *len)
 		    command_giver = ip->ob;
 		    return MY_TRUE;
 		}
-#endif
                 ip->text_end += l;
 
                 /* Here would be the place to send data through an
@@ -4008,9 +4006,7 @@ new_player ( object_t *ob, SOCKET_T new_socket
     new_interactive->set_input_to = MY_FALSE;
     new_interactive->closing = MY_FALSE;
     new_interactive->tn_enabled = MY_TRUE;
-#ifdef USE_EXPERIMENTAL
     new_interactive->is_binary = MY_FALSE;
-#endif
     new_interactive->do_close = 0;
     new_interactive->noecho = 0;
     new_interactive->gobble_char = 0;
@@ -9235,7 +9231,7 @@ f_enable_telnet (svalue_t *sp)
 } /* f_enable_telnet() */
  
 /*-------------------------------------------------------------------------*/
-#ifdef USE_EXPERIMENTAL
+
 svalue_t *
 f_enable_binary (svalue_t *sp)
 
@@ -9269,7 +9265,6 @@ f_enable_binary (svalue_t *sp)
     put_number(sp, rc);
     return sp;
 } /* f_enable_binary() */
-#endif
  
 /*-------------------------------------------------------------------------*/
 void
diff --git a/src/comm.h b/src/comm.h
index b407049..aeff650 100644
--- a/src/comm.h
+++ b/src/comm.h
@@ -175,9 +175,7 @@ struct interactive_s {
     CBool set_input_to;         /* True if input_to was set in this cycle */
     CBool closing;              /* True when closing this socket. */
     CBool tn_enabled;           /* True: telnet machine enabled */
-#ifdef USE_EXPERIMENTAL
     CBool is_binary;		/* True: socket reads binary */
-#endif
     char do_close;              /* Bitflags: Close this down; Proto-ERQ. */
     char noecho;                /* Input mode bitflags */
 
diff --git a/src/func_spec b/src/func_spec
index 8920a31..f63127f 100644
--- a/src/func_spec
+++ b/src/func_spec
@@ -593,9 +593,7 @@ int     get_max_commands(object default: F_THIS_INTERACTIVE);
 void    set_max_commands(int, object default: F_THIS_INTERACTIVE);
 #endif
 int     enable_telnet(int, object default: F_THIS_INTERACTIVE);
-#ifdef USE_EXPERIMENTAL
 int     enable_binary(object default: F_THIS_INTERACTIVE);
-#endif
 
 void    write(mixed);
 object *users();
diff --git a/src/pkg-psyc.c b/src/pkg-psyc.c
index d7c7f23..8790dd4 100644
--- a/src/pkg-psyc.c
+++ b/src/pkg-psyc.c
@@ -43,7 +43,8 @@ f_psyc_render(svalue_t *sp) {
     psycPacket packet;
     string_t *out;
     char *meth, *body;
-    int mlen, blen;
+    size_t mlen, blen;
+    mapping_t *map;
 
     // unless (sp->type == T_POINTER) return sp;
     v = sp->u.vec;
@@ -52,6 +53,12 @@ f_psyc_render(svalue_t *sp) {
 	/* NOTREACHED */
 	return sp;
     }
+    if (v->item[PSYC_ROUTING].type == T_MAPPING) {
+	map = v->item[PSYC_ROUTING].u.map;
+    } else {
+	map = NULL;
+    }
+
 #if 0
     if (v->item[PSYC_METHOD].type != T_STRING) {
 	errorf("Wrong type for PSYC_METHOD element in PSYC packet.\n");
diff --git a/src/pkg-tls.c b/src/pkg-tls.c
index 233cb47..40b741c 100644
--- a/src/pkg-tls.c
+++ b/src/pkg-tls.c
@@ -103,7 +103,6 @@ set_dhe1024 (void)
  */
 
 {
-    int i;
     DSA *dsaparams;
     DH *dhparams;
 
diff --git a/src/version.sh b/src/version.sh
index cd4487a..1845519 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -17,7 +17,7 @@ version_longtype="stable"
 # A timestamp, to be used by bumpversion and other scripts.
 # It can be used, for example, to 'touch' this file on every build, thus
 # forcing revision control systems to add it on every checkin automatically.
-version_stamp="Wed Apr 27 00:18:40 CEST 2011"
+version_stamp="Wed Apr 27 11:22:56 CEST 2011"
 
 # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
 version_major=4