Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server: Make client context available in de-registration callback #843

Closed
wants to merge 1 commit into from
Closed

server: Make client context available in de-registration callback #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions core/registration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2017,12 +2017,17 @@ uint8_t registration_handleRequest(lwm2m_context_t * contextP,
if (!LWM2M_URI_IS_SET_OBJECT(uriP)) return COAP_400_BAD_REQUEST;
if (LWM2M_URI_IS_SET_INSTANCE(uriP)) return COAP_400_BAD_REQUEST;

contextP->clientList = (lwm2m_client_t *)LWM2M_LIST_RM(contextP->clientList, uriP->objectId, &clientP);
if (clientP == NULL) return COAP_400_BAD_REQUEST;
if (contextP->monitorCallback != NULL)
{
contextP->monitorCallback(contextP, clientP->internalID, NULL, COAP_202_DELETED, NULL, LWM2M_CONTENT_TEXT, NULL, 0, contextP->monitorUserData);
clientP = (lwm2m_client_t *)LWM2M_LIST_FIND(contextP->clientList, uriP->objectId);

if (clientP == NULL) {
return COAP_400_BAD_REQUEST;
}

if (contextP->monitorCallback != NULL) {
contextP->monitorCallback(contextP, clientP->internalID, NULL, COAP_202_DELETED, NULL, LWM2M_CONTENT_TEXT,
NULL, 0, contextP->monitorUserData);
}
contextP->clientList = (lwm2m_client_t *)LWM2M_LIST_RM(contextP->clientList, clientP->internalID, NULL);
registration_freeClient(clientP);
result = COAP_202_DELETED;
}
Expand Down Expand Up @@ -2136,17 +2141,14 @@ void registration_step(lwm2m_context_t * contextP,
{
lwm2m_client_t * nextP = clientP->next;

if (clientP->endOfLife <= currentTime)
{
contextP->clientList = (lwm2m_client_t *)LWM2M_LIST_RM(contextP->clientList, clientP->internalID, NULL);
if (contextP->monitorCallback != NULL)
{
contextP->monitorCallback(contextP, clientP->internalID, NULL, COAP_202_DELETED, NULL, LWM2M_CONTENT_TEXT, NULL, 0, contextP->monitorUserData);
if (clientP->endOfLife <= currentTime) {
if (contextP->monitorCallback != NULL) {
contextP->monitorCallback(contextP, clientP->internalID, NULL, COAP_202_DELETED, NULL,
LWM2M_CONTENT_TEXT, NULL, 0, contextP->monitorUserData);
}
contextP->clientList = (lwm2m_client_t *)LWM2M_LIST_RM(contextP->clientList, clientP->internalID, NULL);
registration_freeClient(clientP);
}
else
{
} else {
time_t interval;

interval = clientP->endOfLife - currentTime;
Expand Down
13 changes: 4 additions & 9 deletions examples/server/lwm2mserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,19 +953,17 @@ static void prv_cancel_client(lwm2m_context_t *lwm2mH,
static void prv_monitor_callback(lwm2m_context_t *lwm2mH, uint16_t clientID, lwm2m_uri_t *uriP, int status,
block_info_t *block_info, lwm2m_media_type_t format, uint8_t *data, size_t dataLength,
void *userData) {
lwm2m_client_t * targetP;
lwm2m_client_t *clientP;

/* unused parameter */
(void)userData;

clientP = (lwm2m_client_t *)LWM2M_LIST_FIND(lwm2mH->clientList, clientID);

switch (status)
{
case COAP_201_CREATED:
fprintf(stdout, "\r\nNew client #%d registered.\r\n", clientID);

targetP = (lwm2m_client_t *)lwm2m_list_find((lwm2m_list_t *)lwm2mH->clientList, clientID);

prv_dump_client(targetP);
break;

case COAP_202_DELETED:
Expand All @@ -974,16 +972,13 @@ static void prv_monitor_callback(lwm2m_context_t *lwm2mH, uint16_t clientID, lwm

case COAP_204_CHANGED:
fprintf(stdout, "\r\nClient #%d updated.\r\n", clientID);

targetP = (lwm2m_client_t *)lwm2m_list_find((lwm2m_list_t *)lwm2mH->clientList, clientID);

prv_dump_client(targetP);
break;

default:
fprintf(stdout, "\r\nMonitor callback called with an unknown status: %d.\r\n", status);
break;
}
prv_dump_client(clientP);

fprintf(stdout, "\r\n> ");
fflush(stdout);
Expand Down
Loading