Change in libosmocore[master]: vty: enable optional-multi-choice syntax: ([one]|[two])

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12769


Change subject: vty: enable optional-multi-choice syntax: ([one]|[two])
..

vty: enable optional-multi-choice syntax: ([one]|[two])

Add basic optional multi-choice argument support.

The VTY detects optional arguments by square braces.

 > cmd ?
 [optional-arg]
 > cmd optional-arg
 ok
 > cmd
 ok

However, within multi-choice args, these braces were so far not treated as
optional:

 > list
 cmd2 ([one]|[two]|[three])
 > cmd2
 % Command incomplete

In preparation for I952b3c00f97e2447f2308b0ec6f5f1714692b5b2 which will enable
the more obvious syntax of

  cmd [(one|two)]

for reasons of internal implementation, first support a syntax of

  cmd ([one]|[two])

The internal vty implementation always needs square braces around each option.
There is currently no good way to prevent developers from defining braces
inside multi-arguments, so it is easiest to allow and handle them:

 > list
 cmd2 ([one]|[two]|[three])
 > cmd2
 ok

The VTY doesn't guard against a mix like

 cmd (one|[two])

With this patch, a multi-choice command is treated as optional iff the first
element is in square brackets. The remaining elements' square brackets have no
effect besides confusing the user. This is not explicitly checked against.

In general, I would prefer to check all of these details, but the current VTY
code with its endless code duplication and obscure string mangling just doesn't
provide that luxury. There are numerous worse errors hidden in there.

Change-Id: I9a8474bd89ddc2155c58bfca7bd038d586aaa60a
---
M src/vty/command.c
M tests/vty/vty_transcript_test.vty
2 files changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/12769/1

diff --git a/src/vty/command.c b/src/vty/command.c
index a540cd5..9d02d69 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -467,7 +467,7 @@

for (i = 0; i < vector_active(strvec); i++)
if ((descvec = vector_slot(strvec, i)) != NULL) {
-   if ((vector_active(descvec)) == 1
+   if ((vector_active(descvec)) >= 1
&& (desc = vector_slot(descvec, 0)) != NULL) {
if (desc->cmd == NULL || CMD_OPTION(desc->cmd))
return size;
diff --git a/tests/vty/vty_transcript_test.vty 
b/tests/vty/vty_transcript_test.vty
index 1ae7c0d..514a5ed 100644
--- a/tests/vty/vty_transcript_test.vty
+++ b/tests/vty/vty_transcript_test.vty
@@ -47,7 +47,7 @@
 ok argc=1 th

 vty_transcript_test> multi1
-% Command incomplete.
+ok argc=0

 vty_transcript_test> multi1 [one]
 % Unknown command.

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

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

Change in libosmocore[master]: vty: enable tab-completion for optional-multi-choice args

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12771


Change subject: vty: enable tab-completion for optional-multi-choice args
..

vty: enable tab-completion for optional-multi-choice args

In cmd_complete_command_real(), detect and strip square braces from
multi-choice arguments, to enable tab-completion for commands like

 > list
 cmd [(alpha|beta)]
 > cmd 
 alpha beta
 > cmd be
 > cmd beta

Change-Id: I8c304300b3633bb6e9b3457fcfa42121c8272ac0
---
M src/vty/command.c
1 file changed, 10 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12771/1

diff --git a/src/vty/command.c b/src/vty/command.c
index 2242e76..de084ab 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -2010,9 +2010,18 @@
descvec = vector_slot(strvec, index);
for (j = 0; j < vector_active(descvec); j++)
if ((desc = vector_slot(descvec, j))) {
-   if ((string = 
cmd_entry_function(vector_slot(vline, index), desc->cmd)))
+   const char *cmd = desc->cmd;
+   char *tmp = NULL;
+
+   if (CMD_OPTION(desc->cmd)) {
+   tmp = 
cmd_deopt(tall_vty_cmd_ctx, desc->cmd);
+   cmd = tmp;
+   }
+   if ((string = 
cmd_entry_function(vector_slot(vline, index), cmd)))
if (cmd_unique_string 
(matchvec, string))
vector_set 
(matchvec, talloc_strdup(tall_vty_cmd_ctx, string));
+   if (tmp)
+   talloc_free(tmp);
}
}
}

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

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

Change in libosmocore[master]: doxygen: add source files as dependencies

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12775


Change subject: doxygen: add source files as dependencies
..

doxygen: add source files as dependencies

So far, when modifying a source file, the doxygen docs were not regenerated
automatically. It required a manual 'rm -rf docs/core' or similar. Make it
rebuild automatically:

Add each library's source files to the list of dependencies for the first-pass
doxygen build.

Attention, since all libraries depend on the .map files of each other library,
and each library depends on its own source files, that means that a single
touch on one .c file anywhere will result in rebuilding the entire doxygen
docs. It is correct to do so, since any file may introduce \ref targets used
anywhere else. If you don't want that, --disable-doxygen.

Change-Id: I15ea96be6e7abe91264b91f0b06963a0f2d63b0b
---
M Makefile.am
1 file changed, 25 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/12775/1

diff --git a/Makefile.am b/Makefile.am
index ca01d10..07fd666 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,43 +51,61 @@
 # circular dependency: we would rebuild all every time 'make' is invoked.
 # The .prep file also depends on all the source files for that library.

-$(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core
+$(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core \
+   $(top_srcdir)/include/osmocom/core/*.h \
+   $(top_srcdir)/src/*.c \
+   $(top_srcdir)/src/pseudotalloc/*.[hc] \
+   $(top_builddir)/src/crc*.c
rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core
rm -rf $(top_builddir)/doc/libosmocore.map
-$(DOXYGEN) $(top_builddir)/Doxyfile.core
touch "$@"

-$(top_builddir)/doc/libosmogsm.tag.prep: $(top_builddir)/Doxyfile.gsm
+$(top_builddir)/doc/libosmogsm.tag.prep: $(top_builddir)/Doxyfile.gsm \
+   $(top_srcdir)/include/osmocom/gsm/*.h \
+   $(top_srcdir)/include/osmocom/gsm/protocol/*.h \
+   $(top_srcdir)/include/osmocom/crypt/*.h \
+   $(top_srcdir)/src/gsm/*.c
rm -rf $(top_builddir)/doc/gsm; mkdir -p $(top_builddir)/doc/gsm
rm -rf $(top_builddir)/doc/libosmogsm.map
-$(DOXYGEN) $(top_builddir)/Doxyfile.gsm
touch "$@"

-$(top_builddir)/doc/libosmovty.tag.prep: $(top_builddir)/Doxyfile.vty
+$(top_builddir)/doc/libosmovty.tag.prep: $(top_builddir)/Doxyfile.vty \
+   $(top_srcdir)/include/osmocom/vty/*.h \
+   $(top_srcdir)/src/vty/*.c
rm -rf $(top_builddir)/doc/vty; mkdir -p $(top_builddir)/doc/vty
rm -rf $(top_builddir)/doc/libosmovty.map
-$(DOXYGEN) $(top_builddir)/Doxyfile.vty
touch "$@"

-$(top_builddir)/doc/libosmocodec.tag.prep: $(top_builddir)/Doxyfile.codec
+$(top_builddir)/doc/libosmocodec.tag.prep: $(top_builddir)/Doxyfile.codec \
+   $(top_srcdir)/include/osmocom/codec/*.h \
+   $(top_srcdir)/src/codec/*.c
rm -rf $(top_builddir)/doc/codec; mkdir -p $(top_builddir)/doc/codec
rm -rf $(top_builddir)/doc/libosmocodec.map
-$(DOXYGEN) $(top_builddir)/Doxyfile.codec
touch "$@"

-$(top_builddir)/doc/libosmocoding.tag.prep: $(top_builddir)/Doxyfile.coding
+$(top_builddir)/doc/libosmocoding.tag.prep: $(top_builddir)/Doxyfile.coding \
+   $(top_srcdir)/include/osmocom/coding/*.h \
+   $(top_srcdir)/src/coding/*.c
rm -rf $(top_builddir)/doc/coding; mkdir -p $(top_builddir)/doc/coding
rm -rf $(top_builddir)/doc/libosmocoding.map
-$(DOXYGEN) $(top_builddir)/Doxyfile.coding
touch "$@"

-$(top_builddir)/doc/libosmoctrl.tag.prep: $(top_builddir)/Doxyfile.ctrl
+$(top_builddir)/doc/libosmoctrl.tag.prep: $(top_builddir)/Doxyfile.ctrl \
+   $(top_srcdir)/include/osmocom/ctrl/*.h \
+   $(top_srcdir)/src/ctrl/*.c
rm -rf $(top_builddir)/doc/ctrl; mkdir -p $(top_builddir)/doc/ctrl
rm -rf $(top_builddir)/doc/libosmoctrl.map
-$(DOXYGEN) $(top_builddir)/Doxyfile.ctrl
touch "$@"

-$(top_builddir)/doc/libosmogb.tag.prep: $(top_builddir)/Doxyfile.gb
+$(top_builddir)/doc/libosmogb.tag.prep: $(top_builddir)/Doxyfile.gb \
+   $(top_srcdir)/include/osmocom/gprs/*.h \
+   $(top_srcdir)/src/gb/*.[hc]
rm -rf $(top_builddir)/doc/gb; mkdir -p $(top_builddir)/doc/gb
rm -rf $(top_builddir)/doc/libosmogb.map
-$(DOXYGEN) $(top_builddir)/Doxyfile.gb

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15ea96be6e7abe91264b91f0b06963a0f2d63b0b
Gerrit-Change-Number: 12775

Change in libosmocore[master]: vty api: add vty_out_va()

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12773


Change subject: vty api: add vty_out_va()
..

vty api: add vty_out_va()

Provide a va_list type vty_out() variant, to be able to pass on variable
arguments from other function signatures to vty_out().

This will be used by Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 for osmo_tdef.

Change-Id: Ie6e6f11a6b794f3cb686350c1ed678e4d575
---
M include/osmocom/vty/vty.h
M src/vty/vty.c
2 files changed, 20 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/12773/1

diff --git a/include/osmocom/vty/vty.h b/include/osmocom/vty/vty.h
index c4cf707..8d2e1b3 100644
--- a/include/osmocom/vty/vty.h
+++ b/include/osmocom/vty/vty.h
@@ -193,6 +193,7 @@
 struct vty *vty_new (void);
 struct vty *vty_create (int vty_sock, void *priv);
 int vty_out (struct vty *, const char *, ...) VTY_PRINTF_ATTRIBUTE(2, 3);
+int vty_out_va(struct vty *vty, const char *format, va_list ap);
 int vty_out_newline(struct vty *);
 int vty_read(struct vty *vty);
 //void vty_time_print (struct vty *, int);
diff --git a/src/vty/vty.c b/src/vty/vty.c
index 8c89197..98b332d 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -249,26 +249,19 @@
return vty->type == VTY_SHELL ? 1 : 0;
 }

-
-/*! VTY standard output function
- *  \param[in] vty VTY to which we should print
- *  \param[in] format variable-length format string
- */
-int vty_out(struct vty *vty, const char *format, ...)
+int vty_out_va(struct vty *vty, const char *format, va_list ap)
 {
-   va_list args;
int len = 0;
int size = 1024;
char buf[1024];
char *p = NULL;

if (vty_shell(vty)) {
-   va_start(args, format);
-   vprintf(format, args);
-   va_end(args);
+   vprintf(format, ap);
} else {
+   va_list args;
/* Try to write to initial buffer.  */
-   va_start(args, format);
+   va_copy(args, ap);
len = vsnprintf(buf, sizeof buf, format, args);
va_end(args);

@@ -284,7 +277,7 @@
if (!p)
return -1;

-   va_start(args, format);
+   va_copy(args, ap);
len = vsnprintf(p, size, format, args);
va_end(args);

@@ -310,6 +303,20 @@
return len;
 }

+/*! VTY standard output function
+ *  \param[in] vty VTY to which we should print
+ *  \param[in] format variable-length format string
+ */
+int vty_out(struct vty *vty, const char *format, ...)
+{
+   va_list args;
+   int rc;
+   va_start(args, format);
+   rc = vty_out_va(vty, format, args);
+   va_end(args);
+   return rc;
+}
+
 /*! print a newline on the given VTY */
 int vty_out_newline(struct vty *vty)
 {

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

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

Change in libosmocore[master]: doxygen: allow manual 'make apidoc' even if --disable-doxygen

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12776


Change subject: doxygen: allow manual 'make apidoc' even if --disable-doxygen
..

doxygen: allow manual 'make apidoc' even if --disable-doxygen

Even if ./configure --disable-doxygen was passed and doxygen builds are by
default skipped, provide a manual 'make apidoc' target that nevertheless
generates the API doc on the premise that a 'doxygen' program is available.

Especially since we do a two-pass doxygen build whenever any source file
changes, my guess is --disable-doxygen could be a common choice. It is then
cumbersome to have to ./configure just to get one doxygen build started.

Change-Id: If8d8dfb8365c8f28612b8ce2b8ddf88f74df9a90
---
M Makefile.am
1 file changed, 17 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/12776/1

diff --git a/Makefile.am b/Makefile.am
index 07fd666..ee3ad2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,19 +24,27 @@

 EXTRA_DIST = git-version-gen .version README.md osmo-release.mk osmo-release.sh

-if HAVE_DOXYGEN
+HTML = \
+   $(top_builddir)/doc/core/html/index.html \
+   $(top_builddir)/doc/gsm/html/index.html \
+   $(top_builddir)/doc/vty/html/index.html \
+   $(top_builddir)/doc/codec/html/index.html \
+   $(top_builddir)/doc/coding/html/index.html \
+   $(top_builddir)/doc/ctrl/html/index.html \
+   $(top_builddir)/doc/gb/html/index.html

+if HAVE_DOXYGEN
 html_DATA = $(top_builddir)/doc/html.tar

 doc: $(html_DATA)

-$(html_DATA): $(top_builddir)/doc/core/html/index.html \
- $(top_builddir)/doc/gsm/html/index.html \
- $(top_builddir)/doc/vty/html/index.html \
- $(top_builddir)/doc/codec/html/index.html \
- $(top_builddir)/doc/coding/html/index.html \
- $(top_builddir)/doc/ctrl/html/index.html \
- $(top_builddir)/doc/gb/html/index.html
+$(html_DATA): apidoc
+else
+DOXYGEN=doxygen
+endif
+
+.PHONY: apidoc
+apidoc: $(HTML)
cd $(top_builddir)/doc && tar cf html.tar */html

 # Support doxygen cross references from each library to each other library:
@@ -193,6 +201,7 @@
rm -rf $(top_builddir)/doc/gb; mkdir -p $(top_builddir)/doc/gb
$(DOXYGEN) Doxyfile.gb

+if HAVE_DOXYGEN
 install-data-hook:
cd $(DESTDIR)$(htmldir) && tar xf html.tar && rm -f html.tar


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

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

Change in libosmocore[master]: doxygen: enable cross referencing everywhere

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12774


Change subject: doxygen: enable cross referencing everywhere
..

doxygen: enable cross referencing everywhere

doxygen \ref cross-references to groups or files from other libraries only work
when the .map file was present when the HTML was generated, and when that .map
file was listed in TAGFILES in the Doxyfile.

- Makefile.am: introduce a two-pass build for doxygen API docs.
  - First build pass makes sure the .tag files are present.
  - Second build pass picks up all the references, hence generates hyperlinks
properly.
- Add all libraries to TAGFILES of all other libraries, so we can from now on
  freely criss-cross reference from everywhere to everywhere.
- Add all libraries' tag files as dependencies for all others.

Example: in upcoming tdef.h, I would like to cross reference to tdef_vty.h, and
vice versa, even though they are in libosmocore and libosmovty, respectively.
This is now possible.

We may still need to fix some problems with naming collisions, see for example
stats.h, which exists twice with identical doxygen handle (different source
dirs seems to not suffice for doxygen).

Change-Id: Ib03d0b70d536c8f1386def666c89106a840f7363
---
M Doxyfile.codec.in
M Doxyfile.coding.in
M Doxyfile.core.in
M Doxyfile.ctrl.in
M Doxyfile.gb.in
M Doxyfile.gsm.in
M Doxyfile.vty.in
M Makefile.am
8 files changed, 129 insertions(+), 27 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/12774/1

diff --git a/Doxyfile.codec.in b/Doxyfile.codec.in
index 037ef7a..307e3e1 100644
--- a/Doxyfile.codec.in
+++ b/Doxyfile.codec.in
@@ -1485,7 +1485,7 @@
 # If a tag file is not located in the directory in which doxygen
 # is run, you must also specify the path to the tagfile here.

-TAGFILES   = doc/libosmocore.tag=../../core/html
+TAGFILES = doc/libosmocore.tag=../../core/html 
doc/libosmogsm.tag=../../gsm/html doc/libosmovty.tag=../../vty/html 
doc/libosmocoding.tag=../../coding/html doc/libosmoctrl.tag=../../ctrl/html 
doc/libosmogb.tag=../../gb/html

 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
diff --git a/Doxyfile.coding.in b/Doxyfile.coding.in
index 43c4f82..d0e9942 100644
--- a/Doxyfile.coding.in
+++ b/Doxyfile.coding.in
@@ -1485,7 +1485,7 @@
 # If a tag file is not located in the directory in which doxygen
 # is run, you must also specify the path to the tagfile here.

-TAGFILES   = doc/libosmocore.tag=../../core/html
+TAGFILES = doc/libosmocore.tag=../../core/html 
doc/libosmogsm.tag=../../gsm/html doc/libosmovty.tag=../../vty/html 
doc/libosmocodec.tag=../../codec/html doc/libosmoctrl.tag=../../ctrl/html 
doc/libosmogb.tag=../../gb/html

 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
diff --git a/Doxyfile.core.in b/Doxyfile.core.in
index 7a3cce5..f83205a 100644
--- a/Doxyfile.core.in
+++ b/Doxyfile.core.in
@@ -1485,7 +1485,7 @@
 # If a tag file is not located in the directory in which doxygen
 # is run, you must also specify the path to the tagfile here.

-TAGFILES   =
+TAGFILES = doc/libosmogsm.tag=../../gsm/html doc/libosmovty.tag=../../vty/html 
doc/libosmocodec.tag=../../codec/html doc/libosmocoding.tag=../../coding/html 
doc/libosmoctrl.tag=../../ctrl/html doc/libosmogb.tag=../../gb/html

 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
diff --git a/Doxyfile.ctrl.in b/Doxyfile.ctrl.in
index eb363bb..5612a74 100644
--- a/Doxyfile.ctrl.in
+++ b/Doxyfile.ctrl.in
@@ -1485,7 +1485,7 @@
 # If a tag file is not located in the directory in which doxygen
 # is run, you must also specify the path to the tagfile here.

-TAGFILES   = doc/libosmocore.tag=../../core/html
+TAGFILES = doc/libosmocore.tag=../../core/html 
doc/libosmogsm.tag=../../gsm/html doc/libosmovty.tag=../../vty/html 
doc/libosmocodec.tag=../../codec/html doc/libosmocoding.tag=../../coding/html 
doc/libosmogb.tag=../../gb/html

 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
diff --git a/Doxyfile.gb.in b/Doxyfile.gb.in
index e6b7826..b3b2128 100644
--- a/Doxyfile.gb.in
+++ b/Doxyfile.gb.in
@@ -1485,7 +1485,7 @@
 # If a tag file is not located in the directory in which doxygen
 # is run, you must also specify the path to the tagfile here.

-TAGFILES   = doc/libosmocore.tag=../../core/html
+TAGFILES = doc/libosmocore.tag=../../core/html 
doc/libosmogsm.tag=../../gsm/html doc/libosmovty.tag=../../vty/html 
doc/libosmocodec.tag=../../codec/html doc/libosmocoding.tag=../../coding/html 
doc/libosmoctrl.tag=../../ctrl/html

 # When a file name is specified after 

Change in libosmocore[master]: vty telnet: consistently never change nodes upon CTRL-C

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12772


Change subject: vty telnet: consistently never change nodes upon CTRL-C
..

vty telnet: consistently never change nodes upon CTRL-C

Remove any special node exiting from the VTY CTRL-C handling.

>From a curious VTY transcript test glitch, I noticed weird behavior by the VTY
telnet shell: usually, when the user hits CTRL-C, that means to cancel the
current command line and present a fresh, clean prompt. However, only on the
CONFIG_NODE and CFG_LOG_NODE, a CTRL-C also exits the current node and moves up
by one level. This behavior is unexplainable and makes zero sense.

No other nodes exit on CTRL-C:
- on the ENABLE node, a CTRL-C stays on the ENABLE_NODE and doesn't exit to the
  VIEW_NODE.
- any sub-nodes of the CONFIG_NODE stay unchanged, e.g. 'network' or 'bts' /
  'trx', etc.

There is no apparent special meaning of CTRL-C on CONFIG_NODE nor CFG_LOG_NODE
to justify this odd choice.

Particularly, the vty transcript tests using osmo_verify_transcript_vty.py rely
on sending CTRL-C to clear the command prompt, so that we can properly test
sending '?' to the VTY during transcripts. In a live session, a '?' prints
available options and then updates the prompt with identical command arguments.
In a transcript test, that doesn't make sense, because each time the transcript
writes out a new command to run. Consider e.g. a transcript test like:

tdef_vty_test(config)# timer ?
  tea   Tea time
  test  Test timers
  software  Typical software development cycle

tdef_vty_test(config)# timer tea ?
  [T]  T-number, optionally preceded by 't' or 'T'.

To be able to issue a fresh command after '?', osmo_verify_transcript_vty.py
explicitly sends a CTRL-C to clear the command buffer. Hence there we rely on
predictable behavior of CTRL-C.

More particularly, the upcoming osmo_tdef_vty transcript tests are apparently
the first that want to test '?' behavior on the CONFIG_NODE's root level and
fall on their face, because of the implicit exit that happens only there.

Change-Id: I4f339ba61f1c273fa7da85caf77ba116ae2697b1
---
M src/vty/vty.c
1 file changed, 0 insertions(+), 18 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/12772/1

diff --git a/src/vty/vty.c b/src/vty/vty.c
index abce887..8c89197 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -1217,24 +1217,6 @@
vty->cp = vty->length = 0;
vty_clear_buf(vty);
vty_out(vty, "%s", VTY_NEWLINE);
-
-   switch (vty->node) {
-   case VIEW_NODE:
-   case ENABLE_NODE:
-   /* Nothing to do. */
-   break;
-   case CONFIG_NODE:
-   case VTY_NODE:
-   vty_config_unlock(vty);
-   vty->node = ENABLE_NODE;
-   break;
-   case CFG_LOG_NODE:
-   vty->node = CONFIG_NODE;
-   break;
-   default:
-   /* Unknown node, we have to ignore it. */
-   break;
-   }
vty_prompt(vty);

/* Set history pointer to the latest one. */

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

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

Change in libosmocore[master]: add generic vty_transcript_test.c, vty_transcript_test.vty

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12768


Change subject: add generic vty_transcript_test.c, vty_transcript_test.vty
..

add generic vty_transcript_test.c, vty_transcript_test.vty

I want to tweak general VTY features and need to cover with a transcript test
to show the differences. Start by showing the current situation of optional
and multi-choice arguments.

Change-Id: I5a79c83fabd02aba6406b6e0d620969c4bd0cc1d
---
M tests/Makefile.am
A tests/vty/vty_transcript_test.c
A tests/vty/vty_transcript_test.vty
3 files changed, 298 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/12768/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a307886..83922ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,6 +26,7 @@
 codec/codec_ecu_fr_test timer/clk_override_test\
 oap/oap_client_test gsm29205/gsm29205_test \
 logging/logging_vty_test   \
+vty/vty_transcript_test\
 $(NULL)

 if ENABLE_MSGFILE
@@ -156,6 +157,9 @@
 logging_logging_vty_test_SOURCES = logging/logging_vty_test.c
 logging_logging_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la

+vty_vty_transcript_test_SOURCES = vty/vty_transcript_test.c
+vty_vty_transcript_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
+
 fr_fr_test_SOURCES = fr/fr_test.c
 fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la 
$(LIBRARY_DLSYM) \
   $(top_builddir)/src/vty/libosmovty.la \
@@ -322,11 +326,21 @@
 # To update the VTY script from current application behavior,
 # pass -u to osmo_verify_transcript_vty.py by doing:
 #   make vty-test U=-u
-vty-test:
+vty-test-logging:
osmo_verify_transcript_vty.py -v \
-p 42042 \
-r "$(top_builddir)/tests/logging/logging_vty_test" \
$(U) $(srcdir)/logging/*.vty

+vty-test-vty:
+   osmo_verify_transcript_vty.py -v \
+   -p 42042 \
+   -r "$(top_builddir)/tests/vty/vty_transcript_test" \
+   $(U) $(srcdir)/vty/*.vty
+
+vty-test:
+   $(MAKE) vty-test-logging
+   $(MAKE) vty-test-vty
+
 ctrl-test:
echo "No CTRL tests exist currently"
diff --git a/tests/vty/vty_transcript_test.c b/tests/vty/vty_transcript_test.c
new file mode 100644
index 000..50131ea
--- /dev/null
+++ b/tests/vty/vty_transcript_test.c
@@ -0,0 +1,230 @@
+/* Test implementation for VTY transcript testing. */
+/*
+ * (C) 2019 by sysmocom s.f.m.c. GmbH 
+ *
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * Author: Neels Hofmeyr 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (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.
+ */
+
+#define _GNU_SOURCE
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+#include "config.h"
+
+void *root_ctx = NULL;
+
+static void print_help()
+{
+   printf( "options:\n"
+   "  -h   --help  this text\n"
+   "  -d   --debug MASKEnable debugging (e.g. -d 
DRSL:DOML:DLAPDM)\n"
+   "  -D   --daemonize For the process into a background 
daemon\n"
+   "  -c   --config-file   Specify the filename of the config 
file\n"
+   "  -s   --disable-color Don't use colors in stderr log output\n"
+   "  -T   --timestamp Prefix every log line with a 
timestamp\n"
+   "  -V   --version   Print version information and exit\n"
+   "  -e   --log-level Set a global log-level\n"
+   );
+}
+
+static struct {
+   const char *config_file;
+   int daemonize;
+} cmdline_config = {};
+
+static void handle_options(int argc, char **argv)
+{
+   while (1) {
+   int option_idx = 0, c;
+   static const struct option long_options[] = {
+   { "help", 0, 0, 'h' },
+   { "debug", 1, 0, 'd' },
+   { "daemonize", 0, 0, 'D' },
+   { "config-file", 1, 0, 'c' },
+   { "disable-color", 0, 0, 's' },
+   

Change in libosmocore[master]: add osmo_tdef API, originally adopted from osmo-bsc T_def

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/12717

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

Change subject: add osmo_tdef API, originally adopted from osmo-bsc T_def
..

add osmo_tdef API, originally adopted from osmo-bsc T_def

Move T_def from osmo-bsc to libosmocore as osmo_tdef. Adjust naming to be more
consistent. Upgrade to first class API:
- add timer grouping
- add generic vty support
- add mising API doc
- add C test
- add VTY transcript tests, also as examples for using the API

>From osmo_fsm_inst_state_chg() API doc, cross reference to osmo_tdef API.

The root reason for moving to libosmocore is that I want to use the
mgw_endpoint_fsm in osmo-msc for inter-MSC handover, and hence want to move the
FSM to libosmo-mgcp-client. This FSM uses the T_def from osmo-bsc. Though the
mgw_endpoint_fsm's use of T_def is minimal, I intend to use the osmo_tdef API
in osmo-msc (and probably elsewhere) as well. libosmocore is the most sensible
place for this.

osmo_tdef provides:

- a list of T (GSM) timers with description, unit and default value.
- vty UI to allow users to configure non-default timeouts.
- API to tie T timers to osmo_fsm states and set them on state transitions.

- a few standard units (minute, second, millisecond) as well as a custom unit
  (which relies on the timer's human readable description to indicate the
  meaning of the value).
- conversion for standard units: for example, some GSM timers are defined in
  minutes, while our FSM definitions need timeouts in seconds. Conversion is
  for convenience only and can be easily avoided via the custom unit.

By keeping separate osmo_tdef arrays, several groups of timers can be kept
separately. The VTY tests in tests/tdef/ showcase different schemes:

- tests/vty/tdef_vty_test_config_root.c:
  Keep several timer definitions in separately named groups: showcase the
  osmo_tdef_vty_groups*() API. Each timer group exists exactly once.

- tests/vty/tdef_vty_test_config_subnode.c:
  Keep a single list of timers without separate grouping.
  Put this list on a specific subnode below the CONFIG_NODE.
  There could be several separate subnodes with timers like this, i.e.
  continuing from this example, sets timers could be separated by placing
  timers in specific config subnodes instead of using the global group name.

- tests/vty/tdef_vty_test_dynamic.c:
  Dynamically allocate timer definitions per each new created object.
  Thus there can be an arbitrary number of independent timer definitions, one
  per allocated object.

T_def was introduced during the recent osmo-bsc refactoring for inter-BSC
handover, and has proven useful:

- without osmo_tdef, each invocation of osmo_fsm_inst_state_chg() needs to be
  programmed with the right timeout value, for all code paths that invoke this
  state change. It is a likely source of errors to get one of them wrong.  By
  defining a T timer exactly for an FSM state, the caller can merely invoke the
  state change and trust on the original state definition to apply the correct
  timeout.

- it is helpful to have a standardized config file UI to provide user
  configurable timeouts, instead of inventing new VTY commands for each
  separate application of T timer numbers.

Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5
---
M include/Makefile.am
A include/osmocom/core/tdef.h
A include/osmocom/vty/tdef_vty.h
M src/Makefile.am
M src/fsm.c
A src/tdef.c
M src/vty/Makefile.am
A src/vty/tdef_vty.c
M tests/Makefile.am
A tests/tdef/tdef_test.c
A tests/tdef/tdef_test.ok
A tests/tdef/tdef_vty_test_config_root.c
A tests/tdef/tdef_vty_test_config_root.vty
A tests/tdef/tdef_vty_test_config_subnode.c
A tests/tdef/tdef_vty_test_config_subnode.vty
A tests/tdef/tdef_vty_test_dynamic.c
A tests/tdef/tdef_vty_test_dynamic.vty
M tests/testsuite.at
18 files changed, 2,979 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/12717/4
--
To view, visit https://gerrit.osmocom.org/12717
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5
Gerrit-Change-Number: 12717
Gerrit-PatchSet: 4
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 

Change in libosmocore[master]: vty: enable optional-multi-choice syntax: [(one|two)]

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12770


Change subject: vty: enable optional-multi-choice syntax: [(one|two)]
..

vty: enable optional-multi-choice syntax: [(one|two)]

Since very recently we sensibly handle commands like

  cmd ([one]|[two]|[three])

as optional multi-choice arguments. In addition, support the more obvious
syntax of

  cmd [(one|two|three)]

Internally, the tokens are mangled to [one] [two] and [three], which is how the
rest of the code detects optional args, and makes sense in terms of UI:

  > cmd ?
  [one]
  [two]
  [three]

(i.e. optional arguments are always shown in braces in '?' listings)

Before this patch, commands defined with a syntax like [(one|two)], would lead
to an assertion (shows as "multiple") during program startup.

Change-Id: I952b3c00f97e2447f2308b0ec6f5f1714692b5b2
---
M src/vty/command.c
M tests/vty/vty_transcript_test.c
M tests/vty/vty_transcript_test.vty
3 files changed, 45 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/12770/1

diff --git a/src/vty/command.c b/src/vty/command.c
index 9d02d69..2242e76 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -380,6 +380,7 @@
 static vector cmd_make_descvec(const char *string, const char *descstr)
 {
int multiple = 0;
+   int optional_brace = 0;
const char *sp;
char *token;
int len;
@@ -401,6 +402,12 @@
while (isspace((int)*cp) && *cp != '\0')
cp++;

+   /* Explicitly detect optional multi-choice braces like 
[(one|two)]. */
+   if (cp[0] == '[' && cp[1] == '(') {
+   optional_brace = 1;
+   cp++;
+   }
+
if (*cp == '(') {
multiple = 1;
cp++;
@@ -408,6 +415,9 @@
if (*cp == ')') {
multiple = 0;
cp++;
+   if (*cp == ']')
+   cp++;
+   optional_brace = 0;
}
if (*cp == '|') {
OSMO_ASSERT(multiple);
@@ -434,9 +444,17 @@

len = cp - sp;

-   token = _talloc_zero(tall_vty_cmd_ctx, len + 1, 
"cmd_make_descvec");
-   memcpy(token, sp, len);
-   *(token + len) = '\0';
+   token = _talloc_zero(tall_vty_cmd_ctx, len + (optional_brace? 2 
: 0) + 1, "cmd_make_descvec");
+   if (optional_brace) {
+   /* Place each individual multi-choice token in its own 
square braces */
+   token[0] = '[';
+   memcpy(token + 1, sp, len);
+   token[1 + len] = ']';
+   token[2 + len] = '\0';
+   } else {
+   memcpy(token, sp, len);
+   *(token + len) = '\0';
+   }

desc = talloc_zero(tall_vty_cmd_ctx, struct desc);
desc->cmd = token;
diff --git a/tests/vty/vty_transcript_test.c b/tests/vty/vty_transcript_test.c
index 50131ea..7ffe713 100644
--- a/tests/vty/vty_transcript_test.c
+++ b/tests/vty/vty_transcript_test.c
@@ -170,10 +170,19 @@
return CMD_SUCCESS;
 }

+DEFUN(multi2, multi2_cmd,
+  "multi2 [(one|two|three)]",
+  "multi2 test command\n" "1\n2\n3\n")
+{
+   vty_out(vty, "ok argc=%d%s%s%s", argc, argc ? " " : "", argc ? argv[0] 
: "", VTY_NEWLINE);
+   return CMD_SUCCESS;
+}
+
 static void init_vty_cmds()
 {
install_element_ve(_cmd);
install_element_ve(_cmd);
+   install_element_ve(_cmd);
 }

 int main(int argc, char **argv)
diff --git a/tests/vty/vty_transcript_test.vty 
b/tests/vty/vty_transcript_test.vty
index 514a5ed..57920a8 100644
--- a/tests/vty/vty_transcript_test.vty
+++ b/tests/vty/vty_transcript_test.vty
@@ -2,6 +2,7 @@
 ...
   multi0 (one|two|three)
   multi1 ([one]|[two]|[three])
+  multi2 [(one|two|three)]

 vty_transcript_test> multi0 ?
   one1
@@ -51,3 +52,17 @@

 vty_transcript_test> multi1 [one]
 % Unknown command.
+
+vty_transcript_test> multi2 ?
+  [one]1
+  [two]2
+  [three]  3
+
+vty_transcript_test> multi2 one
+ok argc=1 one
+
+vty_transcript_test> multi2 two
+ok argc=1 two
+
+vty_transcript_test> multi2
+ok argc=0

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

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

Jenkins build is back to normal : master-osmo-hlr » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #1979

[jenkins]

See 

Build failed in Jenkins: master-osmo-hlr » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #1978

[jenkins]

See 


--
[...truncated 30.07 KB...]
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for ar... ar
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for sysroot... no
checking for a working dd... /bin/dd
checking how to truncate binary pipes... /bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for dlfcn.h... yes
checking for objdir... .libs
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC -DPIC
checking if gcc PIC flag -fPIC -DPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking if gcc supports -c -o file.o... (cached) yes
checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... no
checking for pkg-config... /usr/bin/pkg-config
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.20... yes
checking for ANSI C header files... (cached) yes
checking execinfo.h usability... yes
checking execinfo.h presence... yes
checking for execinfo.h... yes
checking sys/select.h usability... yes
checking sys/select.h presence... yes
checking for sys/select.h... yes
checking sys/socket.h usability... yes
checking sys/socket.h presence... yes
checking for sys/socket.h... yes
checking sys/timerfd.h usability... yes
checking sys/timerfd.h presence... yes
checking for sys/timerfd.h... yes
checking syslog.h usability... yes
checking syslog.h presence... yes
checking for syslog.h... yes
checking ctype.h usability... yes
checking ctype.h presence... yes
checking for ctype.h... yes
checking netinet/tcp.h usability... yes
checking netinet/tcp.h presence... yes
checking for netinet/tcp.h... yes
checking for size_t... yes
checking for working alloca.h... yes
checking for alloca... yes
checking for library containing dlopen... -ldl
checking for library containing dlsym... -ldl
checking for backtrace in -lexecinfo... no
checking for library containing clock_gettime... none required
checking for doxygen... (cached) false
checking whether SYS_getrandom is declared... yes
checking if gcc supports -fvisibility=hidden... yes
checking for clock_gettime... yes
checking for localtime_r... yes
checking whether struct tm has tm_gmtoff member... yes
checking for TALLOC... yes
checking for PCSC... yes
checking for LIBGNUTLS... yes
checking whether to enable VTY/CTRL tests... no
checking whether C compiler accepts -mavx2... yes
checking whether C compiler accepts -mssse3... yes
checking whether C compiler accepts -msse4.1... yes
checking whether gcc has __builtin_cpu_supports built-in... yes
CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall"
CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall"
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating libosmocore.pc
config.status: creating libosmocodec.pc
config.status: creating libosmocoding.pc
config.status: creating libosmovty.pc
config.status: creating libosmogsm.pc
config.status: creating libosmogb.pc
config.status: creating libosmoctrl.pc
config.status: creating libosmosim.pc
config.status: creating include/Makefile
config.status: creating src/Makefile
config.status: creating src/vty/Makefile
config.status: creating src/codec/Makefile
config.status: creating src/coding/Makefile
config.status: creating src/sim/Makefile
config.status: creating src/gsm/Makefile
config.status: creating src/gb/Makefile
config.status: creating src/ctrl/Makefile
config.status: creating src/pseudotalloc/Makefile
config.status: creating tests/Makefile
config.status: creating tests/atlocal
config.status: creating utils/Makefile
config.status: creating Doxyfile.core
config.status: creating Doxyfile.gsm
config.status: creating Doxyfile.vty
config.status: creating Doxyfile.codec

Jenkins build is back to normal : master-osmocom-bb » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #1195

[jenkins]

See 

Change in osmo-sysmon[master]: Add OpenVPN probe

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/12763 )

Change subject: Add OpenVPN probe
..


Patch Set 5:

This change is ready for review.


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

Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I4493e19b9a09dcebd289457eacd1719f7f8cc31c
Gerrit-Change-Number: 12763
Gerrit-PatchSet: 5
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Thu, 31 Jan 2019 23:25:55 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Jenkins build is back to normal : master-osmo-bsc » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #5042

[jenkins]

See 

Jenkins build is back to normal : master-osmo-sgsn » --enable-iu,0,a3=default,a4=default,osmocom-master-debian9 #8477

[jenkins]

See 

Change in osmo-sysmon[master]: Add generic host config and related helpers

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/12761 )

Change subject: Add generic host config and related helpers
..


Patch Set 5:

This change is ready for review.


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

Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb
Gerrit-Change-Number: 12761
Gerrit-PatchSet: 5
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Thu, 31 Jan 2019 22:30:06 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmo-netif[master]: Add missing include

[Max]

Max has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12765 )

Change subject: Add missing include
..

Add missing include

stream.h uses msgb from libosmocore without corresponding #include
It's odd that we haven't hit this issue earlier.

Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57
---
M include/osmocom/netif/stream.h
1 file changed, 2 insertions(+), 0 deletions(-)

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

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



diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index 166ede2..529d4d7 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -4,6 +4,8 @@
 #include 
 #include 

+#include 
+
 /*! \addtogroup stream
  *  @{
  */

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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57
Gerrit-Change-Number: 12765
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 

Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard

[Max]

Max has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12766 )

Change subject: Cosmetic: use #pragma once as include guard
..

Cosmetic: use #pragma once as include guard

Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd
---
M include/osmocom/netif/stream.h
1 file changed, 1 insertion(+), 4 deletions(-)

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

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



diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index 529d4d7..969d42f 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -1,5 +1,4 @@
-#ifndef _OSMO_STREAM_H_
-#define _OSMO_STREAM_H_
+#pragma once

 #include 
 #include 
@@ -77,5 +76,3 @@
 int osmo_stream_cli_recv(struct osmo_stream_cli *conn, struct msgb *msg);

 /*! @} */
-
-#endif

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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd
Gerrit-Change-Number: 12766
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 

Change in osmo-sysmon[master]: jenkins.sh: remove obsolete comments

[Max]

Max has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12764 )

Change subject: jenkins.sh: remove obsolete comments
..

jenkins.sh: remove obsolete comments

Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12
---
M contrib/jenkins.sh
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index dc2f734..b1529c4 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# jenkins build helper script for openbsc.  This is how we build on 
jenkins.osmocom.org
+# jenkins build helper: this is how we build on jenkins.osmocom.org

 if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
echo "Error: We need to have scripts/osmo-deps.sh from 
http://git.osmocom.org/osmo-ci/ in PATH !"
@@ -37,8 +37,7 @@
 autoreconf --install --force
 ./configure --enable-sanitize --enable-external-tests --enable-werror
 $MAKE $PARALLEL_MAKE
-#LD_LIBRARY_PATH="$inst/lib" $MAKE check \
-#  || cat-testlogs.sh
+
 LD_LIBRARY_PATH="$inst/lib" \
   DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests 
--enable-werror" \
   $MAKE distcheck \

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

Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12
Gerrit-Change-Number: 12764
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 

Build failed in Jenkins: master-osmo-bsc » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #5041

[jenkins]

See 


Changes:

[pma...@sysmocom.de] bsc_vty: add vty command to display all lchans

--
[...truncated 31.76 KB...]
chmod: changing permissions of './src/osmo-bsc/osmo_bsc_grace.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/gsm_timers.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/bts_ipaccess_nanobts.c': 
Operation not permitted
chmod: changing permissions of './src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c': 
Operation not permitted
chmod: changing permissions of './src/osmo-bsc/e1_config.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/bsc_ctrl_lookup.c': Operation 
not permitted
chmod: changing permissions of './src/osmo-bsc/handover_decision.c': Operation 
not permitted
chmod: changing permissions of './src/osmo-bsc/abis_nm.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/abis_nm_vty.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/bts_ericsson_rbs2000.c': 
Operation not permitted
chmod: changing permissions of './src/osmo-bsc/gsm_08_08.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/bts_sysmobts.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/osmo_bsc_lcls.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/Makefile.am': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/handover_cfg.c': Operation not 
permitted
chmod: changing permissions of './src/osmo-bsc/codec_pref.c': Operation not 
permitted
chmod: changing permissions of './src/ipaccess': Operation not permitted
chmod: changing permissions of './src/ipaccess/abisip-find.c': Operation not 
permitted
chmod: changing permissions of './src/ipaccess/ipaccess-proxy.c': Operation not 
permitted
chmod: changing permissions of './src/ipaccess/stubs.c': Operation not permitted
chmod: changing permissions of './src/ipaccess/ipaccess-config.c': Operation 
not permitted
chmod: changing permissions of './src/ipaccess/ipaccess-firmware.c': Operation 
not permitted
chmod: changing permissions of './src/ipaccess/network_listen.c': Operation not 
permitted
chmod: changing permissions of './src/ipaccess/Makefile.am': Operation not 
permitted
chmod: changing permissions of './src/utils': Operation not permitted
chmod: changing permissions of './src/utils/meas_vis.c': Operation not permitted
chmod: changing permissions of './src/utils/meas_db.c': Operation not permitted
chmod: changing permissions of './src/utils/meas_udp2db.c': Operation not 
permitted
chmod: changing permissions of './src/utils/meas_json.c': Operation not 
permitted
chmod: changing permissions of './src/utils/meas_pcap2db.c': Operation not 
permitted
chmod: changing permissions of './src/utils/bs11_config.c': Operation not 
permitted
chmod: changing permissions of './src/utils/meas_db.h': Operation not permitted
chmod: changing permissions of './src/utils/isdnsync.c': Operation not permitted
chmod: changing permissions of './src/utils/Makefile.am': Operation not 
permitted
chmod: changing permissions of './src/libfilter': Operation not permitted
chmod: changing permissions of './src/libfilter/bsc_msg_vty.c': Operation not 
permitted
chmod: changing permissions of './src/libfilter/bsc_msg_filter.c': Operation 
not permitted
chmod: changing permissions of './src/libfilter/Makefile.am': Operation not 
permitted
chmod: changing permissions of './src/libfilter/bsc_msg_acc.c': Operation not 
permitted
chmod: changing permissions of './src/Makefile.am': Operation not permitted
chmod: changing permissions of './osmoappdesc.py': Operation not permitted
chmod: changing permissions of './contrib': Operation not permitted
chmod: changing permissions of './contrib/jenkins.sh': Operation not permitted
chmod: changing permissions of './contrib/systemd': Operation not permitted
chmod: changing permissions of './contrib/systemd/osmo-bsc.service': Operation 
not permitted
chmod: changing permissions of './contrib/systemd/Makefile.am': Operation not 
permitted
chmod: changing permissions of './contrib/a-link': Operation not permitted
chmod: changing permissions of './contrib/a-link/sccp-split-by-con.lua': 
Operation not permitted
chmod: changing permissions of './contrib/Makefile.am': Operation not permitted
chmod: changing permissions of './debian': Operation not permitted
chmod: changing permissions of './debian/copyright': Operation not permitted
chmod: changing permissions of './debian/control': Operation not permitted
chmod: changing permissions of './debian/osmo-bsc-bs11-utils.install': 
Operation not permitted
chmod: changing permissions of './debian/rules': Operation not permitted
chmod: changing permissions of './debian/compat': Operation not permitted
chmod: changing 

Change in osmo-bsc[master]: bsc_vty: add features to disable specific lchans via vty

[Harald Welte]

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

Change subject: bsc_vty: add features to disable specific lchans via vty
..


Patch Set 7: Code-Review+2


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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I397e68e26d6a1727890353fa34f4897b54795866
Gerrit-Change-Number: 12624
Gerrit-PatchSet: 7
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: dexter 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:20:05 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans

[Harald Welte]

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

Change subject: bsc_vty: add vty command to display all lchans
..

bsc_vty: add vty command to display all lchans

Currently the VTY only displays the lchans that are currently in use
(show lchan summary). In some situations (debugging) it can be useful
to list all lchans, regardless of their state. So lets add a command
for that.

Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5
Related: OS#3503
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 29 insertions(+), 14 deletions(-)

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



diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 791aebe..3830475 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -1441,11 +1441,12 @@


 static int dump_lchan_trx_ts(struct gsm_bts_trx_ts *ts, struct vty *vty,
-void (*dump_cb)(struct vty *, struct gsm_lchan *))
+void (*dump_cb)(struct vty *, struct gsm_lchan *),
+bool all)
 {
struct gsm_lchan *lchan;
ts_for_each_lchan(lchan, ts) {
-   if (lchan_state_is(lchan, LCHAN_ST_UNUSED))
+   if (lchan_state_is(lchan, LCHAN_ST_UNUSED) && all == false)
continue;
dump_cb(vty, lchan);
}
@@ -1454,33 +1455,36 @@
 }

 static int dump_lchan_trx(struct gsm_bts_trx *trx, struct vty *vty,
- void (*dump_cb)(struct vty *, struct gsm_lchan *))
+ void (*dump_cb)(struct vty *, struct gsm_lchan *),
+ bool all)
 {
int ts_nr;

for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) {
struct gsm_bts_trx_ts *ts = >ts[ts_nr];
-   dump_lchan_trx_ts(ts, vty, dump_cb);
+   dump_lchan_trx_ts(ts, vty, dump_cb, all);
}

return CMD_SUCCESS;
 }

 static int dump_lchan_bts(struct gsm_bts *bts, struct vty *vty,
- void (*dump_cb)(struct vty *, struct gsm_lchan *))
+ void (*dump_cb)(struct vty *, struct gsm_lchan *),
+ bool all)
 {
int trx_nr;

for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) {
struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, trx_nr);
-   dump_lchan_trx(trx, vty, dump_cb);
+   dump_lchan_trx(trx, vty, dump_cb, all);
}

return CMD_SUCCESS;
 }

 static int lchan_summary(struct vty *vty, int argc, const char **argv,
-void (*dump_cb)(struct vty *, struct gsm_lchan *))
+void (*dump_cb)(struct vty *, struct gsm_lchan *),
+bool all)
 {
struct gsm_network *net = gsmnet_from_vty(vty);
struct gsm_bts *bts = NULL;
@@ -1500,7 +1504,7 @@
bts = gsm_bts_num(net, bts_nr);

if (argc == 1)
-   return dump_lchan_bts(bts, vty, dump_cb);
+   return dump_lchan_bts(bts, vty, dump_cb, all);
}
if (argc >= 2) {
trx_nr = atoi(argv[1]);
@@ -1512,7 +1516,7 @@
trx = gsm_bts_trx_num(bts, trx_nr);

if (argc == 2)
-   return dump_lchan_trx(trx, vty, dump_cb);
+   return dump_lchan_trx(trx, vty, dump_cb, all);
}
if (argc >= 3) {
ts_nr = atoi(argv[2]);
@@ -1524,7 +1528,7 @@
ts = >ts[ts_nr];

if (argc == 3)
-   return dump_lchan_trx_ts(ts, vty, dump_cb);
+   return dump_lchan_trx_ts(ts, vty, dump_cb, all);
}
if (argc >= 4) {
lchan_nr = atoi(argv[3]);
@@ -1541,7 +1545,7 @@

for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) {
bts = gsm_bts_num(net, bts_nr);
-   dump_lchan_bts(bts, vty, dump_cb);
+   dump_lchan_bts(bts, vty, dump_cb, all);
}

return CMD_SUCCESS;
@@ -1554,17 +1558,27 @@
SHOW_STR "Display information about a logical channel\n"
BTS_TRX_TS_LCHAN_STR)
 {
-   return lchan_summary(vty, argc, argv, lchan_dump_full_vty);
+   return lchan_summary(vty, argc, argv, lchan_dump_full_vty, true);
 }

 DEFUN(show_lchan_summary,
   show_lchan_summary_cmd,
   "show lchan summary [<0-255>] [<0-255>] [<0-7>] [<0-7>]",
SHOW_STR "Display information about a logical channel\n"
-"Short summary\n"
+"Short summary (used lchans)\n"
BTS_TRX_TS_LCHAN_STR)
 {
-   return lchan_summary(vty, argc, argv, lchan_dump_short_vty);
+   return lchan_summary(vty, argc, argv, lchan_dump_short_vty, false);
+}
+
+DEFUN(show_lchan_summary_all,
+  

Change in osmo-bsc[master]: bsc_vty: add vty command to display all lchans

[Harald Welte]

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

Change subject: bsc_vty: add vty command to display all lchans
..


Patch Set 3: Code-Review+2


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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie4d763476905fa8f84b4d7cdad4cc7dd879f84a5
Gerrit-Change-Number: 12679
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:19:27 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: handover_fsm: do not access conn->assignment.req, it may be outdated

[Harald Welte]

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

Change subject: handover_fsm: do not access conn->assignment.req, it may be 
outdated
..


Patch Set 1: Code-Review+1

I very much agree with max regarding the comment.


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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id8018fd9d56421f2ab7be91703018f6d6f21c929
Gerrit-Change-Number: 12734
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Max 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:18:49 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-sysmon[master]: jenkins.sh: remove obsolete comments

[Harald Welte]

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

Change subject: jenkins.sh: remove obsolete comments
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12
Gerrit-Change-Number: 12764
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:17:44 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard

[Harald Welte]

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

Change subject: Cosmetic: use #pragma once as include guard
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd
Gerrit-Change-Number: 12766
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:17:18 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: Add missing include

[Harald Welte]

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

Change subject: Add missing include
..


Patch Set 1: Code-Review+2

I agree osmith's suggestion is much better than the current summary.  But we 
also should make sure we find the right compromise regarding investment of all 
our limited time.  This kind of commit is so trivial that it's unlikely going 
to be something that ever receives much scrutiny or will raise the interest of 
a future reader of the commitlog


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57
Gerrit-Change-Number: 12765
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:17:15 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: openbsc: handle systemd and cfg files through autotools
..

openbsc: handle systemd and cfg files through autotools

Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653
---
M recipes-osmocom/openbsc/openbsc.inc
1 file changed, 6 insertions(+), 15 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/openbsc/openbsc.inc 
b/recipes-osmocom/openbsc/openbsc.inc
index ca3b124..71921b7 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -6,30 +6,21 @@

 RDEPENDS_osmo-nitb = "libdbd-sqlite3"

-INC_PR = "r3.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r4.${META_TELEPHONY_OSMO_INC}"

 EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp 
--enable-mgcp-transcoding --with-g729"

 inherit autotools systemd pkgconfig

 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-sccplite/osmo-bsc-sccplite.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg
-   install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg
-   install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg
-
-   # Install systemd files and enable on sysinit
-   install -d ${D}${systemd_system_unitdir}/
-   install -m 0644 ${S}/contrib/systemd/osmo-nitb.service 
${D}${systemd_system_unitdir}/
-   install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service 
${D}${systemd_system_unitdir}/
-   install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service 
${D}${systemd_system_unitdir}/
-   install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service 
${D}${systemd_system_unitdir}/
-
install -d ${D}/var/lib/osmocom
-
 }

+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
+
 PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"
 SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653
Gerrit-Change-Number: 12755
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Build failed in Jenkins: master-osmocom-bb » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #1194

[jenkins]

See 


--
Started by upstream project "master-osmocom-bb" build number 1194
originally caused by:
 Started by timer
Building remotely on tcc-deb9build (obs osmo-gsm-tester-build 
osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace 

Cloning the remote Git repository
Cloning repository git://git.osmocom.org/osmocom-bb
 > git init 
 > 
 >  # timeout=10
Fetching upstream changes from git://git.osmocom.org/osmocom-bb
 > git --version # timeout=10
 > git fetch --tags --progress git://git.osmocom.org/osmocom-bb 
 > +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url git://git.osmocom.org/osmocom-bb # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
 > timeout=10
 > git config remote.origin.url git://git.osmocom.org/osmocom-bb # timeout=10
Fetching upstream changes from git://git.osmocom.org/osmocom-bb
 > git fetch --tags --progress git://git.osmocom.org/osmocom-bb 
 > +refs/heads/*:refs/remotes/origin/*
Checking out Revision 9ec58916d93cc6fcae63c03be4361b8c075ea248 
(refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 9ec58916d93cc6fcae63c03be4361b8c075ea248
Commit message: "mobile/gsm480_ss.c: fix build: apply msgb_wrap_with_TL() 
rename"
 > git rev-list --no-walk 9ec58916d93cc6fcae63c03be4361b8c075ea248 # timeout=10
[osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins7268240173500913434.sh
+ WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh
+ 
base=
+ 
deps=
+ 
inst=
+ export deps inst
+ osmo-clean-workspace.sh
./contrib/jenkins.sh: 16: ./contrib/jenkins.sh: osmo-clean-workspace.sh: not 
found
Build step 'Execute shell' marked build as failure
[WARNINGS]Skipping publisher since build result is FAILURE

Change in meta-telephony[201705]: osmo-sgsn: Depend on osmo-hlr

[Harald Welte]

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

Change subject: osmo-sgsn: Depend on osmo-hlr
..

osmo-sgsn: Depend on osmo-hlr

Since osmo-sgsn f4b2c4ca42cc530c38c9ac6f275e4d7da9315fa2, it depends on
libosmo-gsup-client available in osmo-hlr.

Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509
---
M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 
b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
index 45256a5..57ab845 100644
--- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
+++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
@@ -3,7 +3,7 @@
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"

-DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn"
+DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn osmo-hlr"

 INC_PR="r1.${META_TELEPHONY_OSMO_INC}"


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509
Gerrit-Change-Number: 12756
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years

[Harald Welte]

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

Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years
..


Patch Set 4: Code-Review+2


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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a
Gerrit-Change-Number: 12716
Gerrit-PatchSet: 4
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:15:24 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-ggsn: Drop untested sysvinit support

[Harald Welte]

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

Change subject: osmo-ggsn: Drop untested sysvinit support
..

osmo-ggsn: Drop untested sysvinit support

These bits come from times were sysvinit was used in stead of systemd in
yocto. Nowadays nobody is known to be using the recipes with sysvinit
instead of systemd, and anyway most osmocom recipes doesn't come with
sysvinit support, so let's drop it. If sysvinit support is required, it
should be added through autotools install process instead.

Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6
---
D recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init
M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
3 files changed, 2 insertions(+), 178 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init 
b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init
deleted file mode 100755
index 157d6dd..000
--- a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:  osmo-ggsn
-# Required-Start:$network $local_fs
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop:  0 1 6
-# Short-Description: Osmocom GSM network-in-a-box
-# Description:   A minimal implementation of the GSM Base Station 
Controller,
-#Mobile Switching Center, Home Location regster and all 
other
-#components to run a self-contained GSM network.
-### END INIT INFO
-
-# Author: Harald Welte 
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Osmocom GGSN implementation"
-NAME=osmo-ggsn
-DAEMON=/usr/bin/ggsn
-DAEMON_ARGS="" # Arguments to run the daemon with
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-CONFIG_FILE=/etc/ggsn.conf
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-# . /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-# . /lib/lsb/init-functions
-
-DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE"
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-   # Return
-   #   0 if daemon has been started
-   #   1 if daemon was already running
-   #   2 if daemon could not be started
-/sbin/modprobe tun
-   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON 
--test > /dev/null \
-   || return 1
-
-   # Check for runtime directory of nonvolatile data
-   if [ ! -d /var/lib/ggsn ]; then
-   mkdir /var/lib/ggsn
-   fi
-
-   # Check for GTP restart counter
-   if [ ! -f /var/lib/ggsn/gsn_restart ]; then
-   echo 0 > /var/lib/ggsn/gsn_restart
-   fi
-
-   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-   $DAEMON_ARGS \
-   || return 2
-   # Add code here, if necessary, that waits for the process to be ready
-   # to handle requests from services started subsequently which depend
-   # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-   # Return
-   #   0 if daemon has been stopped
-   #   1 if daemon was already stopped
-   #   2 if daemon could not be stopped
-   #   other if a failure occurred
-   start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile 
$PIDFILE --name $NAME
-   RETVAL="$?"
-   [ "$RETVAL" = 2 ] && return 2
-   # Wait for children to finish too if this is a daemon that forks
-   # and if the daemon is only ever run from this initscript.
-   # If the above conditions are not satisfied then add some other code
-   # that waits for the process to drop all resources that could be
-   # needed by services started subsequently.  A last resort is to
-   # sleep for some time.
-   start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec 
$DAEMON
-   [ "$?" = 2 ] && return 2
-   # Many daemons don't delete their pidfiles when they exit.
-   rm -f $PIDFILE
-   return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-   #
-   # If the daemon can reload its configuration without
-   # restarting (for example, when it is sent a SIGHUP),
-   # then implement that here.
-   #
-   start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name 
$NAME
-   return 0
-}
-
-case "$1" in
-  start)
-#[ 

Change in meta-telephony[201705]: osmo-hlr: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-hlr: handle systemd and cfg files through autotools
..

osmo-hlr: handle systemd and cfg files through autotools

Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce
---
M recipes-osmocom/osmo-hlr/osmo-hlr.inc
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc 
b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
index 946784b..7fa415b 100644
--- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc
+++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
@@ -5,7 +5,7 @@

 DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native"

-INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"

 inherit autotools pkgconfig systemd

@@ -15,15 +15,15 @@
 }

 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
 }

+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
+
 PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils"

 FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}"

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce
Gerrit-Change-Number: 12746
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils

[Harald Welte]

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

Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils
..

osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils

Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff
---
M recipes-osmocom/osmo-hlr/osmo-hlr.inc
1 file changed, 15 insertions(+), 1 deletion(-)

Approvals:
  Pau Espin Pedrol: Verified
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc 
b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
index 6d8b748..946784b 100644
--- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc
+++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
@@ -5,7 +5,7 @@

 DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native"

-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"

 inherit autotools pkgconfig systemd

@@ -24,6 +24,20 @@
install -m 0644 ${WORKDIR}/hlr.db 
${D}${localstatedir}/lib/osmocom/hlr.db
 }

+PACKAGES =+ "libosmo-gsup-client libosmo-gsup-client-dev osmo-hlr-utils"
+
+FILES_libosmo-gsup-client = "${libdir}/libosmo-gsup-client${SOLIBS}"
+FILES_libosmo-gsup-client-dev = " \
+   ${includedir}/osmocom/gsupclient \
+   ${libdir}/pkgconfig/libosmo-gsup-client.pc \
+   ${libdir}/libosmo-gsup-client${SOLIBSDEV} \
+   "
+
+FILES_osmo-hlr-utils = " \
+   ${bindir}/osmo-hlr-db-tool \
+   ${bindir}/osmo-euse-demo \
+   "
+
 SYSTEMD_SERVICE_${PN} = "${PN}.service"
 CONFFILES_osmo-hlr = "\
${sysconfdir}/osmocom/osmo-hlr.cfg \

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff
Gerrit-Change-Number: 12743
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-mgw: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-mgw: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11
Gerrit-Change-Number: 12750
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:24 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-sgsn: Depend on osmo-hlr

[Harald Welte]

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

Change subject: osmo-sgsn: Depend on osmo-hlr
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I44ce22d6c4b532b159fbdc7d5494830673db2509
Gerrit-Change-Number: 12756
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:55 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: Install osmo-bsc-nat service from git repo

[Harald Welte]

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

Change subject: openbsc: Install osmo-bsc-nat service from git repo
..

openbsc: Install osmo-bsc-nat service from git repo

Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5
---
M recipes-osmocom/openbsc/openbsc.inc
1 file changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/openbsc/openbsc.inc 
b/recipes-osmocom/openbsc/openbsc.inc
index 66782fb..f76afb7 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -20,7 +20,7 @@
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-sccplite/osmo-bsc-sccplite.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg
-   install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg 
${D}${sysconfdir}/osmocom/
+   install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg

# Install sysv-init files
install -d ${D}${sysconfdir}/init.d
@@ -32,6 +32,7 @@
install -d ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/contrib/systemd/osmo-nitb.service 
${D}${systemd_system_unitdir}/
install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service 
${D}${systemd_system_unitdir}/
+   install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service 
${D}${systemd_system_unitdir}/

install -d ${D}/var/lib/osmocom

@@ -65,6 +66,7 @@

 CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"
 FILES_osmo-bsc-nat = " \
-   ${bindir}/osmo-bsc_nat \
-   ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \
-   "
+   ${bindir}/osmo-bsc_nat \
+   ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \
+   ${systemd_system_unitdir}/osmo-bsc-nat.service \
+   "

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5
Gerrit-Change-Number: 12739
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: libosmo-sccp: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: libosmo-sccp: handle systemd and cfg files through autotools
..

libosmo-sccp: handle systemd and cfg files through autotools

Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c
---
M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
1 file changed, 6 insertions(+), 9 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc 
b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
index 60793e3..78dd525 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
@@ -3,12 +3,17 @@
 HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp;
 LICENSE = "AGPLv3"

-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"

 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"

 inherit autotools pkgconfig systemd

+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
+
 # we require the tests to link to the static libosmo-sigtran library to
 # access symbols not starting with osmo_*
 EXTRA_OECONF_remove = "--disable-static"
@@ -17,14 +22,6 @@
 SYSTEMD_PACKAGES = "osmo-stp"
 SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service"

-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/12744
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c
Gerrit-Change-Number: 12744
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-sip-connector: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-sip-connector: handle systemd and cfg files through 
autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805
Gerrit-Change-Number: 12753
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:40 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-bsc: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-bsc: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0
Gerrit-Change-Number: 12752
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:35 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: Drop untested sysvinit support

[Harald Welte]

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

Change subject: openbsc: Drop untested sysvinit support
..

openbsc: Drop untested sysvinit support

These bits come from times were sysvinit was used in stead of systemd in
yocto. Nowadays nobody is known to be using the recipes with sysvinit
instead of systemd, and anyway most osmocom recipes doesn't come with
sysvinit support, so let's drop it. If sysvinit support is required, it
should be added through autotools install process instead.

As update-rc.d was removed, it was noticied that systemd class inherit
was missing, so this commit adds it. As a result, it's not required to
define systemd service file paths in FILES_*.

Change-Id: I864e4a61aed7933c46b80aa26598234faba43395
---
M recipes-osmocom/openbsc/openbsc.inc
D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init
D recipes-osmocom/openbsc/openbsc/osmo-nitb.init
3 files changed, 1 insertion(+), 118 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/openbsc/openbsc.inc 
b/recipes-osmocom/openbsc/openbsc.inc
index ec130db..ca3b124 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -6,15 +6,11 @@

 RDEPENDS_osmo-nitb = "libdbd-sqlite3"

-SRC_URI = "file://osmo-nitb.init \
-  file://osmo-bsc-sccplite.init \
-  "
-
 INC_PR = "r3.${META_TELEPHONY_OSMO_INC}"

 EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp 
--enable-mgcp-transcoding --with-g729"

-inherit autotools update-rc.d pkgconfig
+inherit autotools systemd pkgconfig

 do_install_append() {
install -d ${D}${sysconfdir}/osmocom
@@ -23,12 +19,6 @@
install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg
install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.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-sccplite.init 
${D}${sysconfdir}/init.d/osmo-bsc-sccplite
-
# Install systemd files and enable on sysinit
install -d ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/contrib/systemd/osmo-nitb.service 
${D}${systemd_system_unitdir}/
@@ -42,27 +32,18 @@

 PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"
 SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"
-INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb"

 CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg"
 SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service"
-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"
 SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service"
-INITSCRIPT_NAME_osmo-nitb = "osmo-nitb"
-INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30"
 FILES_osmo-nitb = " ${bindir}/osmo-nitb \
/var/lib/osmocom \
-   ${sysconfdir}/init.d/osmo-nitb \
${sysconfdir}/osmocom/osmo-nitb.cfg \
-   ${systemd_system_unitdir}/osmo-nitb.service \
"

 CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"
@@ -70,7 +51,6 @@
 FILES_osmo-bsc-nat = " \
${bindir}/osmo-bsc_nat \
${sysconfdir}/osmocom/osmo-bsc_nat.cfg \
-   ${systemd_system_unitdir}/osmo-bsc-nat.service \
"

 CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg"
@@ -78,5 +58,4 @@
 FILES_osmo-bsc-mgcp = " \
${bindir}/osmo-bsc_mgcp \
${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \
-   ${systemd_system_unitdir}/osmo-bsc-mgcp.service \
"
diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init 
b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init
deleted file mode 100755
index 3186f6d..000
--- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:osmo-bsc-sccplite
-# Required-Start:  $syslog $networking
-# Required-Stop:   $syslog
-# Default-Start:   5
-# Default-Stop:1
-# Short-Description:   Osmocom GSM Base Station Controller (legacy, with 
SCCPLite)
-### END INIT INFO
-

Change in meta-telephony[201705]: osmo-msc: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-msc: handle systemd and cfg files through autotools
..

osmo-msc: handle systemd and cfg files through autotools

Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a
---
M recipes-osmocom/osmo-msc/osmo-msc.inc
1 file changed, 7 insertions(+), 10 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc 
b/recipes-osmocom/osmo-msc/osmo-msc.inc
index e5364cd..59280ce 100644
--- a/recipes-osmocom/osmo-msc/osmo-msc.inc
+++ b/recipes-osmocom/osmo-msc/osmo-msc.inc
@@ -5,23 +5,20 @@

 DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw 
osmo-hlr"

-INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"

 inherit autotools pkgconfig systemd

-PACKAGECONFIG ??= "smpp ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}"
+PACKAGECONFIG ??= "\
+smpp \
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
 PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c osmo-iuh,"
 PACKAGECONFIG[smpp] = "--enable-smpp,--disable-smpp,libsmpp34,"

 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"
 CONFFILES_osmo-msc = "${sysconfdir}/osmocom/osmo-msc.cfg"

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a
Gerrit-Change-Number: 12751
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-mgw: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-mgw: handle systemd and cfg files through autotools
..

osmo-mgw: handle systemd and cfg files through autotools

Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11
---
M recipes-osmocom/osmo-mgw/osmo-mgw.inc
1 file changed, 5 insertions(+), 8 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc 
b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
index 19e17ab..c00f998 100644
--- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc
+++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
@@ -5,17 +5,14 @@

 DEPENDS = "libosmocore libosmo-netif"

-INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${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-mgw/osmo-mgw.cfg 
${D}${sysconfdir}/osmocom/osmo-mgw.cfg
-   install -m 0644 ${S}/contrib/systemd/osmo-mgw.service 
${D}${systemd_system_unitdir}/
-}
+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"

 PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client 
libosmo-mgcp-client-dev"
 SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service"

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab265207f534f5d2b5960b707081b06aa5d34d11
Gerrit-Change-Number: 12750
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-bsc: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-bsc: handle systemd and cfg files through autotools
..

osmo-bsc: handle systemd and cfg files through autotools

Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0
---
M recipes-osmocom/osmo-bsc/osmo-bsc.inc
1 file changed, 5 insertions(+), 9 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc 
b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
index d066a58..484a779 100644
--- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
@@ -5,18 +5,14 @@

 DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif 
osmo-mgw"

-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${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}/contrib/systemd/osmo-bsc.service 
${D}${systemd_system_unitdir}/
-}
+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"

 PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find"
 SYSTEMD_PACKAGES = "osmo-bsc"

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I752503f1ad7562ead50ec2bb7be49a958b9dc0f0
Gerrit-Change-Number: 12752
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-sip-connector: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-sip-connector: handle systemd and cfg files through 
autotools
..

osmo-sip-connector: handle systemd and cfg files through autotools

Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805
---
M recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc
1 file changed, 5 insertions(+), 7 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc 
b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc
index d7f22a3..96d3734 100644
--- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc
+++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector.inc
@@ -5,17 +5,15 @@

 DEPENDS = "sofia-sip libosmocore"

-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"

 inherit autotools pkgconfig systemd

-do_install_append() {
-   install -d ${D}${systemd_system_unitdir}/
-   install -d ${D}${sysconfdir}/osmocom/
+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"

-   install -m 0644 ${S}/doc/examples/osmo-sip-connector.cfg 
${D}${sysconfdir}/osmocom/

-   install -m 0644 ${S}/contrib/systemd/osmo-sip-connector.service 
${D}${systemd_system_unitdir}/
-}
 SYSTEMD_SERVICE_${PN} = "${PN}.service"
 CONFFILES_osmo-sip-connector = "${sysconfdir}/osmocom/osmo-sip-connector.cfg"

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I88fa636fdc97dbd1c8d13358fb48d157bd95c805
Gerrit-Change-Number: 12753
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-ggsn: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-ggsn: handle systemd and cfg files through autotools
..

osmo-ggsn: handle systemd and cfg files through autotools

Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a
---
M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
1 file changed, 8 insertions(+), 11 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc 
b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
index fe0170f..0aaf418 100644
--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
@@ -5,22 +5,19 @@

 DEPENDS = "libosmocore"

-INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools pkgconfig systemd
+
+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"

 PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu"
 RDEPENDS_${PN} += "iptables"
 RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun"

-inherit autotools pkgconfig systemd
-
-do_install_append() {
-   install -d ${D}${systemd_system_unitdir}/
-   install -d ${D}/${sysconfdir}/osmocom/
-
-   install -m 0644 ${S}/contrib/osmo-ggsn.service 
${D}${systemd_system_unitdir}/
-   install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg 
${D}${sysconfdir}/osmocom/
-}
-
 SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service"

 CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg"

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a
Gerrit-Change-Number: 12748
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-sgsn: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-sgsn: handle systemd and cfg files through autotools
..

osmo-sgsn: handle systemd and cfg files through autotools

At the same time systemd services were installed by autotools,
osmo-gtphub service became available too.

Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852
---
M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
1 file changed, 8 insertions(+), 15 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 
b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
index 4711a2c..45256a5 100644
--- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
+++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
@@ -5,29 +5,22 @@

 DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn"

-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"

 inherit autotools pkgconfig systemd

-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}"
+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
 PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh,"

-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}/doc/examples/osmo-gtphub/osmo-gtphub.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_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub"
 SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service"
 SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service"
+SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service"

 CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg"


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852
Gerrit-Change-Number: 12749
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-iuh: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-iuh: handle systemd and cfg files through autotools
..

osmo-iuh: handle systemd and cfg files through autotools

Change-Id: If879153a32ae21ad63284382a420da534f30e6eb
---
M recipes-osmocom/osmo-iuh/osmo-iuh.inc
1 file changed, 5 insertions(+), 8 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc 
b/recipes-osmocom/osmo-iuh/osmo-iuh.inc
index 6dfb344..ab412ad 100644
--- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc
+++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc
@@ -5,17 +5,14 @@

 DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c"

-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${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}/
-}
+PACKAGECONFIG ??= "\
+${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"

 PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw"
 SYSTEMD_PACKAGES = "osmo-hnbgw"

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb
Gerrit-Change-Number: 12745
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: openbsc: Package osmo-bsc-mgcp

[Harald Welte]

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

Change subject: openbsc: Package osmo-bsc-mgcp
..

openbsc: Package osmo-bsc-mgcp

Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee
---
M recipes-osmocom/openbsc/openbsc.inc
1 file changed, 13 insertions(+), 3 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/openbsc/openbsc.inc 
b/recipes-osmocom/openbsc/openbsc.inc
index ca9a6c6..ec130db 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -10,7 +10,7 @@
   file://osmo-bsc-sccplite.init \
   "

-INC_PR = "r2.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r3.${META_TELEPHONY_OSMO_INC}"

 EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp 
--enable-mgcp-transcoding --with-g729"

@@ -21,6 +21,7 @@
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-sccplite/osmo-bsc-sccplite.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg
install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg
+   install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg 
${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg

# Install sysv-init files
install -d ${D}${sysconfdir}/init.d
@@ -33,13 +34,14 @@
install -m 0644 ${S}/contrib/systemd/osmo-nitb.service 
${D}${systemd_system_unitdir}/
install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service 
${D}${systemd_system_unitdir}/
install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service 
${D}${systemd_system_unitdir}/
+   install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service 
${D}${systemd_system_unitdir}/

install -d ${D}/var/lib/osmocom

 }

-PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb"
-SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb"
+PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"
+SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"
 INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb"

 CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg"
@@ -70,3 +72,11 @@
${sysconfdir}/osmocom/osmo-bsc_nat.cfg \
${systemd_system_unitdir}/osmo-bsc-nat.service \
"
+
+CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg"
+SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service"
+FILES_osmo-bsc-mgcp = " \
+   ${bindir}/osmo-bsc_mgcp \
+   ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \
+   ${systemd_system_unitdir}/osmo-bsc-mgcp.service \
+   "

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee
Gerrit-Change-Number: 12741
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr

[Harald Welte]

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

Change subject: osmo-msc: Depend on osmo-hlr
..

osmo-msc: Depend on osmo-hlr

Since a while ago, osmo-msc depends on libosmo-gsup-client which is
provided by osmo-hlr.

Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9
---
M recipes-osmocom/osmo-msc/osmo-msc.inc
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc 
b/recipes-osmocom/osmo-msc/osmo-msc.inc
index 06f5b10..e5364cd 100644
--- a/recipes-osmocom/osmo-msc/osmo-msc.inc
+++ b/recipes-osmocom/osmo-msc/osmo-msc.inc
@@ -3,9 +3,9 @@
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"

-DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw"
+DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw 
osmo-hlr"

-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"

 inherit autotools pkgconfig systemd


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9
Gerrit-Change-Number: 12742
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Max 

Change in meta-telephony[201705]: openbsc: Use systemd.bbclass correctly

[Harald Welte]

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

Change subject: openbsc: Use systemd.bbclass correctly
..

openbsc: Use systemd.bbclass correctly

* Describe packages containing systemd services in SYSTEMD_PACKAGES.
* Enable services by default, since now osmo-bsc-sccplite doesn't collide
with osmo-bsc.git's osmo-bsc.
* Add SYSTEMD_SERVICE_* to specify service file for each package.

Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd
---
M recipes-osmocom/openbsc/openbsc.inc
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/openbsc/openbsc.inc 
b/recipes-osmocom/openbsc/openbsc.inc
index f76afb7..ca9a6c6 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -39,13 +39,11 @@
 }

 PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb"
-
+SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb"
 INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb"

-# Do not start any of the services by default
-SYSTEMD_AUTO_ENABLE = "disable"
-
 CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg"
+SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service"
 INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite"
 INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30"
 FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \
@@ -55,16 +53,18 @@
"

 CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg"
+SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service"
 INITSCRIPT_NAME_osmo-nitb = "osmo-nitb"
 INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30"
 FILES_osmo-nitb = " ${bindir}/osmo-nitb \
/var/lib/osmocom \
${sysconfdir}/init.d/osmo-nitb \
${sysconfdir}/osmocom/osmo-nitb.cfg \
-   ${systemd_unitdir}/system/osmo-nitb.service \
+   ${systemd_system_unitdir}/osmo-nitb.service \
"

 CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"
+SYSTEMD_SERVICE_osmo-bsc-nat = "osmo-bsc-nat.service"
 FILES_osmo-bsc-nat = " \
${bindir}/osmo-bsc_nat \
${sysconfdir}/osmocom/osmo-bsc_nat.cfg \

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd
Gerrit-Change-Number: 12740
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-msc: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-msc: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a
Gerrit-Change-Number: 12751
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: openbsc: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653
Gerrit-Change-Number: 12755
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:49 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: Drop untested sysvinit support

[Harald Welte]

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

Change subject: openbsc: Drop untested sysvinit support
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395
Gerrit-Change-Number: 12754
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:45 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: Install osmo-bsc-sccplite.service from git repo

[Harald Welte]

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

Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo
..

openbsc: Install osmo-bsc-sccplite.service from git repo

Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb
---
M recipes-osmocom/openbsc/openbsc.inc
D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service
2 files changed, 2 insertions(+), 15 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/openbsc/openbsc.inc 
b/recipes-osmocom/openbsc/openbsc.inc
index 9f23d52..66782fb 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -8,10 +8,9 @@

 SRC_URI = "file://osmo-nitb.init \
   file://osmo-bsc-sccplite.init \
-  file://osmo-bsc-sccplite.service \
   "

-INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r2.${META_TELEPHONY_OSMO_INC}"
 
 EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp 
--enable-mgcp-transcoding --with-g729"

@@ -32,7 +31,7 @@
# Install systemd files and enable on sysinit
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 -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service 
${D}${systemd_system_unitdir}/

install -d ${D}/var/lib/osmocom

diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service 
b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service
deleted file mode 100644
index 3edd35c..000
--- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=OpenBSC BSC (legacy, with SCCPLite)
-Wants=osmo-bsc-mgcp.service
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=/usr/bin/osmo-bsc-sccplite -c /etc/osmocom/osmo-bsc-sccplite.cfg -s
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb
Gerrit-Change-Number: 12738
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-iuh: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-iuh: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: If879153a32ae21ad63284382a420da534f30e6eb
Gerrit-Change-Number: 12745
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:13:48 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-ggsn: Drop untested sysvinit support

[Harald Welte]

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

Change subject: osmo-ggsn: Drop untested sysvinit support
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6
Gerrit-Change-Number: 12747
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-hlr: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-hlr: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I1e3725c6ffef9223015df8cf76b5d5c884a76fce
Gerrit-Change-Number: 12746
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:00 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-sgsn: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-sgsn: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib84a3c8634db2282b2d3757ae7c044a196720852
Gerrit-Change-Number: 12749
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:19 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-ggsn: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: osmo-ggsn: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I3c220c11f58793c644d750040c7fad347500bb8a
Gerrit-Change-Number: 12748
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:14:17 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: libosmo-sccp: handle systemd and cfg files through autotools

[Harald Welte]

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

Change subject: libosmo-sccp: handle systemd and cfg files through autotools
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c
Gerrit-Change-Number: 12744
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:13:40 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils

[Harald Welte]

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

Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff
Gerrit-Change-Number: 12743
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:11:15 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: Package osmo-bsc-mgcp

[Harald Welte]

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

Change subject: openbsc: Package osmo-bsc-mgcp
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I622e2752c878753d1b4b4ccc943fa430b055ffee
Gerrit-Change-Number: 12741
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:10:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: Use systemd.bbclass correctly

[Harald Welte]

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

Change subject: openbsc: Use systemd.bbclass correctly
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd
Gerrit-Change-Number: 12740
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:10:41 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp

[Harald Welte]

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

Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1
Gerrit-Change-Number: 12737
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:09:57 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: Install osmo-bsc-sccplite.service from git repo

[Harald Welte]

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

Change subject: openbsc: Install osmo-bsc-sccplite.service from git repo
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I4d308a62fefd6f3b8d944eb6a84427437c2844bb
Gerrit-Change-Number: 12738
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:10:12 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: openbsc: Install osmo-bsc-nat service from git repo

[Harald Welte]

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

Change subject: openbsc: Install osmo-bsc-nat service from git repo
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: Id9d1a2ea74e41baf3ab292e446a0402cd0cf55e5
Gerrit-Change-Number: 12739
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:10:31 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases

[Harald Welte]

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

Change subject: Update osmocom recipes to latest tag releases
..

Update osmocom recipes to latest tag releases

Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9
---
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/osmo-bsc/osmo-bsc_git.bb
M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb
M recipes-osmocom/osmo-msc/osmo-msc_git.bb
M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb
M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb
M recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb
14 files changed, 28 insertions(+), 28 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb 
b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index 98e5192..3032d28 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc

 S = "${WORKDIR}/git"
-SRCREV = "026ff4574daedcf91a474f9bc67e90e8537a9d86"
+SRCREV = "176a1fbab6ae45eb1c60e3d8b263b0765759e1da"
 SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
-PV = "0.5.1+gitr${SRCPV}"
+PV = "0.6.0+gitr${SRCPV}"
 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 d71810f..73c6314 100644
--- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
+++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc

 S = "${WORKDIR}/git"
-SRCREV = "322dbbeaa29cb90c6917fa7e78a66b96b8ce3689"
+SRCREV = "c775ffe1cc6cfd842566d30c96d287502d9d6218"
 SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git"
-PV = "0.3.0+gitr${SRCPV}"
+PV = "0.4.0+gitr${SRCPV}"
 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 751bf70..6bdea27 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc

 S = "${WORKDIR}/git"
-SRCREV = "688f2304056029f47073a549d7e41043eab5a0fd"
+SRCREV = "81c6a0a97980f9da76ef0e698ca6ab526b98c7c2"
 SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
-PV = "0.10.0+gitr${SRCPV}"
+PV = "1.0.0+gitr${SRCPV}"
 PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb 
b/recipes-osmocom/libosmocore/libosmocore_git.bb
index 6d00c0d..8eca57f 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,10 +1,10 @@
 require ${PN}.inc

 S = "${WORKDIR}/git"
-SRCREV = "b8a91625dd974f596214646da345d9d649f4dae3"
+SRCREV = "d4c406a04eae0071da4fb7aecd3cb47acd0fdab6"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
-PV = "0.12.1+gitr${SRCPV}"
-PR = "r0"
+PV = "1.0.1+gitr${SRCPV}"
+PR = "${INC_PR}.0"

 PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty 
osmo-arfcn osmo-auc-gen"
 FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}"
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb 
b/recipes-osmocom/openbsc/openbsc_git.bb
index e3af4bc..7dbb07a 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -1,10 +1,10 @@
 require ${PN}.inc

-PV = "1.1.0+gitr${SRCPV}"
+PV = "1.2.0+gitr${SRCPV}"
 PRINC = "0"
 PR = "${INC_PR}.0"

-SRCREV = "cc69659217d19af5635638a0fbd4f0702f79bac4"
+SRCREV = "ed8815e723b41e9800f14c67bccd34e51a06beb6"
 SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"

 S = "${WORKDIR}/git/openbsc"
diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb 
b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
index e31dc59..56e7eb4 100644
--- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc

 S = "${WORKDIR}/git"
-SRCREV = "08d02dd5100cbff47922427e3beb31a3373bf75c"
+SRCREV = "117fa9d92d0da3d94a51cbfc1cbeb0d5bdcd3767"
 SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git"
-PV = "1.3.0+gitr${SRCPV}"
+PV = "1.4.0+gitr${SRCPV}"
 PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 
b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
index 5219c03..4cc65b0 100644
--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
@@ -1,10 +1,10 @@
 require ${PN}.inc

 S = "${WORKDIR}/git"
-SRCREV = "b673d1c438488fb74abda344e563d733e5ce451a"

Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases

[Harald Welte]

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

Change subject: Update osmocom recipes to latest tag releases
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9
Gerrit-Change-Number: 12736
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:09:45 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp

[Harald Welte]

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

Change subject: osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp
..

osmo-mgw: Remove osmo-bsc_mgcp and libosmo-legacy-mgcp

Since osmo-mgw.git 31b4729f2731c747b8b33c4646dd5ade2ace29bc those have
been removed entirely from the repo and are only available trhough
openbsc.git.

Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1
---
M recipes-osmocom/osmo-mgw/osmo-mgw.inc
1 file changed, 3 insertions(+), 23 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc 
b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
index b083a9c..19e17ab 100644
--- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc
+++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
@@ -3,35 +3,22 @@
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"

-DEPENDS = "libosmocore libosmo-netif bcg729 libgsm"
+DEPENDS = "libosmocore libosmo-netif"

-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${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}/
-
install -m 0644 ${S}/doc/examples/osmo-mgw/osmo-mgw.cfg 
${D}${sysconfdir}/osmocom/osmo-mgw.cfg
install -m 0644 ${S}/contrib/systemd/osmo-mgw.service 
${D}${systemd_system_unitdir}/
 }
 
-PACKAGES =+ " libosmo-legacy-mgcp libosmo-legacy-mgcp-dev libosmo-mgcp 
libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev osmo-bsc-mgcp"
+PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client 
libosmo-mgcp-client-dev"
 SYSTEMD_SERVICE_osmo-mgw = "osmo-mgw.service"
-SYSTEMD_SERVICE_osmo-bsc-mgcp = "osmo-bsc-mgcp.service"
-
-FILES_libosmo-legacy-mgcp = "${libdir}/libosmo-legacy-mgcp${SOLIBS}"
-FILES_libosmo-legacy-mgcp-dev = " \
-   ${includedir}/osmocom/legacy_mgcp \
-   ${libdir}/pkgconfig/libosmo-legacy-mgcp.pc \
-   ${libdir}/libosmo-legacy-mgcp${SOLIBSDEV} \
-   "

 FILES_libosmo-mgcp = "${libdir}/libosmo-mgcp${SOLIBS}"
 FILES_libosmo-mgcp-dev = " \
@@ -47,11 +34,4 @@
${libdir}/libosmo-mgcp-client${SOLIBSDEV} \
"

-FILES_osmo-bsc-mgcp = " \
-   ${bindir}/osmo-bsc_mgcp \
-   ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \
-   ${systemd_unitdir}/system/osmo-bsc-mgcp.service \
-   "
-CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg"
-
 CONFFILES_osmo-mgw = "${sysconfdir}/osmocom/osmo-mgw.cfg"

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: If07c4af918304db7611f21cd203e4e4670616cf1
Gerrit-Change-Number: 12737
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr

[Harald Welte]

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

Change subject: osmo-msc: Depend on osmo-hlr
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9
Gerrit-Change-Number: 12742
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Max 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:09:19 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ci[master]: osmocom-jenkins-slave: Deploy osmo-ci and build docker images

[Harald Welte]

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

Change subject: osmocom-jenkins-slave: Deploy osmo-ci and build docker images
..

osmocom-jenkins-slave: Deploy osmo-ci and build docker images

This is periodically performed by 
https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves
but in order to get to the point of updating it, we must at least
have done one initial deployment of the repository before.  This is
done by the takss in the new osmo-ci.yml

Closes: OS#3773
Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448
---
M ansible/roles/osmocom-jenkins-slave/tasks/main.yml
A ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
2 files changed, 23 insertions(+), 0 deletions(-)

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



diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml 
b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
index 36bc424..6d15ea1 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
@@ -25,6 +25,10 @@
   include_tasks: generic-slave.yml
   when: generic_slave

+- name: set-up osmo-ci repo
+  include_tasks: osmo-ci.yml
+  when: generic_slave
+
 - name: install ttcn3 dependencies
   include_tasks: ttcn3-slave.yml
   when: ttcn3_slave and ansible_distribution == 'Debian' and 
ansible_distribution_version >= '9'
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml 
b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
new file mode 100644
index 000..d002f95
--- /dev/null
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
@@ -0,0 +1,19 @@
+---
+
+# this is from the "update-osmo-ci-on-slaves" jenkins job.  However,
+# we need to initially install osmo-ci and the docker images *before*
+# that jenkins job can execute subsequent updates
+
+- name: deploy osmo-ci to home directory
+  become: yes
+  become_user: "{{ jenkins_user }}"
+  git:
+repo: "https://git.osmocom.org/osmo-ci;
+dest: "/home/{{ jenkins_user }}/osmo-ci"
+
+- name: rebuild osmocom docker images for jenkins build tests
+  become: yes
+  become_user: "{{ jenkins_user }}"
+  shell: ./rebuild_osmocom_jenkins_image.sh
+  args:
+chdir: "/home/{{ jenkins_user }}/osmo-ci/docker"

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448
Gerrit-Change-Number: 12767
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 

Change in osmo-ci[master]: osmocom-jenkins-slave: Deploy osmo-ci and build docker images

[Harald Welte]

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

Change subject: osmocom-jenkins-slave: Deploy osmo-ci and build docker images
..


Patch Set 1: Verified+1 Code-Review+2


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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448
Gerrit-Change-Number: 12767
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Thu, 31 Jan 2019 21:08:29 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failed in Jenkins: master-osmo-sgsn » --enable-iu,0,a3=default,a4=default,osmocom-master-debian9 #8476

[jenkins]

See 


--
[...truncated 14.62 KB...]
chmod: changing permissions of './.git/refs/tags/0.9.1': Operation not permitted
chmod: changing permissions of './.git/refs/tags/1.4.0': Operation not permitted
chmod: changing permissions of './.git/refs/tags/debian': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/debian/0.9.14-0_jrsantos.1': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.5': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.2': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.1': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/debian/0.9.14-0_jrsantos.2': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.4': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/debian/0.9.13-0_jrsantos.3': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/0.9.11': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/0.11.0': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/0.9.3': Operation not permitted
chmod: changing permissions of './.git/refs/tags/1.1.0': Operation not permitted
chmod: changing permissions of './.git/refs/tags/sysmocom': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/sysmocom/iu_orig_history': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/sysmocom/iu_before_collapse': 
Operation not permitted
chmod: changing permissions of './.git/refs/tags/on-waves': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.4': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.13': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.11': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.12': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.2': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.14': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.92': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.7': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.1': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.96': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.2': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.95': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.17': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.16': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.5': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.3': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.8': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.6': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.4': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.20': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.9': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.2': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.10': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.97': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.18': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.21': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.1': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.93': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.1': Operation not 
permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.91': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.98.2': Operation 
not permitted
chmod: changing permissions of './.git/refs/tags/on-waves/0.3.99.19': Operation 
not permitted
chmod: 

Change in osmo-ci[master]: osmocom-jenkins-slave: Deploy osmo-ci and build docker images

[Harald Welte]

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


Change subject: osmocom-jenkins-slave: Deploy osmo-ci and build docker images
..

osmocom-jenkins-slave: Deploy osmo-ci and build docker images

This is periodically performed by 
https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves
but in order to get to the point of updating it, we must at least
have done one initial deployment of the repository before.  This is
done by the takss in the new osmo-ci.yml

Closes: OS#3773
Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448
---
M ansible/roles/osmocom-jenkins-slave/tasks/main.yml
A ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
2 files changed, 23 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/67/12767/1

diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml 
b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
index 36bc424..6d15ea1 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
@@ -25,6 +25,10 @@
   include_tasks: generic-slave.yml
   when: generic_slave

+- name: set-up osmo-ci repo
+  include_tasks: osmo-ci.yml
+  when: generic_slave
+
 - name: install ttcn3 dependencies
   include_tasks: ttcn3-slave.yml
   when: ttcn3_slave and ansible_distribution == 'Debian' and 
ansible_distribution_version >= '9'
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml 
b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
new file mode 100644
index 000..d002f95
--- /dev/null
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
@@ -0,0 +1,19 @@
+---
+
+# this is from the "update-osmo-ci-on-slaves" jenkins job.  However,
+# we need to initially install osmo-ci and the docker images *before*
+# that jenkins job can execute subsequent updates
+
+- name: deploy osmo-ci to home directory
+  become: yes
+  become_user: "{{ jenkins_user }}"
+  git:
+repo: "https://git.osmocom.org/osmo-ci;
+dest: "/home/{{ jenkins_user }}/osmo-ci"
+
+- name: rebuild osmocom docker images for jenkins build tests
+  become: yes
+  become_user: "{{ jenkins_user }}"
+  shell: ./rebuild_osmocom_jenkins_image.sh
+  args:
+chdir: "/home/{{ jenkins_user }}/osmo-ci/docker"

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I581b8713cfdb3ca2ef7f0925730974056981e448
Gerrit-Change-Number: 12767
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 

Change in osmo-asf4-dfu[master]: avoid mutli-packet USB transfer

[Kévin Redon]

Kévin Redon has posted comments on this change. ( 
https://gerrit.osmocom.org/12595 )

Change subject: avoid mutli-packet USB transfer
..


Patch Set 2: Code-Review-1

do not review until I found the next packer length issue


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

Gerrit-Project: osmo-asf4-dfu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Icb4c5f4bc06095f5f962152b8d8247054ef6a520
Gerrit-Change-Number: 12595
Gerrit-PatchSet: 2
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Kévin Redon 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Thu, 31 Jan 2019 18:17:56 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-asf4-dfu[master]: remove OCTSIM in USB ID

[Kévin Redon]

Kévin Redon has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12609 )

Change subject: remove OCTSIM in USB ID
..

remove OCTSIM in USB ID

this bootloader is initiated and meant for the sysmo-OCTSIM, but
it can be applied for other SAM E5x/D5x boards.
Thus we remove the OCTSIM name an just use the more generic
bootloader name.

Change-Id: Icc46f0d8b4b649fd00b5c6cea5bad91a93891f14
---
M config/usbd_config.h
M usb/class/dfu/device/dfudf_desc.h
2 files changed, 31 insertions(+), 31 deletions(-)

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



diff --git a/config/usbd_config.h b/config/usbd_config.h
index 96b3320..c20dfb2 100644
--- a/config/usbd_config.h
+++ b/config/usbd_config.h
@@ -23,7 +23,7 @@
 #endif
 //  Language IDs
 //  Language IDs in c format, split by comma (E.g., 0x0409 ...)
-//  usb_dufd_langid
+//  usb_dfud_langid
 #ifndef CONF_USB_DFUD_LANGID
 #define CONF_USB_DFUD_LANGID "0x0409"
 #endif
@@ -69,33 +69,33 @@
 // <0x0010=> 16 bytes
 // <0x0020=> 32 bytes
 // <0x0040=> 64 bytes
-//  usb_dufd_bmaxpksz0
+//  usb_dfud_bmaxpksz0
 #ifndef CONF_USB_DFUD_BMAXPKSZ0
 #define CONF_USB_DFUD_BMAXPKSZ0 0x40
 #endif

 //  idVendor <0x-0x>
 // <0x1d50=> OpenMoko
-//  usb_octsim_idvendor
-#ifndef CONF_USB_OCTSIM_IDVENDOR
-#define CONF_USB_OCTSIM_IDVENDOR 0x1d50
+//  usb_dfud_idvendor
+#ifndef CONF_USB_OPENMOKO_IDVENDOR
+#define CONF_USB_OPENMOKO_IDVENDOR 0x1d50
 #endif

 //  idProduct <0x-0x>
-// <0x6140=> sysmoOCTSIM
-//  usb_dufd_idproduct
-#ifndef CONF_USB_OCTSIM_IDPRODUCT
-#define CONF_USB_OCTSIM_IDPRODUCT 0x6140
+// <0x6140=> osmo-ASF4-DFU
+//  usb_dfud_idproduct
+#ifndef CONF_USB_OSMOASF4DFU_IDPRODUCT
+#define CONF_USB_OSMOASF4DFU_IDPRODUCT 0x6140
 #endif

 //  bcdDevice <0x-0x>
-//  usb_dufd_bcddevice
+//  usb_dfud_bcddevice
 #ifndef CONF_USB_DFUD_BCDDEVICE
 #define CONF_USB_DFUD_BCDDEVICE 0x000
 #endif

 //  Enable string descriptor of iManufact
-//  usb_dufd_imanufact_en
+//  usb_dfud_imanufact_en
 #ifndef CONF_USB_DFUD_IMANUFACT_EN
 #define CONF_USB_DFUD_IMANUFACT_EN 1
 #endif
@@ -105,7 +105,7 @@
 #endif

 //  Unicode string of iManufact
-//  usb_dufd_imanufact_str
+//  usb_dfud_imanufact_str
 #ifndef CONF_USB_DFUD_IMANUFACT_STR
 #define CONF_USB_DFUD_IMANUFACT_STR "osmocom"
 #endif
@@ -117,7 +117,7 @@
 // 

 //  Enable string descriptor of iProduct
-//  usb_dufd_iproduct_en
+//  usb_dfud_iproduct_en
 #ifndef CONF_USB_DFUD_IPRODUCT_EN
 #define CONF_USB_DFUD_IPRODUCT_EN 1
 #endif
@@ -128,7 +128,7 @@
 #endif

 //  Unicode string of iProduct
-//  usb_dufd_iproduct_str
+//  usb_dfud_iproduct_str
 #ifndef CONF_USB_DFUD_IPRODUCT_STR
 #define CONF_USB_DFUD_IPRODUCT_STR "osmo-ASF4-DFU"
 #endif
@@ -140,7 +140,7 @@
 // 

 //  Enable string descriptor of iSerialNum
-//  usb_dufd_iserialnum_en
+//  usb_dfud_iserialnum_en
 #ifndef CONF_USB_DFUD_ISERIALNUM_EN
 #define CONF_USB_DFUD_ISERIALNUM_EN 0
 #endif
@@ -152,7 +152,7 @@
 #endif

 //  Unicode string of iSerialNum
-//  usb_dufd_iserialnum_str
+//  usb_dfud_iserialnum_str
 #ifndef CONF_USB_DFUD_ISERIALNUM_STR
 #define CONF_USB_DFUD_ISERIALNUM_STR "123456789ABCDEF"
 #endif
@@ -164,7 +164,7 @@
 // 

 //  bNumConfigurations <0x01-0xFF>
-//  usb_dufd_bnumconfig
+//  usb_dfud_bnumconfig
 #ifndef CONF_USB_DFUD_BNUMCONFIG
 #define CONF_USB_DFUD_BNUMCONFIG 0x1
 #endif
@@ -174,25 +174,25 @@
 //  DFU Configuration Descriptor
 
 //  wTotalLength <0x01-0xFF>
-//  usb_dufd_wtotallength
+//  usb_dfud_wtotallength
 #ifndef CONF_USB_DFUD_WTOTALLENGTH
 #define CONF_USB_DFUD_WTOTALLENGTH 27
 #endif

 //  bNumInterfaces <0x01-0xFF>
-//  usb_dufd_bnuminterfaces
+//  usb_dfud_bnuminterfaces
 #ifndef CONF_USB_DFUD_BNUMINTERFACES
 #define CONF_USB_DFUD_BNUMINTERFACES 1
 #endif

 //  bConfigurationValue <0x01-0xFF>
-//  usb_dufd_bconfigval
+//  usb_dfud_bconfigval
 #ifndef CONF_USB_DFUD_BCONFIGVAL
 #define CONF_USB_DFUD_BCONFIGVAL 0x1
 #endif

 //  Enable string descriptor of iConfig
-//  usb_dufd_iconfig_en
+//  usb_dfud_iconfig_en
 #ifndef CONF_USB_DFUD_ICONFIG_EN
 #define CONF_USB_DFUD_ICONFIG_EN 0
 #endif
@@ -205,7 +205,7 @@
 #endif

 //  Unicode string of iConfig
-//  usb_dufd_iconfig_str
+//  usb_dfud_iconfig_str
 #ifndef CONF_USB_DFUD_ICONFIG_STR
 #define CONF_USB_DFUD_ICONFIG_STR ""
 #endif
@@ -221,13 +221,13 @@
 // <0xA0=> Bus power supply, support for remote wakeup
 // <0xC0=> Self powered, not support for remote wakeup
 // <0xE0=> Self powered, support for remote wakeup
-//  usb_dufd_bmattri
+//  usb_dfud_bmattri
 #ifndef CONF_USB_DFUD_BMATTRI
 #define CONF_USB_DFUD_BMATTRI 0x80
 #endif

 //  bMaxPower <0x00-0xFF>
-//  usb_dufd_bmaxpower
+//  usb_dfud_bmaxpower
 #ifndef CONF_USB_DFUD_BMAXPOWER
 #define CONF_USB_DFUD_BMAXPOWER 0x32
 #endif
@@ -236,25 +236,25 @@
 //  DFU Interface Descriptor

 //  bInterfaceNumber <0x00-0xFF>
-//  usb_dufd_bifcnum
+//  usb_dfud_bifcnum
 #ifndef CONF_USB_DFUD_BIFCNUM
 #define 

Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr

[Pau Espin Pedrol]

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

Change subject: osmo-msc: Depend on osmo-hlr
..


Patch Set 1:

> Is this affected by https://gerrit.osmocom.org/c/meta-telephony/+/12743
 > ?

Not exactly, it's affected by the fact that we upgrade osmo-msc to a new 
version which links against libosmo-gsup-client lib (before that, iirc it had 
its own code embedded in osmo-msc.git).


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9
Gerrit-Change-Number: 12742
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Max 
Gerrit-Comment-Date: Thu, 31 Jan 2019 16:50:43 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in meta-telephony[201705]: Add libosmo-netif to osmo-sysmon dependencies

[Pau Espin Pedrol]

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

Change subject: Add libosmo-netif to osmo-sysmon dependencies
..


Patch Set 1: Code-Review-1

Since the feature afaiu is still not implemented and osmo-sysmon version used 
in 201705 still doesn't require libosmo-netif, let's either:
- Keep this patch here unmerged and then update it once the feature is added. 
New version of the patch should have too the commit hash in osmo-sysmon_git.bb 
updated.
- Submit this patch as it is against laforge/nightly, but better wait a bit 
because we are upgrading 201705 and we'll need to rebase that brach soon.


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I11dd06baf75f9bbb77642640280f6c624ce6d23d
Gerrit-Change-Number: 12757
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 16:47:46 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: Update osmocom recipes to latest tag releases

[Pau Espin Pedrol]

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

Change subject: Update osmocom recipes to latest tag releases
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12736/1/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb
File recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb:

https://gerrit.osmocom.org/#/c/12736/1/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb@6
PS1, Line 6: PV = "0.0.1+gitr${SRCPV}"
> I don't see any tags in the repository actually. […]
Correct, no tag, but we need to set some PV which we can later easily increase 
when we set a TAG, and 0.0.1 is a good candidate since it's the smallest one ;)



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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I1d24e39287769de7b4db235f984e4d4b72a5a3c9
Gerrit-Change-Number: 12736
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 16:42:50 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in libosmocore[master]: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years

[Neels Hofmeyr]

Hello Vadim Yanitskiy, Jenkins Builder,

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

https://gerrit.osmocom.org/12716

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

Change subject: osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years
..

osmo_fsm_inst_state_chg(): clamp timeout_secs to <= ~68 years

During testing of the upcoming tdef API, it became apparent that passing very
large timeout values to osmo_fsm_inst_state_chg() wraps back in the number
range, and might actually result in effectively very short timeouts instead.

Since time_t's range is not well defined across platforms, use a reasonable
maximum value of signed 32 bit integer. Hence this will be safe at least on
systems with an int32_t for struct timeval.tv_sec and larger.

Clamp the osmo_fsm_inst_state_chg() timeout_secs argument to a maximum of
0x7fff, which amounts to just above 68 years:
float(0x7fff) / (60. * 60 * 24 * 365.25) = 68.04965038532715

(In upcoming patch Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5, this can be
verified to work by invoking tdef_test manually with a cmdline argument passed
to enable the range check.)

Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a
---
M src/fsm.c
1 file changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/12716/4
--
To view, visit https://gerrit.osmocom.org/12716
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I35ec4654467b1d6040c8aa215049766089e5e64a
Gerrit-Change-Number: 12716
Gerrit-PatchSet: 4
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Harald Welte 

Change in libosmocore[master]: osmo_fsm_inst_state_chg(): set T also for zero timeout

[Neels Hofmeyr]

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

Change subject: osmo_fsm_inst_state_chg(): set T also for zero timeout
..

osmo_fsm_inst_state_chg(): set T also for zero timeout

Before this patch, if timeout_secs == 0 was passed to
osmo_fsm_inst_state_chg(), the previous T value remained set in the
osmo_fsm_inst->T.

For example:

  osmo_fsm_inst_state_chg(fi, ST_X, 23, 42);
  // timer == 23 seconds; fi->T == 42
  osmo_fsm_inst_state_chg(fi, ST_Y, 0, 0);
  // no timer; fi->T == 42!

Instead, always set to the T value passed to osmo_fsm_inst_state_chg().

Adjust osmo_fsm_inst_state_chg() API doc; need to rephrase to accurately
describe the otherwise unchanged behaviour independently from T.

Verify in fsm_test.c.

Rationale: it is confusing to have a T number remaining from some past state,
especially since the user explicitly passed a T number to
osmo_fsm_inst_state_chg(). (Usually we are passing timeout_secs=0, T=0).

I first thought this behavior was introduced with
osmo_fsm_inst_state_chg_keep_timer(), but in fact osmo_fsm_inst_state_chg()
behaved this way from the start.

This shows up in the C test for the upcoming tdef API, where the test result
printout was showing some past T value sticking around after FSM state
transitions. After this patch, there will be no such confusion.

Change-Id: I65c7c262674a1bc5f37faeca6aa0320ab0174f3c
---
M src/fsm.c
M tests/fsm/fsm_test.c
M tests/fsm/fsm_test.err
M tests/fsm/fsm_test.ok
4 files changed, 71 insertions(+), 7 deletions(-)

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



diff --git a/src/fsm.c b/src/fsm.c
index 1f6141f..ae7c0f5 100644
--- a/src/fsm.c
+++ b/src/fsm.c
@@ -458,9 +458,10 @@
fi->state = new_state;
st = >states[new_state];

-   if (!keep_timer && timeout_secs) {
+   if (!keep_timer) {
fi->T = T;
-   osmo_timer_schedule(>timer, timeout_secs, 0);
+   if (timeout_secs)
+   osmo_timer_schedule(>timer, timeout_secs, 0);
}

/* Call 'onenter' last, user might terminate FSM from there */
@@ -480,11 +481,17 @@
  *  function.  It verifies that the existing state actually permits a
  *  transition to new_state.
  *
- *  timeout_secs and T are optional parameters, and only have any effect
- *  if timeout_secs is not 0.  If the timeout function is used, then the
- *  new_state is entered, and the FSM instances timer is set to expire
- *  in timeout_secs functions.   At that time, the FSM's timer_cb
- *  function will be called for handling of the timeout by the user.
+ *  If timeout_secs is 0, stay in the new state indefinitely, without a timeout
+ *  (stop the FSM instance's timer if it was runnning).
+ *
+ *  If timeout_secs > 0, start or reset the FSM instance's timer with this
+ *  timeout. On expiry, invoke the FSM instance's timer_cb -- if no timer_cb is
+ *  set, an expired timer immediately terminates the FSM instance with
+ *  OSMO_FSM_TERM_TIMEOUT.
+ *
+ *  The value of T is stored in fi->T and is then available for query in
+ *  timer_cb. If passing timeout_secs == 0, it is recommended to also pass T ==
+ *  0, so that fi->T is reset to 0 when no timeout is invoked.
  *
  *  \param[in] fi FSM instance whose state is to change
  *  \param[in] new_state The new state into which we should change
diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c
index 34a8399..7aac8d3 100644
--- a/tests/fsm/fsm_test.c
+++ b/tests/fsm/fsm_test.c
@@ -349,6 +349,43 @@
fprintf(stderr, "--- %s() done\n", __func__);
 }

+static void test_state_chg_T()
+{
+   struct osmo_fsm_inst *fi;
+
+   fprintf(stderr, "\n--- %s()\n", __func__);
+
+   fsm.timer_cb = NULL;
+
+   /* Test setting to timeout_secs = 0, T = 0 */
+   fi = osmo_fsm_inst_alloc(, g_ctx, NULL, LOGL_DEBUG, NULL);
+   OSMO_ASSERT(fi);
+
+   osmo_fsm_inst_state_chg(fi, ST_ONE, 23, 42);
+   printf("T = %d\n", fi->T);
+   OSMO_ASSERT(fi->T == 42);
+   osmo_fsm_inst_state_chg(fi, ST_TWO, 0, 0);
+   printf("T = %d\n", fi->T);
+   OSMO_ASSERT(fi->T == 0);
+
+   osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL);
+
+   /* Test setting to timeout_secs = 0, T != 0 */
+   fi = osmo_fsm_inst_alloc(, g_ctx, NULL, LOGL_DEBUG, NULL);
+   OSMO_ASSERT(fi);
+
+   osmo_fsm_inst_state_chg(fi, ST_ONE, 23, 42);
+   printf("T = %d\n", fi->T);
+   OSMO_ASSERT(fi->T == 42);
+   osmo_fsm_inst_state_chg(fi, ST_TWO, 0, 11);
+   printf("T = %d\n", fi->T);
+   OSMO_ASSERT(fi->T == 11);
+
+   osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL);
+
+   fprintf(stderr, "--- %s() done\n", __func__);
+}
+
 static const struct log_info_cat default_categories[] = {
[DMAIN] = {
.name = "DMAIN",
@@ -390,6 

Jenkins build is back to normal : master-osmo-bsc » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #5038

[jenkins]

See 

Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12766 )

Change subject: Cosmetic: use #pragma once as include guard
..


Patch Set 1:

> It would be better to mention the file that was modified IMHO.

Agree with Oliver.


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd
Gerrit-Change-Number: 12766
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 15:52:24 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard

[osmith]

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

Change subject: Cosmetic: use #pragma once as include guard
..


Patch Set 1: Code-Review-1

(1 comment)

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

https://gerrit.osmocom.org/#/c/12766/1//COMMIT_MSG@7
PS1, Line 7: Cosmetic: use #pragma once as include guard
It would be better to mention the file that was modified IMHO. How about:
"Cosmetic: stream.h: use #pragma once"



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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd
Gerrit-Change-Number: 12766
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 15:45:20 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: Add missing include

[osmith]

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

Change subject: Add missing include
..


Patch Set 1: Code-Review-1

(1 comment)

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

https://gerrit.osmocom.org/#/c/12765/1//COMMIT_MSG@7
PS1, Line 7: Add missing include
Very generic title. How about:
"stream.h: add missing msgb.h libosmocore include"

(This also makes the first line of the next paragraph redundant.)



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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57
Gerrit-Change-Number: 12765
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 15:41:51 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default)

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/12730 )

Change subject: Inactive connection cleanup (disabled by default)
..


Patch Set 5: Code-Review+1


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

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0
Gerrit-Change-Number: 12730
Gerrit-PatchSet: 5
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 15:38:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default)

[osmith]

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

Change subject: Inactive connection cleanup (disabled by default)
..


Patch Set 5:

(1 comment)

https://gerrit.osmocom.org/#/c/12730/5/tests/mgcp/mgcp_test.c
File tests/mgcp/mgcp_test.c:

https://gerrit.osmocom.org/#/c/12730/5/tests/mgcp/mgcp_test.c@981
PS5, Line 981:  endp.cfg = 
> Why adding watchdog requires this change? And how was it working before?
This is needed, because mgcp_conn_watchdog_kick() looks up the timeout value in:
  conn->endp->cfg->conn_timeout

These tests used to have no cfg in endp, which means dereferencing a NULL 
pointer at this point. It was working before, because nothing called by this 
test had accessed endp->cfg.



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

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0
Gerrit-Change-Number: 12730
Gerrit-PatchSet: 5
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 15:37:16 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in meta-telephony[201705]: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/12743 )

Change subject: osmo-hlr: Split libosmo-gsup-client and osmo-hlr-utils
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: If19a2aac9cf414f9c590eb9670192abf6134c6ff
Gerrit-Change-Number: 12743
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 31 Jan 2019 15:33:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in meta-telephony[201705]: osmo-msc: Depend on osmo-hlr

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/12742 )

Change subject: osmo-msc: Depend on osmo-hlr
..


Patch Set 1:

Is this affected by https://gerrit.osmocom.org/c/meta-telephony/+/12743 ?


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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: comment
Gerrit-Change-Id: I66866d90b4e107d6d5a1bbb82e4ff16932d849d9
Gerrit-Change-Number: 12742
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Max 
Gerrit-Comment-Date: Thu, 31 Jan 2019 15:34:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-mgw[master]: Inactive connection cleanup (disabled by default)

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/12730 )

Change subject: Inactive connection cleanup (disabled by default)
..


Patch Set 5:

(1 comment)

Looks good except for odd test change which does not result in any changes to 
output. Could you clarify why it's necessary?

https://gerrit.osmocom.org/#/c/12730/5/tests/mgcp/mgcp_test.c
File tests/mgcp/mgcp_test.c:

https://gerrit.osmocom.org/#/c/12730/5/tests/mgcp/mgcp_test.c@981
PS5, Line 981:  endp.cfg = 
Why adding watchdog requires this change? And how was it working before?



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

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0
Gerrit-Change-Number: 12730
Gerrit-PatchSet: 5
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 31 Jan 2019 15:31:49 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in libosmo-netif[master]: Cosmetic: use #pragma once as include guard

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/12766


Change subject: Cosmetic: use #pragma once as include guard
..

Cosmetic: use #pragma once as include guard

Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd
---
M include/osmocom/netif/stream.h
1 file changed, 1 insertion(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/66/12766/1

diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index 529d4d7..969d42f 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -1,5 +1,4 @@
-#ifndef _OSMO_STREAM_H_
-#define _OSMO_STREAM_H_
+#pragma once

 #include 
 #include 
@@ -77,5 +76,3 @@
 int osmo_stream_cli_recv(struct osmo_stream_cli *conn, struct msgb *msg);

 /*! @} */
-
-#endif

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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c1a13252730294597a7a9fb5726aae928f41bfd
Gerrit-Change-Number: 12766
Gerrit-PatchSet: 1
Gerrit-Owner: Max 

Change in libosmo-netif[master]: Add missing include

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/12765


Change subject: Add missing include
..

Add missing include

stream.h uses msgb from libosmocore without corresponding #include
It's odd that we haven't hit this issue earlier.

Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57
---
M include/osmocom/netif/stream.h
1 file changed, 2 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/65/12765/1

diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index 166ede2..529d4d7 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -4,6 +4,8 @@
 #include 
 #include 

+#include 
+
 /*! \addtogroup stream
  *  @{
  */

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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8b4f4965af0fefa7dac3f2a56a5a4b76a03fd57
Gerrit-Change-Number: 12765
Gerrit-PatchSet: 1
Gerrit-Owner: Max 

Jenkins build is back to normal : master-asn1c » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #387

[jenkins]

See 

Change in osmo-sysmon[master]: jenkins.sh: remove obsolete comments

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/12764


Change subject: jenkins.sh: remove obsolete comments
..

jenkins.sh: remove obsolete comments

Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12
---
M contrib/jenkins.sh
1 file changed, 2 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/64/12764/1

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index dc2f734..b1529c4 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# jenkins build helper script for openbsc.  This is how we build on 
jenkins.osmocom.org
+# jenkins build helper: this is how we build on jenkins.osmocom.org

 if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
echo "Error: We need to have scripts/osmo-deps.sh from 
http://git.osmocom.org/osmo-ci/ in PATH !"
@@ -37,8 +37,7 @@
 autoreconf --install --force
 ./configure --enable-sanitize --enable-external-tests --enable-werror
 $MAKE $PARALLEL_MAKE
-#LD_LIBRARY_PATH="$inst/lib" $MAKE check \
-#  || cat-testlogs.sh
+
 LD_LIBRARY_PATH="$inst/lib" \
   DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests 
--enable-werror" \
   $MAKE distcheck \

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

Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2b3769811e9409d99f3698c490f6e3abe6a3c12
Gerrit-Change-Number: 12764
Gerrit-PatchSet: 1
Gerrit-Owner: Max 

Change in osmo-sysmon[master]: Add generic host config and related helpers

[Max]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/12761

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

Change subject: Add generic host config and related helpers
..

Add generic host config and related helpers

This will be used in follow-up patches as a generic way to store remote
host related configuration data by several TCP-based probes.

Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb
---
M configure.ac
M src/Makefile.am
A src/client.c
A src/client.h
4 files changed, 131 insertions(+), 2 deletions(-)


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

Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb
Gerrit-Change-Number: 12761
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-sysmon[master]: fi cli

[Max]

Max has abandoned this change. ( https://gerrit.osmocom.org/12762 )

Change subject: fi cli
..


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

Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: abandon
Gerrit-Change-Id: I728294b413ddedb5b164035665d80a25f9a60e8d
Gerrit-Change-Number: 12762
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-CC: Jenkins Builder (102)

Change in osmo-sysmon[master]: Add OpenVPN probe

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/12763


Change subject: Add OpenVPN probe
..

Add OpenVPN probe

This adds support for OpenVPN status probe which uses OpenVPN's
management interface (configured via 'management 127.0.0.1 1234' in
OpenVPN's config).

The output looks as follows:
...
  OpenVPN
127.0.0.1:1234
  status: CONNECTED
  tunnel: 10.8.0.15
  remote: 144.76.43.77:1194
localhost:4242
  status: management interface incompatible
127.0.0.1:
  status: management interface unavailable
...

We show tunnel's IP (if available) as well as remote (OpenVPN server
itself) address/port in addition to general connection status. If
management interface is unavailable it's reported as such. If we've
managed to establish connection with a given management interface but
are unable to obtain expected information than we report this
incompatibility as well.

Related: SYS#2655
Change-Id: I4493e19b9a09dcebd289457eacd1719f7f8cc31c
---
M src/Makefile.am
M src/osysmon.h
M src/osysmon_main.c
A src/osysmon_openvpn.c
4 files changed, 307 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/63/12763/1

diff --git a/src/Makefile.am b/src/Makefile.am
index e38b70e..f9b79f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,7 @@

 osmo_sysmon_LDADD = $(LDADD) \
$(LIBOSMOVTY_LIBS) \
+   $(LIBOSMONETIF_LIBS) \
$(LIBMNL_LIBS) \
$(LIBOPING_LIBS) \
$(NULL)
@@ -40,6 +41,7 @@
osysmon_rtnl.c \
osysmon_file.c \
osysmon_ping.c \
+   osysmon_openvpn.c \
osysmon_main.c \
$(NULL)

diff --git a/src/osysmon.h b/src/osysmon.h
index df8bf8d..2f82c47 100644
--- a/src/osysmon.h
+++ b/src/osysmon.h
@@ -15,6 +15,8 @@
struct rtnl_client_state *rcs;
/* list of 'struct ctrl client' */
struct llist_head ctrl_clients;
+   /* list of 'struct openvpn_client' */
+   struct llist_head openvpn_clients;
/* list of 'struct netdev' */
struct llist_head netdevs;
/* list of 'struct osysmon_file' */
@@ -30,6 +32,7 @@
CTRL_CLIENT_NODE = _LAST_OSMOVTY_NODE + 1,
CTRL_CLIENT_GETVAR_NODE,
NETDEV_NODE,
+   OPENVPN_NODE,
PING_NODE,
 };

@@ -48,5 +51,8 @@
 int osysmon_ping_init();
 int osysmon_ping_poll(struct value_node *parent);

+int osysmon_openvpn_init();
+int osysmon_openvpn_poll(struct value_node *parent);
+
 int osysmon_file_init();
 int osysmon_file_poll(struct value_node *parent);
diff --git a/src/osysmon_main.c b/src/osysmon_main.c
index eb4f50b..6d72786 100644
--- a/src/osysmon_main.c
+++ b/src/osysmon_main.c
@@ -199,6 +199,7 @@

g_oss = talloc_zero(NULL, struct osysmon_state);
INIT_LLIST_HEAD(_oss->ctrl_clients);
+   INIT_LLIST_HEAD(_oss->openvpn_clients);
INIT_LLIST_HEAD(_oss->netdevs);
INIT_LLIST_HEAD(_oss->files);

@@ -206,6 +207,7 @@
handle_options(argc, argv);
osysmon_sysinfo_init();
osysmon_ctrl_init();
+   osysmon_openvpn_init();
osysmon_rtnl_init();
ping_init = osysmon_ping_init();
osysmon_file_init();
@@ -239,9 +241,11 @@
osysmon_ping_poll(root);

osysmon_file_poll(root);
+   osysmon_openvpn_poll(root);

display_update(root);
value_node_del(root);
+   osmo_select_main(0);
sleep(1);
}

diff --git a/src/osysmon_openvpn.c b/src/osysmon_openvpn.c
new file mode 100644
index 000..6edb143
--- /dev/null
+++ b/src/osysmon_openvpn.c
@@ -0,0 +1,295 @@
+/* Simple Osmocom System Monitor (osysmon): Support for OpenVPN monitoring */
+
+/* (C) 2019 by sysmocom - s.f.m.c. GmbH.
+ * Author: Max Suraev
+ * All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (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.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "osysmon.h"
+#include "client.h"
+#include "value_node.h"
+
+/***
+ * Data model
+ 

Change in osmo-sysmon[master]: fi cli

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/12762


Change subject: fi cli
..

fi cli

Change-Id: I728294b413ddedb5b164035665d80a25f9a60e8d
---
M configure.ac
1 file changed, 1 insertion(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/62/12762/1

diff --git a/configure.ac b/configure.ac
index d98de89..44a040c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0)
 PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0)
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0)
+PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0)
 PKG_CHECK_MODULES(LIBMNL, libmnl)
 dnl FIXME: bump to 1.10.0 once it's available on build slaves and remove 
workaround from osysmon_ping.c
 PKG_CHECK_MODULES(LIBOPING, liboping >= 1.9.0)

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

Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I728294b413ddedb5b164035665d80a25f9a60e8d
Gerrit-Change-Number: 12762
Gerrit-PatchSet: 1
Gerrit-Owner: Max