Commit 0f08c981 authored by Kishen Maloor's avatar Kishen Maloor

Merge 'origin/hollywood' into ipanema

Signed-off-by: Kishen Maloor's avatarKishen Maloor <kishen.maloor@intel.com>
parents 5c82d3f7 f684e2d2
Pipeline #1265 passed with stage
in 5 minutes and 23 seconds
......@@ -87,7 +87,6 @@ static void
reconnect(oc_cloud_context_t *ctx)
{
oc_set_delayed_callback(ctx, callback_handler, 0);
oc_remove_delayed_callback(ctx, refresh_token);
cloud_reconnect(ctx);
}
......
......@@ -1973,6 +1973,8 @@ read_application_data_tcp(oc_tls_peer_t *peer)
peer->processed_recv_message->length == total_length) {
OC_DBG("oc_tls_tcp: Decrypted incoming message %d",
(int)(total_length));
peer->processed_recv_message->encrypted = 0;
memcpy(peer->processed_recv_message->endpoint.di.id, peer->uuid.id, 16);
if (oc_process_post(&coap_engine, oc_events[INBOUND_RI_EVENT],
peer->processed_recv_message) ==
OC_PROCESS_ERR_FULL) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment