From: Stephen Hemminger <stephen@networkplumber.org>
To: Ben Magistro <koncept1@gmail.com>
Cc: dev@dpdk.org, Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v2 6/6] app/dumpcap: support interface name and description
Date: Tue, 3 Jan 2023 19:38:15 -0800 [thread overview]
Message-ID: <20230104033815.35496-7-stephen@networkplumber.org> (raw)
In-Reply-To: <20230104033815.35496-1-stephen@networkplumber.org>
Support setting --ifname and --ifdescr options to record information
in the start of the pcapng interface description block.
Also, records filter (if any) used in the file.
This also makes sure only the interfaces being recorded in
the capture file are in the interface block.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
app/dumpcap/main.c | 36 +++++++++++++++++++++++++++++++-----
1 file changed, 31 insertions(+), 5 deletions(-)
diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index 86a4423b6de1..fdabc14b02c6 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -93,6 +93,8 @@ struct interface {
char name[RTE_ETH_NAME_MAX_LEN];
struct rte_rxtx_callback *rx_cb[RTE_MAX_QUEUES_PER_PORT];
+ const char *ifname;
+ const char *ifdescr;
};
TAILQ_HEAD(interface_list, interface);
@@ -110,6 +112,9 @@ static void usage(void)
printf("Capture Interface:\n"
" -i <interface> name or port index of interface\n"
" -f <capture filter> packet filter in libpcap filter syntax\n");
+ printf(" --ifname <name> name to use in the capture file\n");
+ printf(" --ifdescr <description>\n");
+ printf(" description to use in the capture file\n");
printf(" -s <snaplen>, --snapshot-length <snaplen>\n"
" packet snapshot length (def: %u)\n",
RTE_MBUF_DEFAULT_BUF_SIZE);
@@ -330,6 +335,8 @@ static void parse_opts(int argc, char **argv)
{ "capture-comment", required_argument, NULL, 0 },
{ "file-prefix", required_argument, NULL, 0 },
{ "help", no_argument, NULL, 'h' },
+ { "ifdescr", required_argument, NULL, 0 },
+ { "ifname", required_argument, NULL, 0 },
{ "interface", required_argument, NULL, 'i' },
{ "list-interfaces", no_argument, NULL, 'D' },
{ "no-promiscuous-mode", no_argument, NULL, 'p' },
@@ -350,18 +357,30 @@ static void parse_opts(int argc, char **argv)
break;
switch (c) {
- case 0:
- if (!strcmp(long_options[option_index].name,
- "capture-comment")) {
+ case 0: {
+ const char *longopt
+ = long_options[option_index].name;
+
+ if (!strcmp(longopt, "capture-comment")) {
capture_comment = optarg;
- } else if (!strcmp(long_options[option_index].name,
- "file-prefix")) {
+ } else if (!strcmp(longopt,"file-prefix")) {
file_prefix = optarg;
+ } else if (!strcmp(longopt, "ifdescr")) {
+ if (last_intf == NULL)
+ rte_exit(EXIT_FAILURE,
+ "--ifdescr must be specified after a -i option\n");
+ last_intf->ifdescr = optarg;
+ } else if (!strcmp(longopt, "ifname")) {
+ if (last_intf == NULL)
+ rte_exit(EXIT_FAILURE,
+ "--ifname must be specified after a -i option\n");
+ last_intf->ifname = optarg;
} else {
usage();
exit(1);
}
break;
+ }
case 'a':
auto_stop(optarg);
break;
@@ -700,6 +719,7 @@ static dumpcap_out_t create_output(void)
}
if (use_pcapng) {
+ struct interface *intf;
char *os = get_os_info();
ret.pcapng = rte_pcapng_fdopen(fd, os, NULL,
@@ -708,6 +728,12 @@ static dumpcap_out_t create_output(void)
rte_exit(EXIT_FAILURE, "pcapng_fdopen failed: %s\n",
strerror(rte_errno));
free(os);
+
+ TAILQ_FOREACH(intf, &interfaces, next) {
+ rte_pcapng_add_interface(ret.pcapng, intf->port,
+ intf->ifname, intf->ifdescr,
+ intf->opts.filter);
+ }
} else {
pcap_t *pcap;
--
2.39.0
next prev parent reply other threads:[~2023-01-04 3:38 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 ` [PATCH 6/6] app/dumpcap: refactor add all and default Ben Magistro
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 ` Stephen Hemminger [this message]
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=20230104033815.35496-7-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=koncept1@gmail.com \
/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).