mirror of
git://git.psyced.org/git/psyclpc
synced 2024-08-15 03:20:16 +00:00
enable_binary() is too essential to stay experimental
This commit is contained in:
parent
f7dcb2eb89
commit
8ee546013a
6 changed files with 10 additions and 13 deletions
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -103,7 +103,6 @@ set_dhe1024 (void)
|
|||
*/
|
||||
|
||||
{
|
||||
int i;
|
||||
DSA *dsaparams;
|
||||
DH *dhparams;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue