another rename

pull/2/head
Tom Early 3 years ago
parent 86dbce8f15
commit ce66f2e260

@ -619,7 +619,7 @@ void CReflector::PutDHTUsers()
void CReflector::PutDHTConfig() void CReflector::PutDHTConfig()
{ {
const std::string cs(g_Configure.GetString(g_Keys.names.callsign)); const std::string cs(g_Configure.GetString(g_Keys.names.callsign));
SUrfdConfig0 cfg; SUrfdConfig1 cfg;
time(&cfg.timestamp); time(&cfg.timestamp);
cfg.cs.assign(cs); cfg.cs.assign(cs);
cfg.ipv4.assign(g_Configure.GetString(g_Keys.ip.ipv4address)); cfg.ipv4.assign(g_Configure.GetString(g_Keys.ip.ipv4address));
@ -668,7 +668,7 @@ void CReflector::PutDHTConfig()
void CReflector::GetDHTConfig(const std::string &cs) void CReflector::GetDHTConfig(const std::string &cs)
{ {
static SUrfdConfig0 cfg; static SUrfdConfig1 cfg;
cfg.timestamp = 0; // every time this is called, zero the timestamp cfg.timestamp = 0; // every time this is called, zero the timestamp
auto item = g_GateKeeper.GetInterlinkMap()->FindMapItem(cs); auto item = g_GateKeeper.GetInterlinkMap()->FindMapItem(cs);
g_GateKeeper.ReleaseInterlinkMap(); g_GateKeeper.ReleaseInterlinkMap();
@ -688,11 +688,11 @@ void CReflector::GetDHTConfig(const std::string &cs)
[](const std::shared_ptr<dht::Value> &v) { [](const std::shared_ptr<dht::Value> &v) {
if (0 == v->user_type.compare("mrefd-config-1")) if (0 == v->user_type.compare("mrefd-config-1"))
{ {
auto rdat = dht::Value::unpack<SUrfdConfig0>(*v); auto rdat = dht::Value::unpack<SUrfdConfig1>(*v);
if (rdat.timestamp > cfg.timestamp) if (rdat.timestamp > cfg.timestamp)
{ {
// the time stamp is the newest so far, so put it in the static cfg struct // the time stamp is the newest so far, so put it in the static cfg struct
cfg = dht::Value::unpack<SUrfdConfig0>(*v); cfg = dht::Value::unpack<SUrfdConfig1>(*v);
} }
} }
else else

@ -74,7 +74,7 @@ enum class EUrfdPorts : unsigned { dcs, dextra, dmrplus, dplus, m17, mmdvm, nxdn
enum class EUrfdAlMod : unsigned { nxdn, p25, ysf, SIZE }; enum class EUrfdAlMod : unsigned { nxdn, p25, ysf, SIZE };
enum class EUrfdTxRx : unsigned { rx, tx, SIZE }; enum class EUrfdTxRx : unsigned { rx, tx, SIZE };
enum class EUrfdRefId : unsigned { nxdn, p25, SIZE }; enum class EUrfdRefId : unsigned { nxdn, p25, SIZE };
struct SUrfdConfig0 struct SUrfdConfig1
{ {
std::time_t timestamp; std::time_t timestamp;
std::string cs, ipv4, ipv6, mods, tcmods, url, email, sponsor, country, version; std::string cs, ipv4, ipv6, mods, tcmods, url, email, sponsor, country, version;

Loading…
Cancel
Save

Powered by TurnKey Linux.