obgm/libcoap
2
0 Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2026-11-01 07:25:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
Olaf Bergmann committed 2014-06-19 15:22:07 +02:00
2 parents 0dcbf38a20 3d66bbb8e3
commit f2e132df23
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
examples/client.c
+2 -2
View File
@@ -401,7 +401,7 @@ message_handler(struct coap_context_t *ctx,
((coap_opt_block_num(block_opt) + 1) << 4) |
COAP_OPT_BLOCK_SZX(block_opt)), buf);
if (received->hdr->type == COAP_MESSAGE_CON)
if (pdu->hdr->type == COAP_MESSAGE_CON)
tid = coap_send_confirmed(ctx, local_interface, remote, pdu);
else
tid = coap_send(ctx, local_interface, remote, pdu);
@@ -411,7 +411,7 @@ message_handler(struct coap_context_t *ctx,
coap_delete_pdu(pdu);
} else {
set_timeout(&max_wait, wait_seconds);
if (received->hdr->type != COAP_MESSAGE_CON)
if (pdu->hdr->type != COAP_MESSAGE_CON)
coap_delete_pdu(pdu);
}