From 2d255eaafa9345bad9e474f7d5b1c6f6cd94537c Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Sat, 25 May 2024 10:24:50 +0200 Subject: [PATCH] samples: Don't use deprecated NET_SOCKETS_POSIX_NAMES Switch to POSIX_API instead. Fix build issues corresponding to this change. Signed-off-by: Robert Lubos --- applications/asset_tracker_v2/boards/native_sim.conf | 2 +- .../asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt | 2 +- samples/cellular/at_client/prj.conf | 2 +- samples/cellular/ciphersuites/prj.conf | 2 +- samples/cellular/gnss/prj.conf | 2 +- samples/cellular/lwm2m_carrier/prj.conf | 2 +- samples/cellular/nrf_cloud_multi_service/overlay_coap.conf | 2 +- .../cellular/nrf_cloud_multi_service/overlay_min_coap.conf | 2 +- .../overlay_nrf7002ek_wifi_coap_no_lte.conf | 2 +- samples/cellular/nrf_cloud_rest_cell_location/prj.conf | 2 +- samples/cellular/nrf_cloud_rest_device_message/prj.conf | 2 +- samples/cellular/nrf_cloud_rest_fota/prj.conf | 2 +- samples/cellular/nrf_provisioning/prj.conf | 2 +- samples/crypto/psa_tls/prj.conf | 2 +- samples/net/aws_iot/boards/native_sim.conf | 2 +- samples/net/aws_iot/src/main.c | 4 ++-- samples/net/azure_iot_hub/boards/native_sim.conf | 2 +- samples/net/coap_client/prj.conf | 2 +- samples/net/download/prj.conf | 2 +- samples/net/mqtt/prj.conf | 2 +- samples/net/udp/boards/native_sim.conf | 2 +- samples/openthread/coap_client/prj.conf | 2 +- samples/openthread/coap_server/prj.conf | 2 +- samples/wifi/monitor/prj.conf | 2 +- samples/wifi/wfa_qt_app/prj.conf | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/applications/asset_tracker_v2/boards/native_sim.conf b/applications/asset_tracker_v2/boards/native_sim.conf index 05e817b38fe..468ffc505eb 100644 --- a/applications/asset_tracker_v2/boards/native_sim.conf +++ b/applications/asset_tracker_v2/boards/native_sim.conf @@ -66,7 +66,7 @@ CONFIG_NET_NATIVE=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_SOCKETS_OFFLOAD=n -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_PKT_RX_COUNT=32 CONFIG_NET_PKT_TX_COUNT=32 diff --git a/applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt b/applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt index 857fc71c8f1..37bfb33a63c 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt +++ b/applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt @@ -57,7 +57,7 @@ target_compile_options(app PRIVATE -DCONFIG_LWM2M_ENGINE_VALIDATION_BUFFER_SIZE=128 -DCONFIG_LWM2M_ENGINE_DEFAULT_LIFETIME=60 -DCONFIG_LWM2M_INTEGRATION_MODEM_MODE_REQUEST_RETRY_SECONDS=10 - -DCONFIG_NET_SOCKETS_POSIX_NAMES=1 + -DCONFIG_POSIX_API=y -DCONFIG_LWM2M_CLIENT_UTILS_SECURITY_OBJ_SUPPORT=y -DCONFIG_LWM2M_CLIENT_UTILS_FIRMWARE_UPDATE_OBJ_SUPPORT=y -DCONFIG_CLOUD_CLIENT_ID_USE_CUSTOM=y diff --git a/samples/cellular/at_client/prj.conf b/samples/cellular/at_client/prj.conf index b8051c7df72..36656414bfa 100644 --- a/samples/cellular/at_client/prj.conf +++ b/samples/cellular/at_client/prj.conf @@ -11,7 +11,7 @@ CONFIG_NETWORKING=y CONFIG_NET_NATIVE=n CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_OFFLOAD=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y # Modem library CONFIG_NRF_MODEM_LIB=y diff --git a/samples/cellular/ciphersuites/prj.conf b/samples/cellular/ciphersuites/prj.conf index c02d6aec937..a6316f56983 100644 --- a/samples/cellular/ciphersuites/prj.conf +++ b/samples/cellular/ciphersuites/prj.conf @@ -2,7 +2,7 @@ CONFIG_NRF_MODEM_LIB=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n CONFIG_HEAP_MEM_POOL_SIZE=1024 diff --git a/samples/cellular/gnss/prj.conf b/samples/cellular/gnss/prj.conf index 2337842d3c5..a1d0670cf91 100644 --- a/samples/cellular/gnss/prj.conf +++ b/samples/cellular/gnss/prj.conf @@ -34,7 +34,7 @@ CONFIG_AT_HOST_LIBRARY=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS_OFFLOAD=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y # Disable native network stack to save some memory CONFIG_NET_NATIVE=n diff --git a/samples/cellular/lwm2m_carrier/prj.conf b/samples/cellular/lwm2m_carrier/prj.conf index e947d96d833..82e5c8fcb00 100644 --- a/samples/cellular/lwm2m_carrier/prj.conf +++ b/samples/cellular/lwm2m_carrier/prj.conf @@ -48,7 +48,7 @@ CONFIG_MAIN_STACK_SIZE=1536 CONFIG_NETWORKING=y CONFIG_NET_NATIVE=n CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_OFFLOAD=y # Allow the non-secure application to request reboot diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_coap.conf b/samples/cellular/nrf_cloud_multi_service/overlay_coap.conf index 9147a1d7a4c..dcd39299c70 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay_coap.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay_coap.conf @@ -38,7 +38,7 @@ CONFIG_MODEM_INFO_ADD_SIM_ICCID=n CONFIG_MODEM_INFO_ADD_SIM_IMSI=n # Network -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_TLS_SET_MAX_FRAGMENT_LENGTH=y CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY=40 diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_min_coap.conf b/samples/cellular/nrf_cloud_multi_service/overlay_min_coap.conf index 114e6524907..d8eb7f194b9 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay_min_coap.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay_min_coap.conf @@ -65,7 +65,7 @@ CONFIG_MODEM_KEY_MGMT=y CONFIG_MODEM_JWT=y # Network -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_TLS_SET_MAX_FRAGMENT_LENGTH=y CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY=40 diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_nrf7002ek_wifi_coap_no_lte.conf b/samples/cellular/nrf_cloud_multi_service/overlay_nrf7002ek_wifi_coap_no_lte.conf index 6c5b7cce798..19a0c87fd17 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay_nrf7002ek_wifi_coap_no_lte.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay_nrf7002ek_wifi_coap_no_lte.conf @@ -214,7 +214,7 @@ CONFIG_MODEM_INFO_ADD_SIM_ICCID=n CONFIG_MODEM_INFO_ADD_SIM_IMSI=n # Network -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_TLS_SET_MAX_FRAGMENT_LENGTH=y CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY=40 diff --git a/samples/cellular/nrf_cloud_rest_cell_location/prj.conf b/samples/cellular/nrf_cloud_rest_cell_location/prj.conf index a222d1fb33e..4d9066f189c 100644 --- a/samples/cellular/nrf_cloud_rest_cell_location/prj.conf +++ b/samples/cellular/nrf_cloud_rest_cell_location/prj.conf @@ -9,7 +9,7 @@ CONFIG_NRF_CLOUD_REST_AUTOGEN_JWT=y CONFIG_MODEM_JWT=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n CONFIG_REST_CLIENT_LOG_LEVEL_ERR=y CONFIG_NRF_CLOUD_CHECK_CREDENTIALS=y diff --git a/samples/cellular/nrf_cloud_rest_device_message/prj.conf b/samples/cellular/nrf_cloud_rest_device_message/prj.conf index f77cd631c68..365131bead6 100644 --- a/samples/cellular/nrf_cloud_rest_device_message/prj.conf +++ b/samples/cellular/nrf_cloud_rest_device_message/prj.conf @@ -11,7 +11,7 @@ CONFIG_NRF_CLOUD_REST=y CONFIG_NRF_CLOUD_CLIENT_ID_SRC_IMEI=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n CONFIG_NRF_CLOUD_CHECK_CREDENTIALS=y diff --git a/samples/cellular/nrf_cloud_rest_fota/prj.conf b/samples/cellular/nrf_cloud_rest_fota/prj.conf index 73ce15ef526..c0a47f95d99 100644 --- a/samples/cellular/nrf_cloud_rest_fota/prj.conf +++ b/samples/cellular/nrf_cloud_rest_fota/prj.conf @@ -8,7 +8,7 @@ CONFIG_NRF_CLOUD_CLIENT_ID_SRC_IMEI=y CONFIG_MODEM_JWT=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n CONFIG_NRF_CLOUD_CHECK_CREDENTIALS=y diff --git a/samples/cellular/nrf_provisioning/prj.conf b/samples/cellular/nrf_provisioning/prj.conf index 852f6349ce0..89f90da3914 100644 --- a/samples/cellular/nrf_provisioning/prj.conf +++ b/samples/cellular/nrf_provisioning/prj.conf @@ -37,7 +37,7 @@ CONFIG_NRF_PROVISIONING_RX_BUF_SZ=2048 # Networking CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n # MCUBOOT diff --git a/samples/crypto/psa_tls/prj.conf b/samples/crypto/psa_tls/prj.conf index 8459f7ff633..6721cf772b0 100644 --- a/samples/crypto/psa_tls/prj.conf +++ b/samples/crypto/psa_tls/prj.conf @@ -26,7 +26,7 @@ CONFIG_NET_TCP_ISN_RFC6528=n CONFIG_NET_CONFIG_SETTINGS=y CONFIG_NET_CONFIG_NEED_IPV6=n CONFIG_NET_CONFIG_NEED_IPV4=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_CONNECTION_MANAGER=n CONFIG_NET_CONTEXT_NET_PKT_POOL=y diff --git a/samples/net/aws_iot/boards/native_sim.conf b/samples/net/aws_iot/boards/native_sim.conf index 78208df3c21..a95d63647d5 100644 --- a/samples/net/aws_iot/boards/native_sim.conf +++ b/samples/net/aws_iot/boards/native_sim.conf @@ -8,7 +8,7 @@ CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_PKT_RX_COUNT=32 CONFIG_NET_PKT_TX_COUNT=32 diff --git a/samples/net/aws_iot/src/main.c b/samples/net/aws_iot/src/main.c index fca6d9c13d3..4ea49732b06 100644 --- a/samples/net/aws_iot/src/main.c +++ b/samples/net/aws_iot/src/main.c @@ -62,12 +62,12 @@ static int app_topics_subscribe(void) static const struct mqtt_topic topic_list[] = { { .topic.utf8 = MY_CUSTOM_TOPIC_1, - .topic.size = strlen(MY_CUSTOM_TOPIC_1), + .topic.size = sizeof(MY_CUSTOM_TOPIC_1) - 1, .qos = MQTT_QOS_1_AT_LEAST_ONCE, }, { .topic.utf8 = MY_CUSTOM_TOPIC_2, - .topic.size = strlen(MY_CUSTOM_TOPIC_2), + .topic.size = sizeof(MY_CUSTOM_TOPIC_2) - 1, .qos = MQTT_QOS_1_AT_LEAST_ONCE, } }; diff --git a/samples/net/azure_iot_hub/boards/native_sim.conf b/samples/net/azure_iot_hub/boards/native_sim.conf index c56923443d0..523e8a840c5 100644 --- a/samples/net/azure_iot_hub/boards/native_sim.conf +++ b/samples/net/azure_iot_hub/boards/native_sim.conf @@ -11,7 +11,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=1024 CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_PKT_RX_COUNT=32 CONFIG_NET_PKT_TX_COUNT=32 diff --git a/samples/net/coap_client/prj.conf b/samples/net/coap_client/prj.conf index 3da8837a502..e1c4f3e5b9b 100644 --- a/samples/net/coap_client/prj.conf +++ b/samples/net/coap_client/prj.conf @@ -13,7 +13,7 @@ CONFIG_MAIN_STACK_SIZE=4096 # Networking CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=y CONFIG_NET_UDP=y CONFIG_NET_IPV4=y diff --git a/samples/net/download/prj.conf b/samples/net/download/prj.conf index 19758ba941e..0801a70152c 100644 --- a/samples/net/download/prj.conf +++ b/samples/net/download/prj.conf @@ -11,6 +11,6 @@ CONFIG_DOWNLOAD_CLIENT_STACK_SIZE=4096 CONFIG_NETWORKING=y CONFIG_NET_CONNECTION_MANAGER=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_IPV4=y CONFIG_HEAP_MEM_POOL_SIZE=1024 diff --git a/samples/net/mqtt/prj.conf b/samples/net/mqtt/prj.conf index 422e1b18d95..9b29f9f4c1d 100644 --- a/samples/net/mqtt/prj.conf +++ b/samples/net/mqtt/prj.conf @@ -17,7 +17,7 @@ CONFIG_LOG=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS_OFFLOAD=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_IPV4=y CONFIG_NET_TCP=y CONFIG_NET_NATIVE=y diff --git a/samples/net/udp/boards/native_sim.conf b/samples/net/udp/boards/native_sim.conf index c6d7f6030cc..3a64c0b7170 100644 --- a/samples/net/udp/boards/native_sim.conf +++ b/samples/net/udp/boards/native_sim.conf @@ -8,7 +8,7 @@ CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_PKT_RX_COUNT=32 CONFIG_NET_PKT_TX_COUNT=32 diff --git a/samples/openthread/coap_client/prj.conf b/samples/openthread/coap_client/prj.conf index 66b1cdbf07b..91af70c837e 100644 --- a/samples/openthread/coap_client/prj.conf +++ b/samples/openthread/coap_client/prj.conf @@ -28,7 +28,7 @@ CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 # Network sockets CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_POLL_MAX=4 # Same network Master Key for client and server diff --git a/samples/openthread/coap_server/prj.conf b/samples/openthread/coap_server/prj.conf index 2abb97e10aa..04c0b360d4c 100644 --- a/samples/openthread/coap_server/prj.conf +++ b/samples/openthread/coap_server/prj.conf @@ -21,7 +21,7 @@ CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 # Network sockets CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_POLL_MAX=4 # Same network Master Key for client and server diff --git a/samples/wifi/monitor/prj.conf b/samples/wifi/monitor/prj.conf index 608e38b6926..1e6270728cd 100644 --- a/samples/wifi/monitor/prj.conf +++ b/samples/wifi/monitor/prj.conf @@ -52,7 +52,7 @@ CONFIG_POSIX_API=y # environment. CONFIG_NET_MGMT_EVENT_QUEUE_TIMEOUT=5000 -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_CONTEXT_RCVTIMEO=y CONFIG_NET_MGMT=y CONFIG_NET_MGMT_EVENT=y diff --git a/samples/wifi/wfa_qt_app/prj.conf b/samples/wifi/wfa_qt_app/prj.conf index 268983e5b17..bba6d523ab5 100644 --- a/samples/wifi/wfa_qt_app/prj.conf +++ b/samples/wifi/wfa_qt_app/prj.conf @@ -98,7 +98,7 @@ CONFIG_SETTINGS_NVS=y # design in net_mgmt. So, use a typical number of networks in a crowded # environment as the queue depth. CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=150 -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_SHELL_BACKEND_DUMMY=y