Commit 13455e2c authored by jan.koester's avatar jan.koester
Browse files

use more modern c++

parent 0b58bc98
Loading
Loading
Loading
Loading
Loading
+9 −12
Changes for src/session.cpp: 9 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ bool authdb::SessionData::isMemberOf(const uuid_t& gid){
}

const authdb::SessionData * authdb::SessionData::next() const{
    return _next;
    return _next.get();
}


@@ -159,16 +159,16 @@ const authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uui
    uuid_generate(sid);

    if(!_firstData){
        _firstData=new SessionData(sid,userid,domainid,grpdat.gid,grpdat.count);
        _firstData=std::make_shared<SessionData>(sid,userid,domainid,grpdat.gid,grpdat.count);
        _lastData=_firstData;
    }else{
        _lastData->_next=new SessionData(sid,userid,domainid,grpdat.gid,grpdat.count);
        _lastData->_next=std::make_shared<SessionData>(sid,userid,domainid,grpdat.gid,grpdat.count);
        _lastData=_lastData->_next;
    }

    _lastData->_username=username;

    return _lastData;
    return _lastData.get();
}

const authdb::SessionData * authdb::Session::getSession(uuid_t sessionid) const{
@@ -180,9 +180,9 @@ const authdb::SessionData * authdb::Session::getSession(uuid_t sessionid) const{
}

void authdb::Session::remSession(uuid_t sessionid){
    SessionData *prev=nullptr;
    std::shared_ptr<SessionData> prev;

    for(SessionData *cur=_firstData; cur; cur=cur->_next){
    for(std::shared_ptr<SessionData> cur=_firstData; cur; cur=cur->_next){
        if(uuid_compare(cur->_sid,sessionid)==0){
            if(prev)
                prev->_next=cur->_next;
@@ -194,7 +194,6 @@ void authdb::Session::remSession(uuid_t sessionid){
                _lastData=prev;

            cur->_next=nullptr;
            delete cur;
            break;
        }
        prev=cur;
@@ -210,9 +209,9 @@ void authdb::Session::relSession(AuthBackend &backend,uuid_t sessionid){

    std::string username;

    SessionData *cursess=nullptr;
    std::shared_ptr<SessionData> cursess=nullptr;

    for(SessionData *cur=_firstData; cur; cur=cur->_next){
    for(std::shared_ptr<SessionData> cur=_firstData; cur; cur=cur->_next){
        if(uuid_compare(cur->_sid,sessionid)==0){
            cursess=cur;
            break;
@@ -252,8 +251,6 @@ void authdb::Session::relSession(AuthBackend &backend,uuid_t sessionid){
        }
    }

    delete[] grpdat.gid;

    grpdat.gid = new uuid_t[grpdat.count];

    size_t count=0;
@@ -288,5 +285,5 @@ void authdb::Session::relSession(AuthBackend &backend,uuid_t sessionid){


const authdb::SessionData * authdb::Session::firstData() const{
    return _firstData;
    return _firstData.get();
}
+7 −6
Changes for src/session.h: 7 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@

#include <vector>
#include <string>
#include <memory>

#include <uuid/uuid.h>

@@ -48,23 +49,23 @@ namespace authdb {

        const SessionData *next() const;

    private:
        SessionData(uuid_t sessionid,uuid_t userid,uuid_t domainid,
                    uuid_t *group,size_t groupsize);
        ~SessionData();

    private:
        uuid_t                _uid;
        uuid_t                _sid;
        uuid_t                _did;

        struct Groups{
            size_t  count;
            uuid_t *gid;
            size_t  count = 0;
            uuid_t *gid = nullptr;
        } _member;

        std::string                  _username;

        SessionData          *_next;
        std::shared_ptr<SessionData> _next;
        friend class Session;
    };

@@ -81,7 +82,7 @@ namespace authdb {
        const SessionData *firstData() const;

    private:
        SessionData           *_firstData;
        SessionData           *_lastData;
        std::shared_ptr<SessionData>  _firstData;
        std::shared_ptr<SessionData>  _lastData;
    };
};