- gerrit-log - lists.osmocom.org

[XS] Change in osmo-pcap[master]: pcap-server: Use osmo_talloc_replace_string() to replace base-path
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39190?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: pcap-server: Use osmo_talloc_replace_string() to replace base-path ...................................................................... pcap-server: Use osmo_talloc_replace_string() to replace base-path Change-Id: I9ba1b7202d3e6a06cfd6efd6ed773b53007a99c4 --- M src/osmo_server_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 3191cda..6a44da6 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -149,8 +149,7 @@ "base-path PATH", "Base path for log files\n" "Path\n") { - talloc_free(pcap_server->base_path); - pcap_server->base_path = talloc_strdup(pcap_server, argv[0]); + osmo_talloc_replace_string(pcap_server, &pcap_server->base_path, argv[0]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39190?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: I9ba1b7202d3e6a06cfd6efd6ed773b53007a99c4 Gerrit-Change-Number: 39190 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

1 0

[S] Change in osmo-pcap[master]: pcap-server: Move struct osmo_pcap_server alloc to its own helper fun...
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39191?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: pcap-server: Move struct osmo_pcap_server alloc to its own helper function ...................................................................... pcap-server: Move struct osmo_pcap_server alloc to its own helper function Change-Id: Ie3b96ed6f47c966e2e12ab99710ac6af1468f963 --- M src/osmo_server_main.c 1 file changed, 23 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index a04de9b..74d2727 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -204,6 +204,28 @@ msgb_talloc_ctx_init(tall_srv_ctx, 0); } +static struct osmo_pcap_server *osmo_pcap_server_alloc(void *ctx) +{ + struct osmo_pcap_server *psrv = talloc_zero(ctx, struct osmo_pcap_server); + OSMO_ASSERT(psrv); + + psrv->ctrg = rate_ctr_group_alloc(psrv, &pcap_server_group_desc, 0); + OSMO_ASSERT(psrv->ctrg); + + INIT_LLIST_HEAD(&psrv->conn); + psrv->base_path = talloc_strdup(psrv, "./"); + OSMO_ASSERT(psrv->base_path); + psrv->permission_mask = 0440; + psrv->max_size = 1073741824; /* 1024^3, 1GB **/ + psrv->max_size_enabled = true; + psrv->max_snaplen = DEFAULT_SNAPLEN; + /* By default rotate daily: */ + psrv->rotate_localtime.enabled = true; + psrv->rotate_localtime.intv = TIME_INTERVAL_DAY; + psrv->rotate_localtime.modulus = 1; + return psrv; +} + int main(int argc, char **argv) { int rc; @@ -236,27 +258,7 @@ osmo_tls_init(); - pcap_server = talloc_zero(tall_srv_ctx, struct osmo_pcap_server); - if (!pcap_server) { - LOGP(DSERVER, LOGL_ERROR, "Failed to allocate osmo_pcap_server.\n"); - exit(1); - } - pcap_server->ctrg = rate_ctr_group_alloc(pcap_server, &pcap_server_group_desc, 0); - if (!pcap_server->ctrg) { - LOGP(DSERVER, LOGL_ERROR, "Failed to allocate rate counter.\n"); - exit(1); - } - - INIT_LLIST_HEAD(&pcap_server->conn); - pcap_server->base_path = talloc_strdup(pcap_server, "./"); - pcap_server->permission_mask = 0440; - pcap_server->max_size = 1073741824; /* 1024^3, 1GB **/ - pcap_server->max_size_enabled = true; - pcap_server->max_snaplen = DEFAULT_SNAPLEN; - /* By default rotate daily: */ - pcap_server->rotate_localtime.enabled = true; - pcap_server->rotate_localtime.intv = TIME_INTERVAL_DAY; - pcap_server->rotate_localtime.modulus = 1; + pcap_server = osmo_pcap_server_alloc(tall_srv_ctx); if (vty_read_config_file(config_file, NULL) < 0) { LOGP(DSERVER, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39191?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: Ie3b96ed6f47c966e2e12ab99710ac6af1468f963 Gerrit-Change-Number: 39191 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

1 0

[M] Change in osmo-pcap[master]: pcap-client: Move stats to its own file
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: laforge, pespin. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39173?usp=email ) Change subject: pcap-client: Move stats to its own file ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39173?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: I4b5ecdd6f9b0c646dd03ca3bc7fa24624fb9fcbc Gerrit-Change-Number: 39173 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 14:39:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-pcap[master]: pcap-client: Move stats to its own file
by fixeria 24 Dec '24

24 Dec '24

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39173?usp=email ) Change subject: pcap-client: Move stats to its own file ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39173?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: I4b5ecdd6f9b0c646dd03ca3bc7fa24624fb9fcbc Gerrit-Change-Number: 39173 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 14:39:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-pcap[master]: pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39174?usp=email to look at the new patch set (#3). 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: pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs ...................................................................... pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs Change-Id: Idcc20646d252ad7bf61a740d900b31ca37ada280 --- M src/osmo_client_core.c M src/osmo_client_network.c M src/osmo_server_network.c 3 files changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/74/39174/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39174?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: Idcc20646d252ad7bf61a740d900b31ca37ada280 Gerrit-Change-Number: 39174 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-pcap[master]: pcap-client: Add per iface counter group instance
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39175?usp=email to look at the new patch set (#3). 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: pcap-client: Add per iface counter group instance ...................................................................... pcap-client: Add per iface counter group instance Change-Id: I0a35f8258eedb785ddb3311f94b42707f0045c32 --- M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c M src/osmo_client_stats.c 3 files changed, 54 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/75/39175/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39175?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: I0a35f8258eedb785ddb3311f94b42707f0045c32 Gerrit-Change-Number: 39175 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-pcap[master]: pcap-client: Move stats to its own file
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39173?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: pcap-client: Move stats to its own file ...................................................................... pcap-client: Move stats to its own file Further stats groups will be added, so move it to a separate file for easier handing. Change-Id: I4b5ecdd6f9b0c646dd03ca3bc7fa24624fb9fcbc --- M include/osmo-pcap/osmo_pcap_client.h M src/Makefile.am M src/osmo_client_core.c M src/osmo_client_main.c A src/osmo_client_stats.c 5 files changed, 69 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/73/39173/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39173?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: I4b5ecdd6f9b0c646dd03ca3bc7fa24624fb9fcbc Gerrit-Change-Number: 39173 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: pcap-server: Move struct osmo_pcap_server alloc to its own helper fun...
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39191?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: pcap-server: Move struct osmo_pcap_server alloc to its own helper function ...................................................................... pcap-server: Move struct osmo_pcap_server alloc to its own helper function Change-Id: Ie3b96ed6f47c966e2e12ab99710ac6af1468f963 --- M src/osmo_server_main.c 1 file changed, 23 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/91/39191/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39191?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: Ie3b96ed6f47c966e2e12ab99710ac6af1468f963 Gerrit-Change-Number: 39191 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-server: Use osmo_talloc_replace_string() to replace base-path
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39190?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: pcap-server: Use osmo_talloc_replace_string() to replace base-path ...................................................................... pcap-server: Use osmo_talloc_replace_string() to replace base-path Change-Id: I9ba1b7202d3e6a06cfd6efd6ed773b53007a99c4 --- M src/osmo_server_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/90/39190/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39190?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: I9ba1b7202d3e6a06cfd6efd6ed773b53007a99c4 Gerrit-Change-Number: 39190 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-client: Allow recording on several interfaces
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39176?usp=email to look at the new patch set (#3). 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: pcap-client: Allow recording on several interfaces ...................................................................... pcap-client: Allow recording on several interfaces This commit enables basic support for multi-interface capturing. The transmitted data to the osmo-pcap-server is not yet in pcapng format, which means no information regarding the iface it was captured on is provided when opening the resulting pcap file. Related: SYS#5822 Change-Id: I082b0bd38cf1829937c5e643f0ee31f9d56a07a7 --- M src/osmo_client_vty.c 1 file changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/76/39176/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39176?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: I082b0bd38cf1829937c5e643f0ee31f9d56a07a7 Gerrit-Change-Number: 39176 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log