Martin Michelsen
0d4b0b2279
- $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
78 lines
2.0 KiB
C++
78 lines
2.0 KiB
C++
#pragma once
|
|
|
|
#include <inttypes.h>
|
|
#include <stddef.h>
|
|
|
|
#include <string>
|
|
|
|
|
|
int char16cmp(const char16_t* s1, const char16_t* s2, size_t count);
|
|
void char16cpy(char16_t* dest, const char16_t* src, size_t count);
|
|
size_t char16len(const char16_t* s);
|
|
|
|
|
|
void encode_sjis(char* dest, const char16_t* source, size_t dest_count);
|
|
void decode_sjis(char16_t* dest, const char* source, size_t dest_count);
|
|
std::string encode_sjis(const char16_t* source);
|
|
std::u16string decode_sjis(const char* source);
|
|
std::string encode_sjis(const std::u16string& source);
|
|
std::u16string decode_sjis(const std::string& source);
|
|
|
|
|
|
void add_language_marker_inplace(char* s, char marker, size_t dest_count);
|
|
void add_language_marker_inplace(char16_t* s, char16_t marker, size_t dest_count);
|
|
void remove_language_marker_inplace(char* s);
|
|
void remove_language_marker_inplace(char16_t* s);
|
|
std::string add_language_marker(const std::string& s, char marker);
|
|
std::u16string add_language_marker(const std::u16string& s, char16_t marker);
|
|
std::string remove_language_marker(const std::string& s);
|
|
std::u16string remove_language_marker(const std::u16string& s);
|
|
|
|
|
|
template <typename T>
|
|
void replace_char_inplace(T* a, T f, T r) {
|
|
while (*a) {
|
|
if (*a == f) {
|
|
*a = r;
|
|
}
|
|
a++;
|
|
}
|
|
}
|
|
|
|
template <typename T>
|
|
size_t add_color_inplace(T* a) {
|
|
T* d = a;
|
|
T* orig_d = d;
|
|
|
|
while (*a) {
|
|
if (*a == '$') {
|
|
*(d++) = '\t';
|
|
} else if (*a == '#') {
|
|
*(d++) = '\n';
|
|
} else if (*a == '%') {
|
|
a++;
|
|
if (*a == 's') {
|
|
*(d++) = '$';
|
|
} else if (*a == '%') {
|
|
*(d++) = '%';
|
|
} else if (*a == 'n') {
|
|
*(d++) = '#';
|
|
} else {
|
|
*(d++) = *a;
|
|
}
|
|
} else {
|
|
*(d++) = *a;
|
|
}
|
|
a++;
|
|
}
|
|
*d = 0;
|
|
|
|
return d - orig_d;
|
|
}
|
|
|
|
template <typename T>
|
|
void add_color_inplace(std::basic_string<T>& a, size_t header_bytes) {
|
|
size_t count = add_color_inplace(const_cast<T*>(a.data() + header_bytes));
|
|
a.resize(count + header_bytes);
|
|
}
|