michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: Rename Kconfig.samples and its main option for future changes

Browse source 
s/SAMPLES/APP for name shortening. Applying the change where relevant.

Not only IP addresse will be available as samples settings there but
also IEEE 802.15.4 channel, pan_id, and more for instance.

Change-Id: I05dd24989bd0c804d9588092d67044a3e063bc88
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2017-03-15 16:01:47 +01:00
commit 0f18ce44f9
80 changed files with 337 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

6
samples/bluetooth/ipsp/prj.conf
View file

@ -27,6 +27,6 @@ CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

4
samples/bluetooth/ipsp/src/main.c
View file

@ -53,10 +53,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_SAMPLES_MY_IPV6_ADDR, CONFIG_NET_APP_MY_IPV6_ADDR,
&in6addr_my) < 0) { &in6addr_my) < 0) {
printk("Invalid IPv6 address %s", printk("Invalid IPv6 address %s",
CONFIG_NET_SAMPLES_MY_IPV6_ADDR); CONFIG_NET_APP_MY_IPV6_ADDR);
} }
do { do {

6
samples/net/coaps_client/prj_qemu_x86.conf
View file

@ -23,6 +23,6 @@ CONFIG_MBEDTLS_CFG_FILE="config-coap.h"
CONFIG_ZOAP=y CONFIG_ZOAP=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::3" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::3"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1"

6
samples/net/coaps_client/src/coaps_client.c
View file

@ -414,12 +414,12 @@ uint8_t stack[STACK_SIZE];
static inline int init_app(void) static inline int init_app(void)
{ {
#if defined(CONFIG_NET_SAMPLES_MY_IPV6_ADDR) #if defined(CONFIG_NET_APP_MY_IPV6_ADDR)
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_SAMPLES_MY_IPV6_ADDR, CONFIG_NET_APP_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_SAMPLES_MY_IPV6_ADDR); CONFIG_NET_APP_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,

6
samples/net/coaps_client/src/udp.c
View file

@ -180,12 +180,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_SAMPLES_PEER_IPV6_ADDR) #if defined(CONFIG_NET_APP_PEER_IPV6_ADDR)
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR, CONFIG_NET_APP_PEER_IPV6_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
printk("Invalid peer IPv6 address %s", printk("Invalid peer IPv6 address %s",
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR); CONFIG_NET_APP_PEER_IPV6_ADDR);
} }
#endif #endif

6
samples/net/coaps_server/prj_qemu_x86.conf
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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"

6
samples/net/coaps_server/src/coaps_server.c
View file

@ -632,11 +632,11 @@ uint8_t stack[STACK_SIZE];
static inline int init_app(void) static inline int init_app(void)
{ {
#if defined(CONFIG_NET_SAMPLES_MY_IPV6_ADDR) #if defined(CONFIG_NET_APP_MY_IPV6_ADDR)
if (net_addr_pton(AF_INET6, CONFIG_NET_SAMPLES_MY_IPV6_ADDR, if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
mbedtls_printf("Invalid IPv6 address %s", mbedtls_printf("Invalid IPv6 address %s",
CONFIG_NET_SAMPLES_MY_IPV6_ADDR); CONFIG_NET_APP_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,

5
samples/net/dns_client/README.rst
View file

@ -89,8 +89,8 @@ for example:
.. code-block:: console .. code-block:: console
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
are the IPv6 addresses for the DNS client running Zephyr and the are the IPv6 addresses for the DNS client running Zephyr and the
DNS server, respectively. DNS server, respectively.
@ -241,4 +241,3 @@ Known Issues
- IPv4: there is still an issue not yet isolated that causes the application - IPv4: there is still an issue not yet isolated that causes the application
to fail during the first two queries. The issue lies between L2 (ARP) and to fail during the first two queries. The issue lies between L2 (ARP) and
UDP and it only appears during application startup. UDP and it only appears during application startup.

10
samples/net/dns_client/prj_arduino_101.conf
View file

@ -39,8 +39,8 @@ CONFIG_DNS_RESOLVER_ADDITIONAL_BUF_CTR=0
# Enable additional queries # Enable additional queries
CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=1 CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=1
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10"

10
samples/net/dns_client/prj_frdm_k64f.conf
View file

@ -27,8 +27,8 @@ CONFIG_DNS_RESOLVER_ADDITIONAL_BUF_CTR=0
# Enable additional queries # Enable additional queries
CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=1 CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=1
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10"

10
samples/net/dns_client/prj_qemu_x86.conf
View file

@ -26,8 +26,8 @@ CONFIG_DNS_RESOLVER_ADDITIONAL_BUF_CTR=0
# Enable additional queries # Enable additional queries
CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=1 CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=1
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

10
samples/net/dns_client/src/config.h
View file

@ -7,13 +7,13 @@
#ifndef _CONFIG_H_ #ifndef _CONFIG_H_
#define _CONFIG_H_ #define _CONFIG_H_
#ifdef CONFIG_NET_SAMPLES_IP_ADDRESSES #ifdef CONFIG_NET_APP_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define LOCAL_ADDR CONFIG_NET_SAMPLES_MY_IPV6_ADDR #define LOCAL_ADDR CONFIG_NET_APP_MY_IPV6_ADDR
#define REMOTE_ADDR CONFIG_NET_SAMPLES_PEER_IPV6_ADDR #define REMOTE_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR
#else #else
#define LOCAL_ADDR CONFIG_NET_SAMPLES_MY_IPV4_ADDR #define LOCAL_ADDR CONFIG_NET_APP_MY_IPV4_ADDR
#define REMOTE_ADDR CONFIG_NET_SAMPLES_PEER_IPV4_ADDR #define REMOTE_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

10
samples/net/dns_resolve/prj_qemu_x86.conf
View file

@ -52,8 +52,8 @@ CONFIG_NET_MGMT_EVENT=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

12
samples/net/dns_resolve/src/main.c
View file

@ -152,7 +152,7 @@ static void setup_dhcpv4(struct net_if *iface)
#if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4) #if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4)
#if !defined(CONFIG_NET_SAMPLES_MY_IPV4_ADDR) #if !defined(CONFIG_NET_APP_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
@ -163,8 +163,8 @@ static void setup_ipv4(struct net_if *iface)
uint16_t dns_id; uint16_t dns_id;
int ret; int ret;
if (net_addr_pton(AF_INET, CONFIG_NET_SAMPLES_MY_IPV4_ADDR, &addr)) { if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, &addr)) {
NET_ERR("Invalid address: %s", CONFIG_NET_SAMPLES_MY_IPV4_ADDR); NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV4_ADDR);
return; return;
} }
@ -193,7 +193,7 @@ static void setup_ipv4(struct net_if *iface)
#if defined(CONFIG_NET_IPV6) #if defined(CONFIG_NET_IPV6)
#if !defined(CONFIG_NET_SAMPLES_MY_IPV6_ADDR) #if !defined(CONFIG_NET_APP_MY_IPV6_ADDR)
#error "You need to define an IPv6 address!" #error "You need to define an IPv6 address!"
#endif #endif
@ -244,8 +244,8 @@ static void setup_ipv6(struct net_if *iface)
char hr_addr[NET_IPV6_ADDR_LEN]; char hr_addr[NET_IPV6_ADDR_LEN];
struct in6_addr addr; struct in6_addr addr;
if (net_addr_pton(AF_INET6, CONFIG_NET_SAMPLES_MY_IPV6_ADDR, &addr)) { if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR, &addr)) {
NET_ERR("Invalid address: %s", CONFIG_NET_SAMPLES_MY_IPV6_ADDR); NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV6_ADDR);
return; return;
} }

6
samples/net/echo_client/prj_arduino_101.conf
View file

@ -27,6 +27,6 @@ CONFIG_ETH_ENC28J60_0_MAC5=0x32
# Arduino 101 # Arduino 101
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.2"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.1"

6
samples/net/echo_client/prj_bt.conf
View file

@ -31,8 +31,8 @@ CONFIG_NET_MGMT_EVENT=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_L2_BLUETOOTH_SHELL=y CONFIG_NET_L2_BLUETOOTH_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_CONTEXT_NBUF_POOL=y CONFIG_NET_CONTEXT_NBUF_POOL=y

6
samples/net/echo_client/prj_cc2520.conf
View file

@ -43,6 +43,6 @@ 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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

10
samples/net/echo_client/prj_frdm_k64f.conf
View file

@ -25,8 +25,8 @@ CONFIG_NET_L2_ETHERNET=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

6
samples/net/echo_client/prj_frdm_k64f_cc2520.conf
View file

@ -50,6 +50,6 @@ 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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

6
samples/net/echo_client/prj_frdm_k64f_mcr20a.conf
View file

@ -44,6 +44,6 @@ 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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

6
samples/net/echo_client/prj_nrf5.conf
View file

@ -51,6 +51,6 @@ 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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

6
samples/net/echo_client/prj_qemu_802154.conf
View file

@ -44,6 +44,6 @@ CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_IEEE802154_UPIPE=y CONFIG_IEEE802154_UPIPE=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

10
samples/net/echo_client/prj_qemu_cortex_m3.conf
View file

@ -20,8 +20,8 @@ CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.2"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.1"

10
samples/net/echo_client/prj_qemu_x86.conf
View file

@ -23,10 +23,10 @@ CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.2"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.1"
CONFIG_NET_CONTEXT_NBUF_POOL=y CONFIG_NET_CONTEXT_NBUF_POOL=y

6
samples/net/echo_client/prj_sam_e70_xplained.conf
View file

@ -31,6 +31,6 @@ CONFIG_ETH_SAM_GMAC_MAC3=44
CONFIG_ETH_SAM_GMAC_MAC4=55 CONFIG_ETH_SAM_GMAC_MAC4=55
CONFIG_ETH_SAM_GMAC_MAC5=66 CONFIG_ETH_SAM_GMAC_MAC5=66
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"

28
samples/net/echo_client/src/echo-client.c
View file

@ -139,7 +139,7 @@ static bool send_tcp_data(struct net_context *ctx,
#define MY_PREFIX_LEN 64 #define MY_PREFIX_LEN 64
#if defined(CONFIG_NET_SAMPLES_IP_ADDRESSES) #if defined(CONFIG_NET_APP_SETTINGS)
static struct in6_addr in6addr_my = MY_IP6ADDR; static struct in6_addr in6addr_my = MY_IP6ADDR;
static struct in6_addr in6addr_peer = PEER_IP6ADDR; static struct in6_addr in6addr_peer = PEER_IP6ADDR;
#endif #endif
@ -168,7 +168,7 @@ static char __noinit __stack ipv6_tcp_stack[STACKSIZE];
#define MY_IP4ADDR { { { 192, 0, 2, 1 } } } #define MY_IP4ADDR { { { 192, 0, 2, 1 } } }
#define PEER_IP4ADDR { { { 192, 0, 2, 2 } } } #define PEER_IP4ADDR { { { 192, 0, 2, 2 } } }
#if defined(CONFIG_NET_SAMPLES_IP_ADDRESSES) #if defined(CONFIG_NET_APP_SETTINGS)
static struct in_addr in4addr_my = MY_IP4ADDR; static struct in_addr in4addr_my = MY_IP4ADDR;
static struct in_addr in4addr_peer = PEER_IP4ADDR; static struct in_addr in4addr_peer = PEER_IP4ADDR;
#endif #endif
@ -204,23 +204,23 @@ static inline void init_app(void)
NET_INFO("Run echo client"); NET_INFO("Run echo client");
#if defined(CONFIG_NET_IPV6) #if defined(CONFIG_NET_IPV6)
#if defined(CONFIG_NET_SAMPLES_IP_ADDRESSES) #if defined(CONFIG_NET_APP_SETTINGS)
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_SAMPLES_MY_IPV6_ADDR, CONFIG_NET_APP_MY_IPV6_ADDR,
&my_addr6.sin6_addr) < 0) { &my_addr6.sin6_addr) < 0) {
NET_ERR("Invalid IPv6 address %s", NET_ERR("Invalid IPv6 address %s",
CONFIG_NET_SAMPLES_MY_IPV6_ADDR); CONFIG_NET_APP_MY_IPV6_ADDR);
net_ipaddr_copy(&my_addr6.sin6_addr, &in6addr_my); net_ipaddr_copy(&my_addr6.sin6_addr, &in6addr_my);
} }
#endif #endif
#if defined(CONFIG_NET_SAMPLES_IP_ADDRESSES) #if defined(CONFIG_NET_APP_SETTINGS)
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR, CONFIG_NET_APP_PEER_IPV6_ADDR,
&peer_addr6.sin6_addr) < 0) { &peer_addr6.sin6_addr) < 0) {
NET_ERR("Invalid peer IPv6 address %s", NET_ERR("Invalid peer IPv6 address %s",
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR); CONFIG_NET_APP_PEER_IPV6_ADDR);
net_ipaddr_copy(&peer_addr6.sin6_addr, &in6addr_peer); net_ipaddr_copy(&peer_addr6.sin6_addr, &in6addr_peer);
} }
@ -243,23 +243,23 @@ static inline void init_app(void)
#if defined(CONFIG_NET_DHCPV4) #if defined(CONFIG_NET_DHCPV4)
net_dhcpv4_start(net_if_get_default()); net_dhcpv4_start(net_if_get_default());
#else #else
#if defined(CONFIG_NET_SAMPLES_IP_ADDRESSES) #if defined(CONFIG_NET_APP_SETTINGS)
if (net_addr_pton(AF_INET, if (net_addr_pton(AF_INET,
CONFIG_NET_SAMPLES_MY_IPV4_ADDR, CONFIG_NET_APP_MY_IPV4_ADDR,
&my_addr4.sin_addr) < 0) { &my_addr4.sin_addr) < 0) {
NET_ERR("Invalid IPv4 address %s", NET_ERR("Invalid IPv4 address %s",
CONFIG_NET_SAMPLES_MY_IPV4_ADDR); CONFIG_NET_APP_MY_IPV4_ADDR);
net_ipaddr_copy(&my_addr4.sin_addr, &in4addr_my); net_ipaddr_copy(&my_addr4.sin_addr, &in4addr_my);
} }
#endif #endif
#if defined(CONFIG_NET_SAMPLES_IP_ADDRESSES) #if defined(CONFIG_NET_APP_SETTINGS)
if (net_addr_pton(AF_INET, if (net_addr_pton(AF_INET,
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR, CONFIG_NET_APP_PEER_IPV4_ADDR,
&peer_addr4.sin_addr) < 0) { &peer_addr4.sin_addr) < 0) {
NET_ERR("Invalid peer IPv4 address %s", NET_ERR("Invalid peer IPv4 address %s",
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR); CONFIG_NET_APP_PEER_IPV4_ADDR);
net_ipaddr_copy(&peer_addr4.sin_addr, &in4addr_peer); net_ipaddr_copy(&peer_addr4.sin_addr, &in4addr_peer);
} }

6
samples/net/echo_server/prj_arduino_101.conf
View file

@ -27,6 +27,6 @@ CONFIG_ETH_ENC28J60_0_MAC5=0x36
# Arduino 101 # Arduino 101
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

6
samples/net/echo_server/prj_bt.conf
View file

@ -29,8 +29,8 @@ CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_CONTEXT_NBUF_POOL=y CONFIG_NET_CONTEXT_NBUF_POOL=y

4
samples/net/echo_server/prj_cc2520.conf
View file

@ -43,5 +43,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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2"

10
samples/net/echo_server/prj_frdm_k64f.conf
View file

@ -25,8 +25,8 @@ CONFIG_NET_L2_ETHERNET=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

4
samples/net/echo_server/prj_frdm_k64f_cc2520.conf
View file

@ -50,5 +50,5 @@ 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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2"

4
samples/net/echo_server/prj_frdm_k64f_mcr20a.conf
View file

@ -43,5 +43,5 @@ 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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2"

6
samples/net/echo_server/prj_nrf5.conf
View file

@ -50,6 +50,6 @@ 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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::1"

4
samples/net/echo_server/prj_qemu_802154.conf
View file

@ -44,5 +44,5 @@ CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_IEEE802154_UPIPE=y CONFIG_IEEE802154_UPIPE=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2"

10
samples/net/echo_server/prj_qemu_cortex_m3.conf
View file

@ -21,8 +21,8 @@ CONFIG_NET_MAX_CONTEXTS=16
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

10
samples/net/echo_server/prj_qemu_x86.conf
View file

@ -23,10 +23,10 @@ CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_CONTEXT_NBUF_POOL=y CONFIG_NET_CONTEXT_NBUF_POOL=y

6
samples/net/echo_server/prj_sam_e70_xplained.conf
View file

@ -31,6 +31,6 @@ CONFIG_ETH_SAM_GMAC_MAC3=44
CONFIG_ETH_SAM_GMAC_MAC4=55 CONFIG_ETH_SAM_GMAC_MAC4=55
CONFIG_ETH_SAM_GMAC_MAC5=66 CONFIG_ETH_SAM_GMAC_MAC5=66
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"

12
samples/net/echo_server/src/echo-server.c
View file

@ -103,12 +103,12 @@ static inline void init_app(void)
k_sem_init(&quit_lock, 0, UINT_MAX); k_sem_init(&quit_lock, 0, UINT_MAX);
#if defined(CONFIG_NET_IPV6) #if defined(CONFIG_NET_IPV6)
#if defined(CONFIG_NET_SAMPLES_MY_IPV6_ADDR) #if defined(CONFIG_NET_APP_MY_IPV6_ADDR)
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_SAMPLES_MY_IPV6_ADDR, CONFIG_NET_APP_MY_IPV6_ADDR,
&in6addr_my) < 0) { &in6addr_my) < 0) {
NET_ERR("Invalid IPv6 address %s", NET_ERR("Invalid IPv6 address %s",
CONFIG_NET_SAMPLES_MY_IPV6_ADDR); CONFIG_NET_APP_MY_IPV6_ADDR);
} }
#endif #endif
@ -124,12 +124,12 @@ static inline void init_app(void)
#if defined(CONFIG_NET_DHCPV4) #if defined(CONFIG_NET_DHCPV4)
net_dhcpv4_start(net_if_get_default()); net_dhcpv4_start(net_if_get_default());
#else #else
#if defined(CONFIG_NET_SAMPLES_MY_IPV4_ADDR) #if defined(CONFIG_NET_APP_MY_IPV4_ADDR)
if (net_addr_pton(AF_INET, if (net_addr_pton(AF_INET,
CONFIG_NET_SAMPLES_MY_IPV4_ADDR, CONFIG_NET_APP_MY_IPV4_ADDR,
&in4addr_my) < 0) { &in4addr_my) < 0) {
NET_ERR("Invalid IPv4 address %s", NET_ERR("Invalid IPv4 address %s",
CONFIG_NET_SAMPLES_MY_IPV4_ADDR); CONFIG_NET_APP_MY_IPV4_ADDR);
} }
net_if_ipv4_addr_add(net_if_get_default(), &in4addr_my, net_if_ipv4_addr_add(net_if_get_default(), &in4addr_my,

4
samples/net/http_client/README.rst
View file

@ -40,8 +40,8 @@ for example:
.. code-block:: console .. code-block:: console
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_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. HTTP server, respectively.

11
samples/net/http_client/prj_frdm_k64f.conf
View file

@ -24,15 +24,14 @@ CONFIG_STDOUT_CONSOLE=y
# Set the IP addresses here or in the # Set the IP addresses here or in the
# src/config.h file # src/config.h file
# #
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10"
#CONFIG_MAIN_STACK_SIZE=8192 #CONFIG_MAIN_STACK_SIZE=8192
# See the config.h file and the LINEARIZE_BUFFER define # See the config.h file and the LINEARIZE_BUFFER define
# #
#CONFIG_NET_NBUF_DATA_SIZE=512 #CONFIG_NET_NBUF_DATA_SIZE=512

10
samples/net/http_client/prj_qemu_x86.conf
View file

@ -24,9 +24,9 @@ CONFIG_HTTP_CLIENT=y
CONFIG_HTTP_PARSER=y CONFIG_HTTP_PARSER=y
CONFIG_STDOUT_CONSOLE=y CONFIG_STDOUT_CONSOLE=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

10
samples/net/http_client/src/config.h
View file

@ -17,13 +17,13 @@
/* rx tx timeout */ /* rx tx timeout */
#define HTTP_NETWORK_TIMEOUT 300 #define HTTP_NETWORK_TIMEOUT 300
#ifdef CONFIG_NET_SAMPLES_IP_ADDRESSES #ifdef CONFIG_NET_APP_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define LOCAL_ADDR CONFIG_NET_SAMPLES_MY_IPV6_ADDR #define LOCAL_ADDR CONFIG_NET_APP_MY_IPV6_ADDR
#define SERVER_ADDR CONFIG_NET_SAMPLES_PEER_IPV6_ADDR #define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR
#else #else
#define LOCAL_ADDR CONFIG_NET_SAMPLES_MY_IPV4_ADDR #define LOCAL_ADDR CONFIG_NET_APP_MY_IPV4_ADDR
#define SERVER_ADDR CONFIG_NET_SAMPLES_PEER_IPV4_ADDR #define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

4
samples/net/http_server/README.rst
View file

@ -52,8 +52,8 @@ project configuration file:
.. code-block:: console .. code-block:: console
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101"
Adding URLs Adding URLs
=========== ===========

6
samples/net/http_server/prj_frdm_k64f.conf
View file

@ -24,8 +24,8 @@ CONFIG_NET_IPV6=n
# Enable IPv4 support # Enable IPv4 support
CONFIG_NET_IPV4=y CONFIG_NET_IPV4=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_MAX_CONTEXTS=16 CONFIG_NET_MAX_CONTEXTS=16

6
samples/net/http_server/prj_qemu_x86.conf
View file

@ -25,9 +25,9 @@ CONFIG_NET_IPV6=n
# Enable IPv4 support # Enable IPv4 support
CONFIG_NET_IPV4=y CONFIG_NET_IPV4=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_MAX_CONTEXTS=16 CONFIG_NET_MAX_CONTEXTS=16

6
samples/net/http_server/src/config.h
View file

@ -7,11 +7,11 @@
#ifndef _CONFIG_H_ #ifndef _CONFIG_H_
#define _CONFIG_H_ #define _CONFIG_H_
#ifdef CONFIG_NET_SAMPLES_IP_ADDRESSES #ifdef CONFIG_NET_APP_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define ZEPHYR_ADDR CONFIG_NET_SAMPLES_MY_IPV6_ADDR #define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR
#else #else
#define ZEPHYR_ADDR CONFIG_NET_SAMPLES_MY_IPV4_ADDR #define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

4
samples/net/ieee802154/qemu/prj.conf
View file

@ -43,8 +43,8 @@ CONFIG_NET_L2_IEEE802154_FRAGMENT=y
CONFIG_IEEE802154_UPIPE=y CONFIG_IEEE802154_UPIPE=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=2 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=2
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y CONFIG_KERNEL_SHELL=y

4
samples/net/ieee802154/qemu/prj_client.conf
View file

@ -43,8 +43,8 @@ CONFIG_NET_L2_IEEE802154_FRAGMENT=y
CONFIG_IEEE802154_UPIPE=y CONFIG_IEEE802154_UPIPE=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=2 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=2
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y CONFIG_KERNEL_SHELL=y

4
samples/net/ieee802154/qemu/prj_server.conf
View file

@ -43,8 +43,8 @@ CONFIG_NET_L2_IEEE802154_FRAGMENT=y
CONFIG_IEEE802154_UPIPE=y CONFIG_IEEE802154_UPIPE=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=2 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=2
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y CONFIG_KERNEL_SHELL=y

4
samples/net/ieee802154/qemu/src/ieee802154_qemu_test.c
View file

@ -37,8 +37,8 @@ static void setup_device(void)
return; return;
} }
if (net_addr_pton(AF_INET6, CONFIG_NET_SAMPLES_MY_IPV6_ADDR, &addr)) { if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR, &addr)) {
NET_ERR("Invalid address: %s", CONFIG_NET_SAMPLES_MY_IPV6_ADDR); NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV6_ADDR);
return; return;
} }

10
samples/net/irc_bot/prj_frdm_k64f.conf
View file

@ -24,11 +24,11 @@ CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=1
CONFIG_PRINTK=y CONFIG_PRINTK=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.0.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.0.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.168.0.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.0.2"
CONFIG_NET_L2_ETHERNET=y CONFIG_NET_L2_ETHERNET=y

10
samples/net/irc_bot/prj_qemu_x86.conf
View file

@ -25,10 +25,10 @@ CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=1
CONFIG_PRINTK=y CONFIG_PRINTK=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.0.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.0.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.168.0.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.0.2"
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y

24
samples/net/irc_bot/src/irc-bot.c
View file

@ -51,17 +51,17 @@ static bool fake_led;
#define ZIRC_AF_INET AF_INET6 #define ZIRC_AF_INET AF_INET6
#define ZIRC_SOCKADDR_IN sockaddr_in6 #define ZIRC_SOCKADDR_IN sockaddr_in6
#if defined(CONFIG_NET_SAMPLES_MY_IPV6_ADDR) #if defined(CONFIG_NET_APP_MY_IPV6_ADDR)
#define ZIRC_LOCAL_IP_ADDR CONFIG_NET_SAMPLES_MY_IPV6_ADDR #define ZIRC_LOCAL_IP_ADDR CONFIG_NET_APP_MY_IPV6_ADDR
#else #else
#define ZIRC_LOCAL_IP_ADDR "2001:db8::1" #define ZIRC_LOCAL_IP_ADDR "2001:db8::1"
#endif /* CONFIG_NET_SAMPLES_MY_IPV6_ADDR */ #endif /* CONFIG_NET_APP_MY_IPV6_ADDR */
#if defined(CONFIG_NET_SAMPLES_PEER_IPV6_ADDR) #if defined(CONFIG_NET_APP_PEER_IPV6_ADDR)
#define ZIRC_PEER_IP_ADDR CONFIG_NET_SAMPLES_PEER_IPV6_ADDR #define ZIRC_PEER_IP_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR
#else #else
#define ZIRC_PEER_IP_ADDR "2001:db8::2" #define ZIRC_PEER_IP_ADDR "2001:db8::2"
#endif /* CONFIG_NET_SAMPLES_PEER_IPV6_ADDR */ #endif /* CONFIG_NET_APP_PEER_IPV6_ADDR */
/* Google DNS server for IPv6 */ /* Google DNS server for IPv6 */
#define DNS_SERVER "2001:4860:4860::8888" #define DNS_SERVER "2001:4860:4860::8888"
@ -71,17 +71,17 @@ static bool fake_led;
#define ZIRC_AF_INET AF_INET #define ZIRC_AF_INET AF_INET
#define ZIRC_SOCKADDR_IN sockaddr_in #define ZIRC_SOCKADDR_IN sockaddr_in
#if defined(CONFIG_NET_SAMPLES_MY_IPV4_ADDR) #if defined(CONFIG_NET_APP_MY_IPV4_ADDR)
#define ZIRC_LOCAL_IP_ADDR CONFIG_NET_SAMPLES_MY_IPV4_ADDR #define ZIRC_LOCAL_IP_ADDR CONFIG_NET_APP_MY_IPV4_ADDR
#else #else
#define ZIRC_LOCAL_IP_ADDR "192.168.0.1" #define ZIRC_LOCAL_IP_ADDR "192.168.0.1"
#endif /* CONFIG_NET_SAMPLES_MY_IPV4_ADDR */ #endif /* CONFIG_NET_APP_MY_IPV4_ADDR */
#if defined(CONFIG_NET_SAMPLES_PEER_IPV4_ADDR) #if defined(CONFIG_NET_APP_PEER_IPV4_ADDR)
#define ZIRC_PEER_IP_ADDR CONFIG_NET_SAMPLES_PEER_IPV4_ADDR #define ZIRC_PEER_IP_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR
#else #else
#define ZIRC_PEER_IP_ADDR "192.168.0.2" #define ZIRC_PEER_IP_ADDR "192.168.0.2"
#endif /* CONFIG_NET_SAMPLES_PEER_IPV4_ADDR */ #endif /* CONFIG_NET_APP_PEER_IPV4_ADDR */
/* Google DNS server for IPv4 */ /* Google DNS server for IPv4 */
#define DNS_SERVER "8.8.8.8" #define DNS_SERVER "8.8.8.8"

10
samples/net/mbedtls_dtlsclient/prj_arduino_101.conf
View file

@ -33,8 +33,8 @@ CONFIG_NET_NBUF_TX_COUNT=10
CONFIG_NET_NBUF_TX_DATA_COUNT=20 CONFIG_NET_NBUF_TX_DATA_COUNT=20
CONFIG_NET_NBUF_RX_DATA_COUNT=20 CONFIG_NET_NBUF_RX_DATA_COUNT=20
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

10
samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf
View file

@ -14,8 +14,8 @@ CONFIG_PRINTK=y
CONFIG_MBEDTLS=y CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_BUILTIN=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

12
samples/net/mbedtls_dtlsclient/src/dtls_client.c
View file

@ -289,12 +289,12 @@ uint8_t stack[STACK_SIZE];
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_SAMPLES_MY_IPV6_ADDR) #if defined(CONFIG_NET_APP_MY_IPV6_ADDR)
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_SAMPLES_MY_IPV6_ADDR, CONFIG_NET_APP_MY_IPV6_ADDR,
&client_addr) < 0) { &client_addr) < 0) {
mbedtls_printf("Invalid IPv6 address %s", mbedtls_printf("Invalid IPv6 address %s",
CONFIG_NET_SAMPLES_MY_IPV6_ADDR); CONFIG_NET_APP_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,
@ -304,11 +304,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_SAMPLES_MY_IPV4_ADDR) #if defined(CONFIG_NET_APP_MY_IPV4_ADDR)
if (net_addr_pton(AF_INET, CONFIG_NET_SAMPLES_MY_IPV4_ADDR, if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR,
&client_addr) < 0) { &client_addr) < 0) {
mbedtls_printf("Invalid IPv4 address %s", mbedtls_printf("Invalid IPv4 address %s",
CONFIG_NET_SAMPLES_MY_IPV4_ADDR); CONFIG_NET_APP_MY_IPV4_ADDR);
} }
#endif #endif

12
samples/net/mbedtls_dtlsclient/src/udp.c
View file

@ -206,12 +206,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_SAMPLES_PEER_IPV6_ADDR) #if defined(CONFIG_NET_APP_PEER_IPV6_ADDR)
if (net_addr_pton(AF_INET6, if (net_addr_pton(AF_INET6,
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR, CONFIG_NET_APP_PEER_IPV6_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
printk("Invalid peer IPv6 address %s", printk("Invalid peer IPv6 address %s",
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR); CONFIG_NET_APP_PEER_IPV6_ADDR);
} }
#endif #endif
@ -257,11 +257,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_SAMPLES_PEER_IPV4_ADDR) #if defined(CONFIG_NET_APP_PEER_IPV4_ADDR)
if (net_addr_pton(AF_INET, CONFIG_NET_SAMPLES_PEER_IPV4_ADDR, if (net_addr_pton(AF_INET, CONFIG_NET_APP_PEER_IPV4_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
printk("Invalid IPv4 address %s", printk("Invalid IPv4 address %s",
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR); CONFIG_NET_APP_PEER_IPV4_ADDR);
} }
#endif #endif

10
samples/net/mbedtls_dtlsserver/prj_qemu_x86.conf
View file

@ -15,8 +15,8 @@ CONFIG_PRINTK=y
CONFIG_MBEDTLS=y CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_BUILTIN=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

12
samples/net/mbedtls_dtlsserver/src/dtls_server.c
View file

@ -367,11 +367,11 @@ uint8_t stack[STACK_SIZE];
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_SAMPLES_MY_IPV6_ADDR) #if defined(CONFIG_NET_APP_MY_IPV6_ADDR)
if (net_addr_pton(AF_INET6, CONFIG_NET_SAMPLES_MY_IPV6_ADDR, if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
mbedtls_printf("Invalid IPv6 address %s", mbedtls_printf("Invalid IPv6 address %s",
CONFIG_NET_SAMPLES_MY_IPV6_ADDR); CONFIG_NET_APP_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,
@ -382,11 +382,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_SAMPLES_MY_IPV4_ADDR) #if defined(CONFIG_NET_APP_MY_IPV4_ADDR)
if (net_addr_pton(AF_INET, CONFIG_NET_SAMPLES_MY_IPV4_ADDR, if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR,
&server_addr) < 0) { &server_addr) < 0) {
mbedtls_printf("Invalid IPv4 address %s", mbedtls_printf("Invalid IPv4 address %s",
CONFIG_NET_SAMPLES_MY_IPV4_ADDR); CONFIG_NET_APP_MY_IPV4_ADDR);
} }
#endif #endif

10
samples/net/mbedtls_sslclient/src/tcp_cfg.h
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_SAMPLES_IP_ADDRESSES #ifdef CONFIG_NET_APP_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define LOCAL_ADDR CONFIG_NET_SAMPLES_MY_IPV6_ADDR #define LOCAL_ADDR CONFIG_NET_APP_MY_IPV6_ADDR
#define SERVER_ADDR CONFIG_NET_SAMPLES_PEER_IPV6_ADDR #define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR
#else #else
#define LOCAL_ADDR CONFIG_NET_SAMPLES_MY_IPV4_ADDR #define LOCAL_ADDR CONFIG_NET_APP_MY_IPV4_ADDR
#define SERVER_ADDR CONFIG_NET_SAMPLES_PEER_IPV4_ADDR #define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

10
samples/net/mqtt_publisher/prj_96b_nitrogen.conf
View file

@ -20,12 +20,12 @@ CONFIG_NET_NBUF_DATA_SIZE=256
CONFIG_NET_NBUF_RX_DATA_COUNT=15 CONFIG_NET_NBUF_RX_DATA_COUNT=15
CONFIG_NET_NBUF_TX_DATA_COUNT=15 CONFIG_NET_NBUF_TX_DATA_COUNT=15
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_APP_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

10
samples/net/mqtt_publisher/prj_frdm_k64f.conf
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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.168.1.10" CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10"
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048

10
samples/net/mqtt_publisher/prj_qemu_x86.conf
View file

@ -25,12 +25,12 @@ CONFIG_NET_IPV4=y
# Enable the MQTT Lib # Enable the MQTT Lib
CONFIG_MQTT_LIB=y CONFIG_MQTT_LIB=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048

10
samples/net/mqtt_publisher/src/config.h
View file

@ -7,13 +7,13 @@
#ifndef __CONFIG_H__ #ifndef __CONFIG_H__
#define __CONFIG_H__ #define __CONFIG_H__
#ifdef CONFIG_NET_SAMPLES_IP_ADDRESSES #ifdef CONFIG_NET_APP_SETTINGS
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6
#define ZEPHYR_ADDR CONFIG_NET_SAMPLES_MY_IPV6_ADDR #define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV6_ADDR
#define SERVER_ADDR CONFIG_NET_SAMPLES_PEER_IPV6_ADDR #define SERVER_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR
#else #else
#define ZEPHYR_ADDR CONFIG_NET_SAMPLES_MY_IPV4_ADDR #define ZEPHYR_ADDR CONFIG_NET_APP_MY_IPV4_ADDR
#define SERVER_ADDR CONFIG_NET_SAMPLES_PEER_IPV4_ADDR #define SERVER_ADDR CONFIG_NET_APP_PEER_IPV4_ADDR
#endif #endif
#else #else
#ifdef CONFIG_NET_IPV6 #ifdef CONFIG_NET_IPV6

6
samples/net/nats/prj_qemu_x86.conf
View file

@ -21,9 +21,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_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y

24
samples/net/nats/src/main.c
View file

@ -33,34 +33,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_SAMPLES_MY_IPV6_ADDR) #if defined(CONFIG_NET_APP_MY_IPV6_ADDR)
#define NATS_LOCAL_IP_ADDR CONFIG_NET_SAMPLES_MY_IPV6_ADDR #define NATS_LOCAL_IP_ADDR CONFIG_NET_APP_MY_IPV6_ADDR
#else #else
#define NATS_LOCAL_IP_ADDR "2001:db8::1" #define NATS_LOCAL_IP_ADDR "2001:db8::1"
#endif /* CONFIG_NET_SAMPLES_MY_IPV6_ADDR */ #endif /* CONFIG_NET_APP_MY_IPV6_ADDR */
#if defined(CONFIG_NET_SAMPLES_PEER_IPV6_ADDR) #if defined(CONFIG_NET_APP_PEER_IPV6_ADDR)
#define NATS_PEER_IP_ADDR CONFIG_NET_SAMPLES_PEER_IPV6_ADDR #define NATS_PEER_IP_ADDR CONFIG_NET_APP_PEER_IPV6_ADDR
#else #else
#define NATS_PEER_IP_ADDR "2001:db8::2" #define NATS_PEER_IP_ADDR "2001:db8::2"
#endif /* CONFIG_NET_SAMPLES_PEER_IPV6_ADDR */ #endif /* CONFIG_NET_APP_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_SAMPLES_MY_IPV4_ADDR) #if defined(CONFIG_NET_APP_MY_IPV4_ADDR)
#define NATS_LOCAL_IP_ADDR CONFIG_NET_SAMPLES_MY_IPV4_ADDR #define NATS_LOCAL_IP_ADDR CONFIG_NET_APP_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_SAMPLES_MY_IPV4_ADDR */ #endif /* CONFIG_NET_APP_MY_IPV4_ADDR */
#if defined(CONFIG_NET_SAMPLES_PEER_IPV4_ADDR) #if defined(CONFIG_NET_APP_PEER_IPV4_ADDR)
#define NATS_PEER_IP_ADDR CONFIG_NET_SAMPLES_PEER_IPV4_ADDR #define NATS_PEER_IP_ADDR CONFIG_NET_APP_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_SAMPLES_PEER_IPV4_ADDR */ #endif /* CONFIG_NET_APP_PEER_IPV4_ADDR */
#endif #endif

4
samples/net/telnet/prj_frdm_k64f.conf
View file

@ -35,8 +35,8 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_SYS_LOG_ETHERNET_LEVEL=1 CONFIG_SYS_LOG_ETHERNET_LEVEL=1
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y CONFIG_KERNEL_SHELL=y

6
samples/net/telnet/prj_qemu_x86.conf
View file

@ -33,9 +33,9 @@ CONFIG_NET_LOG_GLOBAL=y
CONFIG_SYS_LOG_NET_LEVEL=2 CONFIG_SYS_LOG_NET_LEVEL=2
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y CONFIG_KERNEL_SHELL=y

6
samples/net/telnet/prj_qemu_x86_iamcu.conf
View file

@ -33,9 +33,9 @@ CONFIG_NET_LOG_GLOBAL=y
CONFIG_SYS_LOG_NET_LEVEL=2 CONFIG_SYS_LOG_NET_LEVEL=2
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y CONFIG_KERNEL_SHELL=y

12
samples/net/telnet/src/telnet.c
View file

@ -70,7 +70,7 @@ static void setup_dhcpv4(struct net_if *iface)
#if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4) #if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4)
#if !defined(CONFIG_NET_SAMPLES_MY_IPV4_ADDR) #if !defined(CONFIG_NET_APP_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
@ -79,8 +79,8 @@ static void setup_ipv4(struct net_if *iface)
char hr_addr[NET_IPV4_ADDR_LEN]; char hr_addr[NET_IPV4_ADDR_LEN];
struct in_addr addr; struct in_addr addr;
if (net_addr_pton(AF_INET, CONFIG_NET_SAMPLES_MY_IPV4_ADDR, &addr)) { if (net_addr_pton(AF_INET, CONFIG_NET_APP_MY_IPV4_ADDR, &addr)) {
NET_ERR("Invalid address: %s", CONFIG_NET_SAMPLES_MY_IPV4_ADDR); NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV4_ADDR);
return; return;
} }
@ -98,7 +98,7 @@ static void setup_ipv4(struct net_if *iface)
#define MCAST_IP6ADDR "ff84::2" #define MCAST_IP6ADDR "ff84::2"
#ifndef CONFIG_NET_SAMPLES_MY_IPV6_ADDR #ifndef CONFIG_NET_APP_MY_IPV6_ADDR
#error "You need to define an IPv6 Address!" #error "You need to define an IPv6 Address!"
#endif #endif
@ -107,8 +107,8 @@ static void setup_ipv6(struct net_if *iface)
char hr_addr[NET_IPV6_ADDR_LEN]; char hr_addr[NET_IPV6_ADDR_LEN];
struct in6_addr addr; struct in6_addr addr;
if (net_addr_pton(AF_INET6, CONFIG_NET_SAMPLES_MY_IPV6_ADDR, &addr)) { if (net_addr_pton(AF_INET6, CONFIG_NET_APP_MY_IPV6_ADDR, &addr)) {
NET_ERR("Invalid address: %s", CONFIG_NET_SAMPLES_MY_IPV6_ADDR); NET_ERR("Invalid address: %s", CONFIG_NET_APP_MY_IPV6_ADDR);
return; return;
} }

6
samples/net/zoap_client/prj_bt.conf
View file

@ -17,6 +17,6 @@ CONFIG_NET_MGMT_EVENT=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_L2_BLUETOOTH_SHELL=y CONFIG_NET_L2_BLUETOOTH_SHELL=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

6
samples/net/zoap_server/prj_cc2520.conf
View file

@ -9,6 +9,6 @@ CONFIG_NET_UDP=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_IEEE802154_CC2520=y CONFIG_IEEE802154_CC2520=y
CONFIG_ZOAP=y CONFIG_ZOAP=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

6
samples/net/zoap_server/src/zoap-server.c
View file

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

6
samples/net/zperf/prj_bt.conf
View file

@ -29,6 +29,6 @@ CONFIG_CONSOLE_HANDLER=y
CONFIG_CONSOLE_SHELL=y CONFIG_CONSOLE_SHELL=y
CONFIG_PRINTK=y CONFIG_PRINTK=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

10
samples/net/zperf/prj_frdm_k64f.conf
View file

@ -30,8 +30,8 @@ CONFIG_CONSOLE_HANDLER=y
CONFIG_CONSOLE_SHELL=y CONFIG_CONSOLE_SHELL=y
CONFIG_PRINTK=y CONFIG_PRINTK=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

10
samples/net/zperf/prj_qemu_x86.conf
View file

@ -30,8 +30,8 @@ CONFIG_CONSOLE_HANDLER=y
CONFIG_CONSOLE_SHELL=y CONFIG_CONSOLE_SHELL=y
CONFIG_PRINTK=y CONFIG_PRINTK=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_SAMPLES_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_SAMPLES_PEER_IPV4_ADDR="192.0.2.2" CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2"

6
samples/net/zperf/prj_quark_se_c1000_devboard.conf
View file

@ -37,6 +37,6 @@ CONFIG_CONSOLE_HANDLER=y
CONFIG_CONSOLE_SHELL=y CONFIG_CONSOLE_SHELL=y
CONFIG_PRINTK=y CONFIG_PRINTK=y
CONFIG_NET_SAMPLES_IP_ADDRESSES=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_SAMPLES_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"

12
samples/net/zperf/src/zperf_internal.h
View file

@ -16,14 +16,14 @@
#define MY_PREFIX_LEN_STR IP6PREFIX_STR(MY_PREFIX_LEN) #define MY_PREFIX_LEN_STR IP6PREFIX_STR(MY_PREFIX_LEN)
/* Note that you can set local endpoint address in config file */ /* Note that you can set local endpoint address in config file */
#if defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_SAMPLES_IP_ADDRESSES) #if defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_APP_SETTINGS)
#define MY_IP6ADDR CONFIG_NET_SAMPLES_MY_IPV6_ADDR #define MY_IP6ADDR CONFIG_NET_APP_MY_IPV6_ADDR
#define DST_IP6ADDR CONFIG_NET_SAMPLES_PEER_IPV6_ADDR #define DST_IP6ADDR CONFIG_NET_APP_PEER_IPV6_ADDR
#endif #endif
#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_SAMPLES_IP_ADDRESSES) #if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_APP_SETTINGS)
#define MY_IP4ADDR CONFIG_NET_SAMPLES_MY_IPV4_ADDR #define MY_IP4ADDR CONFIG_NET_APP_MY_IPV4_ADDR
#define DST_IP4ADDR CONFIG_NET_SAMPLES_PEER_IPV4_ADDR #define DST_IP4ADDR CONFIG_NET_APP_PEER_IPV4_ADDR
#endif #endif
#define PACKET_SIZE_MAX 1024 #define PACKET_SIZE_MAX 1024

2
subsys/net/ip/Kconfig
View file

@ -299,6 +299,6 @@ source "subsys/net/ip/Kconfig.rpl"
source "subsys/net/ip/Kconfig.stats" source "subsys/net/ip/Kconfig.stats"
source "subsys/net/ip/Kconfig.samples" source "subsys/net/ip/Kconfig.app"
endmenu endmenu

23
subsys/net/ip/Kconfig.samples → subsys/net/ip/Kconfig.app
View file

@ -1,4 +1,4 @@
# Kconfig.samples - Options for sample applications # Kconfig.app - Options for sample applications
# #
# Copyright (c) 2016 Intel Corporation. # Copyright (c) 2016 Intel Corporation.
@ -6,23 +6,26 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
menuconfig NET_SAMPLES_IP_ADDRESSES menuconfig NET_APP_SETTINGS
bool "Set IP addresses for sample applications" bool "Set network settings for sample applications"
default n default n
help help
Allow IP addresses to be set in config file for Allow IP addresses to be set in config file for
networking client/server sample applications. networking client/server sample applications, or
some link-layer dedicated settings like the channel.
Beware this is not meant to be used for proper
provisioning but quick sampling/testing.
if NET_SAMPLES_IP_ADDRESSES if NET_APP_SETTINGS
if NET_IPV6 if NET_IPV6
config NET_SAMPLES_MY_IPV6_ADDR config NET_APP_MY_IPV6_ADDR
string "My IPv6 address" string "My IPv6 address"
help help
Use 2001:db8::1 here if uncertain. Use 2001:db8::1 here if uncertain.
config NET_SAMPLES_PEER_IPV6_ADDR config NET_APP_PEER_IPV6_ADDR
string "Peer IPv6 address" string "Peer IPv6 address"
help help
This is only applicable in client side applications that try This is only applicable in client side applications that try
@ -33,12 +36,12 @@ endif # NET_IPV6
if NET_IPV4 if NET_IPV4
config NET_SAMPLES_MY_IPV4_ADDR config NET_APP_MY_IPV4_ADDR
string "My IPv4 address" string "My IPv4 address"
help help
Use 192.0.2.1 here if uncertain. Use 192.0.2.1 here if uncertain.
config NET_SAMPLES_PEER_IPV4_ADDR config NET_APP_PEER_IPV4_ADDR
string "Peer IPv4 address" string "Peer IPv4 address"
help help
This is only applicable in client side applications that try This is only applicable in client side applications that try
@ -47,4 +50,4 @@ config NET_SAMPLES_PEER_IPV4_ADDR
endif # NET_IPV4 endif # NET_IPV4
endif # NET_SAMPLES_IP_ADDRESSES endif # NET_APP_SETTINGS