From 291bd308c23a3791d2b1228c53fd60cc41dd507c Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Sun, 17 Jul 2016 19:45:12 +0200 Subject: [PATCH 1/2] simple demonstration of chatroom integration of an outgoing socket --- place/nemesis.c | 18 +++++ world/net/include/place.gen | 7 ++ world/net/tn/outgoing.c | 145 ++++++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 place/nemesis.c create mode 100644 world/net/tn/outgoing.c diff --git a/place/nemesis.c b/place/nemesis.c new file mode 100644 index 0000000..4e5a3ec --- /dev/null +++ b/place/nemesis.c @@ -0,0 +1,18 @@ +#include + +#define CONNECT_TELNET "nemesis.de", 2000 +#define ON_CONNECT emit("guest\n"); +#define ON_ANY NET_PATH "tn/outgoing"::msg(source, mc, data, vars); + +#include + +parse(all) { + // remove Nemesis' guest prompt.. why was i so funny + // back then to implement several prompt chars? + if (strlen(all) > 2 && all[1] == ' ' && + (all[0] == '#' || all[0] == '>')) all = all[2 ..]; + return ::parse(all); +} + +#echo Nemesis gateway loaded. + diff --git a/world/net/include/place.gen b/world/net/include/place.gen index 5f40354..c8fe462 100644 --- a/world/net/include/place.gen +++ b/world/net/include/place.gen @@ -177,6 +177,10 @@ inherit NET_PATH "place/intercept"; # endif #endif +#ifdef CONNECT_TELNET +inherit NET_PATH "tn/outgoing"; +#endif + #ifdef FETCH_TEXTDB volatile object feed, tob; @@ -369,6 +373,9 @@ void create() { #ifdef CONNECT_IRC link(CONNECT_IRC); #endif +#ifdef CONNECT_TELNET + link(CONNECT_TELNET); +#endif #if defined(NEWSFEED_RSS) && defined(DEVELOPMENT) // do not connect newsfeeds immediately if running in production mode connect(); diff --git a/world/net/tn/outgoing.c b/world/net/tn/outgoing.c new file mode 100644 index 0000000..b114fa9 --- /dev/null +++ b/world/net/tn/outgoing.c @@ -0,0 +1,145 @@ +// vim:syntax=lpc + +#include +//#include +#include +#include +//#include + +// message queueing and automatic reconnect mgmt +inherit NET_PATH "circuit"; + +//inherit NET_PATH "place/public"; + +#ifdef _flag_log_sockets_telnet_outgoing +emit(all, source) { + log_file("RAW_TN_OUT", "%d %O\t-> %s", time(), ME, all); + return ::emit(all); +} +#endif + +parse(all) { + next_input_to(#'parse); +#ifdef _flag_log_sockets_telnet_outgoing + log_file("RAW_TN_OUT", "%d %O\t<- %s", time(), ME, all); +#endif + // assumes multicaster.. fix later + castmsg(ME, "_notice_telnet_verbatim", "[_text_verbatim]", + ([ "_text_verbatim": all ])); +} + +link(ho, po) { + sTextPath(0, 0, "tn"); + return ::circuit(ho, po || TELNET_SERVICE); +} + +logon(failure) { + int rc = ::logon(failure); + unless (rc) return 0; + next_input_to(#'parse); + parse("[connected]"); // hack to maintain logon ascii graphics intact + call_out(#'runQ, 3); // deliver the queue of messages in circuit.c + return rc; +} + +disconnect(remainder) { + // we typically just want to give it one more try + reconnect(); + // the reconnect in circuit.c will do certain amount of retries only + return 0; // unexpected +} + +msg(source, mc, data, mapping vars, showingLog, target) { + string t, ni, mca; + + if (showingLog) return 1; + PT(("TNOUT(%O,%O,%O,%O,%O,%O)\n", source,mc,data,vars, + showingLog,target)) + unless(interactive()) { + connect(); + // special requirement for enqueue + unless (vars["_source"]) + vars["_source"] = UNIFORM(source); + return enqueue(source, mc, data, vars, showingLog, target); + } + if (abbrev("_status_place",mc) || abbrev("_message_announcement",mc)) { + if (source && source != ME) { + monitor_report("_error_rejected_message_telnet", + S("Caught a %O from %O (%O)", mc, source, data)); + return; + } +#if 0 + tellChannel(source, mc, vars, data); +#endif + return 1; + } +#if 0 + if (abbrev("_message_echo", mc)) return; + if (!data && stringp(vars["_action"]) && abbrev("_message", mc)) + mca = mc +"_action"; + else + mca = mc; + render(mca, data, vars, source); + return 1; +#else + if (abbrev("_message_public", mc)) + return emit(data + "\n"); +#endif +} + +#if 0 + +render(string mc, string data, mapping vars, mixed source) { + string template, output; + mixed t; + + P3(("tn/out:render %O %O\n", ME, data)); + template = T(mc, 0); // enable textdb inheritance + output = psyctext( template, vars, data, source); + if (!output || output=="") return D2(D("tn/out: empty output\n")); + if (template == "") output += "\n"; + emit(output); +} + +cmd(a, args, b, source, vars) { + string t; + + // extra room commands for operators of the gateway + if (b > 0) switch(a) { + case "disc": + return disc(); + } + return ::cmd(a, args, b, source, vars); +} + +showStatus(verbosity, al, person, mc, data, vars) { + if (names && namesfrom) sendmsg(person, "_status_place_members_IRC", + "irc://[_server_IRC]/[_nick_place_IRC] contains: [_members_IRC]", + ([ "_members_IRC": names, + //"_source_IRC": "irc://"+namesfrom+"/"+namesto + "_server_IRC": namesfrom, + "_nick_place_IRC": namesto ])); + return ::showStatus(verbosity, al, person, mc, data, vars); +} + +reboot(reason, restart, pass) { + emit("QUIT :Service "+ (restart ? "restart" : "shutdown") + +": "+ reason +"\n"); + return ::reboot(reason, restart, pass); +} + +static disc() { + emit("QUIT :Service temporarily disabled\n"); + return 1; +} + +onEnter(source, mc, data, vars) { + if (interactive(ME)) tellChannel(source, mc, vars, data); + return ::onEnter(source, mc, data, vars); +} +leave(source, mc, data, vars) { + if (interactive(ME)) tellChannel(source, mc, vars, data); + return ::leave(source, mc, data, vars); +} + +#endif From e6cd27632ea9394b76d48320cb822fbf28613f93 Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Sun, 17 Jul 2016 20:27:15 +0200 Subject: [PATCH 2/2] + --- world/net/tn/outgoing.c | 60 +++++++---------------------------------- 1 file changed, 10 insertions(+), 50 deletions(-) diff --git a/world/net/tn/outgoing.c b/world/net/tn/outgoing.c index b114fa9..9b4c30a 100644 --- a/world/net/tn/outgoing.c +++ b/world/net/tn/outgoing.c @@ -42,13 +42,6 @@ logon(failure) { return rc; } -disconnect(remainder) { - // we typically just want to give it one more try - reconnect(); - // the reconnect in circuit.c will do certain amount of retries only - return 0; // unexpected -} - msg(source, mc, data, mapping vars, showingLog, target) { string t, ni, mca; @@ -82,13 +75,21 @@ msg(source, mc, data, mapping vars, showingLog, target) { render(mca, data, vars, source); return 1; #else - if (abbrev("_message_public", mc)) - return emit(data + "\n"); + if (abbrev("_message_public", mc)) { + // FIXME: should we handle the disconnect instead? + if (data == "quit") return 1; + return emit(data + "\n"); + } #endif } #if 0 +disconnected(remaining) { + // circuit code would destruct this object + return NET_PATH "connect"::disconnected(remaining); +} + render(string mc, string data, mapping vars, mixed source) { string template, output; mixed t; @@ -101,45 +102,4 @@ render(string mc, string data, mapping vars, mixed source) { emit(output); } -cmd(a, args, b, source, vars) { - string t; - - // extra room commands for operators of the gateway - if (b > 0) switch(a) { - case "disc": - return disc(); - } - return ::cmd(a, args, b, source, vars); -} - -showStatus(verbosity, al, person, mc, data, vars) { - if (names && namesfrom) sendmsg(person, "_status_place_members_IRC", - "irc://[_server_IRC]/[_nick_place_IRC] contains: [_members_IRC]", - ([ "_members_IRC": names, - //"_source_IRC": "irc://"+namesfrom+"/"+namesto - "_server_IRC": namesfrom, - "_nick_place_IRC": namesto ])); - return ::showStatus(verbosity, al, person, mc, data, vars); -} - -reboot(reason, restart, pass) { - emit("QUIT :Service "+ (restart ? "restart" : "shutdown") - +": "+ reason +"\n"); - return ::reboot(reason, restart, pass); -} - -static disc() { - emit("QUIT :Service temporarily disabled\n"); - return 1; -} - -onEnter(source, mc, data, vars) { - if (interactive(ME)) tellChannel(source, mc, vars, data); - return ::onEnter(source, mc, data, vars); -} -leave(source, mc, data, vars) { - if (interactive(ME)) tellChannel(source, mc, vars, data); - return ::leave(source, mc, data, vars); -} - #endif