lib: nrf_cloud: invert ports as late as possible

Updated handling of ports with led to
confusing log messages with byte-inversed values.

Signed-off-by: Maximilian Deubel <[email protected]>

Author: maxd-nordic

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -1037,7 +1037,10 @@ Libraries for networking
 * :ref:`lib_nrf_cloud` library:
 
   * Added the :c:func:`nrf_cloud_obj_location_request_create_timestamped` function to make location requests for past cellular or Wi-Fi scans.
-  * Updated by refactoring the folder structure of the library to separate the different backend implementations.
+  * Updated:
+
+    * By refactoring the folder structure of the library to separate the different backend implementations.
+    * Handling of ports, which led to confusing log messages with byte-inversed values.
 
 * :ref:`lib_downloader` library:
 

subsys/net/lib/nrf_cloud/coap/src/nrf_cloud_coap_transport.c

@@ -773,7 +773,7 @@ int nrf_cloud_coap_transport_connect(struct nrf_cloud_coap_client *const client)
 	client->authenticated = false;
 
 	const char *const host_name = CONFIG_NRF_CLOUD_COAP_SERVER_HOSTNAME;
-	uint16_t port = htons(CONFIG_NRF_CLOUD_COAP_SERVER_PORT);
+	uint16_t port = CONFIG_NRF_CLOUD_COAP_SERVER_PORT;
 
 	struct zsock_addrinfo hints = {
 		.ai_socktype = SOCK_DGRAM

subsys/net/lib/nrf_cloud/common/src/nrf_cloud_dns.c

@@ -40,10 +40,10 @@ static int nrf_cloud_try_addresses(const char *const host_name, uint16_t port,
 
 		switch (sa->sa_family) {
 		case AF_INET6:
-			((struct sockaddr_in6 *)sa)->sin6_port = port;
+			((struct sockaddr_in6 *)sa)->sin6_port = htons(port);
 			break;
 		case AF_INET:
-			((struct sockaddr_in *)sa)->sin_port = port;
+			((struct sockaddr_in *)sa)->sin_port = htons(port);
 			break;
 		}
 
@@ -87,14 +87,14 @@ int nrf_cloud_connect_host(const char *hostname, uint16_t port, struct zsock_add
 
 #if defined(CONFIG_NRF_CLOUD_STATIC_IPV4)
 	static struct sockaddr_in static_addr;
-	uint16_t static_port = htons(CONFIG_NRF_CLOUD_PORT);
+	uint16_t static_port = CONFIG_NRF_CLOUD_PORT;
 
 	LOG_DBG("Trying static IPv4 address: %s, port: %d", CONFIG_NRF_CLOUD_STATIC_IPV4_ADDR,
 		port);
 
 	zsock_inet_pton(AF_INET, CONFIG_NRF_CLOUD_STATIC_IPV4_ADDR, &(static_addr.sin_addr));
 	static_addr.sin_family = AF_INET;
-	static_addr.sin_port = static_port;
+	static_addr.sin_port = htons(static_port);
 
 	sock = connect_cb((struct sockaddr *)&static_addr);
 

subsys/net/lib/nrf_cloud/mqtt/src/nrf_cloud_transport.c

@@ -934,7 +934,7 @@ int nct_connect(void)
 {
 	int err = 0;
 	const char *const host_name = NRF_CLOUD_HOSTNAME;
-	uint16_t port = htons(NRF_CLOUD_PORT);
+	uint16_t port = NRF_CLOUD_PORT;
 	struct zsock_addrinfo hints = {.ai_socktype = SOCK_STREAM};
 	int sock = nrf_cloud_connect_host(host_name, port, &hints, &nct_connect_host_cb);