Commit 33d319d4 authored by jan.koester's avatar jan.koester
Browse files

it works

parent 660c971b
Loading
Loading
Loading
Loading
Loading
+6 −4
Changes for src/authdb.cpp: 6 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ namespace authdb {
                            gpo.create(_AdminBackend,&gpodat);
                            ++i;
                        }

                    }catch(std::exception &e){
                        std::cerr << e.what() << std::endl;
                    }
@@ -184,7 +185,6 @@ namespace authdb {
        }

        void RequestEvent(libhttppp::HttpRequest * curreq, const int tid, ULONG_PTR args){
            AuthBackendLock admlock(_AdminBackend);
            if(curreq->getRequestURL().compare(0,10,"/authdb.js",10)==0){
                libhttppp::HttpResponse rep;
                rep.setState(HTTP200);
@@ -212,6 +212,8 @@ namespace authdb {
                }
            }

            AuthBackendLock admlock(_AdminBackend);

            if(curreq->getRequestURL().compare(0,9,"/settings",9)==0){
                try{
                    _AdminInterface.Request(curreq,tid,args);
@@ -259,7 +261,7 @@ namespace authdb {
                }

                if(apidb){
                    // apidb->lock();
                    apidb->lock();
                    try{
                        ApiController(*apidb,did,curreq,tid,args);
                    }catch(AuthBackendError &e){
@@ -268,7 +270,7 @@ namespace authdb {
                        rep.setContentType("text/html");
                        rep.send(curreq,e.what(),strlen(e.what()));
                    }
                    // apidb->unlock();
                    apidb->unlock();
                }else{
                    libhttppp::HttpResponse rep;
                    rep.setState(HTTP404);
@@ -438,7 +440,7 @@ int main(int argc, char *argv[]){

        authdb::AuthDB authdb(backend,httpd.getServerSocket());

        // authdb.threads=2;
        authdb.threads=1;
        authdb.runEventloop();
    }catch(authdb::AuthBackendError &e){
        std::cerr << e.what() << std::endl;
+2 −2
Changes for src/authdb.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ namespace authdb {

    struct AuthHeader{
        int      start = 0xFE;
        char   domain[255];
        char   domain[255]={0};
        size_t Version=0;
        size_t Revesion=0;
    };

    class AuthData {
    public:
        AuthData(const uuid_t id);
        AuthData(const uuid id);

        AuthData(const AuthData &src);

+3 −3
Changes for src/data.cpp: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@
#include "authdb.h"

namespace authdb {
    AuthData::AuthData(const uuid_t id){
         uuid_copy(Data.uuid,id);
    AuthData::AuthData(const uuid id){
         uuid_copy(Data.uuid,id.value);
         Data.start=0xFE;
         Data.storage=EmptyStorage;
         Data.type=DataType::EmptyData;
         Data.fieldname[0]='\0';
         memset(Data.fieldname,0,sizeof(Data.fieldname));
         Data.data=nullptr;
         Data.datasize=0;
        _next=nullptr;
+4 −6
Changes for src/domain.cpp: 4 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -31,15 +31,13 @@
#include "domain.h"
#include "types.h"

authdb::DomainData::DomainData(uuid_t uuid) :AuthData(uuid){
    uuid_copy(did,uuid);
authdb::DomainData::DomainData(uuid uuid) :AuthData(uuid){
    _name=nullptr;
    _storageType=nullptr;
    _storageOptions=nullptr;
}

authdb::DomainData::~DomainData(){
    uuid_clear(did);
}

void authdb::DomainData::setDomainName(const char* name){
@@ -72,7 +70,7 @@ void authdb::Domain::create(authdb::AuthBackend& backend,class DomainData *data)
    int exi=0;


    if(exits(backend,&data->did,data->getDomainName(),exi)){
    if(exits(backend,&data->Data.uuid,data->getDomainName(),exi)){
        switch(exi){
            case 1:
                throw authdb::AuthBackendError("Create Domain: Domainname already Exists aborting!");
@@ -150,7 +148,7 @@ bool authdb::Domain::exits(AuthBackend& backend, uuid_t* did, const char* name,i
void authdb::Domain::info(AuthBackend& backend, class DomainData& dat, size_t& pos){
  size_t end=backend.end();

    if(uuid_is_null(dat.did))
    if(uuid_is_null(dat.Data.uuid))
        throw AuthBackendError("Domain info domainid required!");

    while(pos<end){
@@ -158,7 +156,7 @@ void authdb::Domain::info(AuthBackend& backend, class DomainData& dat, size_t& p
        backend.setPos(pos);
        backend.read((unsigned char*)cur,sizeof(AuthData::Record));
        pos=backend.getPos()+cur->datasize;
        if(cur->type == DataType::DomainData && uuid_compare(dat.did,cur->uuid) == 0 &&
        if(cur->type == DataType::DomainData && uuid_compare(dat.Data.uuid,cur->uuid) == 0 &&
            strcmp(cur->fieldname,"domainname")==0
        ){

+1 −2
Changes for src/domain.h: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -35,10 +35,9 @@
namespace authdb {
    class DomainData : public AuthData{
    public:
        DomainData(uuid_t uuid);
        DomainData(uuid uuid);
        ~DomainData();

        uuid_t      did;
        DomainData *next();

        void setDomainName(const char *name);
Loading