giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed issues with the RD client

This commit is contained in:
Joakim Eriksson 2017-12-07 23:18:27 +01:00 committed by Niclas Finne
parent 18cd711050
commit 43466683ff
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
os/services/lwm2m/lwm2m-rd-client.c
View File

@ -71,6 +71,8 @@
#define LWM2M_DEFAULT_CLIENT_LIFETIME 600 /* sec */ #define LWM2M_DEFAULT_CLIENT_LIFETIME 600 /* sec */
#endif #endif
#define MAX_RD_UPDATE_WAIT 5000
#define REMOTE_PORT UIP_HTONS(COAP_DEFAULT_PORT) #define REMOTE_PORT UIP_HTONS(COAP_DEFAULT_PORT)
#define BS_REMOTE_PORT UIP_HTONS(5685) #define BS_REMOTE_PORT UIP_HTONS(5685)
@ -107,6 +109,7 @@ static uint8_t rd_state = 0;
static uint8_t rd_flags = FLAG_RD_DATA_UPDATE_ON_DIRTY; static uint8_t rd_flags = FLAG_RD_DATA_UPDATE_ON_DIRTY;
static uint64_t wait_until_network_check = 0; static uint64_t wait_until_network_check = 0;
static uint64_t last_update; static uint64_t last_update;
static uint64_t last_rd_progress = 0;
static char query_data[64]; /* allocate some data for queries and updates */ static char query_data[64]; /* allocate some data for queries and updates */
static uint8_t rd_data[128]; /* allocate some data for the RD */ static uint8_t rd_data[128]; /* allocate some data for the RD */
@ -438,10 +441,8 @@ registration_callback(coap_request_state_t *state)
} }
/* TODO Application callback? */ /* TODO Application callback? */
rd_state = INIT; rd_state = INIT;
} else if(REGISTRATION_SENT == rd_state) { /* this can handle double invocations */ /* remember last progress time */
/* Failure! */ last_rd_progress = coap_timer_uptime();
LOG_DBG_("Registration failed! Retry?\n");
rd_state = DO_REGISTRATION;
} else { } else {
LOG_DBG_("Ignore\n"); LOG_DBG_("Ignore\n");
} }
@ -459,6 +460,7 @@ update_callback(coap_request_state_t *state)
/* If we get a continue - we need to call the rd generator one more time */ /* If we get a continue - we need to call the rd generator one more time */
if(CONTINUE_2_31 == state->response->code) { if(CONTINUE_2_31 == state->response->code) {
/* We assume that size never change?! */ /* We assume that size never change?! */
LOG_DBG_("Continue\n");
coap_get_header_block1(state->response, &rd_block1, NULL, NULL, NULL); coap_get_header_block1(state->response, &rd_block1, NULL, NULL, NULL);
coap_timer_set_callback(&block1_timer, block1_rd_callback); coap_timer_set_callback(&block1_timer, block1_rd_callback);
coap_timer_set(&block1_timer, 1); /* delay 1 ms */ coap_timer_set(&block1_timer, 1); /* delay 1 ms */
@ -468,19 +470,14 @@ update_callback(coap_request_state_t *state)
last_update = coap_timer_uptime(); last_update = coap_timer_uptime();
rd_state = REGISTRATION_DONE; rd_state = REGISTRATION_DONE;
rd_flags &= ~FLAG_RD_DATA_UPDATE_TRIGGERED; rd_flags &= ~FLAG_RD_DATA_UPDATE_TRIGGERED;
return; } else {
}
/* Possible error response codes are 4.00 Bad request & 4.04 Not Found */ /* Possible error response codes are 4.00 Bad request & 4.04 Not Found */
LOG_DBG_("Failed with code %d. Retrying registration\n", state->response->code); LOG_DBG_("Failed with code %d. Retrying registration\n",
rd_state = DO_REGISTRATION; state->response->code);
} else if(REGISTRATION_SENT == rd_state) { /* this can handle the current double invocation */
/* Failure! */
LOG_DBG("Registration failed! Retry?");
rd_state = DO_REGISTRATION;
} else if(UPDATE_SENT == rd_state) {
/* Update failed */
LOG_DBG("Update failed! Retry?");
rd_state = DO_REGISTRATION; rd_state = DO_REGISTRATION;
}
/* remember last progress */
last_rd_progress = coap_timer_uptime();
} else { } else {
LOG_DBG("Ignore\n"); LOG_DBG("Ignore\n");
} }
@ -505,6 +502,13 @@ deregister_callback(coap_request_state_t *state)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void
recover_from_rd_delay(void)
{
/* This can be improved in the future... */
rd_state = INIT;
}
/*---------------------------------------------------------------------------*/
/* CoAP timer callback */ /* CoAP timer callback */
static void static void
periodic_process(coap_timer_t *timer) periodic_process(coap_timer_t *timer)
@ -654,11 +658,16 @@ periodic_process(coap_timer_t *timer)
coap_send_request(&rd_request_state, &session_info.server_ep, coap_send_request(&rd_request_state, &session_info.server_ep,
request, registration_callback); request, registration_callback);
last_rd_progress = coap_timer_uptime();
rd_state = REGISTRATION_SENT; rd_state = REGISTRATION_SENT;
} }
break; break;
case REGISTRATION_SENT: case REGISTRATION_SENT:
/* just wait until the callback kicks us to the next state... */ /* just wait until the callback kicks us to the next state... */
if(last_rd_progress + MAX_RD_UPDATE_WAIT < coap_timer_uptime()) {
/* Timeout on the update - something is wrong? */
recover_from_rd_delay();
}
break; break;
case REGISTRATION_DONE: case REGISTRATION_DONE:
/* All is done! */ /* All is done! */
@ -672,12 +681,17 @@ periodic_process(coap_timer_t *timer)
prepare_update(request, rd_flags & FLAG_RD_DATA_UPDATE_TRIGGERED); prepare_update(request, rd_flags & FLAG_RD_DATA_UPDATE_TRIGGERED);
coap_send_request(&rd_request_state, &session_info.server_ep, request, coap_send_request(&rd_request_state, &session_info.server_ep, request,
update_callback); update_callback);
last_rd_progress = coap_timer_uptime();
rd_state = UPDATE_SENT; rd_state = UPDATE_SENT;
} }
break; break;
case UPDATE_SENT: case UPDATE_SENT:
/* just wait until the callback kicks us to the next state... */ /* just wait until the callback kicks us to the next state... */
if(last_rd_progress + MAX_RD_UPDATE_WAIT < coap_timer_uptime()) {
/* Timeout on the update - something is wrong? */
recover_from_rd_delay();
}
break; break;
case DEREGISTER: case DEREGISTER:
LOG_INFO("DEREGISTER %s\n", session_info.assigned_ep); LOG_INFO("DEREGISTER %s\n", session_info.assigned_ep);