From ccb856749fba9e2fa6bc844f13527888e832e04f Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Fri, 30 Nov 2018 10:37:27 -0800 Subject: back to plain old libpq in dev --- controller/PostgreSQL.hpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'controller/PostgreSQL.hpp') diff --git a/controller/PostgreSQL.hpp b/controller/PostgreSQL.hpp index 86aac80d..36fe8c9f 100644 --- a/controller/PostgreSQL.hpp +++ b/controller/PostgreSQL.hpp @@ -23,16 +23,12 @@ #include "DB.hpp" -#include - extern "C" { typedef struct pg_conn PGconn; } namespace ZeroTier { -class _MemberNotificationReceiver; -class _NetworkNotificationReceiver; /** * A controller database driver that talks to PostgreSQL @@ -60,8 +56,8 @@ protected: }; private: - void initializeNetworks(pqxx::connection &conn); - void initializeMembers(pqxx::connection &conn); + void initializeNetworks(PGconn *conn); + void initializeMembers(PGconn *conn); void heartbeat(); void membersDbWatcher(); void networksDbWatcher(); @@ -85,9 +81,6 @@ private: mutable std::mutex _readyLock; std::atomic _ready, _connected, _run; mutable volatile bool _waitNoticePrinted; - - friend class _MemberNotificationReceiver; - friend class _NetworkNotificationReceiver; }; } -- cgit v1.2.3