Skip to content

Commit

Permalink
subsys: net: download_client: restructuring
Browse files Browse the repository at this point in the history 
* Fix new data req!
* Remove pseudo-states

Signed-off-by: Eivind Jølsgard <[email protected]>
  • Loading branch information
@eivindj-nordic
eivindj-nordic committed Sep 25, 2024
1 parent d2bbeee commit 3af4cbb
Show file tree
Hide file tree
Showing 18 changed files with 559 additions and 508 deletions.
4 changes: 2 additions & 2 deletions doc/nrf/libraries/networking/download_client.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ Configuring HTTP and HTTPS (TLS 1.2)

Set the :kconfig:option:`CONFIG_DOWNLOAD_CLIENT_BUF_SIZE` Kconfig option, so that the buffer is large enough to accommodate the entire HTTP header of the request and the response.

Moreover, the application must provision the TLS credentials and pass the security tag to the library when using HTTPS and calling the :c:func:`download_client_set_host` function.
Moreover, the application must provision the TLS credentials and pass the security tag to the library when using HTTPS and calling the :c:func:`download_client_connect` function.
To provision a TLS certificate to the modem, use :c:func:`modem_key_mgmt_write` and other :ref:`modem_key_mgmt` APIs.

Configuring CoAP and CoAPS (DTLS 1.2)
=====================================

Make sure to configure the :kconfig:option:`CONFIG_DOWNLOAD_CLIENT_BUF_SIZE` and :kconfig:option:`CONFIG_DOWNLOAD_CLIENT_COAP_BLOCK_SIZE` Kconfig options, so that the buffer is large enough to accommodate the entire CoAP header and the CoAP block.

The application must provision the TLS credentials and pass the security tag to the library when using CoAPS and calling :c:func:`download_client_set_host`.
The application must provision the TLS credentials and pass the security tag to the library when using CoAPS and calling :c:func:`download_client_connect`.

When you have modem firmware v1.3.5 or newer, you can use the :kconfig:option:`CONFIG_DOWNLOAD_CLIENT_CID` Kconfig option to enable the DTLS Connection Identifier feature in this library.

Expand Down
4 changes: 2 additions & 2 deletions doc/nrf/releases_and_maturity/releases/release-notes-2.4.0.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -814,11 +814,11 @@ Libraries for networking

* :ref:`lib_download_client` library:

* Added the :c:func:`download_client_get` function that combines the functionality of functions :c:func:`download_client_set_host`, :c:func:`download_client_start`, and :c:func:`download_client_disconnect`.
* Added the :c:func:`download_client_get` function that combines the functionality of functions :c:func:`download_client_connect`, :c:func:`download_client_start`, and :c:func:`download_client_close`.

* Updated:

* The ``download_client_connect`` function has been refactored to :c:func:`download_client_set_host` and made it non-blocking.
* The ``download_client_connect`` function has been refactored to :c:func:`download_client_connect` and made it non-blocking.
* The configuration from one security tag to a list of security tags.
* The library reports error ``ERANGE`` when HTTP range is requested but not supported by server.

Expand Down
249 changes: 130 additions & 119 deletions include/net/download_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ enum download_client_evt_id {
* the download client automatically closes the connection. The application should wait for
* DOWNLOAD_CLIENT_EVT_CLOSED before attempting another download.
* If download is stopped, and it was started using @ref download_client_start
* the application should manually disconnect (@ref download_client_disconnect)
* the application should manually disconnect (@ref download_client_stop)
* to clean up the network socket and wait for DOWNLOAD_CLIENT_EVT_CLOSED before attempting
* another download.
*/
Expand All @@ -75,6 +75,8 @@ enum download_client_evt_id {
DOWNLOAD_CLIENT_EVT_DONE,
/** Connection have been closed. Client is now idle, ready for next download */
DOWNLOAD_CLIENT_EVT_CLOSED,
/** Client deinitialized. Memory can be freed. */
DOWNLOAD_CLIENT_EVT_DEINITIALIZED,
};

struct download_fragment {
Expand All @@ -98,9 +100,41 @@ struct download_client_evt {
};

/**
* @brief Download client configuration options.
* @brief Download client asynchronous event handler.
*
* Through this callback, the application receives events, such as
* download of a fragment, download completion, or errors.
*
* If the callback returns a non-zero value, the download stops.
* To resume the download, use @ref download_client_start().
*
* @param[in] event The event.
*
* @return Zero to continue the download, non-zero otherwise.
*/
typedef int (*download_client_callback_t)(
const struct download_client_evt *event);

/**
* @brief
*/
struct download_client_cfg {
/** Event handler. */
download_client_callback_t callback;
/** Client buffer. */
char *buf;
/** Client buffer size. */
size_t buf_size;
};

/**
* @brief Download client configuration options.
*/
struct download_client_host_cfg {
/** Server hosting the file, null-terminated.
* The host name must be kept in scope while download is going on.
*/
const char *hostname;
/** TLS security tag list.
* Pass NULL to disable TLS.
* The list must be kept in scope while download is going on.
Expand All @@ -126,126 +160,107 @@ struct download_client_cfg {
size_t range_override;
/** Set hostname for TLS Server Name Indication extension */
bool set_tls_hostname;
/** Response buffer. */
char *buf;
/** Response buffer size. */
size_t buf_size;
/** Set socket to native TLS */
bool set_native_tls;
/** Close connection when done */
bool close_when_done;
};

/**
* @brief Download client asynchronous event handler.
*
* Through this callback, the application receives events, such as
* download of a fragment, download completion, or errors.
*
* If the callback returns a non-zero value, the download stops.
* To resume the download, use @ref download_client_start().
*
* @param[in] event The event.
*
* @return Zero to continue the download, non-zero otherwise.
*/
typedef int (*download_client_callback_t)(
const struct download_client_evt *event);

/**
* @brief Download client state.
*/
enum download_client_state {
DOWNLOAD_CLIENT_IDLE,
DOWNLOAD_CLIENT_CONNECTING,
DOWNLOAD_CLIENT_CONNECTED,
DOWNLOAD_CLIENT_DOWNLOADING,
DOWNLOAD_CLIENT_FINISHED,
DOWNLOAD_CLIENT_CLOSING
DOWNLOAD_CLIENT_DEINITIALIZING,
DOWNLOAD_CLIENT_DEINITIALIZED,
};

/**
* @brief Download client instance.
*
* Members are set internally by the download client.
*/
struct download_client {
/** Protect shared variables. */
struct k_mutex mutex;

/** Socket descriptor. */
int fd;

/** Destination address storage */
struct sockaddr remote_addr;

/** Buffer offset. */
size_t buf_offset;

/** Size of the file being downloaded, in bytes. */
size_t file_size;
/** Download progress, number of bytes downloaded. */
size_t progress;
/** Client configuration options. */
struct download_client_cfg config;
/** Host configuration options. */
struct download_client_host_cfg host_config;

/** Server hosting the file, null-terminated.
* The host name must be kept in scope while download is going on.
*/
const char *host;
/** File name, null-terminated.
* The file name must be kept in scope while download is going on.
*/
const char *file;
/** Configuration options. */
struct download_client_cfg config;

/** Protocol for current download. */
int proto;

/** Size of the file being downloaded, in bytes. */
size_t file_size;
/** Download progress, number of bytes downloaded. */
size_t progress;
/** Buffer offset. */
size_t buf_offset;
/** Request new data */
bool new_data_req;

struct {
/** The server has closed the connection. */
bool connection_close;
/** Is using ranged query. */
bool ranged;
/** Ranged progress */
size_t ranged_progress;
/** HTTP header */
struct {
/** Header length */
size_t hdr_len;
/** Status code */
unsigned long status_code;
/** Whether the HTTP header for
* the current fragment has been processed.
*/
bool has_end;
} header;
} http;

struct {
/** CoAP block context. */
struct coap_block_context block_ctx;
/** Socket descriptor. */
int fd;
/** Protocol for current download. */
int proto;
/** Socket type */
int type;
/** Port */
uint16_t port;
/** Destination address storage */
struct sockaddr remote_addr;
} sock;

/** Application protocols */
union {
struct {
/** The server has closed the connection. */
bool connection_close;
/** Is using ranged query. */
bool ranged;
/** Ranged progress */
size_t ranged_progress;
/** HTTP header */
struct {
/** Header length */
size_t hdr_len;
/** Status code */
unsigned long status_code;
/** Whether the HTTP header for
* the current fragment has been processed.
*/
bool has_end;
} header;
} http;

/** CoAP pending object. */
struct coap_pending pending;
} coap;
struct {
bool initialized;
/** CoAP block context. */
struct coap_block_context block_ctx;

/** Internal thread ID. */
k_tid_t tid;
/** CoAP pending object. */
struct coap_pending pending;
} coap;
};

/** Protect shared variables. */
struct k_mutex mutex;
/** Download client state. */
enum download_client_state state;
/** Internal download thread. */
struct k_thread thread;
/** Internal thread ID. */
k_tid_t tid;
/** Ensure that thread is ready for download */
struct k_sem wait_for_download;

/* Internal thread stack. */
K_THREAD_STACK_MEMBER(thread_stack,
CONFIG_DOWNLOAD_CLIENT_STACK_SIZE);

/** Event handler. */
download_client_callback_t callback;

/** Set socket to native TLS */
bool set_native_tls;

/** Close the socket when finished. */
bool close_when_done;

enum download_client_state state;
};

/**
Expand All @@ -259,22 +274,20 @@ struct download_client {
*
* @retval int Zero on success, otherwise a negative error code.
*/
int download_client_init(struct download_client *client,
download_client_callback_t callback);
int download_client_init(struct download_client *const dlc,
struct download_client_cfg *config);

/**
* @brief Set a target hostname.
* @brief Deinitialize the download client.
*
* This function can only be called once in each client instance as
* it removes the background thread.
*
* @param[in] client Client instance.
* @param[in] host Name of the host to connect to, null-terminated.
* Can include scheme and port number, defaults to
* HTTP or HTTPS if no scheme is provided.
* @param[in] config Configuration options.
*
* @retval int Zero on success, a negative error code otherwise.
* @retval int Zero on success.
*/
int download_client_set_host(struct download_client *client, const char *host,
const struct download_client_cfg *config);
int download_client_deinit(struct download_client *client);

/**
* @brief Download a file.
Expand All @@ -292,8 +305,21 @@ int download_client_set_host(struct download_client *client, const char *host,
*
* @retval int Zero on success, a negative error code otherwise.
*/
int download_client_start(struct download_client *client, const char *file,
size_t from);
int download_client_start(struct download_client *client,
const struct download_client_host_cfg *host_config,
const char *file, size_t from);

/**
* @brief Stop file download and disconnect from server.
*
* Request client to disconnect from the server. This does not block.
* When client have been disconnected, it send @ref DOWNLOAD_CLIENT_EVT_CLOSED event.
*
* @param[in] client Client instance.
*
* @return Zero on success, a negative error code otherwise.
*/
int download_client_stop(struct download_client *client);

/**
* @brief Retrieve the size of the file being downloaded, in bytes.
Expand All @@ -319,28 +345,12 @@ int download_client_file_size_get(struct download_client *client, size_t *size);
*/
int download_client_downloaded_size_get(struct download_client *client, size_t *size);

/**
* @brief Initiate disconnection.
*
* Request client to disconnect from the server. This does not block.
* When client have been disconnected, it send @ref DOWNLOAD_CLIENT_EVT_CLOSED event.
*
* Request client to disconnect from the server. This does not block.
* When client has been disconnected, it sends @ref DOWNLOAD_CLIENT_EVT_CLOSED event.
*
* @param[in] client Client instance.
*
* @return Zero on success, a negative error code otherwise.
*/
int download_client_disconnect(struct download_client *client);

/**
* @brief Download a file asynchronously.
*
* This initiates an asynchronous connect-download-disconnect sequence to the target
* host. When only one file is required from a target server, it can be used instead of
* separate calls to download_client_set_host(), download_client_start()
* and download_client_disconnect().
* separate calls to download_client_start() and download_client_stop().
*
* Downloads are handled one at a time. If previous download is not finished
* this returns -EALREADY.
Expand All @@ -362,8 +372,9 @@ int download_client_disconnect(struct download_client *client);
*
* @retval int Zero on success, a negative error code otherwise.
*/
int download_client_get(struct download_client *client, const char *host,
const struct download_client_cfg *config, const char *file, size_t from);
int download_client_get(struct download_client *client,
const struct download_client_host_cfg *config,
const char *file, size_t from);

#ifdef __cplusplus
}
Expand Down
Loading

0 comments on commit 3af4cbb

Please sign in to comment.