Skip to content

Commit

Permalink
lib: nrf_cloud: change posix names to zsock
Browse files Browse the repository at this point in the history 
Change posix names to zsock in nrf_cloud lib.

Signed-off-by: Maximilian Deubel <[email protected]>
  • Loading branch information
@maxd-nordic @anangl
maxd-nordic authored and anangl committed Feb 5, 2025
1 parent 8855bc1 commit 0c23ae5
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
14 changes: 7 additions & 7 deletions subsys/net/lib/nrf_cloud/coap/src/nrf_cloud_coap_transport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ static int nrf_cloud_coap_connect_host_cb(struct sockaddr *const addr)
size_t addr_size;

LOG_DBG("Creating socket type IPPROTO_DTLS_1_2");
sock = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_DTLS_1_2);
sock = zsock_socket(addr->sa_family, SOCK_DGRAM, IPPROTO_DTLS_1_2);

if (sock < 0) {
LOG_DBG("Failed to create CoAP socket, errno: %d", errno);
Expand All @@ -677,7 +677,7 @@ static int nrf_cloud_coap_connect_host_cb(struct sockaddr *const addr)
addr_size = sizeof(struct sockaddr_in);
}

err = connect(sock, addr, addr_size);
err = zsock_connect(sock, addr, addr_size);
if (err) {
LOG_DBG("Connect failed, errno: %d", errno);
err = -ECONNREFUSED;
Expand All @@ -687,7 +687,7 @@ static int nrf_cloud_coap_connect_host_cb(struct sockaddr *const addr)
out:
if (err) {
if (sock >= 0) {
close(sock);
zsock_close(sock);
}
return err;
}
Expand All @@ -711,15 +711,15 @@ int nrf_cloud_coap_transport_connect(struct nrf_cloud_coap_client *const client)
/* Could not resume. Try with a full handshake. */
tmp = client->sock;
client->sock = client->cc.fd = -1;
close(tmp);
zsock_close(tmp);
}

client->authenticated = false;

const char *const host_name = CONFIG_NRF_CLOUD_COAP_SERVER_HOSTNAME;
uint16_t port = htons(CONFIG_NRF_CLOUD_COAP_SERVER_PORT);

struct addrinfo hints = {
struct zsock_addrinfo hints = {
.ai_socktype = SOCK_DGRAM
};
sock = nrf_cloud_connect_host(host_name, port, &hints, &nrf_cloud_coap_connect_host_cb);
Expand Down Expand Up @@ -758,7 +758,7 @@ int nrf_cloud_coap_transport_disconnect(struct nrf_cloud_coap_client *const clie
client->paused = false;
tmp = client->sock;
client->sock = client->cc.fd = -1;
err = close(tmp);
err = zsock_close(tmp);
k_mutex_unlock(&client->mutex);

return err;
Expand Down Expand Up @@ -873,7 +873,7 @@ int nrf_cloud_coap_transport_pause(struct nrf_cloud_coap_client *const client)
client->paused = false;
tmp = client->sock;
client->sock = client->cc.fd = -1;
close(tmp);
zsock_close(tmp);
LOG_DBG("Closed socket and marked as unauthenticated.");
}
} else {
Expand Down
24 changes: 12 additions & 12 deletions subsys/net/lib/nrf_cloud/coap/src/nrfc_dtls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static int get_device_ip_address(uint8_t *d4_addr)
LOG_ERR("Could not get IP addr: %d", err);
return err;
}
err = inet_pton(AF_INET, buf, d4_addr);
err = zsock_inet_pton(AF_INET, buf, d4_addr);
if (err == 1) {
return 0;
}
Expand Down Expand Up @@ -81,7 +81,7 @@ int nrfc_dtls_setup(int sock)
LOG_DBG("Setting socket options:");

LOG_DBG(" hostname: %s", CONFIG_NRF_CLOUD_COAP_SERVER_HOSTNAME);
err = setsockopt(sock, SOL_TLS, TLS_HOSTNAME, CONFIG_NRF_CLOUD_COAP_SERVER_HOSTNAME,
err = zsock_setsockopt(sock, SOL_TLS, TLS_HOSTNAME, CONFIG_NRF_CLOUD_COAP_SERVER_HOSTNAME,
sizeof(CONFIG_NRF_CLOUD_COAP_SERVER_HOSTNAME));
if (err) {
LOG_ERR("Error setting hostname: %d", -errno);
Expand All @@ -91,7 +91,7 @@ int nrfc_dtls_setup(int sock)
sectag = nrf_cloud_sec_tag_get();
LOG_DBG(" sectag: %d", sectag);

err = setsockopt(sock, SOL_TLS, TLS_SEC_TAG_LIST, &sectag, sizeof(sectag));
err = zsock_setsockopt(sock, SOL_TLS, TLS_SEC_TAG_LIST, &sectag, sizeof(sectag));
if (err) {
LOG_ERR("Error setting sectag list: %d", -errno);
return -errno;
Expand All @@ -100,7 +100,7 @@ int nrfc_dtls_setup(int sock)
int cid_option = TLS_DTLS_CID_SUPPORTED;

LOG_DBG(" Enable connection id");
err = setsockopt(sock, SOL_TLS, TLS_DTLS_CID, &cid_option, sizeof(cid_option));
err = zsock_setsockopt(sock, SOL_TLS, TLS_DTLS_CID, &cid_option, sizeof(cid_option));
if (!err) {
cid_supported = true;
} else if ((err != EOPNOTSUPP) && (err != EINVAL)) {
Expand All @@ -114,7 +114,7 @@ int nrfc_dtls_setup(int sock)
int timeout = TLS_DTLS_HANDSHAKE_TIMEO_123S;

LOG_DBG(" Set handshake timeout %d", timeout);
err = setsockopt(sock, SOL_TLS, TLS_DTLS_HANDSHAKE_TIMEO,
err = zsock_setsockopt(sock, SOL_TLS, TLS_DTLS_HANDSHAKE_TIMEO,
&timeout, sizeof(timeout));
if (!err) {
} else if ((err != EOPNOTSUPP) || (err != EINVAL)) {
Expand All @@ -124,7 +124,7 @@ int nrfc_dtls_setup(int sock)
int verify = TLS_PEER_VERIFY_REQUIRED;

LOG_DBG(" Peer verify: %d", verify);
err = setsockopt(sock, SOL_TLS, TLS_PEER_VERIFY, &verify, sizeof(verify));
err = zsock_setsockopt(sock, SOL_TLS, TLS_PEER_VERIFY, &verify, sizeof(verify));
if (err) {
LOG_ERR("Failed to setup peer verification, errno %d", -errno);
return -errno;
Expand All @@ -133,15 +133,15 @@ int nrfc_dtls_setup(int sock)
int session_cache = TLS_SESSION_CACHE_ENABLED;

LOG_DBG(" TLS session cache: %d", session_cache);
err = setsockopt(sock, SOL_TLS, TLS_SESSION_CACHE, &session_cache, sizeof(session_cache));
err = zsock_setsockopt(sock, SOL_TLS, TLS_SESSION_CACHE, &session_cache, sizeof(session_cache));
if (err) {
LOG_ERR("Failed to enable session cache, errno: %d", -errno);
err = -errno;
}

keepopen_supported = false;
if (IS_ENABLED(CONFIG_NRF_CLOUD_COAP_KEEPOPEN)) {
err = setsockopt(sock, SOL_SOCKET, SO_KEEPOPEN, &(int){1}, sizeof(int));
err = zsock_setsockopt(sock, SOL_SOCKET, SO_KEEPOPEN, &(int){1}, sizeof(int));
if (err) {
/* Either not supported or unusable due to unknown error. */
err = 0;
Expand All @@ -158,7 +158,7 @@ int nrfc_dtls_session_save(int sock)
int err;

LOG_DBG("Save DTLS CID session");
err = setsockopt(sock, SOL_TLS, TLS_DTLS_CONN_SAVE, &(int){0}, sizeof(int));
err = zsock_setsockopt(sock, SOL_TLS, TLS_DTLS_CONN_SAVE, &(int){0}, sizeof(int));
if (err) {
LOG_DBG("Failed to save DTLS CID session, errno %d", -errno);
err = -errno;
Expand All @@ -171,7 +171,7 @@ int nrfc_dtls_session_load(int sock)
int err;

LOG_DBG("Load DTLS CID session");
err = setsockopt(sock, SOL_TLS, TLS_DTLS_CONN_LOAD, &(int){1}, sizeof(int));
err = zsock_setsockopt(sock, SOL_TLS, TLS_DTLS_CONN_LOAD, &(int){1}, sizeof(int));
if (err) {
LOG_DBG("Failed to load DTLS CID session, errno %d", -errno);
err = -errno;
Expand All @@ -192,7 +192,7 @@ bool nrfc_dtls_cid_is_active(int sock)

#if defined(CONFIG_NRF_CLOUD_COAP_LOG_LEVEL_DBG)

err = getsockopt(sock, SOL_TLS, TLS_DTLS_HANDSHAKE_STATUS, &status, &len);
err = zsock_getsockopt(sock, SOL_TLS, TLS_DTLS_HANDSHAKE_STATUS, &status, &len);
if (!err) {
if (len > 0) {
if (status == TLS_DTLS_HANDSHAKE_STATUS_FULL) {
Expand All @@ -212,7 +212,7 @@ bool nrfc_dtls_cid_is_active(int sock)
#endif /* CONFIG_NRF_CLOUD_COAP_LOG_LEVEL_DBG */

len = sizeof(status);
err = getsockopt(sock, SOL_TLS, TLS_DTLS_CID_STATUS, &status, &len);
err = zsock_getsockopt(sock, SOL_TLS, TLS_DTLS_CID_STATUS, &status, &len);
if (!err) {
if (len > 0) {
switch (status) {
Expand Down
2 changes: 1 addition & 1 deletion subsys/net/lib/nrf_cloud/src/nrf_cloud_dns.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ int nrf_cloud_connect_host(const char *hostname, uint16_t port,
LOG_DBG("Trying static IPv4 address: %s, port: %d",
CONFIG_NRF_CLOUD_STATIC_IPV4_ADDR, port);

inet_pton(AF_INET, CONFIG_NRF_CLOUD_STATIC_IPV4_ADDR, &(static_addr.sin_addr));
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;

Expand Down

0 comments on commit 0c23ae5

Please sign in to comment.