github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 22:03:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rename classes
Some checks are pending
/ build_macos (push) Waiting to run
Details
/ build_windows (push) Waiting to run
Details
/ build_ubuntu (push) Waiting to run
Details

Browse source
This commit is contained in:
Grant Limberg 2025-08-20 10:07:13 -07:00
commit ebe8fdb08e
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
controller/PubSubListener.cpp
View file

@ -17,14 +17,14 @@ void listener_callback(void* user_ptr, const uint8_t* payload, uintptr_t length)
listener->onNotification(payload_str); listener->onNotification(payload_str);
} }
NetworkListener::NetworkListener(const char* controller_id, uint64_t listen_timeout, rustybits::NetworkListenerCallback callback) : _listener(nullptr) PubSubNetworkListener::PubSubNetworkListener(const char* controller_id, uint64_t listen_timeout, rustybits::NetworkListenerCallback callback) : _listener(nullptr)
{ {
_listener = rustybits::network_listener_new(controller_id, listen_timeout, callback, this); _listener = rustybits::network_listener_new(controller_id, listen_timeout, callback, this);
_listenThread = std::thread(&NetworkListener::listenThread, this); _listenThread = std::thread(&PubSubNetworkListener::listenThread, this);
_changeHandlerThread = std::thread(&NetworkListener::changeHandlerThread, this); _changeHandlerThread = std::thread(&PubSubNetworkListener::changeHandlerThread, this);
} }
NetworkListener::~NetworkListener() PubSubNetworkListener::~PubSubNetworkListener()
{ {
if (_listener) { if (_listener) {
rustybits::network_listener_delete(_listener); rustybits::network_listener_delete(_listener);
@ -32,13 +32,13 @@ NetworkListener::~NetworkListener()
} }
} }
void NetworkListener::onNotification(const std::string& payload) void PubSubNetworkListener::onNotification(const std::string& payload)
{ {
fprintf(stderr, "Network notification received: %s\n", payload.c_str()); fprintf(stderr, "Network notification received: %s\n", payload.c_str());
// TODO: Implement the logic to handle network notifications // TODO: Implement the logic to handle network notifications
} }
void NetworkListener::listenThread() void PubSubNetworkListener::listenThread()
{ {
if (_listener) { if (_listener) {
while (rustybits::network_listener_listen(_listener)) { while (rustybits::network_listener_listen(_listener)) {
@ -47,14 +47,14 @@ void NetworkListener::listenThread()
} }
} }
void NetworkListener::changeHandlerThread() void PubSubNetworkListener::changeHandlerThread()
{ {
if (_listener) { if (_listener) {
rustybits::network_listener_change_handler(_listener); rustybits::network_listener_change_handler(_listener);
} }
} }
MemberListener::MemberListener(const char* controller_id, uint64_t listen_timeout, rustybits::NetworkListenerCallback callback) : _listener(nullptr) PubSubMemberListener::PubSubMemberListener(const char* controller_id, uint64_t listen_timeout, rustybits::NetworkListenerCallback callback) : _listener(nullptr)
{ {
// Initialize the member listener with the provided controller ID and timeout // Initialize the member listener with the provided controller ID and timeout
// The callback will be called when a member notification is received // The callback will be called when a member notification is received
@ -63,7 +63,7 @@ MemberListener::MemberListener(const char* controller_id, uint64_t listen_timeou
} }
} }
MemberListener::~MemberListener() PubSubMemberListener::~PubSubMemberListener()
{ {
if (_listener) { if (_listener) {
rustybits::member_listener_delete(_listener); rustybits::member_listener_delete(_listener);
@ -71,14 +71,14 @@ MemberListener::~MemberListener()
} }
} }
void MemberListener::onNotification(const std::string& payload) void PubSubMemberListener::onNotification(const std::string& payload)
{ {
fprintf(stderr, "Member notification received: %s\n", payload.c_str()); fprintf(stderr, "Member notification received: %s\n", payload.c_str());
// TODO: Implement the logic to handle network notifications // TODO: Implement the logic to handle network notifications
} }
void MemberListener::listenThread() void PubSubMemberListener::listenThread()
{ {
if (_listener) { if (_listener) {
while (rustybits::member_listener_listen(_listener)) { while (rustybits::member_listener_listen(_listener)) {
@ -87,7 +87,7 @@ void MemberListener::listenThread()
} }
} }
void MemberListener::changeHandlerThread() void PubSubMemberListener::changeHandlerThread()
{ {
if (_listener) { if (_listener) {
rustybits::member_listener_change_handler(_listener); rustybits::member_listener_change_handler(_listener);

12
controller/PubSubListener.hpp
View file

@ -19,10 +19,10 @@ class PubSubListener {
virtual void onNotification(const std::string& payload) = 0; virtual void onNotification(const std::string& payload) = 0;
}; };
class NetworkListener : public PubSubListener { class PubSubNetworkListener : public PubSubListener {
public: public:
NetworkListener(const char* controller_id, uint64_t listen_timeout, rustybits::NetworkListenerCallback callback); PubSubNetworkListener(const char* controller_id, uint64_t listen_timeout, rustybits::NetworkListenerCallback callback);
virtual ~NetworkListener(); virtual ~PubSubNetworkListener();
virtual void onNotification(const std::string& payload) override; virtual void onNotification(const std::string& payload) override;
@ -35,10 +35,10 @@ class NetworkListener : public PubSubListener {
std::thread _changeHandlerThread; std::thread _changeHandlerThread;
}; };
class MemberListener : public PubSubListener { class PubSubMemberListener : public PubSubListener {
public: public:
MemberListener(const char* controller_id, uint64_t listen_timeout, rustybits::MemberListenerCallback callback); PubSubMemberListener(const char* controller_id, uint64_t listen_timeout, rustybits::MemberListenerCallback callback);
virtual ~MemberListener(); virtual ~PubSubMemberListener();
virtual void onNotification(const std::string& payload) override; virtual void onNotification(const std::string& payload) override;