net: shell: Add virtual command
Move "virtual" command to a separate file. Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
This commit is contained in:
Jukka Rissanen
Carles Cufí
parent
7a167648eb
commit
82a57b9789
|
|
@ -28,6 +28,7 @@ zephyr_library_sources(stats.c)
|
|||
zephyr_library_sources(suspend.c)
|
||||
zephyr_library_sources(tcp.c)
|
||||
zephyr_library_sources(udp.c)
|
||||
zephyr_library_sources(virtual.c)
|
||||
|
||||
zephyr_library_include_directories(
|
||||
${ZEPHYR_BASE}/kernel/include
|
||||
|
|
|
|||
|
|
@ -38,10 +38,6 @@ LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
|
|||
#include <zephyr/net/ethernet_mgmt.h>
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_NET_L2_VIRTUAL)
|
||||
#include <zephyr/net/virtual.h>
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_NET_L2_VIRTUAL_MGMT)
|
||||
#include <zephyr/net/virtual_mgmt.h>
|
||||
#endif
|
||||
|
|
@ -251,102 +247,6 @@ const char *iface2str(struct net_if *iface, const char **extra)
|
|||
return "<unknown type>";
|
||||
}
|
||||
|
||||
#if defined(CONFIG_NET_L2_VIRTUAL)
|
||||
static void virtual_iface_cb(struct net_if *iface, void *user_data)
|
||||
{
|
||||
struct net_shell_user_data *data = user_data;
|
||||
const struct shell *sh = data->sh;
|
||||
int *count = data->user_data;
|
||||
char *name, buf[CONFIG_NET_L2_VIRTUAL_MAX_NAME_LEN];
|
||||
struct net_if *orig_iface;
|
||||
|
||||
if (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (*count == 0) {
|
||||
PR("Interface Attached-To Description\n");
|
||||
(*count)++;
|
||||
}
|
||||
|
||||
orig_iface = net_virtual_get_iface(iface);
|
||||
|
||||
name = net_virtual_get_name(iface, buf, sizeof(buf));
|
||||
|
||||
PR("%d %c %s\n",
|
||||
net_if_get_by_iface(iface),
|
||||
orig_iface ? net_if_get_by_iface(orig_iface) + '0' : '-',
|
||||
name);
|
||||
|
||||
(*count)++;
|
||||
}
|
||||
|
||||
static void attached_iface_cb(struct net_if *iface, void *user_data)
|
||||
{
|
||||
struct net_shell_user_data *data = user_data;
|
||||
const struct shell *sh = data->sh;
|
||||
int *count = data->user_data;
|
||||
char buf[CONFIG_NET_L2_VIRTUAL_MAX_NAME_LEN];
|
||||
const char *name;
|
||||
struct virtual_interface_context *ctx, *tmp;
|
||||
|
||||
if (sys_slist_is_empty(&iface->config.virtual_interfaces)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (*count == 0) {
|
||||
PR("Interface Below-of Description\n");
|
||||
(*count)++;
|
||||
}
|
||||
|
||||
PR("%d ", net_if_get_by_iface(iface));
|
||||
|
||||
SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&iface->config.virtual_interfaces,
|
||||
ctx, tmp, node) {
|
||||
if (ctx->virtual_iface == iface) {
|
||||
continue;
|
||||
}
|
||||
|
||||
PR("%d ", net_if_get_by_iface(ctx->virtual_iface));
|
||||
}
|
||||
|
||||
name = net_virtual_get_name(iface, buf, sizeof(buf));
|
||||
if (name == NULL) {
|
||||
name = iface2str(iface, NULL);
|
||||
}
|
||||
|
||||
PR(" %s\n", name);
|
||||
|
||||
(*count)++;
|
||||
}
|
||||
#endif /* CONFIG_NET_L2_VIRTUAL */
|
||||
|
||||
static int cmd_net_virtual(const struct shell *sh, size_t argc,
|
||||
char *argv[])
|
||||
{
|
||||
ARG_UNUSED(argc);
|
||||
ARG_UNUSED(argv);
|
||||
|
||||
#if defined(CONFIG_NET_L2_VIRTUAL)
|
||||
struct net_shell_user_data user_data;
|
||||
int count = 0;
|
||||
|
||||
user_data.sh = sh;
|
||||
user_data.user_data = &count;
|
||||
|
||||
net_if_foreach(virtual_iface_cb, &user_data);
|
||||
|
||||
count = 0;
|
||||
PR("\n");
|
||||
|
||||
net_if_foreach(attached_iface_cb, &user_data);
|
||||
#else
|
||||
PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_L2_VIRTUAL",
|
||||
"virtual network interface");
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_NET_VLAN)
|
||||
static void iface_vlan_del_cb(struct net_if *iface, void *user_data)
|
||||
{
|
||||
|
|
@ -628,8 +528,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(net_cmd_vlan,
|
|||
|
||||
|
||||
SHELL_STATIC_SUBCMD_SET_CREATE(net_commands,
|
||||
SHELL_CMD(virtual, NULL, "Show virtual network interfaces.",
|
||||
cmd_net_virtual),
|
||||
SHELL_CMD(vlan, &net_cmd_vlan, "Show VLAN information.", cmd_net_vlan),
|
||||
SHELL_CMD(websocket, NULL, "Print information about WebSocket "
|
||||
"connections.",
|
||||
|
|
|
|||
118
subsys/net/lib/shell/virtual.c
Normal file
118
subsys/net/lib/shell/virtual.c
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
/*
|
||||
* Copyright (c) 2016 Intel Corporation
|
||||
* Copyright (c) 2023 Nordic Semiconductor ASA
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <zephyr/logging/log.h>
|
||||
LOG_MODULE_DECLARE(net_shell);
|
||||
|
||||
#if defined(CONFIG_NET_L2_VIRTUAL)
|
||||
#include <zephyr/net/virtual.h>
|
||||
#endif
|
||||
|
||||
#include "common.h"
|
||||
|
||||
#if defined(CONFIG_NET_L2_VIRTUAL)
|
||||
static void virtual_iface_cb(struct net_if *iface, void *user_data)
|
||||
{
|
||||
struct net_shell_user_data *data = user_data;
|
||||
const struct shell *sh = data->sh;
|
||||
int *count = data->user_data;
|
||||
char *name, buf[CONFIG_NET_L2_VIRTUAL_MAX_NAME_LEN];
|
||||
struct net_if *orig_iface;
|
||||
|
||||
if (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (*count == 0) {
|
||||
PR("Interface Attached-To Description\n");
|
||||
(*count)++;
|
||||
}
|
||||
|
||||
orig_iface = net_virtual_get_iface(iface);
|
||||
|
||||
name = net_virtual_get_name(iface, buf, sizeof(buf));
|
||||
|
||||
PR("%d %c %s\n",
|
||||
net_if_get_by_iface(iface),
|
||||
orig_iface ? net_if_get_by_iface(orig_iface) + '0' : '-',
|
||||
name);
|
||||
|
||||
(*count)++;
|
||||
}
|
||||
|
||||
static void attached_iface_cb(struct net_if *iface, void *user_data)
|
||||
{
|
||||
struct net_shell_user_data *data = user_data;
|
||||
const struct shell *sh = data->sh;
|
||||
int *count = data->user_data;
|
||||
char buf[CONFIG_NET_L2_VIRTUAL_MAX_NAME_LEN];
|
||||
const char *name;
|
||||
struct virtual_interface_context *ctx, *tmp;
|
||||
|
||||
if (sys_slist_is_empty(&iface->config.virtual_interfaces)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (*count == 0) {
|
||||
PR("Interface Below-of Description\n");
|
||||
(*count)++;
|
||||
}
|
||||
|
||||
PR("%d ", net_if_get_by_iface(iface));
|
||||
|
||||
SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&iface->config.virtual_interfaces,
|
||||
ctx, tmp, node) {
|
||||
if (ctx->virtual_iface == iface) {
|
||||
continue;
|
||||
}
|
||||
|
||||
PR("%d ", net_if_get_by_iface(ctx->virtual_iface));
|
||||
}
|
||||
|
||||
name = net_virtual_get_name(iface, buf, sizeof(buf));
|
||||
if (name == NULL) {
|
||||
name = iface2str(iface, NULL);
|
||||
}
|
||||
|
||||
PR(" %s\n", name);
|
||||
|
||||
(*count)++;
|
||||
}
|
||||
#endif /* CONFIG_NET_L2_VIRTUAL */
|
||||
|
||||
static int cmd_net_virtual(const struct shell *sh, size_t argc, char *argv[])
|
||||
{
|
||||
ARG_UNUSED(argc);
|
||||
ARG_UNUSED(argv);
|
||||
|
||||
#if defined(CONFIG_NET_L2_VIRTUAL)
|
||||
struct net_shell_user_data user_data;
|
||||
int count = 0;
|
||||
|
||||
user_data.sh = sh;
|
||||
user_data.user_data = &count;
|
||||
|
||||
net_if_foreach(virtual_iface_cb, &user_data);
|
||||
|
||||
if (count == 0) {
|
||||
PR("No virtual interfaces found.");
|
||||
}
|
||||
|
||||
count = 0;
|
||||
PR("\n");
|
||||
|
||||
net_if_foreach(attached_iface_cb, &user_data);
|
||||
#else
|
||||
PR_INFO("Set %s to enable %s support.\n", "CONFIG_NET_L2_VIRTUAL",
|
||||
"virtual network interface");
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
SHELL_SUBCMD_ADD((net), virtual, NULL,
|
||||
"Show virtual network interfaces.",
|
||||
cmd_net_virtual, 1, 0);
|
||||
Loading…
Reference in a new issue