Commit aa0d4130 authored by jan.koester's avatar jan.koester
Browse files

sesioon lock now global

parent 7d65c5c0
Loading
Loading
Loading
Loading
Loading
+17 −15
Changes for src/session.cpp: 17 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@
#include "uuid.h"

namespace authdb {
        SessionData _empty;
        SessionData _Sessionempty;
        std::mutex   _SessionLock;
}

authdb::SessionData::SessionData(){
@@ -129,13 +130,22 @@ authdb::SessionData::GPOResult::~GPOResult(){
    delete next;
}

bool authdb::SessionData::checkGPO(uuid gpoid) const{
    for(const GPOResult *cures=&_GPOResult; cures; cures=cures->next){
        if(cures->GPOId==gpoid){
            return cures->GPORes;
        }
    }
    return false;
}

authdb::Session::Session() {
    _firstData=nullptr;
    _lastData=nullptr;
}

authdb::Session::Session(const Session& src) : Session(){
    std::lock_guard<std::mutex> guard(_lockData);
    std::lock_guard<std::mutex> guard(_SessionLock);

    for(SessionData *cur=src._firstData; cur; cur=cur->_next){
        if(!_firstData){
@@ -168,7 +178,7 @@ authdb::Session::~Session(){
};

const authdb::SessionData *authdb::Session::addSession(AuthBackend &backend,uuid domainid,uuid userid){
    std::lock_guard<std::mutex> guard(_lockData);
    std::lock_guard<std::mutex> guard(_SessionLock);
    std::string username;
    std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

@@ -264,7 +274,7 @@ const authdb::SessionData *authdb::Session::addSession(AuthBackend &backend,uuid
}

const authdb::SessionData *authdb::Session::getSession(uuid sessionid){
    std::lock_guard<std::mutex> guard(_lockData);
    std::lock_guard<std::mutex> guard(_SessionLock);
    for(SessionData *cur=_firstData; cur; cur=cur->_next){
        if(cur->_sid==sessionid)
            return cur;
@@ -273,7 +283,7 @@ const authdb::SessionData *authdb::Session::getSession(uuid sessionid){
}

void authdb::Session::remSession(uuid sessionid){
    std::lock_guard<std::mutex> guard(_lockData);
    std::lock_guard<std::mutex> guard(_SessionLock);
    SessionData *prev=nullptr;

    for(SessionData *cur=_firstData; cur; cur=cur->_next){
@@ -298,7 +308,7 @@ void authdb::Session::remSession(uuid sessionid){
}

void authdb::Session::relSession(AuthBackend &backend,uuid sessionid){
    std::lock_guard<std::mutex> guard(_lockData);
    std::lock_guard<std::mutex> guard(_SessionLock);
    Group group;

    std::string username;
@@ -348,14 +358,6 @@ void authdb::Session::relSession(AuthBackend &backend,uuid sessionid){
}

const authdb::SessionData *authdb::Session::firstData() const{
    std::lock_guard<std::mutex> guard(_SessionLock);
    return _firstData;
}

bool authdb::SessionData::checkGPO(uuid gpoid) const{
    for(const GPOResult *cures=&_GPOResult; cures; cures=cures->next){
        if(cures->GPOId==gpoid){
            return cures->GPORes;
        }
    }
    return false;
}
+0 −1
Changes for src/session.h: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -108,6 +108,5 @@ namespace authdb {
    private:
        SessionData   *_firstData;
        SessionData   *_lastData;
        std::mutex       _lockData;
    };
};