void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-08-02 07:02:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

inheritence mess cleanup

Browse source
This commit is contained in:
Grant Limberg 2025-07-16 10:40:19 -07:00
parent 4a15671e84
commit 3f19712178
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
8 changed files with 73 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controller/CV1.cpp
View file

@ -1209,7 +1209,7 @@ void CV1::_membersWatcher_Postgres()
std::string stream = "member_" + _myAddressStr;
fprintf(stderr, "Listening to member stream: %s\n", stream.c_str());
MemberNotificationReceiver m(this, *c->c, stream);
MemberNotificationReceiver<CV1> m(this, *c->c, stream);
while (_run == 1) {
c->c->await_notification(5, 0);
@ -1316,7 +1316,7 @@ void CV1::_networksWatcher_Postgres()
auto c = _pool->borrow();
NetworkNotificationReceiver n(this, *c->c, stream);
NetworkNotificationReceiver<CV1> n(this, *c->c, stream);
while (_run == 1) {
auto provider = opentelemetry::trace::Provider::GetTracerProvider();

3
controller/CV1.hpp
View file

@ -43,6 +43,9 @@ struct RedisConfig;
* but be aware that we might change it at any time.
*/
class CV1 : public DB {
friend class MemberNotificationReceiver<CV1>;
friend class NetworkNotificationReceiver<CV1>;
public:
CV1(const Identity& myId, const char* path, int listenPort, RedisConfig* rc);
virtual ~CV1();

4
controller/CV2.cpp
View file

@ -790,7 +790,7 @@ void CV2::membersDbWatcher()
std::string stream = "member_" + _myAddressStr;
fprintf(stderr, "Listening to member stream: %s\n", stream.c_str());
MemberNotificationReceiver m(this, *c->c, stream);
MemberNotificationReceiver<CV2> m(this, *c->c, stream);
while (_run == 1) {
c->c->await_notification(5, 0);
@ -809,7 +809,7 @@ void CV2::networksDbWatcher()
auto c = _pool->borrow();
NetworkNotificationReceiver n(this, *c->c, stream);
NetworkNotificationReceiver<CV2> n(this, *c->c, stream);
while (_run == 1) {
c->c->await_notification(5, 0);

3
controller/CV2.hpp
View file

@ -31,6 +31,9 @@
namespace ZeroTier {
class CV2 : public DB {
friend class MemberNotificationReceiver<CV2>;
friend class NetworkNotificationReceiver<CV2>;
public:
CV2(const Identity& myId, const char* path, int listenPort);
virtual ~CV2();

4
controller/DB.hpp
View file

@ -61,10 +61,6 @@ struct AuthInfo {
* Base class with common infrastructure for all controller DB implementations
*/
class DB {
#ifdef ZT_CONTROLLER_USE_LIBPQ
friend class MemberNotificationReceiver;
friend class NetworkNotificationReceiver;
#endif
public:
class ChangeListener {
public:

60
controller/PostgreSQL.cpp
View file

@ -2,70 +2,10 @@
#include "PostgreSQL.hpp"
#include "opentelemetry/trace/provider.h"
#include <nlohmann/json.hpp>
using namespace nlohmann;
using namespace ZeroTier;
MemberNotificationReceiver::MemberNotificationReceiver(DB* p, pqxx::connection& c, const std::string& channel) : pqxx::notification_receiver(c, channel), _psql(p)
{
fprintf(stderr, "initialize MemberNotificationReceiver\n");
}
void MemberNotificationReceiver::operator()(const std::string& payload, int packend_pid)
{
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
auto tracer = provider->GetTracer("db_member_notification");
auto span = tracer->StartSpan("db_member_notification::operator()");
auto scope = tracer->WithActiveSpan(span);
span->SetAttribute("payload", payload);
fprintf(stderr, "Member Notification received: %s\n", payload.c_str());
Metrics::pgsql_mem_notification++;
json tmp(json::parse(payload));
json& ov = tmp["old_val"];
json& nv = tmp["new_val"];
json oldConfig, newConfig;
if (ov.is_object())
oldConfig = ov;
if (nv.is_object())
newConfig = nv;
if (oldConfig.is_object() || newConfig.is_object()) {
_psql->_memberChanged(oldConfig, newConfig, _psql->isReady());
fprintf(stderr, "payload sent\n");
}
}
NetworkNotificationReceiver::NetworkNotificationReceiver(DB* p, pqxx::connection& c, const std::string& channel) : pqxx::notification_receiver(c, channel), _psql(p)
{
fprintf(stderr, "initialize NetworkNotificationReceiver\n");
}
void NetworkNotificationReceiver::operator()(const std::string& payload, int packend_pid)
{
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
auto tracer = provider->GetTracer("db_network_notification");
auto span = tracer->StartSpan("db_network_notification::operator()");
auto scope = tracer->WithActiveSpan(span);
span->SetAttribute("payload", payload);
fprintf(stderr, "Network Notification received: %s\n", payload.c_str());
Metrics::pgsql_net_notification++;
json tmp(json::parse(payload));
json& ov = tmp["old_val"];
json& nv = tmp["new_val"];
json oldConfig, newConfig;
if (ov.is_object())
oldConfig = ov;
if (nv.is_object())
newConfig = nv;
if (oldConfig.is_object() || newConfig.is_object()) {
_psql->_networkChanged(oldConfig, newConfig, _psql->isReady());
fprintf(stderr, "payload sent\n");
}
}
#endif

70
controller/PostgreSQL.hpp
View file

@ -18,8 +18,10 @@
#include "ConnectionPool.hpp"
#include "DB.hpp"
#include "opentelemetry/trace/provider.h"
#include <memory>
#include <nlohmann/json.hpp>
#include <pqxx/pqxx>
namespace ZeroTier {
@ -56,32 +58,84 @@ class PostgresConnFactory : public ConnectionFactory {
std::string m_connString;
};
class MemberNotificationReceiver : public pqxx::notification_receiver {
template <typename T> class MemberNotificationReceiver : public pqxx::notification_receiver {
public:
MemberNotificationReceiver(DB* p, pqxx::connection& c, const std::string& channel);
MemberNotificationReceiver(T* p, pqxx::connection& c, const std::string& channel) : pqxx::notification_receiver(c, channel), _psql(p)
{
fprintf(stderr, "initialize MemberNotificationReceiver\n");
}
virtual ~MemberNotificationReceiver()
{
fprintf(stderr, "MemberNotificationReceiver destroyed\n");
}
virtual void operator()(const std::string& payload, int backendPid);
virtual void operator()(const std::string& payload, int backendPid)
{
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
auto tracer = provider->GetTracer("db_member_notification");
auto span = tracer->StartSpan("db_member_notification::operator()");
auto scope = tracer->WithActiveSpan(span);
span->SetAttribute("payload", payload);
fprintf(stderr, "Member Notification received: %s\n", payload.c_str());
Metrics::pgsql_mem_notification++;
nlohmann::json tmp(nlohmann::json::parse(payload));
nlohmann::json& ov = tmp["old_val"];
nlohmann::json& nv = tmp["new_val"];
nlohmann::json oldConfig, newConfig;
if (ov.is_object())
oldConfig = ov;
if (nv.is_object())
newConfig = nv;
if (oldConfig.is_object() || newConfig.is_object()) {
_psql->_memberChanged(oldConfig, newConfig, _psql->isReady());
fprintf(stderr, "payload sent\n");
}
}
private:
DB* _psql;
T* _psql;
};
class NetworkNotificationReceiver : public pqxx::notification_receiver {
template <typename T> class NetworkNotificationReceiver : public pqxx::notification_receiver {
public:
NetworkNotificationReceiver(DB* p, pqxx::connection& c, const std::string& channel);
NetworkNotificationReceiver(T* p, pqxx::connection& c, const std::string& channel) : pqxx::notification_receiver(c, channel), _psql(p)
{
fprintf(stderr, "initialize NetworkrNotificationReceiver\n");
}
virtual ~NetworkNotificationReceiver()
{
fprintf(stderr, "NetworkNotificationReceiver destroyed\n");
};
virtual void operator()(const std::string& payload, int packend_pid);
virtual void operator()(const std::string& payload, int packend_pid)
{
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
auto tracer = provider->GetTracer("db_network_notification");
auto span = tracer->StartSpan("db_network_notification::operator()");
auto scope = tracer->WithActiveSpan(span);
span->SetAttribute("payload", payload);
fprintf(stderr, "Network Notification received: %s\n", payload.c_str());
Metrics::pgsql_net_notification++;
nlohmann::json tmp(nlohmann::json::parse(payload));
nlohmann::json& ov = tmp["old_val"];
nlohmann::json& nv = tmp["new_val"];
nlohmann::json oldConfig, newConfig;
if (ov.is_object())
oldConfig = ov;
if (nv.is_object())
newConfig = nv;
if (oldConfig.is_object() || newConfig.is_object()) {
_psql->_networkChanged(oldConfig, newConfig, _psql->isReady());
fprintf(stderr, "payload sent\n");
}
}
private:
DB* _psql;
T* _psql;
};
struct NodeOnlineRecord {

1
objects.mk
View file

@ -40,7 +40,6 @@ ONE_OBJS=\
controller/FileDB.o \
controller/LFDB.o \
controller/CtlUtil.o \
controller/PostgreSQL.o \
controller/CV1.o \
controller/CV2.o \
osdep/EthernetTap.o \