[MERGED] osmo-msc[master]: sms db: properly quote MSISDN in various SQL queries

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: sms db: properly quote MSISDN in various SQL queries
..


sms db: properly quote MSISDN in various SQL queries

Related: OS#2706
Change-Id: I793a3863e6f4ccbabafc7dabaff97a8c79bbd8e0
---
M src/libmsc/db.c
1 file changed, 18 insertions(+), 5 deletions(-)

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

Objections:
  Max: I would prefer this is not merged as is



diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index ca27b6a..eba4b1b 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -836,6 +836,7 @@
struct gsm_network *net = vsub->vlr->user_ctx;
dbi_result result;
struct gsm_sms *sms;
+   char *q_msisdn;
 
if (!vsub->lu_complete)
return NULL;
@@ -844,13 +845,16 @@
if (*vsub->msisdn == '\0')
return NULL;
 
+   dbi_conn_quote_string_copy(conn, vsub->msisdn, _msisdn);
result = dbi_conn_queryf(conn,
"SELECT * FROM SMS"
" WHERE sent IS NULL"
-   " AND dest_addr=%s"
+   " AND dest_addr = %s"
" AND deliver_attempts <= %u"
" ORDER BY id LIMIT 1",
-   vsub->msisdn, max_failed);
+   q_msisdn, max_failed);
+   free(q_msisdn);
+
if (!result)
return NULL;
 
@@ -872,14 +876,18 @@
 {
dbi_result result;
struct gsm_sms *sms;
+   char *q_last_msisdn;
 
+   dbi_conn_quote_string_copy(conn, last_msisdn, _last_msisdn);
result = dbi_conn_queryf(conn,
"SELECT * FROM SMS"
" WHERE sent IS NULL"
-   " AND dest_addr > '%s'"
+   " AND dest_addr > %s"
" AND deliver_attempts <= %u"
" ORDER BY dest_addr, id LIMIT 1",
-   last_msisdn, max_failed);
+   q_last_msisdn, max_failed);
+   free(q_last_msisdn);
+
if (!result)
return NULL;
 
@@ -936,11 +944,16 @@
 int db_sms_delete_by_msisdn(const char *msisdn)
 {
dbi_result result;
+   char *q_msisdn;
if (!msisdn || !*msisdn)
return 0;
+
+   dbi_conn_quote_string_copy(conn, msisdn, _msisdn);
result = dbi_conn_queryf(conn,
"DELETE FROM SMS WHERE src_addr=%s OR dest_addr=%s",
-   msisdn, msisdn);
+   q_msisdn, q_msisdn);
+   free(q_msisdn);
+
if (!result) {
LOGP(DDB, LOGL_ERROR,
 "Failed to delete SMS for %s\n", msisdn);

-- 
To view, visit https://gerrit.osmocom.org/5184
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I793a3863e6f4ccbabafc7dabaff97a8c79bbd8e0
Gerrit-PatchSet: 2
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 

osmo-msc[master]: sms db: properly quote MSISDN in various SQL queries

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5184
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I793a3863e6f4ccbabafc7dabaff97a8c79bbd8e0
Gerrit-PatchSet: 2
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[MERGED] osmo-ci[master]: osmocom-nightly/latest: check if osc is installed

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: osmocom-nightly/latest: check if osc is installed
..


osmocom-nightly/latest: check if osc is installed

Change-Id: I10ce91eab415c19bb811fbb2fd617d5ce2b58d41
---
M scripts/osmocom-latest-packages.sh
M scripts/osmocom-nightly-packages.sh
2 files changed, 10 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/scripts/osmocom-latest-packages.sh 
b/scripts/osmocom-latest-packages.sh
index bcc83de..bf20cfe 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -11,6 +11,11 @@
 DT=$(date +%Y%m%d)
 TOP=$(pwd)
 
+if ! which osc >/dev/null 2>/dev/null ; then
+  echo "osc binary not found"
+  exit 1
+fi
+
 # start with a checkout of the project
 if [ -d $PROJ ]; then
(cd $PROJ && osc up)
diff --git a/scripts/osmocom-nightly-packages.sh 
b/scripts/osmocom-nightly-packages.sh
index a00cad1..c2b603b 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -9,6 +9,11 @@
   exit 1
 fi
 
+if ! which osc >/dev/null 2>/dev/null ; then
+  echo "osc binary not found"
+  exit 1
+fi
+
 set -x -e
 
 git clone git://git.osmocom.org/osmo-sip-connector

-- 
To view, visit https://gerrit.osmocom.org/5179
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I10ce91eab415c19bb811fbb2fd617d5ce2b58d41
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 

osmo-pcu[master]: TBF: log timer invocation source

[Harald Welte]

Patch Set 1:

Why not simply introduce the macro in this patch to avoid introducing explicit 
__FILE__ etc in all places?

-- 
To view, visit https://gerrit.osmocom.org/5208
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If5f883ae52c469e5158bad24da9904fdc455582f
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-gsm-manuals[master]: common: preface: spectrum license: also mention UMTS

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: preface: spectrum license: also mention UMTS
..


common: preface: spectrum license: also mention UMTS

Change-Id: I496f56c05f873a7d9d1cdf2bc95231c7957cf51b
---
M common/chapters/preface.adoc
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc
index 21ba761..60bb219 100644
--- a/common/chapters/preface.adoc
+++ b/common/chapters/preface.adoc
@@ -166,9 +166,9 @@
 
  Spectrum License
 
-As GSM operates in licensed spectrum, please always double-check that
-you have all required licenses and that you do not transmit on any ARFCN
-that is not explicitly allocated to you by the applicable regulatory
+As GSM and UMTS operate in licensed spectrum, please always double-check that
+you have all required licenses and that you do not transmit on any ARFCN or
+UARFCN that is not explicitly allocated to you by the applicable regulatory
 authority in your country.
 
 WARNING: Depending on your jurisdiction, operating a radio transmitter

-- 
To view, visit https://gerrit.osmocom.org/5224
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I496f56c05f873a7d9d1cdf2bc95231c7957cf51b
Gerrit-PatchSet: 3
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-gsm-manuals[master]: common: preface: minor tweaks

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: preface: minor tweaks
..


common: preface: minor tweaks

Change-Id: Icfc3dee5fa5e6cc0f6a6e80b122206deeceff102
---
M common/chapters/preface.adoc
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc
index fd77d99..21ba761 100644
--- a/common/chapters/preface.adoc
+++ b/common/chapters/preface.adoc
@@ -137,10 +137,11 @@
 
 === Osmocom and sysmocom
 
-Some of the founders of the Osmocom project have established sysmocom as
-a company to provide products and services related to Osmocom.
+Some of the founders of the Osmocom project have established 'sysmocom -
+systems for mobile communications GmbH' as a company to provide products and
+services related to Osmocom.
 
-sysmocom and its staff have by far contributed the largest part of development
+sysmocom and its staff have contributed by far the largest part of development
 and maintenance to the Osmocom mobile network infrastructure projects.
 
 As part of this work, sysmocom has also created the manual you are

-- 
To view, visit https://gerrit.osmocom.org/5223
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfc3dee5fa5e6cc0f6a6e80b122206deeceff102
Gerrit-PatchSet: 3
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-gsm-manuals[master]: common: preface: minor tweaks

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5223
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Icfc3dee5fa5e6cc0f6a6e80b122206deeceff102
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-gsm-manuals[master]: OsmoHLR: update section 'Bootstrap the Database'

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: OsmoHLR: update section 'Bootstrap the Database'
..


OsmoHLR: update section 'Bootstrap the Database'

Change-Id: I1b7b99cc77d8cd8cce42e7cf93f5e2cd3c2344db
---
M OsmoHLR/chapters/running.adoc
1 file changed, 6 insertions(+), 16 deletions(-)

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



diff --git a/OsmoHLR/chapters/running.adoc b/OsmoHLR/chapters/running.adoc
index 09388c0..44b66f2 100644
--- a/OsmoHLR/chapters/running.adoc
+++ b/OsmoHLR/chapters/running.adoc
@@ -41,23 +41,13 @@
 
 === Bootstrap the Database
 
-Before first launching OsmoHLR, you need to create a database, which can be
-done with these commands:
+If no database exists yet, OsmoHLR will automatically create and bootstrap a
+database file with empty tables. If no `-l` command-line option is provided,
+this database file will be created in the current working directory.
 
-
-mkdir -p /var/lib/osmocom
-sqlite3 /var/lib/osmocom/hlr.db < /usr/share/doc/osmo-hlr/hlr.sql
-
-
-Depending on your installation choices, you will probably find `hlr.sql` in one
-of these locations:
-
-- `/usr/share/doc/osmo-hlr/hlr.sql`
-- `/usr/local/share/doc/osmo-hlr/hlr.sql`
-- in `osmo-hlr.git`'s source tree at `sql/hlr.sql`
-
-NOTE: At the time of writing, OsmoHLR does not create an initial empty database
-automatically, like OsmoNITB did. This behavior may be added in the future.
+Alternatively, you may use the `osmo-hlr-db-tool`, which is installed along
+with `osmo-hlr`, to bootstrap an empty database, or to migrate subscriber data
+from an old 'OsmoNITB' database. See `osmo-hlr-db-tool --help`.
 
 === Multiple instances
 

-- 
To view, visit https://gerrit.osmocom.org/5225
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b7b99cc77d8cd8cce42e7cf93f5e2cd3c2344db
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-gsm-manuals[master]: common: adjust preface to mention the current state of the O...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: adjust preface to mention the current state of the 
Osmocom art
..


common: adjust preface to mention the current state of the Osmocom art

Change-Id: I5690e7b5f0bd1483b5451f284a758b4b09c80d95
---
M common/chapters/preface.adoc
1 file changed, 14 insertions(+), 7 deletions(-)

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



diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc
index d85e318..fd77d99 100644
--- a/common/chapters/preface.adoc
+++ b/common/chapters/preface.adoc
@@ -22,12 +22,12 @@
 despite its ubiquity had not yet seen and Free / Open Source software
 implementations.
 
-`bs11-abis` quickly turned into `bsc-hack`, then 'OpenBSC' and into
-what is today known as its 'OsmoNITB' variant:  A minimal implementation
+`bs11-abis` quickly turned into `bsc-hack`, then 'OpenBSC' and its
+'OsmoNITB' variant: A minimal implementation
 of all the required functionality of an entire GSM network, exposing
 A-bis towards the BTS.  The project attracted more interested
-developers, and surprisingly quick also commercial interest,
-contribution and adoption.   This added support for more BTS models
+developers, and surprisingly quickly also commercial interest,
+contribution and adoption. This allowed adding support for more BTS models.
 
 After having implemented the network-side GSM protocol stack in 2008 and
 2009, in 2010 the same group of people set out to create a
@@ -40,10 +40,17 @@
 telephony, GMR satellite telephony, some SDR hardware, a SIM card
 protocol tracer and many others.
 
-It has been a most exciting ride during the last seven years.  I
-wouldn't want to miss it under any circumstances.
+Increasing commercial interest particularly in the BSS and core network
+components has lead the way to 3G support in Osmocom, as well as the split
+of the minimal 'OsmoNITB' implementation into separate and fully featured
+network components: OsmoBSC, OsmoMSC, OsmoHLR, OsmoMGW and OsmoSTP (among
+others), which allow seamless scaling from a simple "Network In The Box" to a
+distributed installation for serious load.
 
--- Harald Welte, Osmocom.org and OpenBSC founder, January 2016.
+It has been a most exciting ride during the last eight-odd years.  I would not
+have wanted to miss it under any circumstances.
+
+-- Harald Welte, Osmocom.org and OpenBSC founder, December 2017.
 
 
 === Acknowledgements

-- 
To view, visit https://gerrit.osmocom.org/5222
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5690e7b5f0bd1483b5451f284a758b4b09c80d95
Gerrit-PatchSet: 3
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-gsm-manuals[master]: common: preface: spectrum license: also mention UMTS

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5224
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I496f56c05f873a7d9d1cdf2bc95231c7957cf51b
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-gsm-manuals[master]: common: bts: dyn ts: drop special meaning for OsmoBSC vs Osm...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: bts: dyn ts: drop special meaning for OsmoBSC vs 
OsmoNITB
..


common: bts: dyn ts: drop special meaning for OsmoBSC vs OsmoNITB

Change-Id: I70da58bee08e531babfe78852cc82a1177f9b7b2
---
M common/chapters/bts.adoc
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 80c91d6..97c2894 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -277,8 +277,7 @@
 voice calls need to be served. This is a tremendous improvement in service over
 statically assigning a fixed number of timeslots for voice and data.
 
-Dynamic timeslots work both with OsmoNITB as well as with OsmoBSC driven by a
-third-party MSC. The causality is as follows: to establish a voice call, the
+The causality is as follows: to establish a voice call, the
 MSC requests a logical channel of a given TCH kind from the BSC. The BSC
 assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge
 that a given timeslot is dynamic exists only on the BSC level. When the MSC

-- 
To view, visit https://gerrit.osmocom.org/5228
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I70da58bee08e531babfe78852cc82a1177f9b7b2
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-gsm-manuals[master]: common: adjust preface to mention the current state of the O...

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5222
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I5690e7b5f0bd1483b5451f284a758b4b09c80d95
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-gsm-manuals[master]: common: bts: tweak BTS config example to show config, not te...

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5233
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9dda76cee8dfef6fc91099bcb3f90bed6c00b794
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-gsm-manuals[master]: OsmoHLR: update section 'Bootstrap the Database'

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5225
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1b7b99cc77d8cd8cce42e7cf93f5e2cd3c2344db
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-gsm-manuals[master]: common: bts: dyn ts: explain dyn_ts_allow_tch_f from OsmoBSC...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: bts: dyn ts: explain dyn_ts_allow_tch_f from OsmoBSC 
viewpoint
..


common: bts: dyn ts: explain dyn_ts_allow_tch_f from OsmoBSC viewpoint

Change-Id: If9425b16216f353515890a7b2de8590bdfa1ff38
---
M common/chapters/bts.adoc
1 file changed, 14 insertions(+), 3 deletions(-)

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



diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index b8d9f1b..116b69d 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -317,9 +317,20 @@
 
 BTS models supporting this timeslot kind are shown in <>.
 
-NOTE: At the time of writing, OsmoNITB disables TCH/F on this timeslot type due
-to transcoding limitations. Operation of OsmoBSC with a third-party MSC is not
-affected by this limitation. See https://osmocom.org/issues/1778.
+In the lack of transcoding capabilities, this timeslot type may cause
+mismatching codecs to be selected for two parties of the same call, which would
+cause call routing to fail ("`Cannot patch through call with different channel
+types: local = TCH_F, remote = TCH_H`"). A workaround is to disable TCH/F on
+this timeslot type, i.e. to allow only TCH/H. To disable TCH/F on Osmocom
+style dynamic timeslots, use a configuration of
+
+
+network
+ dyn_ts_allow_tch_f 0
+
+
+In OsmoNITB, disabling TCH/F on Osmocom dynamic timeslots is the default. In
+OsmoBSC, the default is to allow both.
 
  ip.access Style Dynamic Timeslots (TCH/F_PDCH)
 

-- 
To view, visit https://gerrit.osmocom.org/5230
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If9425b16216f353515890a7b2de8590bdfa1ff38
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-gsm-manuals[master]: common: bts: dyn ts: example: mention both osmo-bsc and osmo...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: bts: dyn ts: example: mention both osmo-bsc and 
osmo-nitb
..


common: bts: dyn ts: example: mention both osmo-bsc and osmo-nitb

Change-Id: Ie3218fd1449493a252a54f0b5356e8647df619e1
---
M common/chapters/bts.adoc
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 116b69d..475b683 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -348,7 +348,7 @@
 
  Dynamic Timeslot Configuration Examples
 
-This is an extract of an _osmo-nitb_ or _openbsc_ config file. A timeslot
+This is an extract of an @osmo-bsc@ or @osmo-nitb@ config file. A timeslot
 configuration with five Osmocom style dynamic timeslots and one dedicated PDCH
 may look like this:
 

-- 
To view, visit https://gerrit.osmocom.org/5231
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3218fd1449493a252a54f0b5356e8647df619e1
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-gsm-manuals[master]: common: bts: dyn ts: mark octasic as supported

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: bts: dyn ts: mark octasic as supported
..


common: bts: dyn ts: mark octasic as supported

Supported since osmo-bts 69ec4a419edee4f00a104c59a78b530eaf85382a /
Ia109d4bfade7bc28442127581f4bb0289146ea71

Change-Id: Iab21573ab308b1e243bd6b56c9e3b1977a7f69fe
---
M common/chapters/bts.adoc
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 97c2894..b8d9f1b 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -300,7 +300,7 @@
 |sysmoBTS using _osmo-bts-sysmo_ |supported |supported
 |various SDR platforms using _osmo-bts-trx_ |supported |supported
 |Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported
-|Octasic OctBTS using _osmo-bts-octphy_ | -  | -
+|Octasic OctBTS using _osmo-bts-octphy_ | supported  | supported
 |===
 
 The _OsmoBTS Abis Protocol Specification_ <> describes the

-- 
To view, visit https://gerrit.osmocom.org/5229
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab21573ab308b1e243bd6b56c9e3b1977a7f69fe
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-gsm-manuals[master]: common: bts: add blank line to separate a code block

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: bts: add blank line to separate a code block
..


common: bts: add blank line to separate a code block

Change-Id: I6072253a9293e5000465039d7dcd0c6e2b9966a3
---
M common/chapters/bts.adoc
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 475b683..9fbbd51 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -76,6 +76,7 @@
 In order to provision BTSs, you have to enter the BTS config node of the
 VTY.  In order to configure BTS 0, you can issue the following sequence
 of commands:
+
 
 OpenBSC> enable
 OpenBSC# configure terminal

-- 
To view, visit https://gerrit.osmocom.org/5232
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6072253a9293e5000465039d7dcd0c6e2b9966a3
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-gsm-manuals[master]: common: bts: tweak BTS config example to show config, not te...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common: bts: tweak BTS config example to show config, not 
telnet VTY
..


common: bts: tweak BTS config example to show config, not telnet VTY

Change-Id: I9dda76cee8dfef6fc91099bcb3f90bed6c00b794
---
M common/chapters/bts.adoc
1 file changed, 38 insertions(+), 38 deletions(-)

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



diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 9fbbd51..81ca1a2 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -88,51 +88,51 @@
 At this point, you have a plethora of commands, in fact an entire
 hierarchy of commands to configure all aspects of the BTS, as well as
 each of its TRX and each timeslot within each TRX.  For a full
-reference, please consult the respective chapter in the VTY reference of
-OpenBSC.
+reference, please consult the telnet VTY integrated help or the respective
+chapter in the VTY reference.
 
 BTS configuration depends quite a bit on the specific BTS vendor and
 model.  The section below provides just one possible example for the
 case of a sysmoBTS.
 
+Note that from the `configure terminal` command onwards, the telnet VTY
+commands above are identical to configuration file settings, for details see
+<>.
+
+Starting with `network` as above, your complete sysmoBTS configuration may look
+like this:
 
 
-OpenBSC(config-net-bts)# type sysmobts
-OpenBSC(config-net-bts)# band DCS1800
-OpenBSC(config-net-bts)# description The new BTS in Baikonur
-OpenBSC(config-net-bts)# location_area_code 2342
-OpenBSC(config-net-bts)# cell_identity 5
-OpenBSC(config-net-bts)# base_station_id_code 63
-OpenBSC(config-net-bts)# ip.access unit_id  0
-OpenBSC(config-net-bts)# ms max power 40
-OpenBSC(config-net-bts)# trx 0
-OpenBSC(config-net-bts-trx)# arfcn 871
-OpenBSC(config-net-bts-trx)# nominal power 23
-OpenBSC(config-net-bts-trx)# max_power_red 0
-OpenBSC(config-net-bts-trx)# timeslot 0
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config CCCH+SDCCH4
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 1
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 2
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 3
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 4
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 5
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 6
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 7
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config PDCH
-OpenBSC(config-net-bts-trx-ts)# exit
+network
+ bts 0
+  type sysmobts
+  band DCS1800
+  description The new BTS in Baikonur
+  location_area_code 2342
+  cell_identity 5
+  base_station_id_code 63
+  ip.access unit_id  0
+  ms max power 40
+  trx 0
+   arfcn 871
+   nominal power 23
+   max_power_red 0
+   timeslot 0
+phys_chan_config CCCH+SDCCH4
+   timeslot 1
+phys_chan_config TCH/F
+   timeslot 2
+phys_chan_config TCH/F
+   timeslot 3
+phys_chan_config TCH/F
+   timeslot 4
+phys_chan_config TCH/F
+   timeslot 5
+phys_chan_config TCH/F
+   timeslot 6
+phys_chan_config TCH/F
+   timeslot 7
+phys_chan_config PDCH
 
 
 

-- 
To view, visit https://gerrit.osmocom.org/5233
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9dda76cee8dfef6fc91099bcb3f90bed6c00b794
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-gsm-manuals[master]: OsmoBSC: update overview to explain both SCCPlite and SCCP/M3UA

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: OsmoBSC: update overview to explain both SCCPlite and SCCP/M3UA
..


OsmoBSC: update overview to explain both SCCPlite and SCCP/M3UA

Change-Id: I1f105b3febd4f99f4491e217ff1b1d0b28912980
---
M OsmoBSC/chapters/overview.adoc
1 file changed, 100 insertions(+), 86 deletions(-)

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



diff --git a/OsmoBSC/chapters/overview.adoc b/OsmoBSC/chapters/overview.adoc
index 3bb22cc..9b619fb 100644
--- a/OsmoBSC/chapters/overview.adoc
+++ b/OsmoBSC/chapters/overview.adoc
@@ -7,111 +7,125 @@
 [[intro_overview]]
 === About OsmoBSC
 
-OsmoBSC is one particular version of the OpenBSC software suite.
+OsmoBSC is the Osmocom implementation of a Base Station Controller. It
+implements:
 
-Unlike the highly integrated OmsoNITB, OsmoBSC implements a more classic
-GSM Base Station Controller with A-bis interface towards BTSs and A
-interface towards a MSC.
-
-The difference between classic GSM network architecture and
-the OsmoNITB based GSM network architecture is illustrated in
-<> and <>.
-
-[[fig-gsm-classic]]
-.Classic GSM network architecture (simplified)
-[graphviz]
-
-digraph G {
-rankdir=LR;
-MS0 [label="MS"];
-MS1 [label="MS"];
-MS2 [label="MS"];
-MS3 [label="MS"];
-BTS0 [label="BTS"];
-BTS1 [label="BTS"];
-BSC;
-MSC [label="MSC/VLR"];
-HLR [label="HLR/AUC"];
-EIR;
-SMSC;
-MS0->BTS0 [label="Um"];
-MS1->BTS0 [label="Um"];
-MS2->BTS1 [label="Um"];
-MS3->BTS1 [label="Um"];
-BTS0->BSC [label="Abis"];
-BTS1->BSC [label="Abis"];
-BSC->MSC [label="A"];
-MSC->HLR [label="C"];
-MSC->EIR [label="F"];
-MSC->SMSC;
-}
-
-
-[[fig-gsm-nitb]]
-.GSM system architecture using OsmoNITB
-[graphviz]
-
-digraph G {
-rankdir=LR;
-MS0 [label="MS"];
-MS1 [label="MS"];
-MS2 [label="MS"];
-MS3 [label="MS"];
-BTS0 [label="BTS"];
-BTS1 [label="BTS"];
-EXTMNCC [label="Linux Call Router / SoftSwitch / PBX\n(optional)"];
-MS0->BTS0 [label="Um"];
-MS1->BTS0 [label="Um"];
-MS2->BTS1 [label="Um"];
-MS3->BTS1 [label="Um"];
-BTS0->BSC [label="Abis"];
-BTS1->BSC [label="Abis"];
-subgraph cluster_nitb {
-label = "OsmoNITB";
-BSC;
-MSC [label="MSC/VLR"];
-SMSC;
-EIR;
-HLR [label="HLR/AUC"];
-BSC->MSC;
-MSC->HLR;
-MSC->EIR;
-MSC->SMSC;
-}
-MSC -> EXTMNCC [label="external MNCC"];
-}
-
-
+- an 'A-bis' interface towards BTSs and
+- an 'A' interface towards an MSC. It is important to be aware that there are
+  two variants of the 'A' interface, see <>.
 
 === Software Components
 
 OsmoBSC contains a variety of different software components, which
-we'll quickly describe in this section.
+we'll briefly describe in this section.
 
  A-bis Implementation
 
-OsmoBSC implements the ETSI/3GPP specified A-bis interface, including
-TS 08.56 (LAPD), TS 08.58 (RSL) and TS 12.21 (OML). In addition, it
-supports a variety of vendor-specific extensions and dialects in order
-to communicate with BTSs from Siemens, Nokia, Ericsson, ip.access and
-sysmocom.
+OsmoBSC implements the ETSI/3GPP specified A-bis interface, including TS 08.56
+(LAPD), TS 08.58 (RSL) and TS 12.21 (OML). In addition, it supports a variety
+of vendor-specific extensions and dialects in order to communicate with BTSs
+from Siemens, Nokia, Ericsson, ip.access, Octasic and sysmocom, as well as
+various USRP based BTS implementations, using OsmoBTS and OsmoTRX (like the
+Ettus B200 series, the Fairwaves XTRX or the LimeSDR, to name a few).
 
 For more information, see <> and <>.
 
+[[a-interface]]
  A Implementation
 
-OsmoBSC implements a minimal sub-set of the GSM A interface as specified
-in TS 08.08.
+OsmoBSC implements a sub-set of the GSM A interface as specified in TS 08.08
+(BSSAP) and TS 04.08 (DTAP).
 
-Unlike classic A interface implementations for E1 interfacs, OsmoBSC
-implements a variant of encapsulating the A interface over IP.  To do
-so, the SCCP messages are wrapped in an IPA multiplex and then
+Osmocom offers two variants of the 'A' interface's protocol stacking:
+
+- 'A/SCCPlite'
+- 'A/SCCP/M3UA'
+
+Traditionally, OsmoBSC only implemented the A/SCCPlite protocol, but since a
+proper M3UA implementation is available from 'libosmo-sigtran'
+('libosmo-sccp.git'), the stock OsmoBSC now supports only A/SCCP/M3UA. (The
+idea is that SCCPlite support may be added to libosmo-sigtran at some point
+in the future, after which the new `osmo-bsc` would support both variants of
+the A interface.)
+
+The 

[MERGED] osmo-gsm-manuals[master]: common / OsmoBSC: drop unused alink.adoc

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: common / OsmoBSC: drop unused alink.adoc
..


common / OsmoBSC: drop unused alink.adoc

Change-Id: Ia3219359be891c161d20eccb7bbcb65af35ef42b
---
D OsmoBSC/chapters/alink.adoc
M OsmoBSC/osmobsc-usermanual.adoc
2 files changed, 0 insertions(+), 17 deletions(-)

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



diff --git a/OsmoBSC/chapters/alink.adoc b/OsmoBSC/chapters/alink.adoc
deleted file mode 100644
index 0321c0e..000
--- a/OsmoBSC/chapters/alink.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-== A-link including SCCP/BSSAP/DTAP
-
-OsmoBSC implements a minimal sub-set of the GSM A interface as specified
-in TS 08.08.
-
-Unlike classic A interface implementations for E1 interfaces, OsmoBSC
-implements a variant of encapsulating the A interface over IP.  To do
-so, the SCCP messages are wrapped in an IPA multiplex and then
-communicated over TCP.  The audio channels are mapped to RTP streams.
-
-This protocol stacking is sometimes called "SCCPlite".
-
-===
-
-FIXME
diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc
index 2ff985d..e3eadaf 100644
--- a/OsmoBSC/osmobsc-usermanual.adoc
+++ b/OsmoBSC/osmobsc-usermanual.adoc
@@ -27,8 +27,6 @@
 
 include::../common/chapters/abis.adoc[]
 
-#include::../common/chapters/alink.adoc[]
-
 include::../common/chapters/control_if.adoc[]
 
 include::../common/chapters/cell-broadcast.adoc[]

-- 
To view, visit https://gerrit.osmocom.org/5227
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3219359be891c161d20eccb7bbcb65af35ef42b
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-gsm-manuals[master]: common: bts: dyn ts: explain dyn_ts_allow_tch_f from OsmoBSC...

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5230
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If9425b16216f353515890a7b2de8590bdfa1ff38
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-gsm-manuals[master]: common: bts: dyn ts: example: mention both osmo-bsc and osmo...

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5231
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie3218fd1449493a252a54f0b5356e8647df619e1
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-gsm-manuals[master]: common: bts: dyn ts: drop special meaning for OsmoBSC vs Osm...

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5228
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I70da58bee08e531babfe78852cc82a1177f9b7b2
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-gsm-manuals[master]: common / OsmoBSC: drop unused alink.adoc

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5227
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia3219359be891c161d20eccb7bbcb65af35ef42b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-gsm-manuals[master]: OsmoBSC: update overview to explain both SCCPlite and SCCP/M3UA

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5226
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1f105b3febd4f99f4491e217ff1b1d0b28912980
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-gsm-manuals[master]: common: bts: add blank line to separate a code block

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5232
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I6072253a9293e5000465039d7dcd0c6e2b9966a3
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[PATCH] osmo-gsm-manuals[master]: common: bts: add blank line to separate a code block

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5232

common: bts: add blank line to separate a code block

Change-Id: I6072253a9293e5000465039d7dcd0c6e2b9966a3
---
M common/chapters/bts.adoc
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/32/5232/1

diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 475b683..9fbbd51 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -76,6 +76,7 @@
 In order to provision BTSs, you have to enter the BTS config node of the
 VTY.  In order to configure BTS 0, you can issue the following sequence
 of commands:
+
 
 OpenBSC> enable
 OpenBSC# configure terminal

-- 
To view, visit https://gerrit.osmocom.org/5232
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6072253a9293e5000465039d7dcd0c6e2b9966a3
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: OsmoBSC: update overview to explain both SCCPlite and SCCP/M3UA

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5226

OsmoBSC: update overview to explain both SCCPlite and SCCP/M3UA

Change-Id: I1f105b3febd4f99f4491e217ff1b1d0b28912980
---
M OsmoBSC/chapters/overview.adoc
1 file changed, 100 insertions(+), 86 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/26/5226/1

diff --git a/OsmoBSC/chapters/overview.adoc b/OsmoBSC/chapters/overview.adoc
index 3bb22cc..9b619fb 100644
--- a/OsmoBSC/chapters/overview.adoc
+++ b/OsmoBSC/chapters/overview.adoc
@@ -7,111 +7,125 @@
 [[intro_overview]]
 === About OsmoBSC
 
-OsmoBSC is one particular version of the OpenBSC software suite.
+OsmoBSC is the Osmocom implementation of a Base Station Controller. It
+implements:
 
-Unlike the highly integrated OmsoNITB, OsmoBSC implements a more classic
-GSM Base Station Controller with A-bis interface towards BTSs and A
-interface towards a MSC.
-
-The difference between classic GSM network architecture and
-the OsmoNITB based GSM network architecture is illustrated in
-<> and <>.
-
-[[fig-gsm-classic]]
-.Classic GSM network architecture (simplified)
-[graphviz]
-
-digraph G {
-rankdir=LR;
-MS0 [label="MS"];
-MS1 [label="MS"];
-MS2 [label="MS"];
-MS3 [label="MS"];
-BTS0 [label="BTS"];
-BTS1 [label="BTS"];
-BSC;
-MSC [label="MSC/VLR"];
-HLR [label="HLR/AUC"];
-EIR;
-SMSC;
-MS0->BTS0 [label="Um"];
-MS1->BTS0 [label="Um"];
-MS2->BTS1 [label="Um"];
-MS3->BTS1 [label="Um"];
-BTS0->BSC [label="Abis"];
-BTS1->BSC [label="Abis"];
-BSC->MSC [label="A"];
-MSC->HLR [label="C"];
-MSC->EIR [label="F"];
-MSC->SMSC;
-}
-
-
-[[fig-gsm-nitb]]
-.GSM system architecture using OsmoNITB
-[graphviz]
-
-digraph G {
-rankdir=LR;
-MS0 [label="MS"];
-MS1 [label="MS"];
-MS2 [label="MS"];
-MS3 [label="MS"];
-BTS0 [label="BTS"];
-BTS1 [label="BTS"];
-EXTMNCC [label="Linux Call Router / SoftSwitch / PBX\n(optional)"];
-MS0->BTS0 [label="Um"];
-MS1->BTS0 [label="Um"];
-MS2->BTS1 [label="Um"];
-MS3->BTS1 [label="Um"];
-BTS0->BSC [label="Abis"];
-BTS1->BSC [label="Abis"];
-subgraph cluster_nitb {
-label = "OsmoNITB";
-BSC;
-MSC [label="MSC/VLR"];
-SMSC;
-EIR;
-HLR [label="HLR/AUC"];
-BSC->MSC;
-MSC->HLR;
-MSC->EIR;
-MSC->SMSC;
-}
-MSC -> EXTMNCC [label="external MNCC"];
-}
-
-
+- an 'A-bis' interface towards BTSs and
+- an 'A' interface towards an MSC. It is important to be aware that there are
+  two variants of the 'A' interface, see <>.
 
 === Software Components
 
 OsmoBSC contains a variety of different software components, which
-we'll quickly describe in this section.
+we'll briefly describe in this section.
 
  A-bis Implementation
 
-OsmoBSC implements the ETSI/3GPP specified A-bis interface, including
-TS 08.56 (LAPD), TS 08.58 (RSL) and TS 12.21 (OML). In addition, it
-supports a variety of vendor-specific extensions and dialects in order
-to communicate with BTSs from Siemens, Nokia, Ericsson, ip.access and
-sysmocom.
+OsmoBSC implements the ETSI/3GPP specified A-bis interface, including TS 08.56
+(LAPD), TS 08.58 (RSL) and TS 12.21 (OML). In addition, it supports a variety
+of vendor-specific extensions and dialects in order to communicate with BTSs
+from Siemens, Nokia, Ericsson, ip.access, Octasic and sysmocom, as well as
+various USRP based BTS implementations, using OsmoBTS and OsmoTRX (like the
+Ettus B200 series, the Fairwaves XTRX or the LimeSDR, to name a few).
 
 For more information, see <> and <>.
 
+[[a-interface]]
  A Implementation
 
-OsmoBSC implements a minimal sub-set of the GSM A interface as specified
-in TS 08.08.
+OsmoBSC implements a sub-set of the GSM A interface as specified in TS 08.08
+(BSSAP) and TS 04.08 (DTAP).
 
-Unlike classic A interface implementations for E1 interfacs, OsmoBSC
-implements a variant of encapsulating the A interface over IP.  To do
-so, the SCCP messages are wrapped in an IPA multiplex and then
+Osmocom offers two variants of the 'A' interface's protocol stacking:
+
+- 'A/SCCPlite'
+- 'A/SCCP/M3UA'
+
+Traditionally, OsmoBSC only implemented the A/SCCPlite protocol, but since a
+proper M3UA implementation is available from 'libosmo-sigtran'
+('libosmo-sccp.git'), the stock OsmoBSC now supports only A/SCCP/M3UA. (The
+idea is that SCCPlite support may be added to libosmo-sigtran at some point
+in the future, after which the new `osmo-bsc` would support both variants of
+the A interface.)
+
+The difference between an A/SCCPlite and A/SCCP/M3UA is illustrated in
+<> and <>.
+
+= A/SCCPlite
+
+Unlike classic A interface implementations for E1 interfacs,

[PATCH] osmo-gsm-manuals[master]: common: bts: dyn ts: explain dyn_ts_allow_tch_f from OsmoBSC...

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5230

common: bts: dyn ts: explain dyn_ts_allow_tch_f from OsmoBSC viewpoint

Change-Id: If9425b16216f353515890a7b2de8590bdfa1ff38
---
M common/chapters/bts.adoc
1 file changed, 14 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/30/5230/1

diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index b8d9f1b..116b69d 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -317,9 +317,20 @@
 
 BTS models supporting this timeslot kind are shown in <>.
 
-NOTE: At the time of writing, OsmoNITB disables TCH/F on this timeslot type due
-to transcoding limitations. Operation of OsmoBSC with a third-party MSC is not
-affected by this limitation. See https://osmocom.org/issues/1778.
+In the lack of transcoding capabilities, this timeslot type may cause
+mismatching codecs to be selected for two parties of the same call, which would
+cause call routing to fail ("`Cannot patch through call with different channel
+types: local = TCH_F, remote = TCH_H`"). A workaround is to disable TCH/F on
+this timeslot type, i.e. to allow only TCH/H. To disable TCH/F on Osmocom
+style dynamic timeslots, use a configuration of
+
+
+network
+ dyn_ts_allow_tch_f 0
+
+
+In OsmoNITB, disabling TCH/F on Osmocom dynamic timeslots is the default. In
+OsmoBSC, the default is to allow both.
 
  ip.access Style Dynamic Timeslots (TCH/F_PDCH)
 

-- 
To view, visit https://gerrit.osmocom.org/5230
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9425b16216f353515890a7b2de8590bdfa1ff38
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: common: bts: tweak BTS config example to show config, not te...

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5233

common: bts: tweak BTS config example to show config, not telnet VTY

Change-Id: I9dda76cee8dfef6fc91099bcb3f90bed6c00b794
---
M common/chapters/bts.adoc
1 file changed, 38 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/33/5233/1

diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 9fbbd51..81ca1a2 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -88,51 +88,51 @@
 At this point, you have a plethora of commands, in fact an entire
 hierarchy of commands to configure all aspects of the BTS, as well as
 each of its TRX and each timeslot within each TRX.  For a full
-reference, please consult the respective chapter in the VTY reference of
-OpenBSC.
+reference, please consult the telnet VTY integrated help or the respective
+chapter in the VTY reference.
 
 BTS configuration depends quite a bit on the specific BTS vendor and
 model.  The section below provides just one possible example for the
 case of a sysmoBTS.
 
+Note that from the `configure terminal` command onwards, the telnet VTY
+commands above are identical to configuration file settings, for details see
+<>.
+
+Starting with `network` as above, your complete sysmoBTS configuration may look
+like this:
 
 
-OpenBSC(config-net-bts)# type sysmobts
-OpenBSC(config-net-bts)# band DCS1800
-OpenBSC(config-net-bts)# description The new BTS in Baikonur
-OpenBSC(config-net-bts)# location_area_code 2342
-OpenBSC(config-net-bts)# cell_identity 5
-OpenBSC(config-net-bts)# base_station_id_code 63
-OpenBSC(config-net-bts)# ip.access unit_id  0
-OpenBSC(config-net-bts)# ms max power 40
-OpenBSC(config-net-bts)# trx 0
-OpenBSC(config-net-bts-trx)# arfcn 871
-OpenBSC(config-net-bts-trx)# nominal power 23
-OpenBSC(config-net-bts-trx)# max_power_red 0
-OpenBSC(config-net-bts-trx)# timeslot 0
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config CCCH+SDCCH4
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 1
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 2
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 3
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 4
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 5
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 6
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config TCH/F
-OpenBSC(config-net-bts-trx-ts)# exit
-OpenBSC(config-net-bts-trx)# timeslot 7
-OpenBSC(config-net-bts-trx-ts)# phys_chan_config PDCH
-OpenBSC(config-net-bts-trx-ts)# exit
+network
+ bts 0
+  type sysmobts
+  band DCS1800
+  description The new BTS in Baikonur
+  location_area_code 2342
+  cell_identity 5
+  base_station_id_code 63
+  ip.access unit_id  0
+  ms max power 40
+  trx 0
+   arfcn 871
+   nominal power 23
+   max_power_red 0
+   timeslot 0
+phys_chan_config CCCH+SDCCH4
+   timeslot 1
+phys_chan_config TCH/F
+   timeslot 2
+phys_chan_config TCH/F
+   timeslot 3
+phys_chan_config TCH/F
+   timeslot 4
+phys_chan_config TCH/F
+   timeslot 5
+phys_chan_config TCH/F
+   timeslot 6
+phys_chan_config TCH/F
+   timeslot 7
+phys_chan_config PDCH
 
 
 

-- 
To view, visit https://gerrit.osmocom.org/5233
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dda76cee8dfef6fc91099bcb3f90bed6c00b794
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: common: bts: dyn ts: example: mention both osmo-bsc and osmo...

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5231

common: bts: dyn ts: example: mention both osmo-bsc and osmo-nitb

Change-Id: Ie3218fd1449493a252a54f0b5356e8647df619e1
---
M common/chapters/bts.adoc
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/31/5231/1

diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 116b69d..475b683 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -348,7 +348,7 @@
 
  Dynamic Timeslot Configuration Examples
 
-This is an extract of an _osmo-nitb_ or _openbsc_ config file. A timeslot
+This is an extract of an @osmo-bsc@ or @osmo-nitb@ config file. A timeslot
 configuration with five Osmocom style dynamic timeslots and one dedicated PDCH
 may look like this:
 

-- 
To view, visit https://gerrit.osmocom.org/5231
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3218fd1449493a252a54f0b5356e8647df619e1
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: common / OsmoBSC: drop unused alink.adoc

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5227

common / OsmoBSC: drop unused alink.adoc

Change-Id: Ia3219359be891c161d20eccb7bbcb65af35ef42b
---
D OsmoBSC/chapters/alink.adoc
M OsmoBSC/osmobsc-usermanual.adoc
2 files changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/27/5227/1

diff --git a/OsmoBSC/chapters/alink.adoc b/OsmoBSC/chapters/alink.adoc
deleted file mode 100644
index 0321c0e..000
--- a/OsmoBSC/chapters/alink.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-== A-link including SCCP/BSSAP/DTAP
-
-OsmoBSC implements a minimal sub-set of the GSM A interface as specified
-in TS 08.08.
-
-Unlike classic A interface implementations for E1 interfaces, OsmoBSC
-implements a variant of encapsulating the A interface over IP.  To do
-so, the SCCP messages are wrapped in an IPA multiplex and then
-communicated over TCP.  The audio channels are mapped to RTP streams.
-
-This protocol stacking is sometimes called "SCCPlite".
-
-===
-
-FIXME
diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc
index 2ff985d..e3eadaf 100644
--- a/OsmoBSC/osmobsc-usermanual.adoc
+++ b/OsmoBSC/osmobsc-usermanual.adoc
@@ -27,8 +27,6 @@
 
 include::../common/chapters/abis.adoc[]
 
-#include::../common/chapters/alink.adoc[]
-
 include::../common/chapters/control_if.adoc[]
 
 include::../common/chapters/cell-broadcast.adoc[]

-- 
To view, visit https://gerrit.osmocom.org/5227
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3219359be891c161d20eccb7bbcb65af35ef42b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: common: bts: dyn ts: drop special meaning for OsmoBSC vs Osm...

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5228

common: bts: dyn ts: drop special meaning for OsmoBSC vs OsmoNITB

Change-Id: I70da58bee08e531babfe78852cc82a1177f9b7b2
---
M common/chapters/bts.adoc
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/28/5228/1

diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 80c91d6..97c2894 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -277,8 +277,7 @@
 voice calls need to be served. This is a tremendous improvement in service over
 statically assigning a fixed number of timeslots for voice and data.
 
-Dynamic timeslots work both with OsmoNITB as well as with OsmoBSC driven by a
-third-party MSC. The causality is as follows: to establish a voice call, the
+The causality is as follows: to establish a voice call, the
 MSC requests a logical channel of a given TCH kind from the BSC. The BSC
 assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge
 that a given timeslot is dynamic exists only on the BSC level. When the MSC

-- 
To view, visit https://gerrit.osmocom.org/5228
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70da58bee08e531babfe78852cc82a1177f9b7b2
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: common: bts: dyn ts: mark octasic as supported

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5229

common: bts: dyn ts: mark octasic as supported

Supported since osmo-bts 69ec4a419edee4f00a104c59a78b530eaf85382a /
Ia109d4bfade7bc28442127581f4bb0289146ea71

Change-Id: Iab21573ab308b1e243bd6b56c9e3b1977a7f69fe
---
M common/chapters/bts.adoc
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/29/5229/1

diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc
index 97c2894..b8d9f1b 100644
--- a/common/chapters/bts.adoc
+++ b/common/chapters/bts.adoc
@@ -300,7 +300,7 @@
 |sysmoBTS using _osmo-bts-sysmo_ |supported |supported
 |various SDR platforms using _osmo-bts-trx_ |supported |supported
 |Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported
-|Octasic OctBTS using _osmo-bts-octphy_ | -  | -
+|Octasic OctBTS using _osmo-bts-octphy_ | supported  | supported
 |===
 
 The _OsmoBTS Abis Protocol Specification_ <> describes the

-- 
To view, visit https://gerrit.osmocom.org/5229
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab21573ab308b1e243bd6b56c9e3b1977a7f69fe
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: OsmoHLR: update section 'Bootstrap the Database'

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5225

OsmoHLR: update section 'Bootstrap the Database'

Change-Id: I1b7b99cc77d8cd8cce42e7cf93f5e2cd3c2344db
---
M OsmoHLR/chapters/running.adoc
1 file changed, 6 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/25/5225/1

diff --git a/OsmoHLR/chapters/running.adoc b/OsmoHLR/chapters/running.adoc
index 09388c0..44b66f2 100644
--- a/OsmoHLR/chapters/running.adoc
+++ b/OsmoHLR/chapters/running.adoc
@@ -41,23 +41,13 @@
 
 === Bootstrap the Database
 
-Before first launching OsmoHLR, you need to create a database, which can be
-done with these commands:
+If no database exists yet, OsmoHLR will automatically create and bootstrap a
+database file with empty tables. If no `-l` command-line option is provided,
+this database file will be created in the current working directory.
 
-
-mkdir -p /var/lib/osmocom
-sqlite3 /var/lib/osmocom/hlr.db < /usr/share/doc/osmo-hlr/hlr.sql
-
-
-Depending on your installation choices, you will probably find `hlr.sql` in one
-of these locations:
-
-- `/usr/share/doc/osmo-hlr/hlr.sql`
-- `/usr/local/share/doc/osmo-hlr/hlr.sql`
-- in `osmo-hlr.git`'s source tree at `sql/hlr.sql`
-
-NOTE: At the time of writing, OsmoHLR does not create an initial empty database
-automatically, like OsmoNITB did. This behavior may be added in the future.
+Alternatively, you may use the `osmo-hlr-db-tool`, which is installed along
+with `osmo-hlr`, to bootstrap an empty database, or to migrate subscriber data
+from an old 'OsmoNITB' database. See `osmo-hlr-db-tool --help`.
 
 === Multiple instances
 

-- 
To view, visit https://gerrit.osmocom.org/5225
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b7b99cc77d8cd8cce42e7cf93f5e2cd3c2344db
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: common: adjust preface to mention the current state of the O...

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/5222

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

common: adjust preface to mention the current state of the Osmocom art

Change-Id: I5690e7b5f0bd1483b5451f284a758b4b09c80d95
---
M common/chapters/preface.adoc
1 file changed, 14 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/22/5222/2

diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc
index d85e318..fd77d99 100644
--- a/common/chapters/preface.adoc
+++ b/common/chapters/preface.adoc
@@ -22,12 +22,12 @@
 despite its ubiquity had not yet seen and Free / Open Source software
 implementations.
 
-`bs11-abis` quickly turned into `bsc-hack`, then 'OpenBSC' and into
-what is today known as its 'OsmoNITB' variant:  A minimal implementation
+`bs11-abis` quickly turned into `bsc-hack`, then 'OpenBSC' and its
+'OsmoNITB' variant: A minimal implementation
 of all the required functionality of an entire GSM network, exposing
 A-bis towards the BTS.  The project attracted more interested
-developers, and surprisingly quick also commercial interest,
-contribution and adoption.   This added support for more BTS models
+developers, and surprisingly quickly also commercial interest,
+contribution and adoption. This allowed adding support for more BTS models.
 
 After having implemented the network-side GSM protocol stack in 2008 and
 2009, in 2010 the same group of people set out to create a
@@ -40,10 +40,17 @@
 telephony, GMR satellite telephony, some SDR hardware, a SIM card
 protocol tracer and many others.
 
-It has been a most exciting ride during the last seven years.  I
-wouldn't want to miss it under any circumstances.
+Increasing commercial interest particularly in the BSS and core network
+components has lead the way to 3G support in Osmocom, as well as the split
+of the minimal 'OsmoNITB' implementation into separate and fully featured
+network components: OsmoBSC, OsmoMSC, OsmoHLR, OsmoMGW and OsmoSTP (among
+others), which allow seamless scaling from a simple "Network In The Box" to a
+distributed installation for serious load.
 
--- Harald Welte, Osmocom.org and OpenBSC founder, January 2016.
+It has been a most exciting ride during the last eight-odd years.  I would not
+have wanted to miss it under any circumstances.
+
+-- Harald Welte, Osmocom.org and OpenBSC founder, December 2017.
 
 
 === Acknowledgements

-- 
To view, visit https://gerrit.osmocom.org/5222
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I5690e7b5f0bd1483b5451f284a758b4b09c80d95
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder

[PATCH] osmo-gsm-manuals[master]: common: adjust preface to mention the current state of the O...

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5222

common: adjust preface to mention the current state of the Osmocom art

Change-Id: I5690e7b5f0bd1483b5451f284a758b4b09c80d95
---
M common/chapters/preface.adoc
1 file changed, 14 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/22/5222/1

diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc
index d85e318..ed913e6 100644
--- a/common/chapters/preface.adoc
+++ b/common/chapters/preface.adoc
@@ -22,12 +22,12 @@
 despite its ubiquity had not yet seen and Free / Open Source software
 implementations.
 
-`bs11-abis` quickly turned into `bsc-hack`, then 'OpenBSC' and into
-what is today known as its 'OsmoNITB' variant:  A minimal implementation
+`bs11-abis` quickly turned into `bsc-hack`, then 'OpenBSC' and its
+'OsmoNITB' variant: A minimal implementation
 of all the required functionality of an entire GSM network, exposing
 A-bis towards the BTS.  The project attracted more interested
-developers, and surprisingly quick also commercial interest,
-contribution and adoption.   This added support for more BTS models
+developers, and surprisingly quickly also commercial interest,
+contribution and adoption. This allowed adding support for more BTS models.
 
 After having implemented the network-side GSM protocol stack in 2008 and
 2009, in 2010 the same group of people set out to create a
@@ -40,10 +40,17 @@
 telephony, GMR satellite telephony, some SDR hardware, a SIM card
 protocol tracer and many others.
 
-It has been a most exciting ride during the last seven years.  I
-wouldn't want to miss it under any circumstances.
+Increasing commercial interest particularly in the BSS and core network
+components has lead the way to Osmocom now supporting 3G, as well as the split
+of the minimal 'OsmoNITB' implementation into separate and fully featured
+network components: OsmoBSC, OsmoMSC, OsmoHLR, OsmoMGW and OsmoSTP (among
+others), which allow seamless scaling from a simple "Network In The Box" to a
+distributed installation that is able to handle serious load.
 
--- Harald Welte, Osmocom.org and OpenBSC founder, January 2016.
+It has been a most exciting ride during the last eight-odd years.  I would not
+have wanted to miss it under any circumstances.
+
+-- Harald Welte, Osmocom.org and OpenBSC founder, December 2017.
 
 
 === Acknowledgements

-- 
To view, visit https://gerrit.osmocom.org/5222
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5690e7b5f0bd1483b5451f284a758b4b09c80d95
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: common: preface: spectrum license: also mention UMTS

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5224

common: preface: spectrum license: also mention UMTS

Change-Id: I496f56c05f873a7d9d1cdf2bc95231c7957cf51b
---
M common/chapters/preface.adoc
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/24/5224/1

diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc
index 6f68b53..61e5f72 100644
--- a/common/chapters/preface.adoc
+++ b/common/chapters/preface.adoc
@@ -166,9 +166,9 @@
 
  Spectrum License
 
-As GSM operates in licensed spectrum, please always double-check that
-you have all required licenses and that you do not transmit on any ARFCN
-that is not explicitly allocated to you by the applicable regulatory
+As GSM and UMTS operate in licensed spectrum, please always double-check that
+you have all required licenses and that you do not transmit on any ARFCN or
+UARFCN that is not explicitly allocated to you by the applicable regulatory
 authority in your country.
 
 WARNING: Depending on your jurisdiction, operating a radio transmitter

-- 
To view, visit https://gerrit.osmocom.org/5224
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I496f56c05f873a7d9d1cdf2bc95231c7957cf51b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[PATCH] osmo-gsm-manuals[master]: common: preface: minor tweaks

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/5223

common: preface: minor tweaks

Change-Id: Icfc3dee5fa5e6cc0f6a6e80b122206deeceff102
---
M common/chapters/preface.adoc
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/23/5223/1

diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc
index ed913e6..6f68b53 100644
--- a/common/chapters/preface.adoc
+++ b/common/chapters/preface.adoc
@@ -137,10 +137,11 @@
 
 === Osmocom and sysmocom
 
-Some of the founders of the Osmocom project have established sysmocom as
-a company to provide products and services related to Osmocom.
+Some of the founders of the Osmocom project have established 'sysmocom -
+systems for mobile communications GmbH' as a company to provide products and
+services related to Osmocom.
 
-sysmocom and its staff have by far contributed the largest part of development
+sysmocom and its staff have contributed by far the largest part of development
 and maintenance to the Osmocom mobile network infrastructure projects.
 
 As part of this work, sysmocom has also created the manual you are

-- 
To view, visit https://gerrit.osmocom.org/5223
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfc3dee5fa5e6cc0f6a6e80b122206deeceff102
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

osmo-pcu[master]: TBF: remove unused variable

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5219
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I94d83ca8c9b2f0732b53fdf42b17ba93cd7f1c15
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-gsm-manuals[master]: Update CTRL example

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5220
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I3c16f38ade6fcfadffd8d2573f71828119da055c
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-gsm-manuals[master]: Update CTRL example

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Update CTRL example
..


Update CTRL example

Use proper script new and repository location.

Change-Id: I3c16f38ade6fcfadffd8d2573f71828119da055c
---
M common/chapters/control_if.adoc
1 file changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/common/chapters/control_if.adoc b/common/chapters/control_if.adoc
index c4d38d7..682483a 100644
--- a/common/chapters/control_if.adoc
+++ b/common/chapters/control_if.adoc
@@ -173,10 +173,10 @@
 so its use is discouraged.
 There might still be some applications not yet converted to rate_ctr.
 
-=== Control Interface python example: `bsc_control.py`
+=== Control Interface python example: `osmo_ctrl.py`
 
-In the `openbsc.git` repository, there is an example python script
-called `openbsc/contrib/bsc_control.py` which implements the Osmocom
+In the `osmo-python-tests` repository, there is an example python script
+called `osmopy/osmo_ctrl.py` which implements the Osmocom
 control interface protocol.
 
 You can use this tool either stand-alone to perform control interface
@@ -186,27 +186,27 @@
 
  Setting a value
 
-.Example: Use `bsc_control.py` to set the short network name of OsmoNITB
+.Example: Use `osmo_ctrl.py` to set the short network name of OsmoBSC
 
-$ ./bsc_control.py -d localhost -s short-name 32C3
+$ ./osmo_ctrl.py -d localhost -s short-name 32C3
 Got message: SET_REPLY 1 short-name 32C3
 
 
  Getting a value
 
-.Example: Use `bsc_control.py` to get the mnc of OsmoNITB
+.Example: Use `osmo_ctrl.py` to get the mnc of OsmoBSC
 
-$ ./bsc_control.py -d localhost -g mnc
+$ ./osmo_ctrl.py -d localhost -g mnc
 Got message: GET_REPLY 1 mnc 262
 
 
  Listening for traps
 
-You can use `bsc_control.py` to listen for traps the following way:
+You can use `osmo_ctrl.py` to listen for traps the following way:
 
-.Example: Using `bsc_control.py` to listen for traps:
+.Example: Using `osmo_ctrl.py` to listen for traps:
 
-$ ./bsc_control.py -d localhost -m
+$ ./osmo_ctrl.py -d localhost -m
 <1>
 
 <1> the command will not return and wait for any TRAP messages to arrive

-- 
To view, visit https://gerrit.osmocom.org/5220
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c16f38ade6fcfadffd8d2573f71828119da055c
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[ABANDON] python/osmo-python-tests[master]: Print additional debug info for extended tests

[Max]

Max has abandoned this change.

Change subject: Print additional debug info for extended tests
..


Abandoned

-- 
To view, visit https://gerrit.osmocom.org/5042
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I7f3ef3665352c4e74a2c2e8d345a408a2f52
Gerrit-PatchSet: 1
Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 

[MERGED] osmo-gsm-manuals[master]: CTRL: add rate counter dumper to examples

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: CTRL: add rate counter dumper to examples
..


CTRL: add rate counter dumper to examples

This describe rate counter dumper added to osmo-python-tests in
I12b369434e4ee9b38f92872f297e1f3d4f0698c2

Change-Id: I52d735f373f2e7aa1f12941fc450c0e9740ccdeb
Related: OS#2550
---
M common/chapters/control_if.adoc
1 file changed, 31 insertions(+), 1 deletion(-)

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



diff --git a/common/chapters/control_if.adoc b/common/chapters/control_if.adoc
index 682483a..dd6938a 100644
--- a/common/chapters/control_if.adoc
+++ b/common/chapters/control_if.adoc
@@ -173,7 +173,7 @@
 so its use is discouraged.
 There might still be some applications not yet converted to rate_ctr.
 
-=== Control Interface python example: `osmo_ctrl.py`
+=== Control Interface python examples
 
 In the `osmo-python-tests` repository, there is an example python script
 called `osmopy/osmo_ctrl.py` which implements the Osmocom
@@ -184,6 +184,36 @@
 for developing your own python software talking to the control
 interface.
 
+Another implementation is in `osmopy/rate_ctr2csv.py` which will retrieve 
performance counters
+for a given Osmocom program and output it in csv format. This can be used to 
periodically (using systemd timer
+for example) retrieve data to build KPI and evaluate how it changes over time.
+
+Internally it uses "+rate_ctr.*+" variable described in <> to 
get the list of counter groups
+and than request all the counters in each group. Applications interested in 
individual metrics can request it
+directly using `rate_ctr2csv.py` as an example.
+
+ Getting rate counters
+
+.Example: Use `rate_ctr2csv.py` to get rate counters from OsmoBSC
+
+$ ./osmopy/rate_ctr2csv.py --header
+Connecting to localhost:4249...
+Getting rate counter groups info...
+"group","counter","absolute","second","minute","hour","day"
+"e1inp.0","hdlc:abort","0","0","0","0","0"
+"e1inp.0","hdlc:bad_fcs","0","0","0","0","0"
+"e1inp.0","hdlc:overrun","0","0","0","0","0"
+"e1inp.0","alarm","0","0","0","0","0"
+"e1inp.0","removed","0","0","0","0","0"
+"bsc.0","chreq:total","0","0","0","0","0"
+"bsc.0","chreq:no_channel","0","0","0","0","0"
+...
+"msc.0","call:active","0","0","0","0","0"
+"msc.0","call:complete","0","0","0","0","0"
+"msc.0","call:incomplete","0","0","0","0","0"
+Completed: 44 counters from 3 groups received.
+
+
  Setting a value
 
 .Example: Use `osmo_ctrl.py` to set the short network name of OsmoBSC

-- 
To view, visit https://gerrit.osmocom.org/5221
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I52d735f373f2e7aa1f12941fc450c0e9740ccdeb
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-gsm-manuals[master]: CTRL: add rate counter dumper to examples

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5221
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I52d735f373f2e7aa1f12941fc450c0e9740ccdeb
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-pcu[master]: TBF: implement independent T31xx timers

[Max]

Patch Set 3: Code-Review-1

Ready for review, not ready for merge: need to double-check for corner case 
with MS merge first.

-- 
To view, visit https://gerrit.osmocom.org/5158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0305873ca47534f53441247217881da59625e1f7
Gerrit-PatchSet: 3
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max 
Gerrit-HasComments: No

[ABANDON] osmo-pcu[master]: TBF: use independent T3169

[Max]

Max has abandoned this change.

Change subject: TBF: use independent T3169
..


Abandoned

Superseded.

-- 
To view, visit https://gerrit.osmocom.org/5180
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I7ba28b8771b12a4a924ac05937051ade47622e51
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[PATCH] osmo-gsm-manuals[master]: CTRL: add rate counter dumper to examples

[Max]

Review at  https://gerrit.osmocom.org/5221

CTRL: add rate counter dumper to examples

This describe rate counter dumper added to osmo-python-tests in
I12b369434e4ee9b38f92872f297e1f3d4f0698c2

Change-Id: I52d735f373f2e7aa1f12941fc450c0e9740ccdeb
Related: OS#2550
---
M common/chapters/control_if.adoc
1 file changed, 31 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals 
refs/changes/21/5221/1

diff --git a/common/chapters/control_if.adoc b/common/chapters/control_if.adoc
index 682483a..dd6938a 100644
--- a/common/chapters/control_if.adoc
+++ b/common/chapters/control_if.adoc
@@ -173,7 +173,7 @@
 so its use is discouraged.
 There might still be some applications not yet converted to rate_ctr.
 
-=== Control Interface python example: `osmo_ctrl.py`
+=== Control Interface python examples
 
 In the `osmo-python-tests` repository, there is an example python script
 called `osmopy/osmo_ctrl.py` which implements the Osmocom
@@ -184,6 +184,36 @@
 for developing your own python software talking to the control
 interface.
 
+Another implementation is in `osmopy/rate_ctr2csv.py` which will retrieve 
performance counters
+for a given Osmocom program and output it in csv format. This can be used to 
periodically (using systemd timer
+for example) retrieve data to build KPI and evaluate how it changes over time.
+
+Internally it uses "+rate_ctr.*+" variable described in <> to 
get the list of counter groups
+and than request all the counters in each group. Applications interested in 
individual metrics can request it
+directly using `rate_ctr2csv.py` as an example.
+
+ Getting rate counters
+
+.Example: Use `rate_ctr2csv.py` to get rate counters from OsmoBSC
+
+$ ./osmopy/rate_ctr2csv.py --header
+Connecting to localhost:4249...
+Getting rate counter groups info...
+"group","counter","absolute","second","minute","hour","day"
+"e1inp.0","hdlc:abort","0","0","0","0","0"
+"e1inp.0","hdlc:bad_fcs","0","0","0","0","0"
+"e1inp.0","hdlc:overrun","0","0","0","0","0"
+"e1inp.0","alarm","0","0","0","0","0"
+"e1inp.0","removed","0","0","0","0","0"
+"bsc.0","chreq:total","0","0","0","0","0"
+"bsc.0","chreq:no_channel","0","0","0","0","0"
+...
+"msc.0","call:active","0","0","0","0","0"
+"msc.0","call:complete","0","0","0","0","0"
+"msc.0","call:incomplete","0","0","0","0","0"
+Completed: 44 counters from 3 groups received.
+
+
  Setting a value
 
 .Example: Use `osmo_ctrl.py` to set the short network name of OsmoBSC

-- 
To view, visit https://gerrit.osmocom.org/5221
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52d735f373f2e7aa1f12941fc450c0e9740ccdeb
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Max 

osmo-pcu[master]: Introduce LOGTBF* for consistent logging

[Neels Hofmeyr]

Patch Set 1: Code-Review+1

(5 comments)

minor things I'd let pass, but if you'd like to fix them...

https://gerrit.osmocom.org/#/c/5215/1/src/tbf.cpp
File src/tbf.cpp:

Line 477:(tbf->direction != GPRS_RLCMAC_UL_TBF) ? "DL" : "UL");
(change unrelated)


Line 489:   LOGP(DRLCMAC, LOGL_DEBUG, "** DL-TBF update 
**\n");
(change unrelated)


Line 939:   LOGP(DRLCMAC, LOGL_DEBUG, "** DL-TBF starts here 
**\n");
(change unrelated)


Line 941:ms_class, egprs_ms_class);
(change unrelated)


https://gerrit.osmocom.org/#/c/5215/1/src/tbf.h
File src/tbf.h:

Line 139: #define LOGPTBF(level, tbf, fmt, args...) LOGP(DRLCMAC, level, "%s " 
fmt, tbf_name(tbf), ## args)
(our usual pattern here would be LOGPFOO(foo, level, ...), i.e. the object 
first, see LOGPFSM for example)


-- 
To view, visit https://gerrit.osmocom.org/5215
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I388249afefc32d2f6e5cb5e5abc6daf4dbd284ea
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

[PATCH] osmo-msc[master]: mgcp: use osmo-mgw to switch rtp streams

[dexter]

Hello Neels Hofmeyr, Jenkins Builder,

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

https://gerrit.osmocom.org/4980

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

mgcp: use osmo-mgw to switch rtp streams

in the current implementation we still use osmo-bsc_mgcp, which
has many problems and is also obsoleted by osmo-mgw.

integrate osmo-mgw and re-implement the current switching using
an osmo fsm.

Depends: osmo-mgw Iab6a6038e7610c62f34e642cd49c93d11151252c
Closes: OS#2605
Change-Id: Ieea9630358b3963261fa1993cf1f3b563ff23538
---
M include/osmocom/msc/Makefile.am
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/iucs.h
M include/osmocom/msc/msc_ifaces.h
A include/osmocom/msc/msc_mgcp.h
M src/libmsc/Makefile.am
M src/libmsc/a_iface.c
M src/libmsc/a_iface_bssap.c
M src/libmsc/gsm_04_08.c
M src/libmsc/iucs.c
M src/libmsc/msc_ifaces.c
A src/libmsc/msc_mgcp.c
M tests/msc_vlr/Makefile.am
M tests/msc_vlr/msc_vlr_tests.c
14 files changed, 1,227 insertions(+), 321 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/4980/10

diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am
index 1419e8e..052d830 100644
--- a/include/osmocom/msc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
@@ -39,6 +39,7 @@
mncc.h \
mncc_int.h \
msc_ifaces.h \
+   msc_mgcp.h \
network_listen.h \
oap_client.h \
openbscdefines.h \
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 696cef1..9106421 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -196,9 +196,17 @@
struct gsm_encr encr;
 
struct {
+   struct mgcp_ctx *mgcp_ctx;
unsigned int mgcp_rtp_endpoint;
-   uint16_t port_subscr;
-   uint16_t port_cn;
+
+   uint16_t local_port_ran;
+   char local_addr_ran[INET_ADDRSTRLEN];
+   uint16_t remote_port_ran;
+   char remote_addr_ran[INET_ADDRSTRLEN];
+   uint16_t local_port_cn;
+   char local_addr_cn[INET_ADDRSTRLEN];
+   uint16_t remote_port_cn;
+   char remote_addr_cn[INET_ADDRSTRLEN];
} rtp;
 
/* which Iu-CS connection, if any. */
diff --git a/include/osmocom/msc/iucs.h b/include/osmocom/msc/iucs.h
index b7d6064..a48a316 100644
--- a/include/osmocom/msc/iucs.h
+++ b/include/osmocom/msc/iucs.h
@@ -1,7 +1,10 @@
 #pragma once
 
+#include 
+
 int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg,
uint16_t *lac);
 
 struct gsm_subscriber_connection *subscr_conn_lookup_iu(struct gsm_network 
*network,
struct 
ranap_ue_conn_ctx *ue);
+int iu_rab_act_cs(struct gsm_trans *trans);
diff --git a/include/osmocom/msc/msc_ifaces.h b/include/osmocom/msc/msc_ifaces.h
index 0592c07..ca25e9d 100644
--- a/include/osmocom/msc/msc_ifaces.h
+++ b/include/osmocom/msc/msc_ifaces.h
@@ -37,7 +37,3 @@
 enum gsm48_reject_value value);
 
 int msc_tx_common_id(struct gsm_subscriber_connection *conn);
-int msc_call_assignment(struct gsm_trans *trans);
-int msc_call_bridge(struct gsm_trans *trans1, struct gsm_trans *trans2);
-void msc_call_release(struct gsm_trans *trans);
-int msc_call_connect(struct gsm_trans *trans, uint16_t port, uint32_t ip);
diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h
new file mode 100644
index 000..0ccd838
--- /dev/null
+++ b/include/osmocom/msc/msc_mgcp.h
@@ -0,0 +1,52 @@
+/* (C) 2017 by sysmocom - s.f.m.c. GmbH 
+ * All Rights Reserved
+ *
+ * Author: Philipp Maier
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see .
+ *
+ */
+
+#pragma once
+
+#include 
+#include 
+
+/* MGCP state handler context (fsm etc..) */
+struct mgcp_ctx {
+   /* FSM instance, which handles the connection switching procedure */
+   struct osmo_fsm_inst *fsm;
+
+   /* RTP endpoint number */
+   uint16_t rtp_endpoint;
+
+   /* Set to true, when the context information is no longer
+* needed */
+   bool free_ctx;
+
+   /* RTP connection identifiers */
+   char conn_id_ran[MGCP_CONN_ID_LENGTH];
+   char conn_id_cn[MGCP_CONN_ID_LENGTH];
+
+   /* Copy of the pointer and the data with 

[PATCH] osmo-pcu[master]: TBF: add N3101 counter

[Max]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/5182

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

TBF: add N3101 counter

Properly reset the counter when receiving valid RLCMAC block and update
it when no data is received as per 3GPP TS 44.060 §8.1.1.1

Change-Id: I2f79c6153dc4073c9d293b2824979e6381576682
Fixes: OS#2407
---
M src/bts.cpp
M src/tbf.cpp
M src/tbf.h
3 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/82/5182/2

diff --git a/src/bts.cpp b/src/bts.cpp
index 9a559f9..29b743c 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -994,6 +994,10 @@
 ms->dl_tbf() ? ms->dl_tbf()->state_name() : 
"None");
return;
}
+
+   /* Reset N3101 counter: */
+   tbf->m_n3101 = 0;
+
tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);
 
LOGP(DRLCMAC, LOGL_DEBUG, "RX: [PCU <- BTS] %s Packet Control Ack\n", 
tbf_name(tbf));
@@ -1186,6 +1190,9 @@
return;
}
 
+   /* Reset N3101 counter: */
+   tbf->m_n3101 = 0;
+
if (tbf->handle_ack_nack())
LOGP(DRLCMAC, LOGL_NOTICE, "Recovered downlink ack for %s\n", 
tbf_name(tbf));
 
@@ -1249,6 +1256,9 @@
"wrong TFI=%d, ignoring!\n", tfi);
return;
}
+
+   /* Reset N3101 counter: */
+   tbf->m_n3101 = 0;
 
if (tbf->handle_ack_nack())
LOGP(DRLCMAC, LOGL_NOTICE, "Recovered EGPRS downlink ack for 
%s\n", tbf_name(tbf));
@@ -1422,6 +1432,9 @@
LOGP(DRLCMAC, LOGL_ERROR,
"RX: [PCU <- BTS] %s FIXME: Packet resource request\n",
tbf_name(dl_tbf));
+
+   /* Reset N3101 counter: */
+   dl_tbf->m_n3101 = 0;
} else {
struct gprs_rlcmac_ul_tbf *ul_tbf;
int8_t tfi = request->ID.u.Global_TFI.u.UPLINK_TFI;
@@ -1433,6 +1446,9 @@
LOGP(DRLCMAC, LOGL_ERROR,
"RX: [PCU <- BTS] %s FIXME: Packet resource request\n",
tbf_name(ul_tbf));
+
+   /* Reset N3101 counter: */
+   ul_tbf->m_n3101 = 0;
}
 }
 
@@ -1585,6 +1601,9 @@
return 0;
}
 
+   /* Reset N3101 counter: */
+   tbf->m_n3101 = 0;
+
return tbf->rcv_data_block_acknowledged(_dec, data, meas);
 }
 
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 8bd0d29..2d4c037 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -178,6 +178,7 @@
was_releasing(0),
upgrade_to_multislot(0),
bts(bts_),
+   m_n3101(0),
m_tfi(0),
m_created_ts(0),
m_ctrs(NULL),
@@ -730,6 +731,14 @@
 
poll_state = GPRS_RLCMAC_POLL_NONE;
 
+   m_n3101++;
+   if (m_n3101 == bts->bts_data()->n3101) {
+   LOGP(DRLCMAC, LOGL_NOTICE, " N3101 exceeded MAX (%u)\n", 
bts->bts_data()->n3101);
+   set_state(GPRS_RLCMAC_RELEASING);
+   t_start(T3169, bts->bts_data()->t3169, 0, "MAX N3101 reached", 
false);
+   return;
+   }
+
if (ul_tbf && ul_tbf->handle_ctrl_ack()) {
if (!ul_tbf->ctrl_ack_to_toggle()) {
LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling 
PACKET CONTROL ACK for PACKET UPLINK ACK\n");
diff --git a/src/tbf.h b/src/tbf.h
index cdb4858..be0a40e 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -297,6 +297,8 @@
/* store the BTS this TBF belongs to */
BTS *bts;
 
+   uint8_t m_n3101; /* N3101 counter */
+
/*
 * private fields. We can't make it private as it is breaking the
 * llist macros.

-- 
To view, visit https://gerrit.osmocom.org/5182
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2f79c6153dc4073c9d293b2824979e6381576682
Gerrit-PatchSet: 2
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[PATCH] osmo-pcu[master]: TBF: implement independent T31xx timers

[Max]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/5158

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

TBF: implement independent T31xx timers

Previously TBF got single timer so the pending timer was automatically
cancelled when new one was scheduled. Let's make it more robust by
implementing independent T31 xx timers from 3GPP TS 44.060 §13.2 with
corresponding start/stop functions and counters.

The semantics of the timers is preserved as before: pending timers are
restarted unconditionally. It might be neecessary to change this later on
after spec review.

N. B. T0: used for assign/reject timeouts, have to be properly
attributed and documented first.

The test output tweaking is required due to T3169 change.

Change-Id: I0305873ca47534f53441247217881da59625e1f7
Related: OS#2407
---
M src/bts.cpp
M src/tbf.cpp
M src/tbf.h
M src/tbf_dl.cpp
M src/tbf_ul.cpp
M tests/tbf/TbfTest.cpp
M tests/tbf/TbfTest.err
7 files changed, 171 insertions(+), 73 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/5158/3

diff --git a/src/bts.cpp b/src/bts.cpp
index 341c9d4..9a559f9 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -681,7 +681,7 @@
tbf->set_ta(ta);
tbf->set_state(GPRS_RLCMAC_FLOW);
tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_CCCH);
-   tbf_timer_start(tbf, 3169, m_bts.t3169, 0, "RACH (new 
UL-TBF)");
+   tbf->t_start(T3169, m_bts.t3169, 0, "RACH (new 
UL-TBF)", true);
LOGP(DRLCMAC, LOGL_DEBUG, "%s [UPLINK] START\n",
tbf_name(tbf));
LOGP(DRLCMAC, LOGL_DEBUG, "%s RX: [PCU <- BTS] RACH "
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 7b609c8..8bd0d29 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -32,6 +32,7 @@
 
 extern "C" {
 #include 
+#include 
 #include 
 #include 
 }
@@ -56,6 +57,14 @@
OSMO_VALUE_STRING(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ),
OSMO_VALUE_STRING(GPRS_RLCMAC_UL_ASS_WAIT_ACK),
{ 0, NULL }
+};
+
+static const struct value_string tbf_timers_names[] = {
+   OSMO_VALUE_STRING(T3169),
+   OSMO_VALUE_STRING(T3191),
+   OSMO_VALUE_STRING(T3193),
+   OSMO_VALUE_STRING(T3195),
+   { 0, NULL }
 };
 
 static const struct rate_ctr_desc tbf_ctr_description[] = {
@@ -183,6 +192,7 @@
 * Just set them to 0 like talloc_zero did */
memset(, 0, sizeof(pdch));
memset(, 0, sizeof(timer));
+   memset(, 0, sizeof(T31));
memset(_rlc, 0, sizeof(m_rlc));
memset(_timer, 0, sizeof(gsm_timer));
 
@@ -394,7 +404,7 @@
tbf->m_contention_resolution_done = 1;
tbf->set_state(GPRS_RLCMAC_ASSIGN);
tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_PACCH);
-   tbf_timer_start(tbf, 3169, bts->t3169, 0, "allocation (UL-TBF)");
+   tbf->t_start(T3169, bts->t3169, 0, "allocation (UL-TBF)", true);
tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);
OSMO_ASSERT(tbf->ms());
 
@@ -465,6 +475,7 @@
 get_value_string(gprs_rlcmac_tbf_dl_ass_state_names,
  tbf->dl_ass_state));
tbf->stop_timer("freeing TBF");
+   tbf->stop_timers("freeing TBF");
/* TODO: Could/Should generate  bssgp_tx_llc_discarded */
tbf_unlink_pdch(tbf);
llist_del(>list());
@@ -550,9 +561,24 @@
osmo_timer_schedule(>timer, seconds, microseconds);
 }
 
-void gprs_rlcmac_tbf::stop_t3191()
+void gprs_rlcmac_tbf::t_stop(enum tbf_timers t, const char *reason)
 {
-   return stop_timer("T3191");
+   if (t >= T_MAX) {
+   LOGP(DRLCMAC, LOGL_ERROR, "%s attempting to stop unknown timer 
%s [%s]\n",
+tbf_name(this), get_value_string(tbf_timers_names, t), 
reason);
+   }
+
+   if (osmo_timer_pending([t])) {
+   LOGP(DRLCMAC, LOGL_DEBUG, "%s stopping timer %s [%s]\n",
+tbf_name(this), get_value_string(tbf_timers_names, t), 
reason);
+   osmo_timer_del([t]);
+   }
+}
+
+void gprs_rlcmac_tbf::stop_timers(const char *reason) {
+   uint8_t i;
+   for (i = 0; i < T_MAX; i++)
+   t_stop((enum tbf_timers)i, reason);
 }
 
 void gprs_rlcmac_tbf::stop_timer(const char *reason)
@@ -562,6 +588,61 @@
 tbf_name(this), T, reason);
osmo_timer_del();
}
+}
+
+static inline void tbf_timeout_free(struct gprs_rlcmac_tbf *tbf, enum 
tbf_timers t, bool run_diag)
+{
+   LOGP(DRLCMAC, LOGL_NOTICE, "%s %s timeout expired, freeing TBF\n",
+tbf_name(tbf), get_value_string(tbf_timers_names, t));
+
+   if (run_diag)
+   tbf->rlcmac_diag();
+
+   tbf_free(tbf);
+}
+
+#define T_CBACK(t, diag) static void cb_##t(void *_tbf) { 
tbf_timeout_free((struct gprs_rlcmac_tbf *)_tbf, t, diag); }
+
+T_CBACK(T3169, true)
+T_CBACK(T3191, true)
+T_CBACK(T3193, false)

osmo-bts[master]: osmo-bts-trx: add error concealment unit for GSM-FR

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(12 comments)

mostly just a bunch of less important cosmetic comments, but one -1 near the end

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

Line 10: ith a slince frame. This may cause unpleasant audio effects.
ith slince?


Line 12: Add a function to craft a replacement frame from the last
ideally name the function


Line 13: known good frame.
Add ecu_fr_test.


https://gerrit.osmocom.org/#/c/5214/1/include/osmo-bts/ecu_fr.h
File include/osmo-bts/ecu_fr.h:

Line 19:  */
(usually no license header in .h files, but a short summary would be nice)


https://gerrit.osmocom.org/#/c/5214/1/include/osmo-bts/gsm_data_shared.h
File include/osmo-bts/gsm_data_shared.h:

Line 19: #include 
(unrelated ws)


https://gerrit.osmocom.org/#/c/5214/1/src/common/ecu_fr.c
File src/common/ecu_fr.c:

Line 1: /* (C) 2017 by sysmocom s.f.m.c. GmbH
from Harald's recent comment we should put a dash before s.f.m.c.


Line 303: /* Helper function to reduce the XMAXC field. When the XMAXC field 
reaches
(almost any API is a "helper function" :) -- just say what it does, same below)


Line 364:   LOGP(DL1P, LOGL_ERROR, "Wrong number of bits 
unpacked!\n");
a bit more context, like at least say we failed to unpack an FR frame


Line 377:   goto abort;
semantically it's not an abort, right?


Line 383:   goto abort;
-1: unreachable code, the goto is not useful anyhow


Line 384:   LOGP(DL1P, LOGL_ERROR, "Wrong number of bits 
packed!\n");
context


https://gerrit.osmocom.org/#/c/5214/1/src/osmo-bts-trx/scheduler_trx.c
File src/osmo-bts-trx/scheduler_trx.c:

Line 1113:  if (bfi_flag == false && tch_mode == GSM48_CMODE_SPEECH_V1)
if (!bfi_flag...


-- 
To view, visit https://gerrit.osmocom.org/5214
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iae9e69a9578ae305bca42f834694af96a29084e6
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

osmo-bts[master]: cosmetic: remove unused variable

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

summary: ETOOGENERAL

-- 
To view, visit https://gerrit.osmocom.org/5213
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie724e2e5875020aa835b4cd57ab96966aee283e1
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] osmo-bts[master]: cosmetic: tests/Makefile.am: remove excess whitespace

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/5211

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

cosmetic: tests/Makefile.am: remove excess whitespace

Change-Id: I7090d46ae72183014e6c74d6ddb240af8d66e0b4
---
M tests/Makefile.am
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/11/5211/2

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 18b8ce6..1eb28d6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,22 +21,22 @@
echo 'm4_define([AT_PACKAGE_URL],' && \
echo '  [$(PACKAGE_URL)])'; \
  } >'$(srcdir)/package.m4'
- 
+
 EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE)
 TESTSUITE = $(srcdir)/testsuite
 DISTCLEANFILES = atconfig
- 
+
 check-local: atconfig $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
- 
+
 installcheck-local: atconfig $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
$(TESTSUITEFLAGS)
- 
+
 clean-local:
test ! -f '$(TESTSUITE)' || \
$(SHELL) '$(TESTSUITE)' --clean
- 
+
 AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4

-- 
To view, visit https://gerrit.osmocom.org/5211
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7090d46ae72183014e6c74d6ddb240af8d66e0b4
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder

osmo-bts[master]: cosmetic: tests/Makefile.am: remove excess whitespace

[Neels Hofmeyr]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5211
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7090d46ae72183014e6c74d6ddb240af8d66e0b4
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

osmo-bts[master]: cosmetic: remove unused variable

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(1 comment)

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

Line 7: cosmetic: remove unused variable
I edited the other two patches but stopping now: please have more concise 
summaries, at least name the rough area of the code.


-- 
To view, visit https://gerrit.osmocom.org/5212
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ied484e3e2d3006eb0f03516ceaed3e0e802d51e4
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

[MERGED] osmo-bts[master]: cosmetic: meas_test: fix section comment

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: cosmetic: meas_test: fix section comment
..


cosmetic: meas_test: fix section comment

Change-Id: Id228620ccf5a40c8089ae1914d59b19e808ea151
---
M tests/meas/meas_test.c
M tests/meas/meas_test.ok
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c
index 6c514ca..acebab5 100644
--- a/tests/meas/meas_test.c
+++ b/tests/meas/meas_test.c
@@ -125,7 +125,7 @@
 
printf("\n");
printf("***\n");
-   printf("*** FULL RATE TESTS ***\n");
+   printf("*** HALF RATE TESTS ***\n");
printf("***\n");
 
/* Test half rate */
diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok
index 2b76604..6dbda54 100644
--- a/tests/meas/meas_test.ok
+++ b/tests/meas/meas_test.ok
@@ -180,7 +180,7 @@
 Testing: ts[7]->lchan[0], fn=12167=>012167/09/25/29/31, fn%104=103, rc=1, 
delta=13
 
 ***
-*** FULL RATE TESTS ***
+*** HALF RATE TESTS ***
 ***
 
 

-- 
To view, visit https://gerrit.osmocom.org/5210
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id228620ccf5a40c8089ae1914d59b19e808ea151
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

[PATCH] osmo-bts[master]: cosmetic: meas_test: fix section comment

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/5210

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

cosmetic: meas_test: fix section comment

Change-Id: Id228620ccf5a40c8089ae1914d59b19e808ea151
---
M tests/meas/meas_test.c
M tests/meas/meas_test.ok
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/10/5210/2

diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c
index 6c514ca..acebab5 100644
--- a/tests/meas/meas_test.c
+++ b/tests/meas/meas_test.c
@@ -125,7 +125,7 @@
 
printf("\n");
printf("***\n");
-   printf("*** FULL RATE TESTS ***\n");
+   printf("*** HALF RATE TESTS ***\n");
printf("***\n");
 
/* Test half rate */
diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok
index 2b76604..6dbda54 100644
--- a/tests/meas/meas_test.ok
+++ b/tests/meas/meas_test.ok
@@ -180,7 +180,7 @@
 Testing: ts[7]->lchan[0], fn=12167=>012167/09/25/29/31, fn%104=103, rc=1, 
delta=13
 
 ***
-*** FULL RATE TESTS ***
+*** HALF RATE TESTS ***
 ***
 
 

-- 
To view, visit https://gerrit.osmocom.org/5210
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id228620ccf5a40c8089ae1914d59b19e808ea151
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder

osmo-bts[master]: cosmetic: meas_test: fix section comment

[Neels Hofmeyr]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/5210
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id228620ccf5a40c8089ae1914d59b19e808ea151
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] osmo-bsc[master]: OML: expand status reporting checks

[Max]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/5092

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

OML: expand status reporting checks

* check GPRS state: if GPRS is enabled for the BTS but NSE, CELL or both
  NSVC are locked than report it as degraded
* check TRX usability: use already available function to check that TRX
  is actually usable when reporting OML status via CTRL
* fix tests linking: libbsc is using gsm48_create_mm_serv_rej() which is
  defined in libcommon-cs but neither libbsc itself nor tests using it
  are actually linked against libcommon-cs

Related: OS#2486
Change-Id: I9dce1d3b0cabe149a90cfca58a3fe55f8d6a72bc
---
M src/Makefile.am
M src/libbsc/Makefile.am
M src/libbsc/abis_nm.c
M tests/abis/Makefile.am
M tests/nanobts_omlattr/Makefile.am
5 files changed, 22 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/5092/4

diff --git a/src/Makefile.am b/src/Makefile.am
index dd1ad3d..454bf26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,10 +22,10 @@
 # Libraries
 SUBDIRS = \
libcommon \
+   libcommon-cs \
libbsc \
libtrau \
libfilter \
-   libcommon-cs \
$(NULL)
 
 # Programs
diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am
index e78bde6..fc12d05 100644
--- a/src/libbsc/Makefile.am
+++ b/src/libbsc/Makefile.am
@@ -17,6 +17,8 @@
libbsc.a \
$(NULL)
 
+libbsc_a_LIBADD = $(top_builddir)/src/libcommon-cs/libcommon-cs.a
+
 libbsc_a_SOURCES = \
abis_nm.c \
abis_nm_vty.c \
diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c
index 2c84ba7..33af213 100644
--- a/src/libbsc/abis_nm.c
+++ b/src/libbsc/abis_nm.c
@@ -46,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define OM_ALLOC_SIZE  1024
 #define OM_HEADROOM_SIZE   128
@@ -691,9 +692,25 @@
if (bts->mo.nm_state.administrative == NM_STATE_LOCKED)
return false;
 
+   if (bts->gprs.mode != BTS_GPRS_NONE) {
+   if (bts->gprs.cell.mo.nm_state.administrative == 
NM_STATE_LOCKED)
+   return false;
+
+   if (bts->gprs.nse.mo.nm_state.administrative == NM_STATE_LOCKED)
+   return false;
+
+   if (bts->gprs.nsvc[0].mo.nm_state.administrative == 
NM_STATE_LOCKED &&
+   bts->gprs.nsvc[1].mo.nm_state.administrative == 
NM_STATE_LOCKED)
+   return false;
+   }
+
llist_for_each_entry(trx, >trx_list, list) {
if (!trx->rsl_link)
return false;
+
+   if (!trx_is_usable(trx))
+   return false;
+
if (trx->mo.nm_state.administrative == NM_STATE_LOCKED)
return false;
}
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 1c5dede..8dc6248 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -27,6 +27,7 @@
 abis_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon/libcommon.a \
+   $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOABIS_LIBS) \
diff --git a/tests/nanobts_omlattr/Makefile.am 
b/tests/nanobts_omlattr/Makefile.am
index 8b5e116..4b49518 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -26,6 +26,7 @@
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
+   $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \

-- 
To view, visit https://gerrit.osmocom.org/5092
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I9dce1d3b0cabe149a90cfca58a3fe55f8d6a72bc
Gerrit-PatchSet: 4
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[ABANDON] osmo-bsc[master]: Fix tests linking

[Max]

Max has abandoned this change.

Change subject: Fix tests linking
..


Abandoned

-- 
To view, visit https://gerrit.osmocom.org/5084
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ib195694ef92dd6f2328ffa3a818379f3742c5084
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 

[ABANDON] osmo-bsc[master]: OML: check TRX usability when reporting

[Max]

Max has abandoned this change.

Change subject: OML: check TRX usability when reporting
..


Abandoned

Superseded.

-- 
To view, visit https://gerrit.osmocom.org/5085
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I3f5f95b9d6cd00fa437bfbe89cc7ecdd87d2801a
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

[PATCH] osmo-bsc[master]: OML: expand status reporting checks

[Max]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/5092

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

OML: expand status reporting checks

* check GPRS state: if GPRS is enabled for the BTS but NSE, CELL or both
  NSVC are locked than report it as degraded
* check TRX usability: use already available function to check that TRX
  is actually usable when reporting OML status via CTRL
* fix tests linking: libbsc is using gsm48_create_mm_serv_rej() which is
  defined in libcommon-cs but neither libbsc itself nor tests using it
  are actually linked against libcommon-cs

Related: OS#2486
Change-Id: I9dce1d3b0cabe149a90cfca58a3fe55f8d6a72bc
---
M src/libbsc/Makefile.am
M src/libbsc/abis_nm.c
M tests/abis/Makefile.am
M tests/nanobts_omlattr/Makefile.am
4 files changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/5092/3

diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am
index e78bde6..fc12d05 100644
--- a/src/libbsc/Makefile.am
+++ b/src/libbsc/Makefile.am
@@ -17,6 +17,8 @@
libbsc.a \
$(NULL)
 
+libbsc_a_LIBADD = $(top_builddir)/src/libcommon-cs/libcommon-cs.a
+
 libbsc_a_SOURCES = \
abis_nm.c \
abis_nm_vty.c \
diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c
index 2c84ba7..33af213 100644
--- a/src/libbsc/abis_nm.c
+++ b/src/libbsc/abis_nm.c
@@ -46,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define OM_ALLOC_SIZE  1024
 #define OM_HEADROOM_SIZE   128
@@ -691,9 +692,25 @@
if (bts->mo.nm_state.administrative == NM_STATE_LOCKED)
return false;
 
+   if (bts->gprs.mode != BTS_GPRS_NONE) {
+   if (bts->gprs.cell.mo.nm_state.administrative == 
NM_STATE_LOCKED)
+   return false;
+
+   if (bts->gprs.nse.mo.nm_state.administrative == NM_STATE_LOCKED)
+   return false;
+
+   if (bts->gprs.nsvc[0].mo.nm_state.administrative == 
NM_STATE_LOCKED &&
+   bts->gprs.nsvc[1].mo.nm_state.administrative == 
NM_STATE_LOCKED)
+   return false;
+   }
+
llist_for_each_entry(trx, >trx_list, list) {
if (!trx->rsl_link)
return false;
+
+   if (!trx_is_usable(trx))
+   return false;
+
if (trx->mo.nm_state.administrative == NM_STATE_LOCKED)
return false;
}
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 1c5dede..8dc6248 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -27,6 +27,7 @@
 abis_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon/libcommon.a \
+   $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOABIS_LIBS) \
diff --git a/tests/nanobts_omlattr/Makefile.am 
b/tests/nanobts_omlattr/Makefile.am
index 8b5e116..4b49518 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -26,6 +26,7 @@
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
+   $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \

-- 
To view, visit https://gerrit.osmocom.org/5092
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I9dce1d3b0cabe149a90cfca58a3fe55f8d6a72bc
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[PATCH] osmo-pcu[master]: TBF-DL: fix misleading idle time check

[Max]

Review at  https://gerrit.osmocom.org/5218

TBF-DL: fix misleading idle time check

The dl_tbf_idle_msec is uint32_t so it cannot be < 0.

Change-Id: Ic88cb4698bcb9be52a5179529f81b8728bf4f93f
---
M src/tbf_dl.cpp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/18/5218/1

diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 73708f5..193b749 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -1252,7 +1252,7 @@
 {
int keep_time_frames;
 
-   if (bts_data()->dl_tbf_idle_msec <= 0)
+   if (!bts_data()->dl_tbf_idle_msec)
return false;
 
keep_time_frames = msecs_to_frames(bts_data()->dl_tbf_idle_msec);

-- 
To view, visit https://gerrit.osmocom.org/5218
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic88cb4698bcb9be52a5179529f81b8728bf4f93f
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max