diff --git a/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA index ec521b717b8..657c14480e7 100644 --- a/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA +++ b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA @@ -16,7 +16,7 @@ config NUM_IRQS int default 48 -config NET_APP_IEEE802154_DEV_NAME +config NET_CONFIG_IEEE802154_DEV_NAME default IEEE802154_NRF5_DRV_NAME endif # SOC_NRF52840_QIAA diff --git a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 index d702e54b8a0..7f7195f8ebb 100644 --- a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 +++ b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 @@ -95,7 +95,7 @@ endif # NET_L2_OPENTHREAD config IEEE802154_KW41Z def_bool y -config NET_APP_IEEE802154_DEV_NAME +config NET_CONFIG_IEEE802154_DEV_NAME default IEEE802154_KW41Z_DRV_NAME endif # NETWORKING diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000 b/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000 index 2381c8f5279..de3196123c9 100644 --- a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000 +++ b/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000 @@ -11,14 +11,14 @@ if SOC_QUARK_SE_C1000 config SOC default "quark_se_c1000" -if IEEE802154 && NET_APP_SETTINGS +if IEEE802154 && NET_CONFIG_SETTINGS config IEEE802154_CC2520 def_bool y -config NET_APP_IEEE802154_DEV_NAME +config NET_CONFIG_IEEE802154_DEV_NAME default IEEE802154_CC2520_DRV_NAME -endif # IEEE802154 && NET_APP_SETTINGS +endif # IEEE802154 && NET_CONFIG_SETTINGS endif diff --git a/doc/subsystems/networking/net-app-api.rst b/doc/subsystems/networking/net-app-api.rst index 63a6f6ef375..e9962b8d661 100644 --- a/doc/subsystems/networking/net-app-api.rst +++ b/doc/subsystems/networking/net-app-api.rst @@ -34,32 +34,32 @@ The net-app API provides a :cpp:func:`net_app_init()` function that can configure the networking subsystem for the application. The following configuration options control this configuration: -:option:`CONFIG_NET_APP_AUTO_INIT` +:option:`CONFIG_NET_CONFIG_AUTO_INIT` automatically configures the system according to other configuration options. The user does not need to call :cpp:func:`net_app_init()` in this case as that function will be automatically called when the system boots. This option is enabled by default. -:option:`CONFIG_NET_APP_INIT_TIMEOUT` +:option:`CONFIG_NET_CONFIG_INIT_TIMEOUT` specifies how long to wait for the network configuration during the system boot. For example, if DHCPv4 is enabled, and if the IPv4 address discovery takes too long or the DHCPv4 server is not found, the system will resume booting after this number of seconds. -:option:`CONFIG_NET_APP_NEED_IPV6` +:option:`CONFIG_NET_CONFIG_NEED_IPV6` specifies that the application needs IPv6 connectivity. The :cpp:func:`net_app_init()` function will wait until it is able to setup an IPv6 address for the system before continuing. This means that the IPv6 duplicate address detection (DAD) has finished and the system has properly setup the IPv6 address. -:option:`CONFIG_NET_APP_NEED_IPV6_ROUTER` +:option:`CONFIG_NET_CONFIG_NEED_IPV6_ROUTER` specifies that the application needs IPv6 router connectivity; i.e., it needs access to external networks (such as the Internet). The :cpp:func:`net_app_init()` function will wait until it receives a router advertisement (RA) message from the IPv6 router before continuing. -:option:`CONFIG_NET_APP_NEED_IPV4` +:option:`CONFIG_NET_CONFIG_NEED_IPV4` specifies that the application needs IPv4 connectivity. The :cpp:func:`net_app_init()` function will wait, unless a static IP address is configured, until it is able to setup an IPv4 address for the network @@ -70,12 +70,12 @@ Setup Various system level network configuration options can be added to the project configuration file. These settings are enabled by the -:option:`CONFIG_NET_APP_SETTINGS` configuration option. This option is disabled +:option:`CONFIG_NET_CONFIG_SETTINGS` configuration option. This option is disabled by default, and other net-app options may also be disabled by default if generic support for the networking feature is disabled. For example, the IPv6 net-app options are only available if generic IPv6 support is enabled. -:option:`CONFIG_NET_APP_MY_IPV6_ADDR` +:option:`CONFIG_NET_CONFIG_MY_IPV6_ADDR` This option sets a static IPv6 address for the system. This is typically only useful in device testing as normally the system should use SLAAC (IPv6 Stateless Address Auto Configuration), which is enabled by default in the @@ -83,17 +83,17 @@ net-app options are only available if generic IPv6 support is enabled. controlled by the :option:`CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT` configuration option. -:option:`CONFIG_NET_APP_PEER_IPV6_ADDR` +:option:`CONFIG_NET_CONFIG_PEER_IPV6_ADDR` This option specifies what is the peer device IPv6 address. This is only useful when testing client/server type applications. This peer address is typically used as a parameter when calling :cpp:func:`net_app_connect()`. -:option:`CONFIG_NET_APP_MY_IPV4_ADDR` +:option:`CONFIG_NET_CONFIG_MY_IPV4_ADDR` This option sets a static IPv4 address for the system. This is typically useful only in device testing as normally the system should use DHCPv4 to discover the IPv4 address. -:option:`CONFIG_NET_APP_PEER_IPV4_ADDR` +:option:`CONFIG_NET_CONFIG_PEER_IPV4_ADDR` This option specifies what is the peer device IPv4 address. This is only useful when testing client/server type applications. This peer address is typically used as a parameter when connecting to other device. @@ -101,30 +101,30 @@ net-app options are only available if generic IPv6 support is enabled. The following options are only available if IEEE 802.15.4 wireless network technology support is enabled. -:option:`CONFIG_NET_APP_IEEE802154_DEV_NAME` +:option:`CONFIG_NET_CONFIG_IEEE802154_DEV_NAME` This option specifies the name of the IEEE 802.15.4 device. -:option:`CONFIG_NET_APP_IEEE802154_PAN_ID` +:option:`CONFIG_NET_CONFIG_IEEE802154_PAN_ID` This option specifies the used PAN identifier. Note that the PAN id can be changed at runtime if needed. -:option:`CONFIG_NET_APP_IEEE802154_CHANNEL` +:option:`CONFIG_NET_CONFIG_IEEE802154_CHANNEL` This option specifies the used radio channel. Note that the used channel can be changed at runtime if needed. -:option:`CONFIG_NET_APP_IEEE802154_RADIO_TX_POWER` +:option:`CONFIG_NET_CONFIG_IEEE802154_RADIO_TX_POWER` This option specifies the initial radio TX power level. The TX power level can be changed at runtime if needed. -:option:`CONFIG_NET_APP_IEEE802154_SECURITY_KEY` +:option:`CONFIG_NET_CONFIG_IEEE802154_SECURITY_KEY` This option specifies the initially used security key. The security key can be changed at runtime if needed. -:option:`CONFIG_NET_APP_IEEE802154_SECURITY_KEY_MODE` +:option:`CONFIG_NET_CONFIG_IEEE802154_SECURITY_KEY_MODE` This option specifies the initially used security key mode. The security key mode can be changed at runtime if needed. -:option:`CONFIG_NET_APP_IEEE802154_SECURITY_LEVEL` +:option:`CONFIG_NET_CONFIG_IEEE802154_SECURITY_LEVEL` This option specifies the initially used security level. The used security level can be changed at runtime if needed. diff --git a/doc/subsystems/networking/qemu_setup.rst b/doc/subsystems/networking/qemu_setup.rst index 01e12350fe3..32b878e7f3d 100644 --- a/doc/subsystems/networking/qemu_setup.rst +++ b/doc/subsystems/networking/qemu_setup.rst @@ -149,8 +149,8 @@ board is connected to a dedicated router, it should not be needed. To access the internet from a Zephyr application using IPv4, a gateway should be set via DHCP or configured manually. For applications using the "Settings" part of :ref:`net_app_api` -facility (with the config option :option:`CONFIG_NET_APP_SETTINGS` enabled), -set the :option:`CONFIG_NET_APP_MY_IPV4_GW` option to the IP address +facility (with the config option :option:`CONFIG_NET_CONFIG_SETTINGS` enabled), +set the :option:`CONFIG_NET_CONFIG_MY_IPV4_GW` option to the IP address of the gateway. For apps not using the :ref:`net_app_api` facility, set up the gateway by calling the :c:func:`net_if_ipv4_set_gw` at runtime. diff --git a/samples/bluetooth/ipsp/prj.conf b/samples/bluetooth/ipsp/prj.conf index d3436836402..63e1a020c8b 100644 --- a/samples/bluetooth/ipsp/prj.conf +++ b/samples/bluetooth/ipsp/prj.conf @@ -20,9 +20,9 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2 CONFIG_NET_MAX_CONTEXTS=6 -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_BT_NODE=y CONFIG_SYS_LOG=y diff --git a/samples/bluetooth/ipsp/prj_dbg.conf b/samples/bluetooth/ipsp/prj_dbg.conf index 9f5d0835100..59cf076a6c9 100644 --- a/samples/bluetooth/ipsp/prj_dbg.conf +++ b/samples/bluetooth/ipsp/prj_dbg.conf @@ -27,7 +27,7 @@ CONFIG_NET_MAX_CONTEXTS=6 CONFIG_NET_SHELL=y CONFIG_BT_SHELL=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_BT_NODE=y diff --git a/samples/bluetooth/ipsp/prj_zep1656.conf b/samples/bluetooth/ipsp/prj_zep1656.conf index 5dade2d323a..d4edf26dae1 100644 --- a/samples/bluetooth/ipsp/prj_zep1656.conf +++ b/samples/bluetooth/ipsp/prj_zep1656.conf @@ -21,9 +21,9 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2 CONFIG_NET_MAX_CONTEXTS=6 -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_BT_NODE=y CONFIG_SYS_LOG=y diff --git a/samples/bluetooth/ipsp/src/main.c b/samples/bluetooth/ipsp/src/main.c index 415870bbf2d..110aee8e034 100644 --- a/samples/bluetooth/ipsp/src/main.c +++ b/samples/bluetooth/ipsp/src/main.c @@ -69,10 +69,10 @@ static inline void init_app(void) k_sem_init(&quit_lock, 0, UINT_MAX); if (net_addr_pton(AF_INET6, - CONFIG_NET_APP_MY_IPV6_ADDR, + CONFIG_NET_CONFIG_MY_IPV6_ADDR, &in6addr_my) < 0) { SYS_LOG_ERR("Invalid IPv6 address %s", - CONFIG_NET_APP_MY_IPV6_ADDR); + CONFIG_NET_CONFIG_MY_IPV6_ADDR); } do { diff --git a/samples/net/coap_client/prj.conf b/samples/net/coap_client/prj.conf index a25bb4cdb77..4744f30cccd 100644 --- a/samples/net/coap_client/prj.conf +++ b/samples/net/coap_client/prj.conf @@ -6,11 +6,11 @@ CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_COAP=y -CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_CLIENT=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y diff --git a/samples/net/coap_client/prj_bt.conf b/samples/net/coap_client/prj_bt.conf index 9bcb5d6e073..27f2399ea4f 100644 --- a/samples/net/coap_client/prj_bt.conf +++ b/samples/net/coap_client/prj_bt.conf @@ -16,6 +16,6 @@ CONFIG_NET_MGMT_EVENT=y CONFIG_NET_SHELL=y CONFIG_NET_L2_BT_SHELL=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" diff --git a/samples/net/coap_client/src/coap-client.c b/samples/net/coap_client/src/coap-client.c index 92c59e8c685..c548ddcf5ae 100644 --- a/samples/net/coap_client/src/coap-client.c +++ b/samples/net/coap_client/src/coap-client.c @@ -146,17 +146,17 @@ static int init_app(void) struct sockaddr_in6 my_addr; int r; - if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR, + if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &my_addr.sin6_addr)) { NET_ERR("Invalid my IPv6 address: %s", - CONFIG_NET_APP_MY_IPV6_ADDR); + CONFIG_NET_CONFIG_MY_IPV6_ADDR); return -1; } - if (net_addr_pton(AF_INET6, CONFIG_NET_APP_PEER_IPV6_ADDR, + if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &peer_addr.sin6_addr)) { NET_ERR("Invalid peer IPv6 address: %s", - CONFIG_NET_APP_PEER_IPV6_ADDR); + CONFIG_NET_CONFIG_PEER_IPV6_ADDR); return -1; } diff --git a/samples/net/coap_server/prj.conf b/samples/net/coap_server/prj.conf index 31952286305..3b1b6e7c361 100644 --- a/samples/net/coap_server/prj.conf +++ b/samples/net/coap_server/prj.conf @@ -5,10 +5,10 @@ CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_COAP=y -CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_SERVER=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5 CONFIG_NET_LOG=y diff --git a/samples/net/coap_server/prj_bt.conf b/samples/net/coap_server/prj_bt.conf index 0a214160fc9..4e0a46e437e 100644 --- a/samples/net/coap_server/prj_bt.conf +++ b/samples/net/coap_server/prj_bt.conf @@ -11,7 +11,7 @@ CONFIG_NET_LOG=y CONFIG_NET_UDP=y CONFIG_NET_L2_BT=y CONFIG_NET_DEBUG_L2_BT=y -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_BT_NODE=y CONFIG_SYS_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_ENTROPY_GENERATOR=y diff --git a/samples/net/coap_server/prj_cc2520.conf b/samples/net/coap_server/prj_cc2520.conf index b76bcaa07d8..31051494c7d 100644 --- a/samples/net/coap_server/prj_cc2520.conf +++ b/samples/net/coap_server/prj_cc2520.conf @@ -6,7 +6,7 @@ CONFIG_NET_UDP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_IEEE802154_CC2520=y CONFIG_COAP=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_IEEE802154_CHANNEL=20 -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_IEEE802154_CHANNEL=20 +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" diff --git a/samples/net/coap_server/src/coap-server.c b/samples/net/coap_server/src/coap-server.c index 10e6e81b94c..ccf32bcbf32 100644 --- a/samples/net/coap_server/src/coap-server.c +++ b/samples/net/coap_server/src/coap-server.c @@ -1305,12 +1305,12 @@ static bool join_coap_multicast_group(void) return false; } -#if defined(CONFIG_NET_APP_SETTINGS) +#if defined(CONFIG_NET_CONFIG_SETTINGS) if (net_addr_pton(AF_INET6, - CONFIG_NET_APP_MY_IPV6_ADDR, + CONFIG_NET_CONFIG_MY_IPV6_ADDR, &my_addr) < 0) { NET_ERR("Invalid IPv6 address %s", - CONFIG_NET_APP_MY_IPV6_ADDR); + CONFIG_NET_CONFIG_MY_IPV6_ADDR); } #endif diff --git a/samples/net/coaps_client/prj.conf b/samples/net/coaps_client/prj.conf index 5c1880d00f1..6cfcb87f591 100644 --- a/samples/net/coaps_client/prj.conf +++ b/samples/net/coaps_client/prj.conf @@ -23,6 +23,6 @@ CONFIG_MBEDTLS_CFG_FILE="config-coap.h" CONFIG_COAP=y CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=256 -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::3" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::3" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1" diff --git a/samples/net/coaps_client/src/coaps_client.c b/samples/net/coaps_client/src/coaps_client.c index 12feed7cd76..1811c4f6296 100644 --- a/samples/net/coaps_client/src/coaps_client.c +++ b/samples/net/coaps_client/src/coaps_client.c @@ -412,12 +412,12 @@ static struct k_thread thread_data; static inline int init_app(void) { -#if defined(CONFIG_NET_APP_MY_IPV6_ADDR) +#if defined(CONFIG_NET_CONFIG_MY_IPV6_ADDR) if (net_addr_pton(AF_INET6, - CONFIG_NET_APP_MY_IPV6_ADDR, + CONFIG_NET_CONFIG_MY_IPV6_ADDR, (struct sockaddr *)&client_addr) < 0) { mbedtls_printf("Invalid IPv6 address %s", - CONFIG_NET_APP_MY_IPV6_ADDR); + CONFIG_NET_CONFIG_MY_IPV6_ADDR); } #endif if (!net_if_ipv6_addr_add(net_if_get_default(), &client_addr, diff --git a/samples/net/coaps_client/src/udp.c b/samples/net/coaps_client/src/udp.c index e16efad7cf8..9acf454c942 100644 --- a/samples/net/coaps_client/src/udp.c +++ b/samples/net/coaps_client/src/udp.c @@ -185,12 +185,12 @@ int udp_init(struct udp_context *ctx) ctx->remaining = 0; ctx->net_ctx = udp_ctx; -#if defined(CONFIG_NET_APP_PEER_IPV6_ADDR) +#if defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR) if (net_addr_pton(AF_INET6, - CONFIG_NET_APP_PEER_IPV6_ADDR, + CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &server_addr) < 0) { printk("Invalid peer IPv6 address %s", - CONFIG_NET_APP_PEER_IPV6_ADDR); + CONFIG_NET_CONFIG_PEER_IPV6_ADDR); } #endif diff --git a/samples/net/coaps_server/prj.conf b/samples/net/coaps_server/prj.conf index 3ac7d337560..0de7d666e2f 100644 --- a/samples/net/coaps_server/prj.conf +++ b/samples/net/coaps_server/prj.conf @@ -23,6 +23,6 @@ CONFIG_MBEDTLS=y CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_CFG_FILE="config-coap.h" -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" diff --git a/samples/net/coaps_server/src/coaps_server.c b/samples/net/coaps_server/src/coaps_server.c index 4fe6ea9cba7..eb8ee2f5045 100644 --- a/samples/net/coaps_server/src/coaps_server.c +++ b/samples/net/coaps_server/src/coaps_server.c @@ -658,11 +658,11 @@ static struct k_thread thread_data; static inline int init_app(void) { -#if defined(CONFIG_NET_APP_MY_IPV6_ADDR) - if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR, +#if defined(CONFIG_NET_CONFIG_MY_IPV6_ADDR) + if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &server_addr) < 0) { mbedtls_printf("Invalid IPv6 address %s", - CONFIG_NET_APP_MY_IPV6_ADDR); + CONFIG_NET_CONFIG_MY_IPV6_ADDR); } #endif if (!net_if_ipv6_addr_add(net_if_get_default(), &server_addr, diff --git a/samples/net/dns_resolve/README.rst b/samples/net/dns_resolve/README.rst index 335851867ce..6318bf7f2f1 100644 --- a/samples/net/dns_resolve/README.rst +++ b/samples/net/dns_resolve/README.rst @@ -58,8 +58,8 @@ for example: .. code-block:: console - CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" - CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" + CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" + CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" are the IPv6 addresses for the DNS client running Zephyr and the DNS server, respectively. diff --git a/samples/net/dns_resolve/prj.conf b/samples/net/dns_resolve/prj.conf index f1da53279ef..0fde404cb5e 100644 --- a/samples/net/dns_resolve/prj.conf +++ b/samples/net/dns_resolve/prj.conf @@ -50,19 +50,19 @@ CONFIG_DNS_SERVER2="192.0.2.2:15353" #CONFIG_DNS_SERVER2="2001:4860:4860::8888" # Router is needed when resolving using external DNS servers -CONFIG_NET_APP_NEED_IPV6_ROUTER=n +CONFIG_NET_CONFIG_NEED_IPV6_ROUTER=n CONFIG_NET_MGMT=y CONFIG_NET_MGMT_EVENT=y CONFIG_NET_SHELL=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" CONFIG_MAIN_STACK_SIZE=1504 diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c index 4d78ade7952..cab4b654eb7 100644 --- a/samples/net/dns_resolve/src/main.c +++ b/samples/net/dns_resolve/src/main.c @@ -248,7 +248,7 @@ static void do_mdns_ipv4_lookup(struct k_work *work) #if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4) -#if !defined(CONFIG_NET_APP_MY_IPV4_ADDR) +#if !defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR) #error "You need to define an IPv4 address or enable DHCPv4!" #endif @@ -260,8 +260,8 @@ static void setup_ipv4(struct net_if *iface) u16_t dns_id; int ret; - if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, &addr)) { - NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV4_ADDR); + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) { + NET_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR); return; } @@ -290,7 +290,7 @@ static void setup_ipv4(struct net_if *iface) #if defined(CONFIG_NET_IPV6) -#if !defined(CONFIG_NET_APP_MY_IPV6_ADDR) +#if !defined(CONFIG_NET_CONFIG_MY_IPV6_ADDR) #error "You need to define an IPv6 address!" #endif diff --git a/samples/net/echo_client/boards/frdm_kw41z.conf b/samples/net/echo_client/boards/frdm_kw41z.conf index 3f263c00d05..6c9e81a88d0 100644 --- a/samples/net/echo_client/boards/frdm_kw41z.conf +++ b/samples/net/echo_client/boards/frdm_kw41z.conf @@ -1,6 +1,6 @@ CONFIG_NET_TCP=n CONFIG_NET_IPV4=n -CONFIG_NET_APP_NEED_IPV4=n +CONFIG_NET_CONFIG_NEED_IPV4=n CONFIG_NET_6LO=y CONFIG_NET_DEBUG_6LO=y @@ -12,7 +12,7 @@ CONFIG_NET_L2_IEEE802154_FRAGMENT_REASS_CACHE_SIZE=4 # For Wireshark filtering in a busy environment it is useful to set a unique # PAN ID -#CONFIG_NET_APP_IEEE802154_PAN_ID=0xbeef +#CONFIG_NET_CONFIG_IEEE802154_PAN_ID=0xbeef CONFIG_NET_L2_IEEE802154_SECURITY=n CONFIG_NET_L2_IEEE802154_SHELL=y @@ -20,7 +20,7 @@ CONFIG_NET_L2_IEEE802154_SHELL=y CONFIG_IEEE802154_KW41Z=y CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=3 -CONFIG_NET_APP_IEEE802154_DEV_NAME="KW41Z" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="KW41Z" CONFIG_FLASH=y CONFIG_FLASH_PAGE_LAYOUT=y diff --git a/samples/net/echo_client/boards/nrf52840_pca10056.conf b/samples/net/echo_client/boards/nrf52840_pca10056.conf index 86659a24d4c..6a2982f7718 100644 --- a/samples/net/echo_client/boards/nrf52840_pca10056.conf +++ b/samples/net/echo_client/boards/nrf52840_pca10056.conf @@ -16,7 +16,7 @@ CONFIG_MPU_ALLOW_FLASH_WRITE=y CONFIG_NET_TCP=n CONFIG_NET_IPV4=n -CONFIG_NET_APP_NEED_IPV4=n +CONFIG_NET_CONFIG_NEED_IPV4=n CONFIG_NET_DEBUG_L2_IEEE802154=y CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y diff --git a/samples/net/echo_client/boards/qemu_cortext_m3.conf b/samples/net/echo_client/boards/qemu_cortext_m3.conf index 5940d838da6..d6a12c5eac6 100644 --- a/samples/net/echo_client/boards/qemu_cortext_m3.conf +++ b/samples/net/echo_client/boards/qemu_cortext_m3.conf @@ -1,7 +1,7 @@ # The addresses are selected so that qemu<->qemu connectivity works ok. # For linux<->qemu connectivity, create a new conf file and swap the # addresses (so that peer address is ending to 2). -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.1" diff --git a/samples/net/echo_client/boards/qemu_x86.conf b/samples/net/echo_client/boards/qemu_x86.conf index 5940d838da6..d6a12c5eac6 100644 --- a/samples/net/echo_client/boards/qemu_x86.conf +++ b/samples/net/echo_client/boards/qemu_x86.conf @@ -1,7 +1,7 @@ # The addresses are selected so that qemu<->qemu connectivity works ok. # For linux<->qemu connectivity, create a new conf file and swap the # addresses (so that peer address is ending to 2). -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.1" diff --git a/samples/net/echo_client/overlay-bt.conf b/samples/net/echo_client/overlay-bt.conf index 2460b9c42e2..18f54b6fad5 100644 --- a/samples/net/echo_client/overlay-bt.conf +++ b/samples/net/echo_client/overlay-bt.conf @@ -9,6 +9,6 @@ CONFIG_NET_L2_BT=y CONFIG_NET_L2_BT_SHELL=y CONFIG_NET_DEBUG_L2_BT=y CONFIG_NET_IPV4=n -CONFIG_NET_APP_NEED_IPV4=n -CONFIG_NET_APP_MY_IPV4_ADDR="" -CONFIG_NET_APP_PEER_IPV4_ADDR="" +CONFIG_NET_CONFIG_NEED_IPV4=n +CONFIG_NET_CONFIG_MY_IPV4_ADDR="" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="" diff --git a/samples/net/echo_client/overlay-cc2520.conf b/samples/net/echo_client/overlay-cc2520.conf index 1c8dcfe612e..3dd7a71007d 100644 --- a/samples/net/echo_client/overlay-cc2520.conf +++ b/samples/net/echo_client/overlay-cc2520.conf @@ -5,9 +5,9 @@ CONFIG_IEEE802154_CC2520=y CONFIG_IEEE802154_CC2520_AUTO_ACK=y CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 -CONFIG_NET_APP_IEEE802154_DEV_NAME="cc2520" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520" CONFIG_NET_IPV4=n -CONFIG_NET_APP_NEED_IPV4=n -CONFIG_NET_APP_MY_IPV4_ADDR="" -CONFIG_NET_APP_PEER_IPV4_ADDR="" +CONFIG_NET_CONFIG_NEED_IPV4=n +CONFIG_NET_CONFIG_MY_IPV4_ADDR="" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="" diff --git a/samples/net/echo_client/overlay-frdm_k64f_cc2520.conf b/samples/net/echo_client/overlay-frdm_k64f_cc2520.conf index fbd68389316..5e15ee3d6bc 100644 --- a/samples/net/echo_client/overlay-frdm_k64f_cc2520.conf +++ b/samples/net/echo_client/overlay-frdm_k64f_cc2520.conf @@ -14,6 +14,6 @@ CONFIG_IEEE802154_CC2520_SPI_FREQ=4000000 CONFIG_IEEE802154_CC2520_SPI_SLAVE=0 CONFIG_NET_IPV4=n -CONFIG_NET_APP_NEED_IPV4=n -CONFIG_NET_APP_MY_IPV4_ADDR="" -CONFIG_NET_APP_PEER_IPV4_ADDR="" +CONFIG_NET_CONFIG_NEED_IPV4=n +CONFIG_NET_CONFIG_MY_IPV4_ADDR="" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="" diff --git a/samples/net/echo_client/overlay-frdm_k64f_mcr20a.conf b/samples/net/echo_client/overlay-frdm_k64f_mcr20a.conf index b841b4e23da..e7e48222091 100644 --- a/samples/net/echo_client/overlay-frdm_k64f_mcr20a.conf +++ b/samples/net/echo_client/overlay-frdm_k64f_mcr20a.conf @@ -9,6 +9,6 @@ CONFIG_IEEE802154_MCR20A=y CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 CONFIG_NET_IPV4=n -CONFIG_NET_APP_NEED_IPV4=n -CONFIG_NET_APP_MY_IPV4_ADDR="" -CONFIG_NET_APP_PEER_IPV4_ADDR="" +CONFIG_NET_CONFIG_NEED_IPV4=n +CONFIG_NET_CONFIG_MY_IPV4_ADDR="" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="" diff --git a/samples/net/echo_client/overlay-ot.conf b/samples/net/echo_client/overlay-ot.conf index ea5159ce25e..5174ba4b72b 100644 --- a/samples/net/echo_client/overlay-ot.conf +++ b/samples/net/echo_client/overlay-ot.conf @@ -6,10 +6,10 @@ CONFIG_NET_IPV4=n CONFIG_NET_IPV6_NBR_CACHE=n CONFIG_NET_IPV6_MLD=n -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=n -CONFIG_NET_APP_MY_IPV4_ADDR="" -CONFIG_NET_APP_PEER_IPV4_ADDR="" +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=n +CONFIG_NET_CONFIG_MY_IPV4_ADDR="" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="" CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 @@ -30,8 +30,8 @@ CONFIG_OPENTHREAD_L2_LOG_LEVEL_INFO=y CONFIG_OPENTHREAD_CHANNEL=26 -CONFIG_NET_APP_MY_IPV6_ADDR="fdde:ad00:beef::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="fdde:ad00:beef::2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2" # Thread by default registers quite a lot addresses. CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 diff --git a/samples/net/echo_client/overlay-qemu_802154.conf b/samples/net/echo_client/overlay-qemu_802154.conf index 10ff3c7bc04..0db2c54b4c5 100644 --- a/samples/net/echo_client/overlay-qemu_802154.conf +++ b/samples/net/echo_client/overlay-qemu_802154.conf @@ -1,7 +1,7 @@ CONFIG_NET_IPV4=n -CONFIG_NET_APP_NEED_IPV4=n -CONFIG_NET_APP_MY_IPV4_ADDR="" -CONFIG_NET_APP_PEER_IPV4_ADDR="" +CONFIG_NET_CONFIG_NEED_IPV4=n +CONFIG_NET_CONFIG_MY_IPV4_ADDR="" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="" CONFIG_NET_L2_IEEE802154=y CONFIG_NET_DEBUG_L2_IEEE802154=y diff --git a/samples/net/echo_client/prj.conf b/samples/net/echo_client/prj.conf index ef3cb029de9..e3f1064a7c1 100644 --- a/samples/net/echo_client/prj.conf +++ b/samples/net/echo_client/prj.conf @@ -24,12 +24,12 @@ CONFIG_NET_MAX_CONTEXTS=10 CONFIG_NET_SHELL=y CONFIG_NET_APP=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_APP_CLIENT=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/echo_client/src/common.h b/samples/net/echo_client/src/common.h index 7d45c72db3c..ba015fef585 100644 --- a/samples/net/echo_client/src/common.h +++ b/samples/net/echo_client/src/common.h @@ -28,12 +28,12 @@ struct configs { struct data ipv6; }; -#if !defined(CONFIG_NET_APP_PEER_IPV4_ADDR) -#define CONFIG_NET_APP_PEER_IPV4_ADDR "" +#if !defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR) +#define CONFIG_NET_CONFIG_PEER_IPV4_ADDR "" #endif -#if !defined(CONFIG_NET_APP_PEER_IPV6_ADDR) -#define CONFIG_NET_APP_PEER_IPV6_ADDR "" +#if !defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR) +#define CONFIG_NET_CONFIG_PEER_IPV6_ADDR "" #endif extern const char lorem_ipsum[]; diff --git a/samples/net/echo_client/src/tcp.c b/samples/net/echo_client/src/tcp.c index 8256e2ba127..669456edda8 100644 --- a/samples/net/echo_client/src/tcp.c +++ b/samples/net/echo_client/src/tcp.c @@ -328,7 +328,7 @@ int start_tcp(void) int ret = 0; if (IS_ENABLED(CONFIG_NET_IPV6)) { - ret = connect_tcp(&tcp6, CONFIG_NET_APP_PEER_IPV6_ADDR, + ret = connect_tcp(&tcp6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &conf.ipv6, tls_result_ipv6, sizeof(tls_result_ipv6), net_app_tls_stack_ipv6, @@ -340,7 +340,7 @@ int start_tcp(void) } if (IS_ENABLED(CONFIG_NET_IPV4)) { - ret = connect_tcp(&tcp4, CONFIG_NET_APP_PEER_IPV4_ADDR, + ret = connect_tcp(&tcp4, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &conf.ipv4, tls_result_ipv4, sizeof(tls_result_ipv4), net_app_tls_stack_ipv4, diff --git a/samples/net/echo_client/src/udp.c b/samples/net/echo_client/src/udp.c index 7740b975da1..eb78fe59a3b 100644 --- a/samples/net/echo_client/src/udp.c +++ b/samples/net/echo_client/src/udp.c @@ -327,7 +327,7 @@ void start_udp(void) if (IS_ENABLED(CONFIG_NET_IPV6)) { k_delayed_work_init(&conf.ipv6.recv, wait_reply); - ret = connect_udp(&udp6, CONFIG_NET_APP_PEER_IPV6_ADDR, + ret = connect_udp(&udp6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &conf.ipv6, dtls_result_ipv6, sizeof(dtls_result_ipv6), net_app_dtls_stack_ipv6, @@ -341,7 +341,7 @@ void start_udp(void) if (IS_ENABLED(CONFIG_NET_IPV4)) { k_delayed_work_init(&conf.ipv4.recv, wait_reply); - ret = connect_udp(&udp4, CONFIG_NET_APP_PEER_IPV4_ADDR, + ret = connect_udp(&udp4, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &conf.ipv4, dtls_result_ipv4, sizeof(dtls_result_ipv4), net_app_dtls_stack_ipv4, diff --git a/samples/net/echo_server/boards/frdm_kw41z.conf b/samples/net/echo_server/boards/frdm_kw41z.conf index d41326bab5f..9f1564cc3ee 100644 --- a/samples/net/echo_server/boards/frdm_kw41z.conf +++ b/samples/net/echo_server/boards/frdm_kw41z.conf @@ -10,7 +10,7 @@ CONFIG_NET_L2_IEEE802154_FRAGMENT_REASS_CACHE_SIZE=2 # For Wireshark filtering in a busy environment it is useful to set a unique # PAN ID -#CONFIG_NET_APP_IEEE802154_PAN_ID=0xbeef +#CONFIG_NET_CONFIG_IEEE802154_PAN_ID=0xbeef CONFIG_NET_L2_IEEE802154_SECURITY=n CONFIG_NET_L2_IEEE802154_SHELL=y @@ -18,9 +18,9 @@ CONFIG_NET_L2_IEEE802154_SHELL=y CONFIG_IEEE802154_KW41Z=y CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=3 -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_IEEE802154_DEV_NAME="KW41Z" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="KW41Z" CONFIG_FLASH=y CONFIG_FLASH_PAGE_LAYOUT=y diff --git a/samples/net/echo_server/boards/nrf52840_pca10056.conf b/samples/net/echo_server/boards/nrf52840_pca10056.conf index eaa74f85b20..092ea0730a9 100644 --- a/samples/net/echo_server/boards/nrf52840_pca10056.conf +++ b/samples/net/echo_server/boards/nrf52840_pca10056.conf @@ -15,7 +15,7 @@ CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_MPU_ALLOW_FLASH_WRITE=y CONFIG_NET_IPV4=n -CONFIG_NET_APP_NEED_IPV4=n +CONFIG_NET_CONFIG_NEED_IPV4=n CONFIG_NET_DEBUG_L2_IEEE802154=y CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y @@ -27,8 +27,8 @@ CONFIG_IEEE802154_NRF5_DRV_NAME="IEEE802154_nrf5" CONFIG_IEEE802154_NRF5_INIT_PRIO=80 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1" CONFIG_TEST_RANDOM_GENERATOR=n CONFIG_ENTROPY_NRF5_RNG=y diff --git a/samples/net/echo_server/overlay-bt.conf b/samples/net/echo_server/overlay-bt.conf index f03325eb4ca..f014afb6a0c 100644 --- a/samples/net/echo_server/overlay-bt.conf +++ b/samples/net/echo_server/overlay-bt.conf @@ -7,4 +7,4 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_NET_L2_BT=y CONFIG_NET_DEBUG_L2_BT=y -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_BT_NODE=y diff --git a/samples/net/echo_server/overlay-cc2520.conf b/samples/net/echo_server/overlay-cc2520.conf index 33615996c06..313e03ff6f6 100644 --- a/samples/net/echo_server/overlay-cc2520.conf +++ b/samples/net/echo_server/overlay-cc2520.conf @@ -5,5 +5,5 @@ CONFIG_IEEE802154_CC2520=y CONFIG_IEEE802154_CC2520_AUTO_ACK=y CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_IEEE802154_DEV_NAME="cc2520" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520" diff --git a/samples/net/echo_server/overlay-frdm_k64f_cc2520.conf b/samples/net/echo_server/overlay-frdm_k64f_cc2520.conf index ef2a16ec2d1..0790fce8b20 100644 --- a/samples/net/echo_server/overlay-frdm_k64f_cc2520.conf +++ b/samples/net/echo_server/overlay-frdm_k64f_cc2520.conf @@ -13,4 +13,4 @@ CONFIG_IEEE802154_CC2520_SPI_DRV_NAME="SPI_0" CONFIG_IEEE802154_CC2520_SPI_FREQ=4000000 CONFIG_IEEE802154_CC2520_SPI_SLAVE=0 -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" diff --git a/samples/net/echo_server/overlay-frdm_k64f_mcr20a.conf b/samples/net/echo_server/overlay-frdm_k64f_mcr20a.conf index 21ce80711ff..acd0ec22472 100644 --- a/samples/net/echo_server/overlay-frdm_k64f_mcr20a.conf +++ b/samples/net/echo_server/overlay-frdm_k64f_mcr20a.conf @@ -8,4 +8,4 @@ CONFIG_SPI_0=y CONFIG_IEEE802154_MCR20A=y CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" diff --git a/samples/net/echo_server/overlay-ot.conf b/samples/net/echo_server/overlay-ot.conf index b40470e51d2..69fc9a73c1b 100644 --- a/samples/net/echo_server/overlay-ot.conf +++ b/samples/net/echo_server/overlay-ot.conf @@ -6,10 +6,10 @@ CONFIG_NET_IPV4=n CONFIG_NET_IPV6_NBR_CACHE=n CONFIG_NET_IPV6_MLD=n -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=n -CONFIG_NET_APP_MY_IPV4_ADDR="" -CONFIG_NET_APP_PEER_IPV4_ADDR="" +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=n +CONFIG_NET_CONFIG_MY_IPV4_ADDR="" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="" CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 @@ -36,8 +36,8 @@ CONFIG_NET_PKT_TX_COUNT=50 CONFIG_NET_BUF_RX_COUNT=50 CONFIG_NET_BUF_TX_COUNT=50 -CONFIG_NET_APP_MY_IPV6_ADDR="fdde:ad00:beef::2" -CONFIG_NET_APP_PEER_IPV6_ADDR="fdde:ad00:beef::1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::2" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::1" # Thread by default registers quite a lot addresses. CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 diff --git a/samples/net/echo_server/prj.conf b/samples/net/echo_server/prj.conf index ce1c90990a7..a99edf0c3ce 100644 --- a/samples/net/echo_server/prj.conf +++ b/samples/net/echo_server/prj.conf @@ -34,12 +34,12 @@ CONFIG_NET_MAX_CONTEXTS=10 CONFIG_NET_SHELL=y # Network application options and configuration -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_APP_SERVER=y CONFIG_NET_DEBUG_APP=n -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/eth_native_posix/README.rst b/samples/net/eth_native_posix/README.rst index 16cdc355a5d..6e87e8634b7 100644 --- a/samples/net/eth_native_posix/README.rst +++ b/samples/net/eth_native_posix/README.rst @@ -47,11 +47,11 @@ Set prj1.conf IP address configuration like this: .. code-block:: console - CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8:100::1" - CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8:100::2" - CONFIG_NET_APP_MY_IPV4_ADDR="198.51.100.1" - CONFIG_NET_APP_PEER_IPV4_ADDR="198.51.100.2" - CONFIG_NET_APP_MY_IPV4_GW="203.0.113.1" + CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8:100::1" + CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8:100::2" + CONFIG_NET_CONFIG_MY_IPV4_ADDR="198.51.100.1" + CONFIG_NET_CONFIG_PEER_IPV4_ADDR="198.51.100.2" + CONFIG_NET_CONFIG_MY_IPV4_GW="203.0.113.1" CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=n CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:64" CONFIG_ETH_NATIVE_POSIX_SETUP_SCRIPT="echo" @@ -61,11 +61,11 @@ Set prj2.conf IP address configuration like this: .. code-block:: console - CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8:200::1" - CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8:200::2" - CONFIG_NET_APP_MY_IPV4_ADDR="203.0.113.1" - CONFIG_NET_APP_PEER_IPV4_ADDR="203.0.113.2" - CONFIG_NET_APP_MY_IPV4_GW="198.51.100.1" + CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8:200::1" + CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8:200::2" + CONFIG_NET_CONFIG_MY_IPV4_ADDR="203.0.113.1" + CONFIG_NET_CONFIG_PEER_IPV4_ADDR="203.0.113.2" + CONFIG_NET_CONFIG_MY_IPV4_GW="198.51.100.1" CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=n CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:c8" CONFIG_ETH_NATIVE_POSIX_SETUP_SCRIPT="echo" diff --git a/samples/net/eth_native_posix/prj.conf b/samples/net/eth_native_posix/prj.conf index d0a0d93201a..2d7ec08e4d9 100644 --- a/samples/net/eth_native_posix/prj.conf +++ b/samples/net/eth_native_posix/prj.conf @@ -33,15 +33,15 @@ CONFIG_NET_DEBUG_IF=n CONFIG_NET_DEBUG_IPV6=n CONFIG_NET_DEBUG_NET_PKT=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y CONFIG_NET_APP_SERVER=y CONFIG_NET_DEBUG_APP=n -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_L2_ETHERNET=y diff --git a/samples/net/gptp/prj_base.conf b/samples/net/gptp/prj_base.conf index ecdc7562ddd..4c0daa9da30 100644 --- a/samples/net/gptp/prj_base.conf +++ b/samples/net/gptp/prj_base.conf @@ -27,9 +27,9 @@ CONFIG_NET_SHELL=y CONFIG_NET_L2_ETHERNET=y CONFIG_NET_APP_SERVER=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_SETTINGS=y # There will be three network interfaces. gPTP will # run in non-VLAN interface and then there are two extra @@ -37,10 +37,10 @@ CONFIG_NET_APP_SETTINGS=y # how to do this kind of setup. # First ethernet interface will use these settings -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" # Second ethernet interface will have these settings CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1" diff --git a/samples/net/http_client/README.rst b/samples/net/http_client/README.rst index cc59e30d4a8..a3b1fb157af 100644 --- a/samples/net/http_client/README.rst +++ b/samples/net/http_client/README.rst @@ -46,8 +46,8 @@ for example: .. code-block:: console - CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" - CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" + CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" + CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" are the IPv6 addresses for the HTTP client running Zephyr and the HTTP server, respectively. The application also supports DNS resolving so the @@ -56,8 +56,8 @@ can also write the HTTP server name like this: .. code-block:: console - CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" - CONFIG_NET_APP_PEER_IPV6_ADDR="6.zephyr.test" + CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" + CONFIG_NET_CONFIG_PEER_IPV6_ADDR="6.zephyr.test" Open the :file:`src/config.h` file and set the server port to match the HTTP server setup, for example: diff --git a/samples/net/http_client/prj.conf b/samples/net/http_client/prj.conf index 97c067a512a..e0f431cf2df 100644 --- a/samples/net/http_client/prj.conf +++ b/samples/net/http_client/prj.conf @@ -36,14 +36,14 @@ CONFIG_NET_IPV4=y CONFIG_HTTPS=n CONFIG_MBEDTLS=n -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y CONFIG_NET_SHELL=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/http_client/prj_bt.conf b/samples/net/http_client/prj_bt.conf index 79c6a7f841d..677d8fab3db 100644 --- a/samples/net/http_client/prj_bt.conf +++ b/samples/net/http_client/prj_bt.conf @@ -35,11 +35,11 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2500 CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=12000 -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV6=y CONFIG_NET_SHELL=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/http_client/prj_tls.conf b/samples/net/http_client/prj_tls.conf index 2276ac190ea..e533d2a8f20 100644 --- a/samples/net/http_client/prj_tls.conf +++ b/samples/net/http_client/prj_tls.conf @@ -42,14 +42,14 @@ CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=30000 CONFIG_NET_APP_TLS=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y CONFIG_NET_SHELL=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/http_client/src/config.h b/samples/net/http_client/src/config.h index ae5cff88709..051e713bafa 100644 --- a/samples/net/http_client/src/config.h +++ b/samples/net/http_client/src/config.h @@ -21,7 +21,7 @@ #endif #if defined(CONFIG_NET_IPV6) -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR #else -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR #endif diff --git a/samples/net/http_server/README.rst b/samples/net/http_server/README.rst index d113f5330b5..2573c4f4ebc 100644 --- a/samples/net/http_server/README.rst +++ b/samples/net/http_server/README.rst @@ -37,8 +37,8 @@ can be defined in the project configuration file: .. code-block:: console - CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" - CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" + CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" + CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" Adding URLs =========== diff --git a/samples/net/http_server/prj.conf b/samples/net/http_server/prj.conf index 14b6ec8b5ad..5a7cd04b9eb 100644 --- a/samples/net/http_server/prj.conf +++ b/samples/net/http_server/prj.conf @@ -34,12 +34,12 @@ CONFIG_NET_IPV4=y CONFIG_HTTPS=n CONFIG_MBEDTLS=n -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y CONFIG_NET_SHELL=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/http_server/prj_bt.conf b/samples/net/http_server/prj_bt.conf index a1ebd397263..1d5f4cc8495 100644 --- a/samples/net/http_server/prj_bt.conf +++ b/samples/net/http_server/prj_bt.conf @@ -32,9 +32,9 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2500 CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=12000 -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_BT_NODE=y CONFIG_NET_SHELL=y diff --git a/samples/net/http_server/prj_netusb.conf b/samples/net/http_server/prj_netusb.conf index b16e3de230f..19359acc6a0 100644 --- a/samples/net/http_server/prj_netusb.conf +++ b/samples/net/http_server/prj_netusb.conf @@ -30,12 +30,12 @@ CONFIG_NET_IPV4=y CONFIG_HTTPS=n CONFIG_MBEDTLS=n -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y CONFIG_NET_SHELL=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/http_server/prj_tls.conf b/samples/net/http_server/prj_tls.conf index 15825b4733f..8768ee6bc84 100644 --- a/samples/net/http_server/prj_tls.conf +++ b/samples/net/http_server/prj_tls.conf @@ -39,12 +39,12 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2500 CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=30000 -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y CONFIG_NET_SHELL=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/http_server/src/config.h b/samples/net/http_server/src/config.h index 348fc87f7bd..a7fde5ded71 100644 --- a/samples/net/http_server/src/config.h +++ b/samples/net/http_server/src/config.h @@ -12,11 +12,11 @@ */ #define APP_STARTUP_TIME K_SECONDS(20) -#ifdef CONFIG_NET_APP_SETTINGS +#ifdef CONFIG_NET_CONFIG_SETTINGS #ifdef CONFIG_NET_IPV6 -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR #else -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR #endif #else #ifdef CONFIG_NET_IPV6 diff --git a/samples/net/irc_bot/prj.conf b/samples/net/irc_bot/prj.conf index 54b1982a443..6ef15bd2051 100644 --- a/samples/net/irc_bot/prj.conf +++ b/samples/net/irc_bot/prj.conf @@ -33,9 +33,9 @@ CONFIG_PRINTK=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_NET_APP_CLIENT=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_NEED_IPV6=n -CONFIG_NET_APP_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=n +CONFIG_NET_CONFIG_SETTINGS=y CONFIG_GPIO=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/samples/net/leds_demo/prj.conf b/samples/net/leds_demo/prj.conf index f8e785f5330..acad5e47d14 100644 --- a/samples/net/leds_demo/prj.conf +++ b/samples/net/leds_demo/prj.conf @@ -8,5 +8,5 @@ CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_COAP=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" diff --git a/samples/net/leds_demo/prj_802154.conf b/samples/net/leds_demo/prj_802154.conf index 28eaec34746..1a10688bc0c 100644 --- a/samples/net/leds_demo/prj_802154.conf +++ b/samples/net/leds_demo/prj_802154.conf @@ -7,5 +7,5 @@ CONFIG_NET_UDP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_IEEE802154_CC2520=y CONFIG_COAP=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_IEEE802154_CHANNEL=20 +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_IEEE802154_CHANNEL=20 diff --git a/samples/net/lldp/prj.conf b/samples/net/lldp/prj.conf index af90d6a7d5c..795039a3a48 100644 --- a/samples/net/lldp/prj.conf +++ b/samples/net/lldp/prj.conf @@ -27,18 +27,18 @@ CONFIG_NET_SHELL=y CONFIG_NET_L2_ETHERNET=y CONFIG_NET_APP_SERVER=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_SETTINGS=y # There will be three network interfaces. This is just an example # how to do this kind of setup. # First ethernet interface will use these settings -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" # Second ethernet interface will have these settings CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1" diff --git a/samples/net/lwm2m_client/README.rst b/samples/net/lwm2m_client/README.rst index 2035cc478a4..51c9e66ef52 100644 --- a/samples/net/lwm2m_client/README.rst +++ b/samples/net/lwm2m_client/README.rst @@ -82,7 +82,7 @@ To change the sample to use IPv4, disable IPv6 by changing these two configurations in ``prj.conf``:: CONFIG_NET_IPV6=n - CONFIG_NET_APP_NEED_IPV6=n + CONFIG_NET_CONFIG_NEED_IPV6=n DTLS Support ============ diff --git a/samples/net/lwm2m_client/overlay-bt.conf b/samples/net/lwm2m_client/overlay-bt.conf index 1a1bc551f77..24dd4424d1c 100644 --- a/samples/net/lwm2m_client/overlay-bt.conf +++ b/samples/net/lwm2m_client/overlay-bt.conf @@ -1,6 +1,6 @@ CONFIG_NET_L2_BT=y CONFIG_BT_DEVICE_NAME="LwM2M IPSP node" -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_BT_NODE=y # raise bluetooth RX buffer settings for 6lowpan traffic CONFIG_BT_RX_BUF_COUNT=20 diff --git a/samples/net/lwm2m_client/overlay-wncm14a2a.conf b/samples/net/lwm2m_client/overlay-wncm14a2a.conf index 407349ee0bd..ee1aae62221 100644 --- a/samples/net/lwm2m_client/overlay-wncm14a2a.conf +++ b/samples/net/lwm2m_client/overlay-wncm14a2a.conf @@ -4,7 +4,7 @@ CONFIG_MODEM_SHELL=y CONFIG_MODEM_WNCM14A2A=y # Connect to public LwM2M server (leshan.ecplise.org) -CONFIG_NET_APP_PEER_IPV4_ADDR="5.39.83.206" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="5.39.83.206" # extend retry timing to 20 seconds for LTE/LTE-M CONFIG_COAP_INIT_ACK_TIMEOUT_MS=20000 @@ -14,4 +14,4 @@ CONFIG_SYS_LOG_MODEM_LEVEL=4 # Hack: disable IPv6 for now CONFIG_NET_IPV6=n -CONFIG_NET_APP_NEED_IPV6=n +CONFIG_NET_CONFIG_NEED_IPV6=n diff --git a/samples/net/lwm2m_client/prj.conf b/samples/net/lwm2m_client/prj.conf index e32e6030e74..82742f19d3d 100644 --- a/samples/net/lwm2m_client/prj.conf +++ b/samples/net/lwm2m_client/prj.conf @@ -19,16 +19,16 @@ CONFIG_NET_MAX_CONTEXTS=5 CONFIG_NET_SHELL=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_SETTINGS=y CONFIG_LWM2M=y CONFIG_LWM2M_IPSO_SUPPORT=y CONFIG_LWM2M_IPSO_TEMP_SENSOR=y CONFIG_LWM2M_IPSO_LIGHT_CONTROL=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c index 40378802655..2ae265eec8d 100644 --- a/samples/net/lwm2m_client/src/lwm2m-client.c +++ b/samples/net/lwm2m_client/src/lwm2m-client.c @@ -16,12 +16,12 @@ #define APP_BANNER "Run LWM2M client" -#if !defined(CONFIG_NET_APP_PEER_IPV4_ADDR) -#define CONFIG_NET_APP_PEER_IPV4_ADDR "" +#if !defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR) +#define CONFIG_NET_CONFIG_PEER_IPV4_ADDR "" #endif -#if !defined(CONFIG_NET_APP_PEER_IPV6_ADDR) -#define CONFIG_NET_APP_PEER_IPV6_ADDR "" +#if !defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR) +#define CONFIG_NET_CONFIG_PEER_IPV6_ADDR "" #endif #define WAIT_TIME K_SECONDS(10) @@ -380,11 +380,11 @@ void main(void) #endif /* CONFIG_NET_APP_DTLS */ #if defined(CONFIG_NET_IPV6) - ret = lwm2m_rd_client_start(&client, CONFIG_NET_APP_PEER_IPV6_ADDR, + ret = lwm2m_rd_client_start(&client, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, CONFIG_LWM2M_PEER_PORT, CONFIG_BOARD, rd_client_event); #elif defined(CONFIG_NET_IPV4) - ret = lwm2m_rd_client_start(&client, CONFIG_NET_APP_PEER_IPV4_ADDR, + ret = lwm2m_rd_client_start(&client, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, CONFIG_LWM2M_PEER_PORT, CONFIG_BOARD, rd_client_event); #else diff --git a/samples/net/mbedtls_dtlsclient/prj.conf b/samples/net/mbedtls_dtlsclient/prj.conf index 9473c81ca95..f34120aaf6c 100644 --- a/samples/net/mbedtls_dtlsclient/prj.conf +++ b/samples/net/mbedtls_dtlsclient/prj.conf @@ -13,8 +13,8 @@ CONFIG_PRINTK=y CONFIG_MBEDTLS=y CONFIG_MBEDTLS_BUILTIN=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/mbedtls_dtlsclient/src/dtls_client.c b/samples/net/mbedtls_dtlsclient/src/dtls_client.c index 5725551d93c..7c12c5810d2 100644 --- a/samples/net/mbedtls_dtlsclient/src/dtls_client.c +++ b/samples/net/mbedtls_dtlsclient/src/dtls_client.c @@ -290,12 +290,12 @@ static struct k_thread dtls_thread; static inline int init_app(void) { #if defined(CONFIG_NET_IPV6) -#if defined(CONFIG_NET_APP_MY_IPV6_ADDR) +#if defined(CONFIG_NET_CONFIG_MY_IPV6_ADDR) if (net_addr_pton(AF_INET6, - CONFIG_NET_APP_MY_IPV6_ADDR, + CONFIG_NET_CONFIG_MY_IPV6_ADDR, &client_addr) < 0) { mbedtls_printf("Invalid IPv6 address %s", - CONFIG_NET_APP_MY_IPV6_ADDR); + CONFIG_NET_CONFIG_MY_IPV6_ADDR); } #endif if (!net_if_ipv6_addr_add(net_if_get_default(), &client_addr, @@ -305,11 +305,11 @@ static inline int init_app(void) net_if_ipv6_maddr_add(net_if_get_default(), &mcast_addr); #else -#if defined(CONFIG_NET_APP_MY_IPV4_ADDR) - if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, +#if defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR) + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &client_addr) < 0) { mbedtls_printf("Invalid IPv4 address %s", - CONFIG_NET_APP_MY_IPV4_ADDR); + CONFIG_NET_CONFIG_MY_IPV4_ADDR); } #endif diff --git a/samples/net/mbedtls_dtlsclient/src/udp.c b/samples/net/mbedtls_dtlsclient/src/udp.c index 31dbf56335d..916f143bd2f 100644 --- a/samples/net/mbedtls_dtlsclient/src/udp.c +++ b/samples/net/mbedtls_dtlsclient/src/udp.c @@ -213,12 +213,12 @@ int udp_init(struct udp_context *ctx) ctx->remaining = 0; ctx->net_ctx = udp_ctx; -#if defined(CONFIG_NET_APP_PEER_IPV6_ADDR) +#if defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR) if (net_addr_pton(AF_INET6, - CONFIG_NET_APP_PEER_IPV6_ADDR, + CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &server_addr) < 0) { printk("Invalid peer IPv6 address %s", - CONFIG_NET_APP_PEER_IPV6_ADDR); + CONFIG_NET_CONFIG_PEER_IPV6_ADDR); } #endif @@ -264,11 +264,11 @@ int udp_init(struct udp_context *ctx) ctx->remaining = 0; ctx->net_ctx = udp_ctx; -#if defined(CONFIG_NET_APP_PEER_IPV4_ADDR) - if (net_addr_pton(AF_INET, CONFIG_NET_APP_PEER_IPV4_ADDR, +#if defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR) + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &server_addr) < 0) { printk("Invalid IPv4 address %s", - CONFIG_NET_APP_PEER_IPV4_ADDR); + CONFIG_NET_CONFIG_PEER_IPV4_ADDR); } #endif diff --git a/samples/net/mbedtls_dtlsserver/prj.conf b/samples/net/mbedtls_dtlsserver/prj.conf index ccd83da0321..3c82e171683 100644 --- a/samples/net/mbedtls_dtlsserver/prj.conf +++ b/samples/net/mbedtls_dtlsserver/prj.conf @@ -14,8 +14,8 @@ CONFIG_MBEDTLS=y CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_CFG_FILE="config-threadnet.h" -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/mbedtls_dtlsserver/src/dtls_server.c b/samples/net/mbedtls_dtlsserver/src/dtls_server.c index 88bdb706706..b5627071bf5 100644 --- a/samples/net/mbedtls_dtlsserver/src/dtls_server.c +++ b/samples/net/mbedtls_dtlsserver/src/dtls_server.c @@ -368,11 +368,11 @@ static struct k_thread dtls_thread; static inline int init_app(void) { #if defined(CONFIG_NET_IPV6) -#if defined(CONFIG_NET_APP_MY_IPV6_ADDR) - if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR, +#if defined(CONFIG_NET_CONFIG_MY_IPV6_ADDR) + if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &server_addr) < 0) { mbedtls_printf("Invalid IPv6 address %s", - CONFIG_NET_APP_MY_IPV6_ADDR); + CONFIG_NET_CONFIG_MY_IPV6_ADDR); } #endif if (!net_if_ipv6_addr_add(net_if_get_default(), &server_addr, @@ -383,11 +383,11 @@ static inline int init_app(void) net_if_ipv6_maddr_add(net_if_get_default(), &mcast_addr); #else -#if defined(CONFIG_NET_APP_MY_IPV4_ADDR) - if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, +#if defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR) + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &server_addr) < 0) { mbedtls_printf("Invalid IPv4 address %s", - CONFIG_NET_APP_MY_IPV4_ADDR); + CONFIG_NET_CONFIG_MY_IPV4_ADDR); } #endif diff --git a/samples/net/mbedtls_sslclient/prj.conf b/samples/net/mbedtls_sslclient/prj.conf index 36880df077d..65d85e51c45 100644 --- a/samples/net/mbedtls_sslclient/prj.conf +++ b/samples/net/mbedtls_sslclient/prj.conf @@ -8,13 +8,13 @@ CONFIG_NET_TCP=y CONFIG_NET_IPV4=y CONFIG_NET_IPV6=n -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=n -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=n +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" CONFIG_MBEDTLS=y CONFIG_MBEDTLS_BUILTIN=y diff --git a/samples/net/mbedtls_sslclient/src/tcp_cfg.h b/samples/net/mbedtls_sslclient/src/tcp_cfg.h index b81a8e75d85..67a10192c9a 100644 --- a/samples/net/mbedtls_sslclient/src/tcp_cfg.h +++ b/samples/net/mbedtls_sslclient/src/tcp_cfg.h @@ -7,13 +7,13 @@ #ifndef TCP_CONFIG_H_ #define TCP_CONFIG_H_ -#ifdef CONFIG_NET_APP_SETTINGS +#ifdef CONFIG_NET_CONFIG_SETTINGS #ifdef CONFIG_NET_IPV6 -#define LOCAL_ADDR CONFIG_NET_APP_MY_IPV6_ADDR -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR +#define LOCAL_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR #else -#define LOCAL_ADDR CONFIG_NET_APP_MY_IPV4_ADDR -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR +#define LOCAL_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR #endif #else #ifdef CONFIG_NET_IPV6 diff --git a/samples/net/mdns_responder/prj.conf b/samples/net/mdns_responder/prj.conf index 76a5645fe1b..b5f9f5fdeea 100644 --- a/samples/net/mdns_responder/prj.conf +++ b/samples/net/mdns_responder/prj.conf @@ -31,11 +31,11 @@ CONFIG_NET_BUF_TX_COUNT=20 CONFIG_NET_SHELL=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_DEBUG_CORE=n CONFIG_NET_DEBUG_CONTEXT=n diff --git a/samples/net/mqtt_publisher/prj_96b_nitrogen.conf b/samples/net/mqtt_publisher/prj_96b_nitrogen.conf index 6adc1db927e..bf00373434f 100644 --- a/samples/net/mqtt_publisher/prj_96b_nitrogen.conf +++ b/samples/net/mqtt_publisher/prj_96b_nitrogen.conf @@ -20,13 +20,13 @@ CONFIG_NET_BUF_DATA_SIZE=256 CONFIG_NET_BUF_RX_COUNT=15 CONFIG_NET_BUF_TX_COUNT=15 -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_BT_NODE=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.101" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=3 diff --git a/samples/net/mqtt_publisher/prj_frdm_k64f.conf b/samples/net/mqtt_publisher/prj_frdm_k64f.conf index f3124e2aab9..f902596aebb 100644 --- a/samples/net/mqtt_publisher/prj_frdm_k64f.conf +++ b/samples/net/mqtt_publisher/prj_frdm_k64f.conf @@ -24,12 +24,12 @@ CONFIG_NET_IPV6=y # Enable the MQTT Lib CONFIG_MQTT_LIB=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.101" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.168.1.10" CONFIG_MAIN_STACK_SIZE=2048 diff --git a/samples/net/mqtt_publisher/prj_frdm_k64f_tls.conf b/samples/net/mqtt_publisher/prj_frdm_k64f_tls.conf index 4f5830c3313..43665ee6f68 100644 --- a/samples/net/mqtt_publisher/prj_frdm_k64f_tls.conf +++ b/samples/net/mqtt_publisher/prj_frdm_k64f_tls.conf @@ -25,12 +25,12 @@ CONFIG_NET_IPV6=y CONFIG_MQTT_LIB=y CONFIG_MQTT_LIB_TLS=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.101" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.168.1.10" CONFIG_MAIN_STACK_SIZE=2048 diff --git a/samples/net/mqtt_publisher/prj_qemu_x86.conf b/samples/net/mqtt_publisher/prj_qemu_x86.conf index 611fb60d677..817caebf6e8 100644 --- a/samples/net/mqtt_publisher/prj_qemu_x86.conf +++ b/samples/net/mqtt_publisher/prj_qemu_x86.conf @@ -24,12 +24,12 @@ CONFIG_NET_IPV4=y # Enable the MQTT Lib CONFIG_MQTT_LIB=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" CONFIG_MAIN_STACK_SIZE=2048 diff --git a/samples/net/mqtt_publisher/src/config.h b/samples/net/mqtt_publisher/src/config.h index b46ee6d1bdd..1271c3f691a 100644 --- a/samples/net/mqtt_publisher/src/config.h +++ b/samples/net/mqtt_publisher/src/config.h @@ -7,13 +7,13 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ -#ifdef CONFIG_NET_APP_SETTINGS +#ifdef CONFIG_NET_CONFIG_SETTINGS #ifdef CONFIG_NET_IPV6 -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR #else -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR #endif #else #ifdef CONFIG_NET_IPV6 diff --git a/samples/net/nats/prj.conf b/samples/net/nats/prj.conf index ac3a64faef4..389884e66c5 100644 --- a/samples/net/nats/prj.conf +++ b/samples/net/nats/prj.conf @@ -16,9 +16,9 @@ CONFIG_DNS_RESOLVER=n CONFIG_PRINTK=y CONFIG_SYS_LOG_SHOW_COLOR=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/samples/net/nats/src/main.c b/samples/net/nats/src/main.c index dc574b439a2..f7fb45898fb 100644 --- a/samples/net/nats/src/main.c +++ b/samples/net/nats/src/main.c @@ -36,34 +36,34 @@ static bool fake_led; #define NATS_AF_INET AF_INET6 #define NATS_SOCKADDR_IN sockaddr_in6 -#if defined(CONFIG_NET_APP_MY_IPV6_ADDR) -#define NATS_LOCAL_IP_ADDR CONFIG_NET_APP_MY_IPV6_ADDR +#if defined(CONFIG_NET_CONFIG_MY_IPV6_ADDR) +#define NATS_LOCAL_IP_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR #else #define NATS_LOCAL_IP_ADDR "2001:db8::1" -#endif /* CONFIG_NET_APP_MY_IPV6_ADDR */ +#endif /* CONFIG_NET_CONFIG_MY_IPV6_ADDR */ -#if defined(CONFIG_NET_APP_PEER_IPV6_ADDR) -#define NATS_PEER_IP_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR +#if defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR) +#define NATS_PEER_IP_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR #else #define NATS_PEER_IP_ADDR "2001:db8::2" -#endif /* CONFIG_NET_APP_PEER_IPV6_ADDR */ +#endif /* CONFIG_NET_CONFIG_PEER_IPV6_ADDR */ #else /* CONFIG_NET_IPV4 */ #define NATS_AF_INET AF_INET #define NATS_SOCKADDR_IN sockaddr_in -#if defined(CONFIG_NET_APP_MY_IPV4_ADDR) -#define NATS_LOCAL_IP_ADDR CONFIG_NET_APP_MY_IPV4_ADDR +#if defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR) +#define NATS_LOCAL_IP_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR #else #define NATS_LOCAL_IP_ADDR "192.168.0.1" -#endif /* CONFIG_NET_APP_MY_IPV4_ADDR */ +#endif /* CONFIG_NET_CONFIG_MY_IPV4_ADDR */ -#if defined(CONFIG_NET_APP_PEER_IPV4_ADDR) -#define NATS_PEER_IP_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR +#if defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR) +#define NATS_PEER_IP_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR #else #define NATS_PEER_IP_ADDR "192.168.0.2" -#endif /* CONFIG_NET_APP_PEER_IPV4_ADDR */ +#endif /* CONFIG_NET_CONFIG_PEER_IPV4_ADDR */ #endif diff --git a/samples/net/promiscuous_mode/prj.conf b/samples/net/promiscuous_mode/prj.conf index 47655a9bd80..ecfab4a0d0a 100644 --- a/samples/net/promiscuous_mode/prj.conf +++ b/samples/net/promiscuous_mode/prj.conf @@ -36,10 +36,10 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4 CONFIG_NET_SHELL=y # Network application options and configuration -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/rpl-mesh-qemu/node/prj_qemu.conf b/samples/net/rpl-mesh-qemu/node/prj_qemu.conf index 73c5c9e2a77..213b9b3496d 100644 --- a/samples/net/rpl-mesh-qemu/node/prj_qemu.conf +++ b/samples/net/rpl-mesh-qemu/node/prj_qemu.conf @@ -51,10 +51,10 @@ CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=2 # Enabled Shell Extensions CONFIG_NET_SHELL=y CONFIG_NET_L2_IEEE802154_SHELL=y -CONFIG_NET_APP_IEEE802154_DEV_NAME="IEEE802154_UPIPE" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_UPIPE" # Disable default Ethernet interface CONFIG_NET_SLIP_TAP=n # Application Settings -CONFIG_NET_APP_SETTINGS=y \ No newline at end of file +CONFIG_NET_CONFIG_SETTINGS=y diff --git a/samples/net/rpl-mesh-qemu/root/prj_qemu.conf b/samples/net/rpl-mesh-qemu/root/prj_qemu.conf index 210296ee870..e420c92f910 100644 --- a/samples/net/rpl-mesh-qemu/root/prj_qemu.conf +++ b/samples/net/rpl-mesh-qemu/root/prj_qemu.conf @@ -57,9 +57,9 @@ CONFIG_NET_L2_IEEE802154_SHELL=y CONFIG_NET_SLIP_TAP=n # Application Settings -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_IEEE802154_DEV_NAME="IEEE802154_UPIPE" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_UPIPE" # MAC Setup CONFIG_IEEE802154_UPIPE_RANDOM_MAC=n diff --git a/samples/net/rpl_border_router/README.rst b/samples/net/rpl_border_router/README.rst index 4a83f5cb75e..1f5a4010161 100644 --- a/samples/net/rpl_border_router/README.rst +++ b/samples/net/rpl_border_router/README.rst @@ -42,8 +42,8 @@ can be defined in the project configuration file: .. code-block:: console - CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" - CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" + CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" + CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" Note that the IPv4 address is only used for connection to the integrated web server that provides an admin web page for management purposes. The web server diff --git a/samples/net/rpl_border_router/prj_frdm_k64f_mcr20a.conf b/samples/net/rpl_border_router/prj_frdm_k64f_mcr20a.conf index 7410ad6ff3f..a2282abb53b 100644 --- a/samples/net/rpl_border_router/prj_frdm_k64f_mcr20a.conf +++ b/samples/net/rpl_border_router/prj_frdm_k64f_mcr20a.conf @@ -84,12 +84,12 @@ CONFIG_NET_DEBUG_HTTP=n CONFIG_MBEDTLS_DEBUG=n # Network application settings -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y # This is the ethernet interface setting for admin purposes -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" # Set a proper hostname for the router CONFIG_NET_HOSTNAME_ENABLE=y @@ -121,10 +121,10 @@ CONFIG_NET_DEFAULT_IF_ETHERNET=y CONFIG_NET_L2_IEEE802154_SHELL=y CONFIG_NET_L2_IEEE802154=y CONFIG_NET_L2_IEEE802154_FRAGMENT=y -CONFIG_NET_APP_IEEE802154_CHANNEL=18 +CONFIG_NET_CONFIG_IEEE802154_CHANNEL=18 # IEEE MCR20A 802.15.4 options -CONFIG_NET_APP_IEEE802154_DEV_NAME="mcr20a" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="mcr20a" CONFIG_IEEE802154_MCR20A=y CONFIG_SPI=y diff --git a/samples/net/rpl_border_router/src/config.h b/samples/net/rpl_border_router/src/config.h index aa72e8c20f3..ea6e134f2b8 100644 --- a/samples/net/rpl_border_router/src/config.h +++ b/samples/net/rpl_border_router/src/config.h @@ -14,11 +14,11 @@ */ #define APP_STARTUP_TIME K_SECONDS(20) -#ifdef CONFIG_NET_APP_SETTINGS +#ifdef CONFIG_NET_CONFIG_SETTINGS #ifdef CONFIG_NET_IPV6 -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR #else -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR #endif #else #ifdef CONFIG_NET_IPV6 diff --git a/samples/net/rpl_node/boards/nrf52840_pca10056.conf b/samples/net/rpl_node/boards/nrf52840_pca10056.conf index b7e4f6b78b4..57914ccc034 100644 --- a/samples/net/rpl_node/boards/nrf52840_pca10056.conf +++ b/samples/net/rpl_node/boards/nrf52840_pca10056.conf @@ -1,4 +1,4 @@ CONFIG_IEEE802154_NRF5=y CONFIG_IEEE802154_NRF5_DRV_NAME="IEEE802154_nrf5" CONFIG_IEEE802154_NRF5_INIT_PRIO=80 -CONFIG_NET_APP_IEEE802154_DEV_NAME="IEEE802154_nrf5" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_nrf5" diff --git a/samples/net/rpl_node/boards/quark_se_c1000_devboard.conf b/samples/net/rpl_node/boards/quark_se_c1000_devboard.conf index fe7fd4cef95..e96a82ca80c 100644 --- a/samples/net/rpl_node/boards/quark_se_c1000_devboard.conf +++ b/samples/net/rpl_node/boards/quark_se_c1000_devboard.conf @@ -1,7 +1,7 @@ CONFIG_IEEE802154_CC2520=y -CONFIG_NET_APP_IEEE802154_DEV_NAME="cc2520" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520" CONFIG_IEEE802154_CC2520_RANDOM_MAC=n CONFIG_IEEE802154_CC2520_MAC4=0x00 diff --git a/samples/net/rpl_node/prj.conf b/samples/net/rpl_node/prj.conf index 166f05b263c..111924aa902 100644 --- a/samples/net/rpl_node/prj.conf +++ b/samples/net/rpl_node/prj.conf @@ -70,5 +70,5 @@ CONFIG_NET_DEBUG_L2_IEEE802154=n CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=n CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=0 -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_IEEE802154_CHANNEL=18 +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_IEEE802154_CHANNEL=18 diff --git a/samples/net/sntp_client/prj.conf b/samples/net/sntp_client/prj.conf index d0cecf054c0..d87281d1834 100644 --- a/samples/net/sntp_client/prj.conf +++ b/samples/net/sntp_client/prj.conf @@ -12,13 +12,13 @@ CONFIG_NET_SHELL=y CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" # Network debug config CONFIG_NET_LOG=y diff --git a/samples/net/sntp_client/src/main.c b/samples/net/sntp_client/src/main.c index 7243dbd0fa3..f1abb120c70 100644 --- a/samples/net/sntp_client/src/main.c +++ b/samples/net/sntp_client/src/main.c @@ -33,7 +33,7 @@ void main(void) /* ipv4 */ rv = sntp_init(&ctx, - CONFIG_NET_APP_PEER_IPV4_ADDR, + CONFIG_NET_CONFIG_PEER_IPV4_ADDR, SNTP_PORT, K_FOREVER); if (rv < 0) { @@ -52,7 +52,7 @@ void main(void) /* ipv6 */ rv = sntp_init(&ctx, - CONFIG_NET_APP_PEER_IPV6_ADDR, + CONFIG_NET_CONFIG_PEER_IPV6_ADDR, SNTP_PORT, K_NO_WAIT); if (rv < 0) { diff --git a/samples/net/sockets/big_http_download/prj.conf b/samples/net/sockets/big_http_download/prj.conf index 2a7830c47ff..67f28f8852c 100644 --- a/samples/net/sockets/big_http_download/prj.conf +++ b/samples/net/sockets/big_http_download/prj.conf @@ -21,11 +21,11 @@ CONFIG_DNS_SERVER1="192.0.2.2" CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_MY_IPV4_GW="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2" # DHCP configuration. Until DHCP address is assigned, # static configuration above is used instead. CONFIG_NET_DHCPV4=y diff --git a/samples/net/sockets/big_http_download/prj_tls.conf b/samples/net/sockets/big_http_download/prj_tls.conf index a6b0afb9da4..3dd3827b507 100644 --- a/samples/net/sockets/big_http_download/prj_tls.conf +++ b/samples/net/sockets/big_http_download/prj_tls.conf @@ -19,11 +19,11 @@ CONFIG_DNS_SERVER1="192.0.2.2" CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_MY_IPV4_GW="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2" # DHCP configuration. Until DHCP address is assigned, # static configuration above is used instead. CONFIG_NET_DHCPV4=y diff --git a/samples/net/sockets/dumb_http_server/prj.conf b/samples/net/sockets/dumb_http_server/prj.conf index 19931dce79f..c1099d31c2e 100644 --- a/samples/net/sockets/dumb_http_server/prj.conf +++ b/samples/net/sockets/dumb_http_server/prj.conf @@ -13,10 +13,10 @@ CONFIG_NET_SOCKETS_POSIX_NAMES=y CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" # Networking tweaks # Required to handle large number of consecutive connections, diff --git a/samples/net/sockets/echo/prj.conf b/samples/net/sockets/echo/prj.conf index 96344b682e2..af705b52a32 100644 --- a/samples/net/sockets/echo/prj.conf +++ b/samples/net/sockets/echo/prj.conf @@ -13,10 +13,10 @@ CONFIG_NET_SOCKETS_POSIX_NAMES=y CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" # Network debug config #CONFIG_NET_DEBUG_SOCKETS=y diff --git a/samples/net/sockets/echo_async/prj.conf b/samples/net/sockets/echo_async/prj.conf index bfab069ab9b..309e68204ee 100644 --- a/samples/net/sockets/echo_async/prj.conf +++ b/samples/net/sockets/echo_async/prj.conf @@ -14,14 +14,14 @@ CONFIG_NET_SOCKETS_POLL_MAX=5 CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_BT_NODE=y # Network debug config #CONFIG_NET_DEBUG_SOCKETS=y diff --git a/samples/net/sockets/echo_client/prj.conf b/samples/net/sockets/echo_client/prj.conf index a55e10c8b87..2b6c9ec9827 100644 --- a/samples/net/sockets/echo_client/prj.conf +++ b/samples/net/sockets/echo_client/prj.conf @@ -39,8 +39,8 @@ CONFIG_NET_SHELL=y # The addresses are selected so that qemu<->qemu connectivity works ok. # For linux<->qemu connectivity, create a new conf file and swap the # addresses (so that peer address is ending to 2). -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.1" diff --git a/samples/net/sockets/echo_client/src/common.h b/samples/net/sockets/echo_client/src/common.h index af41a303c8b..384e38e36cc 100644 --- a/samples/net/sockets/echo_client/src/common.h +++ b/samples/net/sockets/echo_client/src/common.h @@ -35,12 +35,12 @@ struct configs { struct data ipv6; }; -#if !defined(CONFIG_NET_APP_PEER_IPV4_ADDR) -#define CONFIG_NET_APP_PEER_IPV4_ADDR "" +#if !defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR) +#define CONFIG_NET_CONFIG_PEER_IPV4_ADDR "" #endif -#if !defined(CONFIG_NET_APP_PEER_IPV6_ADDR) -#define CONFIG_NET_APP_PEER_IPV6_ADDR "" +#if !defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR) +#define CONFIG_NET_CONFIG_PEER_IPV6_ADDR "" #endif extern const char lorem_ipsum[]; diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c index 0d2d8ac1a39..287848d4cfe 100644 --- a/samples/net/sockets/echo_client/src/tcp.c +++ b/samples/net/sockets/echo_client/src/tcp.c @@ -184,7 +184,7 @@ int start_tcp(void) if (IS_ENABLED(CONFIG_NET_IPV6)) { addr6.sin6_family = AF_INET6; addr6.sin6_port = htons(PEER_PORT); - inet_pton(AF_INET6, CONFIG_NET_APP_PEER_IPV6_ADDR, + inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &addr6.sin6_addr); ret = start_tcp_proto(&conf.ipv6, (struct sockaddr *)&addr6, @@ -197,7 +197,7 @@ int start_tcp(void) if (IS_ENABLED(CONFIG_NET_IPV4)) { addr4.sin_family = AF_INET; addr4.sin_port = htons(PEER_PORT); - inet_pton(AF_INET, CONFIG_NET_APP_PEER_IPV4_ADDR, + inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &addr4.sin_addr); ret = start_tcp_proto(&conf.ipv4, (struct sockaddr *)&addr4, diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c index 2abceb31ddd..dfbe8295187 100644 --- a/samples/net/sockets/echo_client/src/udp.c +++ b/samples/net/sockets/echo_client/src/udp.c @@ -188,7 +188,7 @@ int start_udp(void) if (IS_ENABLED(CONFIG_NET_IPV6)) { addr6.sin6_family = AF_INET6; addr6.sin6_port = htons(PEER_PORT); - inet_pton(AF_INET6, CONFIG_NET_APP_PEER_IPV6_ADDR, + inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &addr6.sin6_addr); ret = start_udp_proto(&conf.ipv6, (struct sockaddr *)&addr6, @@ -201,7 +201,7 @@ int start_udp(void) if (IS_ENABLED(CONFIG_NET_IPV4)) { addr4.sin_family = AF_INET; addr4.sin_port = htons(PEER_PORT); - inet_pton(AF_INET, CONFIG_NET_APP_PEER_IPV4_ADDR, + inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &addr4.sin_addr); ret = start_udp_proto(&conf.ipv4, (struct sockaddr *)&addr4, diff --git a/samples/net/sockets/echo_server/prj.conf b/samples/net/sockets/echo_server/prj.conf index baa0b327985..71401f76cac 100644 --- a/samples/net/sockets/echo_server/prj.conf +++ b/samples/net/sockets/echo_server/prj.conf @@ -36,8 +36,8 @@ CONFIG_NET_MAX_CONTEXTS=10 CONFIG_NET_SHELL=y # Network application options and configuration -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/sockets/http_get/prj.conf b/samples/net/sockets/http_get/prj.conf index c2e01b27647..7c02a408f17 100644 --- a/samples/net/sockets/http_get/prj.conf +++ b/samples/net/sockets/http_get/prj.conf @@ -17,11 +17,11 @@ CONFIG_DNS_SERVER1="192.0.2.2" CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_MY_IPV4_GW="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2" # Network debug config CONFIG_NET_LOG=y diff --git a/samples/net/sockets/http_get/prj_tls.conf b/samples/net/sockets/http_get/prj_tls.conf index eccd8b0f33e..5dade79ad18 100644 --- a/samples/net/sockets/http_get/prj_tls.conf +++ b/samples/net/sockets/http_get/prj_tls.conf @@ -17,11 +17,11 @@ CONFIG_DNS_SERVER1="192.0.2.2" CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_MY_IPV4_GW="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2" # Network debug config CONFIG_NET_LOG=y diff --git a/samples/net/stats/prj.conf b/samples/net/stats/prj.conf index 32a8ec11378..0929ee333ab 100644 --- a/samples/net/stats/prj.conf +++ b/samples/net/stats/prj.conf @@ -36,12 +36,12 @@ CONFIG_NET_SHELL=y # Application configuration CONFIG_NET_APP_SERVER=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_SETTINGS=y # First interface will use these settings -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" # Logging CONFIG_SYS_LOG_SHOW_COLOR=y diff --git a/samples/net/syslog_net/prj.conf b/samples/net/syslog_net/prj.conf index cb6e61815b2..2561918be5e 100644 --- a/samples/net/syslog_net/prj.conf +++ b/samples/net/syslog_net/prj.conf @@ -28,13 +28,13 @@ CONFIG_NET_DHCPV4=n CONFIG_NET_SHELL=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" # syslog net backend config CONFIG_SYS_LOG_BACKEND_NET=y diff --git a/samples/net/syslog_net/src/main.c b/samples/net/syslog_net/src/main.c index 6cefcc22175..3803258074a 100644 --- a/samples/net/syslog_net/src/main.c +++ b/samples/net/syslog_net/src/main.c @@ -37,7 +37,7 @@ static void init_app(void) #if defined(CONFIG_NET_IPV6) if (server_addr.sa_family == AF_INET6) { snprintk(cmd, sizeof(cmd), "net ping %s", - CONFIG_NET_APP_PEER_IPV6_ADDR); + CONFIG_NET_CONFIG_PEER_IPV6_ADDR); shell_exec(cmd); return; } @@ -46,7 +46,7 @@ static void init_app(void) #if defined(CONFIG_NET_IPV4) if (server_addr.sa_family == AF_INET) { snprintk(cmd, sizeof(cmd), "net ping %s", - CONFIG_NET_APP_PEER_IPV4_ADDR); + CONFIG_NET_CONFIG_PEER_IPV4_ADDR); shell_exec(cmd); return; } diff --git a/samples/net/telnet/prj.conf b/samples/net/telnet/prj.conf index f94a3c02ee5..d63bd2bfbd8 100644 --- a/samples/net/telnet/prj.conf +++ b/samples/net/telnet/prj.conf @@ -27,9 +27,9 @@ CONFIG_NET_LOG_GLOBAL=y CONFIG_SYS_LOG_NET_LEVEL=2 CONFIG_SYS_LOG_SHOW_COLOR=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_SHELL=y CONFIG_KERNEL_SHELL=y diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c index e9af170261e..f7f1cb47d23 100644 --- a/samples/net/telnet/src/telnet.c +++ b/samples/net/telnet/src/telnet.c @@ -74,7 +74,7 @@ static void setup_dhcpv4(struct net_if *iface) #if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4) -#if !defined(CONFIG_NET_APP_MY_IPV4_ADDR) +#if !defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR) #error "You need to define an IPv4 Address or enable DHCPv4!" #endif @@ -83,8 +83,8 @@ static void setup_ipv4(struct net_if *iface) char hr_addr[NET_IPV4_ADDR_LEN]; struct in_addr addr; - if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, &addr)) { - NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV4_ADDR); + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) { + NET_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR); return; } @@ -102,7 +102,7 @@ static void setup_ipv4(struct net_if *iface) #define MCAST_IP6ADDR "ff84::2" -#ifndef CONFIG_NET_APP_MY_IPV6_ADDR +#ifndef CONFIG_NET_CONFIG_MY_IPV6_ADDR #error "You need to define an IPv6 Address!" #endif @@ -111,8 +111,8 @@ static void setup_ipv6(struct net_if *iface) char hr_addr[NET_IPV6_ADDR_LEN]; struct in6_addr addr; - if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR, &addr)) { - NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV6_ADDR); + if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &addr)) { + NET_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV6_ADDR); return; } diff --git a/samples/net/throughput_server/prj_frdm_k64f.conf b/samples/net/throughput_server/prj_frdm_k64f.conf index 3b5f08544f1..a1e8d926b2e 100644 --- a/samples/net/throughput_server/prj_frdm_k64f.conf +++ b/samples/net/throughput_server/prj_frdm_k64f.conf @@ -28,14 +28,14 @@ CONFIG_NET_MAX_CONTEXTS=3 # Do not enable shell as that will use precious ram CONFIG_NET_SHELL=n -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_APP_SERVER=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_DEBUG_NET_PKT=n CONFIG_NET_DEBUG_APP=n diff --git a/samples/net/traffic_class/prj.conf b/samples/net/traffic_class/prj.conf index 44a8cd55577..96e3d6e06a2 100644 --- a/samples/net/traffic_class/prj.conf +++ b/samples/net/traffic_class/prj.conf @@ -26,17 +26,17 @@ CONFIG_NET_SHELL=y CONFIG_NET_L2_ETHERNET=y CONFIG_NET_APP_CLIENT=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_INIT_TIMEOUT=15 +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_INIT_TIMEOUT=15 # First ethernet interface will use these settings -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8:100::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8:100::2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8:100::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8:100::2" # TEST-NET-2 from RFC 5737 -CONFIG_NET_APP_MY_IPV4_ADDR="198.51.100.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="198.51.100.2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="198.51.100.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="198.51.100.2" # VLAN tag for the first interface CONFIG_SAMPLE_VLAN_TAG=100 diff --git a/samples/net/traffic_class/src/main.c b/samples/net/traffic_class/src/main.c index 6daecf57273..8419d413c4d 100644 --- a/samples/net/traffic_class/src/main.c +++ b/samples/net/traffic_class/src/main.c @@ -512,9 +512,9 @@ static void setup_clients(void) if (i % 2) { NET_DBG("TC %d connecting to %s", i, - CONFIG_NET_APP_PEER_IPV6_ADDR); + CONFIG_NET_CONFIG_PEER_IPV6_ADDR); ret = connect_udp(AF_INET6, &udp6[i], - CONFIG_NET_APP_PEER_IPV6_ADDR, + CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &conf.ipv6[i], i); } else { NET_DBG("TC %d connecting to %s", i, @@ -539,9 +539,9 @@ static void setup_clients(void) if (i % 2) { NET_DBG("TC %d connecting to %s", i, - CONFIG_NET_APP_PEER_IPV4_ADDR); + CONFIG_NET_CONFIG_PEER_IPV4_ADDR); ret = connect_udp(AF_INET, &udp4[i], - CONFIG_NET_APP_PEER_IPV4_ADDR, + CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &conf.ipv4[i], i); } else { NET_DBG("TC %d connecting to %s", i, diff --git a/samples/net/vlan/prj.conf b/samples/net/vlan/prj.conf index 10814bac70a..8ad4e31506f 100644 --- a/samples/net/vlan/prj.conf +++ b/samples/net/vlan/prj.conf @@ -26,16 +26,16 @@ CONFIG_NET_SHELL=y CONFIG_NET_L2_ETHERNET=y CONFIG_NET_APP_SERVER=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_SETTINGS=y # First ethernet interface will use these settings -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8:100::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8:100::2" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8:100::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8:100::2" # TEST-NET-2 from RFC 5737 -CONFIG_NET_APP_MY_IPV4_ADDR="198.51.100.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="198.51.100.2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="198.51.100.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="198.51.100.2" # VLAN tag for the first interface CONFIG_SAMPLE_VLAN_TAG=100 diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c index ce9afe382dd..2c59fb8df76 100644 --- a/samples/net/wpan_serial/src/main.c +++ b/samples/net/wpan_serial/src/main.c @@ -540,22 +540,22 @@ static bool init_ieee802154(void) IEEE802154_FILTER_TYPE_IEEE_ADDR, &filter); -#ifdef CONFIG_NET_APP_SETTINGS - SYS_LOG_INF("Set panid %x", CONFIG_NET_APP_IEEE802154_PAN_ID); +#ifdef CONFIG_NET_CONFIG_SETTINGS + SYS_LOG_INF("Set panid %x", CONFIG_NET_CONFIG_IEEE802154_PAN_ID); - filter.pan_id = CONFIG_NET_APP_IEEE802154_PAN_ID; + filter.pan_id = CONFIG_NET_CONFIG_IEEE802154_PAN_ID; radio_api->filter(ieee802154_dev, true, IEEE802154_FILTER_TYPE_PAN_ID, &filter); -#endif /* CONFIG_NET_APP_SETTINGS */ +#endif /* CONFIG_NET_CONFIG_SETTINGS */ } -#ifdef CONFIG_NET_APP_SETTINGS - SYS_LOG_INF("Set channel %x", CONFIG_NET_APP_IEEE802154_CHANNEL); +#ifdef CONFIG_NET_CONFIG_SETTINGS + SYS_LOG_INF("Set channel %x", CONFIG_NET_CONFIG_IEEE802154_CHANNEL); radio_api->set_channel(ieee802154_dev, - CONFIG_NET_APP_IEEE802154_CHANNEL); -#endif /* CONFIG_NET_APP_SETTINGS */ + CONFIG_NET_CONFIG_IEEE802154_CHANNEL); +#endif /* CONFIG_NET_CONFIG_SETTINGS */ /* Start ieee802154 */ radio_api->start(ieee802154_dev); diff --git a/samples/net/wpanusb/overlay-cc1200.conf b/samples/net/wpanusb/overlay-cc1200.conf index 3a6fbdee2b6..739b0ab86d0 100644 --- a/samples/net/wpanusb/overlay-cc1200.conf +++ b/samples/net/wpanusb/overlay-cc1200.conf @@ -1,2 +1,2 @@ CONFIG_IEEE802154_CC1200=y -CONFIG_NET_APP_IEEE802154_DEV_NAME="cc1200" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc1200" diff --git a/samples/net/wpanusb/overlay-cc2520.conf b/samples/net/wpanusb/overlay-cc2520.conf index d024314be5e..ad7f6e99157 100644 --- a/samples/net/wpanusb/overlay-cc2520.conf +++ b/samples/net/wpanusb/overlay-cc2520.conf @@ -1,2 +1,2 @@ CONFIG_IEEE802154_CC2520=y -CONFIG_NET_APP_IEEE802154_DEV_NAME="cc2520" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520" diff --git a/samples/net/wpanusb/overlay-mcr20a.conf b/samples/net/wpanusb/overlay-mcr20a.conf index 7cb05a0134e..09340c88688 100644 --- a/samples/net/wpanusb/overlay-mcr20a.conf +++ b/samples/net/wpanusb/overlay-mcr20a.conf @@ -1,2 +1,2 @@ CONFIG_IEEE802154_MCR20A=y -CONFIG_NET_APP_IEEE802154_DEV_NAME="mcr20a" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="mcr20a" diff --git a/samples/net/wpanusb/prj.conf b/samples/net/wpanusb/prj.conf index f4e51bc567b..540809a2eef 100644 --- a/samples/net/wpanusb/prj.conf +++ b/samples/net/wpanusb/prj.conf @@ -21,5 +21,5 @@ CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_SHELL=y CONFIG_KERNEL_SHELL=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_AUTO_INIT=n +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_AUTO_INIT=n diff --git a/samples/net/wpanusb/src/wpanusb.c b/samples/net/wpanusb/src/wpanusb.c index f0add743e2b..b4ff68df647 100644 --- a/samples/net/wpanusb/src/wpanusb.c +++ b/samples/net/wpanusb/src/wpanusb.c @@ -507,7 +507,7 @@ void main(void) SYS_LOG_INF("Start"); - ieee802154_dev = device_get_binding(CONFIG_NET_APP_IEEE802154_DEV_NAME); + ieee802154_dev = device_get_binding(CONFIG_NET_CONFIG_IEEE802154_DEV_NAME); if (!ieee802154_dev) { SYS_LOG_ERR("Cannot get IEEE802.15.4 device"); return; diff --git a/samples/net/ws_console/prj.conf b/samples/net/ws_console/prj.conf index ffee021ed63..d9f0a0fa01d 100644 --- a/samples/net/ws_console/prj.conf +++ b/samples/net/ws_console/prj.conf @@ -24,11 +24,11 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4 # Network application settings CONFIG_NET_APP=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" # HTTP & Websocket options CONFIG_WEBSOCKET=y diff --git a/samples/net/ws_console/prj_tls.conf b/samples/net/ws_console/prj_tls.conf index f8b1bd59800..031e12416ab 100644 --- a/samples/net/ws_console/prj_tls.conf +++ b/samples/net/ws_console/prj_tls.conf @@ -24,11 +24,11 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4 # Network application settings CONFIG_NET_APP=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" # HTTP & Websocket options CONFIG_WEBSOCKET=y diff --git a/samples/net/ws_console/src/config.h b/samples/net/ws_console/src/config.h index 475ed0221bc..204935cd570 100644 --- a/samples/net/ws_console/src/config.h +++ b/samples/net/ws_console/src/config.h @@ -12,11 +12,11 @@ */ #define APP_STARTUP_TIME K_SECONDS(20) -#ifdef CONFIG_NET_APP_SETTINGS +#ifdef CONFIG_NET_CONFIG_SETTINGS #ifdef CONFIG_NET_IPV6 -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR #else -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR #endif #else #ifdef CONFIG_NET_IPV6 diff --git a/samples/net/ws_echo_server/prj.conf b/samples/net/ws_echo_server/prj.conf index e67363be022..f105f9c2966 100644 --- a/samples/net/ws_echo_server/prj.conf +++ b/samples/net/ws_echo_server/prj.conf @@ -24,11 +24,11 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4 # Network application settings CONFIG_NET_APP=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" # HTTP & Websocket options CONFIG_WEBSOCKET=y diff --git a/samples/net/ws_echo_server/prj_tls.conf b/samples/net/ws_echo_server/prj_tls.conf index f73bef7b975..5c2d5acc808 100644 --- a/samples/net/ws_echo_server/prj_tls.conf +++ b/samples/net/ws_echo_server/prj_tls.conf @@ -24,11 +24,11 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4 # Network application settings CONFIG_NET_APP=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" # HTTP & Websocket options CONFIG_WEBSOCKET=y diff --git a/samples/net/ws_echo_server/src/config.h b/samples/net/ws_echo_server/src/config.h index 475ed0221bc..204935cd570 100644 --- a/samples/net/ws_echo_server/src/config.h +++ b/samples/net/ws_echo_server/src/config.h @@ -12,11 +12,11 @@ */ #define APP_STARTUP_TIME K_SECONDS(20) -#ifdef CONFIG_NET_APP_SETTINGS +#ifdef CONFIG_NET_CONFIG_SETTINGS #ifdef CONFIG_NET_IPV6 -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR #else -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR #endif #else #ifdef CONFIG_NET_IPV6 diff --git a/samples/net/zperf/prj_bt.conf b/samples/net/zperf/prj_bt.conf index a702bae2678..b55ce6c0900 100644 --- a/samples/net/zperf/prj_bt.conf +++ b/samples/net/zperf/prj_bt.conf @@ -28,6 +28,6 @@ CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_SHELL=y CONFIG_PRINTK=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" diff --git a/samples/net/zperf/prj_frdm_k64f.conf b/samples/net/zperf/prj_frdm_k64f.conf index f154443fe4d..6beacc8c933 100644 --- a/samples/net/zperf/prj_frdm_k64f.conf +++ b/samples/net/zperf/prj_frdm_k64f.conf @@ -30,8 +30,8 @@ CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_SHELL=y CONFIG_PRINTK=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/zperf/prj_netusb.conf b/samples/net/zperf/prj_netusb.conf index c210b505651..5b009dcd357 100644 --- a/samples/net/zperf/prj_netusb.conf +++ b/samples/net/zperf/prj_netusb.conf @@ -37,6 +37,6 @@ CONFIG_SYS_LOG_USB_DEVICE_LEVEL=3 # Select USB Configurations CONFIG_USB_DEVICE_NETWORK_ECM=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" diff --git a/samples/net/zperf/prj_qemu_x86.conf b/samples/net/zperf/prj_qemu_x86.conf index 47e2032ecb0..097f655538e 100644 --- a/samples/net/zperf/prj_qemu_x86.conf +++ b/samples/net/zperf/prj_qemu_x86.conf @@ -29,8 +29,8 @@ CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_SHELL=y CONFIG_PRINTK=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/zperf/prj_quark_se_c1000_devboard.conf b/samples/net/zperf/prj_quark_se_c1000_devboard.conf index cfd59209c73..caf2051d0f0 100644 --- a/samples/net/zperf/prj_quark_se_c1000_devboard.conf +++ b/samples/net/zperf/prj_quark_se_c1000_devboard.conf @@ -31,6 +31,6 @@ CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_SHELL=y CONFIG_PRINTK=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" diff --git a/samples/net/zperf/src/zperf_internal.h b/samples/net/zperf/src/zperf_internal.h index a6c43f266be..93d34e84284 100644 --- a/samples/net/zperf/src/zperf_internal.h +++ b/samples/net/zperf/src/zperf_internal.h @@ -16,14 +16,14 @@ #define MY_PREFIX_LEN_STR IP6PREFIX_STR(MY_PREFIX_LEN) /* Note that you can set local endpoint address in config file */ -#if defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_APP_SETTINGS) -#define MY_IP6ADDR CONFIG_NET_APP_MY_IPV6_ADDR -#define DST_IP6ADDR CONFIG_NET_APP_PEER_IPV6_ADDR +#if defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_CONFIG_SETTINGS) +#define MY_IP6ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR +#define DST_IP6ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR #endif -#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_APP_SETTINGS) -#define MY_IP4ADDR CONFIG_NET_APP_MY_IPV4_ADDR -#define DST_IP4ADDR CONFIG_NET_APP_PEER_IPV4_ADDR +#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_CONFIG_SETTINGS) +#define MY_IP4ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR +#define DST_IP4ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR #endif #define PACKET_SIZE_MAX 1024 diff --git a/subsys/net/lib/CMakeLists.txt b/subsys/net/lib/CMakeLists.txt index b421cd5343c..82076be59ac 100644 --- a/subsys/net/lib/CMakeLists.txt +++ b/subsys/net/lib/CMakeLists.txt @@ -4,7 +4,7 @@ add_subdirectory_if_kconfig(sntp) add_subdirectory_ifdef(CONFIG_DNS_RESOLVER dns) add_subdirectory_ifdef(CONFIG_MQTT_LIB mqtt) add_subdirectory_ifdef(CONFIG_NET_APP app) -add_subdirectory_ifdef(CONFIG_NET_APP_SETTINGS config) +add_subdirectory_ifdef(CONFIG_NET_CONFIG_SETTINGS config) add_subdirectory_ifdef(CONFIG_NET_SOCKETS sockets) add_subdirectory_ifdef(CONFIG_TLS_CREDENTIALS tls_credentials) add_subdirectory_ifdef(CONFIG_WEBSOCKET websocket) diff --git a/subsys/net/lib/config/CMakeLists.txt b/subsys/net/lib/config/CMakeLists.txt index 778b5af644e..868621950f2 100644 --- a/subsys/net/lib/config/CMakeLists.txt +++ b/subsys/net/lib/config/CMakeLists.txt @@ -3,9 +3,9 @@ zephyr_library_compile_definitions_ifdef( CONFIG_NEWLIB_LIBC __LINUX_ERRNO_EXTENSIONS__ ) -zephyr_library_sources_ifdef(CONFIG_NET_APP_SETTINGS init.c) +zephyr_library_sources_ifdef(CONFIG_NET_CONFIG_SETTINGS init.c) -if(CONFIG_NET_APP_SETTINGS) +if(CONFIG_NET_CONFIG_SETTINGS) zephyr_library_sources_ifdef( CONFIG_NET_L2_IEEE802154 ieee802154_settings.c diff --git a/subsys/net/lib/config/Kconfig b/subsys/net/lib/config/Kconfig index ae077e24e29..f43e754492c 100644 --- a/subsys/net/lib/config/Kconfig +++ b/subsys/net/lib/config/Kconfig @@ -6,49 +6,49 @@ # SPDX-License-Identifier: Apache-2.0 # -config NET_APP_AUTO_INIT +config NET_CONFIG_AUTO_INIT bool "Init networking support automatically during device startup" default y help If this option is set, then the net_app API is automatically initialized when the device is started. If you do not wish to do - this, then disable this and call net_app_init() in your application. + this, then disable this and call net_config_init() in your application. -config NET_APP_INIT_PRIO +config NET_CONFIG_INIT_PRIO int "Startup priority for the network application init" default 95 - depends on NET_APP_AUTO_INIT + depends on NET_CONFIG_AUTO_INIT -config NET_APP_INIT_TIMEOUT +config NET_CONFIG_INIT_TIMEOUT int "How long to wait for networking to be ready and available" default 30 - depends on NET_APP_AUTO_INIT + depends on NET_CONFIG_AUTO_INIT help The value is in seconds. If for example IPv4 address from DHCPv4 is not - received within this limit, then the net_app_init() call will fail + received within this limit, then the net_config_init() call will fail during the device startup. -config NET_APP_NEED_IPV6 +config NET_CONFIG_NEED_IPV6 bool "This application wants IPv6 support" - depends on NET_APP_AUTO_INIT + depends on NET_CONFIG_AUTO_INIT select NET_IPV6 help The network application needs IPv6 support to function properly. This option makes sure the network application is initialized properly in order to use IPv6. -config NET_APP_NEED_IPV6_ROUTER +config NET_CONFIG_NEED_IPV6_ROUTER bool "This application wants IPv6 router to exists" - depends on NET_APP_AUTO_INIT + depends on NET_CONFIG_AUTO_INIT depends on NET_IPV6 help The network application needs IPv6 router to exists before continuing. What this means that the application wants to wait until it receives IPv6 router advertisement message before continuing. -config NET_APP_NEED_IPV4 +config NET_CONFIG_NEED_IPV4 bool "This application wants IPv4 support" - depends on NET_APP_AUTO_INIT + depends on NET_CONFIG_AUTO_INIT select NET_IPV4 help The network application needs IPv4 support to function properly. @@ -61,9 +61,8 @@ config NET_DEBUG_CONFIG help Enables net config library to output debug messages -menuconfig NET_APP_SETTINGS +menuconfig NET_CONFIG_SETTINGS bool "Set network settings for applications" - depends on NET_APP select NET_MGMT select NET_MGMT_EVENT help @@ -73,16 +72,16 @@ menuconfig NET_APP_SETTINGS Beware this is not meant to be used for proper provisioning but quick sampling/testing. -if NET_APP_SETTINGS +if NET_CONFIG_SETTINGS if NET_IPV6 -config NET_APP_MY_IPV6_ADDR +config NET_CONFIG_MY_IPV6_ADDR string "My IPv6 address" help Use 2001:db8::1 here if uncertain. -config NET_APP_PEER_IPV6_ADDR +config NET_CONFIG_PEER_IPV6_ADDR string "Peer IPv6 address" help This is only applicable in client side applications that try @@ -93,25 +92,25 @@ endif # NET_IPV6 if NET_IPV4 -config NET_APP_MY_IPV4_ADDR +config NET_CONFIG_MY_IPV4_ADDR string "My IPv4 address" help Use 192.0.2.1 here if uncertain. -config NET_APP_MY_IPV4_NETMASK +config NET_CONFIG_MY_IPV4_NETMASK string "My IPv4 netmask" default "255.255.255.0" help Static netmask to use if not overridden by DHCP. Use empty value to skip setting static value. -config NET_APP_MY_IPV4_GW +config NET_CONFIG_MY_IPV4_GW string "My IPv4 gateway" help Static gateway to use if not overridden by DHCP. Use empty value to skip setting static value. -config NET_APP_PEER_IPV4_ADDR +config NET_CONFIG_PEER_IPV4_ADDR string "Peer IPv4 address" help This is only applicable in client side applications that try @@ -122,7 +121,7 @@ endif # NET_IPV4 if NET_L2_IEEE802154 || IEEE802154_RAW_MODE || NET_L2_OPENTHREAD -config NET_APP_IEEE802154_DEV_NAME +config NET_CONFIG_IEEE802154_DEV_NAME string "IEEE 802.15.4 device name" help The device name to get bindings from in the sample application. @@ -131,33 +130,33 @@ endif # NET_L2_IEEE802154 || IEEE802154_RAW_MODE || NET_L2_OPENTHREAD if NET_L2_IEEE802154 || IEEE802154_RAW_MODE -config NET_APP_IEEE802154_PAN_ID +config NET_CONFIG_IEEE802154_PAN_ID hex "IEEE 802.15.4 PAN ID" default 0xabcd help The PAN ID to use by default in the sample. -config NET_APP_IEEE802154_CHANNEL +config NET_CONFIG_IEEE802154_CHANNEL int "IEEE 802.15.4 channel" default 26 help The channel to use by default in the sample application. -config NET_APP_IEEE802154_RADIO_TX_POWER +config NET_CONFIG_IEEE802154_RADIO_TX_POWER int "IEEE 802.15.4 TX power in dbm" default 0 help The TX power to use by default in the sample application. See NET_L2_IEEE802154_RADIO_DFLT_TX_POWER for more info. -config NET_APP_IEEE802154_SECURITY_KEY +config NET_CONFIG_IEEE802154_SECURITY_KEY string "IEEE 802.15.4 security key" default "moooh!" depends on NET_L2_IEEE802154_SECURITY help The key string to use for the link-layer security part. -config NET_APP_IEEE802154_SECURITY_KEY_MODE +config NET_CONFIG_IEEE802154_SECURITY_KEY_MODE int "IEEE 802.15.4 security key mode" default 0 range 0 0 @@ -166,7 +165,7 @@ config NET_APP_IEEE802154_SECURITY_KEY_MODE The key mode to use for the link-layer security part. Only implicit mode is supported, thus 0. -config NET_APP_IEEE802154_SECURITY_LEVEL +config NET_CONFIG_IEEE802154_SECURITY_LEVEL int "IEEE 802.15.4 security level (0-7)" default 0 range 0 7 @@ -186,7 +185,7 @@ endif # NET_L2_IEEE802154 || IEEE802154_RAW_MODE if NET_L2_BT -config NET_APP_BT_NODE +config NET_CONFIG_BT_NODE bool "Enable Bluetooth node support" select NET_L2_BT_MGMT help @@ -195,4 +194,4 @@ config NET_APP_BT_NODE endif # NET_L2_BT -endif # NET_APP_SETTINGS +endif # NET_CONFIG_SETTINGS diff --git a/subsys/net/lib/config/bt_settings.c b/subsys/net/lib/config/bt_settings.c index 94f151b6bb0..6947cab98bc 100644 --- a/subsys/net/lib/config/bt_settings.c +++ b/subsys/net/lib/config/bt_settings.c @@ -18,7 +18,7 @@ #include #include -#if defined(CONFIG_NET_APP_BT_NODE) +#if defined(CONFIG_NET_CONFIG_BT_NODE) #define ADV_STR "on" static struct bt_gatt_attr attrs[] = { @@ -29,7 +29,7 @@ static struct bt_gatt_attr attrs[] = { static struct bt_gatt_service ipss_svc = BT_GATT_SERVICE(attrs); #endif -int _net_app_bt_setup(void) +int _net_config_bt_setup(void) { struct net_if *iface; struct device *dev; @@ -50,7 +50,7 @@ int _net_app_bt_setup(void) return -EINVAL; } -#if defined(CONFIG_NET_APP_BT_NODE) +#if defined(CONFIG_NET_CONFIG_BT_NODE) bt_gatt_service_register(&ipss_svc); if (net_mgmt(NET_REQUEST_BT_ADVERTISE, iface, ADV_STR, diff --git a/subsys/net/lib/config/bt_settings.h b/subsys/net/lib/config/bt_settings.h index 696f9d8d3dd..ac10809a2ae 100644 --- a/subsys/net/lib/config/bt_settings.h +++ b/subsys/net/lib/config/bt_settings.h @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_NET_L2_BT) && defined(CONFIG_NET_APP_SETTINGS) -int _net_app_bt_setup(void); +#if defined(CONFIG_NET_L2_BT) && defined(CONFIG_NET_CONFIG_SETTINGS) +int _net_config_bt_setup(void); #else -#define _net_app_bt_setup(...) 0 +#define _net_config_bt_setup(...) 0 #endif diff --git a/subsys/net/lib/config/ieee802154_settings.c b/subsys/net/lib/config/ieee802154_settings.c index b32edd35547..3d336266baa 100644 --- a/subsys/net/lib/config/ieee802154_settings.c +++ b/subsys/net/lib/config/ieee802154_settings.c @@ -14,25 +14,25 @@ #include #include -int _net_app_ieee802154_setup(void) +int _net_config_ieee802154_setup(void) { - u16_t channel = CONFIG_NET_APP_IEEE802154_CHANNEL; - u16_t pan_id = CONFIG_NET_APP_IEEE802154_PAN_ID; - s16_t tx_power = CONFIG_NET_APP_IEEE802154_RADIO_TX_POWER; + u16_t channel = CONFIG_NET_CONFIG_IEEE802154_CHANNEL; + u16_t pan_id = CONFIG_NET_CONFIG_IEEE802154_PAN_ID; + s16_t tx_power = CONFIG_NET_CONFIG_IEEE802154_RADIO_TX_POWER; #ifdef CONFIG_NET_L2_IEEE802154_SECURITY struct ieee802154_security_params sec_params = { - .key = CONFIG_NET_APP_IEEE802154_SECURITY_KEY, - .key_len = sizeof(CONFIG_NET_APP_IEEE802154_SECURITY_KEY), - .key_mode = CONFIG_NET_APP_IEEE802154_SECURITY_KEY_MODE, - .level = CONFIG_NET_APP_IEEE802154_SECURITY_LEVEL, + .key = CONFIG_NET_CONFIG_IEEE802154_SECURITY_KEY, + .key_len = sizeof(CONFIG_NET_CONFIG_IEEE802154_SECURITY_KEY), + .key_mode = CONFIG_NET_CONFIG_IEEE802154_SECURITY_KEY_MODE, + .level = CONFIG_NET_CONFIG_IEEE802154_SECURITY_LEVEL, }; #endif /* CONFIG_NET_L2_IEEE802154_SECURITY */ struct net_if *iface; struct device *dev; - dev = device_get_binding(CONFIG_NET_APP_IEEE802154_DEV_NAME); + dev = device_get_binding(CONFIG_NET_CONFIG_IEEE802154_DEV_NAME); if (!dev) { return -ENODEV; } diff --git a/subsys/net/lib/config/ieee802154_settings.h b/subsys/net/lib/config/ieee802154_settings.h index b65a92f6674..7307179196c 100644 --- a/subsys/net/lib/config/ieee802154_settings.h +++ b/subsys/net/lib/config/ieee802154_settings.h @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_NET_L2_IEEE802154) && defined(CONFIG_NET_APP_SETTINGS) -int _net_app_ieee802154_setup(void); +#if defined(CONFIG_NET_L2_IEEE802154) && defined(CONFIG_NET_CONFIG_SETTINGS) +int _net_config_ieee802154_setup(void); #else -#define _net_app_ieee802154_setup(...) 0 +#define _net_config_ieee802154_setup(...) 0 #endif diff --git a/subsys/net/lib/config/init.c b/subsys/net/lib/config/init.c index e3f054140b6..ccca2dad652 100644 --- a/subsys/net/lib/config/init.c +++ b/subsys/net/lib/config/init.c @@ -94,11 +94,11 @@ static void setup_dhcpv4(struct net_if *iface) #endif /* CONFIG_NET_DHCPV4 */ #if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4) && \ - !defined(CONFIG_NET_APP_MY_IPV4_ADDR) + !defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR) #error "You need to define an IPv4 address or enable DHCPv4!" #endif -#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_APP_MY_IPV4_ADDR) +#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR) static void setup_ipv4(struct net_if *iface) { @@ -107,13 +107,13 @@ static void setup_ipv4(struct net_if *iface) #endif struct in_addr addr; - if (sizeof(CONFIG_NET_APP_MY_IPV4_ADDR) == 1) { + if (sizeof(CONFIG_NET_CONFIG_MY_IPV4_ADDR) == 1) { /* Empty address, skip setting ANY address in this case */ return; } - if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, &addr)) { - NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV4_ADDR); + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) { + NET_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR); return; } @@ -138,23 +138,23 @@ static void setup_ipv4(struct net_if *iface) net_addr_ntop(AF_INET, &addr, hr_addr, NET_IPV4_ADDR_LEN)); #endif - if (sizeof(CONFIG_NET_APP_MY_IPV4_NETMASK) > 1) { + if (sizeof(CONFIG_NET_CONFIG_MY_IPV4_NETMASK) > 1) { /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_NETMASK, + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, &addr)) { NET_ERR("Invalid netmask: %s", - CONFIG_NET_APP_MY_IPV4_NETMASK); + CONFIG_NET_CONFIG_MY_IPV4_NETMASK); } else { net_if_ipv4_set_netmask(iface, &addr); } } - if (sizeof(CONFIG_NET_APP_MY_IPV4_GW) > 1) { + if (sizeof(CONFIG_NET_CONFIG_MY_IPV4_GW) > 1) { /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_GW, + if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_GW, &addr)) { NET_ERR("Invalid gateway: %s", - CONFIG_NET_APP_MY_IPV4_GW); + CONFIG_NET_CONFIG_MY_IPV4_GW); } else { net_if_ipv4_set_gw(iface, &addr); } @@ -169,7 +169,7 @@ static void setup_ipv4(struct net_if *iface) #endif /* CONFIG_NET_IPV4 && !CONFIG_NET_DHCPV4 */ #if defined(CONFIG_NET_IPV6) -#if !defined(CONFIG_NET_APP_MY_IPV6_ADDR) +#if !defined(CONFIG_NET_CONFIG_MY_IPV6_ADDR) #error "You need to define an IPv6 address!" #endif @@ -232,13 +232,13 @@ static void setup_ipv6(struct net_if *iface, u32_t flags) struct net_if_addr *ifaddr; u32_t mask = NET_EVENT_IPV6_DAD_SUCCEED; - if (sizeof(CONFIG_NET_APP_MY_IPV6_ADDR) == 1) { + if (sizeof(CONFIG_NET_CONFIG_MY_IPV6_ADDR) == 1) { /* Empty address, skip setting ANY address in this case */ return; } - if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR, &laddr)) { - NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV6_ADDR); + if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &laddr)) { + NET_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV6_ADDR); /* some interfaces may add IP address later */ mask |= NET_EVENT_IPV6_ADDR_ADD; } @@ -262,7 +262,7 @@ static void setup_ipv6(struct net_if *iface, u32_t flags) NET_ADDR_MANUAL, 0); if (!ifaddr) { NET_ERR("Cannot add %s to interface", - CONFIG_NET_APP_MY_IPV6_ADDR); + CONFIG_NET_CONFIG_MY_IPV6_ADDR); } } @@ -346,7 +346,7 @@ static inline void syslog_net_init(void) #endif } -#if defined(CONFIG_NET_APP_AUTO_INIT) +#if defined(CONFIG_NET_CONFIG_AUTO_INIT) static int init_net_app(struct device *device) { u32_t flags = 0; @@ -356,32 +356,32 @@ static int init_net_app(struct device *device) #if defined(CONFIG_NET_IPV6) /* IEEE 802.15.4 is only usable if IPv6 is enabled */ - ret = _net_app_ieee802154_setup(); + ret = _net_config_ieee802154_setup(); if (ret < 0) { NET_ERR("Cannot setup IEEE 802.15.4 interface (%d)", ret); } - ret = _net_app_bt_setup(); + ret = _net_config_bt_setup(); if (ret < 0) { NET_ERR("Cannot setup Bluetooth interface (%d)", ret); } #endif - if (IS_ENABLED(CONFIG_NET_APP_NEED_IPV6)) { + if (IS_ENABLED(CONFIG_NET_CONFIG_NEED_IPV6)) { flags |= NET_CONFIG_NEED_IPV6; } - if (IS_ENABLED(CONFIG_NET_APP_NEED_IPV6_ROUTER)) { + if (IS_ENABLED(CONFIG_NET_CONFIG_NEED_IPV6_ROUTER)) { flags |= NET_CONFIG_NEED_ROUTER; } - if (IS_ENABLED(CONFIG_NET_APP_NEED_IPV4)) { + if (IS_ENABLED(CONFIG_NET_CONFIG_NEED_IPV4)) { flags |= NET_CONFIG_NEED_IPV4; } /* Initialize the application automatically if needed */ ret = net_config_init("Initializing network", flags, - K_SECONDS(CONFIG_NET_APP_INIT_TIMEOUT)); + K_SECONDS(CONFIG_NET_CONFIG_INIT_TIMEOUT)); if (ret < 0) { NET_ERR("Network initialization failed (%d)", ret); } @@ -394,5 +394,5 @@ static int init_net_app(struct device *device) return ret; } -SYS_INIT(init_net_app, APPLICATION, CONFIG_NET_APP_INIT_PRIO); -#endif /* CONFIG_NET_APP_AUTO_INIT */ +SYS_INIT(init_net_app, APPLICATION, CONFIG_NET_CONFIG_INIT_PRIO); +#endif /* CONFIG_NET_CONFIG_AUTO_INIT */ diff --git a/subsys/net/lib/dns/Kconfig b/subsys/net/lib/dns/Kconfig index c2c111ca59e..651002d5af0 100644 --- a/subsys/net/lib/dns/Kconfig +++ b/subsys/net/lib/dns/Kconfig @@ -140,7 +140,7 @@ config MDNS_RESPONDER_INIT_PRIO int "Startup priority for the mDNS responder init" default 96 help - Note that if NET_APP_AUTO_INIT is enabled, then this value + Note that if NET_CONFIG_AUTO_INIT is enabled, then this value should be bigger than its value. config NET_DEBUG_MDNS_RESPONDER @@ -186,7 +186,7 @@ config LLMNR_RESPONDER_INIT_PRIO int "Startup priority for the LLMNR responder init" default 96 help - Note that if NET_APP_AUTO_INIT is enabled, then this value + Note that if NET_CONFIG_AUTO_INIT is enabled, then this value should be bigger than its value. config NET_DEBUG_LLMNR_RESPONDER diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c index 8b17b83199b..5433a322370 100644 --- a/subsys/net/lib/openthread/platform/radio.c +++ b/subsys/net/lib/openthread/platform/radio.c @@ -66,7 +66,7 @@ void platformRadioInit(void) { dataInit(); - radio_dev = device_get_binding(CONFIG_NET_APP_IEEE802154_DEV_NAME); + radio_dev = device_get_binding(CONFIG_NET_CONFIG_IEEE802154_DEV_NAME); __ASSERT_NO_MSG(radio_dev != NULL); radio_api = (struct ieee802154_radio_api *)radio_dev->driver_api; diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf index 606f6b91cbe..5af1a32ffac 100644 --- a/tests/net/all/prj.conf +++ b/tests/net/all/prj.conf @@ -141,18 +141,18 @@ CONFIG_NET_MAX_6LO_CONTEXTS=2 CONFIG_NET_DEBUG_6LO=y # Sample application generic options -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_APP_IEEE802154_DEV_NAME="FOO-BAR" -CONFIG_NET_APP_IEEE802154_PAN_ID=0x1234 -CONFIG_NET_APP_IEEE802154_CHANNEL=15 -CONFIG_NET_APP_IEEE802154_SECURITY_KEY="key" -CONFIG_NET_APP_IEEE802154_SECURITY_KEY_MODE=0 -CONFIG_NET_APP_IEEE802154_SECURITY_LEVEL=0 -CONFIG_NET_APP_BT_NODE=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="FOO-BAR" +CONFIG_NET_CONFIG_IEEE802154_PAN_ID=0x1234 +CONFIG_NET_CONFIG_IEEE802154_CHANNEL=15 +CONFIG_NET_CONFIG_IEEE802154_SECURITY_KEY="key" +CONFIG_NET_CONFIG_IEEE802154_SECURITY_KEY_MODE=0 +CONFIG_NET_CONFIG_IEEE802154_SECURITY_LEVEL=0 +CONFIG_NET_CONFIG_BT_NODE=y # Network management CONFIG_NET_MGMT=y diff --git a/tests/net/app/prj-no-ipv4.conf b/tests/net/app/prj-no-ipv4.conf index ba2cba6cb3a..0d10b996c09 100644 --- a/tests/net/app/prj-no-ipv4.conf +++ b/tests/net/app/prj-no-ipv4.conf @@ -21,11 +21,11 @@ CONFIG_NET_BUF_TX_COUNT=10 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IPV6_MAX_NEIGHBORS=8 CONFIG_NET_APP=y -CONFIG_NET_APP_AUTO_INIT=n CONFIG_NET_APP_SERVER=y CONFIG_NET_APP_CLIENT=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_AUTO_INIT=n +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" CONFIG_ZTEST=y #CONFIG_NET_DEBUG_APP=y #CONFIG_SYS_LOG_NET_LEVEL=4 diff --git a/tests/net/app/prj-no-ipv6.conf b/tests/net/app/prj-no-ipv6.conf index c14a34640e2..42f50a83f2b 100644 --- a/tests/net/app/prj-no-ipv6.conf +++ b/tests/net/app/prj-no-ipv6.conf @@ -17,11 +17,11 @@ CONFIG_NET_BUF_RX_COUNT=10 CONFIG_NET_BUF_TX_COUNT=10 CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3 CONFIG_NET_APP=y -CONFIG_NET_APP_AUTO_INIT=n CONFIG_NET_APP_SERVER=y CONFIG_NET_APP_CLIENT=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_AUTO_INIT=n +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" CONFIG_ZTEST=y #CONFIG_NET_DEBUG_APP=y #CONFIG_SYS_LOG_NET_LEVEL=4 diff --git a/tests/net/app/prj-with-dns.conf b/tests/net/app/prj-with-dns.conf index 3e6434285f0..0c0f6c6af1e 100644 --- a/tests/net/app/prj-with-dns.conf +++ b/tests/net/app/prj-with-dns.conf @@ -23,12 +23,12 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IPV6_MAX_NEIGHBORS=8 CONFIG_NET_APP=y -CONFIG_NET_APP_AUTO_INIT=n CONFIG_NET_APP_SERVER=y CONFIG_NET_APP_CLIENT=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_AUTO_INIT=n +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" CONFIG_ZTEST=y CONFIG_DNS_RESOLVER=y diff --git a/tests/net/app/prj.conf b/tests/net/app/prj.conf index 3281b2a2c0a..4780555d612 100644 --- a/tests/net/app/prj.conf +++ b/tests/net/app/prj.conf @@ -23,12 +23,12 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IPV6_MAX_NEIGHBORS=8 CONFIG_NET_APP=y -CONFIG_NET_APP_AUTO_INIT=n CONFIG_NET_APP_SERVER=y CONFIG_NET_APP_CLIENT=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_AUTO_INIT=n +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" CONFIG_ZTEST=y #CONFIG_NET_DEBUG_APP=y #CONFIG_SYS_LOG_NET_LEVEL=4 diff --git a/tests/net/checksum_offload/prj.conf b/tests/net/checksum_offload/prj.conf index aec4318a4c0..e2d1395cae2 100644 --- a/tests/net/checksum_offload/prj.conf +++ b/tests/net/checksum_offload/prj.conf @@ -23,7 +23,7 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IPV6_ND=n CONFIG_ZTEST=y CONFIG_NET_APP=n -CONFIG_NET_APP_SETTINGS=n +CONFIG_NET_CONFIG_SETTINGS=n CONFIG_NET_DEBUG_L2_ETHERNET=n CONFIG_NET_DEBUG_CONTEXT=n CONFIG_NET_DEBUG_IF=n diff --git a/tests/net/lib/mqtt_publisher/prj.conf b/tests/net/lib/mqtt_publisher/prj.conf index 462a7613c72..c9342459893 100644 --- a/tests/net/lib/mqtt_publisher/prj.conf +++ b/tests/net/lib/mqtt_publisher/prj.conf @@ -19,12 +19,12 @@ CONFIG_NET_IPV4=y # Enable the MQTT Lib CONFIG_MQTT_LIB=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" CONFIG_MAIN_STACK_SIZE=2048 diff --git a/tests/net/lib/mqtt_publisher/prj_tls.conf b/tests/net/lib/mqtt_publisher/prj_tls.conf index 95ada4710f9..ab5aa470efa 100644 --- a/tests/net/lib/mqtt_publisher/prj_tls.conf +++ b/tests/net/lib/mqtt_publisher/prj_tls.conf @@ -25,12 +25,12 @@ CONFIG_NET_IPV6=y CONFIG_MQTT_LIB=y CONFIG_MQTT_LIB_TLS=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.101" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.168.1.10" CONFIG_MAIN_STACK_SIZE=2048 diff --git a/tests/net/lib/mqtt_publisher/src/config.h b/tests/net/lib/mqtt_publisher/src/config.h index d8e0f9923be..6508dfe1e0e 100644 --- a/tests/net/lib/mqtt_publisher/src/config.h +++ b/tests/net/lib/mqtt_publisher/src/config.h @@ -7,13 +7,13 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ -#ifdef CONFIG_NET_APP_SETTINGS +#ifdef CONFIG_NET_CONFIG_SETTINGS #ifdef CONFIG_NET_IPV6 -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR #else -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR #endif #else #ifdef CONFIG_NET_IPV6 diff --git a/tests/net/lib/mqtt_subscriber/prj.conf b/tests/net/lib/mqtt_subscriber/prj.conf index 30a16dca9a8..368a9c283dd 100644 --- a/tests/net/lib/mqtt_subscriber/prj.conf +++ b/tests/net/lib/mqtt_subscriber/prj.conf @@ -19,12 +19,12 @@ CONFIG_NET_IPV4=y # Enable the MQTT Lib CONFIG_MQTT_LIB=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" CONFIG_MAIN_STACK_SIZE=2048 diff --git a/tests/net/lib/mqtt_subscriber/src/config.h b/tests/net/lib/mqtt_subscriber/src/config.h index d8e0f9923be..6508dfe1e0e 100644 --- a/tests/net/lib/mqtt_subscriber/src/config.h +++ b/tests/net/lib/mqtt_subscriber/src/config.h @@ -7,13 +7,13 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ -#ifdef CONFIG_NET_APP_SETTINGS +#ifdef CONFIG_NET_CONFIG_SETTINGS #ifdef CONFIG_NET_IPV6 -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR #else -#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR -#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR +#define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR +#define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR #endif #else #ifdef CONFIG_NET_IPV6 diff --git a/tests/net/ptp/clock/prj.conf b/tests/net/ptp/clock/prj.conf index 9f45121b5c3..13c1486a1f6 100644 --- a/tests/net/ptp/clock/prj.conf +++ b/tests/net/ptp/clock/prj.conf @@ -21,7 +21,7 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IPV6_ND=n CONFIG_ZTEST=y CONFIG_NET_APP=n -CONFIG_NET_APP_SETTINGS=n +CONFIG_NET_CONFIG_SETTINGS=n CONFIG_NET_DEBUG_L2_ETHERNET=n CONFIG_NET_DEBUG_CONTEXT=n CONFIG_NET_DEBUG_IF=n diff --git a/tests/net/socket/getaddrinfo/prj.conf b/tests/net/socket/getaddrinfo/prj.conf index e326debf517..d529146183e 100644 --- a/tests/net/socket/getaddrinfo/prj.conf +++ b/tests/net/socket/getaddrinfo/prj.conf @@ -14,9 +14,9 @@ CONFIG_NET_SOCKETS_POSIX_NAMES=y CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" # Enable the DNS resolver CONFIG_DNS_RESOLVER=y diff --git a/tests/net/socket/tcp/prj.conf b/tests/net/socket/tcp/prj.conf index 82192550693..cbc463c2e8d 100644 --- a/tests/net/socket/tcp/prj.conf +++ b/tests/net/socket/tcp/prj.conf @@ -17,11 +17,11 @@ CONFIG_NET_LOOPBACK=y CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" CONFIG_MAIN_STACK_SIZE=2048 diff --git a/tests/net/socket/tcp/src/main.c b/tests/net/socket/tcp/src/main.c index 8a38b8971eb..d864e217d18 100644 --- a/tests/net/socket/tcp/src/main.c +++ b/tests/net/socket/tcp/src/main.c @@ -155,12 +155,12 @@ void test_v4_send_recv(void) struct sockaddr addr; socklen_t addrlen = sizeof(addr); - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); @@ -195,12 +195,12 @@ void test_v6_send_recv(void) struct sockaddr addr; socklen_t addrlen = sizeof(addr); - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); @@ -234,12 +234,12 @@ void test_v4_sendto_recvfrom(void) struct sockaddr addr; socklen_t addrlen = sizeof(addr); - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); @@ -277,12 +277,12 @@ void test_v6_sendto_recvfrom(void) struct sockaddr addr; socklen_t addrlen = sizeof(addr); - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); @@ -321,12 +321,12 @@ void test_v4_sendto_recvfrom_null_dest(void) struct sockaddr addr; socklen_t addrlen = sizeof(addr); - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); @@ -361,12 +361,12 @@ void test_v6_sendto_recvfrom_null_dest(void) struct sockaddr addr; socklen_t addrlen = sizeof(addr); - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); diff --git a/tests/net/socket/udp/prj.conf b/tests/net/socket/udp/prj.conf index 4b29cd5f926..9245f75baac 100644 --- a/tests/net/socket/udp/prj.conf +++ b/tests/net/socket/udp/prj.conf @@ -13,9 +13,9 @@ CONFIG_NET_SOCKETS_POSIX_NAMES=y CONFIG_TEST_RANDOM_GENERATOR=y # Network address config -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" # Network debug config #CONFIG_NET_LOG=y diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c index 9097d24640c..8b97b69e2ec 100644 --- a/tests/net/socket/udp/src/main.c +++ b/tests/net/socket/udp/src/main.c @@ -128,12 +128,12 @@ void test_v4_sendto_recvfrom(void) struct sockaddr_in client_addr; struct sockaddr_in server_addr; - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); @@ -165,12 +165,12 @@ void test_v6_sendto_recvfrom(void) struct sockaddr_in6 client_addr; struct sockaddr_in6 server_addr; - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, ANY_PORT, &client_sock, &client_addr); - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); @@ -202,12 +202,12 @@ void test_v4_bind_sendto(void) struct sockaddr_in client_addr; struct sockaddr_in server_addr; - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, CLIENT_PORT, &client_sock, &client_addr); - prepare_sock_v4(CONFIG_NET_APP_MY_IPV4_ADDR, + prepare_sock_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); @@ -244,12 +244,12 @@ void test_v6_bind_sendto(void) struct sockaddr_in6 client_addr; struct sockaddr_in6 server_addr; - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, CLIENT_PORT, &client_sock, &client_addr); - prepare_sock_v6(CONFIG_NET_APP_MY_IPV6_ADDR, + prepare_sock_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); diff --git a/tests/net/traffic_class/prj.conf b/tests/net/traffic_class/prj.conf index 2180d437fa6..60085b241da 100644 --- a/tests/net/traffic_class/prj.conf +++ b/tests/net/traffic_class/prj.conf @@ -30,7 +30,7 @@ CONFIG_NET_TC_TX_COUNT=8 CONFIG_NET_TC_RX_COUNT=8 CONFIG_ZTEST=y CONFIG_NET_APP=n -CONFIG_NET_APP_SETTINGS=n +CONFIG_NET_CONFIG_SETTINGS=n CONFIG_NET_DEBUG_L2_ETHERNET=n CONFIG_NET_DEBUG_CONTEXT=n CONFIG_NET_DEBUG_IF=n diff --git a/tests/net/tx_timestamp/prj.conf b/tests/net/tx_timestamp/prj.conf index 48c6da2a90d..45089106800 100644 --- a/tests/net/tx_timestamp/prj.conf +++ b/tests/net/tx_timestamp/prj.conf @@ -21,7 +21,7 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IPV6_ND=n CONFIG_ZTEST=y CONFIG_NET_APP=n -CONFIG_NET_APP_SETTINGS=n +CONFIG_NET_CONFIG_SETTINGS=n CONFIG_NET_DEBUG_L2_ETHERNET=n CONFIG_NET_DEBUG_CONTEXT=n CONFIG_NET_DEBUG_IF=n diff --git a/tests/net/vlan/prj.conf b/tests/net/vlan/prj.conf index 076eea15d3e..b04260d8df6 100644 --- a/tests/net/vlan/prj.conf +++ b/tests/net/vlan/prj.conf @@ -25,7 +25,7 @@ CONFIG_NET_VLAN_COUNT=4 CONFIG_NET_CONTEXT_PRIORITY=y CONFIG_ZTEST=y CONFIG_NET_APP=n -CONFIG_NET_APP_SETTINGS=n +CONFIG_NET_CONFIG_SETTINGS=n CONFIG_NET_DEBUG_L2_ETHERNET=n CONFIG_NET_DEBUG_CONTEXT=n CONFIG_NET_DEBUG_IF=n diff --git a/tests/net/websocket/prj.conf b/tests/net/websocket/prj.conf index 5d321efa72d..462a110c602 100644 --- a/tests/net/websocket/prj.conf +++ b/tests/net/websocket/prj.conf @@ -34,13 +34,13 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4 # Network application settings CONFIG_NET_APP=y -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_NEED_IPV6=y -CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_INIT_TIMEOUT=1 CONFIG_NET_APP_CLIENT=y +CONFIG_NET_CONFIG_SETTINGS=y +CONFIG_NET_CONFIG_NEED_IPV6=y +CONFIG_NET_CONFIG_NEED_IPV4=y +CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" +CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" +CONFIG_NET_CONFIG_INIT_TIMEOUT=1 # HTTP & Websocket options CONFIG_WEBSOCKET=y diff --git a/tests/net/websocket/src/main.c b/tests/net/websocket/src/main.c index e82259d37bb..f1550cb74cd 100644 --- a/tests/net/websocket/src/main.c +++ b/tests/net/websocket/src/main.c @@ -330,15 +330,15 @@ void test_v6_init(void) { int ret; - ret = net_ipaddr_parse(CONFIG_NET_APP_MY_IPV6_ADDR, - strlen(CONFIG_NET_APP_MY_IPV6_ADDR), + ret = net_ipaddr_parse(CONFIG_NET_CONFIG_MY_IPV6_ADDR, + strlen(CONFIG_NET_CONFIG_MY_IPV6_ADDR), &server_addr); zassert_equal(ret, 1, "cannot parse server address"); ret = net_app_init_tcp_client(&app_ctx_v6, NULL, NULL, - CONFIG_NET_APP_MY_IPV6_ADDR, + CONFIG_NET_CONFIG_MY_IPV6_ADDR, 80, 0, NULL); @@ -453,15 +453,15 @@ void test_v4_init(void) { int ret; - ret = net_ipaddr_parse(CONFIG_NET_APP_MY_IPV4_ADDR, - strlen(CONFIG_NET_APP_MY_IPV4_ADDR), + ret = net_ipaddr_parse(CONFIG_NET_CONFIG_MY_IPV4_ADDR, + strlen(CONFIG_NET_CONFIG_MY_IPV4_ADDR), &server_addr); zassert_equal(ret, 1, "cannot parse server address"); ret = net_app_init_tcp_client(&app_ctx_v4, NULL, NULL, - CONFIG_NET_APP_MY_IPV4_ADDR, + CONFIG_NET_CONFIG_MY_IPV4_ADDR, 80, 0, NULL);