From: Ben Magistro <koncept1@gmail.com>
To: dev@dpdk.org, stephen@networkplumber.org
Cc: ben.magistro@trinitycyber.com, Ben Magistro <koncept1@gmail.com>
Subject: [PATCH 6/6] app/dumpcap: refactor add all and default
Date: Mon, 2 Jan 2023 16:24:41 +0000 [thread overview]
Message-ID: <20230102162441.6205-6-koncept1@gmail.com> (raw)
In-Reply-To: <20230102162441.6205-1-koncept1@gmail.com>
This refactors the add all and default interface functions to reduce code
duplication.
Cc: stephen@networkplumber.org
Signed-off-by: Ben Magistro <koncept1@gmail.com>
---
app/dumpcap/main.c | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index 1dc4a38adb..d85839a550 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -230,33 +230,20 @@ static void add_interface(uint16_t port, const char *name, struct interface_opts
TAILQ_INSERT_TAIL(&interfaces, intf, next);
}
-/* Select all valid DPDK interfaces */
-static void select_all_interfaces(struct interface_opts *opts)
+/* Select available DPDK interfaces up to the limit */
+static void select_available_interfaces(uint8_t limit, struct interface_opts *opts)
{
char name[RTE_ETH_NAME_MAX_LEN];
uint16_t p;
+ uint8_t added = 0;
RTE_ETH_FOREACH_DEV(p) {
if (rte_eth_dev_get_name_by_port(p, name) < 0)
continue;
add_interface(p, name, opts);
- }
-}
-
-/*
- * Choose interface to capture if no -i option given.
- * Select the first DPDK port, this matches what dumpcap does.
- */
-static void set_default_interface(struct interface_opts *opts)
-{
- char name[RTE_ETH_NAME_MAX_LEN];
- uint16_t p;
-
- RTE_ETH_FOREACH_DEV(p) {
- if (rte_eth_dev_get_name_by_port(p, name) < 0)
- continue;
- add_interface(p, name, opts);
- return;
+ added++;
+ if (added == limit)
+ break;
}
}
@@ -266,7 +253,7 @@ static void select_interface(struct interface_opts *opts)
uint16_t port;
if (strcmp(opts->intf_arg, "*") == 0)
- select_all_interfaces(opts);
+ select_available_interfaces(RTE_MAX_ETHPORTS, opts);
else if (rte_eth_dev_get_port_by_name(opts->intf_arg, &port) == 0)
add_interface(port, opts->intf_arg, opts);
else {
@@ -292,7 +279,7 @@ static void collect_interfaces(void)
active = 0;
if (interface_arg_count == 0)
- set_default_interface(&interface_defaults);
+ select_available_interfaces(1, &interface_defaults);
else
for (uint8_t i = 0; i < interface_arg_count; ++i)
select_interface(&interface_args[i]);
--
2.27.0
next prev parent reply other threads:[~2023-01-02 16:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-02 16:24 [PATCH 1/6] app/dumpcap: add additional dump info Ben Magistro
2023-01-02 16:24 ` [PATCH 2/6] app/dumpcap: fix storing port identifier Ben Magistro
2023-01-02 16:58 ` Stephen Hemminger
2023-01-04 3:04 ` Stephen Hemminger
2023-01-02 16:24 ` [PATCH 3/6] app/dumpcap: fix preserving promiscuous mode Ben Magistro
2023-01-02 16:58 ` Stephen Hemminger
2023-01-04 3:04 ` Stephen Hemminger
2023-01-02 16:24 ` [PATCH 4/6] app/dumpcap: fix capturing on multiple interfaces Ben Magistro
2023-01-04 3:01 ` Stephen Hemminger
2023-01-02 16:24 ` [PATCH 5/6] app/dumpcap: improve per interface arg parsing Ben Magistro
2023-01-04 3:04 ` Stephen Hemminger
2023-01-02 16:24 ` Ben Magistro [this message]
2023-01-02 16:57 ` [PATCH 1/6] app/dumpcap: add additional dump info Stephen Hemminger
2023-01-02 17:01 ` [RFT] dumpcap: fix multiple interface and promiscious handling Stephen Hemminger
2023-01-04 2:58 ` [PATCH 1/6] app/dumpcap: add additional dump info Stephen Hemminger
2023-01-04 3:38 ` [PATCH v2 0/6] dumpcap support multiple interfaces Stephen Hemminger
2023-01-04 3:38 ` [PATCH v2 1/6] app/dumpcap: fix storing port identifier Stephen Hemminger
2023-01-04 3:38 ` [PATCH v2 2/6] app/dumpcap: remove unused variable Stephen Hemminger
2023-01-04 3:38 ` [PATCH v2 3/6] app/dumpcap: check for invalid interface name Stephen Hemminger
2023-01-04 3:38 ` [PATCH v2 4/6] app/dumpcap: support multiple interfaces Stephen Hemminger
2023-01-04 3:38 ` [PATCH v2 5/6] pcapng: require per-interface information Stephen Hemminger
2023-01-04 3:38 ` [PATCH v2 6/6] app/dumpcap: support interface name and description Stephen Hemminger
2023-02-06 11:18 ` [PATCH v2 0/6] dumpcap support multiple interfaces Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230102162441.6205-6-koncept1@gmail.com \
--to=koncept1@gmail.com \
--cc=ben.magistro@trinitycyber.com \
--cc=dev@dpdk.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).