net: lwm2m+coap: Cherry-pick fixes and changes to CoAP and LwM2M

doc/connectivity/networking/api/lwm2m.rst

@@ -789,6 +789,9 @@ required actions from the server side.
     resume  :LwM2M engine thread resume
     lock    :Lock the LwM2M registry
     unlock  :Unlock the LwM2M registry
+    obs     : List observations
+    ls      : ls [PATH]
+            List objects, instances, resources
 
 
 

include/zephyr/net/coap_client.h

@@ -53,16 +53,16 @@ typedef void (*coap_client_response_cb_t)(int16_t result_code,
  * @brief Representation of a CoAP client request.
  */
 struct coap_client_request {
-	enum coap_method method;            /**< Method of the request */
-	bool confirmable;	            /**< CoAP Confirmable/Non-confirmable message */
-	const char *path;	            /**< Path of the requested resource */
-	enum coap_content_format fmt;       /**< Content format to be used */
-	uint8_t *payload;	            /**< User allocated buffer for send request */
-	size_t len;		            /**< Length of the payload */
-	coap_client_response_cb_t cb;       /**< Callback when response received */
-	struct coap_client_option *options; /**< Extra options to be added to request */
-	uint8_t num_options;                /**< Number of extra options */
-	void *user_data;	            /**< User provided context */
+	enum coap_method method;                  /**< Method of the request */
+	bool confirmable;                         /**< CoAP Confirmable/Non-confirmable message */
+	const char *path;                         /**< Path of the requested resource */
+	enum coap_content_format fmt;             /**< Content format to be used */
+	const uint8_t *payload;                   /**< User allocated buffer for send request */
+	size_t len;                               /**< Length of the payload */
+	coap_client_response_cb_t cb;             /**< Callback when response received */
+	const struct coap_client_option *options; /**< Extra options to be added to request */
+	uint8_t num_options;                      /**< Number of extra options */
+	void *user_data;                          /**< User provided context */
 };
 
 /**
@@ -158,6 +158,21 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
  */
 void coap_client_cancel_requests(struct coap_client *client);
 
+/**
+ * @brief Cancel matching requests.
+ *
+ * This function cancels all CoAP client request that matches the given request.
+ * The request is matched based on the method, path, callback and user_data, if provided.
+ * Any field set to NULL is considered a wildcard.
+ *
+ * (struct coap_client_request){0} cancels all requests.
+ * (struct coap_client_request){.method = COAP_METHOD_GET} cancels all GET requests.
+ *
+ * @param client Pointer to the CoAP client instance.
+ * @param req Pointer to the CoAP client request to be canceled.
+ */
+void coap_client_cancel_request(struct coap_client *client, struct coap_client_request *req);
+
 /**
  * @brief Initialise a Block2 option to be added to a request
  *

include/zephyr/net/lwm2m.h

@@ -182,6 +182,7 @@ enum lwm2m_rd_client_event {
 typedef void (*lwm2m_ctx_event_cb_t)(struct lwm2m_ctx *ctx,
 				     enum lwm2m_rd_client_event event);
 
+typedef int (*lwm2m_set_sockopt_cb_t)(struct lwm2m_ctx *client_ctx);
 
 /**
  * @brief Different traffic states of the LwM2M socket.
@@ -245,8 +246,6 @@ struct lwm2m_ctx {
 	char *desthostname;
 	/** Destination hostname length */
 	uint16_t desthostnamelen;
-	/** Flag to indicate if hostname verification is enabled */
-	bool hostname_verify;
 
 	/** Custom load_credentials function.
 	 *  Client can set load_credentials function as a way of overriding
@@ -260,7 +259,7 @@ struct lwm2m_ctx {
 	 * a callback that is called after a socket is created and before
 	 * connect.
 	 */
-	int (*set_socketoptions)(struct lwm2m_ctx *client_ctx);
+	lwm2m_set_sockopt_cb_t set_socketoptions;
 
 	/** Flag to indicate if context should use DTLS.
 	 *  Enabled via the use of coaps:// protocol prefix in connection
@@ -1623,6 +1622,17 @@ int lwm2m_security_mode(struct lwm2m_ctx *ctx);
  */
 int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx);
 
+/**
+ * @brief Set the @ref lwm2m_ctx::set_socketoptions callback for the pull context's client.
+ *
+ * This allows setting specific socket options on the socket that is used to pull
+ * firmware updates. The callback will be called after the pull context socket has been
+ * created and before it will connect.
+ *
+ * @param[in] set_sockopt_cb A callback function to set sockopts for the pull context client.
+ */
+void lwm2m_pull_context_set_sockopt_callback(lwm2m_set_sockopt_cb_t set_sockopt_cb);
+
 #ifdef __cplusplus
 }
 #endif