bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samples: net: common: Check that tunnel config options are valid

Browse Source 
Make sure that we have always a default value for tunnel peer and
local addresses.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
This commit is contained in:
Jukka Rissanen 2025-04-02 10:23:29 +03:00 committed by Benjamin Cabé
parent 43acb93607
commit db098f5ae8
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
samples/net/common/tunnel.c
View File

@ -13,6 +13,18 @@ LOG_MODULE_DECLARE(net_samples_common, LOG_LEVEL_DBG);
#include <zephyr/net/virtual_mgmt.h>
#include <zephyr/net/conn_mgr_monitor.h>
#if defined(CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR)
#define NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR
#else
#define NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR ""
#endif
#if defined(CONFIG_NET_SAMPLE_COMMON_TUNNEL_MY_ADDR)
#define NET_SAMPLE_COMMON_TUNNEL_MY_ADDR CONFIG_NET_SAMPLE_COMMON_TUNNEL_MY_ADDR
#else
#define NET_SAMPLE_COMMON_TUNNEL_MY_ADDR ""
#endif
/* User data for the interface callback */
struct ud {
struct net_if *tunnel;
@ -88,16 +100,16 @@ int init_tunnel(void)
memset(&ud, 0, sizeof(ud));
if (CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR[0] == '\0') {
if (NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR[0] == '\0') {
LOG_INF("Tunnel peer address not set.");
return 0;
}
if (!net_ipaddr_parse(CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR,
strlen(CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR),
if (!net_ipaddr_parse(NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR,
strlen(NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR),
&peer)) {
LOG_ERR("Tunnel peer address \"%s\" invalid.",
CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR);
NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR);
return -EINVAL;
}
@ -130,7 +142,7 @@ int init_tunnel(void)
if (ud.peer == NULL) {
LOG_ERR("Peer address %s unreachable",
CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR);
NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR);
return -ENETUNREACH;
}
@ -146,7 +158,7 @@ int init_tunnel(void)
if (ret < 0 && ret != -ENOTSUP) {
LOG_ERR("Cannot set peer address %s to "
"interface %d (%d)",
CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR,
NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR,
net_if_get_by_iface(ud.tunnel),
ret);
}
@ -161,10 +173,10 @@ int init_tunnel(void)
}
ret = setup_iface(ud.tunnel,
CONFIG_NET_SAMPLE_COMMON_TUNNEL_MY_ADDR);
NET_SAMPLE_COMMON_TUNNEL_MY_ADDR);
if (ret < 0) {
LOG_ERR("Cannot set IP address %s to tunnel interface",
CONFIG_NET_SAMPLE_COMMON_TUNNEL_MY_ADDR);
NET_SAMPLE_COMMON_TUNNEL_MY_ADDR);
return -EINVAL;
}