Attention is currently required from: Timur Davydov, fixeria, pespin.
osmith has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41922?usp=email )
Change subject: core: guard TCP stats on availability of linux/tcp.h
......................................................................
Patch Set 3: Code-Review+2
(3 comments)
File src/core/stats_tcp.c:
https://gerrit.osmocom.org/c/libosmocore/+/41922/comment/8e40e681_1c7c9d60?… :
PS1, Line 315: osmo_timer_schedule(&stats_tcp_poll_timer, osmo_tcp_stats_config->interval, 0);
> Done. I reworked it as suggested: the implementation is now wrapped in […]
Done
https://gerrit.osmocom.org/c/libosmocore/+/41922/comment/8cf23948_81545932?… :
PS1, Line 328: osmo_timer_setup(&stats_tcp_poll_timer, stats_tcp_poll_timer_cb, NULL);
> Done. I reworked it as suggested: the implementation is now wrapped in […]
Done
File src/core/stats_tcp.c:
https://gerrit.osmocom.org/c/libosmocore/+/41922/comment/3086d411_a014370b?… :
PS2, Line 47: #include <errno.h>
> Done, moved it above the HAVE_LINUX_TCP_H guard.
Done, marking as resolved (there is a checkbox for resolving threads, so future reviewers don't need to read through them as well).
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41922?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ibcd00f15131b0291f0b10eca51401c518b77cc39
Gerrit-Change-Number: 41922
Gerrit-PatchSet: 3
Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com>
Gerrit-Comment-Date: Thu, 29 Jan 2026 10:37:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: Timur Davydov <dtv.comp(a)gmail.com>
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/41976?usp=email )
Change subject: repo-install-test: test osmo-pfcp-tool in latest
......................................................................
repo-install-test: test osmo-pfcp-tool in latest
osmo-pfcp-tool is available in latest for quite some time now, so adjust
the check.
Related: osmo-upf Icf4bb566d9b627ead370174e92629a9fccde755e
Change-Id: Icca5a31270bca03596be8ed0104bfb7143fb1ede
---
M scripts/repo-install-test/run-inside.sh
1 file changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/41976/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41976?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Icca5a31270bca03596be8ed0104bfb7143fb1ede
Gerrit-Change-Number: 41976
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41977?usp=email )
Change subject: repo-install-test: debian 10: osmo-gbproxy only
......................................................................
repo-install-test: debian 10: osmo-gbproxy only
The debian 10 repository has been officially disabled:
https://osmocom.org/news/308
However we just re-enabled a subset of the packages, osmo-gbproxy +
dependencies, because currently they are relevant for a customer. Adjust
the repo-install-test to deal with this subset of packages for debian 10
to fix that it is currently failing.
I have verified that repo-install-test works with this change for debian
10, 11 and 12. It currently doesn't run for debian 13 yet (OS#6934).
Related: SYS#7859
Change-Id: Id8d8cda8e399719f06aeb1843eb8f5ab12a90e8f
---
M scripts/repo-install-test/run-inside.sh
1 file changed, 50 insertions(+), 44 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/77/41977/1
diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh
index 2d75e6a..d1054a6 100755
--- a/scripts/repo-install-test/run-inside.sh
+++ b/scripts/repo-install-test/run-inside.sh
@@ -14,7 +14,7 @@
# * osmo-remsim-client (exits immediately without USB device)
# * osmo-trap2cgi (missing config: /etc/osmocom/%N.ini, OS#4108)
# * osmo-trx-* (exits immediately without trx device)
-# * osmo-upf (not available for debian 10, gets added in services_check())
+# * osmo-upf nightly needs a newer kernel (OS#5905)
SERVICES="
osmo-bsc
osmo-bts-virtual
@@ -186,9 +186,7 @@
case "$DISTRO" in
debian10)
# libgnutls30: can't access https://osmocom.org otherwise
- # ca-certificates-java: fails if installed after java
apt-get install -y --no-install-recommends \
- ca-certificates-java \
libgnutls30
;;
esac
@@ -237,6 +235,15 @@
}
test_conflict_debian() {
+ # SYS#7859: the debian10 repository only has osmo-gbproxy + depends, so
+ # the conflict test doesn't work here, skip it
+ if [ "$DISTRO" = "debian10" ]; then
+ set +x
+ echo "Test skipped for debian10"
+ set -x
+ return
+ fi
+
apt-get -y install libosmocore
configure_osmocom_repo_debian_remove "$PROJ"
@@ -254,19 +261,9 @@
"requested an impossible situation" \
"^The following packages have unmet dependencies:"
- case "$DISTRO" in
- debian10)
- find_patterns_or_exit \
- /tmp/out \
- "Depends: osmocom-" \
- "but it is not going to be installed"
- ;;
- debian11|debian12)
- find_patterns_or_exit \
- /tmp/out \
- "Conflicts: osmocom-"
- ;;
- esac
+ find_patterns_or_exit \
+ /tmp/out \
+ "Conflicts: osmocom-"
configure_osmocom_repo_debian_remove "$PROJ_CONFLICT"
configure_osmocom_repo_debian "$PROJ"
@@ -360,12 +357,19 @@
local packages
echo "Installing all repository packages"
- # Get a list of all packages from the repository. Reference:
- # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html
- packages="$(aptitude search -F%p \
- "?origin(.*$PROJ.*) ?architecture(native)" | sort)"
- packages="$(filter_packages $packages)"
-
+ case "$DISTRO" in
+ debian10)
+ # SYS#7859
+ packages="osmo-gbproxy"
+ ;;
+ *)
+ # Get a list of all packages from the repository. Reference:
+ # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html
+ packages="$(aptitude search -F%p \
+ "?origin(.*$PROJ.*) ?architecture(native)" | sort)"
+ packages="$(filter_packages $packages)"
+ ;;
+ esac
apt-get install -y --no-install-recommends -- $packages
}
@@ -417,8 +421,15 @@
fi
}
+# Make sure that binares run at all and output a proper version
test_binaries() {
- # Make sure that binares run at all and output a proper version
+ # SYS#7859
+ if [ "$DISTRO" = "debian10" ]; then
+ test_binaries_version \
+ osmo-gbproxy
+ return
+ fi
+
test_binaries_version \
osmo-bsc \
osmo-bts-trx \
@@ -438,6 +449,7 @@
osmo-pcap-client \
osmo-pcap-server \
osmo-pcu \
+ osmo-pfcp-tool \
osmo-remsim-bankd \
osmo-remsim-client-shell \
osmo-remsim-client-st2 \
@@ -448,7 +460,8 @@
osmo-stp \
osmo-trx-ipc \
osmo-trx-uhd \
- osmo-uecups-daemon
+ osmo-uecups-daemon \
+ osmo-upf
case "$DISTRO" in
debian*)
@@ -457,12 +470,6 @@
;;
esac
- if [ "$DISTRO" != "debian10" ]; then
- test_binaries_version \
- osmo-pfcp-tool \
- osmo-upf
- fi
-
if [ "$FEED" = "nightly" ]; then
test_binaries_version \
osmo-bsc-nat
@@ -471,22 +478,21 @@
services_check() {
local service
- local services_feed="$SERVICES"
+ local services_feed
local failed=""
- if [ "$FEED" = "nightly" ]; then
- services_feed="$services_feed $SERVICES_NIGHTLY"
- fi
-
- # We don't build osmo-upf for debian 10
- if [ "$DISTRO" != "debian10" ]; then
- # osmo-upf <= 0.1.1 needs GTP kernel module
- if [ "$FEED" = "nightly" ]; then
- # osmo-upf nightly needs a newer kernel (OS#5905)
- # services_feed="$services_feed osmo-upf"
- true
- fi
- fi
+ case "$DISTRO" in
+ "debian10")
+ # SYS#7859
+ services_feed="osmo-gbproxy"
+ ;;
+ *)
+ services_feed="$SERVICES"
+ if [ "$FEED" = "nightly" ]; then
+ services_feed="$services_feed $SERVICES_NIGHTLY"
+ fi
+ ;;
+ esac
systemctl start $services_feed
sleep 2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41977?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id8d8cda8e399719f06aeb1843eb8f5ab12a90e8f
Gerrit-Change-Number: 41977
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41976?usp=email )
Change subject: scripts/repo-install-test: test osmo-pfcp-tool in latest
......................................................................
scripts/repo-install-test: test osmo-pfcp-tool in latest
osmo-pfcp-tool is available in latest for quite some time now, so adjust
the check.
Related: osmo-upf Icf4bb566d9b627ead370174e92629a9fccde755e
Change-Id: Icca5a31270bca03596be8ed0104bfb7143fb1ede
---
M scripts/repo-install-test/run-inside.sh
1 file changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/41976/1
diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh
index 0e549b0..2d75e6a 100755
--- a/scripts/repo-install-test/run-inside.sh
+++ b/scripts/repo-install-test/run-inside.sh
@@ -459,13 +459,8 @@
if [ "$DISTRO" != "debian10" ]; then
test_binaries_version \
+ osmo-pfcp-tool \
osmo-upf
-
- # OS#5817: not packaged for debian, needs osmo-upf release
- if [ "$FEED" = "nightly" ] || [ "$DISTRO" = "centos8" ]; then
- test_binaries_version \
- osmo-pfcp-tool
- fi
fi
if [ "$FEED" = "nightly" ]; then
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41976?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Icca5a31270bca03596be8ed0104bfb7143fb1ede
Gerrit-Change-Number: 41976
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41975?usp=email )
Change subject: logging_file: Fix log_target_file_switch_to_stream on stderr
......................................................................
logging_file: Fix log_target_file_switch_to_stream on stderr
In stderr log target, the bfd of the wq was left registered despite
freeing the wq, which ended up in the callback being called and the
freed wq being used.
Change-Id: I1c0d833fb8ae82d1dd54e44cc2fc8be80d5e1b4b
---
M src/core/logging_file.c
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/41975/1
diff --git a/src/core/logging_file.c b/src/core/logging_file.c
index 6e01c26..99a797c 100644
--- a/src/core/logging_file.c
+++ b/src/core/logging_file.c
@@ -213,11 +213,10 @@
}
/* now that everything succeeded, we can finally close the old output fd */
- if (target->type == LOG_TGT_TYPE_FILE) {
- osmo_fd_unregister(&wq->bfd);
+ osmo_fd_unregister(&wq->bfd);
+ if (target->type == LOG_TGT_TYPE_FILE)
close(wq->bfd.fd);
- wq->bfd.fd = -1;
- }
+ wq->bfd.fd = -1;
/* release the queue itself */
talloc_free(wq);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41975?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I1c0d833fb8ae82d1dd54e44cc2fc8be80d5e1b4b
Gerrit-Change-Number: 41975
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
canghaiwuhen has restored this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/41942?usp=email )
Change subject: Modify the QoS length to ensure compatibility with some GPRS modules, such as Air20X.
......................................................................
Restored
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/41942?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: restore
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Iee49745809195fe7d0897dd1e9cba2427ff7008e
Gerrit-Change-Number: 41942
Gerrit-PatchSet: 1
Gerrit-Owner: canghaiwuhen <canghaiwuhen(a)gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>