Merge remote-tracking branch 'origin/master'

This commit is contained in:
psyc://loupsycedyglgamf.onion/~lynX 1984-04-04 00:44:04 +00:00
commit 8b05dff5f6
3 changed files with 2 additions and 4 deletions

View File

@ -21,9 +21,6 @@
# define AUTODETECT 1 // use TLS autodetect if libpsyc is available # define AUTODETECT 1 // use TLS autodetect if libpsyc is available
#else #else
# define AUTODETECT 0 # define AUTODETECT 0
# ifdef SPYC_PATH
# echo libpsyc is not enabled in driver. Using old protocol parser instead.
# endif
#endif #endif
volatile int shutdown_in_progress = 0; volatile int shutdown_in_progress = 0;

View File

@ -219,6 +219,7 @@ void receive_udp(string host, string msg, int port) {
# if !__EFUN_DEFINED__(psyc_parse) # if !__EFUN_DEFINED__(psyc_parse)
# echo libpsyc is not enabled in driver. Using old protocol parser instead. # echo libpsyc is not enabled in driver. Using old protocol parser instead.
# else # else
# echo Excellent: enabling new PSYC syntax using libpsyc.
case '|': case '|':
unless (spycd) { unless (spycd) {
spycd = SPYC_PATH "udp" -> load(); spycd = SPYC_PATH "udp" -> load();

View File

@ -180,7 +180,7 @@ msg(source, mc, data, vars, showingLog, target) {
rv["_context_relay"] = vars["_context"]; rv["_context_relay"] = vars["_context"];
P1(("Invalid route in context: msg(%O, %O, %O, %O, %O) -> %O\n", P1(("Invalid route in context: msg(%O, %O, %O, %O, %O) -> %O\n",
source, mc, data, vars, target, rv)) source, mc, data, vars, target, rv))
D2(( sendmsg(source, "_failure_invalid_route", 0, rv); )) D2( sendmsg(source, "_failure_invalid_route", 0, rv); )
return 1; return 1;
} else { } else {
P1(("%O unexpected msg(%O, %O, %O, %O, %O)\n", P1(("%O unexpected msg(%O, %O, %O, %O, %O)\n",