net: config: Rename Kconfig options to correspond to library name

This finishes refactor of splitting off net_config library name from
net_app library, started in c60df1311, c89a06dbc. This commit makes
sure that Kconfig options are prefixed with CONFIG_NET_CONFIG_
instead of CONFIG_NET_APP_, and propagates these changes thru the
app configs in the tree.

Also, minor dependency, etc. tweaks are made.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
This commit is contained in:
Paul Sokolovsky 2018-08-12 09:32:12 +03:00 committed by Anas Nashif
commit 028aae1ec9
166 changed files with 733 additions and 734 deletions

View file

@ -16,7 +16,7 @@ config NUM_IRQS
int int
default 48 default 48
config NET_APP_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default IEEE802154_NRF5_DRV_NAME default IEEE802154_NRF5_DRV_NAME
endif # SOC_NRF52840_QIAA endif # SOC_NRF52840_QIAA

View file

@ -95,7 +95,7 @@ endif # NET_L2_OPENTHREAD
config IEEE802154_KW41Z config IEEE802154_KW41Z
def_bool y def_bool y
config NET_APP_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default IEEE802154_KW41Z_DRV_NAME default IEEE802154_KW41Z_DRV_NAME
endif # NETWORKING endif # NETWORKING

View file

@ -11,14 +11,14 @@ if SOC_QUARK_SE_C1000
config SOC config SOC
default "quark_se_c1000" default "quark_se_c1000"
if IEEE802154 && NET_APP_SETTINGS if IEEE802154 && NET_CONFIG_SETTINGS
config IEEE802154_CC2520 config IEEE802154_CC2520
def_bool y def_bool y
config NET_APP_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default IEEE802154_CC2520_DRV_NAME default IEEE802154_CC2520_DRV_NAME
endif # IEEE802154 && NET_APP_SETTINGS endif # IEEE802154 && NET_CONFIG_SETTINGS
endif endif

View file

@ -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 configure the networking subsystem for the application. The following
configuration options control this configuration: 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. 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 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 function will be automatically called when the system boots. This option is
enabled by default. 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 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 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 takes too long or the DHCPv4 server is not found, the system will resume
booting after this number of seconds. 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 specifies that the application needs IPv6 connectivity. The
:cpp:func:`net_app_init()` function will wait until it is able to setup an :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 IPv6 address for the system before continuing. This means that the IPv6
duplicate address detection (DAD) has finished and the system has properly duplicate address detection (DAD) has finished and the system has properly
setup the IPv6 address. 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 specifies that the application needs IPv6 router connectivity; i.e., it needs
access to external networks (such as the Internet). The access to external networks (such as the Internet). The
:cpp:func:`net_app_init()` function will wait until it receives a router :cpp:func:`net_app_init()` function will wait until it receives a router
advertisement (RA) message from the IPv6 router before continuing. 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 specifies that the application needs IPv4 connectivity. The
:cpp:func:`net_app_init()` function will wait, unless a static IP address is :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 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 Various system level network configuration options can be added to the project
configuration file. These settings are enabled by the 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 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 generic support for the networking feature is disabled. For example, the IPv6
net-app options are only available if generic IPv6 support is enabled. 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 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 useful in device testing as normally the system should use SLAAC (IPv6
Stateless Address Auto Configuration), which is enabled by default in the 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` controlled by the :option:`CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT`
configuration option. 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 This option specifies what is the peer device IPv6 address. This is only
useful when testing client/server type applications. This peer address is useful when testing client/server type applications. This peer address is
typically used as a parameter when calling :cpp:func:`net_app_connect()`. 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 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 useful only in device testing as normally the system should use DHCPv4 to
discover the IPv4 address. 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 This option specifies what is the peer device IPv4 address. This is only
useful when testing client/server type applications. This peer address is useful when testing client/server type applications. This peer address is
typically used as a parameter when connecting to other device. 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 The following options are only available if IEEE 802.15.4 wireless network
technology support is enabled. 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. 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. This option specifies the used PAN identifier.
Note that the PAN id can be changed at runtime if needed. 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. This option specifies the used radio channel.
Note that the used channel can be changed at runtime if needed. 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 This option specifies the initial radio TX power level. The TX power level can
be changed at runtime if needed. 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 This option specifies the initially used security key. The security key can be
changed at runtime if needed. 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 This option specifies the initially used security key mode. The security key
mode can be changed at runtime if needed. 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 This option specifies the initially used security level. The used security
level can be changed at runtime if needed. level can be changed at runtime if needed.

View file

@ -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, To access the internet from a Zephyr application using IPv4,
a gateway should be set via DHCP or configured manually. a gateway should be set via DHCP or configured manually.
For applications using the "Settings" part of :ref:`net_app_api` For applications using the "Settings" part of :ref:`net_app_api`
facility (with the config option :option:`CONFIG_NET_APP_SETTINGS` enabled), facility (with the config option :option:`CONFIG_NET_CONFIG_SETTINGS` enabled),
set the :option:`CONFIG_NET_APP_MY_IPV4_GW` option to the IP address 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 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. gateway by calling the :c:func:`net_if_ipv4_set_gw` at runtime.

View file

@ -20,9 +20,9 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2
CONFIG_NET_MAX_CONTEXTS=6 CONFIG_NET_MAX_CONTEXTS=6
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_BT_NODE=y CONFIG_NET_CONFIG_BT_NODE=y
CONFIG_SYS_LOG=y CONFIG_SYS_LOG=y

View file

@ -27,7 +27,7 @@ CONFIG_NET_MAX_CONTEXTS=6
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_BT_SHELL=y CONFIG_BT_SHELL=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_BT_NODE=y CONFIG_NET_CONFIG_BT_NODE=y

View file

@ -21,9 +21,9 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2
CONFIG_NET_MAX_CONTEXTS=6 CONFIG_NET_MAX_CONTEXTS=6
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_BT_NODE=y CONFIG_NET_CONFIG_BT_NODE=y
CONFIG_SYS_LOG=y CONFIG_SYS_LOG=y

View file

@ -69,10 +69,10 @@ static inline void init_app(void)
k_sem_init(&quit_lock, 0, UINT_MAX); k_sem_init(&quit_lock, 0, UINT_MAX);
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_APP_MY_IPV6_ADDR, CONFIG_NET_CONFIG_MY_IPV6_ADDR,
&in6addr_my) < 0) { &in6addr_my) < 0) {
SYS_LOG_ERR("Invalid IPv6 address %s", SYS_LOG_ERR("Invalid IPv6 address %s",
CONFIG_NET_APP_MY_IPV6_ADDR); CONFIG_NET_CONFIG_MY_IPV6_ADDR);
} }
do { do {

View file

@ -6,11 +6,11 @@ CONFIG_ENTROPY_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_COAP=y CONFIG_COAP=y
CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_CLIENT=y CONFIG_NET_APP_CLIENT=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_NEED_IPV6=y
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_NET_LOG=y CONFIG_NET_LOG=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y

View file

@ -16,6 +16,6 @@ CONFIG_NET_MGMT_EVENT=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_L2_BT_SHELL=y CONFIG_NET_L2_BT_SHELL=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"

View file

@ -146,17 +146,17 @@ static int init_app(void)
struct sockaddr_in6 my_addr; struct sockaddr_in6 my_addr;
int r; 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)) { &my_addr.sin6_addr)) {
NET_ERR("Invalid my IPv6 address: %s", NET_ERR("Invalid my IPv6 address: %s",
CONFIG_NET_APP_MY_IPV6_ADDR); CONFIG_NET_CONFIG_MY_IPV6_ADDR);
return -1; 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)) { &peer_addr.sin6_addr)) {
NET_ERR("Invalid peer IPv6 address: %s", NET_ERR("Invalid peer IPv6 address: %s",
CONFIG_NET_APP_PEER_IPV6_ADDR); CONFIG_NET_CONFIG_PEER_IPV6_ADDR);
return -1; return -1;
} }

View file

@ -5,10 +5,10 @@ CONFIG_ENTROPY_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_COAP=y CONFIG_COAP=y
CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_SERVER=y CONFIG_NET_APP_SERVER=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" 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_IF_MCAST_IPV6_ADDR_COUNT=5
CONFIG_NET_LOG=y CONFIG_NET_LOG=y

View file

@ -11,7 +11,7 @@ CONFIG_NET_LOG=y
CONFIG_NET_UDP=y CONFIG_NET_UDP=y
CONFIG_NET_L2_BT=y CONFIG_NET_L2_BT=y
CONFIG_NET_DEBUG_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=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_ENTROPY_GENERATOR=y CONFIG_ENTROPY_GENERATOR=y

View file

@ -6,7 +6,7 @@ CONFIG_NET_UDP=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_IEEE802154_CC2520=y CONFIG_IEEE802154_CC2520=y
CONFIG_COAP=y CONFIG_COAP=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_IEEE802154_CHANNEL=20 CONFIG_NET_CONFIG_IEEE802154_CHANNEL=20
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"

View file

@ -1305,12 +1305,12 @@ static bool join_coap_multicast_group(void)
return false; return false;
} }
#if defined(CONFIG_NET_APP_SETTINGS) #if defined(CONFIG_NET_CONFIG_SETTINGS)
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_APP_MY_IPV6_ADDR, CONFIG_NET_CONFIG_MY_IPV6_ADDR,
&my_addr) < 0) { &my_addr) < 0) {
NET_ERR("Invalid IPv6 address %s", NET_ERR("Invalid IPv6 address %s",
CONFIG_NET_APP_MY_IPV6_ADDR); CONFIG_NET_CONFIG_MY_IPV6_ADDR);
} }
#endif #endif

View file

@ -23,6 +23,6 @@ CONFIG_MBEDTLS_CFG_FILE="config-coap.h"
CONFIG_COAP=y CONFIG_COAP=y
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=256 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=256
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::3" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::3"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1"

View file

@ -412,12 +412,12 @@ static struct k_thread thread_data;
static inline int init_app(void) 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, if (net_addr_pton(AF_INET6,
CONFIG_NET_APP_MY_IPV6_ADDR, CONFIG_NET_CONFIG_MY_IPV6_ADDR,
(struct sockaddr *)&client_addr) < 0) { (struct sockaddr *)&client_addr) < 0) {
mbedtls_printf("Invalid IPv6 address %s", mbedtls_printf("Invalid IPv6 address %s",
CONFIG_NET_APP_MY_IPV6_ADDR); CONFIG_NET_CONFIG_MY_IPV6_ADDR);
} }
#endif #endif
if (!net_if_ipv6_addr_add(net_if_get_default(), &client_addr, if (!net_if_ipv6_addr_add(net_if_get_default(), &client_addr,

View file

@ -185,12 +185,12 @@ int udp_init(struct udp_context *ctx)
ctx->remaining = 0; ctx->remaining = 0;
ctx->net_ctx = udp_ctx; 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, if (net_addr_pton(AF_INET6,
CONFIG_NET_APP_PEER_IPV6_ADDR, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
printk("Invalid peer IPv6 address %s", printk("Invalid peer IPv6 address %s",
CONFIG_NET_APP_PEER_IPV6_ADDR); CONFIG_NET_CONFIG_PEER_IPV6_ADDR);
} }
#endif #endif

View file

@ -23,6 +23,6 @@ CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_BUILTIN=y
CONFIG_MBEDTLS_CFG_FILE="config-coap.h" CONFIG_MBEDTLS_CFG_FILE="config-coap.h"
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"

View file

@ -658,11 +658,11 @@ static struct k_thread thread_data;
static inline int init_app(void) 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, if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
mbedtls_printf("Invalid IPv6 address %s", mbedtls_printf("Invalid IPv6 address %s",
CONFIG_NET_APP_MY_IPV6_ADDR); CONFIG_NET_CONFIG_MY_IPV6_ADDR);
} }
#endif #endif
if (!net_if_ipv6_addr_add(net_if_get_default(), &server_addr, if (!net_if_ipv6_addr_add(net_if_get_default(), &server_addr,

View file

@ -58,8 +58,8 @@ for example:
.. code-block:: console .. code-block:: console
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
are the IPv6 addresses for the DNS client running Zephyr and the DNS server, are the IPv6 addresses for the DNS client running Zephyr and the DNS server,
respectively. respectively.

View file

@ -50,19 +50,19 @@ CONFIG_DNS_SERVER2="192.0.2.2:15353"
#CONFIG_DNS_SERVER2="2001:4860:4860::8888" #CONFIG_DNS_SERVER2="2001:4860:4860::8888"
# Router is needed when resolving using external DNS servers # 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=y
CONFIG_NET_MGMT_EVENT=y CONFIG_NET_MGMT_EVENT=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_MAIN_STACK_SIZE=1504 CONFIG_MAIN_STACK_SIZE=1504

View file

@ -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_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!" #error "You need to define an IPv4 address or enable DHCPv4!"
#endif #endif
@ -260,8 +260,8 @@ static void setup_ipv4(struct net_if *iface)
u16_t dns_id; u16_t dns_id;
int ret; int ret;
if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, &addr)) { if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) {
NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV4_ADDR); NET_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR);
return; return;
} }
@ -290,7 +290,7 @@ static void setup_ipv4(struct net_if *iface)
#if defined(CONFIG_NET_IPV6) #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!" #error "You need to define an IPv6 address!"
#endif #endif

View file

@ -1,6 +1,6 @@
CONFIG_NET_TCP=n CONFIG_NET_TCP=n
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
CONFIG_NET_APP_NEED_IPV4=n CONFIG_NET_CONFIG_NEED_IPV4=n
CONFIG_NET_6LO=y CONFIG_NET_6LO=y
CONFIG_NET_DEBUG_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 # For Wireshark filtering in a busy environment it is useful to set a unique
# PAN ID # 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_SECURITY=n
CONFIG_NET_L2_IEEE802154_SHELL=y CONFIG_NET_L2_IEEE802154_SHELL=y
@ -20,7 +20,7 @@ CONFIG_NET_L2_IEEE802154_SHELL=y
CONFIG_IEEE802154_KW41Z=y CONFIG_IEEE802154_KW41Z=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=3 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=y
CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_PAGE_LAYOUT=y

View file

@ -16,7 +16,7 @@ CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NET_TCP=n CONFIG_NET_TCP=n
CONFIG_NET_IPV4=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=y
CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y

View file

@ -1,7 +1,7 @@
# The addresses are selected so that qemu<->qemu connectivity works ok. # The addresses are selected so that qemu<->qemu connectivity works ok.
# For linux<->qemu connectivity, create a new conf file and swap the # For linux<->qemu connectivity, create a new conf file and swap the
# addresses (so that peer address is ending to 2). # addresses (so that peer address is ending to 2).
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.2"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.1"

View file

@ -1,7 +1,7 @@
# The addresses are selected so that qemu<->qemu connectivity works ok. # The addresses are selected so that qemu<->qemu connectivity works ok.
# For linux<->qemu connectivity, create a new conf file and swap the # For linux<->qemu connectivity, create a new conf file and swap the
# addresses (so that peer address is ending to 2). # addresses (so that peer address is ending to 2).
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.2"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.1"

View file

@ -9,6 +9,6 @@ CONFIG_NET_L2_BT=y
CONFIG_NET_L2_BT_SHELL=y CONFIG_NET_L2_BT_SHELL=y
CONFIG_NET_DEBUG_L2_BT=y CONFIG_NET_DEBUG_L2_BT=y
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
CONFIG_NET_APP_NEED_IPV4=n CONFIG_NET_CONFIG_NEED_IPV4=n
CONFIG_NET_APP_MY_IPV4_ADDR="" CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
CONFIG_NET_APP_PEER_IPV4_ADDR="" CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""

View file

@ -5,9 +5,9 @@ CONFIG_IEEE802154_CC2520=y
CONFIG_IEEE802154_CC2520_AUTO_ACK=y CONFIG_IEEE802154_CC2520_AUTO_ACK=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 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_IPV4=n
CONFIG_NET_APP_NEED_IPV4=n CONFIG_NET_CONFIG_NEED_IPV4=n
CONFIG_NET_APP_MY_IPV4_ADDR="" CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
CONFIG_NET_APP_PEER_IPV4_ADDR="" CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""

View file

@ -14,6 +14,6 @@ CONFIG_IEEE802154_CC2520_SPI_FREQ=4000000
CONFIG_IEEE802154_CC2520_SPI_SLAVE=0 CONFIG_IEEE802154_CC2520_SPI_SLAVE=0
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
CONFIG_NET_APP_NEED_IPV4=n CONFIG_NET_CONFIG_NEED_IPV4=n
CONFIG_NET_APP_MY_IPV4_ADDR="" CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
CONFIG_NET_APP_PEER_IPV4_ADDR="" CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""

View file

@ -9,6 +9,6 @@ CONFIG_IEEE802154_MCR20A=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
CONFIG_NET_APP_NEED_IPV4=n CONFIG_NET_CONFIG_NEED_IPV4=n
CONFIG_NET_APP_MY_IPV4_ADDR="" CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
CONFIG_NET_APP_PEER_IPV4_ADDR="" CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""

View file

@ -6,10 +6,10 @@ CONFIG_NET_IPV4=n
CONFIG_NET_IPV6_NBR_CACHE=n CONFIG_NET_IPV6_NBR_CACHE=n
CONFIG_NET_IPV6_MLD=n CONFIG_NET_IPV6_MLD=n
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=n CONFIG_NET_CONFIG_NEED_IPV4=n
CONFIG_NET_APP_MY_IPV4_ADDR="" CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
CONFIG_NET_APP_PEER_IPV4_ADDR="" CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048
CONFIG_SYSTEM_WORKQUEUE_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_OPENTHREAD_CHANNEL=26
CONFIG_NET_APP_MY_IPV6_ADDR="fdde:ad00:beef::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="fdde:ad00:beef::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"
# Thread by default registers quite a lot addresses. # Thread by default registers quite a lot addresses.
CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6

View file

@ -1,7 +1,7 @@
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
CONFIG_NET_APP_NEED_IPV4=n CONFIG_NET_CONFIG_NEED_IPV4=n
CONFIG_NET_APP_MY_IPV4_ADDR="" CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
CONFIG_NET_APP_PEER_IPV4_ADDR="" CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""
CONFIG_NET_L2_IEEE802154=y CONFIG_NET_L2_IEEE802154=y
CONFIG_NET_DEBUG_L2_IEEE802154=y CONFIG_NET_DEBUG_L2_IEEE802154=y

View file

@ -24,12 +24,12 @@ CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_APP=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_CLIENT=y
CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_NEED_IPV4=y
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"

View file

@ -28,12 +28,12 @@ struct configs {
struct data ipv6; struct data ipv6;
}; };
#if !defined(CONFIG_NET_APP_PEER_IPV4_ADDR) #if !defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR)
#define CONFIG_NET_APP_PEER_IPV4_ADDR "" #define CONFIG_NET_CONFIG_PEER_IPV4_ADDR ""
#endif #endif
#if !defined(CONFIG_NET_APP_PEER_IPV6_ADDR) #if !defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR)
#define CONFIG_NET_APP_PEER_IPV6_ADDR "" #define CONFIG_NET_CONFIG_PEER_IPV6_ADDR ""
#endif #endif
extern const char lorem_ipsum[]; extern const char lorem_ipsum[];

View file

@ -328,7 +328,7 @@ int start_tcp(void)
int ret = 0; int ret = 0;
if (IS_ENABLED(CONFIG_NET_IPV6)) { 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, &conf.ipv6, tls_result_ipv6,
sizeof(tls_result_ipv6), sizeof(tls_result_ipv6),
net_app_tls_stack_ipv6, net_app_tls_stack_ipv6,
@ -340,7 +340,7 @@ int start_tcp(void)
} }
if (IS_ENABLED(CONFIG_NET_IPV4)) { 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, &conf.ipv4, tls_result_ipv4,
sizeof(tls_result_ipv4), sizeof(tls_result_ipv4),
net_app_tls_stack_ipv4, net_app_tls_stack_ipv4,

View file

@ -327,7 +327,7 @@ void start_udp(void)
if (IS_ENABLED(CONFIG_NET_IPV6)) { if (IS_ENABLED(CONFIG_NET_IPV6)) {
k_delayed_work_init(&conf.ipv6.recv, wait_reply); 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, &conf.ipv6, dtls_result_ipv6,
sizeof(dtls_result_ipv6), sizeof(dtls_result_ipv6),
net_app_dtls_stack_ipv6, net_app_dtls_stack_ipv6,
@ -341,7 +341,7 @@ void start_udp(void)
if (IS_ENABLED(CONFIG_NET_IPV4)) { if (IS_ENABLED(CONFIG_NET_IPV4)) {
k_delayed_work_init(&conf.ipv4.recv, wait_reply); 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, &conf.ipv4, dtls_result_ipv4,
sizeof(dtls_result_ipv4), sizeof(dtls_result_ipv4),
net_app_dtls_stack_ipv4, net_app_dtls_stack_ipv4,

View file

@ -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 # For Wireshark filtering in a busy environment it is useful to set a unique
# PAN ID # 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_SECURITY=n
CONFIG_NET_L2_IEEE802154_SHELL=y CONFIG_NET_L2_IEEE802154_SHELL=y
@ -18,9 +18,9 @@ CONFIG_NET_L2_IEEE802154_SHELL=y
CONFIG_IEEE802154_KW41Z=y CONFIG_IEEE802154_KW41Z=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=3 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=3
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_IEEE802154_DEV_NAME="KW41Z" CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="KW41Z"
CONFIG_FLASH=y CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_PAGE_LAYOUT=y

View file

@ -15,7 +15,7 @@ CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NET_IPV4=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=y
CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=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_IEEE802154_NRF5_INIT_PRIO=80
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 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"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1"
CONFIG_TEST_RANDOM_GENERATOR=n CONFIG_TEST_RANDOM_GENERATOR=n
CONFIG_ENTROPY_NRF5_RNG=y CONFIG_ENTROPY_NRF5_RNG=y

View file

@ -7,4 +7,4 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_NET_L2_BT=y CONFIG_NET_L2_BT=y
CONFIG_NET_DEBUG_L2_BT=y CONFIG_NET_DEBUG_L2_BT=y
CONFIG_NET_APP_BT_NODE=y CONFIG_NET_CONFIG_BT_NODE=y

View file

@ -5,5 +5,5 @@ CONFIG_IEEE802154_CC2520=y
CONFIG_IEEE802154_CC2520_AUTO_ACK=y CONFIG_IEEE802154_CC2520_AUTO_ACK=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 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"
CONFIG_NET_APP_IEEE802154_DEV_NAME="cc2520" CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520"

View file

@ -13,4 +13,4 @@ CONFIG_IEEE802154_CC2520_SPI_DRV_NAME="SPI_0"
CONFIG_IEEE802154_CC2520_SPI_FREQ=4000000 CONFIG_IEEE802154_CC2520_SPI_FREQ=4000000
CONFIG_IEEE802154_CC2520_SPI_SLAVE=0 CONFIG_IEEE802154_CC2520_SPI_SLAVE=0
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2"

View file

@ -8,4 +8,4 @@ CONFIG_SPI_0=y
CONFIG_IEEE802154_MCR20A=y CONFIG_IEEE802154_MCR20A=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 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"

View file

@ -6,10 +6,10 @@ CONFIG_NET_IPV4=n
CONFIG_NET_IPV6_NBR_CACHE=n CONFIG_NET_IPV6_NBR_CACHE=n
CONFIG_NET_IPV6_MLD=n CONFIG_NET_IPV6_MLD=n
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=n CONFIG_NET_CONFIG_NEED_IPV4=n
CONFIG_NET_APP_MY_IPV4_ADDR="" CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
CONFIG_NET_APP_PEER_IPV4_ADDR="" CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048
CONFIG_SYSTEM_WORKQUEUE_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_RX_COUNT=50
CONFIG_NET_BUF_TX_COUNT=50 CONFIG_NET_BUF_TX_COUNT=50
CONFIG_NET_APP_MY_IPV6_ADDR="fdde:ad00:beef::2" CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::2"
CONFIG_NET_APP_PEER_IPV6_ADDR="fdde:ad00:beef::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::1"
# Thread by default registers quite a lot addresses. # Thread by default registers quite a lot addresses.
CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6

View file

@ -34,12 +34,12 @@ CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
# Network application options and configuration # 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_APP_SERVER=y
CONFIG_NET_DEBUG_APP=n CONFIG_NET_DEBUG_APP=n
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_NEED_IPV4=y
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"

View file

@ -47,11 +47,11 @@ Set prj1.conf IP address configuration like this:
.. code-block:: console .. code-block:: console
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8:100::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8:100::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8:100::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8:100::2"
CONFIG_NET_APP_MY_IPV4_ADDR="198.51.100.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="198.51.100.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="198.51.100.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="198.51.100.2"
CONFIG_NET_APP_MY_IPV4_GW="203.0.113.1" CONFIG_NET_CONFIG_MY_IPV4_GW="203.0.113.1"
CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=n CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=n
CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:64" CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:64"
CONFIG_ETH_NATIVE_POSIX_SETUP_SCRIPT="echo" CONFIG_ETH_NATIVE_POSIX_SETUP_SCRIPT="echo"
@ -61,11 +61,11 @@ Set prj2.conf IP address configuration like this:
.. code-block:: console .. code-block:: console
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8:200::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8:200::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8:200::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8:200::2"
CONFIG_NET_APP_MY_IPV4_ADDR="203.0.113.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="203.0.113.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="203.0.113.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="203.0.113.2"
CONFIG_NET_APP_MY_IPV4_GW="198.51.100.1" CONFIG_NET_CONFIG_MY_IPV4_GW="198.51.100.1"
CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=n CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=n
CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:c8" CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:c8"
CONFIG_ETH_NATIVE_POSIX_SETUP_SCRIPT="echo" CONFIG_ETH_NATIVE_POSIX_SETUP_SCRIPT="echo"

View file

@ -33,15 +33,15 @@ CONFIG_NET_DEBUG_IF=n
CONFIG_NET_DEBUG_IPV6=n CONFIG_NET_DEBUG_IPV6=n
CONFIG_NET_DEBUG_NET_PKT=y CONFIG_NET_DEBUG_NET_PKT=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_SERVER=y CONFIG_NET_APP_SERVER=y
CONFIG_NET_DEBUG_APP=n CONFIG_NET_DEBUG_APP=n
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_L2_ETHERNET=y CONFIG_NET_L2_ETHERNET=y

View file

@ -27,9 +27,9 @@ CONFIG_NET_SHELL=y
CONFIG_NET_L2_ETHERNET=y CONFIG_NET_L2_ETHERNET=y
CONFIG_NET_APP_SERVER=y CONFIG_NET_APP_SERVER=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
# There will be three network interfaces. gPTP will # There will be three network interfaces. gPTP will
# run in non-VLAN interface and then there are two extra # 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. # how to do this kind of setup.
# First ethernet interface will use these settings # First ethernet interface will use these settings
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
# Second ethernet interface will have these settings # Second ethernet interface will have these settings
CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1" CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1"

View file

@ -46,8 +46,8 @@ for example:
.. code-block:: console .. code-block:: console
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
are the IPv6 addresses for the HTTP client running Zephyr and the are the IPv6 addresses for the HTTP client running Zephyr and the
HTTP server, respectively. The application also supports DNS resolving so 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 .. code-block:: console
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="6.zephyr.test" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="6.zephyr.test"
Open the :file:`src/config.h` file and set the server port Open the :file:`src/config.h` file and set the server port
to match the HTTP server setup, for example: to match the HTTP server setup, for example:

View file

@ -36,14 +36,14 @@ CONFIG_NET_IPV4=y
CONFIG_HTTPS=n CONFIG_HTTPS=n
CONFIG_MBEDTLS=n CONFIG_MBEDTLS=n
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS=y

View file

@ -35,11 +35,11 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2500
CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=12000 CONFIG_MBEDTLS_HEAP_SIZE=12000
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" 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_SHELL=y
CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS=y

View file

@ -42,14 +42,14 @@ CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=30000 CONFIG_MBEDTLS_HEAP_SIZE=30000
CONFIG_NET_APP_TLS=y CONFIG_NET_APP_TLS=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS=y

View file

@ -21,7 +21,7 @@
#endif #endif
#if defined(CONFIG_NET_IPV6) #if defined(CONFIG_NET_IPV6)
#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR #define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR
#else #else
#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR #define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR
#endif #endif

View file

@ -37,8 +37,8 @@ can be defined in the project configuration file:
.. code-block:: console .. code-block:: console
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
Adding URLs Adding URLs
=========== ===========

View file

@ -34,12 +34,12 @@ CONFIG_NET_IPV4=y
CONFIG_HTTPS=n CONFIG_HTTPS=n
CONFIG_MBEDTLS=n CONFIG_MBEDTLS=n
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS=y

View file

@ -32,9 +32,9 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2500
CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=12000 CONFIG_MBEDTLS_HEAP_SIZE=12000
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_BT_NODE=y CONFIG_NET_CONFIG_BT_NODE=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y

View file

@ -30,12 +30,12 @@ CONFIG_NET_IPV4=y
CONFIG_HTTPS=n CONFIG_HTTPS=n
CONFIG_MBEDTLS=n CONFIG_MBEDTLS=n
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS=y

View file

@ -39,12 +39,12 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2500
CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=30000 CONFIG_MBEDTLS_HEAP_SIZE=30000
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS=y

View file

@ -12,11 +12,11 @@
*/ */
#define APP_STARTUP_TIME K_SECONDS(20) #define APP_STARTUP_TIME K_SECONDS(20)
#ifdef CONFIG_NET_APP_SETTINGS #ifdef CONFIG_NET_CONFIG_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR #define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR
#else #else
#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR #define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

View file

@ -33,9 +33,9 @@ CONFIG_PRINTK=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_APP_CLIENT=y CONFIG_NET_APP_CLIENT=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_NEED_IPV6=n CONFIG_NET_CONFIG_NEED_IPV6=n
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y

View file

@ -8,5 +8,5 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_ENTROPY_GENERATOR=y CONFIG_ENTROPY_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_COAP=y CONFIG_COAP=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"

View file

@ -7,5 +7,5 @@ CONFIG_NET_UDP=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_IEEE802154_CC2520=y CONFIG_IEEE802154_CC2520=y
CONFIG_COAP=y CONFIG_COAP=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_IEEE802154_CHANNEL=20 CONFIG_NET_CONFIG_IEEE802154_CHANNEL=20

View file

@ -27,18 +27,18 @@ CONFIG_NET_SHELL=y
CONFIG_NET_L2_ETHERNET=y CONFIG_NET_L2_ETHERNET=y
CONFIG_NET_APP_SERVER=y CONFIG_NET_APP_SERVER=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
# There will be three network interfaces. This is just an example # There will be three network interfaces. This is just an example
# how to do this kind of setup. # how to do this kind of setup.
# First ethernet interface will use these settings # First ethernet interface will use these settings
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
# Second ethernet interface will have these settings # Second ethernet interface will have these settings
CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1" CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1"

View file

@ -82,7 +82,7 @@ To change the sample to use IPv4, disable IPv6 by changing these two
configurations in ``prj.conf``:: configurations in ``prj.conf``::
CONFIG_NET_IPV6=n CONFIG_NET_IPV6=n
CONFIG_NET_APP_NEED_IPV6=n CONFIG_NET_CONFIG_NEED_IPV6=n
DTLS Support DTLS Support
============ ============

View file

@ -1,6 +1,6 @@
CONFIG_NET_L2_BT=y CONFIG_NET_L2_BT=y
CONFIG_BT_DEVICE_NAME="LwM2M IPSP node" 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 # raise bluetooth RX buffer settings for 6lowpan traffic
CONFIG_BT_RX_BUF_COUNT=20 CONFIG_BT_RX_BUF_COUNT=20

View file

@ -4,7 +4,7 @@ CONFIG_MODEM_SHELL=y
CONFIG_MODEM_WNCM14A2A=y CONFIG_MODEM_WNCM14A2A=y
# Connect to public LwM2M server (leshan.ecplise.org) # 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 # extend retry timing to 20 seconds for LTE/LTE-M
CONFIG_COAP_INIT_ACK_TIMEOUT_MS=20000 CONFIG_COAP_INIT_ACK_TIMEOUT_MS=20000
@ -14,4 +14,4 @@ CONFIG_SYS_LOG_MODEM_LEVEL=4
# Hack: disable IPv6 for now # Hack: disable IPv6 for now
CONFIG_NET_IPV6=n CONFIG_NET_IPV6=n
CONFIG_NET_APP_NEED_IPV6=n CONFIG_NET_CONFIG_NEED_IPV6=n

View file

@ -19,16 +19,16 @@ CONFIG_NET_MAX_CONTEXTS=5
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_LWM2M=y CONFIG_LWM2M=y
CONFIG_LWM2M_IPSO_SUPPORT=y CONFIG_LWM2M_IPSO_SUPPORT=y
CONFIG_LWM2M_IPSO_TEMP_SENSOR=y CONFIG_LWM2M_IPSO_TEMP_SENSOR=y
CONFIG_LWM2M_IPSO_LIGHT_CONTROL=y CONFIG_LWM2M_IPSO_LIGHT_CONTROL=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"

View file

@ -16,12 +16,12 @@
#define APP_BANNER "Run LWM2M client" #define APP_BANNER "Run LWM2M client"
#if !defined(CONFIG_NET_APP_PEER_IPV4_ADDR) #if !defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR)
#define CONFIG_NET_APP_PEER_IPV4_ADDR "" #define CONFIG_NET_CONFIG_PEER_IPV4_ADDR ""
#endif #endif
#if !defined(CONFIG_NET_APP_PEER_IPV6_ADDR) #if !defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR)
#define CONFIG_NET_APP_PEER_IPV6_ADDR "" #define CONFIG_NET_CONFIG_PEER_IPV6_ADDR ""
#endif #endif
#define WAIT_TIME K_SECONDS(10) #define WAIT_TIME K_SECONDS(10)
@ -380,11 +380,11 @@ void main(void)
#endif /* CONFIG_NET_APP_DTLS */ #endif /* CONFIG_NET_APP_DTLS */
#if defined(CONFIG_NET_IPV6) #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, CONFIG_LWM2M_PEER_PORT, CONFIG_BOARD,
rd_client_event); rd_client_event);
#elif defined(CONFIG_NET_IPV4) #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, CONFIG_LWM2M_PEER_PORT, CONFIG_BOARD,
rd_client_event); rd_client_event);
#else #else

View file

@ -13,8 +13,8 @@ CONFIG_PRINTK=y
CONFIG_MBEDTLS=y CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_BUILTIN=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"

View file

@ -290,12 +290,12 @@ static struct k_thread dtls_thread;
static inline int init_app(void) static inline int init_app(void)
{ {
#if defined(CONFIG_NET_IPV6) #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, if (net_addr_pton(AF_INET6,
CONFIG_NET_APP_MY_IPV6_ADDR, CONFIG_NET_CONFIG_MY_IPV6_ADDR,
&client_addr) < 0) { &client_addr) < 0) {
mbedtls_printf("Invalid IPv6 address %s", mbedtls_printf("Invalid IPv6 address %s",
CONFIG_NET_APP_MY_IPV6_ADDR); CONFIG_NET_CONFIG_MY_IPV6_ADDR);
} }
#endif #endif
if (!net_if_ipv6_addr_add(net_if_get_default(), &client_addr, 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); net_if_ipv6_maddr_add(net_if_get_default(), &mcast_addr);
#else #else
#if defined(CONFIG_NET_APP_MY_IPV4_ADDR) #if defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR)
if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR,
&client_addr) < 0) { &client_addr) < 0) {
mbedtls_printf("Invalid IPv4 address %s", mbedtls_printf("Invalid IPv4 address %s",
CONFIG_NET_APP_MY_IPV4_ADDR); CONFIG_NET_CONFIG_MY_IPV4_ADDR);
} }
#endif #endif

View file

@ -213,12 +213,12 @@ int udp_init(struct udp_context *ctx)
ctx->remaining = 0; ctx->remaining = 0;
ctx->net_ctx = udp_ctx; 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, if (net_addr_pton(AF_INET6,
CONFIG_NET_APP_PEER_IPV6_ADDR, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
printk("Invalid peer IPv6 address %s", printk("Invalid peer IPv6 address %s",
CONFIG_NET_APP_PEER_IPV6_ADDR); CONFIG_NET_CONFIG_PEER_IPV6_ADDR);
} }
#endif #endif
@ -264,11 +264,11 @@ int udp_init(struct udp_context *ctx)
ctx->remaining = 0; ctx->remaining = 0;
ctx->net_ctx = udp_ctx; ctx->net_ctx = udp_ctx;
#if defined(CONFIG_NET_APP_PEER_IPV4_ADDR) #if defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR)
if (net_addr_pton(AF_INET, CONFIG_NET_APP_PEER_IPV4_ADDR, if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
printk("Invalid IPv4 address %s", printk("Invalid IPv4 address %s",
CONFIG_NET_APP_PEER_IPV4_ADDR); CONFIG_NET_CONFIG_PEER_IPV4_ADDR);
} }
#endif #endif

View file

@ -14,8 +14,8 @@ CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_BUILTIN=y
CONFIG_MBEDTLS_CFG_FILE="config-threadnet.h" CONFIG_MBEDTLS_CFG_FILE="config-threadnet.h"
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"

View file

@ -368,11 +368,11 @@ static struct k_thread dtls_thread;
static inline int init_app(void) static inline int init_app(void)
{ {
#if defined(CONFIG_NET_IPV6) #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, if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
mbedtls_printf("Invalid IPv6 address %s", mbedtls_printf("Invalid IPv6 address %s",
CONFIG_NET_APP_MY_IPV6_ADDR); CONFIG_NET_CONFIG_MY_IPV6_ADDR);
} }
#endif #endif
if (!net_if_ipv6_addr_add(net_if_get_default(), &server_addr, 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); net_if_ipv6_maddr_add(net_if_get_default(), &mcast_addr);
#else #else
#if defined(CONFIG_NET_APP_MY_IPV4_ADDR) #if defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR)
if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
mbedtls_printf("Invalid IPv4 address %s", mbedtls_printf("Invalid IPv4 address %s",
CONFIG_NET_APP_MY_IPV4_ADDR); CONFIG_NET_CONFIG_MY_IPV4_ADDR);
} }
#endif #endif

View file

@ -8,13 +8,13 @@ CONFIG_NET_TCP=y
CONFIG_NET_IPV4=y CONFIG_NET_IPV4=y
CONFIG_NET_IPV6=n CONFIG_NET_IPV6=n
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV6=n CONFIG_NET_CONFIG_NEED_IPV6=n
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_MBEDTLS=y CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_BUILTIN=y

View file

@ -7,13 +7,13 @@
#ifndef TCP_CONFIG_H_ #ifndef TCP_CONFIG_H_
#define TCP_CONFIG_H_ #define TCP_CONFIG_H_
#ifdef CONFIG_NET_APP_SETTINGS #ifdef CONFIG_NET_CONFIG_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define LOCAL_ADDR CONFIG_NET_APP_MY_IPV6_ADDR #define LOCAL_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR
#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR #define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR
#else #else
#define LOCAL_ADDR CONFIG_NET_APP_MY_IPV4_ADDR #define LOCAL_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR
#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR #define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

View file

@ -31,11 +31,11 @@ CONFIG_NET_BUF_TX_COUNT=20
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_DEBUG_CORE=n CONFIG_NET_DEBUG_CORE=n
CONFIG_NET_DEBUG_CONTEXT=n CONFIG_NET_DEBUG_CONTEXT=n

View file

@ -20,13 +20,13 @@ CONFIG_NET_BUF_DATA_SIZE=256
CONFIG_NET_BUF_RX_COUNT=15 CONFIG_NET_BUF_RX_COUNT=15
CONFIG_NET_BUF_TX_COUNT=15 CONFIG_NET_BUF_TX_COUNT=15
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_BT_NODE=y CONFIG_NET_CONFIG_BT_NODE=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.168.1.10"
CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=3

View file

@ -24,12 +24,12 @@ CONFIG_NET_IPV6=y
# Enable the MQTT Lib # Enable the MQTT Lib
CONFIG_MQTT_LIB=y CONFIG_MQTT_LIB=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.168.1.10"
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048

View file

@ -25,12 +25,12 @@ CONFIG_NET_IPV6=y
CONFIG_MQTT_LIB=y CONFIG_MQTT_LIB=y
CONFIG_MQTT_LIB_TLS=y CONFIG_MQTT_LIB_TLS=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.168.1.10"
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048

View file

@ -24,12 +24,12 @@ CONFIG_NET_IPV4=y
# Enable the MQTT Lib # Enable the MQTT Lib
CONFIG_MQTT_LIB=y CONFIG_MQTT_LIB=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048

View file

@ -7,13 +7,13 @@
#ifndef __CONFIG_H__ #ifndef __CONFIG_H__
#define __CONFIG_H__ #define __CONFIG_H__
#ifdef CONFIG_NET_APP_SETTINGS #ifdef CONFIG_NET_CONFIG_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR #define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR
#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR #define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR
#else #else
#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR #define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR
#define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR #define SERVER_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

View file

@ -16,9 +16,9 @@ CONFIG_DNS_RESOLVER=n
CONFIG_PRINTK=y CONFIG_PRINTK=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y

View file

@ -36,34 +36,34 @@ static bool fake_led;
#define NATS_AF_INET AF_INET6 #define NATS_AF_INET AF_INET6
#define NATS_SOCKADDR_IN sockaddr_in6 #define NATS_SOCKADDR_IN sockaddr_in6
#if defined(CONFIG_NET_APP_MY_IPV6_ADDR) #if defined(CONFIG_NET_CONFIG_MY_IPV6_ADDR)
#define NATS_LOCAL_IP_ADDR CONFIG_NET_APP_MY_IPV6_ADDR #define NATS_LOCAL_IP_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR
#else #else
#define NATS_LOCAL_IP_ADDR "2001:db8::1" #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) #if defined(CONFIG_NET_CONFIG_PEER_IPV6_ADDR)
#define NATS_PEER_IP_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR #define NATS_PEER_IP_ADDR CONFIG_NET_CONFIG_PEER_IPV6_ADDR
#else #else
#define NATS_PEER_IP_ADDR "2001:db8::2" #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 */ #else /* CONFIG_NET_IPV4 */
#define NATS_AF_INET AF_INET #define NATS_AF_INET AF_INET
#define NATS_SOCKADDR_IN sockaddr_in #define NATS_SOCKADDR_IN sockaddr_in
#if defined(CONFIG_NET_APP_MY_IPV4_ADDR) #if defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR)
#define NATS_LOCAL_IP_ADDR CONFIG_NET_APP_MY_IPV4_ADDR #define NATS_LOCAL_IP_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR
#else #else
#define NATS_LOCAL_IP_ADDR "192.168.0.1" #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) #if defined(CONFIG_NET_CONFIG_PEER_IPV4_ADDR)
#define NATS_PEER_IP_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR #define NATS_PEER_IP_ADDR CONFIG_NET_CONFIG_PEER_IPV4_ADDR
#else #else
#define NATS_PEER_IP_ADDR "192.168.0.2" #define NATS_PEER_IP_ADDR "192.168.0.2"
#endif /* CONFIG_NET_APP_PEER_IPV4_ADDR */ #endif /* CONFIG_NET_CONFIG_PEER_IPV4_ADDR */
#endif #endif

View file

@ -36,10 +36,10 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
# Network application options and configuration # Network application options and configuration
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"

View file

@ -51,10 +51,10 @@ CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=2
# Enabled Shell Extensions # Enabled Shell Extensions
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_L2_IEEE802154_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 # Disable default Ethernet interface
CONFIG_NET_SLIP_TAP=n CONFIG_NET_SLIP_TAP=n
# Application Settings # Application Settings
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y

View file

@ -57,9 +57,9 @@ CONFIG_NET_L2_IEEE802154_SHELL=y
CONFIG_NET_SLIP_TAP=n CONFIG_NET_SLIP_TAP=n
# Application Settings # Application Settings
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_IEEE802154_DEV_NAME="IEEE802154_UPIPE" CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_UPIPE"
# MAC Setup # MAC Setup
CONFIG_IEEE802154_UPIPE_RANDOM_MAC=n CONFIG_IEEE802154_UPIPE_RANDOM_MAC=n

View file

@ -42,8 +42,8 @@ can be defined in the project configuration file:
.. code-block:: console .. code-block:: console
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.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 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 server that provides an admin web page for management purposes. The web server

View file

@ -84,12 +84,12 @@ CONFIG_NET_DEBUG_HTTP=n
CONFIG_MBEDTLS_DEBUG=n CONFIG_MBEDTLS_DEBUG=n
# Network application settings # Network application settings
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
# This is the ethernet interface setting for admin purposes # This is the ethernet interface setting for admin purposes
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
# Set a proper hostname for the router # Set a proper hostname for the router
CONFIG_NET_HOSTNAME_ENABLE=y 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_SHELL=y
CONFIG_NET_L2_IEEE802154=y CONFIG_NET_L2_IEEE802154=y
CONFIG_NET_L2_IEEE802154_FRAGMENT=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 # 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_IEEE802154_MCR20A=y
CONFIG_SPI=y CONFIG_SPI=y

View file

@ -14,11 +14,11 @@
*/ */
#define APP_STARTUP_TIME K_SECONDS(20) #define APP_STARTUP_TIME K_SECONDS(20)
#ifdef CONFIG_NET_APP_SETTINGS #ifdef CONFIG_NET_CONFIG_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR #define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV6_ADDR
#else #else
#define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR #define ZEPHYR_ADDR CONFIG_NET_CONFIG_MY_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

View file

@ -1,4 +1,4 @@
CONFIG_IEEE802154_NRF5=y CONFIG_IEEE802154_NRF5=y
CONFIG_IEEE802154_NRF5_DRV_NAME="IEEE802154_nrf5" CONFIG_IEEE802154_NRF5_DRV_NAME="IEEE802154_nrf5"
CONFIG_IEEE802154_NRF5_INIT_PRIO=80 CONFIG_IEEE802154_NRF5_INIT_PRIO=80
CONFIG_NET_APP_IEEE802154_DEV_NAME="IEEE802154_nrf5" CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_nrf5"

View file

@ -1,7 +1,7 @@
CONFIG_IEEE802154_CC2520=y 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_RANDOM_MAC=n
CONFIG_IEEE802154_CC2520_MAC4=0x00 CONFIG_IEEE802154_CC2520_MAC4=0x00

View file

@ -70,5 +70,5 @@ CONFIG_NET_DEBUG_L2_IEEE802154=n
CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=n CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=n
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=0 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=0
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_IEEE802154_CHANNEL=18 CONFIG_NET_CONFIG_IEEE802154_CHANNEL=18

View file

@ -12,13 +12,13 @@ CONFIG_NET_SHELL=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
# Network address config # Network address config
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
# Network debug config # Network debug config
CONFIG_NET_LOG=y CONFIG_NET_LOG=y

View file

@ -33,7 +33,7 @@ void main(void)
/* ipv4 */ /* ipv4 */
rv = sntp_init(&ctx, rv = sntp_init(&ctx,
CONFIG_NET_APP_PEER_IPV4_ADDR, CONFIG_NET_CONFIG_PEER_IPV4_ADDR,
SNTP_PORT, SNTP_PORT,
K_FOREVER); K_FOREVER);
if (rv < 0) { if (rv < 0) {
@ -52,7 +52,7 @@ void main(void)
/* ipv6 */ /* ipv6 */
rv = sntp_init(&ctx, rv = sntp_init(&ctx,
CONFIG_NET_APP_PEER_IPV6_ADDR, CONFIG_NET_CONFIG_PEER_IPV6_ADDR,
SNTP_PORT, SNTP_PORT,
K_NO_WAIT); K_NO_WAIT);
if (rv < 0) { if (rv < 0) {

View file

@ -21,11 +21,11 @@ CONFIG_DNS_SERVER1="192.0.2.2"
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
# Network address config # Network address config
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_APP_MY_IPV4_GW="192.0.2.2" CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
# DHCP configuration. Until DHCP address is assigned, # DHCP configuration. Until DHCP address is assigned,
# static configuration above is used instead. # static configuration above is used instead.
CONFIG_NET_DHCPV4=y CONFIG_NET_DHCPV4=y

View file

@ -19,11 +19,11 @@ CONFIG_DNS_SERVER1="192.0.2.2"
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
# Network address config # Network address config
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_APP_MY_IPV4_GW="192.0.2.2" CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
# DHCP configuration. Until DHCP address is assigned, # DHCP configuration. Until DHCP address is assigned,
# static configuration above is used instead. # static configuration above is used instead.
CONFIG_NET_DHCPV4=y CONFIG_NET_DHCPV4=y

View file

@ -13,10 +13,10 @@ CONFIG_NET_SOCKETS_POSIX_NAMES=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
# Network address config # Network address config
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
# Networking tweaks # Networking tweaks
# Required to handle large number of consecutive connections, # Required to handle large number of consecutive connections,

View file

@ -13,10 +13,10 @@ CONFIG_NET_SOCKETS_POSIX_NAMES=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
# Network address config # Network address config
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
# Network debug config # Network debug config
#CONFIG_NET_DEBUG_SOCKETS=y #CONFIG_NET_DEBUG_SOCKETS=y

View file

@ -14,14 +14,14 @@ CONFIG_NET_SOCKETS_POLL_MAX=5
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
# Network address config # Network address config
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_APP_NEED_IPV4=y CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_BT_NODE=y CONFIG_NET_CONFIG_BT_NODE=y
# Network debug config # Network debug config
#CONFIG_NET_DEBUG_SOCKETS=y #CONFIG_NET_DEBUG_SOCKETS=y

Some files were not shown because too many files have changed in this diff Show more