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

[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

1 year, 1 month

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

1 year, 1 month

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

1 year, 1 month

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

1 year, 1 month

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

1 year, 1 month

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

1 year, 1 month

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

1 year, 1 month

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

1 year, 1 month

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

1 year, 1 month

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

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024