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

[S] Change in osmo-ci[master]: ttcn3-bsc-test-io_uring: limit jenkins nodes again

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36668?usp=email ) Change subject: ttcn3-bsc-test-io_uring: limit jenkins nodes again ...................................................................... ttcn3-bsc-test-io_uring: limit jenkins nodes again Run this job only on jenkins nodes with a linux kernel of 6.1.x or higher. The io_uring implementation consumes a lot more memory on e.g. the 5.10.x kernel of host2, which causes osmo-bsc to run out of memory in other places: <0002> system_information.c:1641 bts 0: Error while generating SI4: Cannot allocate memory (-12) <0002> bts_trx.c:505 Cannot generate SI4 for BTS 0: error <Cannot allocate memory>, most likely a problem with neighbor cell list generation Related: OS#6405 Change-Id: Iddf2d47a641998860fd1ef615de976104667c5ab --- M jobs/ttcn3-testsuites.yml 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/36668/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 8a1f767..ac79f4d 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -223,6 +223,7 @@ # With LIBOSMO_IO_BACKEND=IO_URING (OS#6357) - ttcn3-bsc-test-io_uring: timer: H 11 * * * + node: ttcn3_with_linux_6.1_or_higher # Runs out of memory on others (OS#6405) - ttcn3-msc-test-io_uring: timer: H 11 * * * - ttcn3-hnbgw-test-io_uring: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iddf2d47a641998860fd1ef615de976104667c5ab Gerrit-Change-Number: 36668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-ci[master]: ansible/setup-jenkins: install rsync

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36667?usp=email ) Change subject: ansible/setup-jenkins: install rsync ...................................................................... ansible/setup-jenkins: install rsync After recent refactoring of the gerrit-binpkgs job, rsync is now requried on the jenkins nodes. It was installed on the ones where I tested, but not on all of them. Fixes: b2e12851 ("OBS: move gerrit-binpkgs logic to separate script") Change-Id: Ic8ffd61fc2c89574085e9c3abbceb554f3c5da6a --- M ansible/setup-jenkins-slave.yml 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/67/36667/1 diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml index 5813b40..03afe65 100644 --- a/ansible/setup-jenkins-slave.yml +++ b/ansible/setup-jenkins-slave.yml @@ -12,6 +12,7 @@ - tmux - screen - ca-certificates + - rsync cache_valid_time: 3600 update_cache: yes roles: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36667?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic8ffd61fc2c89574085e9c3abbceb554f3c5da6a Gerrit-Change-Number: 36667 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-upf[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade --- M contrib/osmo-upf.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/66/36666/1 diff --git a/contrib/osmo-upf.spec.in b/contrib/osmo-upf.spec.in index fb8438c..bc6c5ed 100644 --- a/contrib/osmo-upf.spec.in +++ b/contrib/osmo-upf.spec.in @@ -84,6 +84,8 @@ chmod 0660 /etc/osmocom/osmo-upf.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 7681c46..5c26faf 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Package: osmo-upf Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoUPF: Osmocom User Plane Function Package: osmo-upf-dbg diff --git a/debian/postinst b/debian/postinst index a84d9b2..4310e7e 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-upf.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-upf.cfg + chmod 0660 /etc/osmocom/osmo-upf.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade Gerrit-Change-Number: 36666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-sgsn[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36663?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I406ff0d625b02991d580c8382aa4be04dba45a00 --- M contrib/osmo-sgsn.spec.in M debian/control M debian/postinst 3 files changed, 51 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/36663/1 diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in index 031cd14..b0fae9e 100644 --- a/contrib/osmo-sgsn.spec.in +++ b/contrib/osmo-sgsn.spec.in @@ -99,6 +99,8 @@ chmod 0660 /etc/osmocom/osmo-sgsn.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %if 0%{?suse_version} %preun -n osmo-gtphub %service_del_preun osmo-gtphub.service diff --git a/debian/control b/debian/control index b28db1f..aa59455 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Package: osmo-sgsn Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks Package: osmo-sgsn-dbg @@ -42,7 +42,7 @@ Package: osmo-gtphub Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Osmocom GTP Hub: Proxy for GTP traffic between multiple SGSNs and GGSNs Package: osmo-gtphub-dbg diff --git a/debian/postinst b/debian/postinst index 84d7e5f..4ac99e4 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-sgsn.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-sgsn.cfg + chmod 0660 /etc/osmocom/osmo-sgsn.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I406ff0d625b02991d580c8382aa4be04dba45a00 Gerrit-Change-Number: 36663 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-sip-connector[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/36664?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade --- M contrib/osmo-sip-connector.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/64/36664/1 diff --git a/contrib/osmo-sip-connector.spec.in b/contrib/osmo-sip-connector.spec.in index 6b65800..35f977a 100644 --- a/contrib/osmo-sip-connector.spec.in +++ b/contrib/osmo-sip-connector.spec.in @@ -76,6 +76,8 @@ chmod 0660 /etc/osmocom/osmo-sip-connector.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index b1a7580..4c7e4b0 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Package: osmo-sip-connector Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Depends: ${shlibs:Depends}, ${misc:Depends} Description: MNCC to SIP bridge for osmo-nitb Use the osmo-nitb MNCC interface and bridge it to SIP. diff --git a/debian/postinst b/debian/postinst index 83be547..d96fa8c 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-sip-connector.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-sip-connector.cfg + chmod 0660 /etc/osmocom/osmo-sip-connector.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/36664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade Gerrit-Change-Number: 36664 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-smlc[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/36665?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade --- M contrib/osmo-smlc.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/65/36665/1 diff --git a/contrib/osmo-smlc.spec.in b/contrib/osmo-smlc.spec.in index 6a6dc4b..6b19a17 100644 --- a/contrib/osmo-smlc.spec.in +++ b/contrib/osmo-smlc.spec.in @@ -84,6 +84,8 @@ chmod 0660 /etc/osmocom/osmo-smlc.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index bdfe6e9..242a797 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Package: osmo-smlc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, libdbd-sqlite3, adduser +Depends: ${misc:Depends}, ${shlibs:Depends}, libdbd-sqlite3 Description: OsmoSMLC: Osmocom's Location Services Center FIXME . diff --git a/debian/postinst b/debian/postinst index ae5fcb4..faecd26 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-smlc.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-smlc.cfg + chmod 0660 /etc/osmocom/osmo-smlc.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/36665?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade Gerrit-Change-Number: 36665 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-hlr[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/36659?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories. Let's rather remove this complexity to make the postinst script more maintainable and more similar to the rpm spec file. If users need this, they can achieve something similar by using their own Osmocom config file in a different path with different permissions. * deb: Consistently use tabs throughout postinst, instead of mixing tabs and spaces. Related: OS#4107 Change-Id: Ib20406dd253f5e8720552e92e9002e45591218fa --- M contrib/osmo-hlr.spec.in M debian/control M debian/postinst 3 files changed, 51 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/36659/1 diff --git a/contrib/osmo-hlr.spec.in b/contrib/osmo-hlr.spec.in index a1f92ef..ebf6ee6 100644 --- a/contrib/osmo-hlr.spec.in +++ b/contrib/osmo-hlr.spec.in @@ -155,6 +155,8 @@ chmod 0660 /etc/osmocom/osmo-hlr.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %post -n libosmo-gsup-client0 -p /sbin/ldconfig %postun -n libosmo-gsup-client0 -p /sbin/ldconfig diff --git a/debian/control b/debian/control index 56457c9..ec234a3 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Package: osmo-hlr Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Osmocom Home Location Register OsmoHLR is a Osmocom implementation of HLR (Home Location Registrar) which works over GSUP protocol. The subscribers are store in sqlite DB. diff --git a/debian/postinst b/debian/postinst index 96734df..5dedec4 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,39 +4,30 @@ # to do. /usr/share/osmocom/osmo-hlr-post-upgrade.sh -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-hlr.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-hlr.cfg + chmod 0660 /etc/osmocom/osmo-hlr.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/36659?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib20406dd253f5e8720552e92e9002e45591218fa Gerrit-Change-Number: 36659 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-hnbgw[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36660?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 --- M contrib/osmo-hnbgw.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/60/36660/1 diff --git a/contrib/osmo-hnbgw.spec.in b/contrib/osmo-hnbgw.spec.in index 2b98da2..414a4d5 100644 --- a/contrib/osmo-hnbgw.spec.in +++ b/contrib/osmo-hnbgw.spec.in @@ -94,6 +94,8 @@ chmod 0660 /etc/osmocom/osmo-hnbgw.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 48d95cf..77737b5 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Package: osmo-hnbgw Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: osmo-mgw Description: OsmoHNBGW: Osmocom Home Node B Gateway diff --git a/debian/postinst b/debian/postinst index bdec955..d5bf871 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-hnbgw.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-hnbgw.cfg + chmod 0660 /etc/osmocom/osmo-hnbgw.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36660?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 Gerrit-Change-Number: 36660 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-hnodeb[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36661?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 --- M contrib/osmo-hnodeb.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/61/36661/1 diff --git a/contrib/osmo-hnodeb.spec.in b/contrib/osmo-hnodeb.spec.in index 0f9795b..e28340e 100644 --- a/contrib/osmo-hnodeb.spec.in +++ b/contrib/osmo-hnodeb.spec.in @@ -92,6 +92,8 @@ chmod 0660 /etc/osmocom/osmo-hnodeb.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 365e07e..86ddb27 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Package: osmo-hnodeb Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: osmo-mgw Description: OsmoHNodeB: Osmocom's Home NodeB for 3G mobile networks diff --git a/debian/postinst b/debian/postinst index bdf0e8b..c65375e 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-hnodeb.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-hnodeb.cfg + chmod 0660 /etc/osmocom/osmo-hnodeb.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 Gerrit-Change-Number: 36661 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-msc[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36662?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I406ff0d625b02991d580c8382aa4be04dba45a00 --- M contrib/osmo-msc.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/62/36662/1 diff --git a/contrib/osmo-msc.spec.in b/contrib/osmo-msc.spec.in index e6e323a..ad12846 100644 --- a/contrib/osmo-msc.spec.in +++ b/contrib/osmo-msc.spec.in @@ -111,6 +111,8 @@ chmod 0660 /etc/osmocom/osmo-msc.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 00c1b26..64bb73c 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Package: osmo-msc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: osmo-mgw Description: OsmoMSC: Osmocom's Mobile Switching Center for 2G and 3G circuit-switched mobile networks The Mobile Switching Center (MSC) is the heart of 2G/3G diff --git a/debian/postinst b/debian/postinst index 866c31a..80821c4 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-msc.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-msc.cfg + chmod 0660 /etc/osmocom/osmo-msc.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36662?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I406ff0d625b02991d580c8382aa4be04dba45a00 Gerrit-Change-Number: 36662 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in libosmo-sccp[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36656?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ie34e7aa65e576cf1742a33530a6f44d2344c39d0 --- M contrib/libosmo-sccp.spec.in M debian/control M debian/osmo-stp.postinst 3 files changed, 50 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/56/36656/1 diff --git a/contrib/libosmo-sccp.spec.in b/contrib/libosmo-sccp.spec.in index 7e74e18..9d70874 100644 --- a/contrib/libosmo-sccp.spec.in +++ b/contrib/libosmo-sccp.spec.in @@ -158,7 +158,8 @@ chmod 0660 /etc/osmocom/osmo-stp.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom - +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %files -n libosmo-mtp-devel %dir %{_includedir}/%{name} diff --git a/debian/control b/debian/control index 712774c..444604c 100644 --- a/debian/control +++ b/debian/control @@ -100,8 +100,7 @@ Section: net Depends: libosmo-sigtran9, ${shlibs:Depends}, - ${misc:Depends}, - adduser + ${misc:Depends} Description: Osmocom SIGTRAN STP (Signaling Transfer Point) This is the Osmocom (Open Source Mobile Communications) implementation of a Signaling Transfer Point (STP) for SS7/SIGTRAN telecommunication diff --git a/debian/osmo-stp.postinst b/debian/osmo-stp.postinst index 94fb408..bfcc1dc 100755 --- a/debian/osmo-stp.postinst +++ b/debian/osmo-stp.postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-stp.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-stp.cfg + chmod 0660 /etc/osmocom/osmo-stp.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie34e7aa65e576cf1742a33530a6f44d2344c39d0 Gerrit-Change-Number: 36656 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-bsc[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36657?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ie34e7aa65e576cf1742a33530a6f44d2344c39d0 --- M contrib/osmo-bsc.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/36657/1 diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 7b7777d..464630e 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -123,6 +123,8 @@ chmod 0660 /etc/osmocom/osmo-bsc.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check diff --git a/debian/control b/debian/control index 5f1016c..d2abb43 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Package: osmo-bsc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: osmo-mgw Description: OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks diff --git a/debian/postinst b/debian/postinst index 43d0f5e..26cdddf 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-bsc.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-bsc.cfg + chmod 0660 /etc/osmocom/osmo-bsc.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie34e7aa65e576cf1742a33530a6f44d2344c39d0 Gerrit-Change-Number: 36657 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-cbc[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/36658?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 --- M contrib/osmo-cbc.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/58/36658/1 diff --git a/contrib/osmo-cbc.spec.in b/contrib/osmo-cbc.spec.in index 0fee4b9..0e57fa0 100644 --- a/contrib/osmo-cbc.spec.in +++ b/contrib/osmo-cbc.spec.in @@ -110,6 +110,8 @@ chmod 0660 /etc/osmocom/osmo-cbc.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check diff --git a/debian/control b/debian/control index e3937e5..a1b7f04 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Package: osmo-cbc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoCBC: Osmocom's Cell Broadcast Center Package: osmo-cbc-utils diff --git a/debian/postinst b/debian/postinst index 1894ff7..922fa48 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-cbc.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-cbc.cfg + chmod 0660 /etc/osmocom/osmo-cbc.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/36658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 Gerrit-Change-Number: 36658 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 3 days

1
0
0 0

[M] Change in docker-playground[master]: asterisk-master: Use pjproject from external git repo

by jolly

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email ) Change subject: asterisk-master: Use pjproject from external git repo ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 Gerrit-Change-Number: 36649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Apr 2024 07:39:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adaptor: allow keeping an HTTP client connection

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email ) Change subject: HTTP_Adaptor: allow keeping an HTTP client connection ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646/comment/5b7b5b8f_7fb2… PS1, Line 9: At the moment the HTTP_Adaptor automatically creates a new connection, performs (if you break lines at 72 characters max - except for error/log messages - it wraps properly in gerrit and makes reviewing easier) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic6994c504143820dde498c1a2bad2ad6a523dd70 Gerrit-Change-Number: 36646 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Apr 2024 07:33:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 3 days

1
0
0 0

[M] Change in docker-playground[master]: asterisk-master: Use pjproject from external git repo

by osmith

Attention is currently required from: jolly, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email ) Change subject: asterisk-master: Use pjproject from external git repo ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 Gerrit-Change-Number: 36649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Apr 2024 07:27:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email ) Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX ...................................................................... Patch Set 2: (1 comment) File src/vty.c: https://gerrit.osmocom.org/c/osmo-e1d/+/36653/comment/3f4c131a_5d078b0e PS1, Line 434: framing-tx (no-crc4|crc4)", > Ack, will change. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 29 Apr 2024 06:59:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

2 weeks, 3 days

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by tnt

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Note that I don't have a working DADHI setup ATM, so don't merge until I either get to try this, or someone else does. -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 28 Apr 2024 14:39:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode ...................................................................... icE1usb: Configure the RX mode according to CRC4 mode Previously only the TX side would be configured for CRC4 enable/disable, because the RX side hardware didn't support a no-CRC4 mode. Now that it's implemented, make sure to configure it if requested. Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 61 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/55/36655/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 2262deb..06ec443 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -108,6 +108,7 @@ } ep; struct { struct ice1usb_tx_config tx; + struct ice1usb_rx_config rx; } cfg; /* last received error interrupt */ struct ice1usb_irq_err last_err; @@ -220,10 +221,23 @@ } } +static const char *rx_mode_str(enum ice1usb_rx_mode rx_mode) +{ + switch (rx_mode) { + case ICE1USB_RX_MODE_FRAME: + return "FRAME"; + case ICE1USB_RX_MODE_MULTIFRAME: + return "MULTIFRAME"; + default: + return "unknown"; + } +} + + #define USB_RT_VEND_IF (USB_TYPE_VENDOR | USB_RECIP_INTERFACE) #define USB_RT_VEND_DEV (USB_TYPE_VENDOR | USB_RECIP_DEVICE) -/* synchronous request, may block up to 1s, only called from process context! */ +/* synchronous requests, may block up to 1s, only called from process context! */ static int ice1usb_tx_config(struct ice1usb *ieu) { int rc; @@ -244,6 +258,25 @@ return 0; } +static int ice1usb_rx_config(struct ice1usb *ieu) +{ + int rc; + uint8_t if_num = ieu->usb_intf->cur_altsetting->desc.bInterfaceNumber; + + ieu_info(ieu, "RX-CONFIG (mode=%s)\n", + rx_mode_str(ieu->cfg.rx.mode)); + + rc = usb_control_msg(ieu->usb_dev, usb_sndctrlpipe(ieu->usb_dev, 0), + ICE1USB_INTF_SET_RX_CFG, USB_RT_VEND_IF, + 0, if_num, &ieu->cfg.rx, sizeof(ieu->cfg.rx), + USB_CTRL_SET_TIMEOUT); + if (rc < 0) + return rc; + if (rc != sizeof(ieu->cfg.rx)) + return -EIO; + return 0; +} + /*********************************************************************** * ISOCHRONOUS transfers @@ -685,10 +718,13 @@ lc->sync = 0; } - if (span->lineconfig & DAHDI_CONFIG_CRC4) + if (span->lineconfig & DAHDI_CONFIG_CRC4) { ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4_E; - else + ieu->cfg.rx.mode = ICE1USB_RX_MODE_MULTIFRAME; + } else { ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0; + ieu->cfg.rx.mode = ICE1USB_RX_MODE_FRAME; + } if (lc->sync > 0) ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_REMOTE; @@ -713,9 +749,16 @@ rc = ice1usb_tx_config(ieu); if (rc < 0) return rc; + rc = ice1usb_rx_config(ieu); + if (rc < 0) + return rc; rc = e1u_d_startup(file, span); - } else + } else { rc = ice1usb_tx_config(ieu); + if (rc < 0) + return rc; + rc = ice1usb_rx_config(ieu); + } return rc; } -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

2 weeks, 4 days

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email ) Change subject: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically ...................................................................... icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically We want the hardware to take care of the CRC4 error bit autonomously without us having to do anything ... Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/54/36654/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 7ab751e..2262deb 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -686,7 +686,7 @@ } if (span->lineconfig & DAHDI_CONFIG_CRC4) - ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4; + ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4_E; else ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Gerrit-Change-Number: 36654 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

2 weeks, 4 days

1
0
0 0

[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX

by tnt

Attention is currently required from: laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX ...................................................................... iCE1usb: Add support to configure CRC4 mode for TX/RX Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb --- M src/e1d.h M src/usb.c M src/vty.c 3 files changed, 78 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/53/36653/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 weeks, 4 days

1
0
0 0

[S] Change in libosmocore[master]: add API logging_vty_subsys_strip_leading_char()

by laforge

Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36546?usp=email ) Change subject: add API logging_vty_subsys_strip_leading_char() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Yes, the current approach of when or where to strip that 'd' is not logical. It is - like many things - just because it was done a certain way without thinking about long-term implications. But do we really make life easier by offering (now, after probably more than a decade of the existing behavior) multiple behavioral options, increasing the complexity for application developers even further? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36546?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5faedf7d6525d744a734ebe54c185fcc904f763e Gerrit-Change-Number: 36546 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Apr 2024 12:21:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[S] Change in libosmocore[master]: formalize log subsys stripping for vty

by laforge

Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36545?usp=email ) Change subject: formalize log subsys stripping for vty ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Yes, the current approach of when or where to strip that 'd' is not logical. It is - like many things - just because it was done a certain way without thinking about long-term implications. But do we really make life easier by offering (now, after probably more than a decade of the existing behavior) multiple behavioral options, increasing the complexity for application developers even further? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5f81343e8c7b714a4630e64ba654e391435c4244 Gerrit-Change-Number: 36545 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Apr 2024 12:20:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email ) Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX ...................................................................... Patch Set 1: (1 comment) File src/vty.c: https://gerrit.osmocom.org/c/osmo-e1d/+/36653/comment/012c4c7d_0303d0b1 PS1, Line 434: framing-tx (no-crc4|crc4)", > this could be one command for both rx and tx like "framing (rx|tx) (no-crc4|crc4)". […] Ack, will change. I was trying to change it to "framing [(tx|rx)] (no-crc4|crc4)" so that you could just do both at once, but that doesn't see to work. Is optional middle argument not supported ? -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 28 Apr 2024 12:19:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-sgsn[master]: docs: replace legacy NS with new NS2 chapters

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36627?usp=email ) Change subject: docs: replace legacy NS with new NS2 chapters ...................................................................... docs: replace legacy NS with new NS2 chapters osmo-sgsn already switched to the new NS2 code. Use the correct NS2 chapter Change-Id: I9cc86d234e029b5192e36aeb14b0e39d1496842d --- M doc/manuals/osmosgsn-usermanual-docinfo.xml M doc/manuals/osmosgsn-usermanual.adoc 2 files changed, 32 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/doc/manuals/osmosgsn-usermanual-docinfo.xml b/doc/manuals/osmosgsn-usermanual-docinfo.xml index afbf109..f8d43e9 100644 --- a/doc/manuals/osmosgsn-usermanual-docinfo.xml +++ b/doc/manuals/osmosgsn-usermanual-docinfo.xml @@ -15,6 +15,14 @@ Conversion to asciidoc, removal of sysmoBTS specific parts. </revremark> </revision> + <revision> + <revnumber>3</revnumber> + <date>April 2024</date> + <authorinitials>AC</authorinitials> + <revremark> + Replace NS chapter with new NS2 chapter to match the code. + </revremark> + </revision> </revhistory> <authorgroup> @@ -29,6 +37,17 @@ <jobtitle>Managing Director</jobtitle> </affiliation> </author> + <author> + <firstname>Alexander</firstname> + <surname>Couzens</surname> + <email>acouzens(a)sysmocom.de</email> + <authorinitials>AC</authorinitials> + <affiliation> + <shortaffil>sysmocom</shortaffil> + <orgname>sysmocom - s.f.m.c. GmbH</orgname> + <jobtitle>Developer</jobtitle> + </affiliation> + </author> </authorgroup> <copyright> diff --git a/doc/manuals/osmosgsn-usermanual.adoc b/doc/manuals/osmosgsn-usermanual.adoc index 610704a..781e4d3 100644 --- a/doc/manuals/osmosgsn-usermanual.adoc +++ b/doc/manuals/osmosgsn-usermanual.adoc @@ -21,7 +21,7 @@ include::./common/chapters/cs7-config.adoc[] -include::./common/chapters/gb.adoc[] +include::./common/chapters/gb-ns2.adoc[] include::./common/chapters/control_if.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36627?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9cc86d234e029b5192e36aeb14b0e39d1496842d Gerrit-Change-Number: 36627 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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-MessageType: merged

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-sgsn[master]: docs: front page: use https:// instead of http://

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36629?usp=email ) Change subject: docs: front page: use https:// instead of http:// ...................................................................... docs: front page: use https:// instead of http:// Change-Id: If3c3b8e79f94da7a3bcc9262808da09f6a5a601c --- M doc/manuals/osmosgsn-usermanual-docinfo.xml 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/manuals/osmosgsn-usermanual-docinfo.xml b/doc/manuals/osmosgsn-usermanual-docinfo.xml index 7c7de2c..9eea626 100644 --- a/doc/manuals/osmosgsn-usermanual-docinfo.xml +++ b/doc/manuals/osmosgsn-usermanual-docinfo.xml @@ -66,8 +66,8 @@ </para> <para> The Asciidoc source code of this manual can be found at - <ulink url="http://git.osmocom.org/osmo-gsm-manuals/"> - http://git.osmocom.org/osmo-gsm-manuals/ + <ulink url="https://git.osmocom.org/osmo-gsm-manuals/"> + https://git.osmocom.org/osmo-gsm-manuals/ </ulink> </para> </legalnotice> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36629?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: If3c3b8e79f94da7a3bcc9262808da09f6a5a601c Gerrit-Change-Number: 36629 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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-MessageType: merged

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-sgsn[master]: docs: update year to 2024

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36628?usp=email ) Change subject: docs: update year to 2024 ...................................................................... docs: update year to 2024 Change-Id: I85a987eee470d2040c91289d33c5d97c3e90674d --- M doc/manuals/osmosgsn-usermanual-docinfo.xml 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/manuals/osmosgsn-usermanual-docinfo.xml b/doc/manuals/osmosgsn-usermanual-docinfo.xml index f8d43e9..7c7de2c 100644 --- a/doc/manuals/osmosgsn-usermanual-docinfo.xml +++ b/doc/manuals/osmosgsn-usermanual-docinfo.xml @@ -51,7 +51,7 @@ </authorgroup> <copyright> - <year>2013-2016</year> + <year>2013-2024</year> <holder>sysmocom - s.f.m.c. GmbH</holder> </copyright> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36628?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I85a987eee470d2040c91289d33c5d97c3e90674d Gerrit-Change-Number: 36628 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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-MessageType: merged

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestE...

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email ) Change subject: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestEsipa ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97aa039810ad9fffea4226254fa675fd24647de1 Gerrit-Change-Number: 36647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Apr 2024 12:16:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Apr 2024 12:16:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestE...

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email ) Change subject: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestEsipa ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97aa039810ad9fffea4226254fa675fd24647de1 Gerrit-Change-Number: 36647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Apr 2024 12:15:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[M] Change in docker-playground[master]: asterisk-master: Use pjproject from external git repo

by laforge

Attention is currently required from: jolly, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email ) Change subject: asterisk-master: Use pjproject from external git repo ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I'm wondering if we should have this [as a commit] in our forked asterisk.git, so that even manual builds [from our fork/branch] will use and build right/matching pjproject.git So basically make this work not just for the docker container here, but for all builds? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 Gerrit-Change-Number: 36649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Apr 2024 12:12:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[M] Change in docker-playground[master]: asterisk-master: Use pjproject from external git repo

by laforge

Attention is currently required from: jolly, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email ) Change subject: asterisk-master: Use pjproject from external git repo ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 Gerrit-Change-Number: 36649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Apr 2024 12:11:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email ) Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/vty.c: https://gerrit.osmocom.org/c/osmo-e1d/+/36653/comment/434e2f31_60b6ae9d PS1, Line 434: framing-tx (no-crc4|crc4)", this could be one command for both rx and tx like "framing (rx|tx) (no-crc4|crc4)". Not critical, just a thought. Especially since both the functions are 99% identical. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sun, 28 Apr 2024 11:24:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 4 days

1
0
0 0

[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email ) Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX ...................................................................... iCE1usb: Add support to configure CRC4 mode for TX/RX Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb --- M src/e1d.h M src/usb.c M src/vty.c 3 files changed, 84 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/53/36653/1 diff --git a/src/e1d.h b/src/e1d.h index bf1cbdf..55e5415 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -78,6 +78,11 @@ }; extern const struct value_string e1_ts_mode_names[]; +enum e1_framing_mode { + E1_FRAMING_MODE_CRC4 = 0, + E1_FRAMING_MODE_NO_CRC4, +}; + struct e1_ts { struct e1_line *line; uint8_t id; @@ -160,6 +165,14 @@ uint32_t rx_bytes; } watchdog; + /* driver specific data */ + struct { + struct { + enum e1_framing_mode tx; + enum e1_framing_mode rx; + } framing; + } usb; + void *e1gen_priv; }; diff --git a/src/usb.c b/src/usb.c index 8d431f5..3b77b94 100644 --- a/src/usb.c +++ b/src/usb.c @@ -1036,14 +1036,29 @@ goto next_interface; } - /* Create data flows and start the line */ + /* Configure, create data flows and start the line */ /* all supported devices have an IN endpoint */ + e1_usb_ctrl_set_rx_cfg(line, + (line->usb.framing.rx == E1_FRAMING_MODE_CRC4) ? + ICE1USB_RX_MODE_MULTIFRAME : + ICE1USB_RX_MODE_FRAME + ); + line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); e1uf_start(line_data->flow_in); /* e1-tracer has no OUT or FEEDBACK endpoint */ if (!is_tracer) { + e1_usb_ctrl_set_tx_cfg(line, + (line->usb.framing.tx == E1_FRAMING_MODE_CRC4) ? + ICE1USB_TX_MODE_TS0_CRC4_E : + ICE1USB_TX_MODE_TS0, + ICE1USB_TX_TIME_SRC_LOCAL, + ICE1USB_TX_EXT_LOOPBACK_OFF, + 0x00 + ); + line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); e1uf_start(line_data->flow_out); line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb, line_data->ep_fb, 2, 3, 1); diff --git a/src/vty.c b/src/vty.c index 5b4ca47..5083153 100644 --- a/src/vty.c +++ b/src/vty.c @@ -168,6 +168,12 @@ { 0, NULL } }; +const struct value_string e1_framing_mode_names[] = { + { E1_FRAMING_MODE_CRC4, "crc4" }, + { E1_FRAMING_MODE_NO_CRC4, "no-crc4" }, + { 0, NULL } +}; + static void vty_dump_line(struct vty *vty, const struct e1_line *line) { unsigned int tn; @@ -424,12 +430,49 @@ return CMD_SUCCESS; } +DEFUN(cfg_e1d_if_line_framing_tx, cfg_e1d_if_line_framing_tx_cmd, + "framing-tx (no-crc4|crc4)", + NO_STR "Sets the transmitted E1 framing mode\n") +{ + struct e1_line *line = vty->index; + + if (line->intf->drv != E1_DRIVER_USB) + return CMD_WARNING; + + enum e1_framing_mode new_mode = get_string_value(e1_framing_mode_names, argv[0]); + line->usb.framing.tx = new_mode; + + return CMD_SUCCESS; + +} + +DEFUN(cfg_e1d_if_line_framing_rx, cfg_e1d_if_line_framing_rx_cmd, + "framing-rx (no-crc4|crc4)", + NO_STR "Sets the expected received E1 framing mode\n") +{ + struct e1_line *line = vty->index; + + if (line->intf->drv != E1_DRIVER_USB) + return CMD_WARNING; + + enum e1_framing_mode new_mode = get_string_value(e1_framing_mode_names, argv[0]); + line->usb.framing.rx = new_mode; + + return CMD_SUCCESS; +} + + static int config_write_line(struct vty *vty, struct e1_line *line) { vty_out(vty, " line %u%s", line->id, VTY_NEWLINE); vty_out(vty, " mode %s%s", get_value_string(e1_line_mode_names, line->mode), VTY_NEWLINE); + if (line->intf->drv == E1_DRIVER_USB) { + vty_out(vty, " framing-tx %s%s", get_value_string(e1_framing_mode_names, line->usb.framing.tx), VTY_NEWLINE); + vty_out(vty, " framing-rx %s%s", get_value_string(e1_framing_mode_names, line->usb.framing.tx), VTY_NEWLINE); + } + return 0; } @@ -521,4 +564,6 @@ install_node(&line_node, NULL); install_element(LINE_NODE, &cfg_e1d_if_line_mode_cmd); + install_element(LINE_NODE, &cfg_e1d_if_line_framing_tx_cmd); + install_element(LINE_NODE, &cfg_e1d_if_line_framing_rx_cmd); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Add README.md

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36637?usp=email ) Change subject: epdg: Add README.md ...................................................................... epdg: Add README.md Change-Id: I6326b6c35f66d30787758d83e96e8a070375b0c0 --- A epdg/README.md 1 file changed, 35 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/epdg/README.md b/epdg/README.md new file mode 100644 index 0000000..6f5ea70 --- /dev/null +++ b/epdg/README.md @@ -0,0 +1,26 @@ +# EPDG_Tests.ttcn + +* external interfaces + * CEAI: GSUP (emulates strongswan) + * SWx: Diameter (emulates HSS) + * S6b: Diameter (emulates SMF) + * S2b: GTPv2C (emulates SMF) + * Emulates userplane IPsec decapsulated IP traffic at strongswan + * Emulates userplane GTPv1U encapsulated IP traffic at UPF + +{% dot epdg_tests.svg +digraph G { + rankdir=LR; + ATS [label="ATS\nEPDG_Tests.ttcn"]; + EPDG [label="EPDG\nosmo-epdg",shape="box", color=red]; + GTP_KERN [label="gtp\nkernel-module", shape="box"]; + + ATS -> EPDG [label="CEAI (GSUP)"]; + ATS -> EPDG [label="S6b (Diameter)"]; + EPDG -> ATS [label="SWx (Diameter)"] + EPDG -> ATS [label="S2b (GTPv2C)"]; + ATS -> EPDG [label="IP traffic (to/from strongswan ipsec)", style=dashed]; + EPDG -> GTP_KERN [label="netlink"] + GTP_KERN -> ATS [label="IP traffic (GTPv1U to/from UPF)", style=dashed] +} +%} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36637?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6326b6c35f66d30787758d83e96e8a070375b0c0 Gerrit-Change-Number: 36637 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 weeks, 6 days

1
0
0 0

[S] Change in osmo-hnbgw[master]: drop legacy hack: do not start MGW endp in loopback mode

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36634?usp=email ) Change subject: drop legacy hack: do not start MGW endp in loopback mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36634?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0eca75d7abf66f8b9fde9c68ec10d4265f64a189 Gerrit-Change-Number: 36634 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:16:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Configure new IMS ConnHdlr

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36643?usp=email ) Change subject: ttcn3-asterisk: Configure new IMS ConnHdlr ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36643?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0ee6cb8955fc4f7dec3db97c768430905374f115 Gerrit-Change-Number: 36643 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:15:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[S] Change in osmo-sgsn[master]: contrib/osmo-sgsn.spec: fix build for almalinux:8

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36648?usp=email ) Change subject: contrib/osmo-sgsn.spec: fix build for almalinux:8 ...................................................................... contrib/osmo-sgsn.spec: fix build for almalinux:8 Add the missing "%if 0%{?suse_version}" around %service_del/add commands, as these are only available on opensuse. Fix for: error: line 106: Too many names: %preun -n osmo-gtphub %service_del_preun osmo-gtphub.service Fixes: a07e6d9c (".deb/.rpm: add osmocom user during package install") Change-Id: I89802f926bfccc0f7b4bb1ff64115b232b1db022 --- M contrib/osmo-sgsn.spec.in 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in index d1382cb..031cd14 100644 --- a/contrib/osmo-sgsn.spec.in +++ b/contrib/osmo-sgsn.spec.in @@ -100,10 +100,12 @@ chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +%if 0%{?suse_version} %preun -n osmo-gtphub %service_del_preun osmo-gtphub.service %postun -n osmo-gtphub %service_del_postun osmo-gtphub.service %pre -n osmo-gtphub %service_add_pre osmo-gtphub.service %post -n osmo-gtphub %service_add_post osmo-gtphub.service +%endif %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I89802f926bfccc0f7b4bb1ff64115b232b1db022 Gerrit-Change-Number: 36648 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 weeks, 6 days

1
0
0 0

[S] Change in osmo-sgsn[master]: contrib/osmo-sgsn.spec: fix build for almalinux:8

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36648?usp=email ) Change subject: contrib/osmo-sgsn.spec: fix build for almalinux:8 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I89802f926bfccc0f7b4bb1ff64115b232b1db022 Gerrit-Change-Number: 36648 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:15:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adaptor: allow keeping an HTTP client connection

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email ) Change subject: HTTP_Adaptor: allow keeping an HTTP client connection ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic6994c504143820dde498c1a2bad2ad6a523dd70 Gerrit-Change-Number: 36646 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:14:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: add support for binary messages

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email ) Change subject: HTTP_Adapter: add support for binary messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18340f19ed462bf80af683dc9f2831b602f4bdf7 Gerrit-Change-Number: 36645 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:14:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Add README.md

by laforge

Attention is currently required from: lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36637?usp=email ) Change subject: epdg: Add README.md ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36637?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6326b6c35f66d30787758d83e96e8a070375b0c0 Gerrit-Change-Number: 36637 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:14:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk/AMI_Functions: improvements to implement PJSIPRegister

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36652?usp=email ) Change subject: asterisk/AMI_Functions: improvements to implement PJSIPRegister ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc4ff6eaad84f67d33c1211dc5e39294ce1c8fac Gerrit-Change-Number: 36652 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:13:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[S] Change in docker-playground[master]: asterisk: manager.conf: Give more permissions to AMI user

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email ) Change subject: asterisk: manager.conf: Give more permissions to AMI user ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b Gerrit-Change-Number: 36651 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:13:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[S] Change in docker-playground[master]: asterisk: pjsip.conf: Mark templates accordingly

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email ) Change subject: asterisk: pjsip.conf: Mark templates accordingly ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 Gerrit-Change-Number: 36650 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 19:12:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk/AMI_Functions: improvements to implement PJSIPRegister

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36652?usp=email ) Change subject: asterisk/AMI_Functions: improvements to implement PJSIPRegister ...................................................................... asterisk/AMI_Functions: improvements to implement PJSIPRegister Change-Id: Ibc4ff6eaad84f67d33c1211dc5e39294ce1c8fac --- M asterisk/AMI_Functions.ttcn 1 file changed, 131 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/36652/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index d5139f5..72420e1 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -25,10 +25,14 @@ } const charstring AMI_FIELD_ACTION := "Action"; +const charstring AMI_FIELD_ACTION_ID := "ActionId"; const charstring AMI_FIELD_USERNAME := "Username"; const charstring AMI_FIELD_SECRET := "Secret"; const charstring AMI_FIELD_RESPONSE := "Response"; +/* Extensions: */ +const charstring AMI_FIELD_REGISTRATION := "Registration"; + type record AMI_Field { charstring key, charstring val @@ -69,28 +73,46 @@ template (value) AMI_Field ts_AMI_Field_Action(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ACTION, val); template (value) AMI_Field +ts_AMI_Field_ActionId(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ACTION_ID, val); +template (value) AMI_Field ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); template (value) AMI_Field ts_AMI_Field_Secret(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_SECRET, val); +/* Extensions: */ +template (value) AMI_Field +ts_AMI_Field_Registration(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_REGISTRATION, val); template (present) AMI_Field tr_AMI_Field_Action(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION, val); template (present) AMI_Field +tr_AMI_Field_ActionId(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION_ID, val); +template (present) AMI_Field tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_USERNAME, val); template (present) AMI_Field tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_SECRET, val); template (present) AMI_Field tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_RESPONSE, val); +/* Extensions: */ +template (present) AMI_Field +tr_AMI_Field_Registration(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_REGISTRATION, val); template (present) AMI_Field tr_AMI_Field_ResponseSuccess := tr_AMI_Field(AMI_FIELD_RESPONSE, "Success"); -/* +/*********************** * Message Templates: + ***********************/ + +/* + * ACTIONS */ +/* Action: Login + * Username: <value> + * Secret: <value> + */ template (value) AMI_Msg ts_AMI_Action_Login(charstring username, charstring secret) := { ts_AMI_Field_Action("Login"), @@ -106,15 +128,101 @@ tr_AMI_Field_Secret(secret) ); +/* Action: PJSIPRegister + * ActionID: <value> + * Registration: volte_ims + */ +template (value) AMI_Msg +ts_AMI_Action_PJSIPRegister(template (value) charstring registration := "volte_ims", + template (value) charstring action_id := "0001") := { + ts_AMI_Field_Action("PJSIPRegister"), + ts_AMI_Field_ActionId(action_id), + ts_AMI_Field_Registration(registration) +}; +template (present) AMI_Msg +tr_AMI_Action_PJSIPRegister(template (present) charstring registration := ?, + template (present) charstring action_id := ?) := { + tr_AMI_Field_Action("PJSIPRegister"), + tr_AMI_Field_ActionId(action_id), + tr_AMI_Field_Registration(registration) +}; + +/* + * RESPONSES + */ + +/* Response: Success + */ template (present) AMI_Msg tr_AMI_Response_Success := superset( tr_AMI_Field_ResponseSuccess ); +/* Response: Success + * ActionId: <value> + */ +template (present) AMI_Msg +tr_AMI_Response_Success_ActionId(template (present) charstring action_id := ?) := superset( + tr_AMI_Field_ResponseSuccess, + tr_AMI_Field_ActionId(action_id) +); + /* * Functions: */ +/* Generate a random "ActionId" value: */ +function f_gen_action_id() return charstring { + return hex2str(f_rnd_hexstring(16)); +} + +function f_ami_msg_find(AMI_Msg msg, + template (present) charstring key := ?) +return template (omit) AMI_Field { + var integer i; + + for (i := 0; i < lengthof(msg); i := i + 1) { + if (not ispresent(msg[i])) { + continue; + } + if (match(msg[i].key, key)) { + return msg[i]; + } + } + return omit; +} + +function f_ami_msg_find_or_fail(AMI_Msg msg, + template (present) charstring key := ?) +return AMI_Field { + var template (omit) AMI_Field field; + field := f_ami_msg_find(msg, key); + if (istemplatekind(field, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Key ", key, " not found in ", msg)); + } + return valueof(field); +} + +function f_ami_msg_get_value(AMI_Msg msg, + template (present) charstring key := ?) +return template (omit) charstring { + var template (omit) AMI_Field field; + field := f_ami_msg_find(msg, key); + if (istemplatekind(field, "omit")) { + return omit; + } + return field.val; +} + +function f_ami_msg_get_value_or_fail(AMI_Msg msg, + template (present) charstring key := ?) +return template charstring { + var AMI_Field field; + field := f_ami_msg_find_or_fail(msg, key); + return field.val; +} + private function f_ami_wait_for_prompt_str(TELNETasp_PT pt, charstring log_label := "(?)") return charstring { var charstring rx, buf := ""; @@ -172,11 +280,23 @@ function f_ami_transceive_match_response_success(TELNETasp_PT pt, template (value) AMI_Msg tx_msg) { - f_ami_transceive_match(pt, tx_msg, tr_AMI_Response_Success); + var template (present) AMI_Msg exp_resp; + var template (omit) charstring action_id := f_ami_msg_get_value(valueof(tx_msg), AMI_FIELD_ACTION_ID); + if (isvalue(action_id)) { + exp_resp := tr_AMI_Response_Success_ActionId(action_id); + } else { + exp_resp := tr_AMI_Response_Success; + } + f_ami_transceive_match(pt, tx_msg, exp_resp); } function f_ami_action_login(TELNETasp_PT pt, charstring username, charstring secret) { f_ami_transceive_match_response_success(pt, ts_AMI_Action_Login(username, secret)); } +function f_ami_action_PJSIPRegister(TELNETasp_PT pt, charstring register) { + var charstring reg_action_id := f_gen_action_id(); + f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id)); +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc4ff6eaad84f67d33c1211dc5e39294ce1c8fac Gerrit-Change-Number: 36652 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 6 days

1
0
0 0

[S] Change in docker-playground[master]: asterisk: pjsip.conf: Mark templates accordingly

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email ) Change subject: asterisk: pjsip.conf: Mark templates accordingly ...................................................................... asterisk: pjsip.conf: Mark templates accordingly Mark templates as such, in order to remove error messages during asterisk setup when trying to apply the templates (which lack fields such as "username", provided by config sections using the templates). Reference: https://docs.asterisk.org/Fundamentals/Asterisk-Configuration/Asterisk-Conf… Change-Id: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/50/36650/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index 39cf9bb..57cab41 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -7,8 +7,7 @@ ;external_media_address=[obfuscated] ;external_signaling_address=[obfuscated] - -[endpoint_phone_template] +[endpoint_phone_template](!) type=endpoint transport=transport-udp context=from-phone @@ -16,11 +15,11 @@ allow=alaw allow=ulaw -[auth_phone_template] +[auth_phone_template](!) type=auth auth_type=userpass -[aor_phone_template] +[aor_phone_template](!) type=aor max_contacts=1 remove_existing=yes -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 Gerrit-Change-Number: 36650 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 6 days

1
0
0 0

[S] Change in docker-playground[master]: asterisk: manager.conf: Give more permissions to AMI user

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email ) Change subject: asterisk: manager.conf: Give more permissions to AMI user ...................................................................... asterisk: manager.conf: Give more permissions to AMI user These are required to use eg. PJSIPRegister command, otherwise Asterisk answers with "Permission Denied". It also seems to help in getting more events from Asterisk. Change-Id: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b --- M ttcn3-asterisk-ims-ue-test/asterisk/manager.conf 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/51/36651/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf b/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf index ea6d1ac..67f7b02 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf @@ -9,3 +9,5 @@ secret = 1234 ;deny=0.0.0.0/0.0.0.0 permit=172.18.11.103/255.255.0.0 +read = all,system,call,log,verbose,command,agent,user +write = all,system,call,log,verbose,command,agent,user -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b Gerrit-Change-Number: 36651 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 6 days

1
0
0 0

[M] Change in docker-playground[master]: asterisk-master: Use pjproject from external git repo

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email ) Change subject: asterisk-master: Use pjproject from external git repo ...................................................................... asterisk-master: Use pjproject from external git repo By default, asterisk.git build system will fetch pjproject tarball from https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/$(P…, where PJPROJECT_VERSION is defined in asterisk/third-party/versions.mak: PJPROJECT_VERSION=2.14 On top of that, it applies some patches adapting build system, found in asterisk/third-party/pjproject/patches/. The build system also allows to use an out-of-tree pjproject (eg from a git repo) by symlinking the directory to asterisk/third-party/pjprojec/source/. This is all documented in asterisk/third-party/pjproject/README-hacking.md. Since we want to develop on pjproject too, fetch our own pjproject.git repo, where we can push changes, and build asterisk using that repo. Bear in mind that, when asterisk.git builds with out-of-tree pjproject, it wont apply pjproject patches under asterisk.git/third-party/pjproject/patches. Hence, I created an "asterisk/2.14" branch in our pjproject.git repo which points to tag "2.14" (the one used by asterisk 20.7.0, which we use), and has the 2 patches applied on top. Then, we have our own "sysmocom/2.14" branch on top of that "asterisk/2.14" branch, where we put our development. WIP development can also be done in whatever branch on top of "asterisk/2.14" branch. Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 --- M asterisk-master/Dockerfile M make/Makefile 2 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/49/36649/1 diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile index cd64b2f..789aeb5 100644 --- a/asterisk-master/Dockerfile +++ b/asterisk-master/Dockerfile @@ -36,6 +36,17 @@ WORKDIR /home/${username} +# clone pjproject +ARG PJPROJECT_REMOTE=https://gitea.sysmocom.de/sysmocom/pjproject.git +ARG PJPROJECT_BRANCH=sysmocom/2.14 + +RUN git clone $PJPROJECT_REMOTE +ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/pjproject/git/refs/heads/$P… /tmp/pjproject-ver + +RUN cd pjproject && \ + git fetch && git checkout $PJPROJECT_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$PJPROJECT_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD # clone asterisk ARG ASTERISK_REMOTE=https://gitea.sysmocom.de/sysmocom/asterisk.git @@ -44,6 +55,10 @@ RUN cd asterisk && \ git fetch && git checkout -f -B sysmocom/master origin/sysmocom/master +# Use pjproject from git repo above instead of downloading tar.gz: +RUN cd asterisk/third-party/pjproject && \ + ln -s ../../../pjproject/ source + RUN cd asterisk && \ ./bootstrap.sh && \ ./configure && \ diff --git a/make/Makefile b/make/Makefile index 74efbff..24308e5 100644 --- a/make/Makefile +++ b/make/Makefile @@ -42,6 +42,7 @@ OSMO_STP_BRANCH?=master OSMO_UECUPS_BRANCH?=master OPEN5GS_BRANCH?=main +PJPROJECT_BRANCH?=sysmocom/2.14 BUILD_ARGS?= RUN_ARGS?=-it UPSTREAM_DISTRO?=debian:bookworm @@ -125,6 +126,7 @@ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ --build-arg OSMO_UECUPS_BRANCH=$(OSMO_UECUPS_BRANCH) \ --build-arg OPEN5GS_BRANCH=$(OPEN5GS_BRANCH) \ + --build-arg PJPROJECT_BRANCH=$(PJPROJECT_BRANCH) \ $(BUILD_ARGS) -t $(IMAGE):latest . @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 Gerrit-Change-Number: 36649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 weeks, 6 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: tr_SIP_REGISTER(): Pass via field directly as a param

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36644?usp=email ) Change subject: SIP_Templates: tr_SIP_REGISTER(): Pass via field directly as a param ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9fe477370e028543b04dee35a3285ddae6bb2c59 Gerrit-Change-Number: 36644 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Apr 2024 15:07:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 weeks, 6 days

1
0
0 0

2024

2023

2022

gerrit-log April 2024