Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges..

[Pau Espin Pedrol]

Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/10967 )

Change subject: Install to /bin as it doesn't require special privileges..
..


Patch Set 2:

I think since we don't plan to have binaries with spaces in path is not worth 
spending time changing the logic in the osmo-gsm-tester script. This patch is 
good though.

Note too that osmocon is nowadays installed in /sbin too, I don't know if 
there's some point in installing it there or we should move it to /bin too.


--
To view, visit https://gerrit.osmocom.org/10967
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibe572a4c17871785b623e70acc7f5da056f945e5
Gerrit-Change-Number: 10967
Gerrit-PatchSet: 2
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Holger Freyther 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Mon, 17 Sep 2018 07:56:47 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges..

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10967 )

Change subject: Install to /bin as it doesn't require special privileges..
..


Patch Set 2:

> Note too that osmocon is nowadays installed in /sbin too, I don't
 > know if there's some point in installing it there or we should move
 > it to /bin too.

It should move to /bin, I guess.  Maybe create an issue with an overall audit 
of binary install locations?


--
To view, visit https://gerrit.osmocom.org/10967
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibe572a4c17871785b623e70acc7f5da056f945e5
Gerrit-Change-Number: 10967
Gerrit-PatchSet: 2
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Holger Freyther 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Mon, 17 Sep 2018 08:04:08 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-ttcn3-hacks[master]: GSM_Types: Add CBCH_Block definition of TS 04.12

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10982 )

Change subject: GSM_Types: Add CBCH_Block definition of TS 04.12
..

GSM_Types: Add CBCH_Block definition of TS 04.12

Change-Id: Ib034aba11a0219959c4224238e559ba36e95cacf
---
M library/GSM_Types.ttcn
M library/General_Types.ttcn
2 files changed, 43 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn
index 53208e5..88be975 100644
--- a/library/GSM_Types.ttcn
+++ b/library/GSM_Types.ttcn
@@ -207,6 +207,48 @@
}
}

+
+/* TS 04.12 Section 3.3.1 Block type */
+type record CBCH_BlockType {
+   BIT1spare,
+   BIT2lpd,
+   boolean last_block,
+   uint4_t seq_nr
+};
+template (value) CBCH_BlockType ts_CBCH_BlockType(template (value) uint4_t 
seq_nr, template (value) boolean last_block) := {
+   spare := '0'B,
+   lpd := '01'B,
+   last_block := last_block,
+   seq_nr := seq_nr
+};
+template CBCH_BlockType tr_CBCH_BlockType(template uint4_t seq_nr := ?, 
template boolean last_block := ?) := {
+   spare := '0'B,
+   lpd := '01'B,
+   last_block := last_block,
+   seq_nr := seq_nr
+};
+
+/* TS 04.12 Section 3.3 */
+type record CBCH_Block {
+   CBCH_BlockType  block_type,
+   OCT22   payload
+};
+template (value) CBCH_Block ts_CBCH_Block(template (value) uint4_t seq_nr, 
template (value) boolean last_block, template (value) OCT22 payload) := {
+   block_type := ts_CBCH_BlockType(seq_nr, last_block),
+   payload := payload
+};
+template CBCH_Block tr_CBCH_Block(template uint4_t seq_nr := ?, template 
boolean last_block := ?, template OCT22 payload := ?) := {
+   block_type := tr_CBCH_BlockType(seq_nr, last_block),
+   payload := payload
+};
+
+
+external function enc_CBCH_Block(in CBCH_Block msg) return octetstring
+   with { extension "prototype(convert) encode(RAW)" };
+external function dec_CBCH_Block(in octetstring stream) return CBCH_Block
+   with { extension "prototype(convert) decode(RAW)" };
+
+
 /* Convert RF signal level in dBm to RxLev (TS 45.008 Chapter 8.1.4) */
 function dbm2rxlev(integer dbm) return uint6_t {
var integer rxlev := dbm + 110;
diff --git a/library/General_Types.ttcn b/library/General_Types.ttcn
index 83b2a42..612d5c7 100644
--- a/library/General_Types.ttcn
+++ b/library/General_Types.ttcn
@@ -233,6 +233,7 @@
   type octetstring OCT18 length(18) with { variant "FIELDLENGTH(18)" };
   type octetstring OCT19 length(19) with { variant "FIELDLENGTH(19)" };
   type octetstring OCT20 length(20) with { variant "FIELDLENGTH(20)" };
+  type octetstring OCT22 length(22) with { variant "FIELDLENGTH(22)" };
   type octetstring OCT32 length(32) with { variant "FIELDLENGTH(32)" };
   type octetstring OCT34 length(34) with { variant "FIELDLENGTH(34)" };
   type octetstring OCT46 length(46) with { variant "FIELDLENGTH(46)" };

--
To view, visit https://gerrit.osmocom.org/10982
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib034aba11a0219959c4224238e559ba36e95cacf
Gerrit-Change-Number: 10982
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-gsm-tester[master]: build: Add overload to clone repo and build in subdirectory

[Pau Espin Pedrol]

Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/10970 )

Change subject: build: Add overload to clone repo and build in subdirectory
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10970
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I67fbd54296f2c68316bf8e89cfeb37d147193d53
Gerrit-Change-Number: 10970
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Mon, 17 Sep 2018 08:04:57 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: build: Add script to build the mobile application

[Pau Espin Pedrol]

Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/10971 )

Change subject: build: Add script to build the mobile application
..


Patch Set 1: Code-Review-1

This should go into jenkins-build-osmocom-bb.sh, not an extra build job.

Is there any reason not to put it there? We already have lots of build jobs and 
.tar.gz and have to copy them every time we run an osmo-gsm-tester job, so I'd 
prefer keep them at 1 per git repo as much as possible.


--
To view, visit https://gerrit.osmocom.org/10971
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2c537e56aa982b0b4a703fa78c77ade507738b68
Gerrit-Change-Number: 10971
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Mon, 17 Sep 2018 08:07:23 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: Add script to build virt_phy of OsmocomBB

[Pau Espin Pedrol]

Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/10972 )

Change subject: Add script to build virt_phy of OsmocomBB
..


Patch Set 1: Code-Review-1

Same for this one.


--
To view, visit https://gerrit.osmocom.org/10972
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f14ce43db2f5e16f94dc975e7496dceb4f4b72a
Gerrit-Change-Number: 10972
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Mon, 17 Sep 2018 08:07:57 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libsmpp34[master]: debian/rules: Don't overwrite .tarball-version

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10989


Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe
---
M debian/rules
1 file changed, 0 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/89/10989/1

diff --git a/debian/rules b/debian/rules
index 4f472a7..3e8938e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,6 @@
 override_dh_strip:
dh_strip --dbg-package=libsmpp34-dbg

-override_dh_autoreconf:
-   echo $(VERSION) > .tarball-version
-   dh_autoreconf
-
 # Print test results in case of a failure
 override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)

--
To view, visit https://gerrit.osmocom.org/10989
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libsmpp34
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe
Gerrit-Change-Number: 10989
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in libgtpnl[master]: debian/rules: Don't overwrite .tarball-version

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10990


Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975
---
M debian/rules
1 file changed, 0 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/90/10990/1

diff --git a/debian/rules b/debian/rules
index 0d602e5..616f96d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,3 @@
 # Print test results in case of a failure
 override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
-
-override_dh_autoreconf:
-   echo $(VERSION) > .tarball-version
-   dh_autoreconf

--
To view, visit https://gerrit.osmocom.org/10990
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975
Gerrit-Change-Number: 10990
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in libusrp[master]: debian/rules: Don't overwrite .tarball-version

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10991


Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99
---
M debian/rules
1 file changed, 0 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/91/10991/1

diff --git a/debian/rules b/debian/rules
index 04669b3..5835e95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,6 @@
 %:
dh $@ --with autoreconf --fail-missing

-override_dh_autoreconf:
-   echo $(VERSION) > .tarball-version
-   dh_autoreconf
-
 override_dh_auto_configure:
dh_auto_configure -- --enable-doxygen


--
To view, visit https://gerrit.osmocom.org/10991
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99
Gerrit-Change-Number: 10991
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in libasn1c[master]: debian/rules: Don't overwrite .tarball-version

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10992


Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19
---
M debian/rules
1 file changed, 0 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/92/10992/1

diff --git a/debian/rules b/debian/rules
index a1039b0..bb73059 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,10 +47,6 @@
 %:
dh $@ --with autoreconf

-override_dh_autoreconf:
-   echo $(VERSION) > .tarball-version
-   dh_autoreconf
-
 # debmake generated override targets
 # Set options for ./configure
 #CONFIGURE_FLAGS = 

--
To view, visit https://gerrit.osmocom.org/10992
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libasn1c
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19
Gerrit-Change-Number: 10992
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in openbsc[master]: debian/rules: Don't overwrite .tarball-version

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10993


Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: Ice1875bbd051f78b4a3bcadef48e639419b55e8f
---
M debian/rules
1 file changed, 0 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/93/10993/1

diff --git a/debian/rules b/debian/rules
index e37a262..dc609f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@
dh_strip -posmocom-bsc-nat --dbg-package=osmocom-bsc-nat-dbg

 override_dh_auto_configure:
-   echo $(VERSION) > openbsc/.tarball-version
dh_auto_configure --sourcedirectory=openbsc -- --enable-nat 
--enable-osmo-bsc --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system

 # Print test results in case of a failure

--
To view, visit https://gerrit.osmocom.org/10993
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice1875bbd051f78b4a3bcadef48e639419b55e8f
Gerrit-Change-Number: 10993
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in openbsc[master]: mgcp: Fix osmux_cid_bitmap static array size calculation

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10994


Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation
..

mgcp: Fix osmux_cid_bitmap static array size calculation

Right now it's not a big issue since OSMUX_CID_MAX is 255, so 255+1 is
256 which fits array boundaries correctly (multiple of 8). However, if
for example OSMUC_CID_MAX was modified to be 12, 12+1/8 = 1, so we'd
have an undesired memory access when accessing last 4 CIDs.

Change-Id: I5908ee44404686e68d61f255b7014af39c8f5703
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/94/10994/1

diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index 8a802f5..ca0ed30 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -545,7 +545,7 @@
 }

 /* bsc-nat allocates/releases the Osmux circuit ID */
-static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1) / 8];
+static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8];

 int osmux_used_cid(void)
 {

--
To view, visit https://gerrit.osmocom.org/10994
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5908ee44404686e68d61f255b7014af39c8f5703
Gerrit-Change-Number: 10994
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in libusrp[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10991 )

Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99
---
M debian/rules
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/debian/rules b/debian/rules
index 04669b3..5835e95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,6 @@
 %:
dh $@ --with autoreconf --fail-missing

-override_dh_autoreconf:
-   echo $(VERSION) > .tarball-version
-   dh_autoreconf
-
 override_dh_auto_configure:
dh_auto_configure -- --enable-doxygen


--
To view, visit https://gerrit.osmocom.org/10991
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99
Gerrit-Change-Number: 10991
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libusrp[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10991 )

Change subject: debian/rules: Don't overwrite .tarball-version
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10991
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99
Gerrit-Change-Number: 10991
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:28:27 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in openbsc[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10993 )

Change subject: debian/rules: Don't overwrite .tarball-version
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10993
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ice1875bbd051f78b4a3bcadef48e639419b55e8f
Gerrit-Change-Number: 10993
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:29:13 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libgtpnl[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10990 )

Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975
---
M debian/rules
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/debian/rules b/debian/rules
index 0d602e5..616f96d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,3 @@
 # Print test results in case of a failure
 override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
-
-override_dh_autoreconf:
-   echo $(VERSION) > .tarball-version
-   dh_autoreconf

--
To view, visit https://gerrit.osmocom.org/10990
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975
Gerrit-Change-Number: 10990
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libsmpp34[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10989 )

Change subject: debian/rules: Don't overwrite .tarball-version
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10989
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libsmpp34
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe
Gerrit-Change-Number: 10989
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:28:58 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libgtpnl[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10990 )

Change subject: debian/rules: Don't overwrite .tarball-version
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10990
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I22dac8524ce8acb033dc9c72eab107999f49f975
Gerrit-Change-Number: 10990
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:28:39 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libasn1c[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10992 )

Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19
---
M debian/rules
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/debian/rules b/debian/rules
index a1039b0..bb73059 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,10 +47,6 @@
 %:
dh $@ --with autoreconf

-override_dh_autoreconf:
-   echo $(VERSION) > .tarball-version
-   dh_autoreconf
-
 # debmake generated override targets
 # Set options for ./configure
 #CONFIGURE_FLAGS = 

--
To view, visit https://gerrit.osmocom.org/10992
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libasn1c
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19
Gerrit-Change-Number: 10992
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libasn1c[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10992 )

Change subject: debian/rules: Don't overwrite .tarball-version
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10992
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libasn1c
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I61a7995edf9fbc06db88ab391d32a988c3760c19
Gerrit-Change-Number: 10992
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:29:05 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in openbsc[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10993 )

Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: Ice1875bbd051f78b4a3bcadef48e639419b55e8f
---
M debian/rules
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/debian/rules b/debian/rules
index e37a262..dc609f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@
dh_strip -posmocom-bsc-nat --dbg-package=osmocom-bsc-nat-dbg

 override_dh_auto_configure:
-   echo $(VERSION) > openbsc/.tarball-version
dh_auto_configure --sourcedirectory=openbsc -- --enable-nat 
--enable-osmo-bsc --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system

 # Print test results in case of a failure

--
To view, visit https://gerrit.osmocom.org/10993
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice1875bbd051f78b4a3bcadef48e639419b55e8f
Gerrit-Change-Number: 10993
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libsmpp34[master]: debian/rules: Don't overwrite .tarball-version

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10989 )

Change subject: debian/rules: Don't overwrite .tarball-version
..

debian/rules: Don't overwrite .tarball-version

The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe
---
M debian/rules
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/debian/rules b/debian/rules
index 4f472a7..3e8938e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,6 @@
 override_dh_strip:
dh_strip --dbg-package=libsmpp34-dbg

-override_dh_autoreconf:
-   echo $(VERSION) > .tarball-version
-   dh_autoreconf
-
 # Print test results in case of a failure
 override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)

--
To view, visit https://gerrit.osmocom.org/10989
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libsmpp34
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I30714578bc7fb3cfe333eebec89dc06eb1bbc9fe
Gerrit-Change-Number: 10989
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in openbsc[master]: mgcp: Fix osmux_cid_bitmap static array size calculation

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10994 )

Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10994
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I5908ee44404686e68d61f255b7014af39c8f5703
Gerrit-Change-Number: 10994
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-CC: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:29:42 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: store classmark in vlr_subscr, not conn

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10985 )

Change subject: store classmark in vlr_subscr, not conn
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10985
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I27081bf6e9e017923b2d02607f7ea06beddad82a
Gerrit-Change-Number: 10985
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:33:10 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10986 )

Change subject: msc_vlr_tests: cosmetically tweak perm algo printing
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10986
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3
Gerrit-Change-Number: 10986
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:33:37 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in openbsc[master]: mgcp: Fix osmux_cid_bitmap static array size calculation

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10994 )

Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation
..

mgcp: Fix osmux_cid_bitmap static array size calculation

Right now it's not a big issue since OSMUX_CID_MAX is 255, so 255+1 is
256 which fits array boundaries correctly (multiple of 8). However, if
for example OSMUC_CID_MAX was modified to be 12, 12+1/8 = 1, so we'd
have an undesired memory access when accessing last 4 CIDs.

Change-Id: I5908ee44404686e68d61f255b7014af39c8f5703
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index 8a802f5..ca0ed30 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -545,7 +545,7 @@
 }

 /* bsc-nat allocates/releases the Osmux circuit ID */
-static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1) / 8];
+static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8];

 int osmux_used_cid(void)
 {

--
To view, visit https://gerrit.osmocom.org/10994
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I5908ee44404686e68d61f255b7014af39c8f5703
Gerrit-Change-Number: 10994
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-msc[master]: A5/n Ciph: request Classmark Update if missing

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10987 )

Change subject: A5/n Ciph: request Classmark Update if missing
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10987
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I73c7cb6a86624695bd9c0f59abb72e2fdc655131
Gerrit-Change-Number: 10987
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:35:49 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: store classmark in vlr_subscr, not conn

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10985 )

Change subject: store classmark in vlr_subscr, not conn
..

store classmark in vlr_subscr, not conn

Store all Classmark information in the VLR.

So, we now always know the Classmark 1 (mandatory IE for LU). This is visible
in the msc_vlr_tests -- they no longer indicate "assuming A5/1 is supported"
because classmark 1 is missing, because we now know the Classmark 1.

Rationale:

During Location Updating, we receive Classmark 1; during CM Service Request and
Paging Response, we receive Classmark 2. So far we stored these only for the
duration of the conn, so as soon as a LU is complete, we would forget CM1.

In other words, for anything else than a LU Request, we had no Classmark 1
available at all.

During Ciphering Mode Command, we rely on Classmark 1 to determine whether A5/1
is supported. That is moot if we don't even have a Classmark 1 for any CM
Service Request or Paging Response initiated connections.

The only reason that A5/1 worked is that we assume A5/1 to work if Classmark 1
is missing. To add to the confusion, if a phone indicated that it did *not*
support A5/1 in the Classmark 1, according to spec we're supposed to not
service it at all. A code comment however says that we instead want to heed the
flag -- which so far was only present in a Location Updating initiated
connection. Now we can make this decision without assuming things.

This got my attention while hacking on sending a BSSMAP Classmark Request from
the MSC if it finds missing Classmark information, and was surprised to see it
it lacking CM1 to decide about A5/1.

Change-Id: I27081bf6e9e017923b2d02607f7ea06beddad82a
---
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/vlr.h
M src/libmsc/gsm_04_08.c
M src/libmsc/osmo_msc.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
M tests/msc_vlr/msc_vlr_test_rest.err
6 files changed, 75 insertions(+), 69 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 27f7fc5..ffe3afc 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -127,8 +127,6 @@
/* connected via 2G or 3G? */
enum ran_type via_ran;

-   struct gsm_classmark classmark;
-
uint16_t lac;
struct gsm_encr encr;

diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h
index 386a548..d52713c 100644
--- a/include/osmocom/msc/vlr.h
+++ b/include/osmocom/msc/vlr.h
@@ -174,6 +174,8 @@
uint8_t lac;
enum ran_type attached_via_ran;
} cs;
+
+   struct gsm_classmark classmark;
 };

 enum vlr_ciph {
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 19b0572..b942a03 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -98,14 +98,25 @@
return gsm48_conn_sendmsg(msg, conn, NULL);
 }

+static bool classmark1_is_r99(const struct gsm48_classmark1 *cm1)
+{
+   return cm1->rev_lev >= 2;
+}
+
+static bool classmark2_is_r99(const uint8_t *cm2, uint8_t cm2_len)
+{
+   uint8_t rev_lev;
+   if (!cm2_len)
+   return false;
+   rev_lev = (cm2[0] >> 5) & 0x3;
+   return rev_lev >= 2;
+}
+
 static bool classmark_is_r99(struct gsm_classmark *cm)
 {
-   int rev_lev = 0;
if (cm->classmark1_set)
-   rev_lev = cm->classmark1.rev_lev;
-   else if (cm->classmark2_len > 0)
-   rev_lev = (cm->classmark2[0] >> 5) & 0x3;
-   return rev_lev >= 2;
+   return classmark1_is_r99(&cm->classmark1);
+   return classmark2_is_r99(cm->classmark2, cm->classmark2_len);
 }

 /* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher 
*/
@@ -345,9 +356,6 @@

msc_subscr_conn_update_id(conn, COMPLETE_LAYER3_LU, mi_string);

-   conn->classmark.classmark1 = lu->classmark1;
-   conn->classmark.classmark1_set = true;
-
DEBUGP(DMM, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n",
   gsm48_mi_type_name(mi_type), mi_string,
   get_value_string(lupd_names, lu->type));
@@ -402,7 +410,7 @@
&old_lai, &new_lai,
is_utran || 
conn->network->authentication_required,
is_utran || conn->network->a5_encryption_mask > 
0x01,
-   classmark_is_r99(&conn->classmark),
+   classmark1_is_r99(&lu->classmark1),
is_utran,
net->vlr->cfg.assign_tmsi);
if (!lu_fsm) {
@@ -421,6 +429,9 @@
return -EIO;
}

+   conn->vsub->classmark.classmark1 = lu->classmark1;
+   conn->vsub->classmark.classmark1_set = tr

Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10986 )

Change subject: msc_vlr_tests: cosmetically tweak perm algo printing
..

msc_vlr_tests: cosmetically tweak perm algo printing

In the msc_vlr_tests, instead of printing the algo IDs, rather print the
corresponding A5/n name, for clarity.

Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3
---
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
M tests/msc_vlr/msc_vlr_tests.c
2 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err 
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 71e34a8..6a00669 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -68,7 +68,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -238,7 +238,7 @@
 DVLR 
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 07fa7502e07e1c00
 DVLR 
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -376,7 +376,7 @@
 DVLR 
Process_Access_Request_VLR(PAGING_RESP:90170004620){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: e2b234f807886400
 DVLR 
Process_Access_Request_VLR(PAGING_RESP:90170004620){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -571,7 +571,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -778,7 +778,7 @@
 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 07fa7502e07e1c00
 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -916,7 +916,7 @@
 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: Set 
Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: e2b234f807886400
 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -,7 +,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -1352,7 +1352,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=1
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -1582,7 +1582,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WA

Change in libosmocore[master]: logging: Add VTY cmd: logging level default

[Pau Espin Pedrol]

Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/10136 )

Change subject: logging: Add VTY cmd: logging level default 
..


Abandoned

Abandoning, other patchset have been merged to address the issue.
--
To view, visit https://gerrit.osmocom.org/10136
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: abandon
Gerrit-Change-Id: Iee0d4da16b075e798f85c3f6adeb513057fd5402
Gerrit-Change-Number: 10136
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Vadim Yanitskiy 

Change in libosmocore[master]: logging: Fix logging level all

[Pau Espin Pedrol]

Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/10116 )

Change subject: logging: Fix logging level all
..


Abandoned

Abandoning, other patchset have been merged to address the issue.
--
To view, visit https://gerrit.osmocom.org/10116
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: abandon
Gerrit-Change-Id: I0f50ad8d6fd038398f7d751287417505c8dcdeff
Gerrit-Change-Number: 10116
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-sgsn[master]: sgsn: use gtp_clear_queues() when reset sgsn state

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10988 )

Change subject: sgsn: use gtp_clear_queues() when reset sgsn state
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10988
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I49d70cb7abe5cbe92ea68882fa68eccec0e79586
Gerrit-Change-Number: 10988
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:36:20 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-sgsn[master]: sgsn: use gtp_clear_queues() when reset sgsn state

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10988 )

Change subject: sgsn: use gtp_clear_queues() when reset sgsn state
..

sgsn: use gtp_clear_queues() when reset sgsn state

Allow ttcn3 to flush the gtp queue between each test.
Fixes ttcn3 test SGSN_Tests.TC_attach_pdp_act_deact_mt_t3395_expire

Change-Id: I49d70cb7abe5cbe92ea68882fa68eccec0e79586
---
M src/gprs/sgsn_vty.c
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 057be9f..154e576 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -823,6 +823,9 @@
bssgp_flush_all_queues();
vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE);

+   gtp_clear_queues(sgsn->gsn);
+   vty_out(vty, "Restarted connection to GGSN.%s", VTY_NEWLINE);
+
/* remove all queues to bssgp */
return CMD_SUCCESS;
 }

--
To view, visit https://gerrit.osmocom.org/10988
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I49d70cb7abe5cbe92ea68882fa68eccec0e79586
Gerrit-Change-Number: 10988
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-mgw[master]: mgcp: Fix osmux_cid_bitmap static array size calculation

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10995


Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation
..

mgcp: Fix osmux_cid_bitmap static array size calculation

Right now it's not a big issue since OSMUX_CID_MAX is 255, so 255+1 is
256 which fits array boundaries correctly (multiple of 8). However, if
for example OSMUC_CID_MAX was modified to be 12, 12+1/8 = 1, so we'd
have an undesired memory access when accessing last 4 CIDs.

Change-Id: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/95/10995/1

diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 26817c8..f9ab839 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -656,7 +656,7 @@
 }

 /*! bsc-nat allocates/releases the OSMUX cids (Circuit IDs). */
-static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1) / 8];
+static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8];

 /*! count the number of taken OSMUX cids.
  *  \returns number of OSMUX cids in use */

--
To view, visit https://gerrit.osmocom.org/10995
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c
Gerrit-Change-Number: 10995
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_18.04/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  125s] No package 'libpcsclite' found
[  125s] simtrace2-remsim.o: In function `main':
[  125s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  125s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  125s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  125s] apdu_dispatch.o: In function `apdu_segment_in':
[  125s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  125s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  125s] collect2: error: ld returned 1 exit status
[  125s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  125s] make[2]: *** [simtrace2-remsim] Error 1
[  125s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  125s] Makefile:20: recipe for target 'utils' failed
[  125s] make[1]: *** [utils] Error 2
[  125s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  125s] dh_auto_build: make -j1 returned exit code 2
[  125s] debian/rules:4: recipe for target 'build' failed
[  125s] make: *** [build] Error 2
[  125s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  125s] 
[  125s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:43:54 UTC 2018.
[  125s] 
[  125s] ### VM INTERACTION START ###
[  128s] [  120.755380] sysrq: SysRq : Power Off
[  128s] [  120.761779] reboot: Power down
[  128s] ### VM INTERACTION END ###
[  128s] 
[  128s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:43:57 UTC 2018.
[  128s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  119s] No package 'libpcsclite' found
[  119s] simtrace2-remsim.o: In function `main':
[  119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  119s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  119s] apdu_dispatch.o: In function `apdu_segment_in':
[  119s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  119s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  119s] collect2: error: ld returned 1 exit status
[  119s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  119s] make[2]: *** [simtrace2-remsim] Error 1
[  119s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  119s] Makefile:20: recipe for target 'utils' failed
[  119s] make[1]: *** [utils] Error 2
[  119s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  119s] dh_auto_build: make -j1 returned exit code 2
[  119s] debian/rules:4: recipe for target 'build' failed
[  119s] make: *** [build] Error 2
[  119s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  119s] 
[  119s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:43:36 UTC 2018.
[  119s] 
[  119s] ### VM INTERACTION START ###
[  122s] [  114.797117] sysrq: SysRq : Power Off
[  122s] [  114.803155] reboot: Power down
[  122s] ### VM INTERACTION END ###
[  122s] 
[  122s] sheep82 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:43:39 UTC 2018.
[  122s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_17.10/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  133s] No package 'libpcsclite' found
[  133s] simtrace2-remsim.o: In function `main':
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  133s] apdu_dispatch.o: In function `apdu_segment_in':
[  133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  133s] collect2: error: ld returned 1 exit status
[  133s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  133s] make[2]: *** [simtrace2-remsim] Error 1
[  133s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  133s] Makefile:20: recipe for target 'utils' failed
[  133s] make[1]: *** [utils] Error 2
[  133s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  133s] dh_auto_build: make -j1 returned exit code 2
[  133s] debian/rules:4: recipe for target 'build' failed
[  133s] make: *** [build] Error 2
[  133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  133s] 
[  133s] lamb74 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:44:17 UTC 2018.
[  133s] 
[  133s] ### VM INTERACTION START ###
[  137s] [  127.138446] sysrq: SysRq : Power Off
[  137s] [  127.145766] reboot: Power down
[  137s] ### VM INTERACTION END ###
[  137s] 
[  137s] lamb74 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:44:21 UTC 2018.
[  137s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  133s] No package 'libpcsclite' found
[  134s] simtrace2-remsim.o: In function `main':
[  134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  134s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  134s] apdu_dispatch.o: In function `apdu_segment_in':
[  134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  134s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  134s] collect2: error: ld returned 1 exit status
[  134s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  134s] make[2]: *** [simtrace2-remsim] Error 1
[  134s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  134s] Makefile:20: recipe for target 'utils' failed
[  134s] make[1]: *** [utils] Error 2
[  134s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  134s] dh_auto_build: make -j1 returned exit code 2
[  134s] debian/rules:4: recipe for target 'build' failed
[  134s] make: *** [build] Error 2
[  134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  134s] 
[  134s] lamb52 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:44:23 UTC 2018.
[  134s] 
[  134s] ### VM INTERACTION START ###
[  137s] [  126.645895] sysrq: SysRq : Power Off
[  137s] [  126.652491] reboot: Power down
[  137s] ### VM INTERACTION END ###
[  137s] 
[  137s] lamb52 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:44:27 UTC 2018.
[  137s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  136s] No package 'libpcsclite' found
[  136s] simtrace2-remsim.o: In function `main':
[  136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  136s] apdu_dispatch.o: In function `apdu_segment_in':
[  136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  136s] collect2: error: ld returned 1 exit status
[  136s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  136s] make[2]: *** [simtrace2-remsim] Error 1
[  136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  136s] Makefile:20: recipe for target 'utils' failed
[  136s] make[1]: *** [utils] Error 2
[  136s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  136s] dh_auto_build: make -j1 returned exit code 2
[  136s] debian/rules:4: recipe for target 'build' failed
[  136s] make: *** [build] Error 2
[  136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  136s] 
[  136s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:43:42 UTC 2018.
[  136s] 
[  136s] ### VM INTERACTION START ###
[  140s] [  129.557005] sysrq: SysRq : Power Off
[  140s] [  129.561500] reboot: Power down
[  140s] ### VM INTERACTION END ###
[  140s] 
[  140s] lamb21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:43:47 UTC 2018.
[  140s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  133s] No package 'libpcsclite' found
[  133s] simtrace2-remsim.o: In function `main':
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  133s] apdu_dispatch.o: In function `apdu_segment_in':
[  133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  133s] collect2: error: ld returned 1 exit status
[  133s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  133s] make[2]: *** [simtrace2-remsim] Error 1
[  133s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  133s] Makefile:20: recipe for target 'utils' failed
[  133s] make[1]: *** [utils] Error 2
[  133s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  133s] dh_auto_build: make -j1 returned exit code 2
[  133s] debian/rules:4: recipe for target 'build' failed
[  133s] make: *** [build] Error 2
[  133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  133s] 
[  133s] lamb06 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:45:52 UTC 2018.
[  133s] 
[  133s] ### VM INTERACTION START ###
[  136s] [  125.099929] sysrq: SysRq : Power Off
[  136s] [  125.106297] reboot: Power down
[  136s] ### VM INTERACTION END ###
[  137s] 
[  137s] lamb06 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:45:56 UTC 2018.
[  137s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_16.04/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  108s] No package 'libpcsclite' found
[  108s] simtrace2-remsim.o: In function `main':
[  108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  108s] apdu_dispatch.o: In function `apdu_segment_in':
[  108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  108s] collect2: error: ld returned 1 exit status
[  108s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  108s] make[2]: *** [simtrace2-remsim] Error 1
[  108s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  108s] Makefile:20: recipe for target 'utils' failed
[  108s] make[1]: *** [utils] Error 2
[  108s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  108s] dh_auto_build: make -j1 returned exit code 2
[  108s] debian/rules:4: recipe for target 'build' failed
[  108s] make: *** [build] Error 2
[  108s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  108s] 
[  108s] build71 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:45:37 UTC 2018.
[  108s] 
[  108s] ### VM INTERACTION START ###
[  111s] [  104.035080] sysrq: SysRq : Power Off
[  111s] [  104.037576] reboot: Power down
[  111s] ### VM INTERACTION END ###
[  111s] 
[  111s] build71 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:45:40 UTC 2018.
[  111s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  228s] No package 'libpcsclite' found
[  228s] simtrace2-remsim.o: In function `main':
[  228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  228s] apdu_dispatch.o: In function `apdu_segment_in':
[  228s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  228s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  228s] collect2: error: ld returned 1 exit status
[  228s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  228s] make[2]: *** [simtrace2-remsim] Error 1
[  228s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  228s] Makefile:20: recipe for target 'utils' failed
[  228s] make[1]: *** [utils] Error 2
[  228s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  228s] dh_auto_build: make -j1 returned exit code 2
[  228s] debian/rules:4: recipe for target 'build' failed
[  228s] make: *** [build] Error 2
[  228s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  228s] 
[  228s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:47:23 UTC 2018.
[  228s] 
[  228s] ### VM INTERACTION START ###
[  231s] [  207.387653] sysrq: SysRq : Power Off
[  231s] [  207.394021] reboot: Power down
[  232s] ### VM INTERACTION END ###
[  232s] 
[  232s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
10:47:28 UTC 2018.
[  232s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-gsm-tester[master]: Sanitize existing suite names

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10931 )

Change subject: Sanitize existing suite names
..

Sanitize existing suite names

When first suites were added, osmo-nitb was used. Then new tests using
regular split components were added with "aoip_" prefix. At some point
it was clear that osmo-nitb was being deprecated so new tests for split
components were added without any prefix, as they are expected to be the
default one. Since most current and future development is going to be done
for split components, as well as new tests added, it makes sense to move
the few old testsuites using osmo-nitb to have all "nitb_" prefix, while
keeping the split component tests without prefix as it's the regular
network topology.

Change-Id: Idea2e053d337548e0e9b1b47441dbb262124f909
---
M example/default-suites.conf
D suites/aoip_sms/mo_mt_sms.py
D suites/aoip_sms/suite.conf
M suites/debug/interactive.py
M suites/debug/suite.conf
R suites/encryption/register_a5_0_authopt.py
R suites/encryption/register_a5_0_authreq.py
R suites/encryption/register_a5_1_authreq.py
R suites/encryption/suite.conf
R suites/nitb_debug/error.py
R suites/nitb_debug/fail.py
R suites/nitb_debug/fail_raise.py
R suites/nitb_debug/interactive.py
R suites/nitb_debug/pass.py
R suites/nitb_debug/suite.conf
R suites/nitb_netreg/register.py
R suites/nitb_netreg/register_default.py
R suites/nitb_netreg/suite.conf
R suites/nitb_smpp/esme_connect_policy_acceptall.py
R suites/nitb_smpp/esme_connect_policy_closed.py
R suites/nitb_smpp/esme_ms_sms_storeforward.py
R suites/nitb_smpp/esme_ms_sms_transaction.py
C suites/nitb_smpp/suite.conf
A suites/nitb_sms/mo_mt_sms.py
R suites/nitb_sms/suite.conf
R suites/nitb_ussd/assert_extension.py
R suites/nitb_ussd/suite.conf
M suites/smpp/esme_connect_policy_acceptall.py
M suites/smpp/esme_connect_policy_closed.py
M suites/smpp/esme_ms_sms_storeforward.py
M suites/smpp/esme_ms_sms_transaction.py
M suites/smpp/suite.conf
M suites/sms/mo_mt_sms.py
M suites/sms/suite.conf
M suites/ussd/assert_extension.py
M suites/ussd/suite.conf
36 files changed, 287 insertions(+), 299 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/example/default-suites.conf b/example/default-suites.conf
index 6b6e1d0..af7e8de 100644
--- a/example/default-suites.conf
+++ b/example/default-suites.conf
@@ -1,7 +1,7 @@
+- nitb_sms:sysmo
 - sms:sysmo
-- aoip_sms:sysmo
+- nitb_ussd:sysmo
 - ussd:sysmo
-- aoip_ussd:sysmo
 - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr3
@@ -12,10 +12,10 @@
 - gprs:sysmo
 - gprs:sysmo+mod-bts0-dynts-ipa
 - gprs:sysmo+mod-bts0-dynts-osmo
+- nitb_sms:trx-b200
 - sms:trx-b200
-- aoip_sms:trx-b200
+- nitb_ussd:trx-b200
 - ussd:trx-b200
-- aoip_ussd:trx-b200
 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr3
@@ -26,10 +26,10 @@
 - gprs:trx-b200
 - gprs:trx-b200+mod-bts0-dynts-ipa
 - gprs:trx-b200+mod-bts0-dynts-osmo
+- nitb_sms:trx-sysmocell5000
 - sms:trx-sysmocell5000
-- aoip_sms:trx-sysmocell5000
+- nitb_ussd:trx-sysmocell5000
 - ussd:trx-sysmocell5000
-- aoip_ussd:trx-sysmocell5000
 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr3
@@ -40,10 +40,10 @@
 - gprs:trx-sysmocell5000
 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa
 - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo
-- sms:nanobts
-- aoip_sms:nanobts+band-1900
+- nitb_sms:nanobts
+- sms:nanobts+band-1900
+- nitb_ussd:nanobts+band-1900
 - ussd:nanobts+band-1900
-- aoip_ussd:nanobts+band-1900
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3
@@ -52,9 +52,9 @@
 - voice:nanobts+band-1900+mod-bts0-dynts-ipa
 - gprs:nanobts+band-1900
 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa
-- aoip_sms:nanobts+band-900
+- sms:nanobts+band-900
+- nitb_ussd:nanobts+band-900
 - ussd:nanobts+band-900
-- aoip_ussd:nanobts+band-900
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3
@@ -65,6 +65,6 @@
 - gprs:nanobts+band-900
 - gprs:nanobts+band-900+mod-bts0-dynts-ipa
 - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend
+- nitb_smpp
 - smpp
-- aoip_smpp
-- aoip_encryption
+- encryption
diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py
deleted file mode 100755
index 7654ea6..000
--- a/suites/aoip_sms/mo_mt_sms.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python3
-from osmo_gsm_tester.testenv import *
-
-hlr = suite.hlr()
-bts = suite.bts()

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  214s] No package 'libpcsclite' found
[  214s] simtrace2-remsim.o: In function `main':
[  214s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  214s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  214s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined 
reference to `osim_uicc_sim_cic_profile'
[  214s] apdu_dispatch.o: In function `apdu_segment_in':
[  214s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  214s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference 
to `osim_uicc_sim_cic_profile'
[  214s] collect2: error: ld returned 1 exit status
[  214s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  214s] make[2]: *** [simtrace2-remsim] Error 1
[  214s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  214s] Makefile:20: recipe for target 'utils' failed
[  214s] make[1]: *** [utils] Error 2
[  214s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  214s] dh_auto_build: make -j1 returned exit code 2
[  214s] debian/rules:4: recipe for target 'build' failed
[  214s] make: *** [build] Error 2
[  214s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  214s] 
[  214s] armbuild21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
11:06:04 UTC 2018.
[  214s] 
[  214s] ### VM INTERACTION START ###
[  217s] [  206.645401] SysRq : Power Off
[  217s] [  206.647148] reboot: Power down
[  218s] ### VM INTERACTION END ###
[  218s] 
[  218s] armbuild21 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
11:06:07 UTC 2018.
[  218s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in openbsc[master]: bsc_filter: Move whitelisted info log to debug

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10996


Change subject: bsc_filter: Move whitelisted info log to debug
..

bsc_filter: Move whitelisted info log to debug

It shows up all the time in logs while using "logging level all info",
let's move it to debug.

Change-Id: I51274dad5afef16e466921c5d58672427d23fd3b
---
M openbsc/src/osmo-bsc_nat/bsc_filter.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/96/10996/1

diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c 
b/openbsc/src/osmo-bsc_nat/bsc_filter.c
index ddfcdcb..432529e 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_filter.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c
@@ -208,7 +208,7 @@
continue;

/* whitelisted */
-   LOGP(DNAT, LOGL_INFO, "Whitelisted with rule %d\n", i);
+   LOGP(DNAT, LOGL_DEBUG, "Whitelisted with rule %d\n", i);
return 0;
} else {
/* whitelisted */

-- 
To view, visit https://gerrit.osmocom.org/10996
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51274dad5afef16e466921c5d58672427d23fd3b
Gerrit-Change-Number: 10996
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in openbsc[master]: mgcp: Fix (again) osmux_cid_bitmap static array size calculation

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10997


Change subject: mgcp: Fix (again) osmux_cid_bitmap static array size calculation
..

mgcp: Fix (again) osmux_cid_bitmap static array size calculation

A previous commit merged today fixed array size boundary (multiple of 8
bits), but removed a required +1 which should be kept on top, because
OSMUX_CID_MAX specified the maximum number used by a CID, that is
(0,OSMUX_CID_MAX), and as a result we require OSMUX_CID_MAX+1 slots.

Fixes: 65f422ad5878165be0a1eb05605aa3099536f0c8
Change-Id: I182c9c1a6dd28a4c5c0d8107d53852cf47541592
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/97/10997/1

diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index ca0ed30..a4b7e7a 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -544,8 +544,8 @@
 htons(endp->cfg->osmux_port), buf, sizeof(buf));
 }

-/* bsc-nat allocates/releases the Osmux circuit ID */
-static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8];
+/* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit 
boundary. */
+static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1 + 7) / 8];

 int osmux_used_cid(void)
 {

--
To view, visit https://gerrit.osmocom.org/10997
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I182c9c1a6dd28a4c5c0d8107d53852cf47541592
Gerrit-Change-Number: 10997
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-mgw[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10998


Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen
..

mgcp_osmux: Use define to calculate rtp_ssrc_winlen

Since that define is already used to allocate size of osmux_cid_bitmap,
let's use it here too instead of hardcoding its value.

Change-Id: Ib2e4febee8bc6bcc035ad0a65c5c1eb94ef5e6fb
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/98/10998/1

diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 5d16826..f842232 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -515,12 +515,12 @@
 *  used to reconstruct the RTP flow from osmux. The RTP SSRC is
 *  allocated based on the circuit ID (conn_net->osmux.cid), which is 
unique
 *  in the local scope to the BSC/BSC-NAT. We use it to divide the RTP
-*  SSRC space (2^32) by the 256 possible circuit IDs, then randomly
+*  SSRC space (2^32) by the OSMUX_CID_MAX + 1 possible circuit IDs, 
then randomly
 *  select one value from that window. Thus, we have no chance to have
 *  overlapping RTP SSRC traveling to the BTSes behind the BSC,
 *  similarly, for flows traveling to the MSC.
 */
-   static const uint32_t rtp_ssrc_winlen = UINT32_MAX / 256;
+   static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 
1);
uint16_t osmux_dummy = endp->cfg->osmux_dummy;

/* Check if osmux is enabled for the specified connection */

--
To view, visit https://gerrit.osmocom.org/10998
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2e4febee8bc6bcc035ad0a65c5c1eb94ef5e6fb
Gerrit-Change-Number: 10998
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in openbsc[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10999


Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen
..

mgcp_osmux: Use define to calculate rtp_ssrc_winlen

Since that define is already used to allocate size of osmux_cid_bitmap,
let's use it here too instead of hardcoding its value.

Change-Id: I768ca1b510bf44508ae064dc31620e739260470b
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/99/10999/1

diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index a4b7e7a..69f1c66 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -434,12 +434,12 @@
 * used to reconstruct the RTP flow from osmux. The RTP SSRC is
 * allocated based on the circuit ID (endp->osmux.cid), which is unique
 * in the local scope to the BSC/BSC-NAT. We use it to divide the RTP
-* SSRC space (2^32) by the 256 possible circuit IDs, then randomly
+* SSRC space (2^32) by the OSMUX_CID_MAX + 1 possible circuit IDs, 
then randomly
 * select one value from that window. Thus, we have no chance to have
 * overlapping RTP SSRC traveling to the BTSes behind the BSC,
 * similarly, for flows traveling to the MSC.
 */
-   static const uint32_t rtp_ssrc_winlen = UINT32_MAX / 256;
+   static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 
1);

if (endp->osmux.state == OSMUX_STATE_DISABLED) {
LOGP(DMGCP, LOGL_ERROR, "Endpoint %u didn't request Osmux\n",

--
To view, visit https://gerrit.osmocom.org/10999
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I768ca1b510bf44508ae064dc31620e739260470b
Gerrit-Change-Number: 10999
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate.

[Neels Hofmeyr]

Neels Hofmeyr has uploaded a new patch set (#3) to the change originally 
created by dexter. ( https://gerrit.osmocom.org/10906 )

Change subject: gsm_data: remove unused struct member full_rate.
..

gsm_data: remove unused struct member full_rate.

Remove unused member gsm_subscriber_connection.user_plane.full_rate.

It was forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"

Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
---
M include/osmocom/bsc/gsm_data.h
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/10906/3
--
To view, visit https://gerrit.osmocom.org/10906
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
Gerrit-Change-Number: 10906
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Assignee: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: dexter 
Gerrit-CC: Neels Hofmeyr 

Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode

[Neels Hofmeyr]

Neels Hofmeyr has uploaded a new patch set (#3) to the change originally 
created by dexter. ( https://gerrit.osmocom.org/10907 )

Change subject: gsm_data: remove unused struct member chan_mode
..

gsm_data: remove unused struct member chan_mode

Remove unused gsm_subscriber_connection.user_plane.chan_mode.
There is only one VTY command that displays it along other
parameters, but it is used no where else. Lets remove it.

It was forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"

Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_vty.c
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/10907/3
--
To view, visit https://gerrit.osmocom.org/10907
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
Gerrit-Change-Number: 10907
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-bsc[master]: LCLS: fix codec mismatch detection

[Neels Hofmeyr]

Neels Hofmeyr has uploaded a new patch set (#3) to the change originally 
created by dexter. ( https://gerrit.osmocom.org/10905 )

Change subject: LCLS: fix codec mismatch detection
..

LCLS: fix codec mismatch detection

gsm_subscriber_connection.user_plane.chan_mode and .full_rate were unused
since and forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"

Instead of above unused struct members, use lchan->{full_rate,tch_mode}.

When not explicitly allowed via VTY settings, the LCLS mechanisms will
avoid to locally switch connections with different codecs/rates. For
example GSM HR and GSM FR would not be locally switched.

Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Related: OS#1602
---
M src/osmo-bsc/osmo_bsc_lcls.c
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/10905/3
--
To view, visit https://gerrit.osmocom.org/10905
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Gerrit-Change-Number: 10905
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Assignee: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Harald Welte 
Gerrit-CC: Neels Hofmeyr 

Change in osmo-bsc[master]: LCLS: fix codec mismatch detection

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10905 )

Change subject: LCLS: fix codec mismatch detection
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10905
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Gerrit-Change-Number: 10905
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Assignee: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Neels Hofmeyr 
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:47:09 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate.

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10906 )

Change subject: gsm_data: remove unused struct member full_rate.
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10906
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
Gerrit-Change-Number: 10906
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Assignee: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: dexter 
Gerrit-CC: Neels Hofmeyr 
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:47:24 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10907 )

Change subject: gsm_data: remove unused struct member chan_mode
..


Patch Set 3: Code-Review+2

(1 comment)

https://gerrit.osmocom.org/#/c/10907/1//COMMIT_MSG
Commit Message:

https://gerrit.osmocom.org/#/c/10907/1//COMMIT_MSG@10
PS1, Line 10: There is only one VTY command that displays it along other
it would be good to reference the change-id which made it unused/abandoned.



--
To view, visit https://gerrit.osmocom.org/10907
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
Gerrit-Change-Number: 10907
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:47:28 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in openbsc[master]: bsc_filter: Move whitelisted info log to debug

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10996 )

Change subject: bsc_filter: Move whitelisted info log to debug
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10996
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I51274dad5afef16e466921c5d58672427d23fd3b
Gerrit-Change-Number: 10996
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:47:46 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in openbsc[master]: mgcp: Fix (again) osmux_cid_bitmap static array size calculation

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10997 )

Change subject: mgcp: Fix (again) osmux_cid_bitmap static array size calculation
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10997
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I182c9c1a6dd28a4c5c0d8107d53852cf47541592
Gerrit-Change-Number: 10997
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:48:10 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in openbsc[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10999 )

Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10999
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I768ca1b510bf44508ae064dc31620e739260470b
Gerrit-Change-Number: 10999
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:48:20 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in openbsc[master]: mgcp: Fix (again) osmux_cid_bitmap static array size calculation

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10997 )

Change subject: mgcp: Fix (again) osmux_cid_bitmap static array size calculation
..

mgcp: Fix (again) osmux_cid_bitmap static array size calculation

A previous commit merged today fixed array size boundary (multiple of 8
bits), but removed a required +1 which should be kept on top, because
OSMUX_CID_MAX specified the maximum number used by a CID, that is
(0,OSMUX_CID_MAX), and as a result we require OSMUX_CID_MAX+1 slots.

Fixes: 65f422ad5878165be0a1eb05605aa3099536f0c8
Change-Id: I182c9c1a6dd28a4c5c0d8107d53852cf47541592
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index ca0ed30..a4b7e7a 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -544,8 +544,8 @@
 htons(endp->cfg->osmux_port), buf, sizeof(buf));
 }

-/* bsc-nat allocates/releases the Osmux circuit ID */
-static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 7) / 8];
+/* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit 
boundary. */
+static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1 + 7) / 8];

 int osmux_used_cid(void)
 {

--
To view, visit https://gerrit.osmocom.org/10997
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I182c9c1a6dd28a4c5c0d8107d53852cf47541592
Gerrit-Change-Number: 10997
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in openbsc[master]: bsc_filter: Move whitelisted info log to debug

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10996 )

Change subject: bsc_filter: Move whitelisted info log to debug
..

bsc_filter: Move whitelisted info log to debug

It shows up all the time in logs while using "logging level all info",
let's move it to debug.

Change-Id: I51274dad5afef16e466921c5d58672427d23fd3b
---
M openbsc/src/osmo-bsc_nat/bsc_filter.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c 
b/openbsc/src/osmo-bsc_nat/bsc_filter.c
index ddfcdcb..432529e 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_filter.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c
@@ -208,7 +208,7 @@
continue;

/* whitelisted */
-   LOGP(DNAT, LOGL_INFO, "Whitelisted with rule %d\n", i);
+   LOGP(DNAT, LOGL_DEBUG, "Whitelisted with rule %d\n", i);
return 0;
} else {
/* whitelisted */

--
To view, visit https://gerrit.osmocom.org/10996
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I51274dad5afef16e466921c5d58672427d23fd3b
Gerrit-Change-Number: 10996
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in openbsc[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10999 )

Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen
..

mgcp_osmux: Use define to calculate rtp_ssrc_winlen

Since that define is already used to allocate size of osmux_cid_bitmap,
let's use it here too instead of hardcoding its value.

Change-Id: I768ca1b510bf44508ae064dc31620e739260470b
---
M openbsc/src/libmgcp/mgcp_osmux.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index a4b7e7a..69f1c66 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -434,12 +434,12 @@
 * used to reconstruct the RTP flow from osmux. The RTP SSRC is
 * allocated based on the circuit ID (endp->osmux.cid), which is unique
 * in the local scope to the BSC/BSC-NAT. We use it to divide the RTP
-* SSRC space (2^32) by the 256 possible circuit IDs, then randomly
+* SSRC space (2^32) by the OSMUX_CID_MAX + 1 possible circuit IDs, 
then randomly
 * select one value from that window. Thus, we have no chance to have
 * overlapping RTP SSRC traveling to the BTSes behind the BSC,
 * similarly, for flows traveling to the MSC.
 */
-   static const uint32_t rtp_ssrc_winlen = UINT32_MAX / 256;
+   static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 
1);

if (endp->osmux.state == OSMUX_STATE_DISABLED) {
LOGP(DMGCP, LOGL_ERROR, "Endpoint %u didn't request Osmux\n",

--
To view, visit https://gerrit.osmocom.org/10999
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I768ca1b510bf44508ae064dc31620e739260470b
Gerrit-Change-Number: 10999
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-bsc[master]: LCLS: fix codec mismatch detection

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10905 )

Change subject: LCLS: fix codec mismatch detection
..

LCLS: fix codec mismatch detection

gsm_subscriber_connection.user_plane.chan_mode and .full_rate were unused
since and forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"

Instead of above unused struct members, use lchan->{full_rate,tch_mode}.

When not explicitly allowed via VTY settings, the LCLS mechanisms will
avoid to locally switch connections with different codecs/rates. For
example GSM HR and GSM FR would not be locally switched.

Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Related: OS#1602
---
M src/osmo-bsc/osmo_bsc_lcls.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c
index 6aeccb3..00c3296 100644
--- a/src/osmo-bsc/osmo_bsc_lcls.c
+++ b/src/osmo-bsc/osmo_bsc_lcls.c
@@ -274,15 +274,15 @@
return false;
}

-   if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate
+   if (conn->lchan->type != conn->lcls.other->lchan->type
&& conn->sccp.msc->lcls_codec_mismatch_allow == false) {
-   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch 
(channel rate)\n");
+   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch 
(channel type)\n");
return false;
}

-   if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode
+   if (conn->lchan->tch_mode != conn->lcls.other->lchan->tch_mode
&& conn->sccp.msc->lcls_codec_mismatch_allow == false) {
-   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch 
(channel mode)\n");
+   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch 
(TCH-Mode)\n");
return false;
}


--
To view, visit https://gerrit.osmocom.org/10905
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Gerrit-Change-Number: 10905
Gerrit-PatchSet: 4
Gerrit-Owner: dexter 
Gerrit-Assignee: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Neels Hofmeyr 

Change in osmo-mgw[master]: mgcp_osmux: Use define to calculate rtp_ssrc_winlen

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10998 )

Change subject: mgcp_osmux: Use define to calculate rtp_ssrc_winlen
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10998
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib2e4febee8bc6bcc035ad0a65c5c1eb94ef5e6fb
Gerrit-Change-Number: 10998
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:49:16 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode

[Neels Hofmeyr]

Neels Hofmeyr has uploaded a new patch set (#5) to the change originally 
created by dexter. ( https://gerrit.osmocom.org/10907 )

Change subject: gsm_data: remove unused struct member chan_mode
..

gsm_data: remove unused struct member chan_mode

Remove unused gsm_subscriber_connection.user_plane.chan_mode.
There is only one VTY command that displays it along other
parameters, but it is used no where else. Lets remove it.

It was forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"
change-id I82e3f918295daa83274a4cf803f046979f284366

Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_vty.c
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/10907/5
--
To view, visit https://gerrit.osmocom.org/10907
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
Gerrit-Change-Number: 10907
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate.

[Neels Hofmeyr]

Neels Hofmeyr has uploaded a new patch set (#5) to the change originally 
created by dexter. ( https://gerrit.osmocom.org/10906 )

Change subject: gsm_data: remove unused struct member full_rate.
..

gsm_data: remove unused struct member full_rate.

Remove unused member gsm_subscriber_connection.user_plane.full_rate.

It was forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"
change-id I82e3f918295daa83274a4cf803f046979f284366

Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
---
M include/osmocom/bsc/gsm_data.h
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/10906/5
--
To view, visit https://gerrit.osmocom.org/10906
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
Gerrit-Change-Number: 10906
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Assignee: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: dexter 
Gerrit-CC: Neels Hofmeyr 

Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate.

[Neels Hofmeyr]

Neels Hofmeyr has posted comments on this change. ( 
https://gerrit.osmocom.org/10906 )

Change subject: gsm_data: remove unused struct member full_rate.
..


Patch Set 5: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10906
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
Gerrit-Change-Number: 10906
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Assignee: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: dexter 
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:55:44 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode

[Neels Hofmeyr]

Neels Hofmeyr has posted comments on this change. ( 
https://gerrit.osmocom.org/10907 )

Change subject: gsm_data: remove unused struct member chan_mode
..


Patch Set 5: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10907
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
Gerrit-Change-Number: 10907
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 17 Sep 2018 12:55:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10907 )

Change subject: gsm_data: remove unused struct member chan_mode
..

gsm_data: remove unused struct member chan_mode

Remove unused gsm_subscriber_connection.user_plane.chan_mode.
There is only one VTY command that displays it along other
parameters, but it is used no where else. Lets remove it.

It was forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"
change-id I82e3f918295daa83274a4cf803f046979f284366

Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_vty.c
2 files changed, 1 insertion(+), 6 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 5a922d1..33a5a8d 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -268,10 +268,6 @@
/* The connection identifier of the mgw_endpoint used to 
transceive RTP towards the MSC.
 * (The BTS side CI is handled by struct gsm_lchan and the 
lchan_fsm.) */
struct mgwep_ci *mgw_endpoint_ci_msc;
-
-   /* Channel mode requested by the MSC (signalling or voice 
channel) */
-   enum gsm48_chan_mode chan_mode;
-
} user_plane;

/* LCLS (local call, local switch) related state */
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index b1938e6..d06ec57 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -1472,9 +1472,8 @@

 static void dump_one_subscr_conn(struct vty *vty, const struct 
gsm_subscriber_connection *conn)
 {
-   vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mode=%s, mgw_ep=%s%s",
+   vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mgw_ep=%s%s",
conn->sccp.conn_id, conn->sccp.msc->nr, conn->hodec2.failures,
-   get_value_string(gsm48_chan_mode_names, 
conn->user_plane.chan_mode),
mgw_endpoint_name(conn->user_plane.mgw_endpoint), VTY_NEWLINE);
if (conn->lcls.global_call_ref_len) {
vty_out(vty, " LCLS GCR: %s%s",

--
To view, visit https://gerrit.osmocom.org/10907
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
Gerrit-Change-Number: 10907
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate.

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10906 )

Change subject: gsm_data: remove unused struct member full_rate.
..

gsm_data: remove unused struct member full_rate.

Remove unused member gsm_subscriber_connection.user_plane.full_rate.

It was forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"
change-id I82e3f918295daa83274a4cf803f046979f284366

Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
---
M include/osmocom/bsc/gsm_data.h
1 file changed, 0 insertions(+), 3 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index e408ff9..5a922d1 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -269,9 +269,6 @@
 * (The BTS side CI is handled by struct gsm_lchan and the 
lchan_fsm.) */
struct mgwep_ci *mgw_endpoint_ci_msc;

-   /* Channel rate flag requested by the MSC, FR=1, HR=0, 
Invalid=-1 */
-   int full_rate;
-
/* Channel mode requested by the MSC (signalling or voice 
channel) */
enum gsm48_chan_mode chan_mode;


--
To view, visit https://gerrit.osmocom.org/10906
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
Gerrit-Change-Number: 10906
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Assignee: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: dexter 

Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES

[osmith]

osmith has posted comments on this change. ( https://gerrit.osmocom.org/10932 )

Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/10932
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8f495dbe030775f66ac125e60ded95c5d7660b65
Gerrit-Change-Number: 10932
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Comment-Date: Mon, 17 Sep 2018 13:17:38 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10932 )

Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES
..


Patch Set 2: Code-Review+1

let's have a look at the output this generates in a jenkins job. please create 
one (using jenkins-job-builder) on jenkins.osmocom.org.  Please make sure that 
work directories are properly cleaned up after a build so we don't waste tons 
of disks space.


--
To view, visit https://gerrit.osmocom.org/10932
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8f495dbe030775f66ac125e60ded95c5d7660b65
Gerrit-Change-Number: 10932
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Mon, 17 Sep 2018 13:27:15 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ci[master]: osmo-depcheck: script to verify PKG_CHECK_MODULES

[Neels Hofmeyr]

Neels Hofmeyr has posted comments on this change. ( 
https://gerrit.osmocom.org/10932 )

Change subject: osmo-depcheck: script to verify PKG_CHECK_MODULES
..


Patch Set 2:

(4 comments)

a few lesser comments for now, need to run now and will continue review later...

https://gerrit.osmocom.org/#/c/10932/2/.gitignore
File .gitignore:

https://gerrit.osmocom.org/#/c/10932/2/.gitignore@8
PS2, Line 8: __pycache__/
technically this would be a separate patch from the rest


https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py
File scripts/osmo-depcheck/buildstack.py:

https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/buildstack.py@2
PS2, Line 2: # (c) 2018 sysmocom - s.f.m.c. GmbH
(You should write "Copyright  ...", the (c) is just a gimmick IIUC. I 
typically also append "")


https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py
File scripts/osmo-depcheck/config.py:

https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py@10
PS2, Line 10: # they are mentioned with PKG_CHECK_MODULES in configure.ac.
indicate whether it's regex or shell glob or ...


https://gerrit.osmocom.org/#/c/10932/2/scripts/osmo-depcheck/config.py@18
PS2, Line 18: repos = {"libosmocore": ["libosmocodec",
would make sense to use tuples instead of lists -- they aren't supposed to be 
mutable, right?

  ["mutable", "list",]
  ["single-item mutable"]

vs.

  ("immutable", "tuple")
  ("single-item tuple",)

general cosmetic: we like to keep lists structured so that changes to them are 
likely to produce single-line patches, i.e. add the final optional comma and 
keep braces separate.

  {
bla: [
  item,
  item,
 ],
foo: [
  item,
 ],
   }

(not that important, just saying)



--
To view, visit https://gerrit.osmocom.org/10932
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8f495dbe030775f66ac125e60ded95c5d7660b65
Gerrit-Change-Number: 10932
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Harald Welte 
Gerrit-CC: Neels Hofmeyr 
Gerrit-Comment-Date: Mon, 17 Sep 2018 13:43:06 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-mgw[master]: mgcp: Fix osmux_cid_bitmap static array size calculation

[Pau Espin Pedrol]

Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/10995 )

Change subject: mgcp: Fix osmux_cid_bitmap static array size calculation
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/10995
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iaf9b93712dbd2a862b01e70dd8e11893bfa6b24c
Gerrit-Change-Number: 10995
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Mon, 17 Sep 2018 14:12:02 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Build failed in Jenkins: master-asn1c » a1=default,a2=default,a3=default,osmocom-master-debian9 #249

[jenkins]

See 


--
[...truncated 3.92 KB...]
checking whether build environment is sane... yes
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether to enable maintainer-specific portions of Makefiles... no
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables... 
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for /usr/bin/ld option to reload object files... -r
checking for BSD-compatible nm... /usr/bin/nm -B
checking whether ln -s works... yes
checking how to recognise dependent libraries... pass_all
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking dlfcn.h usability... yes
checking dlfcn.h presence... yes
checking for dlfcn.h... yes
checking for g++... g++
checking whether we are using the GNU C++ compiler... yes
checking whether g++ accepts -g... yes
checking dependency style of g++... gcc3
checking how to run the C++ preprocessor... g++ -E
checking for g77... no
checking for f77... no
checking for xlf... no
checking for frt... no
checking for pgf77... no
checking for cf77... no
checking for fort77... no
checking for fl32... no
checking for af77... no
checking for f90... no
checking for xlf90... no
checking for pgf90... no
checking for pghpf... no
checking for epcf90... no
checking for gfortran... no
checking for g95... no
checking for f95... no
checking for fort... no
checking for xlf95... no
checking for ifort... no
checking for ifc... no
checking for efc... no
checking for pgf95... no
checking for lf95... no
checking for ftn... no
checking whether we are using the GNU Fortran 77 compiler... no
checking whether  accepts -g... no
checking the maximum length of command line arguments... 32768
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for objdir... .libs
checking for ar... ar
checking for ranlib... ranlib
checking for strip... strip
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC
checking if gcc PIC flag -fPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
configure: creating libtool
appending configuration tag "CXX" to libtool
checking for ld used by g++... /usr/bin/ld -m elf_x86_64
checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking for g++ option to produce PIC... -fPIC
checking if g++ PIC flag -fPIC works... yes
checking if g++ static flag -static works... yes
checking if g++ supports -c -o file.o... yes
checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
appending configuration tag "F77" to libtool
checking for autoconf... /usr/bin/autoconf
checking for autoheader... /usr/bin/autoheader
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking how to run the C preprocessor... gcc -E
checking for a BSD-compatible install... /usr/bin/install -c
checking whether ln -s works... yes
checking whether make sets $(MAKE)... (cached) yes
checki

Change in osmo-gsm-tester[master]: WIP: osmo-bts-trx: Enable support for several TRX

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11000


Change subject: WIP: osmo-bts-trx: Enable support for several TRX
..

WIP: osmo-bts-trx: Enable support for several TRX

Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158
---
M example/defaults.conf
M src/osmo_gsm_tester/bts_osmotrx.py
M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
4 files changed, 15 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/00/11000/1

diff --git a/example/defaults.conf b/example/defaults.conf
index fc4c324..42258a6 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -48,7 +48,7 @@
 - phys_chan_config: PDCH
   - nominal_power: 23
 max_power_red: 0
-arfcn: 870
+arfcn: 872
 timeslot_list:
 - phys_chan_config: TCH/F
 - phys_chan_config: TCH/F
@@ -76,6 +76,9 @@
 - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0.
 - phys_chan_config: TCH/F

+osmo_bts_trx:
+  max_trx: 2
+
 osmo_trx:
   type: uhd
   launch_trx: true
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py 
b/src/osmo_gsm_tester/bts_osmotrx.py
index 1c7349f..f446dc3 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -77,7 +77,7 @@
 'osmo_trx': {
 'bts_ip': self.remote_addr(),
 'trx_ip': self.trx_remote_ip(),
-'channels': [{}] # TODO: implement channels 
for multiTRX
+'channels': [{} for trx_i in 
range(self.num_trx())]
 }
 }
 })
@@ -134,7 +134,8 @@

 self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, 
'-r', '1',
 '-c', os.path.abspath(self.config_file),
-'-i', self.bsc.addr())
+'-i', self.bsc.addr(),
+'-t', self.num_trx())
 self.suite_run.poll()

 class OsmoTrx(log.Origin, metaclass=ABCMeta):
diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl 
b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
index 5dba323..677b047 100644
--- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
@@ -23,9 +23,11 @@
 phy 0
  osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip}
  osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip}
- instance 0
+%for chan in osmo_bts_trx.osmo_trx.channels:
+ instance ${loop.index}
   osmotrx rx-gain 25
   osmotrx tx-attenuation oml
+%endfor
 bts 0
  band ${osmo_bts_trx.band}
  ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0
@@ -44,5 +46,7 @@
  gsmtap-sapi ptcch
  gsmtap-sapi cbch
  gsmtap-sapi sacch
- trx 0
-  phy 0 instance 0
+%for chan in osmo_bts_trx.osmo_trx.channels:
+ trx ${loop.index}
+  phy 0 instance ${loop.index}
+%endfor
diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 
b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
index 2f6e830..fa87ed6 100644
--- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
@@ -19,6 +19,7 @@
  remote-ip ${osmo_trx.bts_ip}
  base-port 5700
  egprs disable
+ multi-arfcn enable
  tx-sps 4
  rx-sps 4
  clock-ref ${osmo_trx.clock_reference}

--
To view, visit https://gerrit.osmocom.org/11000
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158
Gerrit-Change-Number: 11000
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-gsm-tester[master]: osmo-trx: Add multi_arfcn support

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11001


Change subject: osmo-trx: Add multi_arfcn support
..

osmo-trx: Add multi_arfcn support

2nd TRX arfcn is changed in defaults.conf because multi_arfcn requires
them to be alocated in steps of 4 starting from TRX0.

It is not enabled by default yet on B200 (it must use it to support
several TRX) because current host running osmo-gsm-tester is not
performant enough and cannot keep up with timers due to multi-arfcn CPU
overhead.

Change-Id: I096df82ad1f4cbb41dfbd6a78466a845f34be385
---
M example/defaults.conf
M src/osmo_gsm_tester/bts_osmotrx.py
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
4 files changed, 9 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/01/11001/1

diff --git a/example/defaults.conf b/example/defaults.conf
index 7ad5e1f..42258a6 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -48,7 +48,7 @@
 - phys_chan_config: PDCH
   - nominal_power: 23
 max_power_red: 0
-arfcn: 870
+arfcn: 872
 timeslot_list:
 - phys_chan_config: TCH/F
 - phys_chan_config: TCH/F
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py 
b/src/osmo_gsm_tester/bts_osmotrx.py
index a4bc082..e7e3542 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -174,6 +174,8 @@
 self.dbg(config_file=self.config_file)

 values = self.conf
+multi_arfcn_bool = util.str2bool(values.get('osmo_trx', 
{}).get('multi_arfcn', False))
+config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool 
} })

 self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values))

diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 9ca5665..e043d87 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -72,6 +72,7 @@
 'bts[].osmo_trx.type': schema.STR,
 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF,
 'bts[].osmo_trx.trx_ip': schema.IPV4,
+'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR,
 'arfcn[].arfcn': schema.INT,
 'arfcn[].band': schema.BAND,
 'modem[].label': schema.STR,
diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 
b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
index 2f6e830..0003f1b 100644
--- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
@@ -19,6 +19,11 @@
  remote-ip ${osmo_trx.bts_ip}
  base-port 5700
  egprs disable
+%if osmo_trx.get('multi_arfcn', False):
+ multi-arfcn enable
+%else:
+ multi-arfcn disable
+%endif
  tx-sps 4
  rx-sps 4
  clock-ref ${osmo_trx.clock_reference}

--
To view, visit https://gerrit.osmocom.org/11001
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I096df82ad1f4cbb41dfbd6a78466a845f34be385
Gerrit-Change-Number: 11001
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-gsm-tester[master]: osmo-bts-trx: Add multiTRX support

[Pau Espin Pedrol]

Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/11000 )

Change subject: osmo-bts-trx: Add multiTRX support
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/11000
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158
Gerrit-Change-Number: 11000
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Comment-Date: Mon, 17 Sep 2018 18:29:20 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-bts[master]: l1sap/scheduler: Consistently print chan_nr as hex number

[Harald Welte]

Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/11002


Change subject: l1sap/scheduler: Consistently print chan_nr as hex number
..

l1sap/scheduler: Consistently print chan_nr as hex number

It's very confusing if some log messages log chan_nr as decimal, while
most log it as hexadecimal.  Let's standardize on hex everywhere.

Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503
---
M src/common/l1sap.c
M src/common/scheduler.c
2 files changed, 7 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/11002/1

diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index b29fcc7..1a7a965 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -508,7 +508,7 @@
lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr);
if (!lchan) {
LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn,
-   "No lchan for MPH INFO MEAS IND (chan_nr=%u)\n", 
info_meas_ind->chan_nr);
+   "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", 
info_meas_ind->chan_nr);
return 0;
}

@@ -746,7 +746,7 @@
} else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and 
SDCCH/8 have C5 bit cleared */
lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan) {
-   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for 
PH-RTS.ind (chan_nr=%u)\n", chan_nr);
+   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for 
PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr);
return 0;
}
if (L1SAP_IS_LINK_SACCH(link_id)) {
@@ -875,7 +875,7 @@

lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan) {
-   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind 
(chan_nr=%u)\n", chan_nr);
+   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind 
(chan_nr=0x%02x)\n", chan_nr);
return 0;
}

@@ -1069,7 +1069,7 @@

lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan) {
-   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%d\n", 
chan_nr);
+   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for 
chan_nr=0x%02x\n", chan_nr);
return 0;
}

@@ -1137,7 +1137,7 @@

lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan) {
-   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind 
(chan_nr=%u)\n", chan_nr);
+   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind 
(chan_nr=0x%02x)\n", chan_nr);
return 0;
}

diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 8a6c007..65ece7f 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -329,8 +329,8 @@
 found_msg:
if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn))
 || ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) {
-   LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong 
chan_nr=%02x link_id=%02x, "
-   "expecting chan_nr=%02x link_id=%02x.\n", chan_nr, 
link_id,
+   LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong 
chan_nr=0x%02x link_id=%02x, "
+   "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, 
link_id,
trx_chan_desc[chan].chan_nr | tn, 
trx_chan_desc[chan].link_id);
goto free_msg;
}

--
To view, visit https://gerrit.osmocom.org/11002
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503
Gerrit-Change-Number: 11002
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 

Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15}

[Harald Welte]

Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/11003


Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}
..

CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}

This fixes a bug introduced in "CBCH: Move processing via L1SAP"

commit 02d99db08b13589e1417c3448a07747f8805ba88
Author: Harald Welte 
Date:   Fri Aug 24 23:37:45 2018 +0200

where the full channel number 0xc8 was used instead of the
(right-shifted) C-bits only.

Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
---
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-octphy/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
3 files changed, 3 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/11003/1

diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 82299ff..cfe1a05 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -700,7 +700,7 @@
cbits = 0x10;
break;
case GsmL1_Sapi_Cbch:
-   cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+   cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
break;
case GsmL1_Sapi_Sacch:
switch(pchan) {
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index 35d0aa3..a02eb0d 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -357,7 +357,7 @@
cbits = 0x10;
break;
case cOCTVC1_GSM_SAPI_ENUM_CBCH:
-   cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+   cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
break;
case cOCTVC1_GSM_SAPI_ENUM_SACCH:
switch (pchan) {
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index c0b42b4..acc43aa 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -697,7 +697,7 @@
cbits = 0x10;
break;
case GsmL1_Sapi_Cbch:
-   cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+   cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
break;
case GsmL1_Sapi_Sacch:
switch(pchan) {

--
To view, visit https://gerrit.osmocom.org/11003
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
Gerrit-Change-Number: 11003
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 

Change in osmo-bts[master]: get_lchan_by_chan_nr(): Fix resolution of CBCH

[Harald Welte]

Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/11004


Change subject: get_lchan_by_chan_nr(): Fix resolution of CBCH
..

get_lchan_by_chan_nr(): Fix resolution of CBCH

The CBCH (as per GSM specs) always maps on sub-slot 2 of either
the SDCCH/4 or SDCCH/8 that it replaces.  However, the way how we
express it as RSL-style channel number (0xC8) doesn't allow room
for any sub-slots.  The top 5 bits are used for expressing CBCH, while
the bottom 3 bits are used for the timeslot number (TN).

So when transforming from channel number to lchan, we must handle the
CBCH case specially by using a hard-coded sub-slot number of 2.

Change-Id: I44e2f763d5d25311167f435f2ca7e030b2a3f009
Related: OS#1617
---
M src/common/l1sap.c
1 file changed, 12 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/11004/1

diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 1a7a965..ac4f0be 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -58,7 +58,18 @@
 struct gsm_lchan *get_lchan_by_chan_nr(struct gsm_bts_trx *trx,
   unsigned int chan_nr)
 {
-   return &trx->ts[L1SAP_CHAN2TS(chan_nr)].lchan[l1sap_chan2ss(chan_nr)];
+   unsigned int tn, ss;
+
+   tn = L1SAP_CHAN2TS(chan_nr);
+   OSMO_ASSERT(tn < ARRAY_SIZE(trx->ts));
+
+   if (L1SAP_IS_CHAN_CBCH(chan_nr))
+   ss = 2; /* CBCH is always on sub-slot 2 */
+   else
+   ss = l1sap_chan2ss(chan_nr);
+   OSMO_ASSERT(ss < ARRAY_SIZE(trx->ts[tn].lchan));
+
+   return &trx->ts[tn].lchan[ss];
 }

 static struct gsm_lchan *

--
To view, visit https://gerrit.osmocom.org/11004
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44e2f763d5d25311167f435f2ca7e030b2a3f009
Gerrit-Change-Number: 11004
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 

Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15}

[Harald Welte]

Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11003

to look at the new patch set (#2).

Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}
..

CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}

This fixes a bug introduced in "CBCH: Move processing via L1SAP"

commit 02d99db08b13589e1417c3448a07747f8805ba88
Author: Harald Welte 
Date:   Fri Aug 24 23:37:45 2018 +0200

where the full channel number 0xc8 was used instead of the
(right-shifted) C-bits only.

Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
---
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-octphy/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
3 files changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/11003/2
--
To view, visit https://gerrit.osmocom.org/11003
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
Gerrit-Change-Number: 11003
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-bts[master]: l1sap/scheduler: Consistently print chan_nr as hex number

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11002 )

Change subject: l1sap/scheduler: Consistently print chan_nr as hex number
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11002
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503
Gerrit-Change-Number: 11002
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 19:41:03 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15}

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11003 )

Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11003
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
Gerrit-Change-Number: 11003
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 19:41:24 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bts[master]: get_lchan_by_chan_nr(): Fix resolution of CBCH

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11004 )

Change subject: get_lchan_by_chan_nr(): Fix resolution of CBCH
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11004
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I44e2f763d5d25311167f435f2ca7e030b2a3f009
Gerrit-Change-Number: 11004
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 19:41:42 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bts[master]: CBCH: Add FIXME comments on queue overflow/underflow handling

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10847 )

Change subject: CBCH: Add FIXME comments on queue overflow/underflow handling
..


Patch Set 4: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10847
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40
Gerrit-Change-Number: 10847
Gerrit-PatchSet: 4
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 19:41:56 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bts[master]: l1sap/scheduler: Consistently print chan_nr as hex number

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11002 )

Change subject: l1sap/scheduler: Consistently print chan_nr as hex number
..

l1sap/scheduler: Consistently print chan_nr as hex number

It's very confusing if some log messages log chan_nr as decimal, while
most log it as hexadecimal.  Let's standardize on hex everywhere.

Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503
---
M src/common/l1sap.c
M src/common/scheduler.c
2 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index b29fcc7..1a7a965 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -508,7 +508,7 @@
lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr);
if (!lchan) {
LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn,
-   "No lchan for MPH INFO MEAS IND (chan_nr=%u)\n", 
info_meas_ind->chan_nr);
+   "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", 
info_meas_ind->chan_nr);
return 0;
}

@@ -746,7 +746,7 @@
} else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and 
SDCCH/8 have C5 bit cleared */
lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan) {
-   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for 
PH-RTS.ind (chan_nr=%u)\n", chan_nr);
+   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for 
PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr);
return 0;
}
if (L1SAP_IS_LINK_SACCH(link_id)) {
@@ -875,7 +875,7 @@

lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan) {
-   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind 
(chan_nr=%u)\n", chan_nr);
+   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind 
(chan_nr=0x%02x)\n", chan_nr);
return 0;
}

@@ -1069,7 +1069,7 @@

lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan) {
-   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%d\n", 
chan_nr);
+   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for 
chan_nr=0x%02x\n", chan_nr);
return 0;
}

@@ -1137,7 +1137,7 @@

lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan) {
-   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind 
(chan_nr=%u)\n", chan_nr);
+   LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind 
(chan_nr=0x%02x)\n", chan_nr);
return 0;
}

diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 8a6c007..65ece7f 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -329,8 +329,8 @@
 found_msg:
if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn))
 || ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) {
-   LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong 
chan_nr=%02x link_id=%02x, "
-   "expecting chan_nr=%02x link_id=%02x.\n", chan_nr, 
link_id,
+   LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong 
chan_nr=0x%02x link_id=%02x, "
+   "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, 
link_id,
trx_chan_desc[chan].chan_nr | tn, 
trx_chan_desc[chan].link_id);
goto free_msg;
}

-- 
To view, visit https://gerrit.osmocom.org/11002
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503
Gerrit-Change-Number: 11002
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-bts[master]: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10848 )

Change subject: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc 
failure
..


Patch Set 4: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10848
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I85fdecbf20de83a6f925765a46b5cd14765da03e
Gerrit-Change-Number: 10848
Gerrit-PatchSet: 4
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 17 Sep 2018 19:42:13 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  136s] No package 'libpcsclite' found
[  136s] simtrace2-remsim.o: In function `main':
[  136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  136s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  136s] apdu_dispatch.o: In function `apdu_segment_in':
[  136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  136s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  136s] collect2: error: ld returned 1 exit status
[  136s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  136s] make[2]: *** [simtrace2-remsim] Error 1
[  136s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  136s] Makefile:20: recipe for target 'utils' failed
[  136s] make[1]: *** [utils] Error 2
[  136s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  136s] dh_auto_build: make -j1 returned exit code 2
[  136s] debian/rules:4: recipe for target 'build' failed
[  136s] make: *** [build] Error 2
[  136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  136s] 
[  136s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
19:58:43 UTC 2018.
[  136s] 
[  136s] ### VM INTERACTION START ###
[  139s] [  126.888197] sysrq: SysRq : Power Off
[  139s] [  126.894246] reboot: Power down
[  139s] ### VM INTERACTION END ###
[  139s] 
[  139s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
19:58:47 UTC 2018.
[  139s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  140s] No package 'libpcsclite' found
[  140s] simtrace2-remsim.o: In function `main':
[  140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  140s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  140s] apdu_dispatch.o: In function `apdu_segment_in':
[  140s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  140s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  140s] collect2: error: ld returned 1 exit status
[  140s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  140s] make[2]: *** [simtrace2-remsim] Error 1
[  140s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  140s] Makefile:20: recipe for target 'utils' failed
[  140s] make[1]: *** [utils] Error 2
[  140s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  140s] dh_auto_build: make -j1 returned exit code 2
[  140s] debian/rules:4: recipe for target 'build' failed
[  140s] make: *** [build] Error 2
[  140s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  140s] 
[  140s] lamb16 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
19:58:44 UTC 2018.
[  140s] 
[  140s] ### VM INTERACTION START ###
[  144s] [  131.915566] sysrq: SysRq : Power Off
[  144s] [  131.922449] reboot: Power down
[  144s] ### VM INTERACTION END ###
[  144s] 
[  144s] lamb16 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
19:58:48 UTC 2018.
[  144s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  189s] No package 'libpcsclite' found
[  189s] simtrace2-remsim.o: In function `main':
[  189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  189s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  189s] apdu_dispatch.o: In function `apdu_segment_in':
[  189s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  189s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  189s] collect2: error: ld returned 1 exit status
[  189s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  189s] make[2]: *** [simtrace2-remsim] Error 1
[  189s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  189s] Makefile:20: recipe for target 'utils' failed
[  189s] make[1]: *** [utils] Error 2
[  189s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  189s] dh_auto_build: make -j1 returned exit code 2
[  189s] debian/rules:4: recipe for target 'build' failed
[  189s] make: *** [build] Error 2
[  189s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  189s] 
[  189s] cloud118 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
19:59:48 UTC 2018.
[  189s] 
[  189s] ### VM INTERACTION START ###
[  192s] [  164.810031] sysrq: SysRq : Power Off
[  192s] [  164.815118] reboot: Power down
[  199s] ### VM INTERACTION END ###
[  199s] 
[  199s] cloud118 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
19:59:59 UTC 2018.
[  199s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_18.04/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  160s] No package 'libpcsclite' found
[  160s] simtrace2-remsim.o: In function `main':
[  160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  160s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  160s] apdu_dispatch.o: In function `apdu_segment_in':
[  160s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  160s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  160s] collect2: error: ld returned 1 exit status
[  160s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  160s] make[2]: *** [simtrace2-remsim] Error 1
[  160s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  160s] Makefile:20: recipe for target 'utils' failed
[  160s] make[1]: *** [utils] Error 2
[  160s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  160s] dh_auto_build: make -j1 returned exit code 2
[  160s] debian/rules:4: recipe for target 'build' failed
[  160s] make: *** [build] Error 2
[  160s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  160s] 
[  160s] lamb17 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
19:59:38 UTC 2018.
[  160s] 
[  160s] ### VM INTERACTION START ###
[  163s] [  151.973040] sysrq: SysRq : Power Off
[  163s] [  151.977899] reboot: Power down
[  163s] ### VM INTERACTION END ###
[  163s] 
[  163s] lamb17 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
19:59:41 UTC 2018.
[  163s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_16.04/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  137s] No package 'libpcsclite' found
[  137s] simtrace2-remsim.o: In function `main':
[  137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  137s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  137s] apdu_dispatch.o: In function `apdu_segment_in':
[  137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  137s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  137s] collect2: error: ld returned 1 exit status
[  137s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  137s] make[2]: *** [simtrace2-remsim] Error 1
[  137s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  137s] Makefile:20: recipe for target 'utils' failed
[  137s] make[1]: *** [utils] Error 2
[  137s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  137s] dh_auto_build: make -j1 returned exit code 2
[  137s] debian/rules:4: recipe for target 'build' failed
[  137s] make: *** [build] Error 2
[  137s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  137s] 
[  137s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:00:24 UTC 2018.
[  137s] 
[  137s] ### VM INTERACTION START ###
[  140s] [  130.520590] sysrq: SysRq : Power Off
[  140s] [  130.525276] reboot: Power down
[  140s] ### VM INTERACTION END ###
[  140s] 
[  140s] lamb54 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:00:29 UTC 2018.
[  140s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  203s] No package 'libpcsclite' found
[  203s] simtrace2-remsim.o: In function `main':
[  203s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  203s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  203s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  203s] apdu_dispatch.o: In function `apdu_segment_in':
[  203s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  203s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  203s] collect2: error: ld returned 1 exit status
[  203s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  203s] make[2]: *** [simtrace2-remsim] Error 1
[  203s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  203s] Makefile:20: recipe for target 'utils' failed
[  203s] make[1]: *** [utils] Error 2
[  203s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  203s] dh_auto_build: make -j1 returned exit code 2
[  203s] debian/rules:4: recipe for target 'build' failed
[  203s] make: *** [build] Error 2
[  203s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  203s] 
[  203s] cloud107 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:00:21 UTC 2018.
[  203s] 
[  203s] ### VM INTERACTION START ###
[  206s] [  175.157014] sysrq: SysRq : Power Off
[  206s] [  175.167601] reboot: Power down
[  208s] ### VM INTERACTION END ###
[  209s] 
[  209s] cloud107 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:00:28 UTC 2018.
[  209s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  219s] No package 'libpcsclite' found
[  219s] simtrace2-remsim.o: In function `main':
[  219s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  219s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  219s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  219s] apdu_dispatch.o: In function `apdu_segment_in':
[  219s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  219s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  219s] collect2: error: ld returned 1 exit status
[  219s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  219s] make[2]: *** [simtrace2-remsim] Error 1
[  219s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  219s] Makefile:20: recipe for target 'utils' failed
[  219s] make[1]: *** [utils] Error 2
[  219s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  219s] dh_auto_build: make -j1 returned exit code 2
[  219s] debian/rules:4: recipe for target 'build' failed
[  219s] make: *** [build] Error 2
[  219s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  219s] 
[  219s] cloud106 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:00:32 UTC 2018.
[  219s] 
[  219s] ### VM INTERACTION START ###
[  222s] [  196.062317] sysrq: SysRq : Power Off
[  222s] [  196.105968] reboot: Power down
[  223s] ### VM INTERACTION END ###
[  223s] 
[  223s] cloud106 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:00:37 UTC 2018.
[  223s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-bts[master]: get_lchan_by_chan_nr(): Fix resolution of CBCH

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11004 )

Change subject: get_lchan_by_chan_nr(): Fix resolution of CBCH
..

get_lchan_by_chan_nr(): Fix resolution of CBCH

The CBCH (as per GSM specs) always maps on sub-slot 2 of either
the SDCCH/4 or SDCCH/8 that it replaces.  However, the way how we
express it as RSL-style channel number (0xC8) doesn't allow room
for any sub-slots.  The top 5 bits are used for expressing CBCH, while
the bottom 3 bits are used for the timeslot number (TN).

So when transforming from channel number to lchan, we must handle the
CBCH case specially by using a hard-coded sub-slot number of 2.

Change-Id: I44e2f763d5d25311167f435f2ca7e030b2a3f009
Related: OS#1617
---
M src/common/l1sap.c
1 file changed, 12 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 1a7a965..ac4f0be 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -58,7 +58,18 @@
 struct gsm_lchan *get_lchan_by_chan_nr(struct gsm_bts_trx *trx,
   unsigned int chan_nr)
 {
-   return &trx->ts[L1SAP_CHAN2TS(chan_nr)].lchan[l1sap_chan2ss(chan_nr)];
+   unsigned int tn, ss;
+
+   tn = L1SAP_CHAN2TS(chan_nr);
+   OSMO_ASSERT(tn < ARRAY_SIZE(trx->ts));
+
+   if (L1SAP_IS_CHAN_CBCH(chan_nr))
+   ss = 2; /* CBCH is always on sub-slot 2 */
+   else
+   ss = l1sap_chan2ss(chan_nr);
+   OSMO_ASSERT(ss < ARRAY_SIZE(trx->ts[tn].lchan));
+
+   return &trx->ts[tn].lchan[ss];
 }

 static struct gsm_lchan *

--
To view, visit https://gerrit.osmocom.org/11004
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I44e2f763d5d25311167f435f2ca7e030b2a3f009
Gerrit-Change-Number: 11004
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-bts[master]: CBCH: Add FIXME comments on queue overflow/underflow handling

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10847 )

Change subject: CBCH: Add FIXME comments on queue overflow/underflow handling
..

CBCH: Add FIXME comments on queue overflow/underflow handling

Change-Id: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40
---
M src/common/cbch.c
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/cbch.c b/src/common/cbch.c
index 56d76f1..7bbe2c9 100644
--- a/src/common/cbch.c
+++ b/src/common/cbch.c
@@ -136,6 +136,7 @@
}

llist_add_tail(&scm->list, &bts->smscb_state.queue);
+   /* FIXME: limit queue size and optionally send CBCH LOAD Information 
(overflow) via RSL */

return 0;
 }
@@ -145,8 +146,10 @@
struct smscb_msg *msg;

msg = llist_first_entry_or_null(&bts->smscb_state.queue, struct 
smscb_msg, list);
-   if (!msg)
+   if (!msg) {
+   /* FIXME: send CBCH LOAD Information (underflow) via RSL */
return NULL;
+   }

llist_del(&msg->list);


--
To view, visit https://gerrit.osmocom.org/10847
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida97f25ab4bf7e4d0f03b13396cb37cdfe99ef40
Gerrit-Change-Number: 10847
Gerrit-PatchSet: 4
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-bts[master]: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo, octphy, litecell15}

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11003 )

Change subject: CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}
..

CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}

This fixes a bug introduced in "CBCH: Move processing via L1SAP"

commit 02d99db08b13589e1417c3448a07747f8805ba88
Author: Harald Welte 
Date:   Fri Aug 24 23:37:45 2018 +0200

where the full channel number 0xc8 was used instead of the
(right-shifted) C-bits only.

Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
---
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-octphy/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
3 files changed, 9 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 82299ff..4093225 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -383,6 +383,8 @@
sapi = GsmL1_Sapi_Sdcch;
} else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {
sapi = GsmL1_Sapi_Bcch;
+   } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {
+   sapi = GsmL1_Sapi_Cbch;
} else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {
/* The sapi depends on DSP configuration, not
 * on the actual SYSTEM INFORMATION 3. */
@@ -700,7 +702,7 @@
cbits = 0x10;
break;
case GsmL1_Sapi_Cbch:
-   cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+   cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
break;
case GsmL1_Sapi_Sacch:
switch(pchan) {
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index 35d0aa3..40d5300 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -357,7 +357,7 @@
cbits = 0x10;
break;
case cOCTVC1_GSM_SAPI_ENUM_CBCH:
-   cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+   cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
break;
case cOCTVC1_GSM_SAPI_ENUM_SACCH:
switch (pchan) {
@@ -517,6 +517,8 @@
sapi = cOCTVC1_GSM_SAPI_ENUM_SDCCH;
} else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {
sapi = cOCTVC1_GSM_SAPI_ENUM_BCCH;
+   } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {
+   sapi = cOCTVC1_GSM_SAPI_ENUM_CBCH;
} else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {
sapi = cOCTVC1_GSM_SAPI_ENUM_PCH_AGCH;
} else {
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index c0b42b4..372e332 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -380,6 +380,8 @@
sapi = GsmL1_Sapi_Sdcch;
} else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {
sapi = GsmL1_Sapi_Bcch;
+   } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {
+   sapi = GsmL1_Sapi_Cbch;
} else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {
/* The sapi depends on DSP configuration, not
 * on the actual SYSTEM INFORMATION 3. */
@@ -697,7 +699,7 @@
cbits = 0x10;
break;
case GsmL1_Sapi_Cbch:
-   cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+   cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */
break;
case GsmL1_Sapi_Sacch:
switch(pchan) {

--
To view, visit https://gerrit.osmocom.org/11003
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0
Gerrit-Change-Number: 11003
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-bts[master]: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10848 )

Change subject: CBCH: sprinkle some OMSO_ASSERT() and guard against talloc 
failure
..

CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure

Change-Id: I85fdecbf20de83a6f925765a46b5cd14765da03e
---
M src/common/cbch.c
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/cbch.c b/src/common/cbch.c
index 7bbe2c9..c628cb5 100644
--- a/src/common/cbch.c
+++ b/src/common/cbch.c
@@ -20,6 +20,7 @@

 #include 

+#include 
 #include 
 #include 

@@ -59,6 +60,7 @@
/* No message: Send NULL mesage */
return get_smscb_null_block(out);
}
+   OSMO_ASSERT(msg->next_seg < 4);

block_type = (struct gsm412_block_type *) out++;

@@ -70,6 +72,7 @@
to_copy = GSM412_MSG_LEN - (msg->next_seg * GSM412_BLOCK_LEN);
if (to_copy > GSM412_BLOCK_LEN)
to_copy = GSM412_BLOCK_LEN;
+   OSMO_ASSERT(to_copy >= 0);

/* copy data and increment index */
memcpy(out, &msg->msg[msg->next_seg * GSM412_BLOCK_LEN], to_copy);
@@ -115,6 +118,8 @@
}

scm = talloc_zero_size(bts, sizeof(*scm));
+   if (!scm)
+   return -1;

/* initialize entire message with default padding */
memset(scm->msg, GSM_MACBLOCK_PADDING, sizeof(scm->msg));

--
To view, visit https://gerrit.osmocom.org/10848
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I85fdecbf20de83a6f925765a46b5cd14765da03e
Gerrit-Change-Number: 10848
Gerrit-PatchSet: 4
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_17.10/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  206s] No package 'libpcsclite' found
[  206s] simtrace2-remsim.o: In function `main':
[  206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  206s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  206s] apdu_dispatch.o: In function `apdu_segment_in':
[  206s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  206s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  206s] collect2: error: ld returned 1 exit status
[  206s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  206s] make[2]: *** [simtrace2-remsim] Error 1
[  206s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  206s] Makefile:20: recipe for target 'utils' failed
[  206s] make[1]: *** [utils] Error 2
[  206s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  206s] dh_auto_build: make -j1 returned exit code 2
[  206s] debian/rules:4: recipe for target 'build' failed
[  206s] make: *** [build] Error 2
[  206s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  206s] 
[  206s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:02:15 UTC 2018.
[  206s] 
[  206s] ### VM INTERACTION START ###
[  209s] [  175.128004] sysrq: SysRq : Power Off
[  209s] [  175.132743] reboot: Power down
[  210s] ### VM INTERACTION END ###
[  210s] 
[  210s] cloud129 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:02:19 UTC 2018.
[  210s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  212s] No package 'libpcsclite' found
[  212s] simtrace2-remsim.o: In function `main':
[  212s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  212s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  212s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined 
reference to `osim_uicc_sim_cic_profile'
[  212s] apdu_dispatch.o: In function `apdu_segment_in':
[  212s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  212s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference 
to `osim_uicc_sim_cic_profile'
[  212s] collect2: error: ld returned 1 exit status
[  212s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  212s] make[2]: *** [simtrace2-remsim] Error 1
[  212s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  212s] Makefile:20: recipe for target 'utils' failed
[  212s] make[1]: *** [utils] Error 2
[  212s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  212s] dh_auto_build: make -j1 returned exit code 2
[  212s] debian/rules:4: recipe for target 'build' failed
[  212s] make: *** [build] Error 2
[  212s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  212s] 
[  212s] armbuild22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:25:27 UTC 2018.
[  212s] 
[  212s] ### VM INTERACTION START ###
[  215s] [  202.684592] SysRq : Power Off
[  215s] [  202.685813] reboot: Power down
[  216s] ### VM INTERACTION END ###
[  216s] 
[  216s] armbuild22 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Mon Sep 17 
20:25:30 UTC 2018.
[  216s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-bts[master]: CBCH: Fix CBCH implementation for osmo-bts-trx

[Harald Welte]

Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/11005


Change subject: CBCH: Fix CBCH implementation for osmo-bts-trx
..

CBCH: Fix CBCH implementation for osmo-bts-trx

Unfortunately the code in Icc15603079a1709ec094f400a9bcf0008211890f
was incomplete as it missed a few spots where the CBCH-enabled channel
types weren't yet covered.

Using this patch I can both still perform RACH / Location Update as
well as actually receive SMSCB messages on an attached phone (Galaxy S5).

Change-Id: I311b141668549ef37054cbe74be66bf17ac1d7e6
Closes: OS#1617
Closes: OS#3559
---
M src/osmo-bts-trx/l1_if.c
1 file changed, 6 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/11005/1

diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 2b4f5c8..faff3a0 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -48,9 +48,11 @@
[GSM_PCHAN_NONE]= 8,
[GSM_PCHAN_CCCH]= 4,
[GSM_PCHAN_CCCH_SDCCH4] = 5,
+   [GSM_PCHAN_CCCH_SDCCH4_CBCH]= 5,
[GSM_PCHAN_TCH_F]   = 1,
[GSM_PCHAN_TCH_H]   = 3,
[GSM_PCHAN_SDCCH8_SACCH8C]  = 7,
+   [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 7,
[GSM_PCHAN_PDCH]= 13,
/* [GSM_PCHAN_TCH_F_PDCH] not needed here, see trx_set_ts_as_pchan() */
[GSM_PCHAN_UNKNOWN] = 0,
@@ -268,7 +270,8 @@
trx_sched_reset(&l1h->l1s);

/* deactivate lchan for CCCH */
-   if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) {
+   if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 ||
+   pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) {
lchan_set_state(&trx->ts[0].lchan[CCCH_LCHAN], 
LCHAN_S_INACTIVE);
}

@@ -378,7 +381,8 @@
return NM_NACK_RES_NOTAVAIL;

/* activate lchan for CCCH */
-   if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) {
+   if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 ||
+   pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) {
ts->lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML;
lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE);
}

--
To view, visit https://gerrit.osmocom.org/11005
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I311b141668549ef37054cbe74be66bf17ac1d7e6
Gerrit-Change-Number: 11005
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte