meta-telephony[201705]: Update osmocom versions to point to current master

[Neels Hofmeyr]

Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/4087/1/recipes-osmocom/openggsn/openggsn_git.bb
File recipes-osmocom/openggsn/openggsn_git.bb:

Line 1: DESCRITOPN = "OpenGGSN a Free Software GGSN"
DECROPITION ... and why bother to modify openggsn when we have osmo-ggsn?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: If36b86a6a542af7381d9a07da51a330f2e44a96f
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: Update osmocom versions to point to current master

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(2 comments)

https://gerrit.osmocom.org/#/c/4087/1/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
File recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb:

Line 7: 
erm, wasn't the EXTRA_OECONF_remove just added in the preceding patch? Does it 
make sense to squash them together?


https://gerrit.osmocom.org/#/c/4087/1/recipes-osmocom/libosmocore/libosmocore_git.bb
File recipes-osmocom/libosmocore/libosmocore_git.bb:

Line 7: PR = "r1"
when the hash changes, should PR go to 0?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: If36b86a6a542af7381d9a07da51a330f2e44a96f
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: libosmo-sccp: Attempt to fix link issue on 201705-nightly bu...

[Neels Hofmeyr]

Patch Set 1: Code-Review+1

can't claim to understand

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I80eea9ac888ab4b13614ff475bebacb94b72b0f2
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Holger Freyther 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

meta-telephony[201705]: update PV versions for libosmocore, libosmo-sccp and openggsn

[Neels Hofmeyr]

Patch Set 1:

(1 comment)

why do we still have an openggsn? Does this one precede or follow the osmo-ggsn 
patch?

https://gerrit.osmocom.org/#/c/4089/1/recipes-osmocom/openggsn/openggsn_git.bb
File recipes-osmocom/openggsn/openggsn_git.bb:

Line 1: DESCRITOPN = "OpenGGSN a Free Software GGSN"
this DESCRITOPN is everywhere!


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib45238e95156f215412d51d975b1acb33633a3e1
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: update PV versions for libosmocore, libosmo-sccp and openggsn

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib45238e95156f215412d51d975b1acb33633a3e1
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

meta-telephony[201705]: libosmo-abis: modify PV to match recent release

[Neels Hofmeyr]

Patch Set 1: Code-Review+1

(I don't understand but looks like you do)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f27661d9e5241efe7725b7d1efcf4aef55e2efe
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

meta-telephony[201705]: libosmo-sccp: Install cfg and service file for osmo-stp

[Neels Hofmeyr]

Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id82a12bbfb72b421c75140072048a963fb50f684
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

meta-telephony[201705]: libosmo-sccp: Install cfg and service file for osmo-stp

[Neels Hofmeyr]

Patch Set 1:

(2 comments)

errors unrelated to this patch...

https://gerrit.osmocom.org/#/c/4091/1/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
File recipes-osmocom/libosmo-sccp/libosmo-sccp.inc:

Line 1: DESCRITOPN = "An utility library for Open Source Mobile Communications"
DESCROMNOMNOM


Line 3: HOMEPAGE = "http://openbsc.gnumonks.org;
link


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id82a12bbfb72b421c75140072048a963fb50f684
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: Drop openggsn and introduce osmo-ggsn

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(3 comments)

https://gerrit.osmocom.org/#/c/4092/1/recipes-osmocom/openbsc/openbsc.inc
File recipes-osmocom/openbsc/openbsc.inc:

Line 3: HOMEPAGE = "http://openbsc.osmocom.org/;
Link to OsmoGGSN project page?


https://gerrit.osmocom.org/#/c/4092/1/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init
File recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init:

Line 18: DESC="Open Source GGSN"
hmm, is this an improvement?


https://gerrit.osmocom.org/#/c/4092/1/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
File recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb:

Line 1: DESCRITOPN = "Open Source GGSN"
DESCRIXTPN

Not sure about the name though. Something of Osmocom's GGSN or Gateway GPRS 
Support Node seems more legit?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie6018ef78ff18f2e6809fee957c9d645e35c7c9a
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: libasn1c: Introduce recipe

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(1 comment)

https://gerrit.osmocom.org/#/c/4093/1/recipes-osmocom/libasn1c/libasn1c.inc
File recipes-osmocom/libasn1c/libasn1c.inc:

Line 1: SUMMARY = "Rruntime library of Lev Walkin's asn1c split out as separate 
library"
untime! arriva!!


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I50d990b06c56c3bfa71e7268694702300c0c9a26
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: osmo-sgsn: Introduce recipe

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(3 comments)

https://gerrit.osmocom.org/#/c/4095/1/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
File recipes-osmocom/osmo-sgsn/osmo-sgsn.inc:

Line 2: HOMEPAGE = "https://osmocom.org/;
link to OsmoSGSN project page?


Line 25: PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub"
there isn't a gtphub service file further above. I guess it doesn't really need 
to be installed, so drop it here as well? If we install gtphub though, then 
maybe a .service and examples should also be installed above?


Line 38:"
(I'm confused, don't we need FILES_osmo-sgsn as well?)


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia7e35660598bfd87917728c521c1fba827e98d68
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: osmo-mgw: Introduce recipe

[Neels Hofmeyr]

Patch Set 1: Code-Review+1

(2 comments)

https://gerrit.osmocom.org/#/c/4096/1/recipes-osmocom/osmo-mgw/osmo-mgw.inc
File recipes-osmocom/osmo-mgw/osmo-mgw.inc:

Line 2: HOMEPAGE = "https://osmocom.org/;
link to OsmoMGW project page?


Line 19:install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service 
${D}${systemd_system_unitdir}/
(soon there will also be the osmo-mgw binary, see G#4003)


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

Gerrit-MessageType: comment
Gerrit-Change-Id: If9c2d6b5dd8dfd8a0b462d87e93e0733e57f7b0a
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: osmo-hlr: Introduce recipe

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(2 comments)

https://gerrit.osmocom.org/#/c/4097/1/recipes-osmocom/osmo-hlr/osmo-hlr.inc
File recipes-osmocom/osmo-hlr/osmo-hlr.inc:

Line 2: HOMEPAGE = "https://osmocom.org/;
link to OsmoHLR project page?


Line 12: RDEPENDS_${PN} = "libdbd-sqlite3"
we should not require libdbd-sqlite3, not using libdbi in osmo-hlr. Some plain 
libsqlite3 or something should suffice


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7f47dca8d7e5e50792104ae0c7cb557391542f7
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: osmo-msc: Introduce recipe

[Neels Hofmeyr]

Patch Set 1: Code-Review+1

(1 comment)

https://gerrit.osmocom.org/#/c/4098/1/recipes-osmocom/osmo-msc/osmo-msc.inc
File recipes-osmocom/osmo-msc/osmo-msc.inc:

Line 2: HOMEPAGE = "https://osmocom.org/;
link to OsmoMSC project page?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I68715d1970fde83fd6647344b82c6a859404ef9e
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: osmo-msc: Avoid installed duplicated binaries in osmo-bsc

[Neels Hofmeyr]

Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/4101/1/recipes-osmocom/osmo-msc/osmo-msc.inc
File recipes-osmocom/osmo-msc/osmo-msc.inc:

Line 2: HOMEPAGE = "https://osmocom.org/;
link to msc project page?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic582450f1881373785f12714ffa3bd150d37417e
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: openbsc: Drop packages present in other recipes after split

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(4 comments)

https://gerrit.osmocom.org/#/c/4100/1/recipes-osmocom/openbsc/openbsc.inc
File recipes-osmocom/openbsc/openbsc.inc:

Line 10:   file://osmo-bsc_mgcp.init \
shouln't osmo-bsc_mgcp come from osmo-mgw.git now?


Line 12:   file://osmo-sgsn.init \
shouldn't osmo-sgsn come from osmo-sgsn.git now?


Line 32: 
...ah, they are removed here, maybe also on top


Line 40:install -d ${D}${systemd_system_unitdir}/
stripping a path element? didn't read about that in the commit log. Is it 
correct? ah, the ${} name also changed...


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifd029cbd36417ee980bff51b4112705be16175d3
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

meta-telephony[201705]: osmo-msc: Avoid installed duplicated binaries in osmo-bsc

[Neels Hofmeyr]

Patch Set 1: Code-Review-1

(1 comment)

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

Line 7: osmo-msc: Avoid installed duplicated binaries in osmo-bsc
please name the binaries that are removed


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic582450f1881373785f12714ffa3bd150d37417e
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

[MERGED] osmo-sgsn[master]: jenkins.sh: fix echo string to say osmo-sgsn, not msc

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: jenkins.sh: fix echo string to say osmo-sgsn, not msc
..


jenkins.sh: fix echo string to say osmo-sgsn, not msc

Change-Id: I3e9a1503de55e939179c032c17df53d27b51
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 07173cc..dc1a1a5 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -39,7 +39,7 @@
 echo
 echo
 echo
-echo " === osmo-msc 
==="
+echo " === osmo-sgsn 
==="
 echo
 set -x
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e9a1503de55e939179c032c17df53d27b51
Gerrit-PatchSet: 2
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

osmo-sgsn[master]: jenkins.sh: fix echo string to say osmo-sgsn, not msc

[Neels Hofmeyr]

Patch Set 1: Code-Review+2

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

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

[PATCH] libosmocore[master]: doxygen: adjust copyright to include 2017

[Neels Hofmeyr]

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

doxygen: adjust copyright to include 2017

Change-Id: If7c09a676f67da15454aedcda99d0e9b301c9945
---
M src/application.c
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/4106/1

diff --git a/src/application.c b/src/application.c
index aec3fd7..ee22639 100644
--- a/src/application.c
+++ b/src/application.c
@@ -43,7 +43,7 @@
  * a multi-threaded context, you have to add your own locking.
  *
  * \section sec_copyright Copyright and License
- * Copyright © 2008-2016 - Harald Welte, Holger Freyther and contributors\n
+ * Copyright © 2008-2017 - Harald Welte, Holger Freyther and contributors\n
  * All rights reserved. \n\n
  * The source code of libosmocore is licensed under the terms of the GNU
  * General Public License as published by the Free Software Foundation;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7c09a676f67da15454aedcda99d0e9b301c9945
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

[MERGED] osmo-hlr[master]: add basic CTRL interface tests

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: add basic CTRL interface tests
..


add basic CTRL interface tests

Prepare for adding tests of enable-/disable-/status-ps CTRL commands.

Change-Id: Ie195169c574716b514da7e04a3ce9727ef70a55e
---
M configure.ac
A contrib/ipa.py
M contrib/jenkins.sh
M tests/Makefile.am
A tests/ctrl_test_runner.py
5 files changed, 503 insertions(+), 1 deletion(-)

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



diff --git a/configure.ac b/configure.ac
index 6532940..167d7f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,21 @@
 dnl checks for header files
 AC_HEADER_STDC
 
+AC_ARG_ENABLE([external_tests],
+   AC_HELP_STRING([--enable-external-tests],
+   [Include the VTY/CTRL tests in make check 
[default=no]]),
+   [enable_ext_tests="$enableval"],[enable_ext_tests="no"])
+if test "x$enable_ext_tests" = "xyes" ; then
+   AM_PATH_PYTHON
+   AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
+if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
+   AC_MSG_ERROR([Please install 
git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.])
+   fi
+fi
+AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
+AC_MSG_RESULT([$enable_ext_tests])
+AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
+
 AC_OUTPUT(
Makefile
src/Makefile
diff --git a/contrib/ipa.py b/contrib/ipa.py
new file mode 100755
index 000..71cbf45
--- /dev/null
+++ b/contrib/ipa.py
@@ -0,0 +1,278 @@
+#!/usr/bin/python3
+# -*- mode: python-mode; py-indent-tabs-mode: nil -*-
+"""
+/*
+ * Copyright (C) 2016 sysmocom s.f.m.c. GmbH
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+"""
+
+import struct, random, sys
+
+class IPA(object):
+"""
+Stateless IPA protocol multiplexer: add/remove/parse (extended) header
+"""
+version = "0.0.5"
+TCP_PORT_OML = 3002
+TCP_PORT_RSL = 3003
+# OpenBSC extensions: OSMO, MGCP_OLD
+PROTO = dict(RSL=0x00, CCM=0xFE, SCCP=0xFD, OML=0xFF, OSMO=0xEE, 
MGCP_OLD=0xFC)
+# ...OML Router Control, GSUP GPRS extension, Osmocom Authn Protocol
+EXT = dict(CTRL=0, MGCP=1, LAC=2, SMSC=3, ORC=4, GSUP=5, OAP=6)
+# OpenBSC extension: SCCP_OLD
+MSGT = dict(PING=0x00, PONG=0x01, ID_GET=0x04, ID_RESP=0x05, ID_ACK=0x06, 
SCCP_OLD=0xFF)
+_IDTAG = dict(SERNR=0, UNITNAME=1, LOCATION=2, TYPE=3, EQUIPVERS=4, 
SWVERSION=5, IPADDR=6, MACADDR=7, UNIT=8)
+CTRL_GET = 'GET'
+CTRL_SET = 'SET'
+CTRL_REP = 'REPLY'
+CTRL_ERR = 'ERR'
+CTRL_TRAP = 'TRAP'
+
+def _l(self, d, p):
+"""
+Reverse dictionary lookup: return key for a given value
+"""
+if p is None:
+return 'UNKNOWN'
+return list(d.keys())[list(d.values()).index(p)]
+
+def _tag(self, t, v):
+"""
+Create TAG as TLV data
+"""
+return struct.pack(">HB", len(v) + 1, t) + v
+
+def proto(self, p):
+"""
+Lookup protocol name
+"""
+return self._l(self.PROTO, p)
+
+def ext(self, p):
+"""
+Lookup protocol extension name
+"""
+return self._l(self.EXT, p)
+
+def msgt(self, p):
+"""
+Lookup message type name
+"""
+return self._l(self.MSGT, p)
+
+def idtag(self, p):
+"""
+Lookup ID tag name
+"""
+return self._l(self._IDTAG, p)
+
+def ext_name(self, proto, exten):
+"""
+Return proper extension byte name depending on the protocol used
+"""
+if self.PROTO['CCM'] == proto:
+return self.msgt(exten)
+if self.PROTO['OSMO'] == proto:
+return self.ext(exten)
+return None
+
+def add_header(self, data, proto, ext=None):
+"""
+Add IPA header (with extension if necessary), data must be represented 
as bytes
+"""
+if ext is None:
+return struct.pack(">HB", len(data) + 1, proto) + data
+return struct.pack(">HBB", len(data) + 1, proto, ext) + data
+
+def del_header(self, data):
+"""
+   

[MERGED] osmo-hlr[master]: add CTRL tests for enable-/disable-/status-ps

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: add CTRL tests for enable-/disable-/status-ps
..


add CTRL tests for enable-/disable-/status-ps

Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
---
M tests/ctrl_test_runner.py
A tests/test_subscriber.sql
2 files changed, 55 insertions(+), 0 deletions(-)

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



diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py
index d453197..7c14f50 100644
--- a/tests/ctrl_test_runner.py
+++ b/tests/ctrl_test_runner.py
@@ -163,6 +163,46 @@
 return responses
 
 
+class TestCtrlHLR(TestCtrlBase):
+
+HLR_DB = 'hlr_ctrl_test.db'
+HLR_SQL = '%s/sql/hlr.sql' % confpath
+HLR_TEST_SQL = '%s/tests/test_subscriber.sql' % confpath
+
+def setUp(self):
+print('\n')
+print(os.getcwd())
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_SQL), shell=True) == 0
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_TEST_SQL), shell=True) == 0
+super(TestCtrlHLR, self).setUp()
+
+def tearDown(self):
+super(TestCtrlHLR, self).tearDown()
+os.unlink("hlr_ctrl_test.db")
+
+def ctrl_command(self):
+return ["./src/osmo-hlr", "-c", "doc/examples/osmo-hlr.cfg", '-l', 
'hlr_ctrl_test.db']
+
+def ctrl_app(self):
+return (4259, "./src/osmo-hlr", "OsmoHLR", "hlr")
+
+def testCtrlErrs(self):
+r = self.do_get('invalid')
+self.assertEquals(r['mtype'], 'ERROR')
+self.assertEquals(r['error'], 'Command not found')
+
+def testEnableDisablePs(self):
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+
 if __name__ == '__main__':
 import argparse
 import sys
@@ -193,6 +233,8 @@
 os.chdir(workdir)
 print "Running tests for specific control commands"
 suite = unittest.TestSuite()
+test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlHLR)
+suite.addTest(test)
 res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)
 sys.exit(len(res.errors) + len(res.failures))
 
diff --git a/tests/test_subscriber.sql b/tests/test_subscriber.sql
new file mode 100644
index 000..0767d48
--- /dev/null
+++ b/tests/test_subscriber.sql
@@ -0,0 +1,13 @@
+
+-- 2G only subscriber
+INSERT INTO subscriber (id, imsi) VALUES (1, '9019901');
+INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES (1, 1, 
'000102030405060708090a0b0c0d0e0f');
+
+-- 3G only subscriber
+INSERT INTO subscriber (id, imsi) VALUES (2, '9019902');
+INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, opc, sqn) VALUES (2, 5, 
'000102030405060708090a0b0c0d0e0f', '101112131415161718191a1b1c1d1e1f', 0);
+
+-- 2G + 3G subscriber
+INSERT INTO subscriber (id, imsi) VALUES (3, '9019903');
+INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES (3, 1, 
'000102030405060708090a0b0c0d0e0f');
+INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, opc, sqn) VALUES (3, 5, 
'000102030405060708090a0b0c0d0e0f', '101112131415161718191a1b1c1d1e1f', 0);

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

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

osmo-hlr[master]: add CTRL tests for enable-/disable-/status-ps

[Neels Hofmeyr]

Patch Set 3: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
Gerrit-PatchSet: 3
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

osmo-hlr[master]: add basic CTRL interface tests

[Neels Hofmeyr]

Patch Set 3: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie195169c574716b514da7e04a3ce9727ef70a55e
Gerrit-PatchSet: 3
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] osmo-hlr[master]: add basic CTRL interface tests

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/4063

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

add basic CTRL interface tests

Prepare for adding tests of enable-/disable-/status-ps CTRL commands.

Change-Id: Ie195169c574716b514da7e04a3ce9727ef70a55e
---
M configure.ac
A contrib/ipa.py
M contrib/jenkins.sh
M tests/Makefile.am
A tests/ctrl_test_runner.py
5 files changed, 503 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/63/4063/3

diff --git a/configure.ac b/configure.ac
index 6532940..167d7f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,21 @@
 dnl checks for header files
 AC_HEADER_STDC
 
+AC_ARG_ENABLE([external_tests],
+   AC_HELP_STRING([--enable-external-tests],
+   [Include the VTY/CTRL tests in make check 
[default=no]]),
+   [enable_ext_tests="$enableval"],[enable_ext_tests="no"])
+if test "x$enable_ext_tests" = "xyes" ; then
+   AM_PATH_PYTHON
+   AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
+if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
+   AC_MSG_ERROR([Please install 
git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.])
+   fi
+fi
+AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
+AC_MSG_RESULT([$enable_ext_tests])
+AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
+
 AC_OUTPUT(
Makefile
src/Makefile
diff --git a/contrib/ipa.py b/contrib/ipa.py
new file mode 100755
index 000..71cbf45
--- /dev/null
+++ b/contrib/ipa.py
@@ -0,0 +1,278 @@
+#!/usr/bin/python3
+# -*- mode: python-mode; py-indent-tabs-mode: nil -*-
+"""
+/*
+ * Copyright (C) 2016 sysmocom s.f.m.c. GmbH
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+"""
+
+import struct, random, sys
+
+class IPA(object):
+"""
+Stateless IPA protocol multiplexer: add/remove/parse (extended) header
+"""
+version = "0.0.5"
+TCP_PORT_OML = 3002
+TCP_PORT_RSL = 3003
+# OpenBSC extensions: OSMO, MGCP_OLD
+PROTO = dict(RSL=0x00, CCM=0xFE, SCCP=0xFD, OML=0xFF, OSMO=0xEE, 
MGCP_OLD=0xFC)
+# ...OML Router Control, GSUP GPRS extension, Osmocom Authn Protocol
+EXT = dict(CTRL=0, MGCP=1, LAC=2, SMSC=3, ORC=4, GSUP=5, OAP=6)
+# OpenBSC extension: SCCP_OLD
+MSGT = dict(PING=0x00, PONG=0x01, ID_GET=0x04, ID_RESP=0x05, ID_ACK=0x06, 
SCCP_OLD=0xFF)
+_IDTAG = dict(SERNR=0, UNITNAME=1, LOCATION=2, TYPE=3, EQUIPVERS=4, 
SWVERSION=5, IPADDR=6, MACADDR=7, UNIT=8)
+CTRL_GET = 'GET'
+CTRL_SET = 'SET'
+CTRL_REP = 'REPLY'
+CTRL_ERR = 'ERR'
+CTRL_TRAP = 'TRAP'
+
+def _l(self, d, p):
+"""
+Reverse dictionary lookup: return key for a given value
+"""
+if p is None:
+return 'UNKNOWN'
+return list(d.keys())[list(d.values()).index(p)]
+
+def _tag(self, t, v):
+"""
+Create TAG as TLV data
+"""
+return struct.pack(">HB", len(v) + 1, t) + v
+
+def proto(self, p):
+"""
+Lookup protocol name
+"""
+return self._l(self.PROTO, p)
+
+def ext(self, p):
+"""
+Lookup protocol extension name
+"""
+return self._l(self.EXT, p)
+
+def msgt(self, p):
+"""
+Lookup message type name
+"""
+return self._l(self.MSGT, p)
+
+def idtag(self, p):
+"""
+Lookup ID tag name
+"""
+return self._l(self._IDTAG, p)
+
+def ext_name(self, proto, exten):
+"""
+Return proper extension byte name depending on the protocol used
+"""
+if self.PROTO['CCM'] == proto:
+return self.msgt(exten)
+if self.PROTO['OSMO'] == proto:
+return self.ext(exten)
+return None
+
+def add_header(self, data, proto, ext=None):
+"""
+Add IPA header (with extension if necessary), data must be represented 
as bytes
+"""
+if ext is None:
+return struct.pack(">HB", len(data) + 1, proto) + data
+return struct.pack(">HBB", len(data) + 1, proto, ext) + data
+
+def del_header(self, data):
+"""
+Strip IPA protocol header 

[PATCH] osmo-hlr[master]: add CTRL tests for enable-/disable-/status-ps

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/4064

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

add CTRL tests for enable-/disable-/status-ps

Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
---
M tests/ctrl_test_runner.py
A tests/test_subscriber.sql
2 files changed, 55 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/4064/3

diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py
index d453197..7c14f50 100644
--- a/tests/ctrl_test_runner.py
+++ b/tests/ctrl_test_runner.py
@@ -163,6 +163,46 @@
 return responses
 
 
+class TestCtrlHLR(TestCtrlBase):
+
+HLR_DB = 'hlr_ctrl_test.db'
+HLR_SQL = '%s/sql/hlr.sql' % confpath
+HLR_TEST_SQL = '%s/tests/test_subscriber.sql' % confpath
+
+def setUp(self):
+print('\n')
+print(os.getcwd())
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_SQL), shell=True) == 0
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_TEST_SQL), shell=True) == 0
+super(TestCtrlHLR, self).setUp()
+
+def tearDown(self):
+super(TestCtrlHLR, self).tearDown()
+os.unlink("hlr_ctrl_test.db")
+
+def ctrl_command(self):
+return ["./src/osmo-hlr", "-c", "doc/examples/osmo-hlr.cfg", '-l', 
'hlr_ctrl_test.db']
+
+def ctrl_app(self):
+return (4259, "./src/osmo-hlr", "OsmoHLR", "hlr")
+
+def testCtrlErrs(self):
+r = self.do_get('invalid')
+self.assertEquals(r['mtype'], 'ERROR')
+self.assertEquals(r['error'], 'Command not found')
+
+def testEnableDisablePs(self):
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+
 if __name__ == '__main__':
 import argparse
 import sys
@@ -193,6 +233,8 @@
 os.chdir(workdir)
 print "Running tests for specific control commands"
 suite = unittest.TestSuite()
+test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlHLR)
+suite.addTest(test)
 res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)
 sys.exit(len(res.errors) + len(res.failures))
 
diff --git a/tests/test_subscriber.sql b/tests/test_subscriber.sql
new file mode 100644
index 000..0767d48
--- /dev/null
+++ b/tests/test_subscriber.sql
@@ -0,0 +1,13 @@
+
+-- 2G only subscriber
+INSERT INTO subscriber (id, imsi) VALUES (1, '9019901');
+INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES (1, 1, 
'000102030405060708090a0b0c0d0e0f');
+
+-- 3G only subscriber
+INSERT INTO subscriber (id, imsi) VALUES (2, '9019902');
+INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, opc, sqn) VALUES (2, 5, 
'000102030405060708090a0b0c0d0e0f', '101112131415161718191a1b1c1d1e1f', 0);
+
+-- 2G + 3G subscriber
+INSERT INTO subscriber (id, imsi) VALUES (3, '9019903');
+INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES (3, 1, 
'000102030405060708090a0b0c0d0e0f');
+INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, opc, sqn) VALUES (3, 5, 
'000102030405060708090a0b0c0d0e0f', '101112131415161718191a1b1c1d1e1f', 0);

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
Gerrit-PatchSet: 3
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

osmo-msc[master]: fix memory leak: vlr: vlr_gsupc_read_cb() must msgb_free()

[dexter]

Patch Set 1: Code-Review+1

> Build Started http://jenkins.osmocom.org/jenkins/job/osmo-msc-gerrit/368/

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

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

meta-telephony[201705]: Drop openggsn and introduce osmo-ggsn

[Max]

Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie6018ef78ff18f2e6809fee957c9d645e35c7c9a
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Max 
Gerrit-HasComments: No

meta-telephony[201705]: osmo-sgsn: Introduce recipe

[Max]

Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia7e35660598bfd87917728c521c1fba827e98d68
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Max 
Gerrit-HasComments: No

osmo-hlr[master]: add basic CTRL interface tests

[Neels Hofmeyr]

Patch Set 2: Code-Review-2

external tests should be added to the jenkins.sh configure

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

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

[PATCH] osmo-gsm-manuals[master]: tweak common/mncc.adoc: use variable for program name

[Neels Hofmeyr]

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

tweak common/mncc.adoc: use variable for program name

Change-Id: I993a3c3bf617b9823f49898364b5f728a4549330
---
M OsmoNITB/osmonitb-usermanual.adoc
M common/chapters/mncc.adoc
2 files changed, 32 insertions(+), 34 deletions(-)


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

diff --git a/OsmoNITB/osmonitb-usermanual.adoc 
b/OsmoNITB/osmonitb-usermanual.adoc
index 7d342c5..85b4c7d 100644
--- a/OsmoNITB/osmonitb-usermanual.adoc
+++ b/OsmoNITB/osmonitb-usermanual.adoc
@@ -1,4 +1,5 @@
 :gfdl-enabled:
+:program-name: OsmoNITB
 
 OsmoNITB User Manual
 
diff --git a/common/chapters/mncc.adoc b/common/chapters/mncc.adoc
index 47dfcbe..74ca6cf 100644
--- a/common/chapters/mncc.adoc
+++ b/common/chapters/mncc.adoc
@@ -17,16 +17,16 @@
 It is exposed by the Osmocom MSC layer (both in the old OsmoNITB as well as the
 new OsmoMSC.
 
-Osmocom's MSCs can run in two different modes:
+{program-name} can run in two different modes:
 
 . with internal MNCC handler
 . with external MNCC handler
 
 === Internal MNCC handler
 
-When the internal MNCC handler is enabled, OsmoMSC/OsmoNITB will switch voice
+When the internal MNCC handler is enabled, {program-name} will switch voice
 calls between GSM subscribers internally and automatically based on the
-subscribers __extension__ number.  No external software is required.
+the subscribers _extension_ number.  No external software is required.
 
 NOTE: Internal MNCC is the default behavior.
 
@@ -48,11 +48,11 @@
 [[mncc-external]]
 === External MNCC handler
 
-When the external MNCC handler is enabled, OsmoMSC/OsmoNITB will not perform
+When the external MNCC handler is enabled, {program-name} will not perform
 any internal call switching, but delegate all call-control handling towards the
 external MNCC program connected via the MNCC socket.
 
-If you intend to operate with external MNCC handler, you have
+If you intend to operate {program-name} with external MNCC handler, you have
 to start it with the `-m` or `--mncc-sock` command line option.
 
 At the time of this writing, the only external application implementing the
@@ -63,10 +63,9 @@
 === MNCC protocol description
 
 The protocol follows the primitives specified in 3GPP TS 04.07 Chapter 7.1.
-The encoding of the primitives is provided in the `mncc.h` header file
-(`osmocom/msc/mncc.h` in `osmo-msc.git` or `openbsc/mncc.h` in old
-`openbsc.git`), which uses some common definitions from `osmocom/gsm/mncc.h`
-(part of `libosmocore.git`).
+The encoding of the primitives is provided in the `mncc.h` header file in
+{program-name}'s source tree, which uses some common definitions from
+`osmocom/gsm/mncc.h` (part of libosmocore.git).
 
 However, Osmocom's MNCC specifies a number of additional primitives beyond
 those listed in the 3GPP specification.
@@ -74,106 +73,104 @@
 The different calls in the network are distinguished by their callref
 (call reference), which is a unique unsigned 32bit integer.
 
-NOTE: _MSC_ below refers to both OsmoMSC and _libmsc_ of the OsmoNITB.
-
  MNCC_HOLD_IND
 
-Direction: MSC -> Handler
+Direction: {program-name} -> Handler
 
 A 'CC HOLD' message was received from the MS.
 
  MNCC_HOLD_CNF
 
-Direction: Handler -> MSC
+Direction: Handler -> {program-name}
 
 Acknowledge a previously-received 'CC HOLD' message, causes the
 transmission of a 'CC HOLD ACK' message to the MS.
 
  MNCC_HOLD_REJ
 
-Direction: Handler -> MSC
+Direction: Handler -> {program-name}
 
 Reject a previously-received 'CC HOLD' message, causes the
 transmission of a 'CC HOLD REJ' message to the MS.
 
  MNCC_RETRIEVE_IND
 
-Direction: MSC -> Handler
+Direction: {program-name} -> Handler
 
 A 'CC RETRIEVE' message was received from the MS.
 
  MNCC_RETRIEVE_CNF
 
-Direction: Handler -> MSC
+Direction: Handler -> {program-name}
 
 Acknowledge a previously-received 'CC RETRIEVE' message, causes the
 transmission of a 'CC RETRIEVE ACK' message to the MS.
 
  MNCC_RETRIEVE_REJ
 
-Direction: Handler -> MSC
+Direction: Handler -> {program-name}
 
 Reject a previously-received 'CC RETRIEVE' message, causes the
 transmission of a 'CC RETRIEVE REJ' message to the MS.
 
  MNCC_USERINFO_REQ
 
-Direction: MSC -> Handler
+Direction: {program-name} -> Handler
 
 Causes a 'CC USER INFO' message to be sent to the MS.
 
  MNCC_USERINFO_IND
 
-Direction: MSC -> Handler
+Direction: {program-name} -> Handler
 
 Indicates that a 'CC USER-USER' message has been received from the MS.
 
  MNCC_BRIDGE
 
-Direction: Handler -> MSC
+Direction: Handler -> {program-name}
 
 Requests that the TCH (voice) channels of two calls shall be
 inter-connected.   This is the old-fashioned way of using MNCC,
 primarily required for circuit-switched BTSs whose TRAU frames are
-received via an E1 interface card on the MSC machine.
+received via an E1 interface card on the {program-name} machine.
 
  MNCC_FRAME_RECV
 
-Direction: 

[PATCH] osmo-gsm-manuals[master]: move smpp.adoc to common chapters

[Neels Hofmeyr]

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

move smpp.adoc to common chapters

It will soon be referenced by OsmoMSC as well.

Change-Id: I15febdea6569316dad3eed5f9dc7158adb5b078c
---
M OsmoNITB/osmonitb-usermanual.adoc
R common/chapters/smpp.adoc
2 files changed, 8 insertions(+), 5 deletions(-)


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

diff --git a/OsmoNITB/osmonitb-usermanual.adoc 
b/OsmoNITB/osmonitb-usermanual.adoc
index 85b4c7d..63d430a 100644
--- a/OsmoNITB/osmonitb-usermanual.adoc
+++ b/OsmoNITB/osmonitb-usermanual.adoc
@@ -28,7 +28,7 @@
 
 include::chapters/hlr.adoc[]
 
-include::chapters/smpp.adoc[]
+include::../common/chapters/smpp.adoc[]
 
 include::../common/chapters/mncc.adoc[]
 
diff --git a/OsmoNITB/chapters/smpp.adoc b/common/chapters/smpp.adoc
similarity index 92%
rename from OsmoNITB/chapters/smpp.adoc
rename to common/chapters/smpp.adoc
index 23951ba..e62a844 100644
--- a/OsmoNITB/chapters/smpp.adoc
+++ b/common/chapters/smpp.adoc
@@ -2,16 +2,19 @@
 == Short Message Peer to Peer (SMPP)
 
 The _Short Message Peer to Peer (SMPP) Protocol_ <> has been
-used for the communication with SMSCs. OsmoNITB implements version 3.4
+used for the communication with SMSCs. Osmocom implements version 3.4
 of the protocol. Using this interface one can send MT-SMS to an attached
 subscriber or receive unrouted MO-SMS.
+
+SMPP is served by the Osmocom MSC layer (both in the old OsmoNITB as well as
+the new OsmoMSC.
 
 SMPP describes a situation where multiple ESMEs (External SMS Entities)
 interact with a SMSC (SMS Service Center) via the SMPP protocol.  Each
 entity is identified by its System Id.  The System ID is a character
 string which is configured by the system administrator.
 
-OsmoNITB implements the SMSC side of SMPP and subsequently acts as a TCP
+{program-name} implements the SMSC side of SMPP and subsequently acts as a TCP
 server accepting incoming connections from ESME client programs.
 
 Each ESME identifies itself to the SMSC with its system-id and an
@@ -21,13 +24,13 @@
 === Global SMPP configuration
 
 
-There is a `smpp` vty node at the top level of the OsmoNITB
+There is a `smpp` vty node at the top level of the {program-name}
 configuration. Under this node, the global SMPP configuration is
 performed.
 
 
 Use the `local-tcp-ip` command to define the TCP IP and port at which the
-OsmoNITB internal SMSC should listen for incoming SMPP connections.  The
+{program-name} internal SMSC should listen for incoming SMPP connections.  The
 default behaviour is to listen on all IPs (0.0.0.0), and the default port
 assigned to SMPP is 2775.
 

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

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

[PATCH] osmo-gsm-manuals[master]: mncc.adoc: clarify MNCC_BRIDGE, with future outlook

[Neels Hofmeyr]

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

mncc.adoc: clarify MNCC_BRIDGE, with future outlook

Change-Id: Ic71a83d71f2da87e1066fcc060b2b942643eddbc
---
M common/chapters/mncc.adoc
1 file changed, 14 insertions(+), 2 deletions(-)


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

diff --git a/common/chapters/mncc.adoc b/common/chapters/mncc.adoc
index 74ca6cf..77579a5 100644
--- a/common/chapters/mncc.adoc
+++ b/common/chapters/mncc.adoc
@@ -131,8 +131,20 @@
 
 Requests that the TCH (voice) channels of two calls shall be
 inter-connected.   This is the old-fashioned way of using MNCC,
-primarily required for circuit-switched BTSs whose TRAU frames are
-received via an E1 interface card on the {program-name} machine.
+historically required for circuit-switched BTSs whose TRAU frames are
+received via an E1 interface card, and works only when the TCH channel types
+match.
+
+NOTE: Internal MNCC uses MNCC_BRIDGE to connect calls directly between
+connected BTSs or RNCs, in effect disallowing calls between mismatching TCH
+types and forcing all BTSs to be configured with exactly one TCH type and
+codec. This is a limitation that will probably remain for the old OsmoNITB. For
+the new OsmoMSC, the MNCC_BRIDGE command will instruct the separate OsmoMGW to
+bridge calls, which will be able to handle transcoding between different TCH as
+well as 3G (IuUP) payloads (but note: not yet implemented at the time of
+writing this). Hence an external MNCC may decide to bridge calls directly
+between BTSs or RNCs that both are internal to the OsmoMSC, for optimization
+reasons.
 
  MNCC_FRAME_RECV
 

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

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

[PATCH] osmo-gsm-manuals[master]: mncc: not 'TCHF', rather 'TCH'

[Neels Hofmeyr]

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

mncc: not 'TCHF', rather 'TCH'

Change-Id: I0edf1763122f182c66ad4c7155ddd4bea0c1d608
---
M common/chapters/mncc.adoc
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/common/chapters/mncc.adoc b/common/chapters/mncc.adoc
index 77579a5..4f098e6 100644
--- a/common/chapters/mncc.adoc
+++ b/common/chapters/mncc.adoc
@@ -150,14 +150,14 @@
 
 Direction: Handler -> {program-name}
 
-Enable the forwarding of TCHF voice frames via the MNCC interface in
+Enable the forwarding of TCH voice frames via the MNCC interface in
 {program-name}->Handler direction for the specified call.
 
  MNCC_FRAME_DROP
 
 Direction: Handler -> {program-name}
 
-Disable the forwarding of TCHF voice frames via the MNCC interface in
+Disable the forwarding of TCH voice frames via the MNCC interface in
 {program-name}->Handler direction for the specified call.
 
  MNCC_LCHAN_MODIFY

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

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

[PATCH] meta-telephony[201705]: osmo-sgsn: Introduce recipe

[Pau Espin Pedrol]

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

osmo-sgsn: Introduce recipe

Change-Id: Ia7e35660598bfd87917728c521c1fba827e98d68
---
A recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
A recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb
2 files changed, 48 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/95/4095/1

diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 
b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
new file mode 100644
index 000..a8b34ae
--- /dev/null
+++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
@@ -0,0 +1,41 @@
+DESCRITOPN = "Osmocom SGSN implementation"
+HOMEPAGE = "https://osmocom.org/;
+LICENSE = "AGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+DEPENDS = "c-ares libpcap libasn1c libosmocore libosmo-netif osmo-iuh 
osmo-ggsn"
+
+INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools pkgconfig systemd
+
+EXTRA_OECONF += "--enable-iu"
+
+do_install_append() {
+   install -d ${D}${systemd_system_unitdir}/
+   install -d ${D}${sysconfdir}/osmocom/
+
+   install -m 0644 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg 
${D}${sysconfdir}/osmocom/
+   install -m 0644 ${S}/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg 
${D}${sysconfdir}/osmocom/
+
+   install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service 
${D}${systemd_system_unitdir}/
+   install -m 0644 ${S}/contrib/systemd/osmo-gbproxy.service 
${D}${systemd_system_unitdir}/
+}
+
+PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub"
+SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy"
+SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service"
+SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service"
+
+FILES_osmo-gbproxy = " \
+   ${bindir}/osmo-gbproxy \
+   ${sysconfdir}/osmocom/osmo-gbproxy.cfg \
+   "
+
+FILES_osmo-gtphub = " \
+   ${bindir}/osmo-gtphub \
+   ${sysconfdir}/osmocom/osmo-gtphub.cfg \
+   "
+
+FILES_osmo-gbproxy-doc = " ${docdir}/osmo-sgsn/examples/osmo-gbproxy "
+FILES_osmo-gtphub-doc = " ${docdir}/osmo-sgsn/examples/osmo-gtphub "
diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb 
b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb
new file mode 100644
index 000..e94618f
--- /dev/null
+++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "341d446b4db87b48812afe8d2149ebc840e8a357"
+SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git"
+PV = "0.1.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7e35660598bfd87917728c521c1fba827e98d68
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: Update osmocom versions to point to current master

[Pau Espin Pedrol]

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

Update osmocom versions to point to current master

New versions are required in order to build new git repositories which
will deprecate osmo-nitb soon.

Change-Id: If36b86a6a542af7381d9a07da51a330f2e44a96f
---
M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
M recipes-osmocom/libosmocore/libosmocore_git.bb
M recipes-osmocom/openbsc/openbsc_git.bb
M recipes-osmocom/openggsn/openggsn_git.bb
6 files changed, 11 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/87/4087/1

diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb 
b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index c9c2077..f796948 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
@@ -3,7 +3,7 @@
 DEPENDS += "libtalloc"
 
 S = "${WORKDIR}/git"
-SRCREV = "35003ec2ea7de49d67e5332938a66fe92580b94d"
+SRCREV = "01543a1ea392fa98974ea2f99cafbc28e9966656"
 SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
 PV = "0.3.2+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb 
b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
index bea2435..0e55628 100644
--- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
+++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
@@ -3,7 +3,7 @@
 DEPENDS += "libtalloc lksctp-tools"
 
 S = "${WORKDIR}/git"
-SRCREV = "243a3b0372fe738b01c2d32d6f6cb7b7c99a1180"
+SRCREV = "59941982083f7f0d6ab11f7bbb42c297a3fb8d69"
 SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git"
 PV = "0.4.0+gitr${SRCPV}"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb 
b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index 1e5af41..1ce9efc 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -1,13 +1,9 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "882f340b6c394f581f6c32cafefa10c7b57073b9"
+SRCREV = "54fa75b85c91bb4bb79960942f63968f6423f6a5"
 SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
-PR = "${INC_PR}.1"
-
-# we require the tests to link to the static libosmo-sigtran library to
-# access symbols not starting with osmo_*
-EXTRA_OECONF_remove = "--disable-static"
+PR = "${INC_PR}.0"
 
 # because "${WORKDIR}/git" is not a git repo, it can't figure out the version
 do_configure_prepend() {
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb 
b/recipes-osmocom/libosmocore/libosmocore_git.bb
index 964dea2..052a7a4 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "a8a8d3977dc3b31352f8a87ca005763677bd7e8c"
+SRCREV = "657c5b6cadcef470c7ff9bffed3caab227026e6a"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
 PV = "0.9.0+gitr${SRCPV}"
 PR = "r1"
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb 
b/recipes-osmocom/openbsc/openbsc_git.bb
index ac0d257..59667f7 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -2,9 +2,9 @@
 
 PV = "0.15.0+gitr${SRCPV}"
 PRINC = "0"
-PR = "${INC_PR}.6"
+PR = "${INC_PR}.0"
 
-SRCREV = "ba66e79953cb1c2230fe2916ef7d8de78500c7fd"
+SRCREV = "3ae8682f974058970fa564f09a34a51e867b896b"
 SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
 
 S = "${WORKDIR}/git/openbsc"
diff --git a/recipes-osmocom/openggsn/openggsn_git.bb 
b/recipes-osmocom/openggsn/openggsn_git.bb
index d704bc5..55ca924 100644
--- a/recipes-osmocom/openggsn/openggsn_git.bb
+++ b/recipes-osmocom/openggsn/openggsn_git.bb
@@ -2,9 +2,9 @@
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 PV = "0.92+gitr${SRCPV}"
-PR = "r1"
+PR = "r0"
 
-SRCREV = "283188790bb1b3af673d4edbd56ff649b7464e1e"
+SRCREV = "6045efb642918ac43056ca6a40cda2fe2e6db08d"
 SRC_URI = "git://git.osmocom.org/openggsn   \
file://openggsn.init \
   file://libgtp-queue_depth_32.patch   \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If36b86a6a542af7381d9a07da51a330f2e44a96f
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: Drop openggsn and introduce osmo-ggsn

[Pau Espin Pedrol]

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

Drop openggsn and introduce osmo-ggsn

Take the opportunity to enable systemd service instead of sysvint like other 
osmocom
services already do.

Change-Id: Ie6018ef78ff18f2e6809fee957c9d645e35c7c9a
---
M recipes-osmocom/openbsc/openbsc.inc
D recipes-osmocom/openggsn/openggsn_git.bb
R recipes-osmocom/osmo-ggsn/files/libgtp-queue_depth_32.patch
R recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init
A recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
M recipes-telephony/tasks/task-telephony-all.bb
6 files changed, 48 insertions(+), 49 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/92/4092/1

diff --git a/recipes-osmocom/openbsc/openbsc.inc 
b/recipes-osmocom/openbsc/openbsc.inc
index a965040..164b492 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "OpenBSC a Free Software GSM BaseStationController"
-DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn 
libsmpp34 bcg729 libgsm libpcap c-ares"
+DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif 
osmo-ggsn libsmpp34 bcg729 libgsm libpcap c-ares"
 HOMEPAGE = "http://openbsc.osmocom.org/;
 LICENSE = "AGPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
@@ -11,7 +11,7 @@
   file://osmo-bsc.init \
   file://osmo-sgsn.init"
 
-INC_PR = "r21.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r22.${META_TELEPHONY_OSMO_INC}"
 
 
 EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp 
--enable-mgcp-transcoding --with-g729"
@@ -97,4 +97,3 @@
${systemd_unitdir}/system/osmo-gbproxy.service \
"
 FILES_osmo-gbproxy-dbg = " ${bindir}/.debug/osmo-gbproxy "
-
diff --git a/recipes-osmocom/openggsn/openggsn_git.bb 
b/recipes-osmocom/openggsn/openggsn_git.bb
deleted file mode 100644
index 6190b22..000
--- a/recipes-osmocom/openggsn/openggsn_git.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRITOPN = "OpenGGSN a Free Software GGSN"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PV = "0.94+gitr${SRCPV}"
-PR = "r0"
-
-SRCREV = "6045efb642918ac43056ca6a40cda2fe2e6db08d"
-SRC_URI = "git://git.osmocom.org/openggsn   \
-   file://openggsn.init \
-  file://libgtp-queue_depth_32.patch   \
-  "
-S = "${WORKDIR}/git"
-
-DEPENDS = "libosmocore"
-
-PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev openggsn-sgsnemu"
-RDEPENDS_${PN} += "kernel-module-tun"
-
-inherit autotools update-rc.d pkgconfig
-
-do_install_append() {
-   install -d ${D}${sysconfdir}/init.d
-   install -d ${D}${systemd_unitdir}/system
-
-   install -m 0776 ${WORKDIR}/openggsn.init 
${D}${sysconfdir}/init.d/openggsn
-   install -m 0644 ${S}/contrib/openggsn.service 
${D}${systemd_unitdir}/system/
-}
-
-INITSCRIPT_PACKAGES = "openggsn"
-
-INITSCRIPT_NAME_openggsn = "openggsn"
-INITSCRIPT_PARAMS_openggsn = "defaults 29 29"
-RDEPENDS_${PN} += "iptables kernel-module-ipt-masquerade"
-
-FILES_libgtp = "${libdir}/*${SOLIBS}"
-FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"
-FILES_libgtp-staticdev = "${libdir}/*.a"
-
-FILES_openggsn-sgsnemu = "${bindir}/sgsnemu"
-FILES_${PN} += "${systemd_unitdir}/system/*"
diff --git a/recipes-osmocom/openggsn/files/libgtp-queue_depth_32.patch 
b/recipes-osmocom/osmo-ggsn/files/libgtp-queue_depth_32.patch
similarity index 100%
rename from recipes-osmocom/openggsn/files/libgtp-queue_depth_32.patch
rename to recipes-osmocom/osmo-ggsn/files/libgtp-queue_depth_32.patch
diff --git a/recipes-osmocom/openggsn/files/openggsn.init 
b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init
similarity index 97%
rename from recipes-osmocom/openggsn/files/openggsn.init
rename to recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init
index 695a6cc..af34dc0 100755
--- a/recipes-osmocom/openggsn/files/openggsn.init
+++ b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:  openggsn
+# Provides:  osmo-ggsn
 # Required-Start:$network $local_fs
 # Required-Stop:
 # Default-Start: 2 3 4 5
@@ -15,8 +15,8 @@
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenGGSN Gateway GPRS Support Node"
-NAME=openggsn
+DESC="Open Source GGSN"
+NAME=osmo-ggsn
 DAEMON=/usr/bin/ggsn
 DAEMON_ARGS="" # Arguments to run the daemon with
 PIDFILE=/var/run/$NAME.pid
diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 
b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
new file mode 100644
index 000..ba024e1
--- /dev/null
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
@@ -0,0 +1,41 @@
+DESCRITOPN = "Open Source GGSN"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+PV = "1.0.0+gitr${SRCPV}"
+PR = "r0"
+
+SRCREV = 

[PATCH] meta-telephony[201705]: osmo-mgw: Introduce recipe

[Pau Espin Pedrol]

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

osmo-mgw: Introduce recipe

Change-Id: If9c2d6b5dd8dfd8a0b462d87e93e0733e57f7b0a
---
A recipes-osmocom/osmo-mgw/osmo-mgw.inc
A recipes-osmocom/osmo-mgw/osmo-mgw_git.bb
2 files changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/96/4096/1

diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc 
b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
new file mode 100644
index 000..b98f2a2
--- /dev/null
+++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
@@ -0,0 +1,22 @@
+DESCRITOPN = "Osmocom Media Gateway (MGCP) implementation"
+HOMEPAGE = "https://osmocom.org/;
+LICENSE = "AGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+DEPENDS = "libosmocore libosmo-netif bcg729 libgsm"
+
+INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools pkgconfig systemd
+
+EXTRA_OECONF += "--enable-mgcp-transcoding --with-g729"
+
+do_install_append() {
+   install -d ${D}${systemd_system_unitdir}/
+   install -d ${D}${sysconfdir}/osmocom/
+
+   install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg
+   install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service 
${D}${systemd_system_unitdir}/
+}
+
+SYSTEMD_SERVICE_osmo-mgw = "osmo-bsc-mgcp.service"
diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb 
b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb
new file mode 100644
index 000..1ea1a7b
--- /dev/null
+++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "1c8d67d7f5f6f8788d92df65a0b68e0ec19a34dc"
+SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git"
+PV = "1.0.2+gitr${SRCPV}"
+PR = "${INC_PR}.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9c2d6b5dd8dfd8a0b462d87e93e0733e57f7b0a
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: libosmo-sccp: Install cfg and service file for osmo-stp

[Pau Espin Pedrol]

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

libosmo-sccp: Install cfg and service file for osmo-stp

Patch with systemd service file is added while waiting to have it merged
in upstream.

Change-Id: Id82a12bbfb72b421c75140072048a963fb50f684
---
M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
2 files changed, 19 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/91/4091/1

diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc 
b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
index bac8527..5a503ab 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
@@ -7,6 +7,6 @@
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig systemd
 
 ALLOW_EMPTY_libosmo-sccp = "1"
diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb 
b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index 7ec2224..ed28cea 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -4,13 +4,30 @@
 SRCREV = "54fa75b85c91bb4bb79960942f63968f6423f6a5"
 SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
 PV = "0.7.0+gitr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # we require the tests to link to the static libosmo-sigtran library to
 # access symbols not starting with osmo_*
 EXTRA_OECONF_remove = "--disable-static"
 
+PACKAGES =+ "osmo-stp"
+SYSTEMD_PACKAGES = "osmo-stp"
+SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service"
+
 # because "${WORKDIR}/git" is not a git repo, it can't figure out the version
 do_configure_prepend() {
 echo "${PV}" > ${S}/.tarball-version
 }
+
+do_install_append() {
+   install -d ${D}${systemd_system_unitdir}/
+   install -d ${D}${sysconfdir}/osmocom/
+
+   install -m 0644 ${S}/doc/examples/osmo-stp.cfg 
${D}${sysconfdir}/osmocom/
+   install -m 0644 ${S}/contrib/systemd/osmo-stp.service 
${D}${systemd_system_unitdir}/
+}
+
+FILES_osmo-stp = " \
+   ${bindir}/osmo-stp \
+   ${sysconfdir}/osmocom/osmo-stp.cfg \
+   "

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id82a12bbfb72b421c75140072048a963fb50f684
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: osmo-hlr: Introduce recipe

[Pau Espin Pedrol]

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

osmo-hlr: Introduce recipe

Change-Id: Ie7f47dca8d7e5e50792104ae0c7cb557391542f7
---
A recipes-osmocom/osmo-hlr/osmo-hlr.inc
A recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
2 files changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/97/4097/1

diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc 
b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
new file mode 100644
index 000..c70b83d
--- /dev/null
+++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
@@ -0,0 +1,28 @@
+DESCRITOPN = "Osmocom HLR implementation"
+HOMEPAGE = "https://osmocom.org/;
+LICENSE = "AGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+DEPENDS = "libdbi libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native"
+
+INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools pkgconfig systemd
+
+RDEPENDS_${PN} = "libdbd-sqlite3"
+
+do_compile_append() {
+   sqlite3 ${WORKDIR}/hlr.db < ${S}/sql/hlr.sql
+}
+
+do_install_append() {
+   install -d ${D}${systemd_system_unitdir}/
+   install -d ${D}${sysconfdir}/osmocom/
+   install -d ${D}${localstatedir}/lib/osmocom/
+
+   install -m 0644 ${S}/doc/examples/osmo-hlr.cfg 
${D}${sysconfdir}/osmocom/
+   install -m 0644 ${S}/contrib/systemd/osmo-hlr.service 
${D}${systemd_system_unitdir}/
+   install -m 0644 ${WORKDIR}/hlr.db 
${D}${localstatedir}/lib/osmocom/hlr.db
+}
+
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb 
b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
new file mode 100644
index 000..8a08d94
--- /dev/null
+++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "05c8b465ab2fe13edb67c95210a9b475f91ebeb3"
+SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git"
+PV = "0.0.1+gitr${SRCPV}"
+PR = "${INC_PR}.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7f47dca8d7e5e50792104ae0c7cb557391542f7
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: openbsc: Drop packages present in other recipes after split

[Pau Espin Pedrol]

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

openbsc: Drop packages present in other recipes after split

The osmo-bsc one is renamed to osmo-bsc-sccplite and kept because the
code in the new osmo-bsc repository still doesn't support SCCPLite, this
this one can still be used by installing the osmo-bsc-sccplite package.

Change-Id: Ifd029cbd36417ee980bff51b4112705be16175d3
---
M recipes-osmocom/openbsc/openbsc.inc
R recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init
A recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service
3 files changed, 40 insertions(+), 54 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/00/4100/1

diff --git a/recipes-osmocom/openbsc/openbsc.inc 
b/recipes-osmocom/openbsc/openbsc.inc
index 164b492..9645153 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -8,13 +8,15 @@
 
 SRC_URI = "file://osmo-nitb.init \
   file://osmo-bsc_mgcp.init \
-  file://osmo-bsc.init \
-  file://osmo-sgsn.init"
+  file://osmo-bsc-sccplite.init \
+  file://osmo-sgsn.init \
+  file://osmo-bsc-sccplite.service \
+  "
 
-INC_PR = "r22.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r23.${META_TELEPHONY_OSMO_INC}"
 
 
-EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp 
--enable-mgcp-transcoding --with-g729"
+EXTRA_OECONF += "--enable-osmo-bsc --enable-mgcp-transcoding --with-g729"
 
 inherit autotools update-rc.d pkgconfig
 
@@ -26,50 +28,38 @@
 do_install_append() {
install -d ${D}${sysconfdir}/osmocom
install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg 
${D}${sysconfdir}/osmocom/osmo-nitb.cfg
-   install -m 0660 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc.cfg
-   install -m 0660 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg
-   install -m 0660 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg 
${D}${sysconfdir}/osmocom/osmo-sgsn.cfg
+   install -m 0660 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg
 
# Install sysv-init files
install -d ${D}${sysconfdir}/init.d
install -d ${D}${sysconfdir}/rc5.d
install -m 0775 ${WORKDIR}/osmo-nitb.init 
${D}${sysconfdir}/init.d/osmo-nitb
-   install -m 0775 ${WORKDIR}/osmo-bsc_mgcp.init 
${D}${sysconfdir}/init.d/osmo-bsc-mgcp
-   install -m 0775 ${WORKDIR}/osmo-bsc.init 
${D}${sysconfdir}/init.d/osmo-bsc
-   install -m 0775 ${WORKDIR}/osmo-sgsn.init 
${D}${sysconfdir}/init.d/osmo-sgsn
+   install -m 0775 ${WORKDIR}/osmo-bsc-sccplite.init 
${D}${sysconfdir}/init.d/osmo-bsc-sccplite
 
# Install systemd files and enable on sysinit
-   install -d ${D}${systemd_unitdir}/system
-   for i in `ls ${S}/contrib/systemd`; do
-   install -m 0644 ${S}/contrib/systemd/$i 
${D}${systemd_unitdir}/system/
-   done
+   install -d ${D}${systemd_system_unitdir}/
+   install -m 0644 ${S}/contrib/systemd/osmo-nitb.service 
${D}${systemd_system_unitdir}/
+   install -m 0644 ${WORKDIR}/osmo-bsc-sccplite.service 
${D}${systemd_system_unitdir}/
 
install -d ${D}/var/lib/osmocom
+
+   mv ${D}${bindir}/osmo-bsc ${D}${bindir}/osmo-bsc-sccplite
 }
 
-PACKAGES =+ "osmo-bsc osmo-nitb osmo-gbproxy osmo-gbproxy-dbg osmo-sgsn 
ipaccess-utils osmo-bsc-mgcp osmo-bsc-nat"
+PACKAGES =+ "osmo-bsc-sccplite osmo-nitb"
 
-INITSCRIPT_PACKAGES = "osmo-bsc osmo-bsc-mgcp osmo-nitb osmo-sgsn"
+INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb"
 
 # Do not start any of the services by default
 SYSTEMD_AUTO_ENABLE = "disable"
 
-CONFFILES_osmo-bsc = "${sysconfdir}/osmocom/osmo-bsc.cfg"
-INITSCRIPT_NAME_osmo-bsc = "osmo-bsc"
-INITSCRIPT_PARAMS_osmo-bsc = "defaults 30 30"
-FILES_osmo-bsc = " ${bindir}/osmo-bsc \
-   ${sysconfdir}/osmocom/osmo-bsc.cfg \
-   ${sysconfdir}/init.d/osmo-bsc \
-   ${systemd_unitdir}/system/osmo-bsc.service \
-   "
-
-CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg"
-INITSCRIPT_NAME_osmo-bsc-mgcp = "osmo-bsc-mgcp"
-INITSCRIPT_PARAMS_osmo-bsc-mgcp = "defaults 30 30"
-FILES_osmo-bsc-mgcp = " ${bindir}/osmo-bsc_mgcp \
-   ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \
-   ${sysconfdir}/init.d/osmo-bsc-mgcp \
-   ${systemd_unitdir}/system/osmo-bsc-mgcp.service \
+CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg"
+INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite"
+INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30"
+FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \
+   ${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg \
+   ${sysconfdir}/init.d/osmo-bsc-sccplite \
+   ${systemd_system_unitdir}/osmo-bsc-sccplite.service \
"
 
 CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg"
@@ -81,19 +71,3 @@

[PATCH] meta-telephony[201705]: libasn1c: Introduce recipe

[Pau Espin Pedrol]

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

libasn1c: Introduce recipe

Change-Id: I50d990b06c56c3bfa71e7268694702300c0c9a26
---
A recipes-osmocom/libasn1c/libasn1c.inc
A recipes-osmocom/libasn1c/libasn1c_git.bb
2 files changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/93/4093/1

diff --git a/recipes-osmocom/libasn1c/libasn1c.inc 
b/recipes-osmocom/libasn1c/libasn1c.inc
new file mode 100644
index 000..96500f8
--- /dev/null
+++ b/recipes-osmocom/libasn1c/libasn1c.inc
@@ -0,0 +1,10 @@
+SUMMARY = "Rruntime library of Lev Walkin's asn1c split out as separate 
library"
+HOMEPAGE = "https://osmocom.org/;
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=25192323023bb0db6998ac6fcd5aa6a1"
+
+DEPENDS = "libtalloc"
+
+INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools pkgconfig
diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb 
b/recipes-osmocom/libasn1c/libasn1c_git.bb
new file mode 100644
index 000..0d4800a
--- /dev/null
+++ b/recipes-osmocom/libasn1c/libasn1c_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "aaae8c76496a97050264e4c49e539b0420496737"
+SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git"
+PV = "0.9.28+gitr${SRCPV}"
+PR = "${INC_PR}.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50d990b06c56c3bfa71e7268694702300c0c9a26
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: osmo-msc: Introduce recipe

[Pau Espin Pedrol]

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

osmo-msc: Introduce recipe

Change-Id: I68715d1970fde83fd6647344b82c6a859404ef9e
---
A recipes-osmocom/osmo-msc/osmo-msc.inc
A recipes-osmocom/osmo-msc/osmo-msc_git.bb
2 files changed, 31 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/98/4098/1

diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc 
b/recipes-osmocom/osmo-msc/osmo-msc.inc
new file mode 100644
index 000..594d754
--- /dev/null
+++ b/recipes-osmocom/osmo-msc/osmo-msc.inc
@@ -0,0 +1,24 @@
+DESCRITOPN = "Osmocom MSC implementation"
+HOMEPAGE = "https://osmocom.org/;
+LICENSE = "AGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+DEPENDS = "libdbi libasn1c osmo-iuh libosmocore libosmo-abis libosmo-sccp 
libosmo-netif libsmpp34 osmo-mgw"
+
+INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools pkgconfig systemd
+
+EXTRA_OECONF += "--enable-smpp --enable-iu"
+
+RDEPENDS_${PN} = "libdbd-sqlite3"
+
+do_install_append() {
+   install -d ${D}${systemd_system_unitdir}/
+   install -d ${D}${sysconfdir}/osmocom/
+
+   install -m 0644 ${S}/doc/examples/osmo-msc/osmo-msc.cfg 
${D}${sysconfdir}/osmocom/
+   install -m 0644 ${S}/contrib/systemd/osmo-msc.service 
${D}${systemd_system_unitdir}/
+}
+
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb 
b/recipes-osmocom/osmo-msc/osmo-msc_git.bb
new file mode 100644
index 000..7d55237
--- /dev/null
+++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "4e7ece0bd969389132d7babf8de4f57cf7d0126f"
+SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git"
+PV = "1.0.1+gitr${SRCPV}"
+PR = "${INC_PR}.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68715d1970fde83fd6647344b82c6a859404ef9e
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: osmo-iuh: Introduce recipe

[Pau Espin Pedrol]

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

osmo-iuh: Introduce recipe

Change-Id: I33d6dccad2336b83f4b4e89769b0796d1c87ed94
---
A recipes-osmocom/osmo-iuh/osmo-iuh.inc
A recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
2 files changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/94/4094/1

diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc 
b/recipes-osmocom/osmo-iuh/osmo-iuh.inc
new file mode 100644
index 000..613df72
--- /dev/null
+++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc
@@ -0,0 +1,20 @@
+DESCRITOPN = "Osmocom Iuh and HNB-GW implementation"
+HOMEPAGE = "https://osmocom.org/;
+LICENSE = "AGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c"
+
+INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools pkgconfig systemd
+
+do_install_append() {
+   install -d ${D}${systemd_system_unitdir}/
+   install -d ${D}${sysconfdir}/osmocom/
+
+   install -m 0644 ${S}/doc/examples/osmo-hnbgw.cfg 
${D}${sysconfdir}/osmocom/
+   install -m 0644 ${S}/contrib/systemd/osmo-hnbgw.service 
${D}${systemd_system_unitdir}/
+}
+
+SYSTEMD_SERVICE_${PN} = "osmo-hnbgw.service"
diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb 
b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
new file mode 100644
index 000..821373d
--- /dev/null
+++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "5a3df8fa9ffc4400367250a0f9ff0e20dc4b5d3b"
+SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git"
+PV = "0.1.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33d6dccad2336b83f4b4e89769b0796d1c87ed94
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: libosmo-abis: modify PV to match recent release

[Pau Espin Pedrol]

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

libosmo-abis: modify PV to match recent release

The upstream release commit is 7f17b8c45d094941292036143f3292a1d5789cf5.

This should fix current issue with 201705/nightly package feed:

$ opkg upgrade
Not selecting libosmo-abis 0.3.2+gitr0+d3292913ac as installing it would break 
existing dependencies.
$ opkg list_installed | grep  libosmo-abis
libosmo-abis - 0.3.2+gitr2+d3292913ac-r2.18.1.0

See that gitr in repos is 0 while the previously installed one has
gitr2, which is higher. Explanations I can find for this:
- PR server was somehow reset?
- the value in gitr is calculated based on offset from latest tag. As
new release introduced new tag, gitr may have been reset.

In any case, updating PV to have the correct value should fix this
issue.

Change-Id: I9f27661d9e5241efe7725b7d1efcf4aef55e2efe
---
M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/90/4090/1

diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb 
b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index f796948..6f9c2fd 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
@@ -5,5 +5,5 @@
 S = "${WORKDIR}/git"
 SRCREV = "01543a1ea392fa98974ea2f99cafbc28e9966656"
 SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
-PV = "0.3.2+gitr${SRCPV}"
+PV = "0.4.0+gitr${SRCPV}"
 PR = "${INC_PR}.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f27661d9e5241efe7725b7d1efcf4aef55e2efe
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: osmo-bsc: Introduce recipe

[Pau Espin Pedrol]

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

osmo-bsc: Introduce recipe

Change-Id: I06c529c01a72e16aa20a2c7a20e8b043718edab3
---
A recipes-osmocom/osmo-bsc/osmo-bsc.inc
A recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
2 files changed, 44 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/99/4099/1

diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc 
b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
new file mode 100644
index 000..ae3af65
--- /dev/null
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
@@ -0,0 +1,37 @@
+DESCRITOPN = "Osmocom BSC implementation"
+HOMEPAGE = "https://osmocom.org/;
+LICENSE = "AGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+DEPENDS = "sqlite3 libosmocore libosmo-abis libosmo-sccp libosmo-netif 
osmo-mgw"
+
+INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools pkgconfig systemd
+
+do_install_append() {
+   install -d ${D}${systemd_system_unitdir}/
+   install -d ${D}${sysconfdir}/osmocom/
+
+   install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg 
${D}${sysconfdir}/osmocom/
+   install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg 
${D}${sysconfdir}/osmocom/
+
+   install -m 0644 ${S}/contrib/systemd/osmo-bsc.service 
${D}${systemd_system_unitdir}/
+}
+
+PACKAGES =+ "osmo-bsc-nat-doc osmo-bsc-nat ipaccess-utils"
+SYSTEMD_PACKAGES = "osmo-bsc"
+SYSTEMD_SERVICE_osmo-bsc = "osmo-bsc.service"
+
+FILES_ipaccess-utils = " \
+   ${bindir}/ipaccess-find \
+   ${bindir}/ipaccess-config \
+   ${bindir}/ipaccess-proxy \
+   "
+
+FILES_osmo-bsc-nat = " \
+   ${bindir}/osmo-bsc_nat \
+   ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \
+   "
+
+FILES_osmo-bsc-nat-doc = " ${docdir}/osmo-bsc/examples/osmo-bsc_nat "
diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb 
b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
new file mode 100644
index 000..234e054
--- /dev/null
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "00c22464a0c1b51bb4b29efecab39e993224949c"
+SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git"
+PV = "1.0.1+gitr${SRCPV}"
+PR = "${INC_PR}.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06c529c01a72e16aa20a2c7a20e8b043718edab3
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: osmo-msc: Avoid installed duplicated binaries in osmo-bsc

[Pau Espin Pedrol]

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

osmo-msc: Avoid installed duplicated binaries in osmo-bsc

Those two binaries are currently being installed by osmo-bsc too.

Change-Id: Ic582450f1881373785f12714ffa3bd150d37417e
---
M recipes-osmocom/osmo-msc/osmo-msc.inc
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/01/4101/1

diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc 
b/recipes-osmocom/osmo-msc/osmo-msc.inc
index 594d754..4c3125d 100644
--- a/recipes-osmocom/osmo-msc/osmo-msc.inc
+++ b/recipes-osmocom/osmo-msc/osmo-msc.inc
@@ -5,7 +5,7 @@
 
 DEPENDS = "libdbi libasn1c osmo-iuh libosmocore libosmo-abis libosmo-sccp 
libosmo-netif libsmpp34 osmo-mgw"
 
-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
@@ -19,6 +19,10 @@
 
install -m 0644 ${S}/doc/examples/osmo-msc/osmo-msc.cfg 
${D}${sysconfdir}/osmocom/
install -m 0644 ${S}/contrib/systemd/osmo-msc.service 
${D}${systemd_system_unitdir}/
+
+   # osmo-bsc already provides these, see issue Osmocom #2522:
+   rm -f ${D}${bindir}/.debug/*meas*
+   rm -f ${D}${bindir}/*meas*
 }
 
 SYSTEMD_SERVICE_${PN} = "${PN}.service"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic582450f1881373785f12714ffa3bd150d37417e
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] meta-telephony[201705]: libosmo-sccp: Attempt to fix link issue on 201705-nightly bu...

[Pau Espin Pedrol]

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

libosmo-sccp: Attempt to fix link issue on 201705-nightly builds

This project will build some static libraries needed for testing
and also for downstream users. Do not disable the static build on
newer Poky versions.

arm-poky-linux-gnueabi-libtool: link: arm-poky-linux-gnueabi-gcc -march=armv5te 
-marm 
--sysroot=/home/jenkinsdebian8amd64/jenkins/workspace/201705-nightly/label/Debian8-AMD64/build/tmp/work/armv5te-poky-linux-gnueabi/libosmo-sccp/git-r1.18.1/recipe-sysroot
 -Wall 
-I/home/jenkinsdebian8amd64/jenkins/workspace/201705-nightly/label/Debian8-AMD64/build/tmp/work/armv5te-poky-linux-gnueabi/libosmo-sccp/git-r1.18.1/recipe-sysroot/usr/include/
 
-I/home/jenkinsdebian8amd64/jenkins/workspace/201705-nightly/label/Debian8-AMD64/build/tmp/work/armv5te-poky-linux-gnueabi/libosmo-sccp/git-r1.18.1/recipe-sysroot/usr/include/
 -O2 -pipe -g -feliminate-unused-debug-types 
-fdebug-prefix-map=/home/jenkinsdebian8amd64/jenkins/workspace/201705-nightly/label/Debian8-AMD64/build/tmp/work/armv5te-poky-linux-gnueabi/libosmo-sccp/git-r1.18.1=/usr/src/debug/libosmo-sccp/git-r1.18.1
 
-fdebug-prefix-map=/home/jenkinsdebian8amd64/jenkins/workspace/201705-nightly/label/Debian8-AMD64/build/tmp/work/armv5te-poky-linux-gn
 ueabi/libosmo-sccp/git-r1.18.1/recipe-sysroot-native= 
-fdebug-prefix-map=/home/jenkinsdebian8amd64/jenkins/workspace/201705-nightly/label/Debian8-AMD64/build/tmp/work/armv5te-poky-linux-gnueabi/libosmo-sccp/git-r1.18.1/recipe-sysroot=
 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o xua_test xua_test.o 
sccp_test_data.o  ../../src/.libs/libosmo-sigtran.so -losmogsm -ltalloc 
-losmovty -losmocore -losmonetif -lsctp
| xua_test.o: In function `test_helpers':
| /usr/src/debug/libosmo-sccp/git-r1.18.1/git/tests/xua/xua_test.c:160: 
undefined reference to `xua_part_add_gt'
| /usr/src/debug/libosmo-sccp/git-r1.18.1/git/tests/xua/xua_test.c:168: 
undefined reference to `sua_parse_gt'
| xua_test.o: In function `test_sccp2sua_case':

Change-Id: I80eea9ac888ab4b13614ff475bebacb94b72b0f2
---
M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/88/4088/1

diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb 
b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index 1ce9efc..3d55f69 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -5,6 +5,10 @@
 SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
 PR = "${INC_PR}.0"
 
+# we require the tests to link to the static libosmo-sigtran library to
+# access symbols not starting with osmo_*
+EXTRA_OECONF_remove = "--disable-static"
+
 # because "${WORKDIR}/git" is not a git repo, it can't figure out the version
 do_configure_prepend() {
 echo "${PV}" > ${S}/.tarball-version

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80eea9ac888ab4b13614ff475bebacb94b72b0f2
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Holger Freyther 

[PATCH] meta-telephony[201705]: update PV versions for libosmocore, libosmo-sccp and openggsn

[Pau Espin Pedrol]

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

update PV versions for libosmocore, libosmo-sccp and openggsn

As we're building git master, we need to make sure PV is not lagging
behind.  I wish there was some OE magic by which it could discover
PV from the source it builds.

Change-Id: Ib45238e95156f215412d51d975b1acb33633a3e1
---
M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
M recipes-osmocom/libosmocore/libosmocore_git.bb
M recipes-osmocom/openggsn/openggsn_git.bb
3 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/89/4089/1

diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb 
b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index 3d55f69..7ec2224 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -3,6 +3,7 @@
 S = "${WORKDIR}/git"
 SRCREV = "54fa75b85c91bb4bb79960942f63968f6423f6a5"
 SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
+PV = "0.7.0+gitr${SRCPV}"
 PR = "${INC_PR}.0"
 
 # we require the tests to link to the static libosmo-sigtran library to
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb 
b/recipes-osmocom/libosmocore/libosmocore_git.bb
index 052a7a4..e4f1784 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -3,7 +3,7 @@
 S = "${WORKDIR}/git"
 SRCREV = "657c5b6cadcef470c7ff9bffed3caab227026e6a"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
-PV = "0.9.0+gitr${SRCPV}"
+PV = "0.9.6+gitr${SRCPV}"
 PR = "r1"
 
 DEPENDS += "libtalloc"
diff --git a/recipes-osmocom/openggsn/openggsn_git.bb 
b/recipes-osmocom/openggsn/openggsn_git.bb
index 55ca924..6190b22 100644
--- a/recipes-osmocom/openggsn/openggsn_git.bb
+++ b/recipes-osmocom/openggsn/openggsn_git.bb
@@ -1,7 +1,7 @@
 DESCRITOPN = "OpenGGSN a Free Software GGSN"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PV = "0.92+gitr${SRCPV}"
+PV = "0.94+gitr${SRCPV}"
 PR = "r0"
 
 SRCREV = "6045efb642918ac43056ca6a40cda2fe2e6db08d"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib45238e95156f215412d51d975b1acb33633a3e1
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol 

[MERGED] osmo-ggsn[master]: contrib: osmo-ggsn.service: Use expected suffix for cfg file

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: contrib: osmo-ggsn.service: Use expected suffix for cfg file
..


contrib: osmo-ggsn.service: Use expected suffix for cfg file

files in doc/examples/ dir end with .cfg, as well as all configuration
files present in all projects.

Change-Id: I361c67809d095dd08b0f400de2a6f84f981411c5
---
M contrib/osmo-ggsn.service
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/osmo-ggsn.service b/contrib/osmo-ggsn.service
index a8d123a..10e3507 100644
--- a/contrib/osmo-ggsn.service
+++ b/contrib/osmo-ggsn.service
@@ -5,7 +5,7 @@
 [Service]
 Type=simple
 Restart=always
-ExecStart=/usr/bin/osmo-ggsn -c /etc/osmocom/osmo-ggsn.conf -f
+ExecStart=/usr/bin/osmo-ggsn -c /etc/osmocom/osmo-ggsn.cfg -f
 RestartSec=2
 RestartPreventExitStatus=1
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I361c67809d095dd08b0f400de2a6f84f981411c5
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 

osmo-ggsn[master]: contrib: osmo-ggsn.service: Use expected suffix for cfg file

[Neels Hofmeyr]

Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I361c67809d095dd08b0f400de2a6f84f981411c5
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] osmo-pcu[master]: Simplify TS alloc: adjust allocator signatures

[Max]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/3807

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

Simplify TS alloc: adjust allocator signatures

* drop unused parameters (from both functions and structs)
* document used parameters and return values
* tighten types used for parameters
* use consistent formatting

Tests are adjusted accordingly but test results are left untouched to
avoid regressions.

Change-Id: I39d81ab64ff790b9c4c2d0312a574485cd83e755
Related: OS#228
---
M src/bts.h
M src/gprs_rlcmac.h
M src/gprs_rlcmac_ts_alloc.cpp
M src/tbf.cpp
M src/tbf.h
M src/tbf_dl.cpp
M tests/alloc/AllocTest.cpp
7 files changed, 59 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/07/3807/10

diff --git a/src/bts.h b/src/bts.h
index 1d13a64..0ce5123 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -205,11 +205,9 @@
struct gsmtap_inst *gsmtap;
uint32_t gsmtap_categ_mask;
struct gprs_rlcmac_trx trx[8];
-   int (*alloc_algorithm)(struct gprs_rlcmac_bts *bts,
-   struct GprsMs *ms,
-   struct gprs_rlcmac_tbf *tbf, uint32_t cust, uint8_t single,
-   int use_tbf);
-   uint32_t alloc_algorithm_curst; /* options to customize algorithm */
+   int (*alloc_algorithm)(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, 
struct gprs_rlcmac_tbf *tbf,
+  bool single, int8_t use_tbf);
+
uint8_t force_two_phase;
uint8_t alpha, gamma;
uint8_t egprs_enabled;
diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h
index be1e686..c16a954 100644
--- a/src/gprs_rlcmac.h
+++ b/src/gprs_rlcmac.h
@@ -21,6 +21,8 @@
 #ifndef GPRS_RLCMAC_H
 #define GPRS_RLCMAC_H
 
+#include 
+
 #ifdef __cplusplus
 #include 
 #include 
@@ -98,20 +100,14 @@
 
 extern "C" {
 #endif
-int alloc_algorithm_a(struct gprs_rlcmac_bts *bts,
-   struct GprsMs *ms,
-   struct gprs_rlcmac_tbf *tbf, uint32_t cust, uint8_t single,
-   int use_trx);
+int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct 
gprs_rlcmac_tbf *tbf, bool single,
+ int8_t use_trx);
 
-int alloc_algorithm_b(struct gprs_rlcmac_bts *bts,
-   struct GprsMs *ms,
-   struct gprs_rlcmac_tbf *tbf, uint32_t cust, uint8_t single,
-   int use_trx);
+int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct 
gprs_rlcmac_tbf *tbf, bool single,
+ int8_t use_trx);
 
-int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts,
-   struct GprsMs *ms,
-   struct gprs_rlcmac_tbf *tbf, uint32_t cust, uint8_t single,
-   int use_trx);
+int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, 
struct gprs_rlcmac_tbf *tbf, bool single,
+   int8_t use_trx);
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 3b596f4..9ceceb2 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -396,14 +396,19 @@
return tfi;
 }
 
-/* Slot Allocation: Algorithm A
+/*! Slot Allocation: Algorithm A
  *
  * Assign single slot for uplink and downlink
+ *
+ *  \param[in,out] bts Pointer to BTS struct
+ *  \param[in,out] ms_ Pointer to MS object
+ *  \param[in,out] tbf_ Pointer to TBF struct
+ *  \param[in] single flag indicating if we should force single-slot allocation
+ *  \param[in] use_trx which TRX to use or -1 if it should be selected during 
allocation
+ *  \returns negative error code or 0 on success
  */
-int alloc_algorithm_a(struct gprs_rlcmac_bts *bts,
-   GprsMs *ms_,
-   struct gprs_rlcmac_tbf *tbf_, uint32_t cust, uint8_t single,
-   int use_trx)
+int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct 
gprs_rlcmac_tbf *tbf_, bool single,
+ int8_t use_trx)
 {
struct gprs_rlcmac_pdch *pdch;
int ts = -1;
@@ -796,15 +801,20 @@
return 0;
 }
 
-/* Slot Allocation: Algorithm B
+/*! Slot Allocation: Algorithm B
  *
  * Assign as many downlink slots as possible.
  * Assign one uplink slot. (With free USF)
  *
+ *  \param[in,out] bts Pointer to BTS struct
+ *  \param[in,out] ms_ Pointer to MS object
+ *  \param[in,out] tbf_ Pointer to TBF struct
+ *  \param[in] single flag indicating if we should force single-slot allocation
+ *  \param[in] use_trx which TRX to use or -1 if it should be selected during 
allocation
+ *  \returns negative error code or 0 on success
  */
-int alloc_algorithm_b(struct gprs_rlcmac_bts *bts,
-   GprsMs *ms_, struct gprs_rlcmac_tbf *tbf_,
-   uint32_t cust, uint8_t single, int use_trx)
+int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct 
gprs_rlcmac_tbf *tbf_, bool single,
+ int8_t use_trx)
 {
uint8_t dl_slots;
uint8_t ul_slots;
@@ -1025,7 +1035,7 @@
return 0;
 }
 
-/* Slot Allocation: Algorithm dynamic
+/*! 

[PATCH] osmo-pcu[master]: Simplify TS alloc: move slot check into functions

[Max]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/3935

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

Simplify TS alloc: move slot check into functions

Move timeslot applicability check outside of nested for loop into
separate functions and document them.

This allows us to clarify types used in TS-related computations.

Change-Id: Ic39e848da47dc11357782362fdf6206d2c1457c2
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
1 file changed, 97 insertions(+), 113 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/35/3935/4

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 0301d79..2763100 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -139,11 +139,11 @@
return -1;
 }
 
-static int find_possible_pdchs(const struct gprs_rlcmac_trx *trx, size_t 
max_slots, uint8_t mask,
-  const char *mask_reason = NULL)
+static uint8_t find_possible_pdchs(const struct gprs_rlcmac_trx *trx, uint8_t 
max_slots, uint8_t mask,
+  const char *mask_reason = NULL)
 {
unsigned ts;
-   int valid_ts_set = 0;
+   uint8_t valid_ts_set = 0;
int8_t last_tsc = -1; /* must be signed */
 
for (ts = 0; ts < ARRAY_SIZE(trx->pdch); ts++) {
@@ -430,7 +430,7 @@
int trx_no;
int tfi = -1;
int usf = -1;
-   int mask = 0xff;
+   uint8_t mask = 0xff;
const char *mask_reason = NULL;
const GprsMs *ms = ms_;
const gprs_rlcmac_tbf *tbf = tbf_;
@@ -514,7 +514,7 @@
  *  \param[in] tx_window Transmit window
  *  \returns non-negative capacity
  */
-static inline unsigned compute_capacity(const struct gprs_rlcmac_trx *trx, int 
rx_window, int tx_window)
+static inline unsigned compute_capacity(const struct gprs_rlcmac_trx *trx, 
int16_t rx_window, int16_t tx_window)
 {
const struct gprs_rlcmac_pdch *pdch;
unsigned ts, capacity = 0;
@@ -534,6 +534,84 @@
return capacity;
 }
 
+/*! Decide if a given slot should be skipped by multislot allocator
+ *
+ *  \param[in] ms_class Pointer to MS Class object
+ *  \param[in] check_tr Flag indicating whether we should check for Tra or Tta 
parameters for a given MS class
+ *  \param[in] rx_window Receive window
+ *  \param[in] rx_slot_count Number of TS in RX
+ *  \param[in] tx_window Transmit window
+ *  \param[in] tx_slot_count Number of TS in TX
+ *  \param[in,out] checked_rx array with already checked RX timeslots
+ *  \returns true if the slot should be skipped, false otherwise
+ */
+static bool skip_slot(const struct gprs_ms_multislot_class *ms_class, bool 
check_tr, int16_t rx_window,
+ uint8_t rx_slot_count, int16_t tx_window, uint8_t 
tx_slot_count, uint32_t *checked_rx)
+{
+   uint8_t common_slot_count, req_common_slots;
+
+   /* Check compliance with TS 45.002, table 6.4.2.2.1 */
+   /* Whether to skip this round doesn not only depend on the bit
+* sets but also on check_tr. Therefore this check must be done
+* before doing the test_and_set_bit shortcut. */
+   if (ms_class->type == 1) {
+   uint16_t slot_sum = rx_slot_count + tx_slot_count;
+   /* Assume down + up / dynamic.
+* TODO: For ext-dynamic, down only, up only add more cases.
+*/
+   if (slot_sum <= 6 && tx_slot_count < 3) {
+   if (!check_tr)
+   return true; /* Skip Tta */
+   } else if (slot_sum > 6 && tx_slot_count < 3) {
+   if (check_tr)
+   return true; /* Skip Tra */
+   } else
+   return true; /* No supported row in TS 45.002, table 
6.4.2.2.1. */
+   }
+
+   /* Avoid repeated RX combination check */
+   if (test_and_set_bit(checked_rx, rx_window))
+   return true;
+
+   /* Check number of common slots according to TS 45.002, §6.4.2.2 */
+   common_slot_count = pcu_bitcount(tx_window & rx_window);
+   req_common_slots = OSMO_MIN(tx_slot_count, rx_slot_count);
+   if (ms_class->type == 1)
+   req_common_slots = OSMO_MIN(req_common_slots, 2);
+
+   if (req_common_slots != common_slot_count)
+   return true;
+
+   return false;
+}
+
+/*! Filter out bad slots
+ *
+ *  \param[in] mask TS selection mask
+ *  \param[in] ul_slots set of UL timeslots
+ *  \param[in] dl_slots set of DL timeslots
+ *  \param[in] rx_valid_win Mask for valid RX window value
+ *  \returns negative error code or RX window on success
+ */
+static int16_t filter_bad_slots(uint8_t mask, uint8_t ul_slots, uint8_t 
dl_slots, uint16_t rx_valid_win)
+{
+   uint8_t rx_good;
+   uint16_t rx_bad = (uint16_t)(0xff & ~mask) << ul_slots;
+
+   /* TODO: CHECK this calculation -> separate function for unit testing */
+   rx_bad = (rx_bad 

[PATCH] osmo-pcu[master]: Simplify TS alloc: replace debug printer

[Max]

Hello Harald Welte, Jenkins Builder, Holger Freyther,

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

https://gerrit.osmocom.org/3929

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

Simplify TS alloc: replace debug printer

Replace unreadable recursive debug printer with simpler functions.

Note: the new printer also correctly handle reserved TS so Control slot
overrides TS for the bits set for both Uplink and Downlink slots. This
does not change the allocation semantics of course but requires cosmetic
adjustement to TBF tests output.

Change-Id: Ia13855877b2145cb57b1646f5562b2af3b87bcfb
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
M tests/tbf/TbfTest.err
2 files changed, 21 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/29/3929/6

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 57fd27b..1bde088 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -81,18 +81,19 @@
 /* N/A */  { MS_NA,MS_NA,  MS_NA,  MS_NA,  MS_NA,  MS_NA,  MS_NA,  MS_NA },
 };
 
-static char *set_flag_chars(char *buf, uint8_t val, char set_char, char 
unset_char = 0)
+static inline void masked_override_with(char *buf, uint8_t mask, char set_char)
 {
int i;
-
-   for (i = 0; i < 8; i += 1, val = val >> 1) {
-   if (val & 1)
+   for (i = 0; mask; i++, mask >>= 1)
+   if (mask & 1)
buf[i] = set_char;
-   else if (unset_char)
-   buf[i] = unset_char;
-   }
+}
 
-   return buf;
+static void ts_format(char *buf, uint8_t dl_mask, uint8_t ul_mask)
+{
+   snprintf(buf, 9, OSMO_BIT_SPEC, OSMO_BIT_PRINT_EX(dl_mask, 'D'));
+   masked_override_with(buf, ul_mask, 'U');
+   masked_override_with(buf, ul_mask & dl_mask, 'C');
 }
 
 static bool test_and_set_bit(uint32_t *bits, size_t elem)
@@ -596,11 +597,9 @@
*dl_slots &= pdch_slots;
*ul_slots &= pdch_slots;
 
-   LOGP(DRLCMAC, LOGL_DEBUG, "- Possible DL/UL slots: 
(TS=0)\"%s\"(TS=7)\n",
-   set_flag_chars(set_flag_chars(set_flag_chars(slot_info,
-   *dl_slots, 'D', '.'),
-   *ul_slots, 'U'),
-   *ul_slots & *dl_slots, 'C'));
+   ts_format(slot_info, *dl_slots, *ul_slots);
+   LOGP(DRLCMAC, LOGL_DEBUG,
+"- Possible DL/UL slots: (TS=0)\"%s\"(TS=7)\n", slot_info);
 
/* Check for each UL (TX) slot */
 
@@ -912,12 +911,10 @@
}
 
if (tbf->direction == GPRS_RLCMAC_DL_TBF) {
+   snprintf(slot_info, 9, OSMO_BIT_SPEC, 
OSMO_BIT_PRINT_EX(reserved_dl_slots, 'd'));
+   masked_override_with(slot_info, dl_slots, 'D');
LOGP(DRLCMAC, LOGL_DEBUG,
-   "- Selected DL slots: (TS=0)\"%s\"(TS=7)%s\n",
-   set_flag_chars(set_flag_chars(slot_info,
-   reserved_dl_slots, 'd', '.'),
-   dl_slots, 'D'),
-   single ? ", single" : "");
+"- Selected DL slots: (TS=0)\"%s\"(TS=7)%s\n", slot_info, 
single ? ", single" : "");
 
/* assign downlink */
if (dl_slots == 0) {
@@ -950,12 +947,10 @@
ul_slots = 1 << ts;
usf[ts] = free_usf;
 
+   snprintf(slot_info, 9, OSMO_BIT_SPEC, 
OSMO_BIT_PRINT_EX(reserved_ul_slots, 'u'));
+   masked_override_with(slot_info, ul_slots, 'U');
LOGP(DRLCMAC, LOGL_DEBUG,
-   "- Selected UL slots: (TS=0)\"%s\"(TS=7)%s\n",
-   set_flag_chars(set_flag_chars(slot_info,
-   reserved_ul_slots, 'u', '.'),
-   ul_slots, 'U'),
-   single ? ", single" : "");
+"- Selected UL slots: (TS=0)\"%s\"(TS=7)%s\n",slot_info, 
single ? ", single" : "");
 
slotcount++;
first_ts = ts;
@@ -1000,12 +995,9 @@
ms_->set_reserved_slots(trx,
reserved_ul_slots, reserved_dl_slots);
 
+   ts_format(slot_info, dl_slots, ul_slots);
LOGP(DRLCMAC, LOGL_DEBUG,
-   "- Reserved DL/UL slots: (TS=0)\"%s\"(TS=7)\n",
-   set_flag_chars(set_flag_chars(set_flag_chars(slot_info,
-   dl_slots, 'D', '.'),
-   ul_slots, 'U'),
-   ul_slots & dl_slots, 'C'));
+"- Reserved DL/UL slots: (TS=0)\"%s\"(TS=7)\n", slot_info);
}
 
tbf_->trx = trx;
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index 602e35b..9016eb1 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -6549,7 +6549,7 @@
 - Possible DL/UL slots: (TS=0)"...."(TS=7)
 - Selected DL slots: 

[PATCH] osmo-pcu[master]: Simplify TS alloc: avoid TS reassignment

[Max]

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

Simplify TS alloc: avoid TS reassignment

Assign reserved_*_slots only when multislot masks are found to avoid
reassignment and make code easier to follow.

Change-Id: I9b0482f4ea75ead9855cd78e33c8e70d0ccf4484
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 76a84c7..4ab6543 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -850,8 +850,8 @@
return -EINVAL;
}
 
-   reserved_dl_slots = dl_slots = ms->reserved_dl_slots();
-   reserved_ul_slots = ul_slots = ms->reserved_ul_slots();
+   dl_slots = ms->reserved_dl_slots();
+   ul_slots = ms->reserved_ul_slots();
first_common_ts = ms->first_common_ts();
trx = ms->current_trx();
 
@@ -880,11 +880,11 @@
rc = find_multi_slots(trx, ms, _slots, _slots);
if (rc < 0)
return rc;
-
-   reserved_dl_slots = dl_slots;
-   reserved_ul_slots = ul_slots;
}
 
+   reserved_dl_slots = dl_slots;
+   reserved_ul_slots = ul_slots;
+
/* Step 3: Derive the slot set for the current TBF */
if (single) {
/* Make sure to consider the first common slot only */

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

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

[PATCH] osmo-pcu[master]: Simplify TS alloc: use defines for constants

[Max]

Hello Harald Welte, Jenkins Builder, Holger Freyther,

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

https://gerrit.osmocom.org/3920

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

Simplify TS alloc: use defines for constants

* define and use constant for occupied TFI instead copying the same
  magic number all over the place
* use libosmocore's define for bit pretty-printer

Change-Id: I2699ceebf0cbec01652a02fa68ccc9e9419d0293
Related: OS#2282
---
M src/bts.cpp
M src/bts.h
M src/gprs_rlcmac_ts_alloc.cpp
M tests/alloc/AllocTest.cpp
4 files changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/20/3920/5

diff --git a/src/bts.cpp b/src/bts.cpp
index b768569..6debb68 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -458,7 +458,7 @@
for (trx = trx_from; trx <= trx_to; trx++) {
bool trx_has_pdch = false;
 
-   free_tfis = 0x;
+   free_tfis = NO_FREE_TFI;
 
for (ts = 0; ts < 8; ts++) {
pdch = _bts.trx[trx].pdch[ts];
diff --git a/src/bts.h b/src/bts.h
index d65cd2f..1d13a64 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -44,6 +44,7 @@
 #define LLC_CODEL_DISABLE 0
 #define LLC_CODEL_USE_DEFAULT (-1)
 #define MAX_GPRS_CS 9
+#define NO_FREE_TFI 0x
 
 /* see bts->gsmtap_categ_mask */
 enum pcu_gsmtap_category {
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 57197b2..3b596f4 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -128,7 +128,7 @@
int8_t tfi;
 
tfi_map = pdch->assigned_tfi(dir);
-   if (tfi_map == 0xUL)
+   if (tfi_map == NO_FREE_TFI)
return -1;
 
/* look for USF, don't use USF=7 */
@@ -209,7 +209,7 @@
pdch->num_tbfs(GPRS_RLCMAC_UL_TBF) +
compute_usage_by_reservation(pdch, dir);
 
-   if (pdch->assigned_tfi(reverse(dir)) == 0x)
+   if (pdch->assigned_tfi(reverse(dir)) == NO_FREE_TFI)
/* No TFI in the opposite direction, avoid it */
usage += 32;
 
@@ -340,10 +340,10 @@
if (!pdch->is_enabled())
continue;
 
-   if (pdch->assigned_tfi(GPRS_RLCMAC_UL_TBF) == 
0x)
+   if (pdch->assigned_tfi(GPRS_RLCMAC_UL_TBF) == 
NO_FREE_TFI)
continue;
 
-   if (pdch->assigned_tfi(GPRS_RLCMAC_DL_TBF) == 
0x)
+   if (pdch->assigned_tfi(GPRS_RLCMAC_DL_TBF) == 
NO_FREE_TFI)
continue;
 
return trx_no;
diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp
index a88f477..9bff38a 100644
--- a/tests/alloc/AllocTest.cpp
+++ b/tests/alloc/AllocTest.cpp
@@ -613,17 +613,17 @@
continue;
 
if (ul_tbf &&
-   pdch->assigned_tfi(GPRS_RLCMAC_DL_TBF) != 
0x)
+   pdch->assigned_tfi(GPRS_RLCMAC_DL_TBF) != 
NO_FREE_TFI)
continue;
 
if (dl_tbf &&
-   pdch->assigned_tfi(GPRS_RLCMAC_UL_TBF) != 
0x)
+   pdch->assigned_tfi(GPRS_RLCMAC_UL_TBF) != 
NO_FREE_TFI)
continue;
 
busy_slots |= 1 << i;
}
 
-   printf(" TBF[%d] class %d reserves %c%c%c%c%c%c%c%c\n",
+   printf(" TBF[%d] class %d reserves " OSMO_BIT_SPEC "\n",
tfi, ms_class,
get_dir_char(0x01, ul_slots, dl_slots, busy_slots),
get_dir_char(0x02, ul_slots, dl_slots, busy_slots),

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2699ceebf0cbec01652a02fa68ccc9e9419d0293
Gerrit-PatchSet: 5
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Holger Freyther 
Gerrit-Reviewer: Jenkins Builder

[PATCH] osmo-pcu[master]: Simplify TS alloc: internalize TRX check

[Max]

Hello Neels Hofmeyr, Jenkins Builder,

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

https://gerrit.osmocom.org/3760

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

Simplify TS alloc: internalize TRX check

Move TRX check inside local tfi_find_free() wrapper to make main
algorithm easier to follow.

Change-Id: I02da2b8ba8c9c8815dae0e39e1fed277ca0df171
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
1 file changed, 10 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/60/3760/17

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 4ab6543..57fd27b 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -374,7 +374,7 @@
 /*! Return free TFI
  *
  *  \param[in] bts Pointer to BTS struct
- *  \param[in] trx Pointer to TRX struct
+ *  \param[in] trx Optional pointer to TRX struct
  *  \param[in] ms Pointer to MS object
  *  \param[in] dir DL or UL direction
  *  \param[in] use_trx which TRX to use or -1 if it should be selected based 
on what MS uses
@@ -386,6 +386,15 @@
 {
int tfi;
uint8_t trx_no;
+
+   if (trx) {
+   if (use_trx >= 0 && use_trx != trx->trx_no) {
+   LOGP(DRLCMAC, LOGL_ERROR, "- Requested incompatible TRX 
%d (current is %d)\n",
+use_trx, trx->trx_no);
+   return -EINVAL;
+   }
+   use_trx = trx->trx_no;
+   }
 
if (use_trx == -1 && ms->current_trx())
use_trx = ms->current_trx()->trx_no;
@@ -854,16 +863,6 @@
ul_slots = ms->reserved_ul_slots();
first_common_ts = ms->first_common_ts();
trx = ms->current_trx();
-
-   if (trx) {
-   if (use_trx >= 0 && use_trx != trx->trx_no) {
-   LOGP(DRLCMAC, LOGL_ERROR,
-   "- Requested incompatible TRX %d (current is 
%d)\n",
-   use_trx, trx->trx_no);
-   return -EINVAL;
-   }
-   use_trx = trx->trx_no;
-   }
 
/* Step 2a: Find usable TRX and TFI */
tfi = tfi_find_free(bts->bts, trx, ms, tbf->direction, use_trx, 
_no);

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I02da2b8ba8c9c8815dae0e39e1fed277ca0df171
Gerrit-PatchSet: 17
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Holger Freyther 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

[PATCH] osmo-pcu[master]: Simplify TS alloc: split off RX mask computation

[Max]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/3913

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

Simplify TS alloc: split off RX mask computation

Move computation of RX mask into separate function and document it. This
allows to significantly shrink find_multi_slot() function and overall
improve code readability.

Since the test output requires cosmetic adjustment anyway due to change
in the sequence of log messages, use this opportunity to better group
and format log message.

Change-Id: I731726a096bba7ee97499e5cbe3e7401869d7392
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
M tests/tbf/TbfTest.err
2 files changed, 58 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/13/3913/6

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 2763100..57faebf 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -612,6 +612,56 @@
return (win | win >> 8) & 0xFF;
 }
 
+enum { MASK_TT, MASK_TR };
+
+/*! Fill in RX mask table for a given MS Class
+ *
+ *  \param[in] ms_cl MS Class pointer
+ *  \param[in] num_tx Number of TX slots to consider
+ *  \param[out] rx_mask RX mask table
+ */
+static inline void fill_rx_mask(const struct gprs_ms_multislot_class *ms_cl, 
uint8_t num_tx, uint8_t *rx_mask)
+{
+   static const char *digit[10] = { "0", "1", "2", "3", "4", "5", "6", 
"7", "8", "9" };
+   uint8_t Tta = ms_cl->ta, Ttb = ms_cl->tb, Tra = ms_cl->ra, Trb = 
ms_cl->rb, /* Minimum Number of Slots */
+   Tx = ms_cl->tx, Sum = ms_cl->sum, /* Maximum Number of Slots: 
Tx, Sum = Rx + Tx */
+   Type = ms_cl->type; /* Type of Mobile */
+
+   /* MS_A maps to 0 if frequency hopping is disabled */
+   /* TODO: Set it to 1 if FH is implemented and enabled */
+   if (Ttb == MS_A)
+   Ttb = 0;
+   if (Trb == MS_A)
+   Trb = 0;
+
+   /* MS_A and MS_B are 0 iff FH is disabled and there is no Tx/Rx change.
+* This is never the case with the current implementation, so 1 will 
always be used. */
+   if (Ttb == MS_B)
+   Ttb = 1;
+   if (Trb == MS_C)
+   Trb = 1;
+
+   if (num_tx == 1) /* it's enough to log this once per TX slot set 
iteration */
+   LOGP(DRLCMAC, LOGL_DEBUG, " Rx=%u, Tx=%u, Sum Rx + Tx=%s 
[Tta=%s Ttb=%u] [Tra=%u Trb=%u] Type=%u\n",
+ms_cl->rx, Tx,
+(Sum == MS_NA) ? "N/A" : digit[Sum],
+(Tta == MS_NA) ? "N/A" : digit[Tta], Ttb, Tra, Trb, Type);
+
+   if (ms_cl->type == 1) {
+   rx_mask[MASK_TT] = (0x100 >> OSMO_MAX(Ttb, Tta)) - 1;
+   rx_mask[MASK_TT] &= ~((1 << (Trb + num_tx)) - 1);
+   rx_mask[MASK_TR] = (0x100 >> Ttb) - 1;
+   rx_mask[MASK_TR] &= ~((1 << (OSMO_MAX(Trb, Tra) + num_tx)) - 1);
+   } else {
+   /* Class type 2 MS have independant RX and TX */
+   rx_mask[MASK_TT] = 0xff;
+   rx_mask[MASK_TR] = 0xff;
+   }
+
+   rx_mask[MASK_TT] = (rx_mask[MASK_TT] << 3) | (rx_mask[MASK_TT] >> 5);
+   rx_mask[MASK_TR] = (rx_mask[MASK_TR] << 3) | (rx_mask[MASK_TR] >> 5);
+}
+
 /*! Find set of slots available for allocation while taking MS class into 
account
  *
  *  \param[in] trx Pointer to TRX object
@@ -623,17 +673,12 @@
 static int find_multi_slots(const struct gprs_rlcmac_trx *trx, const GprsMs 
*ms, uint8_t *ul_slots, uint8_t *dl_slots)
 {
const struct gprs_ms_multislot_class *ms_class;
-   uint8_t Tx, Sum;/* Maximum Number of Slots: RX, Tx, Sum Rx+Tx */
-   uint8_t Tta, Ttb, Tra, Trb; /* Minimum Number of Slots */
-   uint8_t Type; /* Type of Mobile */
uint8_t max_slots, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts;
int16_t rx_window, tx_window;
-   static const char *digit[10] = { 
"0","1","2","3","4","5","6","7","8","9" };
char slot_info[9] = {0};
-   int max_capacity;
-   uint8_t max_ul_slots;
-   uint8_t max_dl_slots;
-   enum {MASK_TT, MASK_TR};
+   int max_capacity = -1;
+   uint8_t max_ul_slots = 0;
+   uint8_t max_dl_slots = 0;
 
if (ms->ms_class() >= 32) {
LOGP(DRLCMAC, LOGL_ERROR, "Multislot class %d out of range.\n",
@@ -657,34 +702,6 @@
return -EINVAL;
}
 
-   Tx = ms_class->tx;
-   Sum = ms_class->sum;
-   Tta = ms_class->ta;
-   Ttb = ms_class->tb;
-   Tra = ms_class->ra;
-   Trb = ms_class->rb;
-   Type = ms_class->type;
-
-   /* MS_A maps to 0 if frequency hopping is disabled */
-   /* TODO: Set it to 1 if FH is implemented and enabled */
-   if (Ttb == MS_A)
-   Ttb = 0;
-   if (Trb == MS_A)
-   Trb = 0;
-
-   /* MS_A and MS_B are 0 iff FH is disabled and there is no Tx/Rx change.
-* This is never the case with the current implementation, so 

[PATCH] osmo-pcu[master]: Simplify TS alloc: improve readability

[Max]

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

Simplify TS alloc: improve readability

* consistently format log messages to make it possible to grep for test
  output in source code
* remove dead code

Change-Id: I31600462e48d945bc8b7abf86a3718ac83e1dcbb
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
1 file changed, 12 insertions(+), 29 deletions(-)


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

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 57faebf..190f18d 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -250,8 +250,7 @@
tfi = find_free_tfi(pdch, dir);
if (tfi < 0) {
LOGP(DRLCMAC, LOGL_DEBUG,
-   "- Skipping TS %d, because "
-   "no TFI available\n", ts);
+"- Skipping TS %d, because no TFI 
available\n", ts);
continue;
}
}
@@ -260,25 +259,22 @@
usf = find_free_usf(pdch);
if (usf < 0) {
LOGP(DRLCMAC, LOGL_DEBUG,
-   "- Skipping TS %d, because "
-   "no USF available\n", ts);
+"- Skipping TS %d, because no USF 
available\n", ts);
continue;
}
}
if (min_ts >= 0)
LOGP(DRLCMAC, LOGL_DEBUG,
-   "- Skipping TS %d, because "
-   "num TBFs %d > %d\n",
-   min_ts, min_used, num_tbfs);
+"- Skipping TS %d, because num TBFs %d > 
%d\n",
+min_ts, min_used, num_tbfs);
min_used = num_tbfs;
min_ts = ts;
min_tfi = tfi;
min_usf = usf;
} else {
LOGP(DRLCMAC, LOGL_DEBUG,
-   "- Skipping TS %d, because "
-   "num TBFs %d >= %d\n",
-   ts, num_tbfs, min_used);
+"- Skipping TS %d, because num TBFs %d >= %d\n",
+ts, num_tbfs, min_used);
}
}
 
@@ -688,17 +684,17 @@
 
if (ms->ms_class()) {
ms_class = _ms_multislot_class[ms->ms_class()];
-   LOGP(DRLCMAC, LOGL_DEBUG, "Slot Allocation (Algorithm B) for "
-   "class %d\n", ms->ms_class());
+   LOGP(DRLCMAC, LOGL_DEBUG,
+"Slot Allocation (Algorithm B) for class %d\n", 
ms->ms_class());
} else {
ms_class = _ms_multislot_class[12];
-   LOGP(DRLCMAC, LOGL_DEBUG, "Slot Allocation (Algorithm B) for "
-   "unknown class (assuming 12)\n");
+   LOGP(DRLCMAC, LOGL_DEBUG,
+"Slot Allocation (Algorithm B) for unknown class (assuming 
12)\n");
}
 
if (ms_class->tx == MS_NA) {
-   LOGP(DRLCMAC, LOGL_NOTICE, "Multislot class %d not "
-   "applicable.\n", ms->ms_class());
+   LOGP(DRLCMAC, LOGL_NOTICE,
+"Multislot class %d not applicable.\n", ms->ms_class());
return -EINVAL;
}
 
@@ -777,19 +773,6 @@
 
/* Compute capacity */
capacity = compute_capacity(trx, rx_window, tx_window);
-
-#ifdef ENABLE_TS_ALLOC_DEBUG
-   LOGP(DRLCMAC, LOGL_DEBUG,
-   "- Considering DL/UL slots: (TS=0)\"%s\"(TS=7), "
-   "capacity = %d\n",
-   
set_flag_chars(set_flag_chars(set_flag_chars(set_flag_chars(
-   slot_info,
-   rx_bad, 'x', '.'),
-   rx_window, 'D'),
-   tx_window, 'U'),
-   rx_window & tx_window, 'C'),
-   capacity);
-#endif
 
if (capacity <= max_capacity)
continue;

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

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

[PATCH] osmo-pcu[master]: Simplify TS alloc: move slot assignment

[Max]

Hello Harald Welte, Jenkins Builder, Holger Freyther,

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

https://gerrit.osmocom.org/3905

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

Simplify TS alloc: move slot assignment

Move into separate functions:
* move timeslot reservation
* move UL timeslot assignment
* move DL timeslot assignment

Change-Id: I64cf78c5cfc78664766f9769dd5cde632dab92b0
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
1 file changed, 74 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/3905/8

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 1bde088..99ce4c5 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -819,6 +819,75 @@
return 0;
 }
 
+/*! Update MS' reserved timeslots
+ *
+ *  \param[in,out] trx Pointer to TRX struct
+ *  \param[in,out] ms_ Pointer to MS object
+ *  \param[in] tbf_ Pointer to TBF struct
+ *  \param[in] res_ul_slots Newly reserved UL slots
+ *  \param[in] res_dl_slots Newly reserved DL slots
+ *  \param[in] ul_slots available UL slots (for logging only)
+ *  \param[in] dl_slots available DL slots (for logging only)
+ */
+static void update_ms_reserved_slots(gprs_rlcmac_trx *trx, GprsMs *ms, uint8_t 
res_ul_slots, uint8_t res_dl_slots,
+uint8_t ul_slots, uint8_t dl_slots)
+{
+   char slot_info[9] = { 0 };
+
+   if (res_ul_slots == ms->reserved_ul_slots() && res_dl_slots == 
ms->reserved_dl_slots())
+   return;
+
+   /* The reserved slots have changed, update the MS */
+   ms->set_reserved_slots(trx, res_ul_slots, res_dl_slots);
+
+   ts_format(slot_info, dl_slots, ul_slots);
+   LOGP(DRLCMAC, LOGL_DEBUG, "- Reserved DL/UL slots: 
(TS=0)\"%s\"(TS=7)\n", slot_info);
+}
+
+/*! Assign given UL timeslots to UL TBF
+ *
+ *  \param[in,out] ul_tbf Pointer to UL TBF struct
+ *  \param[in,out] trx Pointer to TRX object
+ *  \param[in] ul_slots Set of slots to be assigned
+ *  \param[in] tfi selected TFI
+ *  \param[in] usf selected USF
+ */
+static void assign_ul_tbf_slots(struct gprs_rlcmac_ul_tbf *ul_tbf, 
gprs_rlcmac_trx *trx, uint8_t ul_slots, int tfi,
+   int *usf)
+{
+   uint8_t ts;
+
+   for (ts = 0; ts < 8; ts++) {
+   if (!(ul_slots & (1 << ts)))
+   continue;
+
+   OSMO_ASSERT(usf[ts] >= 0);
+
+   LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning UL TS %u\n", ts);
+   assign_uplink_tbf_usf(>pdch[ts], ul_tbf, tfi, usf[ts]);
+   }
+}
+
+/*! Assign given DL timeslots to DL TBF
+ *
+ *  \param[in,out] dl_tbf Pointer to DL TBF struct
+ *  \param[in,out] trx Pointer to TRX object
+ *  \param[in] ul_slots Set of slots to be assigned
+ *  \param[in] tfi selected TFI
+ */
+static void assign_dl_tbf_slots(struct gprs_rlcmac_dl_tbf *dl_tbf, 
gprs_rlcmac_trx *trx, uint8_t dl_slots, int tfi)
+{
+   uint8_t ts;
+
+   for (ts = 0; ts < 8; ts++) {
+   if (!(dl_slots & (1 << ts)))
+   continue;
+
+   LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning DL TS %u\n", ts);
+   assign_dlink_tbf(>pdch[ts], dl_tbf, tfi);
+   }
+}
+
 /*! Slot Allocation: Algorithm B
  *
  * Assign as many downlink slots as possible.
@@ -988,47 +1057,16 @@
 
/* Step 4: Update MS and TBF and really allocate the resources */
 
-   /* The reserved slots have changed, update the MS */
-   if (reserved_ul_slots != ms->reserved_ul_slots() ||
-   reserved_dl_slots != ms->reserved_dl_slots())
-   {
-   ms_->set_reserved_slots(trx,
-   reserved_ul_slots, reserved_dl_slots);
-
-   ts_format(slot_info, dl_slots, ul_slots);
-   LOGP(DRLCMAC, LOGL_DEBUG,
-"- Reserved DL/UL slots: (TS=0)\"%s\"(TS=7)\n", slot_info);
-   }
+   update_ms_reserved_slots(trx, ms_, reserved_ul_slots, 
reserved_dl_slots, ul_slots, dl_slots);
 
tbf_->trx = trx;
tbf_->first_common_ts = first_common_ts;
tbf_->first_ts = first_ts;
 
-   if (tbf->direction == GPRS_RLCMAC_DL_TBF) {
-   struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf_);
-   for (ts = 0; ts < 8; ts++) {
-   if (!(dl_slots & (1 << ts)))
-   continue;
-
-   LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning DL TS "
-   "%d\n", ts);
-   assign_dlink_tbf(>pdch[ts], dl_tbf, tfi);
-   }
-   } else {
-   struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf_);
-
-   for (ts = 0; ts < 8; ts++) {
-   if (!(ul_slots & (1 << ts)))
-   continue;
-
-   OSMO_ASSERT(usf[ts] >= 0);
-
-   LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning UL TS "
-   "%d\n", 

[PATCH] osmo-ci[master]: Use new GPRS repositories

[Max]

Hello André Boddenberg,

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

https://gerrit.osmocom.org/4056

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

Use new GPRS repositories

* use coverity check on osmo-ggsn instead of openggsn
* move osmo-sgsn and osmo-ggsn from nightly-split into nightly

Change-Id: Ia49969cbfb9ef57b635a3b5759f411f71a54f8e1
---
M coverity/build_Osmocom.sh
M coverity/prepare_source_Osmcocom.sh
M scripts/osmocom-nightly-nitb-split.sh
M scripts/osmocom-nightly-packages.sh
4 files changed, 6 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/4056/3

diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh
index 58a74f2..bccd7ea 100755
--- a/coverity/build_Osmocom.sh
+++ b/coverity/build_Osmocom.sh
@@ -69,8 +69,8 @@
popd
 }
 
-build_openggsn() {
-   pushd openggsn
+build_osmoggsn() {
+   pushd osmo-ggsn
do_build
popd
 }
@@ -155,7 +155,7 @@
 build_libosmonetif
 build_libosmosccp
 build_libsmpp34
-build_openggsn
+build_osmoggsn
 #IU build_osmoiuh
 build_osmopcu
 build_osmobts
diff --git a/coverity/prepare_source_Osmcocom.sh 
b/coverity/prepare_source_Osmcocom.sh
index 6d226b2..386e16e 100755
--- a/coverity/prepare_source_Osmcocom.sh
+++ b/coverity/prepare_source_Osmcocom.sh
@@ -13,7 +13,7 @@
   libosmo-sccp \
   libsmpp34 \
   openbsc \
-  openggsn \
+  osmo-ggsn \
   osmo-bts \
   osmo-gmr \
   osmo-iuh \
diff --git a/scripts/osmocom-nightly-nitb-split.sh 
b/scripts/osmocom-nightly-nitb-split.sh
index 3b547bf..4484214 100755
--- a/scripts/osmocom-nightly-nitb-split.sh
+++ b/scripts/osmocom-nightly-nitb-split.sh
@@ -90,11 +90,9 @@
   checkout libasn1c
   checkout osmo-iuh
   checkout osmo-hlr
-  checkout osmo-ggsn
   checkout osmo-mgw
   checkout osmo-bsc
   checkout osmo-msc
-  checkout osmo-sgsn
 
   build libosmocore
   build libosmo-abis
@@ -104,11 +102,9 @@
   build libasn1c
   build osmo-iuh
   build osmo-hlr
-  build osmo-ggsn
   build osmo-mgw
   build osmo-bsc
   build osmo-msc
-  build osmo-sgsn
 
   post
 }
diff --git a/scripts/osmocom-nightly-packages.sh 
b/scripts/osmocom-nightly-packages.sh
index 84cf6e4..032bd49 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -14,7 +14,7 @@
 git clone git://git.osmocom.org/libosmo-abis
 git clone git://git.osmocom.org/libosmo-netif
 git clone git://git.osmocom.org/libsmpp34
-git clone git://git.osmocom.org/openggsn
+git clone git://git.osmocom.org/osmo-sgsn
 git clone git://git.osmocom.org/osmo-ggsn
 git clone git://git.osmocom.org/openbsc
 git clone git://git.osmocom.org/osmo-pcap
@@ -51,7 +51,7 @@
 build libosmo-abis
 build libosmo-netif
 build libsmpp34
-build openggsn
+build osmo-sgsn
 build osmo-ggsn
 build openbsc
 build osmo-pcap

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia49969cbfb9ef57b635a3b5759f411f71a54f8e1
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: André Boddenberg 
Gerrit-Reviewer: blobb 
Gerrit-Reviewer: lynxis lazus 

[ABANDON] openbsc[master]: SGSN: log IMSI on PDP context creation/deletion

[Max]

Max has abandoned this change.

Change subject: SGSN: log IMSI on PDP context creation/deletion
..


Abandoned

Superseded by #4073.

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I5ada9f85af2098f9acc8a277b9026eed226b9ac2
Gerrit-PatchSet: 3
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 

[MERGED] osmo-sgsn[master]: jenkins: use osmo-ggsn for tests

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: jenkins: use osmo-ggsn for tests
..


jenkins: use osmo-ggsn for tests

Change-Id: I62b29b5531bfb9895318254c41a4e24ba1078fbf
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 2882989..07173cc 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -27,7 +27,7 @@
 osmo-build-dep.sh libosmo-abis
 osmo-build-dep.sh libosmo-netif
 osmo-build-dep.sh libosmo-sccp
-osmo-build-dep.sh openggsn
+osmo-build-dep.sh osmo-ggsn
 
 if [ "x$IU" = "x--enable-iu" ]; then
osmo-build-dep.sh libasn1c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62b29b5531bfb9895318254c41a4e24ba1078fbf
Gerrit-PatchSet: 1
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

osmo-sgsn[master]: jenkins: use osmo-ggsn for tests

[Neels Hofmeyr]

Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I62b29b5531bfb9895318254c41a4e24ba1078fbf
Gerrit-PatchSet: 1
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] osmo-sgsn[master]: jenkins: use osmo-ggsn for tests

[Max]

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

jenkins: use osmo-ggsn for tests

Change-Id: I62b29b5531bfb9895318254c41a4e24ba1078fbf
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/80/4080/1

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 2882989..07173cc 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -27,7 +27,7 @@
 osmo-build-dep.sh libosmo-abis
 osmo-build-dep.sh libosmo-netif
 osmo-build-dep.sh libosmo-sccp
-osmo-build-dep.sh openggsn
+osmo-build-dep.sh osmo-ggsn
 
 if [ "x$IU" = "x--enable-iu" ]; then
osmo-build-dep.sh libasn1c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62b29b5531bfb9895318254c41a4e24ba1078fbf
Gerrit-PatchSet: 1
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Max 

[PATCH] osmo-sgsn[master]: jenkins.sh: fix echo string to say osmo-sgsn, not msc

[Neels Hofmeyr]

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

jenkins.sh: fix echo string to say osmo-sgsn, not msc

Change-Id: I3e9a1503de55e939179c032c17df53d27b51
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/79/4079/1

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 2882989..9cf7575 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -39,7 +39,7 @@
 echo
 echo
 echo
-echo " === osmo-msc 
==="
+echo " === osmo-sgsn 
==="
 echo
 set -x
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e9a1503de55e939179c032c17df53d27b51
Gerrit-PatchSet: 1
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

libosmocore[master]: IPA msgb: on ipa_msg_alloc(), set caller as talloc string

[Max]

Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic67ca94b27a4f36ba1bf655b4cd1c7e78fd06ab8
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max 
Gerrit-HasComments: No

osmo-ggsn[master]: contrib: osmo-ggsn.service: Use expected suffix for cfg file

[Max]

Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I361c67809d095dd08b0f400de2a6f84f981411c5
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max 
Gerrit-HasComments: No