fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42835?usp=email )
Change subject: doc: clarify 'pcap snaplen' / 'max-snaplen'
......................................................................
doc: clarify 'pcap snaplen' / 'max-snaplen'
Change-Id: Ic2c82173c12814d61f0ee9f7454b9e5dcb0c13f4
Related: SYS#8099
---
M doc/manuals/chapters/client.adoc
M doc/manuals/chapters/server.adoc
2 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/doc/manuals/chapters/client.adoc b/doc/manuals/chapters/client.adoc
index 1769b60..979d326 100644
--- a/doc/manuals/chapters/client.adoc
+++ b/doc/manuals/chapters/client.adoc
@@ -49,6 +49,7 @@
pcap device eth2 <3>
pcap filter udp port 23000 <4>
pcap detect-loop 1 <5>
+ pcap snaplen 9000 <6>
----
<1> Prepare records in pcapng format.
<2> The network device from which to obtain a capture.
@@ -57,6 +58,13 @@
<5> Instruct osmo-pcap-client to automatically add a filter that prevents
capturing the traffic between osmo-pcap-client and osmo-pcap-server,
which would create a loop.
+<6> Maximum number of bytes captured per packet (snapshot length).
+
+Packets longer than the configured `snaplen` are captured truncated, and
+osmo-pcap-client logs an error for each such packet. Note that kernel receive
+offloading (GRO/LRO) can hand libpcap coalesced "super-frames" much larger
+than the link MTU; either raise `snaplen` accordingly or disable offloading on
+the captured interface (e.g. `ethtool -K <iface> gro off lro off`).
Adding or removing new recording network devices during operation is not really
supported, and a restart of osmo-pcap-client is expected for the new
diff --git a/doc/manuals/chapters/server.adoc b/doc/manuals/chapters/server.adoc
index e0d9ff4..5d6ed32 100644
--- a/doc/manuals/chapters/server.adoc
+++ b/doc/manuals/chapters/server.adoc
@@ -46,6 +46,12 @@
<3> TCP port number to which to bind/listen
<4> maximum pcap snapshot length (per packet, in bytes; default: 9000)
+The `max-snaplen` value acts as an upper bound (ceiling) for all connected
+clients: a client is accepted as long as its own configured `snaplen` does not
+exceed the server's `max-snaplen`. It is therefore perfectly fine to configure a
+larger `max-snaplen` on the server than the `snaplen` used by some clients; each
+client's trace is recorded using that client's own snaplen.
+
The received packets are stored to a pcap file below the `base-path` using a filename
encoding both the client name and the date/time at time of file creation.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42835?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: Ic2c82173c12814d61f0ee9f7454b9e5dcb0c13f4
Gerrit-Change-Number: 42835
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42837?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: server: vty: fix docs for cfg_server_rotate_localtime[_mod_n]
......................................................................
server: vty: fix docs for cfg_server_rotate_localtime[_mod_n]
Change-Id: I6fd1d081bba035fbd9d72a1705ab58194edf274e
Fixes: 18747641 ("pcap-server: Make rotate-localtime feature configurable through VTY")
---
M src/osmo_server_vty.c
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c
index dfe9857..f96df7f 100644
--- a/src/osmo_server_vty.c
+++ b/src/osmo_server_vty.c
@@ -331,7 +331,9 @@
"Rotate every Second\n"
"Rotate every Minute\n"
"Rotate every Hour\n"
- "Rotate every Day\n")
+ "Rotate every Day\n"
+ "Rotate every Month\n"
+ "Rotate every Year\n")
{
return apply_rotate_localtime(vty, get_string_value(time_interval_names, argv[0]), 1);
}
@@ -344,8 +346,10 @@
"Rotate every Minute\n"
"Rotate every Hour\n"
"Rotate every Day\n"
- "Rotate every Nth second/minute/hour/day/month/year"
- "Nth second/minute/hour/day/month/year")
+ "Rotate every Month\n"
+ "Rotate every Year\n"
+ "Rotate every Nth second/minute/hour/day/month/year\n"
+ "Nth second/minute/hour/day/month/year\n")
{
unsigned long long modulus = strtoull(argv[1], NULL, 10);
return apply_rotate_localtime(vty, get_string_value(time_interval_names, argv[0]), modulus);
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42837?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I6fd1d081bba035fbd9d72a1705ab58194edf274e
Gerrit-Change-Number: 42837
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: laforge, pespin.
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcap/+/42835?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+2 by laforge, Verified+1 by Jenkins Builder
The change is no longer submittable: Code-Review and Verified are unsatisfied now.
Change subject: doc: clarify 'pcap snaplen' / 'max-snaplen'
......................................................................
doc: clarify 'pcap snaplen' / 'max-snaplen'
Change-Id: Ic2c82173c12814d61f0ee9f7454b9e5dcb0c13f4
Related: SYS#8099
---
M doc/manuals/chapters/client.adoc
M doc/manuals/chapters/server.adoc
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/35/42835/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42835?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: Ic2c82173c12814d61f0ee9f7454b9e5dcb0c13f4
Gerrit-Change-Number: 42835
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcap/+/42837?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
The change is no longer submittable: Verified is unsatisfied now.
Change subject: server: vty: fix docs for cfg_server_rotate_localtime[_mod_n]
......................................................................
server: vty: fix docs for cfg_server_rotate_localtime[_mod_n]
Change-Id: I6fd1d081bba035fbd9d72a1705ab58194edf274e
Fixes: 18747641 ("pcap-server: Make rotate-localtime feature configurable through VTY")
---
M src/osmo_server_vty.c
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/37/42837/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42837?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I6fd1d081bba035fbd9d72a1705ab58194edf274e
Gerrit-Change-Number: 42837
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: pespin.
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42836?usp=email )
Change subject: vty: clamp configured snaplen to the wire-framing limit
......................................................................
Patch Set 1:
(3 comments)
File include/osmo-pcap/common.h:
https://gerrit.osmocom.org/c/osmo-pcap/+/42836/comment/e7d701fc_01f3b7e4?us… :
PS1, Line 70: #define OSMO_PCAP_MAX_SNAPLEN 65535
> can we then set it to UINT16_MAX here?
Done
File src/osmo_client_vty.c:
https://gerrit.osmocom.org/c/osmo-pcap/+/42836/comment/0b01a86d_8bc0a6ce?us… :
PS1, Line 202: "Bytes (effectively limited to 64 KiB by the osmo-pcap wire framing)\n")
> Can you add the exact integer number here instead of 64KiB so user actually knows what to set it to?
Done
File src/osmo_server_vty.c:
https://gerrit.osmocom.org/c/osmo-pcap/+/42836/comment/c72c1cea_ea00f0ed?us… :
PS1, Line 377: "Bytes (effectively limited to 64 KiB by the osmo-pcap wire framing)\n")
> Can you add the exact integer number here instead of 64KiB so user actually knows what to set it to?
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42836?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: Ia56cad48e8cefe8ae103f2f7d2e037bf28438b71
Gerrit-Change-Number: 42836
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 20 Jun 2026 23:00:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Attention is currently required from: pespin.
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42835?usp=email )
Change subject: doc: clarify 'pcap snaplen' / 'max-snaplen'
......................................................................
Patch Set 1:
(1 comment)
File doc/manuals/chapters/client.adoc:
https://gerrit.osmocom.org/c/osmo-pcap/+/42835/comment/d7da9612_32fc73b3?us… :
PS1, Line 67: the captured interface (e.g. `ethtool -K <iface> gro off lro off gso off tso
> AFAIR GSO and TSO is for the transmit path, so I fail to see why they apply here?
Honestly, I took this command from somewhere, so I trust you here. Done.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42835?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: Ic2c82173c12814d61f0ee9f7454b9e5dcb0c13f4
Gerrit-Change-Number: 42835
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 20 Jun 2026 21:17:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/42854?usp=email )
Change subject: common: track whether gsm_time has been initialized
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42854?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I7022b0ad084a0c224f7e8c04aca0648915b1a1c6
Gerrit-Change-Number: 42854
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Sat, 20 Jun 2026 21:07:59 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Attention is currently required from: laforge, pespin.
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42849?usp=email )
Change subject: tls: fix broken certificate hostname verification
......................................................................
Patch Set 2:
(1 comment)
This change is ready for review.
File src/osmo_tls.c:
https://gerrit.osmocom.org/c/osmo-pcap/+/42849/comment/d21e1b08_994793e9?us… :
PS1, Line 529: sess->tls_hostname = client->tls_hostname;
> can client be freed here somehow while sess keeps being valid and hence sess->tls_hostname ends up p […]
`struct osmo_tls_session` is a field of `struct osmo_pcap_client_conn`, not a pointer, so if the client is free()d, the inner session structure becomes heap garbage. However, use-after-free is still possible here: if the user does `no tls hostname` in the VTY while `verify_cert_cb()` is invoked asynchronously, `conn->tls_hostname` is free()d and we end up with a dangling pointer. So I added `talloc_strdrup()`.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42849?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: If64950a698bfcfbf556a37ef1be3e68abc124384
Gerrit-Change-Number: 42849
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 20 Jun 2026 21:05:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>