Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-10-31 09:20:21 +00:00
Code Issues Projects Releases Wiki Activity

use std::string instead of fs::path

Browse Source
This commit is contained in:
Jeff Becker 2019-07-14 07:25:33 -04:00
parent 8dab4b87bb
commit 750397d085
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llarp/config/config.hpp
View File

@ -110,16 +110,16 @@ namespace llarp
std::string m_netId; std::string m_netId;
std::string m_nickname; std::string m_nickname;
fs::path m_encryptionKeyfile = "encryption.key"; std::string m_encryptionKeyfile = "encryption.key";
// path to write our self signed rc to // path to write our self signed rc to
fs::path m_ourRcFile = "rc.signed"; std::string m_ourRcFile = "rc.signed";
// transient iwp encryption key // transient iwp encryption key
fs::path m_transportKeyfile = "transport.key"; std::string m_transportKeyfile = "transport.key";
// long term identity key // long term identity key
fs::path m_identKeyfile = "identity.key"; std::string m_identKeyfile = "identity.key";
bool m_publicOverride = false; bool m_publicOverride = false;
struct sockaddr_in m_ip4addr; struct sockaddr_in m_ip4addr;
@ -132,10 +132,10 @@ namespace llarp
// clang-format off // clang-format off
size_t minConnectedRouters() const { return fromEnv(m_minConnectedRouters, "MIN_CONNECTED_ROUTERS"); } size_t minConnectedRouters() const { return fromEnv(m_minConnectedRouters, "MIN_CONNECTED_ROUTERS"); }
size_t maxConnectedRouters() const { return fromEnv(m_maxConnectedRouters, "MAX_CONNECTED_ROUTERS"); } size_t maxConnectedRouters() const { return fromEnv(m_maxConnectedRouters, "MAX_CONNECTED_ROUTERS"); }
fs::path encryptionKeyfile() const { return fromEnv(m_encryptionKeyfile, "ENCRYPTION_KEYFILE"); } std::string encryptionKeyfile() const { return fromEnv(m_encryptionKeyfile, "ENCRYPTION_KEYFILE"); }
fs::path ourRcFile() const { return fromEnv(m_ourRcFile, "OUR_RC_FILE"); } std::string ourRcFile() const { return fromEnv(m_ourRcFile, "OUR_RC_FILE"); }
fs::path transportKeyfile() const { return fromEnv(m_transportKeyfile, "TRANSPORT_KEYFILE"); } std::string transportKeyfile() const { return fromEnv(m_transportKeyfile, "TRANSPORT_KEYFILE"); }
fs::path identKeyfile() const { return fromEnv(m_identKeyfile, "IDENT_KEYFILE"); } std::string identKeyfile() const { return fromEnv(m_identKeyfile, "IDENT_KEYFILE"); }
std::string netId() const { return fromEnv(m_netId, "NETID"); } std::string netId() const { return fromEnv(m_netId, "NETID"); }
std::string nickname() const { return fromEnv(m_nickname, "NICKNAME"); } std::string nickname() const { return fromEnv(m_nickname, "NICKNAME"); }
bool publicOverride() const { return fromEnv(m_publicOverride, "PUBLIC_OVERRIDE"); } bool publicOverride() const { return fromEnv(m_publicOverride, "PUBLIC_OVERRIDE"); }

2
vendor/cppbackport-master/lib/fs/path.cpp vendored
View File

@ -66,7 +66,7 @@ namespace cpp17
void void
path::swap(path& p) path::swap(path& p)
{ {
s.swap(p.s); std::swap(p.s, s);
} }
std::string std::string

8
vendor/cppbackport-master/lib/fs/path.h vendored
View File

@ -83,9 +83,7 @@ public:
template< typename Source > template< typename Source >
path& assign(const Source& source) path& assign(const Source& source)
{ {
path t(source); s = string_type(source);
swap(t);
return *this; return *this;
} }
@ -95,9 +93,7 @@ public:
Iterator last Iterator last
) )
{ {
path t(first, last); s = string_type(first, last);
swap(t);
return *this; return *this;
} }