- gerrit-log - lists.osmocom.org

[XS] Change in osmo-pcap[master]: pcap-server: Avoid closing cli conn if writing to disk fails
by pespin 11 Mar '25

11 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39772?usp=email ) Change subject: pcap-server: Avoid closing cli conn if writing to disk fails ...................................................................... pcap-server: Avoid closing cli conn if writing to disk fails Related: SYS#7374 Change-Id: I06b20a17fae064a74e2acdc4549df400ad9c4930 --- M src/osmo_server_core.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/72/39772/1 diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c index 9629423..cebc70a 100644 --- a/src/osmo_server_core.c +++ b/src/osmo_server_core.c @@ -547,8 +547,9 @@ rc = osmo_pcap_wr_file_write_msgb(conn->wrf, msg); if (rc < 0) { LOGP(DSERVER, LOGL_ERROR, "%s: Failed writing to file\n", conn->name); - /* msgb will be freed by caller */ - return -1; + msgb_free(msg); + /* Avoid closing conn. msgb won't be freed by caller */ + return 0; } update_last_write(conn, now); /* msgb is now owned by conn->wrf. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I06b20a17fae064a74e2acdc4549df400ad9c4930 Gerrit-Change-Number: 39772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-server: Validate rolling over file was successful before writing...
by pespin 11 Mar '25

11 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39773?usp=email ) Change subject: pcap-server: Validate rolling over file was successful before writing to it ...................................................................... pcap-server: Validate rolling over file was successful before writing to it If reopening the file fails (eg. disk full), we'd end up with a null conn->wrf pointer there which would segfault in osmo_pcap_wr_file_write_msgb() immediatelly below. Change-Id: I103d3f66bf40c68db1a20a987bc984989c91b447 --- M src/osmo_server_core.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/73/39773/1 diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c index cebc70a..77d916a 100644 --- a/src/osmo_server_core.c +++ b/src/osmo_server_core.c @@ -543,6 +543,13 @@ if (!check_restart_pcap_max_size(conn, msgb_length(msg))) check_restart_pcap_localtime(conn, now); + /* Since the checks above may have closed and re-opened (and could have + * failed), check again whether new wrf is ready... */ + if (!conn->wrf) { + LOGP(DSERVER, LOGL_ERROR, "No file is open. close connection.\n"); + return -1; + } + talloc_steal(conn->wrf, msg); rc = osmo_pcap_wr_file_write_msgb(conn->wrf, msg); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39773?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I103d3f66bf40c68db1a20a987bc984989c91b447 Gerrit-Change-Number: 39773 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd file-write-queue-max-length
by pespin 11 Mar '25

11 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email ) Change subject: pcap-server: Introduce VTY cmd file-write-queue-max-length ...................................................................... pcap-server: Introduce VTY cmd file-write-queue-max-length This allows dimensioning the write queue used to write msgbs to disk. Related: SYS#7374 Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_pcap_wr_file.c M src/osmo_server_core.c M src/osmo_server_vty.c 4 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/74/39774/1 diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index f97e4ae..2422530 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -45,6 +45,7 @@ struct osmo_pcap_server; +#define PCAP_SERVER_FILE_WRQUEUE_MAX_LEN 1024 #define STATE_INITIAL 0 #define STATE_DATA 1 @@ -83,6 +84,8 @@ char *filename; /* file descriptor of the file we write to */ struct osmo_io_fd *local_iofd; + /* Maximum size of write queue of pcap files being stored on disk: */ + size_t wr_queue_max_length; /* Current write offset of the file we write to (local_fd) */ off_t wr_offset; /* Number of bytes confirmed to be written, <=wr_offset */ @@ -90,6 +93,7 @@ osmo_pcap_wr_file_flush_completed_cb_t flush_completed_cb; }; struct osmo_pcap_wr_file *osmo_pcap_wr_file_alloc(void *ctx, void *data); +void osmo_pcap_wr_file_write_queue_max_length(struct osmo_pcap_wr_file *wrf, size_t max_len); void osmo_pcap_wr_file_free(struct osmo_pcap_wr_file *wrf); void osmo_pcap_wr_file_set_flush_completed_cb(struct osmo_pcap_wr_file *wrf, osmo_pcap_wr_file_flush_completed_cb_t flush_completed_cb); int osmo_pcap_wr_file_open(struct osmo_pcap_wr_file *wrf, const char *filename, mode_t mode); @@ -184,6 +188,8 @@ off_t max_size; bool max_size_enabled; int max_snaplen; + /* Maximum size of write queue of pcap files being stored on disk: */ + size_t file_wr_queue_max_length; struct { bool enabled; diff --git a/src/osmo_pcap_wr_file.c b/src/osmo_pcap_wr_file.c index 582caa8..e7463df 100644 --- a/src/osmo_pcap_wr_file.c +++ b/src/osmo_pcap_wr_file.c @@ -75,6 +75,7 @@ * list in osmo_pcap_wr_file_is_flushing(): */ INIT_LLIST_HEAD(&wrf->entry); wrf->data = data; + wrf->wr_queue_max_length = PCAP_SERVER_FILE_WRQUEUE_MAX_LEN; wrf->wr_offset = 0; wrf->wr_completed = 0; @@ -96,6 +97,13 @@ wrf->flush_completed_cb = flush_completed_cb; } +void osmo_pcap_wr_file_write_queue_max_length(struct osmo_pcap_wr_file *wrf, size_t max_len) +{ + wrf->wr_queue_max_length = max_len; + if (wrf->local_iofd) + osmo_iofd_set_txqueue_max_length(wrf->local_iofd, wrf->wr_queue_max_length); +} + int osmo_pcap_wr_file_open(struct osmo_pcap_wr_file *wrf, const char *filename, mode_t mode) { struct osmo_io_ops ioops = { @@ -117,6 +125,7 @@ &ioops, wrf); if (!wrf->local_iofd) return -EBADFD; + osmo_iofd_set_txqueue_max_length(wrf->local_iofd, wrf->wr_queue_max_length); if (osmo_iofd_register(wrf->local_iofd, -1) < 0) { osmo_iofd_free(wrf->local_iofd); wrf->local_iofd = NULL; diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c index 77d916a..1b0552f 100644 --- a/src/osmo_server_core.c +++ b/src/osmo_server_core.c @@ -349,6 +349,7 @@ conn->wrf = osmo_pcap_wr_file_alloc(conn, conn); osmo_pcap_wr_file_set_flush_completed_cb(conn->wrf, osmo_pcap_wr_file_flush_completed_cb); + osmo_pcap_wr_file_write_queue_max_length(conn->wrf, conn->server->file_wr_queue_max_length); rc = osmo_pcap_wr_file_open(conn->wrf, curr_filename, conn->server->permission_mask); talloc_free(curr_filename); if (rc < 0) @@ -578,6 +579,7 @@ psrv->max_size = 1073741824; /* 1024^3, 1GB **/ psrv->max_size_enabled = true; psrv->max_snaplen = DEFAULT_SNAPLEN; + psrv->file_wr_queue_max_length = PCAP_SERVER_FILE_WRQUEUE_MAX_LEN; /* By default rotate daily: */ psrv->rotate_localtime.enabled = true; psrv->rotate_localtime.intv = TIME_INTERVAL_DAY; diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 51448ff..363fcde 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -100,6 +100,7 @@ if (pcap_server->completed_path) vty_out(vty, " completed-path %s%s", pcap_server->completed_path, VTY_NEWLINE); vty_out(vty, " file-permission-mask 0%o%s", pcap_server->permission_mask, VTY_NEWLINE); + vty_out(vty, " file-write-queue-max-length %zu%s", pcap_server->file_wr_queue_max_length, VTY_NEWLINE); if (pcap_server->addr) vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); if (pcap_server->port > 0) @@ -226,6 +227,36 @@ return CMD_WARNING; } +DEFUN(cfg_server_file_write_queue_max_length, + cfg_server_file_write_queue_max_length_cmd, + "file-write-queue-max-length <0-4294967295>", + "Configure the write-queue used for storing received pcap data to disk\n" + "Maximum amount of packets before dropping starts (default " + OSMO_STRINGIFY_VAL(PCAP_SERVER_FILE_WRQUEUE_MAX_LEN) ")\n") +{ + struct osmo_pcap_conn *conn; + int64_t val; + + + if (osmo_str_to_int64(&val, argv[0], 10, 0, INT64_MAX)) { + vty_out(vty, "%% Error parsing value %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + pcap_server->file_wr_queue_max_length = (size_t)val; + + llist_for_each_entry(conn, &pcap_server->conn, entry) { + if (!conn->wrf) + continue; + osmo_pcap_wr_file_write_queue_max_length(conn->wrf, + pcap_server->file_wr_queue_max_length); + /* wrfs in conn->wrf_flushing_list don't need queue size increase + * since anyway they won't get more data enqueued in it. */ + } + + return CMD_SUCCESS; +} + DEFUN(cfg_server_ip, cfg_server_ip_cmd, "server ip A.B.C.D", @@ -696,6 +727,7 @@ install_element(SERVER_NODE, &cfg_server_no_completed_path_cmd); install_element(SERVER_NODE, &cfg_server_completed_path_cmd); install_element(SERVER_NODE, &cfg_server_file_permission_mask_cmd); + install_element(SERVER_NODE, &cfg_server_file_write_queue_max_length_cmd); install_element(SERVER_NODE, &cfg_server_ip_cmd); install_element(SERVER_NODE, &cfg_server_port_cmd); install_element(SERVER_NODE, &cfg_server_no_rotate_localtime_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I137f13481c03f82d11a2d38ba4fd5691a55535ce Gerrit-Change-Number: 39774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ccid-firmware[master]: tame the linter
by Hoernchen 11 Mar '25

11 Mar '25

Attention is currently required from: Hoernchen, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39441?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: tame the linter ...................................................................... tame the linter Change-Id: I84f8637b47047bb9b8c217b0869a486ceee7243f --- A .checkpatch.conf 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/41/39441/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I84f8637b47047bb9b8c217b0869a486ceee7243f Gerrit-Change-Number: 39441 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-ccid-firmware[master]: clean up slot reset hack
by Hoernchen 11 Mar '25

11 Mar '25

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39760?usp=email ) Change subject: clean up slot reset hack ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Iebde945661569882d136406b8c11fa9653323d37 Gerrit-Change-Number: 39760 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-ccid-firmware[master]: strict prototypes
by Hoernchen 11 Mar '25

11 Mar '25

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39443?usp=email to look at the new patch set (#5). 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: strict prototypes ...................................................................... strict prototypes Change-Id: Ic2915a9182dc64ac1e3fba7da18a71ff9fe91944 --- M sysmoOCTSIM/command.c M sysmoOCTSIM/gcc/Makefile M sysmoOCTSIM/hpl/port/hpl_gpio_base.h M sysmoOCTSIM/main.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/43/39443/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39443?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic2915a9182dc64ac1e3fba7da18a71ff9fe91944 Gerrit-Change-Number: 39443 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

1 0

[S] Change in osmo-ccid-firmware[master]: tame the linter
by Hoernchen 11 Mar '25

11 Mar '25

Attention is currently required from: Hoernchen, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39441?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: tame the linter ...................................................................... tame the linter Change-Id: I84f8637b47047bb9b8c217b0869a486ceee7243f --- A .checkpatch.conf 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/41/39441/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I84f8637b47047bb9b8c217b0869a486ceee7243f Gerrit-Change-Number: 39441 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-ccid-firmware[master]: fix up usb version string, not 0 terminated
by Hoernchen 11 Mar '25

11 Mar '25

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39442?usp=email to look at the new patch set (#5). 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: fix up usb version string, not 0 terminated ...................................................................... fix up usb version string, not 0 terminated Change-Id: I198f0a55c5c5853ea58f20ad4124a909952a3074 --- M sysmoOCTSIM/main.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/42/39442/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39442?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I198f0a55c5c5853ea58f20ad4124a909952a3074 Gerrit-Change-Number: 39442 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: ccid dev: fix sizeof abuse
by Hoernchen 11 Mar '25

11 Mar '25

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39444?usp=email to look at the new patch set (#5). 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: ccid dev: fix sizeof abuse ...................................................................... ccid dev: fix sizeof abuse Change-Id: Ia96247af6f2a887d3c894a65983e795b9e5a7cbe --- M ccid_common/ccid_device.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/44/39444/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ia96247af6f2a887d3c894a65983e795b9e5a7cbe Gerrit-Change-Number: 39444 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: usb desc: use per-interface dev class instead of CDC
by Hoernchen 11 Mar '25

11 Mar '25

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39446?usp=email to look at the new patch set (#7). 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: usb desc: use per-interface dev class instead of CDC ...................................................................... usb desc: use per-interface dev class instead of CDC Change-Id: I9d4f88b973f0c16d2c1241343d416496b35019a0 --- M sysmoOCTSIM/usb_descriptors.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/46/39446/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I9d4f88b973f0c16d2c1241343d416496b35019a0 Gerrit-Change-Number: 39446 Gerrit-PatchSet: 7 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log