psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

expect TLS autodetect only when libpsyc is compiled in (fixes alice' dot bug)

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2011-05-24 18:54:56 +02:00
parent 47232884b9
commit 069a3b66ae
6 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

19
world/net/psyc/parse.i
View file

@ -1113,23 +1113,17 @@ protected int deliver(mixed ip, string host, string mc, string buffer, mapping c
return 1;
}
#if __EFUN_DEFINED__(psyc_parse)
// temporary new "lfun" called from driver's comm.c to peek into new connection
// only exists if libpsyc is provided
void connection_peek(string data) {
P4((">> peek: %O\n", data));
#ifdef USE_SPYC
# if !__EFUN_DEFINED__(psyc_parse)
# echo New PSYC syntax will not work: Driver compiled without libpsyc!
# endif
if (data[0] == C_GLYPH_NEW_PACKET_DELIMITER) {
# if __EFUN_DEFINED__(enable_binary)
enable_binary(ME);
# else
# echo New PSYC syntax will not work: Driver compiled without enable_binary!
raise_error("Driver compiled without enable_binary()");
# endif
enable_binary(ME);
}
#endif
}
#endif
#ifdef PSYC_TCP
vamixed startParse(string a) {
@ -1137,8 +1131,7 @@ vamixed startParse(string a) {
restart();
if (isServer()) greet();
}
// new syntax is so broken, we should not pretend to support it yet FIXME
# if defined(SPYC_PATH) && defined(USE_SPYC)
# if defined(SPYC_PATH) && __EFUN_DEFINED__(psyc_parse)
else if (a[0] == C_GLYPH_NEW_PACKET_DELIMITER) {
object o = clone_object(SPYC_PATH "server");
unless (o && exec(o, ME) && o->logon(0)) {