martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome: more work on http service.

Browse Source
This commit is contained in:
Martin Preuss
2023-08-07 14:08:52 +02:00
parent 6269431467
commit 1efcd09f0c
20 changed files with 2375 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aqhome/service/module.t2d
View File

@@ -64,6 +64,8 @@
<preset>NULL</preset>
<access>public</access>
<flags>own</flags>
<getflags>none</getflags>
<setflags>none</setflags>
</member>
</members>

17
aqhome/service/moduleperms.t2d
View File

@@ -38,13 +38,6 @@
<flags>with_getbymember</flags>
</member>
<member name="perms" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="exclAddPerms" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
@@ -59,13 +52,21 @@
<flags></flags>
</member>
<member name="roleArray" type="uint32_t_array" maxlen="16">
<member name="roleArray" type="uint8_t_array" maxlen="16">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="perms" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags>volatile</flags>
</member>
</members>
</type>

6
aqhome/service/role.t2d
View File

@@ -29,7 +29,7 @@
<members>
<member name="id" type="uint32_t" maxlen="4">
<member name="id" type="uint8_t" maxlen="1">
<default>0</default>
<preset>0</preset>
<access>public</access>
@@ -50,14 +50,14 @@
<flags></flags>
</member>
<member name="exclAddPerms" type="uint32_t" maxlen="4">
<member name="explAddPerms" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="exclDelPerms" type="uint32_t" maxlen="4">
<member name="explDelPerms" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>

10
aqhome/service/service.c
View File

@@ -149,9 +149,9 @@ AQH_SESSION_LIST *AQH_Service_GetSessionList(const AQH_SERVICE *sv)
AQH_SESSION *AQH_Service_GetSessionById(const AQH_SERVICE *sv, uint32_t sessionId)
AQH_SESSION *AQH_Service_GetSessionByUid(const AQH_SERVICE *sv, const char *sessionUid)
{
return sv?AQH_Session_List_GetById(sv->sessionList, sessionId):NULL;
return sv?AQH_Session_List_GetByUid(sv->sessionList, sessionUid):NULL;
}
@@ -164,12 +164,12 @@ void AQH_Service_AddSession(AQH_SERVICE *sv, AQH_SESSION *session)
void AQH_Service_DelSession(AQH_SERVICE *sv, uint32_t id)
void AQH_Service_DelSession(AQH_SERVICE *sv, const char *sid)
{
if (sv && id) {
if (sv && sid && *sid) {
AQH_SESSION *session;
session=AQH_Session_List_GetById(sv->sessionList, id);
session=AQH_Session_List_GetByUid(sv->sessionList, sid);
if (session) {
AQH_Session_List_Del(session);
AQH_Session_free(session);

4
aqhome/service/service.h
View File

@@ -44,9 +44,9 @@ AQHOME_API void AQH_Service_AddModule(AQH_SERVICE *sv, AQH_MODULE *m);
AQHOME_API void AQH_Service_DelModule(AQH_SERVICE *sv, uint32_t moduleId);
AQHOME_API AQH_SESSION_LIST *AQH_Service_GetSessionList(const AQH_SERVICE *sv);
AQHOME_API AQH_SESSION *AQH_Service_GetSessionById(const AQH_SERVICE *sv, uint32_t sessionId);
AQHOME_API AQH_SESSION *AQH_Service_GetSessionByUid(const AQH_SERVICE *sv, const char *sessionUid);
AQHOME_API void AQH_Service_AddSession(AQH_SERVICE *sv, AQH_SESSION *session);
AQHOME_API void AQH_Service_DelSession(AQH_SERVICE *sv, uint32_t id);
AQHOME_API void AQH_Service_DelSession(AQH_SERVICE *sv, const char *sid);

21
aqhome/service/session.t2d
View File

@@ -14,6 +14,8 @@
with_db
with_list1
with_list2
nodup
nocopy
</flags>
<headers>
@@ -31,18 +33,11 @@
<members>
<member name="id" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags>with_getbymember</flags>
</member>
<member name="uid" type="char_ptr" maxlen="64">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
<flags>with_getbymember</flags>
</member>
<member name="flags" type="uint32_t" maxlen="4">
@@ -52,9 +47,9 @@
<flags>with_flags</flags>
</member>
<member name="userId" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<member name="userAlias" type="char_ptr" maxlen="64">
<default>NULL</default>
<preset>NULL</preset>
<access>public</access>
<flags></flags>
</member>
@@ -87,8 +82,8 @@
<preset>NULL</preset>
<access>public</access>
<setflags>assign</setflags>
<dupflags>assign</dupflags>
<flags>volatile</flags>
<getflags>none</getflags>
<flags>volatile nodup nocopy</flags>
</member>
</members>

19
aqhome/service/user.t2d
View File

@@ -14,6 +14,9 @@
with_db
with_list1
with_list2
with_refcount
nodup
nocopy
</flags>
<headers>
@@ -28,6 +31,14 @@
</lang>
<defines>
<define id="AQH_USER_RTFLAGS" prefix="AQH_USER_RTFLAGS_">
<item name="MODIFIED" value="0x00000001" />
<item name="PERMSCALC" value="0x00000002" />
</define>
</defines>
<members>
@@ -103,6 +114,14 @@
<flags>own</flags>
</member>
<member name="runtimeFlags" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags>volatile with_flags</flags>
</member>
</members>
</type>