Loading src/api.cpp +10 −4 Changes for src/api.cpp: 10 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -122,8 +122,13 @@ namespace authdb { clt.info(*_Backend,cdat,upos); if(name==cdat.getName() ){ if(pwsalt==cdat.getKey() ) if(pwsalt==cdat.getKey() ){ uuid cid=clt.addConnection(); json_object *respid=json_object_new_object(); json_object_object_add(respid,"sessionid",json_object_new_string(cid.c_str())); json_object_array_add(response,respid); return true; } return false; } } Loading Loading @@ -165,11 +170,12 @@ namespace authdb { return; } std::string loginmsg="{\"error: {\"msg\":\"no client key!\"}}"; size_t outsize=0; const char *out=json_object_to_json_string_length(jresponse,0,&outsize); rep.setState(HTTP500); rep.setState(HTTP200); rep.setContentType("text/json"); rep.send(curreq,loginmsg.c_str(),loginmsg.length()); rep.send(curreq,out,outsize); } ~Api(){ Loading src/client.cpp +33 −29 Changes for src/client.cpp: 33 added lines, 29 removed lines. Original line number Diff line number Diff line Loading @@ -25,8 +25,28 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ #include <mutex> #include "client.h" namespace authdb{ class ConnectionData { private: ConnectionData(uuid &id){ _next=nullptr; _Id=id; }; uuid _Id; ConnectionData *_next; friend class Client; }; ConnectionData *_firstConnection=nullptr; ConnectionData *_lastConnection=nullptr; std::mutex _lockConnection; }; authdb::ClientData::ClientData(uuid_t clid) : AuthData(clid){ ClientKey=nullptr; ClientName=nullptr; Loading Loading @@ -141,30 +161,15 @@ void authdb::Client::remove(AuthBackend& backend, const uuid_t clid){ } authdb::Client::Client(){ _firstConnection=nullptr; _lastConnection=nullptr; } authdb::Client::~Client(){ ConnectionData *curdat=_firstConnection,*next=_firstConnection; while(next){ next=curdat->_next; curdat->_next=nullptr; delete curdat; curdat=next; } } const authdb::ConnectionData * authdb::Client::getFirstConnection() const{ return _firstConnection; } const authdb::ConnectionData * authdb::Client::getLastConnection() const{ return _lastConnection; authdb::Client::~Client(){ } authdb::ConnectionData * authdb::Client::addConnection(){ authdb::uuid &authdb::Client::addConnection(){ std::lock_guard<std::mutex> guard(_lockConnection); uuid ncid; if(_firstConnection){ _lastConnection->_next=new ConnectionData(ncid); Loading @@ -173,15 +178,17 @@ authdb::ConnectionData * authdb::Client::addConnection(){ _firstConnection=new ConnectionData(ncid); _lastConnection=_firstConnection; } return _lastConnection; return _lastConnection->_Id; } void authdb::Client::delConnection(const uuid conid){ std::lock_guard<std::mutex> guard(_lockConnection); ConnectionData *prev=nullptr; for(ConnectionData *curdat=_firstConnection; curdat; curdat=curdat->_next){ if(curdat->_Id==conid){ if(prev) if(prev){ prev->_next=curdat->_next; } curdat->_next=nullptr; delete curdat; } Loading @@ -189,15 +196,12 @@ void authdb::Client::delConnection(const uuid conid){ } } authdb::ConnectionData::ConnectionData(uuid &id){ _next=nullptr; _Id=id; bool authdb::Client::checkConnection(const uuid conid) const{ std::lock_guard<std::mutex> guard(_lockConnection); for(ConnectionData *curdat=_firstConnection; curdat; curdat=curdat->_next){ if(curdat->_Id==conid){ return true; } const authdb::uuid & authdb::ConnectionData::getId() const{ return _Id; } const authdb::ConnectionData * authdb::ConnectionData::next() const{ return _next; return false; } src/client.h +2 −17 Changes for src/client.h: 2 added lines, 17 removed lines. Original line number Diff line number Diff line Loading @@ -48,17 +48,6 @@ namespace authdb { friend class Client; }; class ConnectionData { public: const uuid &getId() const; const ConnectionData *next() const; private: ConnectionData(uuid &id); uuid _Id; ConnectionData *_next; friend class Client; }; class Client { public: Client(); Loading @@ -68,14 +57,10 @@ namespace authdb { bool exits(AuthBackend& backend, uuid_t* clid, const char* name,int &ret); void info(AuthBackend &backend,class ClientData &dat,size_t &pos); ConnectionData *addConnection(); uuid &addConnection(); void delConnection(const uuid conid); const ConnectionData *getFirstConnection() const; const ConnectionData *getLastConnection() const; bool checkConnection(const uuid conid) const; private: ConnectionData *_firstConnection; ConnectionData *_lastConnection; }; }; src/uuid.cpp +12 −0 Changes for src/uuid.cpp: 12 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -51,3 +51,15 @@ bool authdb::uuid::operator==(const uuid src) const{ return uuid_compare(value,src.value); } void authdb::uuid::operator=(const uuid& src){ uuid_copy(value,src.value); } void authdb::uuid::operator=(const uuid_t& src){ uuid_copy(value,src); } const char *authdb::uuid::c_str(){ uuid_unparse(value,nvalue); return nvalue; } src/uuid.h +5 −0 Changes for src/uuid.h: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -40,10 +40,15 @@ namespace authdb{ uuid(const uuid_t &src); ~uuid(); const char *c_str(); void operator=(const uuid_t &src); void operator=(const uuid &src); bool operator==(const uuid_t src) const; bool operator==(const uuid src) const; private: uuid_t value; char nvalue[sizeof(uuid_t)+1]; }; }; Loading
src/api.cpp +10 −4 Changes for src/api.cpp: 10 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -122,8 +122,13 @@ namespace authdb { clt.info(*_Backend,cdat,upos); if(name==cdat.getName() ){ if(pwsalt==cdat.getKey() ) if(pwsalt==cdat.getKey() ){ uuid cid=clt.addConnection(); json_object *respid=json_object_new_object(); json_object_object_add(respid,"sessionid",json_object_new_string(cid.c_str())); json_object_array_add(response,respid); return true; } return false; } } Loading Loading @@ -165,11 +170,12 @@ namespace authdb { return; } std::string loginmsg="{\"error: {\"msg\":\"no client key!\"}}"; size_t outsize=0; const char *out=json_object_to_json_string_length(jresponse,0,&outsize); rep.setState(HTTP500); rep.setState(HTTP200); rep.setContentType("text/json"); rep.send(curreq,loginmsg.c_str(),loginmsg.length()); rep.send(curreq,out,outsize); } ~Api(){ Loading
src/client.cpp +33 −29 Changes for src/client.cpp: 33 added lines, 29 removed lines. Original line number Diff line number Diff line Loading @@ -25,8 +25,28 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ #include <mutex> #include "client.h" namespace authdb{ class ConnectionData { private: ConnectionData(uuid &id){ _next=nullptr; _Id=id; }; uuid _Id; ConnectionData *_next; friend class Client; }; ConnectionData *_firstConnection=nullptr; ConnectionData *_lastConnection=nullptr; std::mutex _lockConnection; }; authdb::ClientData::ClientData(uuid_t clid) : AuthData(clid){ ClientKey=nullptr; ClientName=nullptr; Loading Loading @@ -141,30 +161,15 @@ void authdb::Client::remove(AuthBackend& backend, const uuid_t clid){ } authdb::Client::Client(){ _firstConnection=nullptr; _lastConnection=nullptr; } authdb::Client::~Client(){ ConnectionData *curdat=_firstConnection,*next=_firstConnection; while(next){ next=curdat->_next; curdat->_next=nullptr; delete curdat; curdat=next; } } const authdb::ConnectionData * authdb::Client::getFirstConnection() const{ return _firstConnection; } const authdb::ConnectionData * authdb::Client::getLastConnection() const{ return _lastConnection; authdb::Client::~Client(){ } authdb::ConnectionData * authdb::Client::addConnection(){ authdb::uuid &authdb::Client::addConnection(){ std::lock_guard<std::mutex> guard(_lockConnection); uuid ncid; if(_firstConnection){ _lastConnection->_next=new ConnectionData(ncid); Loading @@ -173,15 +178,17 @@ authdb::ConnectionData * authdb::Client::addConnection(){ _firstConnection=new ConnectionData(ncid); _lastConnection=_firstConnection; } return _lastConnection; return _lastConnection->_Id; } void authdb::Client::delConnection(const uuid conid){ std::lock_guard<std::mutex> guard(_lockConnection); ConnectionData *prev=nullptr; for(ConnectionData *curdat=_firstConnection; curdat; curdat=curdat->_next){ if(curdat->_Id==conid){ if(prev) if(prev){ prev->_next=curdat->_next; } curdat->_next=nullptr; delete curdat; } Loading @@ -189,15 +196,12 @@ void authdb::Client::delConnection(const uuid conid){ } } authdb::ConnectionData::ConnectionData(uuid &id){ _next=nullptr; _Id=id; bool authdb::Client::checkConnection(const uuid conid) const{ std::lock_guard<std::mutex> guard(_lockConnection); for(ConnectionData *curdat=_firstConnection; curdat; curdat=curdat->_next){ if(curdat->_Id==conid){ return true; } const authdb::uuid & authdb::ConnectionData::getId() const{ return _Id; } const authdb::ConnectionData * authdb::ConnectionData::next() const{ return _next; return false; }
src/client.h +2 −17 Changes for src/client.h: 2 added lines, 17 removed lines. Original line number Diff line number Diff line Loading @@ -48,17 +48,6 @@ namespace authdb { friend class Client; }; class ConnectionData { public: const uuid &getId() const; const ConnectionData *next() const; private: ConnectionData(uuid &id); uuid _Id; ConnectionData *_next; friend class Client; }; class Client { public: Client(); Loading @@ -68,14 +57,10 @@ namespace authdb { bool exits(AuthBackend& backend, uuid_t* clid, const char* name,int &ret); void info(AuthBackend &backend,class ClientData &dat,size_t &pos); ConnectionData *addConnection(); uuid &addConnection(); void delConnection(const uuid conid); const ConnectionData *getFirstConnection() const; const ConnectionData *getLastConnection() const; bool checkConnection(const uuid conid) const; private: ConnectionData *_firstConnection; ConnectionData *_lastConnection; }; };
src/uuid.cpp +12 −0 Changes for src/uuid.cpp: 12 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -51,3 +51,15 @@ bool authdb::uuid::operator==(const uuid src) const{ return uuid_compare(value,src.value); } void authdb::uuid::operator=(const uuid& src){ uuid_copy(value,src.value); } void authdb::uuid::operator=(const uuid_t& src){ uuid_copy(value,src); } const char *authdb::uuid::c_str(){ uuid_unparse(value,nvalue); return nvalue; }
src/uuid.h +5 −0 Changes for src/uuid.h: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -40,10 +40,15 @@ namespace authdb{ uuid(const uuid_t &src); ~uuid(); const char *c_str(); void operator=(const uuid_t &src); void operator=(const uuid &src); bool operator==(const uuid_t src) const; bool operator==(const uuid src) const; private: uuid_t value; char nvalue[sizeof(uuid_t)+1]; }; };