Loading src/admin.cpp +5 −13 Changes for src/admin.cpp: 5 added lines, 13 removed lines. Original line number Diff line number Diff line Loading @@ -1175,6 +1175,7 @@ namespace authdb { } } if(members.count>0) members.uid = new uuid_t[members.count]; for (libhttppp::HttpForm::MultipartForm::Data* curformdat = curform.MultipartFormData.getFormData(); Loading Loading @@ -1261,10 +1262,7 @@ namespace authdb { } if(data){ if(members.count>0){ editrec.addMember(members); delete[] members.uid; } editRecord(*backend,editrec,GroupData); libhttppp::HttpResponse rep; rep.setState(HTTP307); Loading Loading @@ -1313,11 +1311,9 @@ namespace authdb { cur.data = new char[cur.datasize]; backend->read((unsigned char*)cur.data,cur.datasize); GroupData::MemberUids *mrec; mrec = (GroupData::MemberUids *)cur.data; GroupData::MemberUids mrec(cur.data,cur.datasize); char *start=cur.data+(sizeof(GroupData::MemberUids)-sizeof(uuid_t)); delete[] cur.data; size_t urd=sizeof(AuthHeader),uend=backend->end(); while(urd<uend){ Loading @@ -1335,10 +1331,8 @@ namespace authdb { uuid_unparse(curu.uuid,cuuid); form << "<option value=\"" << cuuid << "\" "; for(size_t i=0; i<mrec->count; ++i ){ uuid_t *ucmp =(uuid_t*)start+(i*sizeof(uuid_t)); if(uuid_compare(*ucmp,curu.uuid) == 0){ for(size_t i=0; i<mrec.count; ++i ){ if(mrec.uid && uuid_compare(mrec.uid[i],curu.uuid) == 0){ form << "selected"; break; } Loading @@ -1350,8 +1344,6 @@ namespace authdb { } } delete[] cur.data; form << "</select>"; } form << "</td>"; Loading src/authdb.cpp +1 −1 Changes for src/authdb.cpp: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -338,7 +338,7 @@ namespace authdb { int searchValue(authdb::AuthBackend &backend,const char*fieldname,const char *value){ authdb::AuthData::Record *user=new AuthData::Record; int rd=sizeof(authdb::AuthHeader),brd=rd; size_t rd=sizeof(authdb::AuthHeader),brd=rd; while(rd>backend.end()){ backend.setPos(rd); backend.read((unsigned char*)user,sizeof(AuthData::Record)); Loading src/authdb.h +8 −26 Changes for src/authdb.h: 8 added lines, 26 removed lines. Original line number Diff line number Diff line Loading @@ -40,6 +40,8 @@ #define VERSION 1 #include <iostream> namespace authdb { class Client; class Session; Loading @@ -50,7 +52,7 @@ namespace authdb { extern std::mutex AuthSessionLock; struct AuthHeader{ char start = 0xFE; int start = 0xFE; char domain[255]; size_t Version; size_t Revesion; Loading @@ -67,7 +69,7 @@ namespace authdb { AuthData *next() const; struct Record { char start = 0xFE; int start = 0xFE; uuid_t uuid; int type = EmptyData; int storage = EmptyStorage; Loading @@ -91,9 +93,8 @@ namespace authdb { friend void delRecord(authdb::AuthBackend &backend,const uuid_t uid,int type); }; template<class T,class Y> void setAuthData(int type,int storage,const T *src,AuthData *dat,AuthData::Record **varclass, const char *varname,const Y *value,size_t count){ template<class T> void setAuthData(int type,int storage,AuthData *dat,AuthData::Record **varclass, const char *varname,T *source,size_t sourcelen){ AuthData::Record *target=*varclass; AuthData *curec=dat; Loading Loading @@ -131,28 +132,9 @@ namespace authdb { target->storage=storage; snprintf(target->fieldname,255,"%s",varname); if(src) target->datasize = sizeof(*src)+(sizeof(Y)*count); else target->datasize = (sizeof(Y)*count); target->datasize=sourcelen; target->data=new char[target->datasize]; memset(target->data,0,target->datasize); if(src) memcpy(target->data,src,sizeof(*src)); char *start; if(src) start= (char*) target->data+sizeof(*src); else start= (char*) target->data; for(int i=0; i< count; ++i){ memcpy(start+(sizeof(Y)*i),&value[i],sizeof(Y)); } std::copy(reinterpret_cast<const char*>(source),reinterpret_cast<const char*>(source)+target->datasize,target->data); *varclass=target; } Loading src/backends/file.cpp +0 −1 Changes for src/backends/file.cpp: 0 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -51,7 +51,6 @@ authdb::File::File(const char* path,size_t version,const char *domain){ AuthHeader head; memset(&head,0,sizeof(AuthHeader)); head.Version=version; head.Revesion=0; head.start=0xFE; Loading src/client.cpp +2 −4 Changes for src/client.cpp: 2 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -56,8 +56,7 @@ authdb::ClientData::~ClientData(){ } void authdb::ClientData::setKey(const char *key){ setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage,nullptr, this,&ClientKey,"clientkey",key,strlen(key)+1); setAuthData<const char>(DataType::ClientData,StorageType::TextStorage,this,&ClientKey,"clientkey",key,strlen(key)+1); } const char *authdb::ClientData::getKey(){ Loading @@ -66,8 +65,7 @@ const char *authdb::ClientData::getKey(){ } void authdb::ClientData::setName(const char* name){ setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage,nullptr, this,&ClientName,"clientname",name,strlen(name)+1); setAuthData<const char>(DataType::ClientData,StorageType::TextStorage, this,&ClientName,"clientname",name,strlen(name)+1); } Loading Loading
src/admin.cpp +5 −13 Changes for src/admin.cpp: 5 added lines, 13 removed lines. Original line number Diff line number Diff line Loading @@ -1175,6 +1175,7 @@ namespace authdb { } } if(members.count>0) members.uid = new uuid_t[members.count]; for (libhttppp::HttpForm::MultipartForm::Data* curformdat = curform.MultipartFormData.getFormData(); Loading Loading @@ -1261,10 +1262,7 @@ namespace authdb { } if(data){ if(members.count>0){ editrec.addMember(members); delete[] members.uid; } editRecord(*backend,editrec,GroupData); libhttppp::HttpResponse rep; rep.setState(HTTP307); Loading Loading @@ -1313,11 +1311,9 @@ namespace authdb { cur.data = new char[cur.datasize]; backend->read((unsigned char*)cur.data,cur.datasize); GroupData::MemberUids *mrec; mrec = (GroupData::MemberUids *)cur.data; GroupData::MemberUids mrec(cur.data,cur.datasize); char *start=cur.data+(sizeof(GroupData::MemberUids)-sizeof(uuid_t)); delete[] cur.data; size_t urd=sizeof(AuthHeader),uend=backend->end(); while(urd<uend){ Loading @@ -1335,10 +1331,8 @@ namespace authdb { uuid_unparse(curu.uuid,cuuid); form << "<option value=\"" << cuuid << "\" "; for(size_t i=0; i<mrec->count; ++i ){ uuid_t *ucmp =(uuid_t*)start+(i*sizeof(uuid_t)); if(uuid_compare(*ucmp,curu.uuid) == 0){ for(size_t i=0; i<mrec.count; ++i ){ if(mrec.uid && uuid_compare(mrec.uid[i],curu.uuid) == 0){ form << "selected"; break; } Loading @@ -1350,8 +1344,6 @@ namespace authdb { } } delete[] cur.data; form << "</select>"; } form << "</td>"; Loading
src/authdb.cpp +1 −1 Changes for src/authdb.cpp: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -338,7 +338,7 @@ namespace authdb { int searchValue(authdb::AuthBackend &backend,const char*fieldname,const char *value){ authdb::AuthData::Record *user=new AuthData::Record; int rd=sizeof(authdb::AuthHeader),brd=rd; size_t rd=sizeof(authdb::AuthHeader),brd=rd; while(rd>backend.end()){ backend.setPos(rd); backend.read((unsigned char*)user,sizeof(AuthData::Record)); Loading
src/authdb.h +8 −26 Changes for src/authdb.h: 8 added lines, 26 removed lines. Original line number Diff line number Diff line Loading @@ -40,6 +40,8 @@ #define VERSION 1 #include <iostream> namespace authdb { class Client; class Session; Loading @@ -50,7 +52,7 @@ namespace authdb { extern std::mutex AuthSessionLock; struct AuthHeader{ char start = 0xFE; int start = 0xFE; char domain[255]; size_t Version; size_t Revesion; Loading @@ -67,7 +69,7 @@ namespace authdb { AuthData *next() const; struct Record { char start = 0xFE; int start = 0xFE; uuid_t uuid; int type = EmptyData; int storage = EmptyStorage; Loading @@ -91,9 +93,8 @@ namespace authdb { friend void delRecord(authdb::AuthBackend &backend,const uuid_t uid,int type); }; template<class T,class Y> void setAuthData(int type,int storage,const T *src,AuthData *dat,AuthData::Record **varclass, const char *varname,const Y *value,size_t count){ template<class T> void setAuthData(int type,int storage,AuthData *dat,AuthData::Record **varclass, const char *varname,T *source,size_t sourcelen){ AuthData::Record *target=*varclass; AuthData *curec=dat; Loading Loading @@ -131,28 +132,9 @@ namespace authdb { target->storage=storage; snprintf(target->fieldname,255,"%s",varname); if(src) target->datasize = sizeof(*src)+(sizeof(Y)*count); else target->datasize = (sizeof(Y)*count); target->datasize=sourcelen; target->data=new char[target->datasize]; memset(target->data,0,target->datasize); if(src) memcpy(target->data,src,sizeof(*src)); char *start; if(src) start= (char*) target->data+sizeof(*src); else start= (char*) target->data; for(int i=0; i< count; ++i){ memcpy(start+(sizeof(Y)*i),&value[i],sizeof(Y)); } std::copy(reinterpret_cast<const char*>(source),reinterpret_cast<const char*>(source)+target->datasize,target->data); *varclass=target; } Loading
src/backends/file.cpp +0 −1 Changes for src/backends/file.cpp: 0 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -51,7 +51,6 @@ authdb::File::File(const char* path,size_t version,const char *domain){ AuthHeader head; memset(&head,0,sizeof(AuthHeader)); head.Version=version; head.Revesion=0; head.start=0xFE; Loading
src/client.cpp +2 −4 Changes for src/client.cpp: 2 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -56,8 +56,7 @@ authdb::ClientData::~ClientData(){ } void authdb::ClientData::setKey(const char *key){ setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage,nullptr, this,&ClientKey,"clientkey",key,strlen(key)+1); setAuthData<const char>(DataType::ClientData,StorageType::TextStorage,this,&ClientKey,"clientkey",key,strlen(key)+1); } const char *authdb::ClientData::getKey(){ Loading @@ -66,8 +65,7 @@ const char *authdb::ClientData::getKey(){ } void authdb::ClientData::setName(const char* name){ setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage,nullptr, this,&ClientName,"clientname",name,strlen(name)+1); setAuthData<const char>(DataType::ClientData,StorageType::TextStorage, this,&ClientName,"clientname",name,strlen(name)+1); } Loading