ChronosXYZ/psyced
1
0
Fork 0
mirror of https://github.com/ChronosX88/psyced.git synced 2024-11-13 22:11:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin'

Browse Source
This commit is contained in:
psyc://loupsycedyglgamf.onion/~lynX 2016-07-02 13:28:38 +02:00
commit 7ed24714e8
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/net/root.c
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))
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",

34
world/net/sockets.c
View File

@ -18,6 +18,19 @@
//#define NO_INHERIT // virtual ain't workin' .. but leavin it out neither //#define NO_INHERIT // virtual ain't workin' .. but leavin it out neither
#include <text.h> #include <text.h>
// similar logic in probably_private()
static string safetypin(object o, string ip) {
return !interactive(o) ? "-" :
#ifdef SECURE_IP_NUMBER
SECURE_IP_NUMBER(ip) ? "*" :
#endif
is_localhost(ip) ? "=" :
#if __EFUN_DEFINED__(tls_query_connection_state)
tls_query_connection_state(o) ? "+" :
#endif
" ";
}
static int smaller_object_name(object a, object b) { static int smaller_object_name(object a, object b) {
return object_name(a) < object_name(b); return object_name(a) < object_name(b);
} }
@ -64,17 +77,10 @@ list_sockets(guy, flags) {
if (boss(o)) name += "*"; if (boss(o)) name += "*";
if (uv["visibility"] == "off") name = "°"+name; if (uv["visibility"] == "off") name = "°"+name;
list += sprintf(T("_list_user_technical_person", list += sprintf(T("_list_user_technical_person",
"\n%4.4s%s %s %s %s (%s) <%s> %s"), "\n%s%4.4s %s %s %s (%s) <%s> %s"),
// scheme ? (layout && scheme=="ht" ? safetypin(o, ip),
// layout : scheme) : "-",
(scheme == "ht" ? (layout || scheme) (scheme == "ht" ? (layout || scheme)
: scheme) || "", : scheme) || "",
#if __EFUN_DEFINED__(tls_query_connection_state)
interactive(o) &&
tls_query_connection_state(o) ? "!" : " ",
#else
" ",
#endif
idle ? ((stringp(idle) ? idle ? ((stringp(idle) ?
idle : to_string(idle))) : "", idle : to_string(idle))) : "",
name || "???", name || "???",
@ -92,20 +98,12 @@ list_sockets(guy, flags) {
if (name? flags & SOCKET_LIST_GHOST : flags & SOCKET_LIST_LINK) if (name? flags & SOCKET_LIST_GHOST : flags & SOCKET_LIST_LINK)
list += sprintf(T("_list_user_technical_ghost", list += sprintf(T("_list_user_technical_ghost",
"\n%s %s %O %s (%s) %s %s"), "\n%s %s %O %s (%s) %s %s"),
#if __EFUN_DEFINED__(tls_query_connection_state) safetypin(o, query_ip_number(o)),
interactive(o) &&
tls_query_connection_state(o) ? "!" : " ",
#else
" ",
#endif
(name && to_string(name)) || "", (name && to_string(name)) || "",
o, o,
#if 1 //def _flag_log_hosts // realtime inspection isn't logging
query_ip_name(o) || "", query_ip_name(o) || "",
query_ip_number(o) || "", query_ip_number(o) || "",
#else
"", "", "", "",
#endif
#if __EFUN_DEFINED__(tls_query_connection_info) #if __EFUN_DEFINED__(tls_query_connection_info)
tls ? intp(tls[TLS_PROT]) ? tls ? intp(tls[TLS_PROT]) ?
TLS_PROT_NAME(tls[TLS_PROT]) || TLS_PROT_NAME(tls[TLS_PROT]) ||