mirror of
https://github.com/minetest/minetest.git
synced 2024-08-20 05:24:15 +02:00
parent
bdc124ba41
commit
e8008c1b21
@ -33,6 +33,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "util/srp.h"
|
#include "util/srp.h"
|
||||||
#include "face_position_cache.h"
|
#include "face_position_cache.h"
|
||||||
|
|
||||||
|
static std::string string_sanitize_ascii(const std::string &s, u32 max_length)
|
||||||
|
{
|
||||||
|
std::string out;
|
||||||
|
for (char c : s) {
|
||||||
|
if (out.size() >= max_length)
|
||||||
|
break;
|
||||||
|
if (c > 32 && c < 127)
|
||||||
|
out.push_back(c);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
const char *ClientInterface::statenames[] = {
|
const char *ClientInterface::statenames[] = {
|
||||||
"Invalid",
|
"Invalid",
|
||||||
"Disconnecting",
|
"Disconnecting",
|
||||||
@ -46,8 +58,6 @@ const char *ClientInterface::statenames[] = {
|
|||||||
"SudoMode",
|
"SudoMode",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::string ClientInterface::state2Name(ClientState state)
|
std::string ClientInterface::state2Name(ClientState state)
|
||||||
{
|
{
|
||||||
return statenames[state];
|
return statenames[state];
|
||||||
@ -639,9 +649,17 @@ void RemoteClient::resetChosenMech()
|
|||||||
chosen_mech = AUTH_MECHANISM_NONE;
|
chosen_mech = AUTH_MECHANISM_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 RemoteClient::uptime() const
|
void RemoteClient::setVersionInfo(u8 major, u8 minor, u8 patch, const std::string &full)
|
||||||
{
|
{
|
||||||
return porting::getTimeS() - m_connection_time;
|
m_version_major = major;
|
||||||
|
m_version_minor = minor;
|
||||||
|
m_version_patch = patch;
|
||||||
|
m_full_version = string_sanitize_ascii(full, 64);
|
||||||
|
}
|
||||||
|
|
||||||
|
void RemoteClient::setLangCode(const std::string &code)
|
||||||
|
{
|
||||||
|
m_lang_code = string_sanitize_ascii(code, 12);
|
||||||
}
|
}
|
||||||
|
|
||||||
ClientInterface::ClientInterface(const std::shared_ptr<con::Connection> & con)
|
ClientInterface::ClientInterface(const std::shared_ptr<con::Connection> & con)
|
||||||
|
@ -329,16 +329,10 @@ public:
|
|||||||
{ serialization_version = m_pending_serialization_version; }
|
{ serialization_version = m_pending_serialization_version; }
|
||||||
|
|
||||||
/* get uptime */
|
/* get uptime */
|
||||||
u64 uptime() const;
|
u64 uptime() const { return porting::getTimeS() - m_connection_time; }
|
||||||
|
|
||||||
/* set version information */
|
/* set version information */
|
||||||
void setVersionInfo(u8 major, u8 minor, u8 patch, const std::string &full)
|
void setVersionInfo(u8 major, u8 minor, u8 patch, const std::string &full);
|
||||||
{
|
|
||||||
m_version_major = major;
|
|
||||||
m_version_minor = minor;
|
|
||||||
m_version_patch = patch;
|
|
||||||
m_full_version = full;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* read version information */
|
/* read version information */
|
||||||
u8 getMajor() const { return m_version_major; }
|
u8 getMajor() const { return m_version_major; }
|
||||||
@ -346,7 +340,7 @@ public:
|
|||||||
u8 getPatch() const { return m_version_patch; }
|
u8 getPatch() const { return m_version_patch; }
|
||||||
const std::string &getFullVer() const { return m_full_version; }
|
const std::string &getFullVer() const { return m_full_version; }
|
||||||
|
|
||||||
void setLangCode(const std::string &code) { m_lang_code = code; }
|
void setLangCode(const std::string &code);
|
||||||
const std::string &getLangCode() const { return m_lang_code; }
|
const std::string &getLangCode() const { return m_lang_code; }
|
||||||
|
|
||||||
void setCachedAddress(const Address &addr) { m_addr = addr; }
|
void setCachedAddress(const Address &addr) { m_addr = addr; }
|
||||||
|
Loading…
Reference in New Issue
Block a user