Commit 743178aa authored by jan.koester's avatar jan.koester
Browse files

test

parent ce4f9835

CMakeLists.txt

+1 −5
Changes for CMakeLists.txt: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -32,11 +32,7 @@ find_package(libhttppp REQUIRED) 
find_package(libhtmlpp REQUIRED)

find_package(json-c REQUIRED)

find_package(libuuidp REQUIRED)



# libparitypp for cluster support

set(PARITYPP_ROOT "/home/intranet.tuxist.de/jan.koester/Projects/libparitypp")

set(PARITYPP_INCLUDE_DIR "${PARITYPP_ROOT}/src")

set(PARITYPP_LIBRARIES "${PARITYPP_ROOT}/build/libparitypp.a")

find_package(libparitypp REQUIRED)



include_directories(

    ${LIBUUIDP_INCLUDE_DIR}

src/CMakeLists.txt

+1 −2
Changes for src/CMakeLists.txt: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ target_include_directories( 
    authobj

    PUBLIC

    ${JSONC_INCLUDE_DIR}

    ${PARITYPP_INCLUDE_DIR}

    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

    $<INSTALL_INTERFACE:include>

)
@@ -37,7 +36,7 @@ target_link_libraries( 
    netplus::netplus

    httppp::httppp

    htmlpp::htmlpp

    ${PARITYPP_LIBRARIES}

    paritypp::paritypp

)



add_executable(authdb

src/cluster.cpp

+5 −14
Changes for src/cluster.cpp: 5 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -25,17 +25,11 @@ 
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *******************************************************************************/



#include <parity.h>

#include <protocol.h>

#include <auth.h>

#include <server.h>

#include <client.h>



// Define PClient wrapper outside authdb namespace to avoid

// authdb::client namespace clashing with paritypp::client class

struct ClusterPClient {

    std::unique_ptr<paritypp::client> impl;

};

#include <paritypp/parity.h>

#include <paritypp/protocol.h>

#include <paritypp/auth.h>

#include <paritypp/server.h>

#include <paritypp/client.h>



#include "cluster.h"

#include "exception.h"
@@ -50,9 +44,6 @@ namespace authdb { 


    Cluster *g_Cluster = nullptr;



    // Map PClient to ClusterPClient

    struct Cluster::PClient : ClusterPClient {};



    // --- SessionBlock serialization ---



    // Wire format:

src/cluster.h

+3 −7
Changes for src/cluster.h: 3 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -35,13 +35,9 @@ 
#include <atomic>

#include <uuidp.h>



// Include paritypp headers first to avoid name clashes with authdb::client

namespace paritypp {

    class memory_block_store;

    class auth_store;

    class server;

    class parity;

}

#include <paritypp/server.h>

#include <paritypp/client.h>

#include <paritypp/auth.h>



#include "session.h"