December 2024 - gerrit-log - lists.osmocom.org

[S] Change in dahdi-linux[master]: Misc warning/build fixes for more recent kernels

by tnt

Attention is currently required from: tnt. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/dahdi-linux/+/39159?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Misc warning/build fixes for more recent kernels ...................................................................... Misc warning/build fixes for more recent kernels Change-Id: I54e89040dfc6e21d23f620df407b6613397f7e45 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/dahdi_dynamic_ethmf.c M drivers/dahdi/wcaxx-base.c M drivers/dahdi/wct4xxp/base.c M drivers/dahdi/wctdm24xxp/base.c M drivers/dahdi/wcte13xp-base.c M drivers/dahdi/wcte43x-base.c M drivers/dahdi/xpp/xbus-core.c 8 files changed, 15 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/59/39159/3 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I54e89040dfc6e21d23f620df407b6613397f7e45 Gerrit-Change-Number: 39159 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com>

6 months, 1 week

1
0
0 0

[S] Change in dahdi-linux[master]: Misc warning/build fixes for more recent kernels

by tnt

Attention is currently required from: tnt. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/dahdi-linux/+/39159?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Misc warning/build fixes for more recent kernels ...................................................................... Misc warning/build fixes for more recent kernels Change-Id: I54e89040dfc6e21d23f620df407b6613397f7e45 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/wct4xxp/base.c M drivers/dahdi/wctdm24xxp/base.c M drivers/dahdi/xpp/xbus-core.c 4 files changed, 9 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/59/39159/2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I54e89040dfc6e21d23f620df407b6613397f7e45 Gerrit-Change-Number: 39159 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com>

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: Misc warning/build fixes for more recent kernels

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39159?usp=email ) Change subject: Misc warning/build fixes for more recent kernels ...................................................................... Misc warning/build fixes for more recent kernels Change-Id: I54e89040dfc6e21d23f620df407b6613397f7e45 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/wctdm24xxp/base.c M drivers/dahdi/xpp/xbus-core.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/59/39159/1 diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 9725d3c..ba328aa 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -1501,16 +1501,16 @@ unsigned char data = 0; int count = 0; - #define MAX 10 /* attempts */ + #define MAX_ATTEMPTS 10 /* Wait for indirect access */ - while (count++ < MAX) { + while (count++ < MAX_ATTEMPTS) { data = wctdm_getreg(wc, mod, I_STATUS); if (!data) return 0; } - if (count > (MAX-1)) { + if (count > (MAX_ATTEMPTS-1)) { dev_notice(&wc->vb.pdev->dev, " ##### Loop error (%02x) #####\n", data); } diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index e08e2d6..141c54f 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -113,7 +113,7 @@ { if (!xbus) return -ENOENT; - if (xbus->label && *(xbus->label)) { + if (xbus->label[0]) { xbus_t *xbus_old; XBUS_DBG(DEVICES, xbus, "Checking LABEL='%s'\n", xbus->label); -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I54e89040dfc6e21d23f620df407b6613397f7e45 Gerrit-Change-Number: 39159 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com>

6 months, 1 week

1
0
0 0

[M] Change in osmo-pcap[master]: src/Makefile.am: Improve formatting

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39156?usp=email ) Change subject: src/Makefile.am: Improve formatting ...................................................................... src/Makefile.am: Improve formatting Change-Id: I6b9571df37d8ad39c523de2dc34bb467a0756198 --- M src/Makefile.am 1 file changed, 42 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index 6b887d3..a86b578 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,16 +1,46 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/ -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOGB_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(PCAP_CFLAGS) $(LIBGNUTLS_CFLAGS) +AM_CFLAGS = -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOGB_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(PCAP_CFLAGS) \ + $(LIBGNUTLS_CFLAGS) \ + $(NULL) -bin_PROGRAMS = osmo-pcap-client osmo-pcap-server +bin_PROGRAMS = \ + osmo-pcap-client \ + osmo-pcap-server \ + $(NULL) -osmo_pcap_client_SOURCES = osmo_client_main.c osmo_common.c \ - osmo_client_core.c osmo_client_vty.c \ - osmo_client_network.c osmo_tls.c -osmo_pcap_client_LDADD = $(PCAP_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOGSM_LIBS) $(LIBGNUTLS_LIBS) +osmo_pcap_client_SOURCES = \ + osmo_client_main.c \ + osmo_common.c \ + osmo_client_core.c \ + osmo_client_vty.c \ + osmo_client_network.c \ + osmo_tls.c \ + $(NULL) -osmo_pcap_server_SOURCES = osmo_server_main.c osmo_common.c \ - osmo_server_vty.c osmo_server_network.c \ - osmo_tls.c -osmo_pcap_server_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBZMQ_LIBS) \ - $(LIBGNUTLS_LIBS) +osmo_pcap_client_LDADD = \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCORE_LIBS) \ + $(PCAP_LIBS) \ + $(LIBGNUTLS_LIBS) \ + $(NULL) + +osmo_pcap_server_SOURCES = \ + osmo_server_main.c \ + osmo_common.c \ + osmo_server_vty.c \ + osmo_server_network.c \ + osmo_tls.c \ + $(NULL) + +osmo_pcap_server_LDADD = \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCORE_LIBS) \ + $(LIBZMQ_LIBS) \ + $(LIBGNUTLS_LIBS) \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39156?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: I6b9571df37d8ad39c523de2dc34bb467a0756198 Gerrit-Change-Number: 39156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[M] Change in osmo-pcap[master]: pcap-server: Move stats to its own file

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39157?usp=email ) Change subject: pcap-server: Move stats to its own file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39157?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: I71734a4c78e4d3109947ff5e69c3a382a7908218 Gerrit-Change-Number: 39157 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Dec 2024 10:48:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[M] Change in osmo-pcap[master]: src/Makefile.am: Improve formatting

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39156?usp=email ) Change subject: src/Makefile.am: Improve formatting ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39156?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: I6b9571df37d8ad39c523de2dc34bb467a0756198 Gerrit-Change-Number: 39156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Dec 2024 10:47:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: tests/Makefile.am: Fix trailing whitespace

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39152?usp=email ) Change subject: tests/Makefile.am: Fix trailing whitespace ...................................................................... tests/Makefile.am: Fix trailing whitespace Change-Id: I121a0d596a645e6c70b5c9d2ff394d263d2a1dc4 --- M tests/Makefile.am 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 5084704..2098927 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,7 +15,7 @@ echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [$(PACKAGE_URL)])'; \ } >'$(srcdir)/package.m4' - + EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) DISTCLEANFILES = atconfig TESTSUITE = $(srcdir)/testsuite @@ -29,19 +29,19 @@ python-tests: echo "Not running python-based tests (determined at configure-time)" endif - + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests - + installcheck-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ $(TESTSUITEFLAGS) - + clean-local: test ! -f '$(TESTSUITE)' || \ $(SHELL) '$(TESTSUITE)' --clean - + AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39152?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: I121a0d596a645e6c70b5c9d2ff394d263d2a1dc4 Gerrit-Change-Number: 39152 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-server: Move write checks to reopen pcap into helper functions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39150?usp=email ) Change subject: pcap-server: Move write checks to reopen pcap into helper functions ...................................................................... pcap-server: Move write checks to reopen pcap into helper functions The logic there will be further extended, hence move the code as a preparatory patch. Change-Id: Icc2a8e424b166863afa9f8704fd48d35528972df --- M src/osmo_server_network.c 1 file changed, 26 insertions(+), 10 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 41d0b3f..1ace77a 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -212,6 +212,30 @@ return 1; } +/* Returns true if pcap was re-opened */ +static bool check_restart_pcap_max_size(struct osmo_pcap_conn *conn, const struct osmo_pcap_data *data) +{ + off_t cur; + + cur = lseek(conn->local_fd, 0, SEEK_CUR); + if (cur + data->len <= conn->server->max_size) + return false; + LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s (max-size)\n", conn->name); + restart_pcap(conn); + return true; +} + +static bool check_restart_pcap_localtime(struct osmo_pcap_conn *conn, const struct tm *tm) +{ + if (conn->last_write.tm_mday == tm->tm_mday && + conn->last_write.tm_mon == tm->tm_mon && + conn->last_write.tm_year == tm->tm_year) + return false; + LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s (localtime)\n", conn->name); + restart_pcap(conn); + return true; +} + /* * Check if we are past the limit or on a day change */ @@ -233,16 +257,8 @@ return -1; } - off_t cur = lseek(conn->local_fd, 0, SEEK_CUR); - if (cur + data->len > conn->server->max_size) { - LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s\n", conn->name); - restart_pcap(conn); - } else if (conn->last_write.tm_mday != tm->tm_mday || - conn->last_write.tm_mon != tm->tm_mon || - conn->last_write.tm_year != tm->tm_year) { - LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s\n", conn->name); - restart_pcap(conn); - } + if (!check_restart_pcap_max_size(conn, data)) + check_restart_pcap_localtime(conn, tm); conn->last_write = *tm; rc = write(conn->local_fd, &data->data[0], data->len); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39150?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: Icc2a8e424b166863afa9f8704fd48d35528972df Gerrit-Change-Number: 39150 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-server: New vty command 'no max-file-size'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39151?usp=email ) Change subject: pcap-server: New vty command 'no max-file-size' ...................................................................... pcap-server: New vty command 'no max-file-size' This new VTY command allows disabling the max-file-size feature. Change-Id: I54f1f0e2976ea235e92a1c527fa80f18ae166992 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_main.c M src/osmo_server_network.c M src/osmo_server_vty.c 4 files changed, 20 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 6d2afcf..5fe6d11 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -131,6 +131,7 @@ char *base_path; mode_t permission_mask; off_t max_size; + bool max_size_enabled; int max_snaplen; /* statistics */ diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 4633888..85f4290 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -281,7 +281,8 @@ INIT_LLIST_HEAD(&pcap_server->conn); pcap_server->base_path = talloc_strdup(pcap_server, "./"); pcap_server->permission_mask = 0440; - pcap_server->max_size = 1073741824; + pcap_server->max_size = 1073741824; /* 1024^3, 1GB **/ + pcap_server->max_size_enabled = true; pcap_server->max_snaplen = DEFAULT_SNAPLEN; if (vty_read_config_file(config_file, NULL) < 0) { diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 1ace77a..e53ce01 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -217,6 +217,8 @@ { off_t cur; + if (pcap_server->max_size_enabled) + return false; cur = lseek(conn->local_fd, 0, SEEK_CUR); if (cur + data->len <= conn->server->max_size) return false; diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 796aed8..507a477 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -93,8 +93,10 @@ vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); if (pcap_server->port > 0) vty_out(vty, " server port %d%s", pcap_server->port, VTY_NEWLINE); - vty_out(vty, " max-file-size %llu%s", - (unsigned long long) pcap_server->max_size, VTY_NEWLINE); + if (pcap_server->max_size_enabled) + vty_out(vty, " max-file-size %llu%s", (unsigned long long)pcap_server->max_size, VTY_NEWLINE); + else + vty_out(vty, " no max-file-size%s", VTY_NEWLINE); if (pcap_server->max_snaplen != DEFAULT_SNAPLEN) vty_out(vty, " server max-snaplen %d%s", pcap_server->max_snaplen, VTY_NEWLINE); if (pcap_server->zmq_port > 0) @@ -198,6 +200,16 @@ "Maximum file size for a trace\n" "Filesize in bytes\n") { pcap_server->max_size = strtoull(argv[0], NULL, 10); + pcap_server->max_size_enabled = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_server_no_max_size, + cfg_server_no_max_size_cmd, + "no max-file-size", + NO_STR "Maximum file size for a trace\n") +{ + pcap_server->max_size_enabled = false; return CMD_SUCCESS; } @@ -564,6 +576,7 @@ install_element(SERVER_NODE, &cfg_server_ip_cmd); install_element(SERVER_NODE, &cfg_server_port_cmd); install_element(SERVER_NODE, &cfg_server_max_size_cmd); + install_element(SERVER_NODE, &cfg_server_no_max_size_cmd); install_element(SERVER_NODE, &cfg_server_max_snaplen_cmd); install_element(SERVER_NODE, &cfg_server_zmq_ip_port_cmd); install_element(SERVER_NODE, &cfg_no_server_zmq_ip_port_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39151?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: I54f1f0e2976ea235e92a1c527fa80f18ae166992 Gerrit-Change-Number: 39151 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[XS] Change in osmo-pcap[master]: pcap-server: Take into account PDU len when calculating pcap max-size

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39149?usp=email ) Change subject: pcap-server: Take into account PDU len when calculating pcap max-size ...................................................................... pcap-server: Take into account PDU len when calculating pcap max-size We never want to overpass the configured max-size. Change-Id: I666830fbbc23ce34007d45bbf8c7a13a1f2a93ea --- M src/osmo_server_network.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index b566bd2..41d0b3f 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -234,7 +234,7 @@ } off_t cur = lseek(conn->local_fd, 0, SEEK_CUR); - if (cur > conn->server->max_size) { + if (cur + data->len > conn->server->max_size) { LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s\n", conn->name); restart_pcap(conn); } else if (conn->last_write.tm_mday != tm->tm_mday || -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39149?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: I666830fbbc23ce34007d45bbf8c7a13a1f2a93ea Gerrit-Change-Number: 39149 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024