Build failure of network:osmocom:nightly/osmo-bts in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-bts failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 656s] ../../src/common/libbts.a(bts.o): In function `lchan_init_lapdm': [ 656s] ./src/common/bts.c:423: undefined reference to `lapdm_channel_init2' [ 656s] collect2: error: ld returned 1 exit status [ 656s] Makefile:421: recipe for target 'osmo-bts-virtual' failed [ 656s] make[4]: *** [osmo-bts-virtual] Error 1 [ 656s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 656s] Makefile:385: recipe for target 'all-recursive' failed [ 656s] make[3]: *** [all-recursive] Error 1 [ 656s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 656s] Makefile:434: recipe for target 'all-recursive' failed [ 656s] make[2]: *** [all-recursive] Error 1 [ 656s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 656s] Makefile:366: recipe for target 'all' failed [ 656s] make[1]: *** [all] Error 2 [ 656s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 656s] dh_auto_build: make -j1 returned exit code 2 [ 656s] debian/rules:12: recipe for target 'build' failed [ 656s] make: *** [build] Error 2 [ 656s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 656s] [ 656s] obs-arm-5 failed "build osmo-bts_0.8.1.328.5b92.dsc" at Tue Jun 25 09:17:15 UTC 2019. [ 656s] [ 656s] ### VM INTERACTION START ### [ 659s] [ 619.606981] sysrq: SysRq : Power Off [ 659s] [ 619.648020] reboot: Power down [ 660s] ### VM INTERACTION END ### [ 660s] [ 660s] obs-arm-5 failed "build osmo-bts_0.8.1.328.5b92.dsc" at Tue Jun 25 09:17:19 UTC 2019. [ 660s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-python-tests[master]: osmo_trap2cgi.py: Don't recurse in ctrl_client()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 ) Change subject: osmo_trap2cgi.py: Don't recurse in ctrl_client() .. Patch Set 2: Agree with Max, let's increase the version. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Gerrit-Change-Number: 14545 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: msuraev Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 25 Jun 2019 09:19:58 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-trx[master]: trx_{vty, rate_ctr}: Set proper license AGPLv3+
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/14588
Change subject: trx_{vty,rate_ctr}: Set proper license AGPLv3+
..
trx_{vty,rate_ctr}: Set proper license AGPLv3+
Take the chance to improve text with author, SPDX tag and fix incorrect
copyright dates.
Change-Id: Ic745312ed07db205b1cdc0f2fa13319354c5
---
M CommonLibs/trx_rate_ctr.cpp
M CommonLibs/trx_vty.c
2 files changed, 19 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/14588/1
diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp
index d98caff..43e4189 100644
--- a/CommonLibs/trx_rate_ctr.cpp
+++ b/CommonLibs/trx_rate_ctr.cpp
@@ -2,21 +2,23 @@
* Copyright (C) 2019 sysmocom - s.f.m.c. GmbH
* All Rights Reserved
*
+ * SPDX-License-Identifier: AGPL-3.0+
+ *
* Author: Pau Espin Pedrol
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
Change in ...osmo-trx[master]: Remove AUTHORS file
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/14587 Change subject: Remove AUTHORS file .. Remove AUTHORS file License of this file doesn't match the license stated in COPYING and in most source code files (GPLv3 vs AGPLv3). Furthermore, we don't really maintain this file, so let's drop it to avoid non-up-to-date content which may introduce confusion. Related: OS#3515 Change-Id: I536a145cb7696af8e9dbd3065ee5e5f493217ac6 --- D AUTHORS 1 file changed, 0 insertions(+), 127 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/87/14587/1 diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 53a3c7d..000 --- a/AUTHORS +++ /dev/null @@ -1,127 +0,0 @@ -# -# Copyright 2008, 2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -David A. Burgess, dburg...@kestrelsp.com: -CLI/CLI.cpp -CLI/CLI.h -CommonLibs/Assert.h -CommonLibs/BitVector.cpp -CommonLibs/Interthread.h -CommonLibs/LinkedLists.cpp -CommonLibs/LinkedLists.h -CommonLibs/Regexp.h -CommonLibs/Sockets.cpp -CommonLibs/Sockets.h -CommonLibs/Threads.cpp -CommonLibs/Threads.h -CommonLibs/Timeval.cpp -CommonLibs/Timeval.h -CommonLibs/Vector.h -GSM/GSM610Tables.cpp -GSM/GSM610Tables.h -GSM/GSMCommon.cpp -GSM/GSMCommon.h -GSM/GSMConfig.h -GSM/GSML1FEC.cpp -GSM/GSML1FEC.h -GSM/GSML2LAPDm.cpp -GSM/GSML2LAPDm.h -GSM/GSML3CCElements.cpp -GSM/GSML3CCElements.h -GSM/GSML3CCMessages.cpp -GSM/GSML3CCMessages.h -GSM/GSML3CommonElements.cpp -GSM/GSML3CommonElements.h -GSM/GSML3MMElements.cpp -GSM/GSML3MMElements.h -GSM/GSML3MMMessages.cpp -GSM/GSML3MMMessages.h -GSM/GSML3Message.cpp -GSM/GSML3Message.h -GSM/GSML3RRElements.cpp -GSM/GSML3RRElements.h -GSM/GSML3RRMessages.cpp -GSM/GSML3RRMessages.h -GSM/GSMLogicalChannel.h -GSM/GSMTDMA.cpp -GSM/GSMTDMA.h -GSM/GSMTransfer.cpp -GSM/GSMTransfer.h -LICENSEBLOCK -TRXManager/TRXManager.cpp -Transceiver/Complex.h -tests/CommonLibs/BitVectorTest.cpp -tests/CommonLibs/InterthreadTest.cpp -tests/CommonLibs/SocketsTest.cpp -tests/CommonLibs/TimevalTest.cpp -tests/CommonLibs/VectorTest.cpp - -Harvind S. Samra, hssa...@kestrelsp.com: -GSM/GSMConfig.h -GSM/GSMTransfer.h -LICENSEBLOCK -Transceiver/ComplexTest.cpp -Transceiver/Transceiver.cpp -Transceiver/Transceiver.h -Transceiver/USRPDevice.cpp -Transceiver/USRPDevice.h -Transceiver/USRPping.cpp -Transceiver/radioInterface.cpp -Transceiver/radioInterface.h -Transceiver/rcvLPF_651.h -Transceiver/runTransceiver.cpp -Transceiver/sendLPF_961.h -Transceiver/sigProcLib.cpp -Transceiver/sigProcLib.h -Transceiver/sigProcLibTest.cpp -Transceiver/sweepGenerator.cpp -Transceiver/testRadio.cpp - -Raffi Sevlian, raffi...@gmail.com: -GSM/GSMCommon.h -GSM/GSMConfig.h -GSM/GSML1FEC.h -GSM/GSML3CCElements.cpp -GSM/GSML3CCElements.h -GSM/GSML3CCMessages.cpp -GSM/GSML3CCMessages.h -GSM/GSML3CommonElements.cpp -GSM/GSML3CommonElements.h -GSM/GSML3MMElements.cpp -GSM/GSML3MMElements.h -GSM/GSML3MMMessages.cpp -GSM/GSML3MMMessages.h -GSM/GSML3Message.cpp -GSM/GSML3Message.h -GSM/GSML3RRElements.cpp -GSM/GSML3RRElements.h -GSM/GSML3RRMessages.cpp -GSM/GSML3RRMessages.h -GSM/GSMLogicalChannel.h -GSM/GSMSAPMux.cpp -GSM/GSMSAPMux.h -GSM/GSMTransfer.h -LICENSEBLOCK -TRXManager/TRXManager.h - -Alon Levy, alonle...@gmail.com -RRLPMessages.cpp -RRLPMessages.h -RRLPTest.cpp -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I536a145cb7696af8e9dbd3065ee5e5f493217ac6 Gerrit-Change-Number: 14587 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: trx_{vty, rate_ctr}: Set proper license AGPLv3+
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-trx/+/14588
to look at the new patch set (#2).
Change subject: trx_{vty,rate_ctr}: Set proper license AGPLv3+
..
trx_{vty,rate_ctr}: Set proper license AGPLv3+
Take the chance to improve text with author, SPDX tag and fix incorrect
copyright dates.
Related: OS#3515
Change-Id: Ic745312ed07db205b1cdc0f2fa13319354c5
---
M CommonLibs/trx_rate_ctr.cpp
M CommonLibs/trx_vty.c
2 files changed, 19 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/14588/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14588
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ic745312ed07db205b1cdc0f2fa13319354c5
Gerrit-Change-Number: 14588
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
Change in ...osmo-trx[master]: Remove AUTHORS file
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/14587 to look at the new patch set (#2). Change subject: Remove AUTHORS file .. Remove AUTHORS file License of this file doesn't match the license stated in COPYING and in most source code files (GPLv3 vs AGPLv3). Furthermore, we don't really maintain this file, so let's drop it to avoid non-up-to-date content which may introduce confusion. Related: OS#3515 Change-Id: I536a145cb7696af8e9dbd3065ee5e5f493217ac6 --- D AUTHORS M configure.ac 2 files changed, 1 insertion(+), 128 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/87/14587/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I536a145cb7696af8e9dbd3065ee5e5f493217ac6 Gerrit-Change-Number: 14587 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Build failure of network:osmocom:nightly/osmo-msc in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 681s] tmsi |= GSM23003_TMSI_SGSN_MASK; [ 681s] ^~~ [ 681s] vlr.c:339:12: note: each undeclared identifier is reported only once for each function it appears in [ 681s] Makefile:442: recipe for target 'vlr.o' failed [ 681s] make[4]: *** [vlr.o] Error 1 [ 681s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libvlr' [ 681s] Makefile:422: recipe for target 'all-recursive' failed [ 681s] make[3]: *** [all-recursive] Error 1 [ 681s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 681s] Makefile:462: recipe for target 'all-recursive' failed [ 681s] make[2]: *** [all-recursive] Error 1 [ 681s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 681s] Makefile:394: recipe for target 'all' failed [ 681s] make[1]: *** [all] Error 2 [ 681s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 681s] dh_auto_build: make -j1 returned exit code 2 [ 681s] debian/rules:45: recipe for target 'build' failed [ 681s] make: *** [build] Error 2 [ 681s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 681s] [ 681s] obs-arm-5 failed "build osmo-msc_1.3.1.175.1c500.dsc" at Tue Jun 25 11:49:27 UTC 2019. [ 681s] [ 681s] ### VM INTERACTION START ### [ 685s] [ 651.422637] sysrq: SysRq : Power Off [ 685s] [ 651.507336] reboot: Power down [ 685s] ### VM INTERACTION END ### [ 685s] [ 685s] obs-arm-5 failed "build osmo-msc_1.3.1.175.1c500.dsc" at Tue Jun 25 11:49:31 UTC 2019. [ 685s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-sgsn in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 651s] bss_ptmsi = bss_ptmsi | GSM23003_TMSI_SGSN_MASK; [ 651s] ^~~ [ 651s] gb_proxy.c:246:28: note: each undeclared identifier is reported only once for each function it appears in [ 651s] Makefile:615: recipe for target 'gb_proxy.o' failed [ 651s] make[4]: *** [gb_proxy.o] Error 1 [ 651s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/gprs' [ 651s] Makefile:391: recipe for target 'all-recursive' failed [ 651s] make[3]: *** [all-recursive] Error 1 [ 651s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 651s] Makefile:453: recipe for target 'all-recursive' failed [ 651s] make[2]: *** [all-recursive] Error 1 [ 651s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 651s] Makefile:385: recipe for target 'all' failed [ 651s] make[1]: *** [all] Error 2 [ 651s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 651s] dh_auto_build: make -j1 returned exit code 2 [ 651s] debian/rules:45: recipe for target 'build' failed [ 651s] make: *** [build] Error 2 [ 651s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 651s] [ 651s] armbuild22 failed "build osmo-sgsn_1.4.0.27.43c5.dsc" at Tue Jun 25 12:01:41 UTC 2019. [ 651s] [ 651s] ### VM INTERACTION START ### [ 654s] [ 631.961764] sysrq: SysRq : Power Off [ 654s] [ 632.006627] reboot: Power down [ 655s] ### VM INTERACTION END ### [ 655s] [ 655s] armbuild22 failed "build osmo-sgsn_1.4.0.27.43c5.dsc" at Tue Jun 25 12:01:45 UTC 2019. [ 655s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-bts[master]: bts: Set T200 DCCH values for CCCH
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14568 ) Change subject: bts: Set T200 DCCH values for CCCH .. Patch Set 1: So after looking a bit at the related code: bts.c calls libosmocore's lapdm_channel_init2(), which in turn calls get_n200_dcch() which will return -1 for CCH and then in turn lapdm_channel_init2() will return -EINVAL. So I think we should in bts.c only print the log line if t200_by_lchan() returns != -1, and avoid calling lapdm_channel_init2() in that case too. I initially tried avoiding a call to lchan_init_lapdm() in osmo-bts if lchan was CCCH, but it doesn't seem to like that since then lapdm_rll_tx_cb is never called and it seems RACH requests are never handled? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3d7e1883811acf97aac97325739f2ff97fc2aa08 Gerrit-Change-Number: 14568 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 25 Jun 2019 12:15:39 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Remove AUTHORS file
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14587 ) Change subject: Remove AUTHORS file .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I536a145cb7696af8e9dbd3065ee5e5f493217ac6 Gerrit-Change-Number: 14587 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 25 Jun 2019 12:28:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: trx_{vty, rate_ctr}: Set proper license AGPLv3+
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/14588 )
Change subject: trx_{vty,rate_ctr}: Set proper license AGPLv3+
..
trx_{vty,rate_ctr}: Set proper license AGPLv3+
Take the chance to improve text with author, SPDX tag and fix incorrect
copyright dates.
Related: OS#3515
Change-Id: Ic745312ed07db205b1cdc0f2fa13319354c5
---
M CommonLibs/trx_rate_ctr.cpp
M CommonLibs/trx_vty.c
2 files changed, 19 insertions(+), 13 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp
index d98caff..43e4189 100644
--- a/CommonLibs/trx_rate_ctr.cpp
+++ b/CommonLibs/trx_rate_ctr.cpp
@@ -2,21 +2,23 @@
* Copyright (C) 2019 sysmocom - s.f.m.c. GmbH
* All Rights Reserved
*
+ * SPDX-License-Identifier: AGPL-3.0+
+ *
* Author: Pau Espin Pedrol
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
Change in ...osmo-trx[master]: Remove AUTHORS file
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14587 ) Change subject: Remove AUTHORS file .. Remove AUTHORS file License of this file doesn't match the license stated in COPYING and in most source code files (GPLv3 vs AGPLv3). Furthermore, we don't really maintain this file, so let's drop it to avoid non-up-to-date content which may introduce confusion. Related: OS#3515 Change-Id: I536a145cb7696af8e9dbd3065ee5e5f493217ac6 --- D AUTHORS M configure.ac 2 files changed, 1 insertion(+), 128 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 53a3c7d..000 --- a/AUTHORS +++ /dev/null @@ -1,127 +0,0 @@ -# -# Copyright 2008, 2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -David A. Burgess, dburg...@kestrelsp.com: -CLI/CLI.cpp -CLI/CLI.h -CommonLibs/Assert.h -CommonLibs/BitVector.cpp -CommonLibs/Interthread.h -CommonLibs/LinkedLists.cpp -CommonLibs/LinkedLists.h -CommonLibs/Regexp.h -CommonLibs/Sockets.cpp -CommonLibs/Sockets.h -CommonLibs/Threads.cpp -CommonLibs/Threads.h -CommonLibs/Timeval.cpp -CommonLibs/Timeval.h -CommonLibs/Vector.h -GSM/GSM610Tables.cpp -GSM/GSM610Tables.h -GSM/GSMCommon.cpp -GSM/GSMCommon.h -GSM/GSMConfig.h -GSM/GSML1FEC.cpp -GSM/GSML1FEC.h -GSM/GSML2LAPDm.cpp -GSM/GSML2LAPDm.h -GSM/GSML3CCElements.cpp -GSM/GSML3CCElements.h -GSM/GSML3CCMessages.cpp -GSM/GSML3CCMessages.h -GSM/GSML3CommonElements.cpp -GSM/GSML3CommonElements.h -GSM/GSML3MMElements.cpp -GSM/GSML3MMElements.h -GSM/GSML3MMMessages.cpp -GSM/GSML3MMMessages.h -GSM/GSML3Message.cpp -GSM/GSML3Message.h -GSM/GSML3RRElements.cpp -GSM/GSML3RRElements.h -GSM/GSML3RRMessages.cpp -GSM/GSML3RRMessages.h -GSM/GSMLogicalChannel.h -GSM/GSMTDMA.cpp -GSM/GSMTDMA.h -GSM/GSMTransfer.cpp -GSM/GSMTransfer.h -LICENSEBLOCK -TRXManager/TRXManager.cpp -Transceiver/Complex.h -tests/CommonLibs/BitVectorTest.cpp -tests/CommonLibs/InterthreadTest.cpp -tests/CommonLibs/SocketsTest.cpp -tests/CommonLibs/TimevalTest.cpp -tests/CommonLibs/VectorTest.cpp - -Harvind S. Samra, hssa...@kestrelsp.com: -GSM/GSMConfig.h -GSM/GSMTransfer.h -LICENSEBLOCK -Transceiver/ComplexTest.cpp -Transceiver/Transceiver.cpp -Transceiver/Transceiver.h -Transceiver/USRPDevice.cpp -Transceiver/USRPDevice.h -Transceiver/USRPping.cpp -Transceiver/radioInterface.cpp -Transceiver/radioInterface.h -Transceiver/rcvLPF_651.h -Transceiver/runTransceiver.cpp -Transceiver/sendLPF_961.h -Transceiver/sigProcLib.cpp -Transceiver/sigProcLib.h -Transceiver/sigProcLibTest.cpp -Transceiver/sweepGenerator.cpp -Transceiver/testRadio.cpp - -Raffi Sevlian, raffi...@gmail.com: -GSM/GSMCommon.h -GSM/GSMConfig.h -GSM/GSML1FEC.h -GSM/GSML3CCElements.cpp -GSM/GSML3CCElements.h -GSM/GSML3CCMessages.cpp -GSM/GSML3CCMessages.h -GSM/GSML3CommonElements.cpp -GSM/GSML3CommonElements.h -GSM/GSML3MMElements.cpp -GSM/GSML3MMElements.h -GSM/GSML3MMMessages.cpp -GSM/GSML3MMMessages.h -GSM/GSML3Message.cpp -GSM/GSML3Message.h -GSM/GSML3RRElements.cpp -GSM/GSML3RRElements.h -GSM/GSML3RRMessages.cpp -GSM/GSML3RRMessages.h -GSM/GSMLogicalChannel.h -GSM/GSMSAPMux.cpp -GSM/GSMSAPMux.h -GSM/GSMTransfer.h -LICENSEBLOCK -TRXManager/TRXManager.h - -Alon Levy, alonle...@gmail.com -RRLPMessages.cpp -RRLPMessages.h -RRLPTest.cpp diff --git a/configure.ac b/configure.ac index e2a07f8..f2664ed 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([subdir-objects]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) dnl Linux kernel KBuild style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14587 To unsubscribe, or for help writing mail filters, visit http
Change in ...osmo-trx[master]: trx_{vty, rate_ctr}: Set proper license AGPLv3+
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/14588 )
Change subject: trx_{vty,rate_ctr}: Set proper license AGPLv3+
..
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14588
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ic745312ed07db205b1cdc0f2fa13319354c5
Gerrit-Change-Number: 14588
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Comment-Date: Tue, 25 Jun 2019 12:28:06 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...osmo-bts[master]: bts: Bypass T200 DCCH values for CCCH
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/14568 to look at the new patch set (#2). Change subject: bts: Bypass T200 DCCH values for CCCH .. bts: Bypass T200 DCCH values for CCCH Otherwise t200_ms_dcch array values are left uninitialized with random values, and passed later on to lapdm_channel_init2(). lapdm_channel_init2() will anyways fail during initial check on get_n200_dcch() and return -EINVAL, so let's not print garbage or call a function which will anyways simply return an error. Catched due to some strange values seen in log (see D0 and D3): osmo-bts/src/common/bts.c:421 (bts=0,trx=0,ts=0,ss=4) Setting T200 D0=1028672, D3=2, S0=520, S3=520 (all in ms) Related: OS#4066 Change-Id: I3d7e1883811acf97aac97325739f2ff97fc2aa08 --- M src/common/bts.c 1 file changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/14568/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3d7e1883811acf97aac97325739f2ff97fc2aa08 Gerrit-Change-Number: 14568 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: bts: Bypass T200 DCCH values for CCCH
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14568 ) Change subject: bts: Bypass T200 DCCH values for CCCH .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3d7e1883811acf97aac97325739f2ff97fc2aa08 Gerrit-Change-Number: 14568 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 25 Jun 2019 14:53:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: RSL: Fix fixed MS power control in RSL CHAN ACTIV
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14489 ) Change subject: RSL: Fix fixed MS power control in RSL CHAN ACTIV .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0bbe171a287b10d71fc853cd721f66e4c84db8c5 Gerrit-Change-Number: 14489 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 25 Jun 2019 14:55:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14538 ) Change subject: vty: Simplify char escaping in asciidoc output .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 Gerrit-Change-Number: 14538 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 25 Jun 2019 15:02:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/14538 )
Change subject: vty: Simplify char escaping in asciidoc output
..
vty: Simplify char escaping in asciidoc output
Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638
---
M src/vty/command.c
1 file changed, 4 insertions(+), 9 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/vty/command.c b/src/vty/command.c
index 89a2bc1..454a10c 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -515,7 +515,7 @@
{
int _strlen;
char *out, *out_ptr;
- int len = 0, i, j;
+ int len = 0, i;
if (!inp)
return NULL;
@@ -538,23 +538,18 @@
out_ptr = out;
-#define ADD(out, str) \
- for (j = 0; j < strlen(str); ++j) \
- *(out++) = str[j];
-
for (i = 0; i < _strlen; ++i) {
switch (inp[i]) {
case '|':
- ADD(out_ptr, "\\|");
- break;
+ /* Prepend escape character "\": */
+ *(out_ptr++) = '\\';
+ /* fall through */
default:
*(out_ptr++) = inp[i];
break;
}
}
-#undef ADD
-
out_ptr[0] = '\0';
return out;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638
Gerrit-Change-Number: 14538
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-gsm-tester[master]: Introduce osmux support for msc, bsc, mgw
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14547 ) Change subject: Introduce osmux support for msc,bsc,mgw .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ief3518e77650f2cddb48357b07fe95346e46ee1b Gerrit-Change-Number: 14547 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 25 Jun 2019 21:47:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-gsm-tester[master]: tests: voice: Add voice call test with Osmux enabled
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14548 ) Change subject: tests: voice: Add voice call test with Osmux enabled .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ie4f360a77f6fcbc74f140a7fcb5feef2d94ac734 Gerrit-Change-Number: 14548 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 25 Jun 2019 21:47:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-gsm-tester[master]: Introduce osmux support for msc, bsc, mgw
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14547 )
Change subject: Introduce osmux support for msc,bsc,mgw
..
Introduce osmux support for msc,bsc,mgw
Change-Id: Ief3518e77650f2cddb48357b07fe95346e46ee1b
---
M src/osmo_gsm_tester/osmo_bsc.py
M src/osmo_gsm_tester/osmo_mgw.py
M src/osmo_gsm_tester/osmo_msc.py
M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
M src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl
6 files changed, 41 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py
index ec9c3b8..4160527 100644
--- a/src/osmo_gsm_tester/osmo_bsc.py
+++ b/src/osmo_gsm_tester/osmo_bsc.py
@@ -32,6 +32,7 @@
self.process = None
self.encryption = None
self.rsl_ip = None
+self.use_osmux = "off"
self.suite_run = suite_run
self.ip_address = ip_address
self.bts = []
@@ -90,6 +91,7 @@
else:
encryption_vty =
util.encryption2osmovty(values['bsc']['net']['encryption'])
config.overlay(values,
dict(bsc=dict(net=dict(encryption=encryption_vty
+config.overlay(values, dict(bsc=dict(use_osmux=self.use_osmux)))
if self.rsl_ip is not None:
config.overlay(values,
dict(bsc=dict(net=dict(rsl_ip=self.rsl_ip
@@ -113,6 +115,15 @@
other external entities to test the RSL path, such as TTCN3 tests.'''
self.rsl_ip = ip_addr
+def set_use_osmux(self, use=False, force=False):
+if not use:
+self.use_osmux = "off"
+else:
+if not force:
+self.use_osmux = "on"
+else:
+self.use_osmux = "only"
+
def bts_add(self, bts):
self.bts.append(bts)
bts.set_bsc(self)
diff --git a/src/osmo_gsm_tester/osmo_mgw.py b/src/osmo_gsm_tester/osmo_mgw.py
index ca7bd51..ea8e652 100644
--- a/src/osmo_gsm_tester/osmo_mgw.py
+++ b/src/osmo_gsm_tester/osmo_mgw.py
@@ -31,6 +31,7 @@
self.process = None
self.suite_run = suite_run
self.ip_address = ip_address
+self.use_osmux = "off"
def start(self):
self.log('Starting osmo-mgw')
@@ -63,7 +64,11 @@
values = dict(mgw=config.get_defaults('mgw'))
config.overlay(values, self.suite_run.config())
-config.overlay(values, dict(mgw=dict(ip_address=self.ip_address)))
+config.overlay(values, { 'mgw': {
+'ip_address': self.ip_address,
+'use_osmux': self.use_osmux
+}
+})
self.dbg('MGW CONFIG:\n' + pprint.pformat(values))
@@ -81,4 +86,14 @@
def running(self):
return not self.process.terminated()
+def set_use_osmux(self, use=False, force=False):
+if not use:
+self.use_osmux = "off"
+else:
+if not force:
+self.use_osmux = "on"
+else:
+self.use_osmux = "only"
+
+
# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/osmo_msc.py b/src/osmo_gsm_tester/osmo_msc.py
index 192926c..51f50c4 100644
--- a/src/osmo_gsm_tester/osmo_msc.py
+++ b/src/osmo_gsm_tester/osmo_msc.py
@@ -32,6 +32,7 @@
self.config = None
self.encryption = None
self.authentication = None
+self.use_osmux = "off"
self.suite_run = suite_run
self.ip_address = ip_address
self.hlr = hlr
@@ -84,6 +85,7 @@
config.overlay(values,
dict(msc=dict(net=dict(encryption=encryption_vty
if self.authentication is not None:
config.overlay(values,
dict(msc=dict(net=dict(authentication=self.authentication
+config.overlay(values, dict(msc=dict(use_osmux=self.use_osmux)))
self.config = values
@@ -107,6 +109,15 @@
return
self.authentication = "required" if val else "optional"
+def set_use_osmux(self, use=False, force=False):
+if not use:
+self.use_osmux = "off"
+else:
+if not force:
+self.use_osmux = "on"
+else:
+self.use_osmux = "only"
+
def mcc(self):
return self.config['msc']['net']['mcc']
diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
index 53e683b..572e765 100644
--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
@@ -118,5 +118,6 @@
amr-config 5_90k allowed
amr-config 5_15k forbidden
amr-config 4_75k forbidden
+ osmux ${bsc.use_osmux}
msc-add
Change in ...osmo-gsm-tester[master]: tests: voice: Add voice call test with Osmux enabled
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14548 )
Change subject: tests: voice: Add voice call test with Osmux enabled
..
tests: voice: Add voice call test with Osmux enabled
Change-Id: Ie4f360a77f6fcbc74f140a7fcb5feef2d94ac734
---
M src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
A suites/voice/lib/testlib.py
M suites/voice/mo_mt_call.py
A suites/voice/mo_mt_call_osmux.py
4 files changed, 81 insertions(+), 52 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
b/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
index f91ab30..5f351a4 100644
--- a/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
@@ -15,3 +15,4 @@
rtcp-omit
rtp-accept-all 1
osmux ${mgw.use_osmux}
+ osmux bind-ip ${mgw.ip_address.addr}
diff --git a/suites/voice/lib/testlib.py b/suites/voice/lib/testlib.py
new file mode 100644
index 000..7d934f1
--- /dev/null
+++ b/suites/voice/lib/testlib.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.testenv import *
+
+def test_mo_mt_call(use_osmux=False, force_osmux=False):
+hlr = suite.hlr()
+bts = suite.bts()
+mgw_msc = suite.mgw()
+mgw_bsc = suite.mgw()
+stp = suite.stp()
+msc = suite.msc(hlr, mgw_msc, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
+ms_mo = suite.modem()
+ms_mt = suite.modem()
+
+hlr.start()
+stp.start()
+
+msc.set_use_osmux(use_osmux, force_osmux)
+msc.start()
+
+# osmo-msc still doesn't support linking 2 internal leg calls through Osmux
+# if both calls are using Osmux. Currently, RTP is always used between the
2
+# endpoints of the MGW. See OS#4065.
+mgw_msc.set_use_osmux(use_osmux, False)
+mgw_msc.start()
+
+# We don't want to force Osmux in BSC_MGW since in MGW BTS-side is still
RTP.
+mgw_bsc.set_use_osmux(use_osmux, False)
+mgw_bsc.start()
+
+bsc.set_use_osmux(use_osmux, force_osmux)
+bsc.bts_add(bts)
+bsc.start()
+
+bts.start()
+wait(bsc.bts_is_connected, bts)
+
+hlr.subscriber_add(ms_mo)
+hlr.subscriber_add(ms_mt)
+
+ms_mo.connect(msc.mcc_mnc())
+ms_mt.connect(msc.mcc_mnc())
+
+ms_mo.log_info()
+ms_mt.log_info()
+
+print('waiting for modems to attach...')
+wait(ms_mo.is_connected, msc.mcc_mnc())
+wait(ms_mt.is_connected, msc.mcc_mnc())
+wait(msc.subscriber_attached, ms_mo, ms_mt)
+
+assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0
+mo_cid = ms_mo.call_dial(ms_mt)
+mt_cid = ms_mt.call_wait_incoming(ms_mo)
+print('dial success')
+
+assert not ms_mo.call_is_active(mo_cid) and not
ms_mt.call_is_active(mt_cid)
+ms_mt.call_answer(mt_cid)
+wait(ms_mo.call_is_active, mo_cid)
+wait(ms_mt.call_is_active, mt_cid)
+print('answer success, call established and ongoing')
+
+sleep(5) # maintain the call active for 5 seconds
+
+assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid)
+ms_mt.call_hangup(mt_cid)
+wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list())
== 0)
+print('hangup success')
diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py
index aeda80d..740b1fe 100755
--- a/suites/voice/mo_mt_call.py
+++ b/suites/voice/mo_mt_call.py
@@ -1,56 +1,8 @@
#!/usr/bin/env python3
from osmo_gsm_tester.testenv import *
-hlr = suite.hlr()
-bts = suite.bts()
-mgw_msc = suite.mgw()
-mgw_bsc = suite.mgw()
-stp = suite.stp()
-msc = suite.msc(hlr, mgw_msc, stp)
-bsc = suite.bsc(msc, mgw_bsc, stp)
-ms_mo = suite.modem()
-ms_mt = suite.modem()
+import testlib
+suite.test_import_modules_register_for_cleanup(testlib)
+from testlib import test_mo_mt_call
-hlr.start()
-stp.start()
-msc.start()
-mgw_msc.start()
-mgw_bsc.start()
-
-bsc.bts_add(bts)
-bsc.start()
-
-bts.start()
-wait(bsc.bts_is_connected, bts)
-
-hlr.subscriber_add(ms_mo)
-hlr.subscriber_add(ms_mt)
-
-ms_mo.connect(msc.mcc_mnc())
-ms_mt.connect(msc.mcc_mnc())
-
-ms_mo.log_info()
-ms_mt.log_info()
-
-print('waiting for modems to attach...')
-wait(ms_mo.is_connected, msc.mcc_mnc())
-wait(ms_mt.is_connected, msc.mcc_mnc())
-wait(msc.subscriber_attached, ms_mo, ms_mt)
-
-assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0
-mo_cid = ms_mo.call_dial(ms_mt)
-mt_cid = ms_mt.call_wait_incoming(ms_mo)
-print('dial success')
-
-assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid)
-ms_mt.call_answer(mt_cid)
-wait(ms_mo.call_is_active, mo_cid)
-wait(ms_mt.call_is_active, mt_cid)
-print('answer success, call established and ongoing')
-
-sleep(5) # maintain the call active for 5 seconds
-
-assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid)
-ms_mt.call_hangup(mt_ci
Change in ...osmo-mgw[master]: mgw: Support uppercase LCO options
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/14589
Change subject: mgw: Support uppercase LCO options
..
mgw: Support uppercase LCO options
MGCP RFC3435 (https://tools.ietf.org/html/rfc3435) states almost all
text has to be handled in a case-insensitive way, except SDP parts.
Related: OS#4001
Change-Id: Ic28a5eacc4c441d68e8a20d2743956ab2e01125d
---
M src/libosmo-mgcp/mgcp_protocol.c
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
3 files changed, 76 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/89/14589/1
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 74926ad..841440b 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -590,7 +590,7 @@
static int set_local_cx_options(void *ctx, struct mgcp_lco *lco,
const char *options)
{
- char *p_opt, *a_opt;
+ char *lco_id;
char codec[17];
if (!options)
@@ -608,18 +608,32 @@
talloc_free(lco->string);
lco->string = talloc_strdup(ctx, options);
- p_opt = strstr(lco->string, "p:");
- if (p_opt && sscanf(p_opt, "p:%d-%d",
- &lco->pkt_period_min, &lco->pkt_period_max) == 1)
- lco->pkt_period_max = lco->pkt_period_min;
+ lco_id = lco->string;
+ while ((lco_id = get_lco_identifier(lco_id))) {
+ switch (tolower(lco_id[0])) {
+ case 'p':
+ if (sscanf(lco_id + 1, ":%d-%d",
+ &lco->pkt_period_min, &lco->pkt_period_max)
== 1)
+ lco->pkt_period_max = lco->pkt_period_min;
+ break;
+ case 'a':
+ /* FIXME: LCO also supports the negotiation of more
then one codec.
+* (e.g. a:PCMU;G726-32) But this implementation only
supports a single
+* codec only. */
+ if (sscanf(lco_id + 1, ":%16[^,]", codec) == 1) {
+ talloc_free(lco->codec);
+ lco->codec = talloc_strdup(ctx, codec);
+ }
+ break;
+ default:
+ LOGP(DLMGCP, LOGL_NOTICE,
+"LCO: unhandled option: '%c'/%d\n", *lco_id,
*lco_id);
+ break;
+ }
- /* FIXME: LCO also supports the negotiation of more then one codec.
-* (e.g. a:PCMU;G726-32) But this implementation only supports a single
-* codec only. */
- a_opt = strstr(lco->string, "a:");
- if (a_opt && sscanf(a_opt, "a:%16[^,]", codec) == 1) {
- talloc_free(lco->codec);
- lco->codec = talloc_strdup(ctx, codec);
+ lco_id = strchr(lco_id, ',');
+ if (!lco_id)
+ break;
}
LOGP(DLMGCP, LOGL_DEBUG,
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index c4931b2..ab6d0ce 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -208,8 +208,24 @@
"a=rtpmap:99 AMR/8000\r\n" \
"a=ptime:40\r\n"
-#define MDCX4_SO \
+/* Test different upper/lower case in options */
+#define MDCX4_PT4 \
"MDCX 18983220 1@mgw MGCP 1.0\r\n" \
+ "M: sendrecv\r" \
+ "C: 2\r\n" \
+ "I: %s\r\n" \
+ "L: A:AMR, NT:IN\r\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- %s 23 IN IP4 0.0.0.0\r\n" \
+ "c=IN IP4 0.0.0.0\r\n" \
+ "t=0 0\r\n" \
+ "m=audio 4441 RTP/AVP 99\r\n" \
+ "a=rtpmap:99 AMR/8000\r\n" \
+ "a=ptime:40\r\n"
+
+#define MDCX4_SO \
+ "MDCX 18983221 1@mgw MGCP 1.0\r\n" \
"M: sendonly\r" \
"C: 2\r\n" \
"I: %s\r\n" \
@@ -224,17 +240,17 @@
"a=ptime:40\r\n"
#define MDCX4_RO \
- "MDCX 18983221 1@mgw MGCP 1.0\r\n" \
+ "MDCX 18983222 1@mgw MGCP 1.0\r\n" \
"M: recvonly\r" \
"C: 2\r\n" \
"I: %s\r\n" \
"L: p:20, a:AMR, nt:IN\r\n"
#define MDCX_TOO_LONG_CI \
- "MDCX 18983222 1@mgw MGCP 1.0\r\n" \
+ "MDCX 18983223 1@mgw MGCP 1.0\r\n" \
"I: 123456789012345678901234567890123\n"
-#define MDCX_TOO_LONG_CI_RET "510 18983222 FAIL\r\n"
+#define MDCX_TOO_LONG_CI_RET "510 18983223 FAIL\r\n"
#define SHORT2 "CRCX 1"
#define SHORT2_RET "510 00 FAIL\r\n"
@@ -526,8 +542,9 @@
{"MDCX4_PT1", MDCX4_PT1, MDCX4_RET("18983217"), 99},
{"MDCX4_PT2", MDCX4_PT2, MDCX4_RET("18983218"), 99},
{"MDCX4_PT3", MDCX4_PT3, MDCX4_RET("18983219"), 99},
- {"MDCX4_SO", MDCX4_SO, MDCX4_RET("18983220"), 99},
- {"MDCX4_RO", MDCX4_RO, MDCX4_RO_RET("18983221"), PTYPE_IGNORE},
+ {"MDCX4_PT4", MDCX4_PT4, MDCX4_RET("18983220"), 99},
+ {"MDCX4_SO", MDCX4_SO, MDCX4_RET(
Change in ...osmo-mgw[master]: mgw: Support upper-case header parameters
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/14590
Change subject: mgw: Support upper-case header parameters
..
mgw: Support upper-case header parameters
MGCP RFC3435 (https://tools.ietf.org/html/rfc3435) states almost all
text has to be handled in a case-insensitive way, except SDP parts.
Related: OS#4001
Change-Id: I48252415f9d0cd985ad097f334aa4c1665f52511
---
M src/libosmo-mgcp/mgcp_protocol.c
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
3 files changed, 18 insertions(+), 20 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/90/14590/1
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 841440b..6473394 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -812,7 +812,7 @@
if (!mgcp_check_param(endp, line))
continue;
- switch (line[0]) {
+ switch (toupper(line[0])) {
case 'L':
local_options = (const char *)line + 3;
break;
@@ -830,7 +830,6 @@
mode = (const char *)line + 3;
break;
case 'X':
- case 'x':
if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: "))
== 0) {
/* If osmux is disabled, just skip setting it
up */
if (!p->endp->cfg->osmux)
@@ -1089,7 +1088,7 @@
if (!mgcp_check_param(endp, line))
continue;
- switch (line[0]) {
+ switch (toupper(line[0])) {
case 'C':
if (mgcp_verify_call_id(endp, line + 3) != 0) {
rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CALLID]);
@@ -1114,7 +1113,6 @@
silent = strcmp("noanswer", line + 3) == 0;
break;
case 'X':
- case 'x':
if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: "))
== 0) {
/* If osmux is disabled, just skip setting it
up */
if (!p->endp->cfg->osmux)
@@ -1313,7 +1311,7 @@
if (!mgcp_check_param(endp, line))
continue;
- switch (line[0]) {
+ switch (toupper(line[0])) {
case 'C':
if (mgcp_verify_call_id(endp, line + 3) != 0) {
error_code = 516;
@@ -1464,7 +1462,7 @@
LOGP(DLMGCP, LOGL_NOTICE, "RQNT: processing request for notification
...\n");
for_each_line(line, p->save) {
- switch (line[0]) {
+ switch (toupper(line[0])) {
case 'S':
tone = extract_tone(line);
break;
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index ab6d0ce..c67b9d5 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -211,10 +211,10 @@
/* Test different upper/lower case in options */
#define MDCX4_PT4 \
"MDCX 18983220 1@mgw MGCP 1.0\r\n" \
- "M: sendrecv\r" \
- "C: 2\r\n" \
- "I: %s\r\n" \
- "L: A:AMR, NT:IN\r\n" \
+ "m: sendrecv\r" \
+ "c: 2\r\n" \
+ "i: %s\r\n" \
+ "l: A:AMR, NT:IN\r\n" \
"\n" \
"v=0\r\n" \
"o=- %s 23 IN IP4 0.0.0.0\r\n" \
@@ -260,7 +260,7 @@
#define CRCX \
"CRCX 2 1@mgw MGCP 1.0\r\n" \
- "M: recvonly\r\n" \
+ "m: recvonly\r\n" \
"C: 2\r\n" \
"L: p:20\r\n" \
"\r\n" \
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index 3929d79..08ea438 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -65,7 +65,7 @@
creating message from statically defined input:
-8<-
CRCX 2 1@mgw MGCP 1.0
-M: recvonly
+m: recvonly
C: 2
L: p:20
@@ -197,9 +197,9 @@
creating message from statically defined input:
-8<-
MDCX 18983220 1@mgw MGCP 1.0
-M: sendrecv
C: 2
-I: %s
-L: A:AMR, NT:IN
+m: sendrecv
c: 2
+i: %s
+l: A:AMR, NT:IN
v=0
o=- %s 23 IN IP4 0.0.0.0
@@ -383,7 +383,7 @@
creating message from statically defined input:
-8<-
CRCX 2 1@mgw MGCP 1.0
-M: recvonly
+m: recvonly
C: 2
L: p:20
@@ -508,7 +508,7 @@
creating message from statically defined input:
-8<-
CRCX 2 1@mgw MGCP 1.0
-M: recvonly
+m: recvonly
C: 2
L: p:20
@@ -526,7 +526,7 @@
creating message from statically defined input:
-8<-
CRCX 2 1@mgw MGCP 1.0
-M: recvonly
+m: recvonly
C: 2
L: p:20
@@ -638,7 +638,7 @@
creating message from statically defined input:
-8<-
CRCX 2 1@mgw MGCP 1.0
-M: recvonly
+m: recvonly
C: 2
L: p:20
@@ -1189,7 +1189,7 @@
creating
Build failure of network:osmocom:nightly/libosmocore in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Raspbian_9.0/armv7l Package network:osmocom:nightly/libosmocore failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 582s] -Returned: 0, Current node: 1 '%s> ' [ 582s] -Going to execute 'ambiguous_str' [ 582s] -Called: 'ambiguous_str [ARG]' (argc=0) [ 582s] -Returned: 0, Current node: 1 '%s> ' [ 582s] -Going to execute 'ambiguous_str arg' [ 582s] -Called: 'ambiguous_str [ARG]' (argc=1) [ 582s] -Returned: 0, Current node: 1 '%s> ' [ 582s] -Going to execute 'ambiguous_str arg keyword' [ 582s] -Called: 'ambiguous_str ARG keyword' [ 582s] -Returned: 0, Current node: 1 '%s> ' [ 582s] -All tests passed [ 582s] ./testsuite.at:196: exit code was 139, expected 0 [ 582s] 31. testsuite.at:192: 31. vty (testsuite.at:192): FAILED (testsuite.at:196) [ 582s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 582s] make[1]: *** [override_dh_auto_test] Error 1 [ 582s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 582s] debian/rules:15: recipe for target 'build' failed [ 582s] make: *** [build] Error 2 [ 582s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 582s] [ 582s] armbuild21 failed "build libosmocore_1.1.0.73.e1e1.dsc" at Wed Jun 26 02:41:31 UTC 2019. [ 582s] [ 582s] ### VM INTERACTION START ### [ 585s] [ 565.916212] sysrq: SysRq : Power Off [ 585s] [ 565.972069] reboot: Power down [ 585s] ### VM INTERACTION END ### [ 585s] [ 585s] armbuild21 failed "build libosmocore_1.1.0.73.e1e1.dsc" at Wed Jun 26 02:41:34 UTC 2019. [ 585s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bts in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-bts failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 478s] ../../src/common/libbts.a(bts.o): In function `lchan_init_lapdm': [ 478s] ./src/common/bts.c:423: undefined reference to `lapdm_channel_init2' [ 478s] collect2: error: ld returned 1 exit status [ 478s] Makefile:421: recipe for target 'osmo-bts-virtual' failed [ 478s] make[4]: *** [osmo-bts-virtual] Error 1 [ 478s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 478s] Makefile:385: recipe for target 'all-recursive' failed [ 478s] make[3]: *** [all-recursive] Error 1 [ 478s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 478s] Makefile:434: recipe for target 'all-recursive' failed [ 478s] make[2]: *** [all-recursive] Error 1 [ 478s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 478s] Makefile:366: recipe for target 'all' failed [ 478s] make[1]: *** [all] Error 2 [ 478s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 478s] dh_auto_build: make -j1 returned exit code 2 [ 478s] debian/rules:12: recipe for target 'build' failed [ 478s] make: *** [build] Error 2 [ 478s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 478s] [ 478s] obs-arm-5 failed "build osmo-bts_0.8.1.328.5b92.dsc" at Wed Jun 26 05:15:30 UTC 2019. [ 478s] [ 478s] ### VM INTERACTION START ### [ 481s] [ 444.894410] sysrq: SysRq : Power Off [ 481s] [ 444.912299] reboot: Power down [ 481s] ### VM INTERACTION END ### [ 481s] [ 481s] obs-arm-5 failed "build osmo-bts_0.8.1.328.5b92.dsc" at Wed Jun 26 05:15:33 UTC 2019. [ 481s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-sgsn in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 563s] bss_ptmsi = bss_ptmsi | GSM23003_TMSI_SGSN_MASK; [ 563s] ^~~ [ 563s] gb_proxy.c:246:28: note: each undeclared identifier is reported only once for each function it appears in [ 563s] Makefile:615: recipe for target 'gb_proxy.o' failed [ 563s] make[4]: *** [gb_proxy.o] Error 1 [ 563s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/gprs' [ 563s] Makefile:391: recipe for target 'all-recursive' failed [ 563s] make[3]: *** [all-recursive] Error 1 [ 563s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 563s] Makefile:453: recipe for target 'all-recursive' failed [ 563s] make[2]: *** [all-recursive] Error 1 [ 563s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 563s] Makefile:385: recipe for target 'all' failed [ 563s] make[1]: *** [all] Error 2 [ 563s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 563s] dh_auto_build: make -j1 returned exit code 2 [ 563s] debian/rules:45: recipe for target 'build' failed [ 563s] make: *** [build] Error 2 [ 563s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 563s] [ 563s] armbuild25 failed "build osmo-sgsn_1.4.0.27.43c5.dsc" at Wed Jun 26 06:10:24 UTC 2019. [ 563s] [ 563s] ### VM INTERACTION START ### [ 566s] [ 538.501896] sysrq: SysRq : Power Off [ 566s] [ 538.518304] reboot: Power down [ 567s] ### VM INTERACTION END ### [ 567s] [ 567s] armbuild25 failed "build osmo-sgsn_1.4.0.27.43c5.dsc" at Wed Jun 26 06:10:28 UTC 2019. [ 567s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 652s] tmsi |= GSM23003_TMSI_SGSN_MASK; [ 652s] ^~~ [ 652s] vlr.c:339:12: note: each undeclared identifier is reported only once for each function it appears in [ 652s] Makefile:442: recipe for target 'vlr.o' failed [ 652s] make[4]: *** [vlr.o] Error 1 [ 652s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libvlr' [ 652s] Makefile:422: recipe for target 'all-recursive' failed [ 652s] make[3]: *** [all-recursive] Error 1 [ 652s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 652s] Makefile:462: recipe for target 'all-recursive' failed [ 652s] make[2]: *** [all-recursive] Error 1 [ 652s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 652s] Makefile:394: recipe for target 'all' failed [ 652s] make[1]: *** [all] Error 2 [ 652s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 652s] dh_auto_build: make -j1 returned exit code 2 [ 652s] debian/rules:45: recipe for target 'build' failed [ 652s] make: *** [build] Error 2 [ 652s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 652s] [ 652s] armbuild19 failed "build osmo-msc_1.3.1.175.1c500.dsc" at Wed Jun 26 06:22:47 UTC 2019. [ 652s] [ 652s] ### VM INTERACTION START ### [ 655s] [ 603.921439] sysrq: SysRq : Power Off [ 655s] [ 603.924005] reboot: Power down [ 655s] ### VM INTERACTION END ### [ 655s] [ 655s] armbuild19 failed "build osmo-msc_1.3.1.175.1c500.dsc" at Wed Jun 26 06:22:50 UTC 2019. [ 655s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-bts[master]: osmo-bts-trx/trx_if.c: introduce TRXD header version 0x01 support
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/14593
Change subject: osmo-bts-trx/trx_if.c: introduce TRXD header version 0x01
support
..
osmo-bts-trx/trx_if.c: introduce TRXD header version 0x01 support
The new version adds the following fields to the TRX2L1 message,
keeping the L12TRX message unchanged:
+--+-+-+-++
| RSSI | ToA | MTS | C/I | soft-bits (254..0) |
+--+-+-+-++
- MTS (1 octet) - Modulation and Training Sequence info, and
- C/I (2 octets) - Carrier-to-Interference ratio (big endian).
== Coding of MTS: Modulation and Training Sequence info
3GPP TS 45.002 version 15.1.0 defines several modulation types,
and a few sets of training sequences for each type. The most
common are GMSK and 8-PSK (which is used in EDGE).
+-+---+
| 7 6 5 4 3 2 1 0 | bit numbers (value range) |
+-+---+
| . . . . . X X X | Training Sequence Code (0..7) |
+-+---+
| . X X X X . . . | Modulation, TS set number (see below) |
+-+---+
| X . . . . . . . | IDLE / nope frame indication (0 or 1) |
+-+---+
The bit number 7 (MSB) is set to high when either nothing has been
detected, or during IDLE frames, so we can deliver noise levels,
and avoid clock gaps on the L1 side. Other bits are ignored,
and should be set to low (0) in this case. L16 shall be set to 0x00.
== Coding of modulation and TS set number
GMSK has 4 sets of training sequences (see tables 5.2.3a-d),
while 8-PSK (see tables 5.2.3f-g) and the others have 2 sets.
Access and Synchronization bursts also have several synch.
sequences.
+-+---+
| 7 6 5 4 3 2 1 0 | bit numbers (value range) |
+-+---+
| . 0 0 X X . . . | GMSK, 4 TS sets (0..3)|
+-+---+
| . 0 1 0 X . . . | 8-PSK, 2 TS sets (0..1) |
+-+---+
| . 0 1 1 X . . . | AQPSK, 2 TS sets (0..1) |
+-+---+
| . 1 0 0 X . . . | 16QAM, 2 TS sets (0..1) |
+-+---+
| . 1 0 1 X . . . | 32QAM, 2 TS sets (0..1) |
+-+---+
| . 1 1 1 X . . . | RESERVED (0) |
+-+---+
== C/I: Carrier-to-Interference ratio
The C/I value is computed from the training sequence of each burst,
where we can compare the "ideal" training sequence with the actual
training sequence, and then express that difference in centiBels.
== Limitations
- The only supported modulation types are GMSK and 8-PSK.
Messages with other modulation types will be rejected.
- IDLE / NOPE indications are not (yet) supported.
- The logical channel handlers do not (yet) handle optional
fields, such as TSC and C/I. This will be implemented
in the follow-up changes.
Change-Id: If61c71d20d590bf07bfd019afb33000a0b6135bd
Related: OS#4006
---
M include/osmo-bts/scheduler.h
M src/osmo-bts-trx/trx_if.c
2 files changed, 148 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/14593/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index 695700d..4b2b5bc 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -227,14 +227,28 @@
bool trx_sched_is_sacch_fn(struct gsm_bts_trx_ts *ts, uint32_t fn, bool
uplink);
extern const struct trx_sched_multiframe trx_sched_multiframes[];
+#define TRX_BI_F_NOPE_IND (1 << 0)
+#define TRX_BI_F_MOD_TYPE (1 << 1)
+#define TRX_BI_F_TS_INFO (1 << 2)
+#define TRX_BI_F_CI_CB (1 << 3)
+
/*! UL burst indication with the corresponding meta info */
struct trx_ul_burst_ind {
+ /* Field presence bitmask (see TRX_BI_F_*) */
+ uint32_t flags;
+
/* Mandatory fields */
uint32_t fn;/*!< TDMA frame number */
uint8_t tn; /*!< TDMA time-slot number */
int16_t toa256; /*!< Timing of Arrival in units of 1/256 of
symbol */
int8_t rssi;/*!< Received Signal Strength Indication */
+ /* Optional fields (defined by flags) */
+ enum trx_burst_type bt; /*!< Modulation type */
+ uint8_t tsc_set;/*!< Training Sequence Set */
+ uint8_t tsc;/*!< Training Sequence Code */
+
Change in ...osmo-bts[master]: osmo-bts-trx/trx_if.c: introduce TRXD header version handling
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/14592
Change subject: osmo-bts-trx/trx_if.c: introduce TRXD header version handling
..
osmo-bts-trx/trx_if.c: introduce TRXD header version handling
It may be necessary to extend the message specific header with
more information. Since this is not a TLV-based protocol, we
need to include the header format version.
+-+---+
| 7 6 5 4 3 2 1 0 | bit numbers (value range) |
+-+---+
| X X X X . . . . | header version (0..15)|
+-+---+
| . . . . . X X X | TDMA TN (0..7)|
+-+---+
| . . . . X . . . | RESERVED (0) |
+-+---+
Instead of prepending an additional byte, it was decided to use
4 MSB bits of the first octet, which used to be zero-initialized
due to the value range of TDMA TN (0..7). Therefore the current
header format has implicit version 0x00.
Otherwise Wireshark (or trx_sniff.py) would have to guess the
header version, or alternatively follow the control channel
looking for the version setting command.
This change introduces a new structure 'trx_ul_burst_ind', which
represents an Uplink burst and the corresponding meta info. The
purpose of this structure is to avoid overloading the existing
functions, such as trx_sched_ul_burst(), with more and more
arguments every time we bump the version.
On receipt of a TRXD message, trx_data_read_cb() now parses
the header version, and calls the corresponding dissector
function, e.g. trx_data_handle_v0() for version 0x00.
Change-Id: I171c18229ca3e5cab70de0064a31e47c78602c0c
Related: OS#4006
---
M include/osmo-bts/scheduler.h
M src/common/scheduler.c
M src/osmo-bts-trx/trx_if.c
3 files changed, 180 insertions(+), 53 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/14592/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index c862307..695700d 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -173,10 +173,6 @@
/*! \brief PHY informs us of new (current) GSM frame number */
int trx_sched_clock(struct gsm_bts *bts, uint32_t fn);
-/*! \brief handle an UL burst received by PHY */
-int trx_sched_ul_burst(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
-sbit_t *bits, uint16_t nbits, int8_t rssi, int16_t toa);
-
/*! \brief set multiframe scheduler to given physical channel config */
int trx_sched_set_pchan(struct l1sched_trx *l1t, uint8_t tn,
enum gsm_phys_chan_config pchan);
@@ -231,4 +227,20 @@
bool trx_sched_is_sacch_fn(struct gsm_bts_trx_ts *ts, uint32_t fn, bool
uplink);
extern const struct trx_sched_multiframe trx_sched_multiframes[];
+/*! UL burst indication with the corresponding meta info */
+struct trx_ul_burst_ind {
+ /* Mandatory fields */
+ uint32_t fn;/*!< TDMA frame number */
+ uint8_t tn; /*!< TDMA time-slot number */
+ int16_t toa256; /*!< Timing of Arrival in units of 1/256 of
symbol */
+ int8_t rssi;/*!< Received Signal Strength Indication */
+
+ /* Burst soft-bits */
+ size_t burst_len;
+ sbit_t *burst;
+};
+
+/*! Handle an UL burst received by PHY */
+int trx_sched_ul_burst(struct l1sched_trx *l1t, const struct trx_ul_burst_ind
*bi);
+
#endif /* TRX_SCHEDULER_H */
diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 3f804a9..7b51a2a 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -1313,11 +1313,10 @@
return 0;
}
-/* process uplink burst */
-int trx_sched_ul_burst(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
- sbit_t *bits, uint16_t nbits, int8_t rssi, int16_t toa256)
+/* Process an Uplink burst indication */
+int trx_sched_ul_burst(struct l1sched_trx *l1t, const struct trx_ul_burst_ind
*bi)
{
- struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);
+ struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, bi->tn);
struct l1sched_chan_state *l1cs;
const struct trx_sched_frame *frame;
uint8_t offset, period, bid;
@@ -1329,7 +1328,7 @@
/* get frame from multiframe */
period = l1ts->mf_period;
- offset = fn % period;
+ offset = bi->fn % period;
frame = l1ts->mf_frames + offset;
chan = frame->ul_chan;
@@ -1346,28 +1345,29 @@
return -EINVAL;
/* calculate how many TDMA frames were potentially lost */
- trx_sched_calc_frame_loss(l1t, l1cs, tn, fn);
+ trx_sched_calc_frame_loss(l1t, l1cs, bi->tn, bi->fn);
/* update TDMA frame counters */
- l1cs->last_tdma_fn = fn;
+ l1cs->last_tdma_fn = bi->fn;
l1cs->proc_tdma_fs++;
/* decrypt */
- if (bits && l
Change in ...osmo-bts[master]: osmo-bts-trx/trx_if.c: use osmo_loadXXbe() for TDMA FN and ToA256
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/14591
Change subject: osmo-bts-trx/trx_if.c: use osmo_loadXXbe() for TDMA FN and
ToA256
..
osmo-bts-trx/trx_if.c: use osmo_loadXXbe() for TDMA FN and ToA256
Change-Id: Iec0d86f9be7243578ddc1ab322fc313cb5ac5d0b
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/14591/1
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 2805260..fde4d50 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -39,6 +39,9 @@
#include
#include
+#include
+#include
+
#include
#include
#include
@@ -611,9 +614,9 @@
return -EINVAL;
}
tn = buf[0];
- fn = (buf[1] << 24) | (buf[2] << 16) | (buf[3] << 8) | buf[4];
+ fn = osmo_load32be(buf + 1);
rssi = -(int8_t)buf[5];
- toa256 = ((int16_t)(buf[6] << 8) | buf[7]);
+ toa256 = (int16_t) osmo_load16be(buf + 6);
/* copy and convert bits {254..0} to sbits {-127..127} */
for (i = 0; i < burst_len; i++) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14591
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iec0d86f9be7243578ddc1ab322fc313cb5ac5d0b
Gerrit-Change-Number: 14591
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
