psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

_flag_disable_network_circuit_connect, _flag_disable_idna_stringprep, no PERSISTENT_MASTERS

This commit is contained in:
psyc://loupsycedyglgamf.onion/~lynX 2018-05-11 17:08:52 +02:00
parent 04a4908877
commit 2e459558f5
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
world/net/circuit.c
View File

@ -261,29 +261,31 @@ runQ() {
}
connect(ho, po, transport, srv, extra) {
#ifndef _flag_disable_network_circuit_connect
if (interactive()) return -8;
P3(("connect: %O, %O, %O, %O for %O\n", ho, po, transport, srv, ME))
if (time() < time_of_connect_attempt + waitforme) return -2;
if (ho) { // paranoid: stringp(ho) && strlen(ho)) {
if (po) port = po;
#ifndef ERQ_WITHOUT_SRV
# ifndef ERQ_WITHOUT_SRV
if (srv) {
hostname = lower_case(ho);
host = 0;
} else
#endif
# endif
host = lower_case(ho);
P2(("connect.%s:\t%O, %O, %O\t%O\n", srv || "to",
ho, po, transport, ME))
}
#ifndef ERQ_WITHOUT_SRV
# ifndef ERQ_WITHOUT_SRV
P4(("connect->srv_choose? depends on srv %O\n", srv))
if (srv) return dns_srv_resolve(hostname, srv, // _psyc._tls.domain
transport == "s" ? "tls" : "tcp", #'srv_choose,
transport);
#endif
# endif
if (::connect(host, port, transport, extra) >= 0)
time_of_connect_attempt = time();
#endif
}
disconnected(remaining) {

1
world/net/http/server.c
View File

@ -114,6 +114,7 @@ process_header() {
parse_request(input) {
P0(("=== HTTP got: %O from %O\n", input, query_ip_name(ME)))
if (input == "HEAD / HTTP/1.1") return 1;
if (!input || input=="") {
// should return error?

8
world/net/include/net.h
View File

@ -53,7 +53,8 @@
# define DEFAULT_CONTENT_TYPE "text/html; charset=" SYSTEM_CHARSET
#endif
#if __EFUN_DEFINED__(idna_stringprep) && defined(DRIVER_PATH)
// 2018-05 tmp disabled stringprep:
#if __EFUN_DEFINED__(idna_stringprep) && defined(DRIVER_PATH) && !defined(_flag_disable_idna_stringprep)
// stringprep needs utf8 arguments
// this results in lots of conversions some of which look like
// system->utf­>system->utf. luckily UTF8 is our system charset.
@ -221,7 +222,10 @@
# define WANT_S2S_TLS
# define WANT_S2S_SASL
# define ENTER_MEMBERS
# define PERSISTENT_MASTERS
// disabled 2018-05 due to stringprep messing up the _routes
// data structures *and* plenty of karteileichen which means
// that clean-up of _routes is not working!!
//# define PERSISTENT_MASTERS
# define NEW_RENDER
# define MUCSUC
//# define XMPP_BIDI