Build failure of network:osmocom:nightly/osmo-bsc-nat in Raspbian_11/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc-nat/Raspbian_11/armv7l Package network:osmocom:nightly/osmo-bsc-nat failed to build in Raspbian_11/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc-nat Last lines of build log: [ 434s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2xml to provide /usr/bin/rst2xml (rst2xml) in auto mode [ 434s] update-alternatives: using /usr/share/docutils/scripts/python3/rstpep2html to provide /usr/bin/rstpep2html (rstpep2html) in auto mode [ 435s] [450/483] installing python3-reportlab-3.5.59-2 [ 438s] [451/483] installing g++-4:10.2.1-1+rpi1 [ 438s] update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode [ 438s] [452/483] installing libosmo-netif-dev-1.2.0.61.a07c.202210250053 [ 439s] [453/483] installing mount-2.36.1-8+deb11u1 [ 439s] [454/483] installing texlive-latex-extra-2020.20210202-3 [ 447s] [455/483] installing debhelper-13.3.4 [ 448s] [456/483] installing bash-5.1-2+deb11u1 [ 452s] update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode [ 452s] [457/483] installing libosmo-sigtran-dev-1.6.0.14.71fc.202210250053 [ 453s] [458/483] installing build-essential-12.9 [ 453s] [459/483] installing python3-blockdiag-2.0.1+dfsg-1 [ 454s] [460/483] installing texlive-xetex-2020.20210202-3 [ 455s] dpkg-deb (subprocess): decompressing archive '.init_b_cache/texlive-xetex.deb' (size=12542520) member 'data.tar': lzma error: compressed data is corrupt [ 455s] dpkg-deb: error: subprocess returned error exit status 2 [ 455s] dpkg: error processing archive .init_b_cache/texlive-xetex.deb (--install): [ 455s] cannot copy extracted data for './usr/share/doc/texlive-doc/xelatex/businesscard-qrcode/screenshots/peter-muster-example-company-zuerich.jpg' to '/usr/share/doc/texlive-doc/xelatex/businesscard-qrcode/screenshots/peter-muster-example-company-zuerich.jpg.dpkg-new': unexpected end of file or stream [ 455s] Errors were encountered while processing: [ 455s] .init_b_cache/texlive-xetex.deb [ 455s] exit ... [ 455s] ### VM INTERACTION START ### [ 457s] [ 299.747483] sysrq: SysRq : Power Off [ 457s] [ 299.749125] reboot: Power down [ 458s] ### VM INTERACTION END ### [ 458s] [ 458s] armbuild02 failed "build osmo-bsc-nat_0.1.0.202210250053.dsc" at Tue Oct 25 05:05:05 UTC 2022. [ 458s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 346s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2pseudoxml to provide /usr/bin/rst2pseudoxml (rst2pseudoxml) in auto mode [ 346s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2s5 to provide /usr/bin/rst2s5 (rst2s5) in auto mode [ 346s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2xetex to provide /usr/bin/rst2xetex (rst2xetex) in auto mode [ 346s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2xml to provide /usr/bin/rst2xml (rst2xml) in auto mode [ 346s] update-alternatives: using /usr/share/docutils/scripts/python3/rstpep2html to provide /usr/bin/rstpep2html (rstpep2html) in auto mode [ 347s] [441/485] installing python3-reportlab-3.5.13-1+deb10u1 [ 350s] [442/485] installing sysvinit-utils-2.93-8 [ 350s] [443/485] installing libosmo-netif-dev-1.2.0.61.a07c.202210250053 [ 351s] [444/485] installing mount-2.33.1-0.1 [ 351s] [445/485] installing gpg-wks-client-2.2.12-1+rpi1+deb10u1 [ 351s] [446/485] installing libpangocairo-1.0-0-1.42.4-8~deb10u1 [ 352s] [447/485] installing texlive-binaries-2018.20181218.49446-1 [ 360s] update-alternatives: using /usr/bin/xdvi-xaw to provide /usr/bin/xdvi.bin (xdvi.bin) in auto mode [ 360s] update-alternatives: using /usr/bin/bibtex.original to provide /usr/bin/bibtex (bibtex) in auto mode [ 361s] [448/485] installing bash-5.0-4 [ 361s] dpkg-deb (subprocess): decompressing archive member: lzma error: compressed data is corrupt [ 361s] dpkg-deb: error: subprocess returned error exit status 2 [ 361s] dpkg: error processing archive .init_b_cache/bash.deb (--install): [ 361s] cannot copy extracted data for './bin/bash' to '/bin/bash.dpkg-new': unexpected end of file or stream [ 361s] Errors were encountered while processing: [ 361s] .init_b_cache/bash.deb [ 361s] exit ... [ 361s] ### VM INTERACTION START ### [ 362s] [ 286.655056] sysrq: SysRq : Power Off [ 362s] [ 286.656904] reboot: Power down [ 362s] ### VM INTERACTION END ### [ 362s] [ 363s] armbuild02 failed "build osmo-msc_1.9.0.34.bb624.202210250053.dsc" at Tue Oct 25 04:54:28 UTC 2022. [ 363s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-e1d in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-e1d failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 322s] [447/461] installing texlive-extra-utils-2018.20190227-2 [ 329s] [448/461] installing texlive-2018.20190227-2 [ 329s] [449/461] installing texlive-pictures-2018.20190227-2 [ 331s] [450/461] installing texlive-science-2018.20190227-2 [ 333s] [451/461] installing libgtk2.0-0-2.24.32-3 [ 333s] [452/461] installing texlive-latex-extra-2018.20190227-2 [ 339s] [453/461] installing libgtkmm-2.4-1v5-1:2.24.5-4 [ 340s] [454/461] installing libgtkspell0-2.0.16-1.2 [ 340s] [455/461] installing texlive-xetex-2018.20190227-2 [ 343s] [456/461] installing dblatex-0.3.10-2 [ 344s] [457/461] installing inkscape-0.92.4-3 [ 350s] [458/461] installing texlive-formats-extra-2018.20190227-2 [ 352s] [459/461] installing docbook-utils-0.6.14-3.3 [ 352s] Processing triggers for sgml-base (1.29) ... [ 352s] [460/461] installing asciidoc-dblatex-8.6.10-3 [ 362s] dpkg-deb (subprocess): decompressing archive member: lzma error: compressed data is corrupt [ 362s] dpkg-deb: error: subprocess returned error exit status 2 [ 362s] dpkg: error processing archive .init_b_cache/asciidoc-dblatex.deb (--install): [ 362s] dpkg-deb --fsys-tarfile subprocess returned error exit status 2 [ 362s] Errors were encountered while processing: [ 362s] .init_b_cache/asciidoc-dblatex.deb [ 362s] exit ... [ 362s] ### VM INTERACTION START ### [ 363s] [ 330.267597] sysrq: SysRq : Power Off [ 363s] [ 330.269217] reboot: Power down [ 363s] ### VM INTERACTION END ### [ 363s] [ 363s] armbuild02 failed "build osmo-e1d_0.4.0.8.56a7.202210250053.dsc" at Tue Oct 25 03:15:56 UTC 2022. [ 363s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-bsc[master]: Add BTS setup ramping to prevent BSC overloading
Attention is currently required from: fixeria, lynxis lazus. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29788 ) Change subject: Add BTS setup ramping to prevent BSC overloading .. Patch Set 3: (4 comments) File include/osmocom/bsc/bts_setup_ramp.h: https://gerrit.osmocom.org/c/osmo-bsc/+/29788/comment/5aa50e91_c674beec PS3, Line 31: BTS_SETUP_RAMP_INIT, /** initial state */ (osmo-bsc doesn't generate doxygen, but just saying: the correct doxygen syntaxes here would be BTS_FOO, /*< foo */ because otherwise it is seen as comment for the subsequent line; or /*! foo */ BTS_FOO because osmocom has decided on '/*!' instead of the IMHO nicer '/**' ) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/29788/comment/3c286c2a_1a550b19 PS1, Line 1284: "allow-bts-configuration <0-65535>", > What I actually suggest is to implement it as 'bts <0-255> > bts-unblock-bringup-ramping', so that it' […] (i also prefer 'bts <0-255> foo') File src/osmo-bsc/bts_setup_ramp.c: https://gerrit.osmocom.org/c/osmo-bsc/+/29788/comment/7543cc16_6dfc2e05 PS3, Line 62: * \brief Unblock a BTS from BTS setup ramping to allow it to setup and configure. please don't use '\brief', our doxygen config has AUTOBRIEF set https://gerrit.osmocom.org/c/osmo-bsc/+/29788/comment/56554042_3e428810 PS3, Line 77: * \brief Timer callback and called by bts_setup_ramp_deactivate drop \brief and end the line with a period (same below) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id56dde6d58f3d0d20352f6c306598d26345d Gerrit-Change-Number: 29788 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: neels Gerrit-Attention: fixeria Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Mon, 24 Oct 2022 21:52:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment
Change in osmo-bsc[master]: bts_ipaccess_nanobts: remove unused assignment
Attention is currently required from: lynxis lazus. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29786 ) Change subject: bts_ipaccess_nanobts: remove unused assignment .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I thought "RSL Assignment" =) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I811f7c596de42eff250b1882a9e2e7cdece6259d Gerrit-Change-Number: 29786 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Mon, 24 Oct 2022 21:33:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: cosmetic: Clarify and fix typos in comment
Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29859 ) Change subject: cosmetic: Clarify and fix typos in comment .. Patch Set 1: Code-Review+1 (2 comments) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29859/comment/27e26d88_550b9836 PS1, Line 1530: t also add missing ')' https://gerrit.osmocom.org/c/osmo-mgw/+/29859/comment/b5aed591_ef13d30d PS1, Line 1532: * expectation. */ (this comment describes the non-compliant behavior of osmo-mgw; we may soon have to discuss that separately, because this behavior may torpedo proper codec handling in osmo-msc... i created an issue for that: https://osmocom.org/issues/5726 ) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibcbe7d85cf7e1912de73d59540f2dea1dfa5d98d Gerrit-Change-Number: 29859 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 21:29:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode
Attention is currently required from: pespin, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29867 ) Change subject: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode .. Patch Set 2: (2 comments) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29867/comment/78ca37c0_3c2b3d8e PS2, Line 723: * boundaries. This function is used to convert between the two modes */ > Since this function was static before there was not doxygen apidoc added. […] ack, especially if this is now public libosmo-mgcp API File src/libosmo-mgcp/mgcp_osmux.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29867/comment/4971680f_f3bf2a42 PS2, Line 230: /* Osmux implementation works with AMR OA only, make sure we convert to it if needed: */ i would prefer having two patches, 1) the API change to use msgb and 2) adding the conversion to OA The actual conversion to OA seems to be a very short bit that is orthogonal to the rest, reads cluttered -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifeec44241079f7a31da12745c92bfdc4fb222f3a Gerrit-Change-Number: 29867 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: neels Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 24 Oct 2022 20:54:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: Rename s/mgcp_send_rtp/mgcp_rtp_conn_dispatch_rtp/
Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29865 ) Change subject: mgw: Rename s/mgcp_send_rtp/mgcp_rtp_conn_dispatch_rtp/ .. Patch Set 1: Code-Review+1 (2 comments) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29865/comment/9fd3f384_feb19791 PS1, Line 986: rs might as well fix this typo too while at it (and use full line width maybe) https://gerrit.osmocom.org/c/osmo-mgw/+/29865/comment/e1a934e8_c255362e PS1, Line 987: static int mgcp_rtp_conn_dispatch_rtp(struct mgcp_conn_rtp *conn_dst, struct msgb *msg) mgcp_conn_rtp_dispatch_rtp() the struct is called 'mgcp_conn_rtp', we have three functions in the form 'mgcp_conn_rtp_*' matching the struct name, and two mismatching 'mgcp_rtp_conn_*' -- maybe it would be better to stick with a name matching the struct name. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idaf791997b8438a4aede50f614afa0d55ad41faa Gerrit-Change-Number: 29865 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 20:45:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: rx_rtp(): reorder checks and handlings
Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29864 ) Change subject: mgw: rx_rtp(): reorder checks and handlings .. Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/29864/comment/b8296e75_934230b2 PS1, Line 9: Let's first validate the origin of the message, then the content of the (you're using "Let's" regularly, but from https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards : "You should stick to the imperative form -- e.g. "add foo", "fix bar", "drop baz" -- and avoid empty phrasing like "this patch implements". This is shortest to write and, more importantly, most efficient to read for reviewers.") Patchset: PS1: I am missing the point of the patch, can you explain the motivation / the effects in the commit log? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I011a6d7d705768c32a35cec5cd7169725a21a670 Gerrit-Change-Number: 29864 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 20:38:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: reuse mgcp_codec_amr_mode_is_indicated() in mgcp_codec_amr_is_oc...
Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29863 ) Change subject: mgw: reuse mgcp_codec_amr_mode_is_indicated() in mgcp_codec_amr_is_octet_aligned() .. Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: sorry, my firm opinion is to keep the function exactly as it was, it is short enough, and i prefer not mixing it with the weird/obscure aspects of that other function: osmo-mgw should not check whether a fmtp is present, just what the resulting (explicit or implicit) OA setting ends up being. In the long run i'd rather get rid of that other function instead of expanding its use. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4c18510b59fd917ed033393994b21517bf753510 Gerrit-Change-Number: 29863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 20:31:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: AMR->IuUP: log conversion, like for the flipside
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29857 ) Change subject: AMR->IuUP: log conversion, like for the flipside .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I525685a7dedb6d5d1deecbd026844cbe23193fac Gerrit-Change-Number: 29857 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 20:26:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-netif[master]: cosmetic: Fix indentation whitespace
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29866 ) Change subject: cosmetic: Fix indentation whitespace .. cosmetic: Fix indentation whitespace Change-Id: Ia47d30aceee0db30b403575dd696c1bec2dcf271 --- M src/osmux_input.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/src/osmux_input.c b/src/osmux_input.c index 2c18b20..3420e8b 100644 --- a/src/osmux_input.c +++ b/src/osmux_input.c @@ -563,9 +563,9 @@ return 0; default: /* The RTP payload type is dynamically allocated, - * although we use static ones. Assume that we always - * receive AMR traffic. - */ +* although we use static ones. Assume that we always +* receive AMR traffic. +*/ /* Add this RTP to the OSMUX batch */ ret = osmux_batch_add(batch, h->batch_factor, -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia47d30aceee0db30b403575dd696c1bec2dcf271 Gerrit-Change-Number: 29866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-mgw[master]: Rename and move func checking if amr mode is explicitly configured
Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29861 ) Change subject: Rename and move func checking if amr mode is explicitly configured .. Patch Set 1: Code-Review-1 (1 comment) File include/osmocom/mgcp/mgcp_codec.h: https://gerrit.osmocom.org/c/osmo-mgw/+/29861/comment/4250393c_ba999f4d PS1, Line 20: bool mgcp_codec_amr_mode_is_indicated(const struct mgcp_rtp_codec *codec); problems: - term 'mode' in the spec refers to the AMR modes 4k75 .. 12k2. So the naming 'mode is indicated' would mean that a 'mode-set' fmtp is present, not 'octet-align'. Not sure what term is non-ambiguous for OA vs BE. Maybe 'amr_align_is_indicated'? - per spec, the lack of an 'octet-align' fmtp implies octet-align=0. So it is wrong to even look whether a parameter is present or not, we should (TM) only work with the resulting alignment value. Of course that's a problem when osmo-bsc and osmo-msc always fail to send the octet-align=1 fmtp in their MGCP even though we basically always deal with AMR OA. Is it worth changing this non-compliant code instead of replacing it with the correct behvior? If we have to do some legacy compatibility, the non-compliant behavior deserves loud code comments? - why is this function changing from static to listed in a header file? I oppose that because the function's usefulness is obscure and it should never have been written. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8dce3038ebccf5e1e37e2908070a67d66693a96f Gerrit-Change-Number: 29861 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 20:23:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: Log unexpected RTP AMR OA-vs-BE payload
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29860 ) Change subject: mgw: Log unexpected RTP AMR OA-vs-BE payload .. Patch Set 1: (1 comment) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29860/comment/15a60eb1_a80d9aca PS1, Line 1541: " Check your config!\n", > i'd drop "Check your config!", because it is confusing. […] I prefer keeping it, since it really shows some sort of misconfiguration somewhere. The log is not saying that the user should check "osmo-mgw.cfg". -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5ae82c01153398491b21191a8cec9969337bbbc Gerrit-Change-Number: 29860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 20:14:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: Log unexpected RTP AMR OA-vs-BE payload
Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29860 ) Change subject: mgw: Log unexpected RTP AMR OA-vs-BE payload .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5ae82c01153398491b21191a8cec9969337bbbc Gerrit-Change-Number: 29860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 20:02:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Rework tbf::update_ms()
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29846 ) Change subject: Rework tbf::update_ms() .. Patch Set 3: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/29846/comment/99a28336_988abcca PS3, Line 18: practive practice? (it would have been easier to read this text if there was an empty line between paragraphs) File src/gprs_ms_storage.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/29846/comment/97cec518_06c7ea83 PS3, Line 112: " No newline at end of revision file. " -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1b7c0fde15b9bb8a973068994dbe972285ad0aff Gerrit-Change-Number: 29846 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:55:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: Log unexpected RTP AMR OA-vs-BE payload
Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29860 ) Change subject: mgw: Log unexpected RTP AMR OA-vs-BE payload .. Patch Set 1: (1 comment) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29860/comment/504d27ec_b465ca64 PS1, Line 1541: " Check your config!\n", i'd drop "Check your config!", because it is confusing. As a user reading this i would expect that i need to adjust some osmo-mgw.cfg item to fix it, but instead OA vs BE is decided by the MGCP client, and may not originate from a particular config at all, but e.g. from SDP received from a remote entity. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5ae82c01153398491b21191a8cec9969337bbbc Gerrit-Change-Number: 29860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:45:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: allow subsequent TRXCON_EV_FULL_POWER_SCAN_REQ
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/29850 )
Change subject: trxcon: allow subsequent TRXCON_EV_FULL_POWER_SCAN_REQ
..
trxcon: allow subsequent TRXCON_EV_FULL_POWER_SCAN_REQ
The remote L1CTL peer may send another L1CTL_PM_REQ message right
after getting L1CTL_PM_CONF from us. Handle this properly.
Change-Id: I8e5fd778467567e8ca69ed420b9815073daa7e16
---
M src/host/trxcon/src/trxcon_fsm.c
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
laforge: Looks good to me, approved
msuraev: Looks good to me, but someone else must approve
diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c
index 4116291..59a29d9 100644
--- a/src/host/trxcon/src/trxcon_fsm.c
+++ b/src/host/trxcon/src/trxcon_fsm.c
@@ -175,6 +175,13 @@
l1ctl_tx_pm_conf(trxcon->l2if, res->band_arfcn, res->dbm,
res->last_result);
break;
}
+ case TRXCON_EV_FULL_POWER_SCAN_REQ:
+ {
+ const struct trxcon_param_full_power_scan_req *req = data;
+
+ trx_if_cmd_measure(trxcon->phyif, req->band_arfcn_start,
req->band_arfcn_stop);
+ break;
+ }
default:
OSMO_ASSERT(0);
}
@@ -479,7 +486,8 @@
[TRXCON_ST_FULL_POWER_SCAN] = {
.name = "FULL_POWER_SCAN",
.out_state_mask = S(TRXCON_ST_RESET),
- .in_event_mask = S(TRXCON_EV_FULL_POWER_SCAN_RES),
+ .in_event_mask = S(TRXCON_EV_FULL_POWER_SCAN_RES)
+ | S(TRXCON_EV_FULL_POWER_SCAN_REQ),
.action = &trxcon_st_full_power_scan_action,
},
[TRXCON_ST_FBSB_SEARCH] = {
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29850
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I8e5fd778467567e8ca69ed420b9815073daa7e16
Gerrit-Change-Number: 29850
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: msuraev
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmocom-bb[master]: Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore"
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/29852 )
Change subject: Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from
libosmocore"
..
Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore"
This reverts commit c5d9507b5ddd04d4ac14dc009b6df20c3098e2cc.
Using osmo_ubit2sbit() was a bad idea because this function treats
the input buffer as ubits (while we deal with usbits) and produces
absolute sbit values: either 127 or -127. This is wrong, because
all intermediate usbit values are getting converted to -127.
This bug remained unnoticed so far because trxcon is mostly used in
combination with fake_trx.py, a virtual Um interface which simulates
ideal RF conditions by default and feeds trxcon with 'perfect' bits.
Change-Id: I3a32da19c9f419d51d55b301461ce28ce11b2249
---
M src/host/trxcon/src/trx_if.c
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c
index 7b1ca99..6f225ee 100644
--- a/src/host/trxcon/src/trx_if.c
+++ b/src/host/trxcon/src/trx_if.c
@@ -621,7 +621,12 @@
toa256 = ((int16_t) (buf[6] << 8) | buf[7]);
/* Copy and convert bits {254..0} to sbits {-127..127} */
- osmo_ubit2sbit(bits, buf + 8, 148);
+ for (unsigned int i = 0; i < 148; i++) {
+ if (buf[8 + i] == 255)
+ bits[i] = -127;
+ else
+ bits[i] = 127 - buf[8 + i];
+ }
if (tn >= 8) {
LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal TS %d\n", tn);
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29852
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I3a32da19c9f419d51d55b301461ce28ce11b2249
Gerrit-Change-Number: 29852
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmocom-bb[master]: trxcon: give L1CTL API direct access to trxcon_fsm
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/29849 )
Change subject: trxcon: give L1CTL API direct access to trxcon_fsm
..
trxcon: give L1CTL API direct access to trxcon_fsm
The L1CTL interface logic currently gets access to the trxcon_fsm
via an associated struct trxcon_inst. No other fields are used,
so we can pass trxcon->fi directly. All communication shall be
done via the FSM anyway.
Change-Id: I5a15a676ce3917d2eddc44f1143cea8d3cd8781f
---
M src/host/trxcon/src/l1ctl.c
M src/host/trxcon/src/trxcon.c
2 files changed, 72 insertions(+), 72 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
msuraev: Looks good to me, but someone else must approve
diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c
index a321e37..5f1e610 100644
--- a/src/host/trxcon/src/l1ctl.c
+++ b/src/host/trxcon/src/l1ctl.c
@@ -80,7 +80,7 @@
int l1ctl_tx_pm_conf(struct l1ctl_client *l1c, uint16_t band_arfcn,
int dbm, int last)
{
- struct trxcon_inst *trxcon = l1c->priv;
+ struct osmo_fsm_inst *fi = l1c->priv;
struct l1ctl_pm_conf *pmc;
struct msgb *msg;
@@ -88,7 +88,7 @@
if (!msg)
return -ENOMEM;
- LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG,
+ LOGPFSMSL(fi, DL1C, LOGL_DEBUG,
"Send PM Conf (%s %d = %d dBm)\n",
arfcn2band_name(band_arfcn),
band_arfcn & ~ARFCN_FLAG_MASK, dbm);
@@ -108,7 +108,7 @@
int l1ctl_tx_reset_ind(struct l1ctl_client *l1c, uint8_t type)
{
- struct trxcon_inst *trxcon = l1c->priv;
+ struct osmo_fsm_inst *fi = l1c->priv;
struct msgb *msg;
struct l1ctl_reset *res;
@@ -116,7 +116,7 @@
if (!msg)
return -ENOMEM;
- LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send Reset Ind (%u)\n", type);
+ LOGPFSMSL(fi, DL1C, LOGL_DEBUG, "Send Reset Ind (%u)\n", type);
res = (struct l1ctl_reset *) msgb_put(msg, sizeof(*res));
res->type = type;
@@ -126,7 +126,7 @@
int l1ctl_tx_reset_conf(struct l1ctl_client *l1c, uint8_t type)
{
- struct trxcon_inst *trxcon = l1c->priv;
+ struct osmo_fsm_inst *fi = l1c->priv;
struct msgb *msg;
struct l1ctl_reset *res;
@@ -134,7 +134,7 @@
if (!msg)
return -ENOMEM;
- LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send Reset Conf (%u)\n", type);
+ LOGPFSMSL(fi, DL1C, LOGL_DEBUG, "Send Reset Conf (%u)\n", type);
res = (struct l1ctl_reset *) msgb_put(msg, sizeof(*res));
res->type = type;
@@ -168,7 +168,7 @@
int l1ctl_tx_fbsb_fail(struct l1ctl_client *l1c, uint16_t band_arfcn)
{
- struct trxcon_inst *trxcon = l1c->priv;
+ struct osmo_fsm_inst *fi = l1c->priv;
struct l1ctl_info_dl *dl;
struct msgb *msg;
@@ -183,14 +183,14 @@
fbsb_conf_make(msg, 255, 0);
- LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send FBSB Conf (timeout)\n");
+ LOGPFSMSL(fi, DL1C, LOGL_DEBUG, "Send FBSB Conf (timeout)\n");
return l1ctl_client_send(l1c, msg);
}
int l1ctl_tx_fbsb_conf(struct l1ctl_client *l1c, uint16_t band_arfcn, uint8_t
bsic)
{
- struct trxcon_inst *trxcon = l1c->priv;
+ struct osmo_fsm_inst *fi = l1c->priv;
struct l1ctl_fbsb_conf *conf;
struct l1ctl_info_dl *dl;
struct msgb *msg;
@@ -209,7 +209,7 @@
/* FIXME: set proper value */
conf->initial_freq_err = 0;
- LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG,
+ LOGPFSMSL(fi, DL1C, LOGL_DEBUG,
"Send FBSB Conf (result=%u, bsic=%u)\n",
conf->result, conf->bsic);
@@ -320,13 +320,13 @@
static int l1ctl_rx_fbsb_req(struct l1ctl_client *l1c, struct msgb *msg)
{
- struct trxcon_inst *trxcon = l1c->priv;
+ struct osmo_fsm_inst *fi = l1c->priv;
struct l1ctl_fbsb_req *fbsb;
int rc = 0;
fbsb = (struct l1ctl_fbsb_req *) msg->l1h;
if (msgb_l1len(msg) < sizeof(*fbsb)) {
- LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR,
+ LOGPFSMSL(fi, DL1C, LOGL_ERROR,
"MSG too short FBSB Req: %u\n",
msgb_l1len(msg));
rc = -EINVAL;
@@ -339,13 +339,13 @@
.band_arfcn = ntohs(fbsb->band_arfcn),
};
- LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE,
+ LOGPFSMSL(fi, DL1C, LOGL_NOTICE,
"Received FBSB request (%s %d, timeout %u ms)\n",
arfcn2band_name(req.band_arfcn),
req.band_arfcn & ~ARFCN_FLAG_MASK,
req.timeout_ms);
- osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_FBSB_SEARCH_REQ, &req);
+ osmo_fsm_inst_dispatch(fi, TRXCON_EV_FBSB_SEARCH_REQ, &req);
Change in osmocom-bb[master]: trxcon: gracefully exit on receipt of SIGTERM
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/29847 )
Change subject: trxcon: gracefully exit on receipt of SIGTERM
..
trxcon: gracefully exit on receipt of SIGTERM
Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0
---
M src/host/trxcon/src/trxcon.c
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c
index 7e12e3b..605 100644
--- a/src/host/trxcon/src/trxcon.c
+++ b/src/host/trxcon/src/trxcon.c
@@ -429,6 +429,7 @@
switch (signum) {
case SIGINT:
+ case SIGTERM:
app_data.quit++;
break;
case SIGABRT:
@@ -469,6 +470,7 @@
/* Setup signal handlers */
signal(SIGINT, &signal_handler);
+ signal(SIGTERM, &signal_handler);
signal(SIGABRT, &signal_handler);
signal(SIGUSR1, &signal_handler);
signal(SIGUSR2, &signal_handler);
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0
Gerrit-Change-Number: 29847
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: msuraev
Gerrit-Reviewer: pespin
Gerrit-CC: laforge
Gerrit-MessageType: merged
Change in osmocom-bb[master]: trxcon: give L1CTL API direct access to trxcon_fsm
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29849 ) Change subject: trxcon: give L1CTL API direct access to trxcon_fsm .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5a15a676ce3917d2eddc44f1143cea8d3cd8781f Gerrit-Change-Number: 29849 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:35:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: gracefully exit on receipt of SIGTERM
Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29847 ) Change subject: trxcon: gracefully exit on receipt of SIGTERM .. Patch Set 3: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/29847/comment/02d8c598_f7e1b55c PS2, Line 7: grecefully > gracefully Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0 Gerrit-Change-Number: 29847 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 24 Oct 2022 19:35:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-mgw[master]: AMR->IuUP: do not crash on AMR data before IuUP Init
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29853 ) Change subject: AMR->IuUP: do not crash on AMR data before IuUP Init .. Patch Set 2: (1 comment) File src/libosmo-mgcp/mgcp_iuup.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-404): https://gerrit.osmocom.org/c/osmo-mgw/+/29853/comment/9439c800_921885e0 PS2, Line 102: /* No IuUP Initialization has occured on the IuUP side yet. Return error and drop the RTP data, until 'occured' may be misspelled - perhaps 'occurred'? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 Gerrit-Change-Number: 29853 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:34:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: IuUP->AMR: log whether converting to AMR OA or BE
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29856 )
Change subject: IuUP->AMR: log whether converting to AMR OA or BE
..
IuUP->AMR: log whether converting to AMR OA or BE
Enhance the existing log message
Convert IuUP -> AMR:...
to
Convert IuUP -> AMR OA:...
(or BE) to show wether emitting Octet-Aligned or Bandwidth-Efficient.
Related: SYS#5092
Change-Id: I3672d01d2879ae8820176a46454f26a4f5f584de
---
M src/libosmo-mgcp/mgcp_iuup.c
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c
index c84b971..95487fc 100644
--- a/src/libosmo-mgcp/mgcp_iuup.c
+++ b/src/libosmo-mgcp/mgcp_iuup.c
@@ -274,9 +274,9 @@
return ft;
}
msgb_pull_to_l3(msg);
- LOGP(DLMGCP, LOGL_DEBUG, "Convert IuUP -> AMR: ft %d, len %d\n", ft,
msgb_l3len(msg));
if (mgcp_codec_amr_is_octet_aligned(conn_rtp_dst->end.codec)) {
+ LOGP(DLMGCP, LOGL_DEBUG, "Convert IuUP -> AMR OA: ft %d, len
%d\n", ft, msgb_length(msg));
amr_hdr = (struct amr_hdr *) msgb_push(msg, sizeof(struct
amr_hdr));
amr_hdr->cmr = 15; /* no change */
amr_hdr->f = 0;
@@ -295,6 +295,7 @@
amr_data[1] |= ((ft & 0x1) << 7) | (((!fqc) & 0x1) << 6);
amr_length = (osmo_amr_bits(ft) + 10 + 7) / 8;
msgb_trim(msg, amr_length);
+ LOGP(DLMGCP, LOGL_DEBUG, "Convert IuUP -> AMR BE: ft %d, len
%zd\n", ft, amr_length);
}
rtp_hdr = (struct rtp_hdr *) msgb_push(msg, sizeof(*rtp_hdr));
*rtp_hdr = (struct rtp_hdr){
null--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29856
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I3672d01d2879ae8820176a46454f26a4f5f584de
Gerrit-Change-Number: 29856
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-mgw[master]: IuUP->AMR: do not patch payload type a second time
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29855 )
Change subject: IuUP->AMR: do not patch payload type a second time
..
IuUP->AMR: do not patch payload type a second time
When converting IuUP to AMR/RTP, bridge_iuup_to_rtp_peer() sets the AMR
side's payload type number and then calls mgcp_send(). In mgcp_send(),
do not attempt to patch the payload type number a second time.
In mgcp_send(), skip patching payload type numbers if the source side is
IuUP. This matches exactly the case of converting IuUP to AMR/RTP.
There already is a check for IuUP, but for the wrong side. Drop that one
and explain in a comment why.
Move the comment about transcoding into the failure branch, where it is
relevant and doesn't clutter the new explanation of payload type
patching conditions.
Related: OS#5720
Related: SYS#5092
Change-Id: I7c722cd959f76bd104ae4941d182c77e5c025867
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 13 insertions(+), 9 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
laforge: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index bb8cfa3..29c0dc2 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -1160,17 +1160,21 @@
else
LOGPENDP(endp, DRTP, LOGL_DEBUG, "delivering RTCP packet...\n");
- /* FIXME: It is legal that the payload type on the egress connection is
-* different from the payload type that has been negotiated on the
-* ingress connection. Essentially the codecs are the same so we can
-* match them and patch the payload type. However, if we can not find
-* the codec pendant (everything ist equal except the PT), we are of
-* course unable to patch the payload type. A situation like this
-* should not occur if transcoding is consequently avoided. Until
-* we have transcoding support in osmo-mgw we can not resolve this. */
- if (is_rtp && !mgcp_conn_rtp_is_iuup(conn_dst)) {
+ /* Patch the payload type number: translate from conn_src to conn_dst.
+* Do not patch for IuUP, where the correct payload type number is
already set in bridge_iuup_to_rtp_peer():
+* IuUP -> AMR: calls this function, skip patching if conn_src is IuUP.
+* {AMR or IuUP} -> IuUP: calls mgcp_udp_send() directly, skipping this
function: No need to examine dst. */
+ if (is_rtp && !mgcp_conn_rtp_is_iuup(conn_src)) {
rc = mgcp_patch_pt(conn_src, conn_dst, msg);
if (rc < 0) {
+ /* FIXME: It is legal that the payload type on the
egress connection is
+* different from the payload type that has been
negotiated on the
+* ingress connection. Essentially the codecs are the
same so we can
+* match them and patch the payload type. However, if
we can not find
+* the codec pendant (everything ist equal except the
PT), we are of
+* course unable to patch the payload type. A situation
like this
+* should not occur if transcoding is consequently
avoided. Until
+* we have transcoding support in osmo-mgw we can not
resolve this. */
LOGPENDP(endp, DRTP, LOGL_DEBUG,
"can not patch PT because no suitable egress
codec was found.\n");
}
null--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29855
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I7c722cd959f76bd104ae4941d182c77e5c025867
Gerrit-Change-Number: 29855
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-mgw[master]: AMR->IuUP: properly translate Q -> FQC
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29854 )
Change subject: AMR->IuUP: properly translate Q -> FQC
..
AMR->IuUP: properly translate Q -> FQC
Fix the reversed logic when composing IuUP.FQC:
AMR.Q == 1 means the frame is good.
Without this fix, all frames on IuUP are marked as bad, and no voice is
heard on the IuUP side.
Related: SYS#5092
Change-Id: I29878dd27af9ba0c9e600324c528b22940cdcc30
---
M src/libosmo-mgcp/mgcp_iuup.c
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
laforge: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c
index 15d674d..c84b971 100644
--- a/src/libosmo-mgcp/mgcp_iuup.c
+++ b/src/libosmo-mgcp/mgcp_iuup.c
@@ -679,12 +679,13 @@
LOG_CONN_RTP(conn_dest_rtp, LOGL_NOTICE, "Bridge
RTP=>IuUP: No RFCI found for AMR OA ft=%u\n", amr_hdr->ft);
goto free_ret;
}
- irp->u.data.fqc = amr_hdr->q;
+ irp->u.data.fqc = amr_hdr->q ? IUUP_FQC_FRAME_GOOD :
IUUP_FQC_FRAME_BAD;
irp->u.data.rfci = rfci;
msgb_pull(msg, 2);
} else {
uint8_t *amr_bwe_hdr = (uint8_t *) msgb_data(msg);
int8_t ft;
+ uint8_t q;
if (msgb_length(msg) < 2) {
LOG_CONN_RTP(conn_src_rtp, LOGL_NOTICE,
"Bridge RTP=>IuUP: too short for AMR BE
hdr (%u)\n", msgb_length(msg));
@@ -699,7 +700,8 @@
LOG_CONN_RTP(conn_dest_rtp, LOGL_NOTICE, "Bridge
RTP=>IuUP: No RFCI found for AMR BE ft=%u\n", ft);
goto free_ret;
}
- irp->u.data.fqc = ((amr_bwe_hdr[1] & 0x40) >> 6);
+ q = amr_bwe_hdr[1] & 0x40;
+ irp->u.data.fqc = q ? IUUP_FQC_FRAME_GOOD : IUUP_FQC_FRAME_BAD;
irp->u.data.rfci = rfci;
rc = iuup_length = osmo_amr_bwe_to_iuup(msgb_data(msg),
msgb_length(msg));
if (rc < 0) {
null--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29854
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I29878dd27af9ba0c9e600324c528b22940cdcc30
Gerrit-Change-Number: 29854
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-mgw[master]: AMR->IuUP: do not crash on AMR data before IuUP Init
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29853 )
Change subject: AMR->IuUP: do not crash on AMR data before IuUP Init
..
AMR->IuUP: do not crash on AMR data before IuUP Init
When translating AMR to IuUP, when AMR data arrives before the IuUP side
has negotiated an IuUP Initialization, do not crash osmo-mgw, but return
failure and drop the AMR packet.
As soon as IuUP Initialization occured and RFCIs are defined, the AMR
starts to pass through to the IuUP side.
Related: SYS#5092
Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934
---
M src/libosmo-mgcp/mgcp_iuup.c
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c
index 90021f3..15d674d 100644
--- a/src/libosmo-mgcp/mgcp_iuup.c
+++ b/src/libosmo-mgcp/mgcp_iuup.c
@@ -98,7 +98,11 @@
uint8_t rfci_cnt = 0;
unsigned match_bytes = (unsigned)osmo_amr_bytes(ft);
struct osmo_iuup_rnl_prim *irp = conn_rtp->iuup.init_ind;
- OSMO_ASSERT(irp);
+ if (!irp) {
+ /* No IuUP Initialization has occured on the IuUP side yet.
Return error and drop the RTP data, until
+* the IuUP Initialization has configured the link. */
+ return -1;
+ }
/* TODO: cache this somehow */
for (i = 0; i < ARRAY_SIZE(irp->u.status.u.initialization.rfci); i++) {
null--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934
Gerrit-Change-Number: 29853
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-mgw[master]: AMR->IuUP: do not crash on AMR data before IuUP Init
Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 to look at the new patch set (#2). Change subject: AMR->IuUP: do not crash on AMR data before IuUP Init .. AMR->IuUP: do not crash on AMR data before IuUP Init When translating AMR to IuUP, when AMR data arrives before the IuUP side has negotiated an IuUP Initialization, do not crash osmo-mgw, but return failure and drop the AMR packet. As soon as IuUP Initialization occured and RFCIs are defined, the AMR starts to pass through to the IuUP side. Related: SYS#5092 Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/53/29853/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 Gerrit-Change-Number: 29853 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-MessageType: newpatchset
Change in osmo-mgw[master]: AMR->IuUP: log conversion, like for the flipside
Attention is currently required from: neels. Hello Jenkins Builder, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29857 to look at the new patch set (#2). Change subject: AMR->IuUP: log conversion, like for the flipside .. AMR->IuUP: log conversion, like for the flipside For IuUP -> AMR, we log a message like Convert IuUP -> AMR OA:... Do the same for the direction AMR -> IuUP. Related: SYS#5092 Change-Id: I525685a7dedb6d5d1deecbd026844cbe23193fac --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/29857/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I525685a7dedb6d5d1deecbd026844cbe23193fac Gerrit-Change-Number: 29857 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: trxcon: gracefully exit on receipt of SIGTERM
Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847 to look at the new patch set (#3). Change subject: trxcon: gracefully exit on receipt of SIGTERM .. trxcon: gracefully exit on receipt of SIGTERM Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0 --- M src/host/trxcon/src/trxcon.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/29847/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0 Gerrit-Change-Number: 29847 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: trxcon: allow subsequent TRXCON_EV_FULL_POWER_SCAN_REQ
Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/29850 to look at the new patch set (#3). Change subject: trxcon: allow subsequent TRXCON_EV_FULL_POWER_SCAN_REQ .. trxcon: allow subsequent TRXCON_EV_FULL_POWER_SCAN_REQ The remote L1CTL peer may send another L1CTL_PM_REQ message right after getting L1CTL_PM_CONF from us. Handle this properly. Change-Id: I8e5fd778467567e8ca69ed420b9815073daa7e16 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/29850/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8e5fd778467567e8ca69ed420b9815073daa7e16 Gerrit-Change-Number: 29850 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore"
Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/29852 to look at the new patch set (#3). Change subject: Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore" .. Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore" This reverts commit c5d9507b5ddd04d4ac14dc009b6df20c3098e2cc. Using osmo_ubit2sbit() was a bad idea because this function treats the input buffer as ubits (while we deal with usbits) and produces absolute sbit values: either 127 or -127. This is wrong, because all intermediate usbit values are getting converted to -127. This bug remained unnoticed so far because trxcon is mostly used in combination with fake_trx.py, a virtual Um interface which simulates ideal RF conditions by default and feeds trxcon with 'perfect' bits. Change-Id: I3a32da19c9f419d51d55b301461ce28ce11b2249 --- M src/host/trxcon/src/trx_if.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/52/29852/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a32da19c9f419d51d55b301461ce28ce11b2249 Gerrit-Change-Number: 29852 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: trxcon: give L1CTL API direct access to trxcon_fsm
Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/29849 to look at the new patch set (#3). Change subject: trxcon: give L1CTL API direct access to trxcon_fsm .. trxcon: give L1CTL API direct access to trxcon_fsm The L1CTL interface logic currently gets access to the trxcon_fsm via an associated struct trxcon_inst. No other fields are used, so we can pass trxcon->fi directly. All communication shall be done via the FSM anyway. Change-Id: I5a15a676ce3917d2eddc44f1143cea8d3cd8781f --- M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c 2 files changed, 72 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/29849/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5a15a676ce3917d2eddc44f1143cea8d3cd8781f Gerrit-Change-Number: 29849 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
Change in osmo-mgw[master]: mgw: Log unexpected RTP AMR OA-vs-BE payload
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29860 ) Change subject: mgw: Log unexpected RTP AMR OA-vs-BE payload .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5ae82c01153398491b21191a8cec9969337bbbc Gerrit-Change-Number: 29860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:17:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: reuse mgcp_codec_amr_mode_is_indicated() in mgcp_codec_amr_is_oc...
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29863 ) Change subject: mgw: reuse mgcp_codec_amr_mode_is_indicated() in mgcp_codec_amr_is_octet_aligned() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4c18510b59fd917ed033393994b21517bf753510 Gerrit-Change-Number: 29863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:16:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: rx_rtp(): reorder checks and handlings
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29864 ) Change subject: mgw: rx_rtp(): reorder checks and handlings .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: This makes sense. When there are packets from the wrong origin then the watchdog gets not kicked and the endpoint is eventually cleared. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I011a6d7d705768c32a35cec5cd7169725a21a670 Gerrit-Change-Number: 29864 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:16:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: Rename s/mgcp_send_rtp/mgcp_rtp_conn_dispatch_rtp/
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29865 ) Change subject: mgw: Rename s/mgcp_send_rtp/mgcp_rtp_conn_dispatch_rtp/ .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idaf791997b8438a4aede50f614afa0d55ad41faa Gerrit-Change-Number: 29865 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:14:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29867 ) Change subject: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode .. Patch Set 2: Code-Review+1 (2 comments) Patchset: PS2: I didn't try it out, but it looks technically ok to me. File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29867/comment/0fd0ba11_bb9a7100 PS2, Line 723: * boundaries. This function is used to convert between the two modes */ Since this function was static before there was not doxygen apidoc added. Maybe you can add Apidoc now so that it is uniform. Maybe its also good to prefix the function with mgcp_ so that it is like the other functions in this file. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifeec44241079f7a31da12745c92bfdc4fb222f3a Gerrit-Change-Number: 29867 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:13:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-netif[master]: cosmetic: Fix indentation whitespace
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29866 ) Change subject: cosmetic: Fix indentation whitespace .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia47d30aceee0db30b403575dd696c1bec2dcf271 Gerrit-Change-Number: 29866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 19:04:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: configure.ac: set -std=gnu11
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29851 ) Change subject: trxcon: configure.ac: set -std=gnu11 .. trxcon: configure.ac: set -std=gnu11 The majority of Osmocom projects require -std=gnu11, and so we do. Change-Id: Ia22adb18ea34690ef8e46dbf02308cbb1541a7ee --- M src/host/trxcon/configure.ac 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/configure.ac b/src/host/trxcon/configure.ac index f645991..46991a2 100644 --- a/src/host/trxcon/configure.ac +++ b/src/host/trxcon/configure.ac @@ -3,6 +3,8 @@ AM_INIT_AUTOMAKE LT_INIT +CFLAGS="$CFLAGS -std=gnu11" + dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia22adb18ea34690ef8e46dbf02308cbb1541a7ee Gerrit-Change-Number: 29851 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-mgw[master]: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode
Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29867 to look at the new patch set (#2). Change subject: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode .. osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode The Osmux implementation in libosmo-netif expects to work with RTP AMR in octet-aligned mode. Therefore, if the peer connection received RTP AMR in bandwidth-efficient mode, we need to convert it to octet-aligned before feeding the packets to the osmux layer. Related: SYS#6161 Change-Id: Ifeec44241079f7a31da12745c92bfdc4fb222f3a --- M include/osmocom/mgcp/mgcp_network.h M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c 4 files changed, 18 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/67/29867/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifeec44241079f7a31da12745c92bfdc4fb222f3a Gerrit-Change-Number: 29867 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
Change in osmo-mgw[master]: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29867 ) Change subject: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode .. Patch Set 1: (1 comment) File src/libosmo-mgcp/mgcp_osmux.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-398): https://gerrit.osmocom.org/c/osmo-mgw/+/29867/comment/faa83a06_4cca9540 PS1, Line 229: memcpy(msg2->data, (char*)msgb_data(msg), msgb_length(msg)); "(foo*)" should be "(foo *)" -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifeec44241079f7a31da12745c92bfdc4fb222f3a Gerrit-Change-Number: 29867 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 24 Oct 2022 16:33:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29867 )
Change subject: osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode
..
osmux: Make sure RTP AMR feed to osmux is in octet-aligned mode
The Osmux implementation in libosmo-netif expects to work with RTP AMR
in octet-aligned mode. Therefore, if the peer connection received RTP
AMR in bandwidth-efficient mode, we need to convert it to octet-aligned
before feeding the packets to the osmux layer.
Related: SYS#6161
Change-Id: Ifeec44241079f7a31da12745c92bfdc4fb222f3a
---
M include/osmocom/mgcp/mgcp_network.h
M include/osmocom/mgcp/osmux.h
M src/libosmo-mgcp/mgcp_network.c
M src/libosmo-mgcp/mgcp_osmux.c
4 files changed, 20 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/67/29867/1
diff --git a/include/osmocom/mgcp/mgcp_network.h
b/include/osmocom/mgcp/mgcp_network.h
index a3d57f0..e95907d 100644
--- a/include/osmocom/mgcp/mgcp_network.h
+++ b/include/osmocom/mgcp/mgcp_network.h
@@ -183,3 +183,5 @@
int id);
void forward_data_tap(int fd, struct mgcp_rtp_tap *tap, struct msgb *msg);
uint32_t mgcp_get_current_ts(unsigned codec_rate);
+
+int amr_oa_bwe_convert(struct mgcp_endpoint *endp, struct msgb *msg, bool
target_is_oa);
diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h
index 044a33f..4ea6da7 100644
--- a/include/osmocom/mgcp/osmux.h
+++ b/include/osmocom/mgcp/osmux.h
@@ -15,7 +15,7 @@
int conn_osmux_enable(struct mgcp_conn_rtp *conn);
void conn_osmux_disable(struct mgcp_conn_rtp *conn);
int conn_osmux_event_rx_crcx_mdcx(struct mgcp_conn_rtp *conn);
-int osmux_xfrm_to_osmux(char *buf, int buf_len, struct mgcp_conn_rtp *conn);
+int conn_osmux_send_rtp(struct mgcp_conn_rtp *conn, struct msgb *msg);
int osmux_send_dummy(struct mgcp_conn_rtp *conn);
void osmux_cid_pool_get(uint8_t osmux_cid);
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 960b496..b4599f2 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -721,7 +721,7 @@
* efficient encoding scheme where all fields are packed together one after
* another and an octet aligned mode where all fields are aligned to octet
* boundaries. This function is used to convert between the two modes */
-static int amr_oa_bwe_convert(struct mgcp_endpoint *endp, struct msgb *msg,
+int amr_oa_bwe_convert(struct mgcp_endpoint *endp, struct msgb *msg,
bool target_is_oa)
{
/* NOTE: the msgb has an allocated length of RTP_BUF_SIZE, so there is
@@ -1013,7 +1013,7 @@
LOGPENDP(endp, DRTP, LOGL_DEBUG,
"endpoint type is MGCP_RTP_OSMUX, "
"using osmux_xfrm_to_osmux() to forward data through
OSMUX\n");
- return osmux_xfrm_to_osmux((char*)msgb_data(msg),
msgb_length(msg), conn_dst);
+ return conn_osmux_send_rtp(conn_dst, msg);
case MGCP_RTP_IUUP:
if (proto == MGCP_PROTO_RTP) {
LOGPENDP(endp, DRTP, LOGL_DEBUG,
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 0fd1ba7..4e58452 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -205,10 +205,10 @@
* \param[in] buf_len length of rtp data
* \param[in] conn associated RTP connection
* \returns 0 on success, -1 on ERROR */
-int osmux_xfrm_to_osmux(char *buf, int buf_len, struct mgcp_conn_rtp *conn)
+int conn_osmux_send_rtp(struct mgcp_conn_rtp *conn, struct msgb *msg)
{
int ret;
- struct msgb *msg;
+ struct msgb *msg2;
if (!conn->end.output_enabled) {
rtpconn_osmux_rate_ctr_inc(conn,
OSMUX_RTP_PACKETS_TX_DROPPED_CTR);
@@ -222,14 +222,21 @@
return -1;
}
- msg = msgb_alloc(4096, "RTP");
- if (!msg)
+ /* msg is not owned by us and will be freed by the caller stack upon
return: */
+ msg2 = msgb_alloc(4096, "RTP");
+ if (!msg2)
return -1;
+ memcpy(msg2->data, (char*)msgb_data(msg), msgb_length(msg));
+ msgb_put(msg2, msgb_length(msg));
- memcpy(msg->data, buf, buf_len);
- msgb_put(msg, buf_len);
+ /* Osmux implementation works with AMR OA only, make sure we convert to
it if needed: */
+ if (amr_oa_bwe_convert(conn->conn->endp, msg2, true) < 0) {
+ LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR,
+"Error converting to AMR octet-aligned mode\n");
+ return -1;
+ }
- while ((ret = osmux_xfrm_input(conn->osmux.in, msg,
conn->osmux.remote_cid)) > 0) {
+ while ((ret = osmux_xfrm_input(conn->osmux.in, msg2,
conn->osmux.remote_cid)) > 0) {
/* batch full, build and deliver it */
osmux_xfrm_input_deliv
Change in libosmo-netif[master]: cosmetic: Fix indentation whitespace
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29866 ) Change subject: cosmetic: Fix indentation whitespace .. cosmetic: Fix indentation whitespace Change-Id: Ia47d30aceee0db30b403575dd696c1bec2dcf271 --- M src/osmux_input.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/66/29866/1 diff --git a/src/osmux_input.c b/src/osmux_input.c index 2c18b20..3420e8b 100644 --- a/src/osmux_input.c +++ b/src/osmux_input.c @@ -563,9 +563,9 @@ return 0; default: /* The RTP payload type is dynamically allocated, - * although we use static ones. Assume that we always - * receive AMR traffic. - */ +* although we use static ones. Assume that we always +* receive AMR traffic. +*/ /* Add this RTP to the OSMUX batch */ ret = osmux_batch_add(batch, h->batch_factor, -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia47d30aceee0db30b403575dd696c1bec2dcf271 Gerrit-Change-Number: 29866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-mgw[master]: mgw: Rename s/mgcp_send_rtp/mgcp_rtp_conn_dispatch_rtp/
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29865 )
Change subject: mgw: Rename s/mgcp_send_rtp/mgcp_rtp_conn_dispatch_rtp/
..
mgw: Rename s/mgcp_send_rtp/mgcp_rtp_conn_dispatch_rtp/
The previous name is misleading since the function is not really sending
stuff over a socket, but rather handling/dispatching the incoming
message internally (and finally later it may be sent over a socket under
some conditions).
Change-Id: Idaf791997b8438a4aede50f614afa0d55ad41faa
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/29865/1
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 2a4a4eb..960b496 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -983,8 +983,8 @@
}
/* Send RTP data. Possible options are standard RTP packet
- * transmission or trsmission via an osmux connection */
-static int mgcp_send_rtp(struct mgcp_conn_rtp *conn_dst, struct msgb *msg)
+ * transmission, transmission via IuUP or trsmission via an osmux connection */
+static int mgcp_rtp_conn_dispatch_rtp(struct mgcp_conn_rtp *conn_dst, struct
msgb *msg)
{
struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg);
enum rtp_proto proto = mc->proto;
@@ -1311,7 +1311,7 @@
osmo_sockaddr_ntop(&from_addr->u.sa,
ipbuf),
osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa));
}
- return mgcp_send_rtp(conn_src, msg);
+ return mgcp_rtp_conn_dispatch_rtp(conn_src, msg);
}
/* Find a destination connection. */
@@ -1343,7 +1343,7 @@
}
/* Dispatch RTP packet to destination RTP connection */
- return mgcp_send_rtp(&conn_dst->u.rtp, msg);
+ return mgcp_rtp_conn_dispatch_rtp(&conn_dst->u.rtp, msg);
}
/*! dispatch incoming RTP packet to E1 subslot, handle RTCP packets locally.
@@ -1376,7 +1376,7 @@
osmo_sockaddr_ntop(&from_addr->u.sa,
ipbuf),
osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa));
}
- return mgcp_send_rtp(conn_src, msg);
+ return mgcp_rtp_conn_dispatch_rtp(conn_src, msg);
}
/* Forward to E1 */
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29865
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Idaf791997b8438a4aede50f614afa0d55ad41faa
Gerrit-Change-Number: 29865
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-mgw[master]: mgw: rx_rtp(): reorder checks and handlings
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29864 ) Change subject: mgw: rx_rtp(): reorder checks and handlings .. mgw: rx_rtp(): reorder checks and handlings Let's first validate the origin of the message, then the content of the message and finally execute whatever triggers are necessary. Change-Id: I011a6d7d705768c32a35cec5cd7169725a21a670 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/64/29864/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index f9c7a01..2a4a4eb 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1510,7 +1510,9 @@ LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx_rtp(%u bytes)\n", msgb_length(msg)); - mgcp_conn_watchdog_kick(conn_src->conn); + /* Check if the origin of the RTP packet seems plausible */ + if (!trunk->rtp_accept_all && check_rtp_origin(conn_src, from_addr)) + return -1; /* If AMR is configured for the ingress connection and conversion of the * framing mode (octet-aligned vs. bandwith-efficient is explicitly @@ -1530,9 +1532,7 @@ } } - /* Check if the origin of the RTP packet seems plausible */ - if (!trunk->rtp_accept_all && check_rtp_origin(conn_src, from_addr)) - return -1; + mgcp_conn_watchdog_kick(conn_src->conn); /* Execute endpoint specific implementation that handles the * dispatching of the RTP data */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I011a6d7d705768c32a35cec5cd7169725a21a670 Gerrit-Change-Number: 29864 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ci[master]: jobs/master-builds: add ice40-usbtrace
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29862 ) Change subject: jobs/master-builds: add ice40-usbtrace .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8872f20eabf2975aea602c9e95f66d144f74742d Gerrit-Change-Number: 29862 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 24 Oct 2022 15:29:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgw: reuse mgcp_codec_amr_mode_is_indicated() in mgcp_codec_amr_is_oc...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29863 )
Change subject: mgw: reuse mgcp_codec_amr_mode_is_indicated() in
mgcp_codec_amr_is_octet_aligned()
..
mgw: reuse mgcp_codec_amr_mode_is_indicated() in
mgcp_codec_amr_is_octet_aligned()
mgcp_codec_amr_mode_is_indicated() has an extra check validating the
subtype is AMR, which is fine for all the callers of
mgcp_codec_amr_is_octet_aligned() (mgcp_iuup.c):
mgcp_conn_iuup_send_rtp: conn_rtp_src is explictly checked to be AMR
just before calling the function.
bridge_iuup_to_rtp_peer: conn_rtp_dst is expected to be an RTP_DEFAULT
conn using AMR.
Change-Id: I4c18510b59fd917ed033393994b21517bf753510
---
M src/libosmo-mgcp/mgcp_codec.c
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/63/29863/1
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index 184ca43..849b0c8 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -369,9 +369,7 @@
*/
bool mgcp_codec_amr_is_octet_aligned(const struct mgcp_rtp_codec *codec)
{
- if (!codec->param_present)
- return false;
- if (!codec->param.amr_octet_aligned_present)
+ if (!mgcp_codec_amr_mode_is_indicated(codec))
return false;
return codec->param.amr_octet_aligned;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29863
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I4c18510b59fd917ed033393994b21517bf753510
Gerrit-Change-Number: 29863
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ci[master]: jobs/master-builds: add ice40-usbtrace
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/29862 )
Change subject: jobs/master-builds: add ice40-usbtrace
..
jobs/master-builds: add ice40-usbtrace
Related: OS#6169
Change-Id: I8872f20eabf2975aea602c9e95f66d144f74742d
---
M jobs/master-builds.yml
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/29862/1
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index e7b4c61..3371356 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -237,6 +237,10 @@
- osmo-e1-hardware:
docker_img: 'registry.osmocom.org/$USER/fpga-build'
cmd: 'docker pull {docker_img} && {docker_run} {docker_img}
/build/contrib/jenkins.sh --publish'
+ - ice40-usbtrace:
+ git_base_url: https://gitea.osmocom.org/electronics
+ docker_img: 'registry.osmocom.org/$USER/fpga-build'
+ cmd: 'docker pull {docker_img} && {docker_run} {docker_img}
/build/contrib/jenkins.sh --publish'
- no2bootloader:
git_base_url: https://github.com/no2fpga
docker_img: 'registry.osmocom.org/$USER/fpga-build'
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29862
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8872f20eabf2975aea602c9e95f66d144f74742d
Gerrit-Change-Number: 29862
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in osmo-mgw[master]: Rename and move func checking if amr mode is explicitly configured
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29861 )
Change subject: Rename and move func checking if amr mode is explicitly
configured
..
Rename and move func checking if amr mode is explicitly configured
The previous naming was quite confusing, since the function is not
really checking whether a conversion is needed, but rather whether the
codec has the AMR RTP mode defined explicitly and hence forced.
The previous naming didn't harm because the amr_oa_bwe_convert also
supports the conversion path OA<->OA and BE<->BE.
Hence nowadays the amr_oa_bwe_convert() function is called always if the
dst conn has its codec with AMR RTP mode explicitly set, no matter if
the src and dst conn have the same mode.
Related: SYS#6161
Change-Id: I8dce3038ebccf5e1e37e2908070a67d66693a96f
---
M include/osmocom/mgcp/mgcp_codec.h
M src/libosmo-mgcp/mgcp_codec.c
M src/libosmo-mgcp/mgcp_network.c
3 files changed, 15 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/61/29861/1
diff --git a/include/osmocom/mgcp/mgcp_codec.h
b/include/osmocom/mgcp/mgcp_codec.h
index 97e6b8d..a460809 100644
--- a/include/osmocom/mgcp/mgcp_codec.h
+++ b/include/osmocom/mgcp/mgcp_codec.h
@@ -17,4 +17,5 @@
int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct
mgcp_conn_rtp *conn_dst, int payload_type);
const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct
mgcp_conn_rtp *conn,
const char
*subtype_name, unsigned int match_nr);
+bool mgcp_codec_amr_mode_is_indicated(const struct mgcp_rtp_codec *codec);
bool mgcp_codec_amr_is_octet_aligned(const struct mgcp_rtp_codec *codec);
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index 38aa0a7..184ca43 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -345,6 +345,18 @@
return -EINVAL;
}
+/* Check if the codec has a specific AMR mode (octet-aligned or
bandwith-efficient) set. */
+bool mgcp_codec_amr_mode_is_indicated(const struct mgcp_rtp_codec *codec)
+{
+ if (codec->param_present == false)
+ return false;
+ if (!codec->param.amr_octet_aligned_present)
+ return false;
+ if (strcmp(codec->subtype_name, "AMR") != 0)
+ return false;
+ return true;
+}
+
/* Return true if octet-aligned is set in the given codec. Default to
octet-aligned=0, i.e. bandwidth-efficient mode.
* See RFC4867 "RTP Payload Format for AMR and AMR-WB" sections "8.1. AMR
Media Type Registration" and "8.2. AMR-WB
* Media Type Registration":
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 4ca4914..f9c7a01 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -769,20 +769,6 @@
return msgb_trim(msg, rc + sizeof(struct rtp_hdr));
}
-/* Check if a conversion between octet-aligned and bandwith-efficient mode is
- * indicated. */
-static bool amr_oa_bwe_convert_indicated(struct mgcp_rtp_codec *codec)
-{
- if (codec->param_present == false)
- return false;
- if (!codec->param.amr_octet_aligned_present)
- return false;
- if (strcmp(codec->subtype_name, "AMR") != 0)
- return false;
- return true;
-}
-
-
/* Return whether an RTP packet with AMR payload is in octet-aligned mode.
* Return 0 if in bandwidth-efficient mode, 1 for octet-aligned mode, and
negative if the RTP data is invalid. */
static int amr_oa_check(char *data, int len)
@@ -1217,7 +1203,7 @@
if (mgcp_conn_rtp_is_iuup(conn_dst) ||
mgcp_conn_rtp_is_iuup(conn_src)) {
/* the iuup code will correctly transform to
the correct AMR mode */
- } else if
(amr_oa_bwe_convert_indicated(conn_dst->end.codec)) {
+ } else if
(mgcp_codec_amr_mode_is_indicated(conn_dst->end.codec)) {
rc = amr_oa_bwe_convert(endp, msg,
conn_dst->end.codec->param.amr_octet_aligned);
if (rc < 0) {
@@ -1531,7 +1517,7 @@
* defined, then we check if the incoming payload matches that
* expectation. */
if (mc->proto == MGCP_PROTO_RTP &&
- amr_oa_bwe_convert_indicated(conn_src->end.codec)) {
+ mgcp_codec_amr_mode_is_indicated(conn_src->end.codec)) {
int oa = amr_oa_check((char*)msgb_data(msg), msgb_length(msg));
if (oa < 0)
return -1;
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29861
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I8dce3038ebccf5
Change in osmo-mgw[master]: mgw: Log unexpected RTP AMR OA-vs-BE payload
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29860 )
Change subject: mgw: Log unexpected RTP AMR OA-vs-BE payload
..
mgw: Log unexpected RTP AMR OA-vs-BE payload
Change-Id: Ib5ae82c01153398491b21191a8cec9969337bbbc
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/60/29860/1
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 528764a..4ca4914 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -1535,8 +1535,13 @@
int oa = amr_oa_check((char*)msgb_data(msg), msgb_length(msg));
if (oa < 0)
return -1;
- if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned)
+ if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned)
{
+ LOG_CONN_RTP(conn_src, LOGL_NOTICE,
+"rx_rtp(%u bytes): Expected RTP AMR
octet-aligned=%u but got octet-aligned=%u."
+" Check your config!\n",
+msgb_length(msg),
conn_src->end.codec->param.amr_octet_aligned, oa);
return -1;
+ }
}
/* Check if the origin of the RTP packet seems plausible */
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29860
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib5ae82c01153398491b21191a8cec9969337bbbc
Gerrit-Change-Number: 29860
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-mgw[master]: cosmetic: Clarify and fix typos in comment
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29859 )
Change subject: cosmetic: Clarify and fix typos in comment
..
cosmetic: Clarify and fix typos in comment
Change-Id: Ibcbe7d85cf7e1912de73d59540f2dea1dfa5d98d
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/29859/1
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index bb8cfa3..528764a 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -1526,9 +1526,9 @@
mgcp_conn_watchdog_kick(conn_src->conn);
- /* If AMR is configured for the ingress connection a conversion of the
+ /* If AMR is configured for the ingress connection and conversion of the
* framing mode (octet-aligned vs. bandwith-efficient is explicitly
-* define, then we check if the incoming payload matches that
+* defined, then we check if the incoming payload matches that
* expectation. */
if (mc->proto == MGCP_PROTO_RTP &&
amr_oa_bwe_convert_indicated(conn_src->end.codec)) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29859
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ibcbe7d85cf7e1912de73d59540f2dea1dfa5d98d
Gerrit-Change-Number: 29859
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: debian-buster-jenkins: add pysim doc/lint depends
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29841 ) Change subject: debian-buster-jenkins: add pysim doc/lint depends .. debian-buster-jenkins: add pysim doc/lint depends The lint and docs parts of pysim's contrib/jenkins.sh will run on a different jenkins node than the tests (which has to run on simtester). Add the depends for lint and docs to debian-buster-jenkins, so we can run them in docker. The python libraries construct, pytlv, pyyaml are needed so pylint doesn't print false errors like "Undefined variable 'TLV'". Related: OS#5497 Change-Id: Id5c75725d2fab46b29773fa4f637fa2d73fa7291 --- M debian-buster-jenkins/Dockerfile 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 01a383e..ca11719 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -52,6 +52,7 @@ graphviz \ htop \ inkscape \ + latexmk \ lcov \ libaio-dev \ libasound2-dev \ @@ -122,6 +123,7 @@ sudo \ systemd \ tcpdump \ + tex-gyre \ texinfo \ unzip \ wget \ @@ -138,10 +140,17 @@ # Install pip dependencies (keep in alphabetic order) RUN pip3 install \ - git+https://github.com/podshumok/python-smpplib.git \ - git+https://github.com/eriwen/lcov-to-cobertura-xml.git \ - pydbus \ - pysispm + 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git' \ + 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ + 'git+https://github.com/podshumok/python-smpplib.git' \ + 'construct>=2.9.51' \ + 'pydbus' \ + 'pylint' \ + 'pysispm' \ + 'pytlv' \ + 'pyyaml>=5.1' \ + 'sphinx' \ + 'sphinxcontrib-napoleon' # match the outside user RUN useradd --uid=1000 build -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id5c75725d2fab46b29773fa4f637fa2d73fa7291 Gerrit-Change-Number: 29841 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmocom-bb[master]: trxcon: allow subsequent TRXCON_EV_FULL_POWER_SCAN_REQ
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29850 ) Change subject: trxcon: allow subsequent TRXCON_EV_FULL_POWER_SCAN_REQ .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8e5fd778467567e8ca69ed420b9815073daa7e16 Gerrit-Change-Number: 29850 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 13:20:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: give L1CTL API direct access to trxcon_fsm
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29849 ) Change subject: trxcon: give L1CTL API direct access to trxcon_fsm .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5a15a676ce3917d2eddc44f1143cea8d3cd8781f Gerrit-Change-Number: 29849 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 13:20:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: grecefully exit on receipt of SIGTERM
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29847 ) Change subject: trxcon: grecefully exit on receipt of SIGTERM .. Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/29847/comment/738183cf_2d9da2bf PS2, Line 7: grecefully gracefully -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0 Gerrit-Change-Number: 29847 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 13:19:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: configure.ac: set -std=gnu11
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29851 ) Change subject: trxcon: configure.ac: set -std=gnu11 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia22adb18ea34690ef8e46dbf02308cbb1541a7ee Gerrit-Change-Number: 29851 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 13:19:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore"
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29852 ) Change subject: Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore" .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a32da19c9f419d51d55b301461ce28ce11b2249 Gerrit-Change-Number: 29852 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 13:19:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: IuUP->AMR: log whether converting to AMR OA or BE
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29856 ) Change subject: IuUP->AMR: log whether converting to AMR OA or BE .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3672d01d2879ae8820176a46454f26a4f5f584de Gerrit-Change-Number: 29856 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 13:18:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Avoid loosing DL tbf from old_ms when rx premier UL data
Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29845 ) Change subject: Avoid loosing DL tbf from old_ms when rx premier UL data .. Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/29845/comment/1001e2f6_f9e0b6fc PS2, Line 7: A > I don't think you can use 'premier' in english this way, sorry. […] meaning "first" here. I'm just quoting the relevant logging line here, so I'd prefer keeping it this way. The logging line can be fixed later on, but for now it identifies where to find the problem. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a989af89f9469d7894b9e70a2ea01989b9dbb75 Gerrit-Change-Number: 29845 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 13:18:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-mgw[master]: IuUP->AMR: do not patch payload type a second time
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29855 ) Change subject: IuUP->AMR: do not patch payload type a second time .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7c722cd959f76bd104ae4941d182c77e5c025867 Gerrit-Change-Number: 29855 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 13:18:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: AMR->IuUP: properly translate Q -> FQC
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29854 ) Change subject: AMR->IuUP: properly translate Q -> FQC .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I29878dd27af9ba0c9e600324c528b22940cdcc30 Gerrit-Change-Number: 29854 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 13:17:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: AMR->IuUP: do not crash on AMR data before IuUP Init
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29853 ) Change subject: AMR->IuUP: do not crash on AMR data before IuUP Init .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 Gerrit-Change-Number: 29853 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 13:17:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-buster-jenkins: add pysim doc/lint depends
Attention is currently required from: osmith, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29841 ) Change subject: debian-buster-jenkins: add pysim doc/lint depends .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id5c75725d2fab46b29773fa4f637fa2d73fa7291 Gerrit-Change-Number: 29841 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 13:16:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Avoid loosing DL tbf from old_ms when rx premier UL data
Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29845 ) Change subject: Avoid loosing DL tbf from old_ms when rx premier UL data .. Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/29845/comment/11caa1dc_19dab194 PS2, Line 7: A I don't think you can use 'premier' in english this way, sorry. Not sure what you mean here, something like "Rx first UL data" or "Rx prior [to] UL data" ? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a989af89f9469d7894b9e70a2ea01989b9dbb75 Gerrit-Change-Number: 29845 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 13:15:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Rework tbf::update_ms()
Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29846 ) Change subject: Rework tbf::update_ms() .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1b7c0fde15b9bb8a973068994dbe972285ad0aff Gerrit-Change-Number: 29846 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 13:13:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: gsm48_parse_meas_rep: fix parsing multi-band list
Attention is currently required from: osmith, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29836 ) Change subject: gsm48_parse_meas_rep: fix parsing multi-band list .. Patch Set 4: Code-Review+1 (1 comment) Patchset: PS4: indeed, it would be good to have some unit test coverage showing the old bug before this change and showing the bug is gone after the change is committed. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5e4f0531e08685460948b102367825588d839ba Gerrit-Change-Number: 29836 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 13:12:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: gprs_ms: Move creating string name of object to a function
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/29844 )
Change subject: gprs_ms: Move creating string name of object to a function
..
gprs_ms: Move creating string name of object to a function
This way it can be used outside of LOGPMS().
Change-Id: I8ab713154c8f308878f3e85b6f7e8afc5c4be249
---
M src/gprs_ms.c
M src/gprs_ms.h
2 files changed, 21 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index 8453f20..d68f8aa 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -942,6 +942,24 @@
return NULL;
}
+const char *ms_name(const struct GprsMs *ms)
+{
+ static char _ms_name_buf[128];
+ return ms_name_buf(ms, _ms_name_buf, sizeof(_ms_name_buf));
+}
+
+char *ms_name_buf(const struct GprsMs *ms, char *buf, unsigned int buf_size)
+{
+ snprintf(buf, buf_size - 1,
+ "MS(TLLI=0x%08x, IMSI=%s, TA=%" PRIu8 ", %" PRIu8 "/%" PRIu8
",%s%s)",
+ ms_tlli(ms), ms_imsi(ms), ms_ta(ms),
+ ms_ms_class(ms), ms_egprs_ms_class(ms),
+ ms_ul_tbf(ms) ? " UL" : "",
+ ms_dl_tbf(ms) ? " DL" : "");
+ buf[buf_size - 1] = '\0';
+ return buf;
+}
+
int ms_nacc_start(struct GprsMs *ms, Packet_Cell_Change_Notification_t *notif)
{
if (!ms->nacc)
diff --git a/src/gprs_ms.h b/src/gprs_ms.h
index c5ee01c..cc92e2a 100644
--- a/src/gprs_ms.h
+++ b/src/gprs_ms.h
@@ -134,6 +134,8 @@
static inline struct gprs_rlcmac_ul_tbf *ms_ul_tbf(const struct GprsMs *ms)
{return ms->ul_tbf;}
static inline struct gprs_rlcmac_dl_tbf *ms_dl_tbf(const struct GprsMs *ms)
{return ms->dl_tbf;}
+const char *ms_name(const struct GprsMs *ms);
+char *ms_name_buf(const struct GprsMs *ms, char *buf, unsigned int buf_size);
void ms_set_callback(struct GprsMs *ms, struct gpr_ms_callback *cb);
@@ -237,11 +239,7 @@
}
#define LOGPMS(ms, category, level, fmt, args...) \
- LOGP(category, level, "MS(TLLI=0x%08x, IMSI=%s, TA=%" PRIu8 ", %" PRIu8
"/%" PRIu8 ",%s%s) " fmt, \
-ms_tlli(ms), ms_imsi(ms), ms_ta(ms), ms_ms_class(ms),
ms_egprs_ms_class(ms), \
-ms_ul_tbf(ms) ? " UL": "", \
-ms_dl_tbf(ms) ? " DL": "", \
-## args)
+ LOGP(category, level, "%s " fmt, ms_name(ms), ## args)
#ifdef __cplusplus
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29844
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I8ab713154c8f308878f3e85b6f7e8afc5c4be249
Gerrit-Change-Number: 29844
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: keith
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-pcu[master]: Call ms_store->get_ms() with GSM_RESERVED_TMSI instead of 0
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/29839 )
Change subject: Call ms_store->get_ms() with GSM_RESERVED_TMSI instead of 0
..
Call ms_store->get_ms() with GSM_RESERVED_TMSI instead of 0
That's the special value checked in the implementation of get_ms() to
skip lookups based on TLLI.
This should save some cicles trying to match TLLI 0.
Change-Id: I364d238ff8a82abb14281140fe18b273c0e8f541
---
M src/bts.cpp
M src/pcu_vty_functions.cpp
M src/tbf.cpp
M src/tbf_dl.cpp
M tests/ms/MsTest.cpp
M tests/tbf/TbfTest.cpp
6 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/bts.cpp b/src/bts.cpp
index f77c5a2..df08cc6 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -1389,7 +1389,7 @@
struct GprsMs *bts_ms_by_imsi(struct gprs_rlcmac_bts *bts, const char *imsi)
{
- return bts_ms_store(bts)->get_ms(0, 0, imsi);
+ return bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI,
imsi);
}
const struct llist_head* bts_ms_list(struct gprs_rlcmac_bts *bts)
diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp
index 1745eea..28ecebf 100644
--- a/src/pcu_vty_functions.cpp
+++ b/src/pcu_vty_functions.cpp
@@ -236,7 +236,7 @@
int pcu_vty_show_ms_by_imsi(struct vty *vty, struct gprs_rlcmac_bts *bts,
const char *imsi)
{
- GprsMs *ms = bts_ms_store(bts)->get_ms(0, 0, imsi);
+ GprsMs *ms = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI,
GSM_RESERVED_TMSI, imsi);
if (!ms) {
vty_out(vty, "Unknown IMSI '%s'.%s", imsi, VTY_NEWLINE);
return CMD_WARNING;
diff --git a/src/tbf.cpp b/src/tbf.cpp
index d15cd3d..cb5d9f3 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -225,7 +225,7 @@
if (!ms_check_tlli(ms(), tlli)) {
GprsMs *old_ms;
- old_ms = bts_ms_store(bts)->get_ms(tlli, 0, NULL);
+ old_ms = bts_ms_store(bts)->get_ms(tlli, GSM_RESERVED_TMSI,
NULL);
if (old_ms)
ms_merge_and_clear_ms(ms(), old_ms);
}
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 9c99cf6..67ac573 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -295,7 +295,7 @@
/* If we got MS by TLLI above let's see if we already have another MS
* object identified by IMSI and merge them */
if (ms && !ms_imsi_is_valid(ms) && imsi) {
- ms_old = bts_ms_store(bts)->get_ms(0, 0, imsi);
+ ms_old = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI,
GSM_RESERVED_TMSI, imsi);
if (ms_old && ms_old != ms) {
/* The TLLI has changed (RAU), so there are two MS
* objects for the same MS */
diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp
index 2ff2fc2..cbafee9 100644
--- a/tests/ms/MsTest.cpp
+++ b/tests/ms/MsTest.cpp
@@ -416,10 +416,10 @@
OSMO_ASSERT(ms == ms_tmp);
OSMO_ASSERT(ms_tlli(ms) == tlli + 0);
- ms_tmp = store.get_ms(0, 0, imsi1);
+ ms_tmp = store.get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi1);
OSMO_ASSERT(ms == ms_tmp);
OSMO_ASSERT(strcmp(ms_imsi(ms), imsi1) == 0);
- ms_tmp = store.get_ms(0, 0, imsi2);
+ ms_tmp = store.get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi2);
OSMO_ASSERT(ms_tmp == NULL);
ms = prepare_ms(&store, tlli + 1, GPRS_RLCMAC_UL_TBF);
@@ -432,10 +432,10 @@
OSMO_ASSERT(ms == ms_tmp);
OSMO_ASSERT(ms_tlli(ms) == tlli + 1);
- ms_tmp = store.get_ms(0, 0, imsi1);
+ ms_tmp = store.get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi1);
OSMO_ASSERT(ms_tmp != NULL);
OSMO_ASSERT(ms_tmp != ms);
- ms_tmp = store.get_ms(0, 0, imsi2);
+ ms_tmp = store.get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi2);
OSMO_ASSERT(ms == ms_tmp);
OSMO_ASSERT(strcmp(ms_imsi(ms), imsi2) == 0);
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index 116b234..c18fa77 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -450,7 +450,7 @@
dl_tbf[1]->update_ms(0xf102, GPRS_RLCMAC_DL_TBF);
ms_set_imsi(dl_tbf[0]->ms(), "0010011");
- ms1 = bts_ms_store(bts)->get_ms(0, 0, "0010011");
+ ms1 = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI,
"0010011");
OSMO_ASSERT(ms1 != NULL);
ms2 = bts_ms_store(bts)->get_ms(0xf101);
OSMO_ASSERT(ms2 != NULL);
@@ -459,9 +459,9 @@
/* change the IMSI on TBF 0 */
ms_set_imsi(dl_tbf[0]->ms(), "0010012");
- ms1 = bts_ms_store(bts)->get_ms(0, 0, "0010011");
+ ms1 = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI,
"0010011");
OSMO_ASSERT(ms1 == NULL);
- ms1 = bts_ms_store(b
Change in osmo-bsc[master]: gsm48_parse_meas_rep: fix parsing multi-band list
Attention is currently required from: osmith, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29836 ) Change subject: gsm48_parse_meas_rep: fix parsing multi-band list .. Patch Set 4: Code-Review+1 (1 comment) Patchset: PS4: Did you think about adding unit tests for this? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5e4f0531e08685460948b102367825588d839ba Gerrit-Change-Number: 29836 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 13:05:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Rework tbf::update_ms()
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29846 ) Change subject: Rework tbf::update_ms() .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1b7c0fde15b9bb8a973068994dbe972285ad0aff Gerrit-Change-Number: 29846 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 12:17:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Avoid loosing DL tbf from old_ms when rx premier UL data
Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29845 ) Change subject: Avoid loosing DL tbf from old_ms when rx premier UL data .. Patch Set 2: Code-Review+1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/29845/comment/c67a76cb_d267768d PS2, Line 10: MS has UL TBF to attach to the network in FINISHED state, PCU received DL data (if you put a bit less in each line, it's more convenient to read this in gerrit) https://gerrit.osmocom.org/c/osmo-pcu/+/29845/comment/fc0e33ac_92367c01 PS2, Line 14: earns learns -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a989af89f9469d7894b9e70a2ea01989b9dbb75 Gerrit-Change-Number: 29845 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 12:08:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: gprs_ms: Move creating string name of object to a function
Attention is currently required from: pespin, keith. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29844 ) Change subject: gprs_ms: Move creating string name of object to a function .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab713154c8f308878f3e85b6f7e8afc5c4be249 Gerrit-Change-Number: 29844 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: keith Gerrit-Comment-Date: Mon, 24 Oct 2022 11:47:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Call ms_store->get_ms() with GSM_RESERVED_TMSI instead of 0
Attention is currently required from: pespin, keith. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29839 ) Change subject: Call ms_store->get_ms() with GSM_RESERVED_TMSI instead of 0 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I364d238ff8a82abb14281140fe18b273c0e8f541 Gerrit-Change-Number: 29839 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: keith Gerrit-Comment-Date: Mon, 24 Oct 2022 11:42:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: docs: allow overriding OSMO_GSM_MANUALS_DIR
osmith has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/29843 ) Change subject: docs: allow overriding OSMO_GSM_MANUALS_DIR .. docs: allow overriding OSMO_GSM_MANUALS_DIR Related: OS#5497 Change-Id: I433217b7aa1cdcddc52a89721e03e44b417bacb1 --- M docs/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/docs/Makefile b/docs/Makefile index e594851..550d4e7 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,7 +9,7 @@ BUILDDIR = _build # for osmo-gsm-manuals -OSMO_GSM_MANUALS_DIR=$(shell pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null) +OSMO_GSM_MANUALS_DIR ?= $(shell pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null) OSMO_REPOSITORY = "pysim" UPLOAD_FILES = $(BUILDDIR)/latex/osmopysim-usermanual.pdf CLEAN_FILES = $(UPLOAD_FILES) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I433217b7aa1cdcddc52a89721e03e44b417bacb1 Gerrit-Change-Number: 29843 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in pysim[master]: contrib/jenkins.sh: set PYTHONUNBUFFERED=1
osmith has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/29842 ) Change subject: contrib/jenkins.sh: set PYTHONUNBUFFERED=1 .. contrib/jenkins.sh: set PYTHONUNBUFFERED=1 Make sure all python output is printed immediatelly. Change-Id: I5d334bbc34e4df39ac54472642299c567894f449 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index fbcd73c..0ade9b4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -6,6 +6,8 @@ # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") # +export PYTHONUNBUFFERED=1 + if [ ! -d "./pysim-testdata/" ] ; then echo "###" echo "Please call from pySim-prog top directory" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d334bbc34e4df39ac54472642299c567894f449 Gerrit-Change-Number: 29842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: BSC: add TC_ho_meas_rep_multi_band
Attention is currently required from: neels, fixeria.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 )
Change subject: BSC: add TC_ho_meas_rep_multi_band
..
Patch Set 3:
(1 comment)
File library/BSSMAP_Templates.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837/comment/856d721e_5b3df68c
PS3, Line 898: cid_list := *
> This parameter should be '(present)' and set to '?' by default, because
> PDU_BSSMAP_HandoverRequired. […]
Wouldn't this break existing code using this?
$ git grep tr_BSSMAP_HandoverRequired
BSC_Tests.ttcn:
BSSAP.receive(tr_BSSMAP_HandoverRequired(exp_oldToNewBSSIEs));
BSC_Tests.ttcn: BSSAP.receive(tr_BSSMAP_HandoverRequired);
BSC_Tests.ttcn: BSSAP.receive(tr_BSSMAP_HandoverRequired);
BSC_Tests.ttcn: BSSAP.receive(tr_BSSMAP_HandoverRequired);
BSC_Tests.ttcn: [] BSSAP.receive(tr_BSSMAP_HandoverRequired) {
BSC_Tests.ttcn: [] BSSAP.receive(tr_BSSMAP_HandoverRequired(cid_list :=
cid_list)) {
BSC_Tests.ttcn: [] BSSAP.receive(tr_BSSMAP_HandoverRequired()) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837
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: I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286
Gerrit-Change-Number: 29837
Gerrit-PatchSet: 3
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-CC: fixeria
Gerrit-CC: pespin
Gerrit-Attention: neels
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 24 Oct 2022 11:28:02 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria
Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BSC: add TC_ho_meas_rep_multi_band
Attention is currently required from: osmith, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 ) Change subject: BSC: add TC_ho_meas_rep_multi_band .. Patch Set 3: (1 comment) File library/BSSMAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837/comment/b44046df_56ceaba6 PS3, Line 898: cid_list := * This parameter should be '(present)' and set to '?' by default, because PDU_BSSMAP_HandoverRequired.cellIdentifierList is *not* optional, and thus always present. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 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: I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286 Gerrit-Change-Number: 29837 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 11:20:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BSC: extend TC_ho_meas_rep_multi_band for ARFCN=0
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29858 ) Change subject: BSC: extend TC_ho_meas_rep_multi_band for ARFCN=0 .. Patch Set 1: (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29858/comment/08aba771_5232ae8b PS1, Line 11979: 40 For some reason, the testsuite seems to encode this wrong: https://nextcloud.sysmocom.de/s/C4DoX5tNAjeHSwp Instead of giving the third entry an rxlev of 40, the second entry has this level. OsmoBSC with my patch then decodes it as it's in the measurement report, but the test fails. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29858 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: Ia8f94d72651061427afc9e34f678544f89d0149b Gerrit-Change-Number: 29858 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 24 Oct 2022 11:18:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in pysim[master]: docs: allow overriding OSMO_GSM_MANUALS_DIR
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29843 ) Change subject: docs: allow overriding OSMO_GSM_MANUALS_DIR .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I433217b7aa1cdcddc52a89721e03e44b417bacb1 Gerrit-Change-Number: 29843 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 24 Oct 2022 11:10:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: contrib/jenkins.sh: set PYTHONUNBUFFERED=1
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29842 ) Change subject: contrib/jenkins.sh: set PYTHONUNBUFFERED=1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d334bbc34e4df39ac54472642299c567894f449 Gerrit-Change-Number: 29842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 11:10:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: contrib/jenkins.sh: set PYTHONUNBUFFERED=1
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29842 ) Change subject: contrib/jenkins.sh: set PYTHONUNBUFFERED=1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d334bbc34e4df39ac54472642299c567894f449 Gerrit-Change-Number: 29842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 11:10:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BSC: extend TC_ho_meas_rep_multi_band for ARFCN=0
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29858 )
Change subject: BSC: extend TC_ho_meas_rep_multi_band for ARFCN=0
..
BSC: extend TC_ho_meas_rep_multi_band for ARFCN=0
Adjust the test to also check the special case ARFCN=0, which is at the
end of each sub list.
Related: OS#5717
Related: osmo-bsc Ic5e4f0531e08685460948b102367825588d839ba
Change-Id: Ia8f94d72651061427afc9e34f678544f89d0149b
---
M bsc/BSC_Tests.ttcn
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/58/29858/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index ef81c46..c43fa20 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -11973,20 +11973,20 @@
* 3GPP TS 04.08 § 10.5.2.20. */
var NcellReports neighbor_rep := {
/* Sub list 1: same band */
- { rxlev := 0, bcch_freq := 0, bsic := 11 }, /* ARFCN 700,
band 1800, LAC 96 */
{ rxlev := 0, bcch_freq := 1, bsic := 12 }, /* ARFCN 800,
band 1800, LAC 98 */
/* Sub list 2: different band */
- { rxlev := 40, bcch_freq := 2, bsic := 13 }, /* ARFCN 200,
band 850, LAC 97 */
- { rxlev := 0, bcch_freq := 3, bsic := 14 } /* ARFCN 1000,
band 900, LAC 99 */
+ { rxlev := 0, bcch_freq := 2, bsic := 13 }, /* ARFCN 200,
band 850, LAC 97 */
+ { rxlev := 40, bcch_freq := 3, bsic := 14 }, /* ARFCN 1000,
band 900, LAC 99 */
+ { rxlev := 0, bcch_freq := 0, bsic := 11 } /* ARFCN0,
band 900, LAC 96 */
};
var octetstring l3_mr := enc_GsmRrL3Message(valueof(ts_MEAS_REP(true,
8, 8, reps := neighbor_rep)));
RSL.send(ts_RSL_MEAS_RES(g_chan_nr, 0, ts_RSL_IE_UplinkMeas,
ts_RSL_IE_BS_Power(0), ts_RSL_IE_L1Info,
l3_mr, 0));
/* Expect a handover to the third entry. If the BSC parsed the report
-* correctly, the third entry has LAC 97. */
+* correctly, the third entry has LAC 99. */
var template BSSMAP_FIELD_CellIdentificationList cid_list := {
- cIl_LAC := { ts_BSSMAP_CI_LAC(97) }
+ cIl_LAC := { ts_BSSMAP_CI_LAC(99) }
};
alt {
[] BSSAP.receive(tr_BSSMAP_HandoverRequired(cid_list := cid_list)) {
@@ -12017,7 +12017,7 @@
"neighbor lac 99 arfcn 1000 bsic any", /* band 900 */
"neighbor lac 98 arfcn 800 bsic any", /* band 1800 */
"neighbor lac 97 arfcn 200 bsic any", /* band 850 */
-"neighbor lac 96 arfcn 700 bsic any"}); /* band 1800 */
+"neighbor lac 96 arfcn 0 bsic any"}); /* band 900 */
f_vty_transceive(BSCVTY, "drop bts connection 0 oml");
f_init(1, true);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29858
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: Ia8f94d72651061427afc9e34f678544f89d0149b
Gerrit-Change-Number: 29858
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in osmo-bsc[master]: gsm48_parse_meas_rep: fix parsing multi-band list
Attention is currently required from: osmith, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29836 ) Change subject: gsm48_parse_meas_rep: fix parsing multi-band list .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5e4f0531e08685460948b102367825588d839ba Gerrit-Change-Number: 29836 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 11:08:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: gsm48_parse_meas_rep: fix parsing multi-band list
Attention is currently required from: neels, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29836 ) Change subject: gsm48_parse_meas_rep: fix parsing multi-band list .. Patch Set 3: (3 comments) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/29836/comment/e86c028d_cf583026 PS2, Line 770: TS 04.08 > FYI: TS 44.018 is a more recent version of TS 04. […] thanks, done https://gerrit.osmocom.org/c/osmo-bsc/+/29836/comment/4245c22b_fd26016f PS2, Line 775: struct bitvec *nbv > const Done https://gerrit.osmocom.org/c/osmo-bsc/+/29836/comment/839f7700_fae834b2 PS2, Line 780: arfcn = 0 > "In each BCCH channel sub list the absolute RF channel numbers are placed in > increasing order of ARF […] good catch! this wasn't implemented correctly, fixed in patchset 3. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5e4f0531e08685460948b102367825588d839ba Gerrit-Change-Number: 29836 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 11:01:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bsc[master]: gsm48_parse_meas_rep: fix parsing multi-band list
Attention is currently required from: osmith, neels. Hello Jenkins Builder, neels, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/29836 to look at the new patch set (#4). Change subject: gsm48_parse_meas_rep: fix parsing multi-band list .. gsm48_parse_meas_rep: fix parsing multi-band list When looking up "BCCH-FREQ-NCELL i" from the measurement report, don't treat the BCCH channel list as one list sorted by ascending ARFCN. Instead, treat it as two sub lists, one for the same band, and one for channels in different bands, as described in 3GPP TS 04.08 § 10.5.2.20. This fixes getting the wrong ARFCN from measurement reports in multi-band BSS, which leads to failing handovers. Fixes: OS#5717 Related: osmo-ttcn3-hacks I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286 Change-Id: Ic5e4f0531e08685460948b102367825588d839ba --- M include/osmocom/bsc/system_information.h M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/system_information.c 3 files changed, 58 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/29836/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5e4f0531e08685460948b102367825588d839ba Gerrit-Change-Number: 29836 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: gsm48_parse_meas_rep: fix parsing multi-band list
Attention is currently required from: osmith, neels. Hello Jenkins Builder, neels, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/29836 to look at the new patch set (#3). Change subject: gsm48_parse_meas_rep: fix parsing multi-band list .. gsm48_parse_meas_rep: fix parsing multi-band list When looking up "BCCH-FREQ-NCELL i" from the measurement report, don't treat the BCCH channel list as one list sorted by ascending ARFCN. Instead, treat it as two sub lists, one for the same band, and one for channels in different bands, as described in 3GPP TS 04.08 § 10.5.2.20. This fixes getting the wrong ARFCN from measurement reports in multi-band BSS, which leads to failing handovers. Fixes: OS#5717 Related: osmo-ttcn3-hacks I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286 Change-Id: Ic5e4f0531e08685460948b102367825588d839ba --- M include/osmocom/bsc/system_information.h M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/system_information.c 3 files changed, 57 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/29836/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5e4f0531e08685460948b102367825588d839ba Gerrit-Change-Number: 29836 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: BSC: add TC_ho_meas_rep_multi_band
Attention is currently required from: osmith, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 ) Change subject: BSC: add TC_ho_meas_rep_multi_band .. Patch Set 3: (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837/comment/f40e933f_1924e632 PS2, Line 11987: * correctly, the third entry has LAC 97. Before this was fixed, the > ah you probably meant the other thread, nvm Yes the reset of the vty commands. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 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: I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286 Gerrit-Change-Number: 29837 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 08:54:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in pysim[master]: contrib/jenkins.sh: set PYTHONUNBUFFERED=1
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29842 ) Change subject: contrib/jenkins.sh: set PYTHONUNBUFFERED=1 .. Patch Set 1: (1 comment) Patchset: PS1: > why is this needed? >From the description: "Make sure all python output is printed immediately." Without this, some of the python commands would only print their output after they completed. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d334bbc34e4df39ac54472642299c567894f449 Gerrit-Change-Number: 29842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 08:53:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-mgw[master]: AMR->IuUP: log conversion, like for the flipside
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29857 ) Change subject: AMR->IuUP: log conversion, like for the flipside .. Patch Set 1: Code-Review-1 (1 comment) File src/libosmo-mgcp/mgcp_iuup.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29857/comment/7d2ce51d_de89c01d PS1, Line 683: LOGP(DLMGCP, LOGL_DEBUG, "Convert AMR OA -> IuUP: ft %d, len %d\n", amr_hdr->ft, msgb_length(msg)); you are printing rfci in the log below but not in this one. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I525685a7dedb6d5d1deecbd026844cbe23193fac Gerrit-Change-Number: 29857 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 08:53:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: IuUP->AMR: log whether converting to AMR OA or BE
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29856 ) Change subject: IuUP->AMR: log whether converting to AMR OA or BE .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3672d01d2879ae8820176a46454f26a4f5f584de Gerrit-Change-Number: 29856 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 08:52:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: IuUP->AMR: do not patch payload type a second time
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29855 ) Change subject: IuUP->AMR: do not patch payload type a second time .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7c722cd959f76bd104ae4941d182c77e5c025867 Gerrit-Change-Number: 29855 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 08:50:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: AMR->IuUP: properly translate Q -> FQC
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29854 ) Change subject: AMR->IuUP: properly translate Q -> FQC .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I29878dd27af9ba0c9e600324c528b22940cdcc30 Gerrit-Change-Number: 29854 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 08:48:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: AMR->IuUP: do not crash on AMR data before IuUP Init
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29853 ) Change subject: AMR->IuUP: do not crash on AMR data before IuUP Init .. Patch Set 1: Code-Review+1 (1 comment) File src/libosmo-mgcp/mgcp_iuup.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29853/comment/25ad8cbd_fa280716 PS1, Line 102: return -1; It would be great to have some comment explaining what !irp means here: the conn has not yet received/sent IuUP Init yet so it is not yet configured. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 Gerrit-Change-Number: 29853 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 24 Oct 2022 08:46:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore"
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29852 ) Change subject: Revert "host/trxcon/trx_ic.c: use osmo_ubit2sbit() from libosmocore" .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a32da19c9f419d51d55b301461ce28ce11b2249 Gerrit-Change-Number: 29852 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 08:44:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: configure.ac: set -std=gnu11
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29851 ) Change subject: trxcon: configure.ac: set -std=gnu11 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia22adb18ea34690ef8e46dbf02308cbb1541a7ee Gerrit-Change-Number: 29851 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 08:43:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: grecefully exit on receipt of SIGTERM
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29847 ) Change subject: trxcon: grecefully exit on receipt of SIGTERM .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0 Gerrit-Change-Number: 29847 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 08:43:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: trxcon: add new trxcon_fsm state - TRXCON_ST_PACKET_DATA
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29848 ) Change subject: trxcon: add new trxcon_fsm state - TRXCON_ST_PACKET_DATA .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7706d677c8966a6a7c6d452ae97eda84d4282ef5 Gerrit-Change-Number: 29848 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 24 Oct 2022 08:42:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BSC: add TC_ho_meas_rep_multi_band
Attention is currently required from: neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 ) Change subject: BSC: add TC_ho_meas_rep_multi_band .. Patch Set 3: (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837/comment/5d3f0126_ec043ed0 PS2, Line 11987: * correctly, the third entry has LAC 97. Before this was fixed, the > What do you mean? I removed the "Before..." text in patchset 3. ah you probably meant the other thread, nvm -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 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: I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286 Gerrit-Change-Number: 29837 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 24 Oct 2022 08:40:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
