From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH v2 2/4] monitor: track current PCAP size
Date: Mon, 2 Dec 2024 06:54:36 -0800 [thread overview]
Message-ID: <20241202145438.282998-2-prestwoj@gmail.com> (raw)
In-Reply-To: <20241202145438.282998-1-prestwoj@gmail.com>
This will come into play when support for rolling captures is
added to iwmon.
---
monitor/pcap.c | 10 ++++++++++
monitor/pcap.h | 1 +
2 files changed, 11 insertions(+)
diff --git a/monitor/pcap.c b/monitor/pcap.c
index fb29eea8..b13a29f3 100644
--- a/monitor/pcap.c
+++ b/monitor/pcap.c
@@ -60,6 +60,7 @@ struct pcap {
bool closed;
uint32_t type;
uint32_t snaplen;
+ size_t size;
};
struct pcap *pcap_open(const char *pathname)
@@ -152,6 +153,8 @@ struct pcap *pcap_create(const char *pathname)
goto failed;
}
+ pcap->size += len;
+
return pcap;
failed:
@@ -188,6 +191,11 @@ uint32_t pcap_get_snaplen(struct pcap *pcap)
return pcap->snaplen;
}
+size_t pcap_get_size(struct pcap *pcap)
+{
+ return pcap->size;
+}
+
bool pcap_read(struct pcap *pcap, struct timeval *tv,
void *data, uint32_t size, uint32_t *len, uint32_t *real_len)
{
@@ -279,5 +287,7 @@ bool pcap_write(struct pcap *pcap, const struct timeval *tv,
return false;
}
+ pcap->size += written;
+
return true;
}
diff --git a/monitor/pcap.h b/monitor/pcap.h
index 1705b33d..5b797cf3 100644
--- a/monitor/pcap.h
+++ b/monitor/pcap.h
@@ -36,6 +36,7 @@ void pcap_close(struct pcap *pcap);
uint32_t pcap_get_type(struct pcap *pcap);
uint32_t pcap_get_snaplen(struct pcap *pcap);
+size_t pcap_get_size(struct pcap *pcap);
bool pcap_read(struct pcap *pcap, struct timeval *tv,
void *data, uint32_t size, uint32_t *len, uint32_t *real_len);
--
2.34.1
next prev parent reply other threads:[~2024-12-02 14:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-02 14:54 [PATCH v2 1/4] monitor: add --time-format,-t option James Prestwood
2024-12-02 14:54 ` James Prestwood [this message]
2024-12-02 14:54 ` [PATCH v2 3/4] monitor: add support for limiting PCAP size/count James Prestwood
2024-12-02 14:54 ` [PATCH v2 4/4] monitor: add --pcap-size,--pcap-count James Prestwood
2024-12-17 17:29 ` [PATCH v2 1/4] monitor: add --time-format,-t option Denis Kenzior
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=20241202145438.282998-2-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=iwd@lists.linux.dev \
/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