Commit Graph
2452 Commits
Author SHA1 Message Date
Jon Shallow dc92fe5e1e coap.h.windows.in: Fix missing file renames 2022-07-01 13:29:06 +01:00
Jon Shallow 347270b9ab file naming: Rename files to have coap_ prefix
Initial update - rename files that are not subject to any PRs.
2022-07-01 11:36:26 +01:00
Jon Shallow 8b9377ef2a coap_mbedtls.c: Fix memory leak 2022-06-27 14:00:24 +02:00
Jon Shallow e8052b3988 resource.c: Further fix making subscribers iteration safe 2022-06-27 13:19:18 +02:00
Jon Shallow f93b9a3e37 coap_mbedtls.c: Catch connection reset in coap_tls_write 2022-06-24 18:15:02 +02:00
Jon Shallow d5bcb8159b resource.c: Make subscribers iteration safe in coap_notify_observers
When sending an unsolicited Observe message, this may trigger a
session disconnection which can remove a subscription.
2022-06-24 18:09:59 +02:00
Jon Shallow 0d9f2531e5 coap_session.c: Free off session's last_token on session deletion 2022-06-24 09:42:11 +02:00
Jon Shallow 415fbdb7cd RFC9175: Add in support for the Echo and Request-Tag options
A unique Request-Tag is added to any PUT/POST/FETCH request that contains
a large body.  The server is then able to differentiate between concurrent
sending of large data using the same session.

If a server responds with a 4.01 and includes an Echo option, then the libcoap
client retransmits the request adding in the received Echo option with the same
value.

If the server responds normally with an Echo option, then the next request
from the libcoap client (internally added by libcoap) will contain that Echo
option.

It is the responsibility of the server application to add in the Echo
option if required and validate the next request unless the Echo is triggered
by OSCORE (RFC8613 Appendix B.1.2).
2022-06-22 15:08:47 +02:00
Jon Shallow 88ae9563e6 mcast support: Support multicast granular to the resource level
Add in new function coap_mcast_per_resource() to enable granularity of
handling multicast requests differently at the resource level.

The granularity is handled by how the flags variable is set up in
coap_resource_init().  These additional flags are ignored if
function coap_mcast_per_resource() has not been invoked.

Added 2 functions coap_resource_unknown_init2() and
coap_resource_proxy_uri_init2() that support defining the mcast flags as
per coap_resource_init().

Responses are now delayed rather than the request being delayed before being
passed to the request handler.

Update coap-server with the -r option to enable multicast on specific
resources.

Do not reset wait_ms in coap-client for Block2 transfers.
2022-06-22 15:08:26 +02:00
Jon Shallow 73565196a8 block.c: Fix error handling with Block transfers
Fix double release of lg_xmit data.

Allow lg_xmit server sessions to timeout.

Check that there is support for adding diagnostic messages for
error returns.

Truncate received data that is larger than the indicated block size
apart from the BERT case.
2022-06-21 15:13:54 +01:00
Jon Shallow 132c726190 net.c: Handle multiple same token request/responses
Sending off multiple CON requests with the same token without waiting for
any responses, causes the first one to be sent with the remainder ending
up in the delayqueue.

On receipt of ACK, coap_remove_from_queue() called in coap_dispatch(),
which returns the MID matching entry that was in the send queue, and then
the next entry on the delayqueue is removed from delayqueue and then sent
which puts the request on the sendqueue for any required re-transmissions.

coap_cancel_all_messages() should not be called in handle_response()
following the logic above if response is type ACK. If
coap_cancel_all_messages() is subsequently called with the same (possibly
empty) token as the next request that is being sent, then the next sendqueue
entry is inadvertantly deleted.

As there is now no sendqueue entry on receipt of the next ACK, the next
delayqueue entry is not sent off.

Only call coap_cancel_all_messages() if response is not of type ACK
(i.e. a separate response).

Report on tokens being the same as the previous one to encourage application
coders to use different tokens.
2022-06-21 14:50:47 +01:00
Jon Shallow d68f5d6f57 net.c: Handle well_known requests when there is no libcoap block support
Fit as much as possible into a single PDU.
2022-06-21 10:28:14 +01:00
Jon Shallow fe51d3335e lwip: Fix minor issues
Increase MEMP_LEN_COAPSTRING to handle example server .wellknown/core request.

If session cannot be generated, check for NULL pointer.
2022-06-21 10:26:40 +01:00
Jon Shallow 6046dcbd55 net.c: Fix broken client only build
Comment out specific server code in coap_start().
2022-06-17 16:42:45 +02:00
Jon Shallow 20f15a17d6 Large Observes: Prevent server sending new response if active response
If the response is large, it can take time to transfer over the body.  If
the server then initiates a new unsolicited response during the existing
transfer, then overflow / retry issues start to occur, compounded if multiple
unsolicited responses are triggerred during an existing transfer.

Hold back the notify of the new unsolicited response(s) until the
existing response has completed (or failed for another reason).

Other code has been tightened up incase the server or client are
not libcoap based and also exhibit this behavior, so to have a better chance
of recovery.
2022-06-17 13:02:45 +02:00
Jon Shallow 5a10ce4890 Congestion Control: add in RFC7252 configuration flexibility
Create where appropriate default values for the Congestion control base
values and update the derived CC values accordingly.

Move derived value #define to coap_session_internal.h.

Update coap_session_t to hold the new CC values.

Update documentation for the new CC functions that update / get the
appropriate values.

NOTE: PROBING_WAIT is not currently checked in the code.
2022-06-17 12:15:19 +02:00
Jon Shallow 41afb92141 net.c: Update .well-known/core handling to use common logic
This removes a lot of code duplication by creating a pseudo resource
for .well-known/core that is not included in the .well-known/core output.
In particular specific Block2 option handling is no longer required.

Updated tests which now include checking that queries work.
2022-06-17 12:12:45 +02:00
Jon Shallow 6b32ed3de2 coap_io.c: Track ICMP Host Administravely Prohibited error
Add in tracking for EHOSTUNREACH in coap_network_read().
2022-06-17 12:00:49 +02:00
Jon Shallow 279755b1df coap_send: Make error checks for coap_send() more rigorous
Always delete PDUs on error before return from coap_send() (aligning with
previous documentation).

Check that the socket is still available before continuing with the PDU
transmission in coap_send().

Update documentation to be clearer on non-usage of PDU on return from
coap_send().

Trap coap_send() errors in coap-client.

Move event handlers setup code to earlier in coap-client to trap events
early on in the CoAP setup process.
2022-06-17 11:34:41 +02:00
Olaf Bergmann 925d39fd8c coap-server.c: Cleanup misplaced comment
Fix comment that has been left at the wrong place by a previous change.
2022-06-17 11:25:08 +02:00
Jon Shallow c771767147 coap_gnutls.c: Handle another error in do_gnutls_handshake()
Treat GNUTLS_E_UNEXPECTED_PACKET as a reason for DTLS closure.

To test, gnutls server and client with different PSK keys and coaps://

GNUTLS_E_UNEXPECTED_PACKET raised if alert sent by server in the
middle of the setup handshaking.
2022-06-17 08:59:00 +02:00
Jon Shallow 801e5492f2 CSM: Move coap_client_delay_first() to later in code processing
Commit 069a0786ce (#833) introduced the concept
of delaying PDU building until the CSM message had been received from server
so that PDUs could be correctly sized.

However, this meant that the functions coap_new_client_session*() would not
complete until the CSM was in for reliable protocols.  Some applications need
the returned session to handle / differentiate between different events.

CSM can update
session->mtu
session->csm_block_supported
session->csm_bert_rem_support

coap_client_delay_first() is now called in coap_add_data_large_request()
and coap_session_max_pdu_size() (not coap_session_max_pdu_rcv_size() as
this is for receiving PDUs).

coap_client_delay_first() has been updated to catch recursive requests as well
as using more of the common code for the LwIP specifics.
2022-06-17 08:49:09 +02:00
mrdeep1 4cad453197 Merge pull request #778 from mrdeep1/coap_io_prepare_io
coap_io_prepare_io: Re-order function code for correctly updating sockets[]
2022-06-14 10:22:06 +01:00
mrdeep1 ee863e4509 Merge pull request #863 from mrdeep1/update_block
block.c: Correctly preset updated_block variable
2022-06-13 16:54:52 +01:00
mrdeep1 f2de7098ce Merge pull request #862 from mrdeep1/white_space_1
async.c: Remove white space
2022-06-13 16:48:19 +01:00
Jon Shallow 346a831cd6 block.c: Correctly preset updated_block variable 2022-06-13 13:42:18 +01:00
Jon Shallow 56db248dab async.c: Remove white space 2022-06-13 13:35:15 +01:00
mrdeep1 df99212fac Merge pull request #850 from mrdeep1/sigpipe
TLS SIGPIPE: Stop programs exiting with code 141 (128 + 13:SIGPIPE)
2022-06-09 10:27:57 +01:00
Jon Shallow 256a758e02 TLS SIGPIPE: Stop programs exiting with code 141 (128 + 13:SIGPIPE)
The example coap-client application was setting the SIGPIPE signal to
SIG_IGN too late.

For applications that do not handle SIGPIPE, set MSG_NOSIGNAL in send() flags
to stop SIGPIPE being generated (but send() still returns EPIPE).

Drop the logging level when a client session cannot be extablished.

Can be reproduced when server requires certificates, but client does not
provide any certificate when using coaps+tcp:// and Mbed TLS.

Window 1
$ coap-server -c server.pem -C ca.pem
Window 2
$ coap-client coaps+tcp://127.0.0.1
$ echo $?
2022-06-09 09:21:14 +01:00
mrdeep1 c74b3efcb4 Merge pull request #744 from mrdeep1/cache_caution
Caching: Highlight requirements ignoring certain CoAP Options
2022-06-07 20:28:34 +01:00
mrdeep1 8b05aa5211 Merge pull request #848 from mrdeep1/bert
BERT: Support block BERT szx of 7 for reliable protocols
2022-06-07 16:07:35 +01:00
mrdeep1 573d3abc55 Merge pull request #851 from mrdeep1/multicast_log
CMakeLists.txt: Correctly determine cmsghdr support for determining addresses
2022-06-07 15:56:12 +01:00
mrdeep1 2449c1ee06 Merge pull request #857 from kkrentz/net-pr
net.c: fix null pointer exception
2022-06-07 15:53:31 +01:00
mrdeep1 05384551af Merge pull request #853 from mrdeep1/mbedtls_3_1
coap_mbedtls.c: Fix coap_rng() return for 3.x code
2022-06-07 15:41:35 +01:00
mrdeep1 5a2e45e745 Merge pull request #856 from mrdeep1/rfc7390
RFC7390: Update support for RFC7390
2022-06-07 15:38:24 +01:00
kkrentz 6649bdef39 net.c: fix null pointer exception 2022-06-07 16:22:37 +02:00
Jon Shallow 03a9059439 BERT: Support block BERT szx of 7 for reliable protocols
Add in new coap_block_b_t structure that tracks BERT usage, and
use new functions coap_*block_b_* that are in addition to the old
coap_*block_* functions that use coap_block_b_t.
2022-05-31 19:45:29 +01:00
Jon Shallow 445a9481de RFC7390: Update support for RFC7390
Update documentation and add in missing content-format.
2022-05-26 21:10:29 +01:00
Jon Shallow 428f759659 coap_mbedtls.c: Fix coap_rng() return for 3.x code
coap_rng() needs to return 0 on success, and negative error on failure.

Corrected some logging function names.

Corrected the return value in coap_prng_default() to be always 1 on success
and 0 on failure to be consistent with coap_rand_func_t.

Updated coap_prng() to return 0 if an error in the used random function.
2022-05-24 10:36:18 +01:00
Jon Shallow 1b2668f562 CMakeLists.txt: Correctly determine cmsghdr support for determining addresses
check_symbol_exists() only works for defines etc., not struct, so look for
CMSG_FIRSTHDR instead.

Make sure _GNU_SOURCE is defined to pick up the in6_pktinfo definition needed
for the logic using cmsghdr.
2022-05-22 16:03:03 +01:00
Jon Shallow 21fd838dc7 coap_io_prepare_io: Re-order function code for correctly updating sockets[]
Two cases for not updating active sockets[] with file descriptors from a
session (non epoll code)
  coap_retransmit() can release a session
  coap_dtls_handle_timeout() can disconnect a session

Move the restransmit test code to before any updates to socket[].

Update coap_dtls_handle_timeout() to return a value indicating a DTLS timeout
has occurred.  At the same time move the coap_dtls_handle_timeout() checks
into the first sessions iteration loop, removing having to iterate through the
sessions twice if DTLS.
2022-05-20 11:10:32 +01:00
obgm 50128de191 Merge pull request #847 from mrdeep1/async_con
net.c: Make sure separate response is CON for CON requests
2022-05-11 15:07:45 +02:00
Olaf Bergmann cfbf3ab617 doc/main.md: Update copyright year 2022-05-11 13:03:51 +02:00
Jon Shallow f28044303a net.c: Make sure separate response is CON for CON requests 2022-05-10 15:25:16 +01:00
obgm abbe3edd5a Merge pull request #795 from mrdeep1/async_fix
async: Handle changes to delay when using epoll
2022-05-06 14:47:39 +02:00
obgm 7404ee172f Merge pull request #833 from mrdeep1/csm_message_size
CSM: Support different XMT and RCV Max-Message-Size
2022-05-06 13:28:27 +02:00
obgm 13f53368c3 Merge pull request #844 from mrdeep1/mutex_fix
recursive mutex: Stop recursive Mutex when doing handler callbacks
2022-05-06 12:10:20 +02:00
Jon Shallow 069a0786ce CSM: Support different XMT and RCV Max-Message-Size
Track the RCV mtu size separately from the XMT mtu, so that sufficiently
large PDUs can be built for receiving incoming data.

Wait until reliable session is complete and the initial CSM have been exchanged
before building any new PDUs for transmission so that they can hold the
appropriate amount of Max-Message-Size data.

Add in support into coap-server and coap-client for defining the
Max-Message-Size to use by adding in 2 new functions
coap_context_set_csm_max_message_size() and
coap_context_get_csm_max_message_size().

Add in flexibility into coap-server to control the initial example_data size.

Requires #844 to prevent recursive mutex locking when initiating proxy ongoing
session to upstream server.
2022-05-04 10:01:37 +01:00
Jon Shallow 9cbe5757cb recursive mutex: Stop recursive Mutex when doing handler callbacks
Move around some of the COAP_CONSTRAINED_STACK mutex locking to prevent
recursive locking (issue when a proxy initiates an ongoing reliable client
connection).
2022-05-04 09:57:34 +01:00
obgm 0691f4ff5d Merge pull request #839 from namib-project/server_session_events
Add events for server session state management
2022-04-29 10:57:15 +02:00