fix a lot of issues on psogc; add proxy module

- $ann implemented - concurrency removed; server is now single-threaded, event-driven and much more stable - rare seed is no longer the game id; ids are sequential from server startup so they weren't random at all before - supports dropping privileges; now you can run it as root so it can open a sockets on low ports, then it will switch to the given user before serving any traffic - newserv now behaves like a proxy if you run it with the --proxy-destination=<IP_OR_HOSTNAME> argument; there's also an (invisible) shell in this mode where you can inject commands to the server or client. e.g. it can always be christmas in the lobby if you do `sc DA 01 00 00` - increased the mtu on PSODolphinConfig's tap0 configuration; this seems to make the connection more stable - fixed some uninitialized memory bugs - the shell is now event-driven and now uses libevent too; unfortunately this means readline doesn't work anymore (no history and vim-like shortcuts) - made network command display consistent for input vs. output (the header appears in both cases now) - fixed bugs in some subcommand handling (the BB logic was being applied to non-BB clients erroneously, causing most item drops not to work at all) - fixed player tags in the short lobby data struct. unclear if this was actually a problem but it was inconsistent with other servers - fixed "unused" field in game join command (actually it appears to be disable_udp and should be 1, not 0) - cleaned up Server abstraction a bit - rewrote some text functions; asan was complaining about the built-in ones for some reason - added an optional welcome message
2020-02-16 15:03:47 -08:00
parent 76c810c1e6
commit 0d4b0b2279
39 changed files with 1487 additions and 975 deletions
@@ -0,0 +1,81 @@
+#include "ProxyShell.hh"
+
+#include <event2/event.h>
+#include <stdio.h>
+
+#include <phosg/Strings.hh>
+
+using namespace std;
+
+
+
+ProxyShell::ProxyShell(std::shared_ptr<struct event_base> base,
+    std::shared_ptr<ServerState> state,
+    std::shared_ptr<ProxyServer> proxy_server) : Shell(base, state),
+    proxy_server(proxy_server) { }
+
+void ProxyShell::execute_command(const string& command) {
+  // find the entry in the command table and run the command
+  size_t command_end = skip_non_whitespace(command, 0);
+  size_t args_begin = skip_whitespace(command, command_end);
+  string command_name = command.substr(0, command_end);
+  string command_args = command.substr(args_begin);
+
+  if (command_name == "exit") {
+    throw exit_shell();
+
+  } else if (command_name == "help") {
+    fprintf(stderr, "\
+commands:\n\
+  help\n\
+    you\'re reading it now\n\
+  exit (or ctrl+d)\n\
+    shut down the proxy\n\
+  sc <data>\n\
+    send a command to the client\n\
+  ss <data>\n\
+    send a command to the server\n\
+  chat <text>\n\
+    send a chat message to the server\n\
+");
+
+  } else if ((command_name == "sc") || (command_name == "ss")) {
+    bool to_client = (command_name[1] == 'c');
+    string data = parse_data_string(command_args);
+    if (data.size() & 3) {
+      throw invalid_argument("data size is not a multiple of 4");
+    }
+    if (data.size() == 0) {
+      throw invalid_argument("no data given");
+    }
+    uint16_t* size_field = reinterpret_cast<uint16_t*>(const_cast<char*>(data.data() + 2));
+    *size_field = data.size();
+
+    log(INFO, "%s (from proxy):", to_client ? "server" : "client");
+    print_data(stderr, data);
+
+    if (to_client) {
+      this->proxy_server->send_to_client(data);
+    } else {
+      this->proxy_server->send_to_server(data);
+    }
+
+  } else if (command_name == "chat") {
+    string data(12, '\0');
+    data[0] = 0x06;
+    data.push_back('\x09');
+    data.push_back('E');
+    data += command_args;
+    data.push_back('\0');
+    data.resize((data.size() + 3) & (~3));
+    uint16_t* size_field = reinterpret_cast<uint16_t*>(const_cast<char*>(data.data() + 2));
+    *size_field = data.size();
+
+    log(INFO, "client (from proxy):");
+    print_data(stderr, data);
+    this->proxy_server->send_to_server(data);
+
+  } else {
+    throw invalid_argument("unknown command; try \'help\'");
+  }
+}