Change in osmo-bts[master]: oc2g: vty: Compilation error fixes due to commented code

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12973 )

Change subject: oc2g: vty: Compilation error fixes due to commented code
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12973/1/src/osmo-bts-oc2g/oc2gbts_vty.c
File src/osmo-bts-oc2g/oc2gbts_vty.c:

https://gerrit.osmocom.org/#/c/12973/1/src/osmo-bts-oc2g/oc2gbts_vty.c@80
PS1, Line 80: /*
Same here, why not to use #if 0?



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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id2b16b9acd15d0c80085fac0fdc2a57173ebb0a0
Gerrit-Change-Number: 12973
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:47:20 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in osmo-bts[master]: oc2g: Remove unused variables

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12971 )

Change subject: oc2g: Remove unused variables
..


Patch Set 2: Code-Review+1


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6738adb6b0ae50905351c67c259d7a77cb250624
Gerrit-Change-Number: 12971
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:46:20 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: fsync requires fd instead of file stream

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12970 )

Change subject: oc2g: fsync requires fd instead of file stream
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idcd9dc48ea2e1f80bfdf5cf8b6bf55d8150fe0d2
Gerrit-Change-Number: 12970
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:45:33 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: Cleanup of get_hwversion_desc

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12964 )

Change subject: oc2g: Cleanup of get_hwversion_desc
..


Patch Set 2: Code-Review+1


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2
Gerrit-Change-Number: 12964
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:44:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: led_sleep_cb: pass correct ptr to llist_move_tail

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12965 )

Change subject: oc2g: led_sleep_cb: pass correct ptr to llist_move_tail
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie393a21bc3a725520343c70941cb4f591b313420
Gerrit-Change-Number: 12965
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:44:44 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: Add get_hwversion_desc to header file

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12963 )

Change subject: oc2g: Add get_hwversion_desc to header file
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic6826d8c8ff5c648158493454a80704bb956b51d
Gerrit-Change-Number: 12963
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:41:29 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: Fix compilation error (comment mark inside comment)

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12962 )

Change subject: oc2g: Fix compilation error (comment mark inside comment)
..


Patch Set 2: Code-Review+1

A better approach would be to use:

#if 0
...
#endif

instead of abusing comments.


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c
Gerrit-Change-Number: 12962
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:41:05 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: fsync requires fd instead of file stream

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12970 )

Change subject: oc2g: fsync requires fd instead of file stream
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idcd9dc48ea2e1f80bfdf5cf8b6bf55d8150fe0d2
Gerrit-Change-Number: 12970
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:30:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: Remove unused variables

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12971 )

Change subject: oc2g: Remove unused variables
..


Patch Set 2: Code-Review+2


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6738adb6b0ae50905351c67c259d7a77cb250624
Gerrit-Change-Number: 12971
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:31:00 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: Remove unused static function

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12972 )

Change subject: oc2g: Remove unused static function
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I4d0a476f84bc9e92e02f94c3990daddeeaa3c5d5
Gerrit-Change-Number: 12972
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:31:08 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in libosmocore[master]: gprs_ns: Add missing NSVCI IE to NS-BLOCK-ACK message

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12969 )

Change subject: gprs_ns: Add missing NSVCI IE to NS-BLOCK-ACK message
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12969/1/src/gb/gprs_ns.c
File src/gb/gprs_ns.c:

https://gerrit.osmocom.org/#/c/12969/1/src/gb/gprs_ns.c@560
PS1, Line 560:  log_set_context(LOG_CTX_GB_NSVC, nsvc);
> You most probably want to remove the context once you get out of the 
> function, to avoid having non-r […]
the style of this function follows the style of all the other functions in this 
file.  You raise an interesting question, but I don't immediately see any code 
path where within a single "read from select" callback from libosmocore we 
would be processing messages for multiple NSVCs.  Each incoming message relates 
to zero to one NSVC, and any messages transmitted as a result are also related 
to that NS-VC.



--
To view, visit https://gerrit.osmocom.org/12969
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: Ie7205e99d57f1e42d941f1be2460d8c9f46aadfe
Gerrit-Change-Number: 12969
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Wed, 20 Feb 2019 07:30:12 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Build failed in Jenkins: master-openbsc » --disable-iu,--disable-mgcp-transcoding,--enable-smpp,default,osmocom-master-debian9 #3906

2019-02-19 Thread jenkins
See 


--
[...truncated 30.65 KB...]
   - have your system administrator add LIBDIR to `/etc/ld.so.conf'

See any operating system documentation about shared libraries for
more information, such as the ld(1) and ld.so(8) manual pages.
--
make[4]: Leaving directory '/build/deps/libosmocore/src'
make[3]: Leaving directory '/build/deps/libosmocore/src'
make[2]: Leaving directory '/build/deps/libosmocore/src'
Making install in src/vty
make[2]: Entering directory '/build/deps/libosmocore/src/vty'
  CC   buffer.lo
  CC   command.lo
  CC   telnet_interface.lo
  CC   logging_vty.lo
  CC   vector.lo
  CC   utils.lo
  CC   vty.lo
  CC   stats_vty.lo
  CC   fsm_vty.lo
  CC   talloc_ctx_vty.lo
  CC   tdef_vty.lo
  CCLD libosmovty.la
make[3]: Entering directory '/build/deps/libosmocore/src/vty'
make[3]: Nothing to be done for 'install-data-am'.
 /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib'
 /bin/bash ../../libtool   --mode=install /usr/bin/install -c   libosmovty.la 
'/build/deps/install/stow/libosmocore/lib'
libtool: install: warning: relinking `libosmovty.la'
libtool: install: (cd /build/deps/libosmocore/src/vty; /bin/bash 
/build/deps/libosmocore/libtool  --silent --tag CC --mode=relink gcc -Wall -g 
-O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 6:0:2 -no-undefined -o 
libosmovty.la -rpath /build/deps/install/stow/libosmocore/lib buffer.lo 
command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo 
stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo tdef_vty.lo ../../src/libosmocore.la 
-ltalloc )
libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.2.0T 
/build/deps/install/stow/libosmocore/lib/libosmovty.so.4.2.0
libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f 
libosmovty.so.4.2.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s 
libosmovty.so.4.2.0 libosmovty.so.4; }; })
libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f 
libosmovty.so.4.2.0 libosmovty.so || { rm -f libosmovty.so && ln -s 
libosmovty.so.4.2.0 libosmovty.so; }; })
libtool: install: /usr/bin/install -c .libs/libosmovty.lai 
/build/deps/install/stow/libosmocore/lib/libosmovty.la
libtool: finish: 
PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin"
 ldconfig -n /build/deps/install/stow/libosmocore/lib
--
Libraries have been installed in:
   /build/deps/install/stow/libosmocore/lib

If you ever happen to want to link against installed libraries
in a given directory, LIBDIR, you must either use libtool, and
specify the full pathname of the library, or use the `-LLIBDIR'
flag during linking and do at least one of the following:
   - add LIBDIR to the `LD_LIBRARY_PATH' environment variable
 during execution
   - add LIBDIR to the `LD_RUN_PATH' environment variable
 during linking
   - use the `-Wl,-rpath -Wl,LIBDIR' linker flag
   - have your system administrator add LIBDIR to `/etc/ld.so.conf'

See any operating system documentation about shared libraries for
more information, such as the ld(1) and ld.so(8) manual pages.
--
make[3]: Leaving directory '/build/deps/libosmocore/src/vty'
make[2]: Leaving directory '/build/deps/libosmocore/src/vty'
Making install in src/codec
make[2]: Entering directory '/build/deps/libosmocore/src/codec'
  CC   gsm660.lo
  CC   gsm610.lo
  CC   gsm620.lo
  CC   gsm690.lo
  CC   ecu_fr.lo
  CCLD libosmocodec.la
make[3]: Entering directory '/build/deps/libosmocore/src/codec'
make[3]: Nothing to be done for 'install-data-am'.
 /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib'
 /bin/bash ../../libtool   --mode=install /usr/bin/install -c   libosmocodec.la 
'/build/deps/install/stow/libosmocore/lib'
libtool: install: warning: relinking `libosmocodec.la'
libtool: install: (cd /build/deps/libosmocore/src/codec; /bin/bash 
/build/deps/libosmocore/libtool  --silent --tag CC --mode=relink gcc -Wall -g 
-O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o 
libosmocodec.la -rpath /build/deps/install/stow/libosmocore/lib gsm610.lo 
gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la )
libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T 
/build/deps/install/stow/libosmocore/lib/libosmocodec.so.0.1.1
libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f 
libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s 
libosmocodec.so.0.1.1 libosmocodec.so.0; }; })
libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln 

Build failed in Jenkins: master-openbsc » --disable-iu,--enable-mgcp-transcoding,--enable-smpp,default,osmocom-master-debian9 #3906

2019-02-19 Thread jenkins
See 


--
[...truncated 1.98 KB...]
Fetching upstream changes from git://git.osmocom.org/openbsc
 > git --version # timeout=10
 > git fetch --tags --progress git://git.osmocom.org/openbsc 
 > +refs/heads/*:refs/remotes/origin/*
Checking out Revision ed8815e723b41e9800f14c67bccd34e51a06beb6 
(refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f ed8815e723b41e9800f14c67bccd34e51a06beb6
Commit message: "Bump version: 1.1.0.120-9981 → 1.2.0"
 > git rev-list --no-walk ed8815e723b41e9800f14c67bccd34e51a06beb6 # timeout=10
[osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins6353477383584535291.sh
+ ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store
+ mkdir -p /home/osmocom-build/jenkins_build_artifact_store
+ docker run --rm=true -e HOME=/build -e ARTIFACT_STORE=/artifact_store -e 
JOB_NAME=master-openbsc/IU=--disable-iu,MGCP=--enable-mgcp-transcoding,SMPP=--enable-smpp,a4=default,label=osmocom-master-debian9
 -e MAKE=make -e PARALLEL_MAKE=-j 8 -e IU=--disable-iu -e SMPP=--enable-smpp -e 
MGCP=--enable-mgcp-transcoding -e 
PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin 
-e OSMOPY_DEBUG_TCP_SOCKETS=1 -e WITH_MANUALS=1 -e PUBLISH=1 -w /build -i -u 
build -v 
:/build
 -v /home/osmocom-build/bin:/build_bin -v 
/home/osmocom-build/.ssh:/home/build/.ssh:ro -v 
/home/osmocom-build/jenkins_build_artifact_store:/artifact_store osmocom:amd64 
/build/contrib/jenkins.sh
+ osmo-clean-workspace.sh
+ chmod -R +w .
+ git checkout -f HEAD
+ git clean -dxf
Skipping repository deps/libosmocore
Skipping repository deps/libosmo-sccp
Skipping repository deps/libosmo-netif
Skipping repository deps/osmo-gsm-manuals
Skipping repository deps/openggsn
Skipping repository deps/libsmpp34
Skipping repository deps/libosmo-abis
Removing manuals/OsmoBSCMGCP/build
Removing manuals/OsmoBSCMGCP/common
Removing manuals/OsmoBSCMGCP/generated/
Removing manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.pdf
Removing manuals/OsmoBSCMGCP/out/
Removing manuals/OsmoBSCNAT/build
Removing manuals/OsmoBSCNAT/common
Removing manuals/OsmoBSCNAT/generated/
Removing manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.pdf
Removing manuals/OsmoBSCNAT/out/
Removing manuals/OsmoNITB/build
Removing manuals/OsmoNITB/common
Removing manuals/OsmoNITB/generated/
Removing manuals/OsmoNITB/osmonitb-usermanual.check
Removing manuals/OsmoNITB/osmonitb-usermanual.html
Removing manuals/OsmoNITB/osmonitb-usermanual.pdf
Removing manuals/OsmoNITB/osmonitb-usermanual__1.png
Removing manuals/OsmoNITB/osmonitb-usermanual__10.png
Removing manuals/OsmoNITB/osmonitb-usermanual__11.png
Removing manuals/OsmoNITB/osmonitb-usermanual__12.png
Removing manuals/OsmoNITB/osmonitb-usermanual__2.png
Removing manuals/OsmoNITB/osmonitb-usermanual__3.png
Removing manuals/OsmoNITB/osmonitb-usermanual__4.png
Removing manuals/OsmoNITB/osmonitb-usermanual__5.png
Removing manuals/OsmoNITB/osmonitb-usermanual__6.png
Removing manuals/OsmoNITB/osmonitb-usermanual__7.png
Removing manuals/OsmoNITB/osmonitb-usermanual__8.png
Removing manuals/OsmoNITB/osmonitb-usermanual__9.png
Removing manuals/OsmoNITB/osmonitb-vty-reference.pdf
Removing manuals/OsmoNITB/out/
+ [ -d  ]
+ [ -d layer1-headers ]
+ [ x--disable-iu = x--enable-iu ]
+ . osmo-build.sh

[INFO] source sanity check to ensure that sourcing script holds necessary 
functions

artifact_deps is a shell function
build_deps is a shell function
build_project is a shell function

[INFO] check whether necessary dependency build scripts are in PATH

osmo-build-dep.sh is /build_bin/osmo-build-dep.sh
+ log source sanity check to ensure that sourcing script holds necessary 
functions
+ set +x
+ type artifact_deps
+ type build_deps
+ type build_project
+ log check whether necessary dependency build scripts are in PATH
+ set +x
+ type osmo-build-dep.sh
osmo-deps.sh is /build_bin/osmo-deps.sh
+ type osmo-deps.sh
+ build
+ init_build
+ [ -z 
master-openbsc/IU=--disable-iu,MGCP=--enable-mgcp-transcoding,SMPP=--enable-smpp,a4=default,label=osmocom-master-debian9
 ]
+ [ -z /artifact_store ]
+ pwd
+ base=/build
+ deps=/build/deps
+ inst=/build/deps/install
+ rm -rf /build/deps
+ git config --get --local remote.origin.url
+ + cut -d . -f1
cut -d / -f4
+ project=openbsc
+ echo 
master-openbsc/IU=--disable-iu,MGCP=--enable-mgcp-transcoding,SMPP=--enable-smpp,a4=default,label=osmocom-master-debian9
+ tr / _
+ 
job_name=master-openbsc_IU=--disable-iu,MGCP=--enable-mgcp-transcoding,SMPP=--enable-smpp,a4=default,label=osmocom-master-debian9
+ export base deps inst project job_name
+ export 

Change in libosmocore[master]: gprs_ns: Add missing NSVCI IE to NS-BLOCK-ACK message

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/12969 )

Change subject: gprs_ns: Add missing NSVCI IE to NS-BLOCK-ACK message
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12969/1/src/gb/gprs_ns.c
File src/gb/gprs_ns.c:

https://gerrit.osmocom.org/#/c/12969/1/src/gb/gprs_ns.c@560
PS1, Line 560:  log_set_context(LOG_CTX_GB_NSVC, nsvc);
You most probably want to remove the context once you get out of the function, 
to avoid having non-related messages later on being filtered same way.



--
To view, visit https://gerrit.osmocom.org/12969
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: Ie7205e99d57f1e42d941f1be2460d8c9f46aadfe
Gerrit-Change-Number: 12969
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 19 Feb 2019 23:08:49 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in osmo-bts[master]: oc2g: Fix compilation error (comment mark inside comment)

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/12962 )

Change subject: oc2g: Fix compilation error (comment mark inside comment)
..


Patch Set 2:

All of them are fixed using gcc 8.2.1 and using -Werror.


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c
Gerrit-Change-Number: 12962
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 19 Feb 2019 23:06:12 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Change in osmo-bts[master]: oc2g: vty: Compilation error fixes due to commented code

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/12973


Change subject: oc2g: vty: Compilation error fixes due to commented code
..

oc2g: vty: Compilation error fixes due to commented code

Change-Id: Id2b16b9acd15d0c80085fac0fdc2a57173ebb0a0
---
M src/osmo-bts-oc2g/oc2gbts_vty.c
1 file changed, 5 insertions(+), 2 deletions(-)



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

diff --git a/src/osmo-bts-oc2g/oc2gbts_vty.c b/src/osmo-bts-oc2g/oc2gbts_vty.c
index 099698f..9bb4579 100644
--- a/src/osmo-bts-oc2g/oc2gbts_vty.c
+++ b/src/osmo-bts-oc2g/oc2gbts_vty.c
@@ -77,11 +77,13 @@
{ 0, NULL }
 };

+/*
 static const struct value_string oc2g_led_mode_strs[] = {
{ OC2G_LED_CONTROL_BTS, "bts" },
{ OC2G_LED_CONTROL_EXT, "external" },
{ 0, NULL }
 };
+*/

 static const struct value_string oc2g_auto_adj_pwr_strs[] = {
{ OC2G_TX_PWR_ADJ_NONE, "none" },
@@ -455,7 +457,7 @@
struct gsm_lchan *lchan;
int trx_nr, ts_nr, lchan_nr;
uint8_t ho_cause;
-   uint8_t old_ho_cause;
+   /* uint8_t old_ho_cause; */

/* get BTS pointer */
bts = gsm_bts_num(net, 0);
@@ -519,6 +521,7 @@
/ * restore HO cause * /
lchan->meas_preproc.rec_ho_causes = old_ho_cause;
*/
+   (void)lchan; /* to use lchan and avoid compilation warning */

return CMD_SUCCESS;
 }
@@ -728,5 +731,5 @@
rc |= ctrl_cmd_install(CTRL_NODE_ROOT, _oc2g_oml_ceased);
*/

-   return 0;
+   return rc;
 }

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2b16b9acd15d0c80085fac0fdc2a57173ebb0a0
Gerrit-Change-Number: 12973
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 


Change in osmo-bts[master]: oc2g: Remove unused static function

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/12972


Change subject: oc2g: Remove unused static function
..

oc2g: Remove unused static function

Change-Id: I4d0a476f84bc9e92e02f94c3990daddeeaa3c5d5
---
M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c
1 file changed, 0 insertions(+), 12 deletions(-)



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

diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c 
b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c
index 104d279..eac8ed1 100644
--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c
+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c
@@ -245,18 +245,6 @@
ipa_client_conn_send(mgr->oc2gbts_ctrl.bts_conn, msg);
 }

-static void send_set_ctrl_cmd_int(struct oc2gbts_mgr_instance *mgr, const char 
*key, const int val)
-{
-   struct msgb *msg;
-   int ret;
-
-   msg = msgb_alloc_headroom(1024, 128, "CTRL SET");
-   ret = snprintf((char *) msg->data, 4096, "SET %u %s %d",
-   mgr->oc2gbts_ctrl.last_seqno++, key, val);
-   msg->l2h = msgb_put(msg, ret);
-   return send_ctrl_cmd(mgr, msg);
-}
-
 static void send_set_ctrl_cmd(struct oc2gbts_mgr_instance *mgr, const char 
*key, const int val, const char *text)
 {
struct msgb *msg;

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d0a476f84bc9e92e02f94c3990daddeeaa3c5d5
Gerrit-Change-Number: 12972
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 


Change in osmo-bts[master]: oc2g: Remove unused variables

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded a new patch set (#2). ( 
https://gerrit.osmocom.org/12971 )

Change subject: oc2g: Remove unused variables
..

oc2g: Remove unused variables

Change-Id: I6738adb6b0ae50905351c67c259d7a77cb250624
---
M src/osmo-bts-oc2g/l1_if.c
M src/osmo-bts-oc2g/main.c
M src/osmo-bts-oc2g/misc/oc2gbts_clock.c
M src/osmo-bts-oc2g/misc/oc2gbts_mgr.c
4 files changed, 0 insertions(+), 5 deletions(-)


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I6738adb6b0ae50905351c67c259d7a77cb250624
Gerrit-Change-Number: 12971
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 


Change in osmo-bts[master]: oc2g: Remove unused variable

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/12971


Change subject: oc2g: Remove unused variable
..

oc2g: Remove unused variable

Change-Id: I6738adb6b0ae50905351c67c259d7a77cb250624
---
M src/osmo-bts-oc2g/main.c
1 file changed, 0 insertions(+), 1 deletion(-)



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

diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c
index e685150..ab3d36d 100644
--- a/src/osmo-bts-oc2g/main.c
+++ b/src/osmo-bts-oc2g/main.c
@@ -83,7 +83,6 @@

 int bts_model_init(struct gsm_bts *bts)
 {
-   struct gsm_bts_trx *trx;
struct stat st;
static struct osmo_fd accept_fd, read_fd;
int rc;

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6738adb6b0ae50905351c67c259d7a77cb250624
Gerrit-Change-Number: 12971
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 


Change in libosmocore[master]: gprs_ns.c: cosmetic whitespace fixes

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12967 )

Change subject: gprs_ns.c: cosmetic whitespace fixes
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12967
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: Ic19f65bdc5527ad5a69d0a92320ce5f672bf4d2b
Gerrit-Change-Number: 12967
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Tue, 19 Feb 2019 22:48:19 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: fsync requires fd instead of file stream

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/12970


Change subject: oc2g: fsync requires fd instead of file stream
..

oc2g: fsync requires fd instead of file stream

Similar fix was done for lc15 in a8041edb.

Change-Id: Idcd9dc48ea2e1f80bfdf5cf8b6bf55d8150fe0d2
---
M src/osmo-bts-oc2g/misc/oc2gbts_par.c
1 file changed, 3 insertions(+), 3 deletions(-)



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

diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_par.c 
b/src/osmo-bts-oc2g/misc/oc2gbts_par.c
index f355024..7dc77c9 100644
--- a/src/osmo-bts-oc2g/misc/oc2gbts_par.c
+++ b/src/osmo-bts-oc2g/misc/oc2gbts_par.c
@@ -151,7 +151,7 @@
fclose(fp);
return -EIO;
}
-   fsync(fp);
+   fsync(fileno(fp));
fclose(fp);
return 0;
 }
@@ -201,7 +201,7 @@

 rc = fwrite(buf, 1, size, fp);

-fsync(fp);
+fsync(fileno(fp));
 fclose(fp);

 return rc;
@@ -242,7 +242,7 @@
fclose(fp);
return -EIO;
}
-   fsync(fp);
+   fsync(fileno(fp));
fclose(fp);

return 0;

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcd9dc48ea2e1f80bfdf5cf8b6bf55d8150fe0d2
Gerrit-Change-Number: 12970
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 


Change in libosmocore[master]: gprs_ns: Declare gprs_ns_tx_alive*() in header file

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12968 )

Change subject: gprs_ns: Declare gprs_ns_tx_alive*() in header file
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12968
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: Ib073e9c93fcdf408b63000182e90aabce37f687e
Gerrit-Change-Number: 12968
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Tue, 19 Feb 2019 22:48:28 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: Fix compilation error (comment mark inside comment)

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12962 )

Change subject: oc2g: Fix compilation error (comment mark inside comment)
..


Patch Set 2: Code-Review+1

would be great to elaborate on which compiler/system this fails to compile


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c
Gerrit-Change-Number: 12962
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 19 Feb 2019 22:47:15 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: Cleanup of get_hwversion_desc

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12964 )

Change subject: oc2g: Cleanup of get_hwversion_desc
..


Patch Set 2: Code-Review+2


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2
Gerrit-Change-Number: 12964
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 19 Feb 2019 22:47:35 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: led_sleep_cb: pass correct ptr to llist_move_tail

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12965 )

Change subject: oc2g: led_sleep_cb: pass correct ptr to llist_move_tail
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie393a21bc3a725520343c70941cb4f591b313420
Gerrit-Change-Number: 12965
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Tue, 19 Feb 2019 22:47:50 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: oc2g: Add get_hwversion_desc to header file

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12963 )

Change subject: oc2g: Add get_hwversion_desc to header file
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic6826d8c8ff5c648158493454a80704bb956b51d
Gerrit-Change-Number: 12963
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 19 Feb 2019 22:47:22 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in libosmocore[master]: gprs_ns: Add missing NSVCI IE to NS-BLOCK-ACK message

2019-02-19 Thread Harald Welte
Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/12969


Change subject: gprs_ns: Add missing NSVCI IE to NS-BLOCK-ACK message
..

gprs_ns: Add missing NSVCI IE to NS-BLOCK-ACK message

According to Section 9.2.4 of 3GPP TS 48.016, the NS-BLOCK-ACK PDU has a
mandatory NSVCI IE which we so far were missing.

Change-Id: Ie7205e99d57f1e42d941f1be2460d8c9f46aadfe
Closes: OS#3808
---
M src/gb/gprs_ns.c
1 file changed, 29 insertions(+), 1 deletion(-)



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

diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index 47c2529..54964d3 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -547,6 +547,34 @@
return gprs_ns_tx(nsvc, msg);
 }

+/*! Transmit a NS-BLOCK-ACK on a given NS-VC
+ *  \param[in] nsvc NS-VC on which the NS-BLOCK is to be transmitted
+ *  \returns 0 in case of success
+ */
+static int gprs_ns_tx_block_ack(struct gprs_nsvc *nsvc)
+{
+   struct msgb *msg;
+   struct gprs_ns_hdr *nsh;
+   uint16_t nsvci = osmo_htons(nsvc->nsvci);
+
+   log_set_context(LOG_CTX_GB_NSVC, nsvc);
+
+   msg = gprs_ns_msgb_alloc();
+   if (!msg)
+   return -ENOMEM;
+
+   LOGP(DNS, LOGL_INFO, "NSEI=%u Tx NS BLOCK ACK (NSVCI=%u)\n", 
nsvc->nsei, nsvc->nsvci);
+
+   /* be conservative and mark it as blocked even now! */
+   msg->l2h = msgb_put(msg, sizeof(*nsh));
+   nsh = (struct gprs_ns_hdr *) msg->l2h;
+   nsh->pdu_type = NS_PDUT_BLOCK_ACK;
+
+   msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) );
+
+   return gprs_ns_tx(nsvc, msg);
+}
+
 /*! Transmit a NS-UNBLOCK on a given NS-VC
  *  \param[in] nsvc NS-VC on which the NS-UNBLOCK is to be transmitted
  *  \returns 0 in case of success
@@ -1122,7 +1150,7 @@
ns_osmo_signal_dispatch(nsvc, S_NS_BLOCK, *cause);
rate_ctr_inc(>ctrg->ctr[NS_CTR_BLOCKED]);

-   return gprs_ns_tx_simple(nsvc, NS_PDUT_BLOCK_ACK);
+   return gprs_ns_tx_block_ack(nsvc);
 }

 int gprs_ns_vc_create(struct gprs_ns_inst *nsi, struct msgb *msg,

--
To view, visit https://gerrit.osmocom.org/12969
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: Ie7205e99d57f1e42d941f1be2460d8c9f46aadfe
Gerrit-Change-Number: 12969
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 


Change in libosmocore[master]: gprs_ns: Use gprs_ns_tx_alive() instead of gprs_ns_tx_simple()

2019-02-19 Thread Harald Welte
Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/12966


Change subject: gprs_ns: Use gprs_ns_tx_alive() instead of gprs_ns_tx_simple()
..

gprs_ns: Use gprs_ns_tx_alive() instead of gprs_ns_tx_simple()

If we use gprs_ns_tx_alive() we will get logging for free.

Change-Id: I53d410d13540d389096c40425e1fa2eb7460b16b
---
M src/gb/gprs_ns.c
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/12966/1

diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index 1281c9f..5c75694 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -960,7 +960,7 @@
rc = gprs_ns_tx_reset_ack(*nsvc);

/* start the test procedure */
-   gprs_ns_tx_simple((*nsvc), NS_PDUT_ALIVE);
+   gprs_ns_tx_alive(*nsvc);
nsvc_start_timer((*nsvc), NSVC_TIMER_TNS_TEST);

return rc;
@@ -1084,7 +1084,7 @@
osmo_timer_del(&(*nsvc)->timer);
}
/* Initiate TEST proc.: Send ALIVE and start timer */
-   rc = gprs_ns_tx_simple(*nsvc, NS_PDUT_ALIVE);
+   rc = gprs_ns_tx_alive(*nsvc);
nsvc_start_timer(*nsvc, NSVC_TIMER_TNS_TEST);

return rc;

--
To view, visit https://gerrit.osmocom.org/12966
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: I53d410d13540d389096c40425e1fa2eb7460b16b
Gerrit-Change-Number: 12966
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 


Change in libosmocore[master]: gprs_ns.c: cosmetic whitespace fixes

2019-02-19 Thread Harald Welte
Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/12967


Change subject: gprs_ns.c: cosmetic whitespace fixes
..

gprs_ns.c: cosmetic whitespace fixes

Change-Id: Ic19f65bdc5527ad5a69d0a92320ce5f672bf4d2b
---
M src/gb/gprs_ns.c
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/12967/1

diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index 5c75694..47c2529 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -608,7 +608,7 @@
DEBUGP(DNS, "NSEI=%u Starting timer in mode %s (%u seconds)\n",
nsvc->nsei, get_value_string(timer_mode_strs, mode),
seconds);
-
+
if (osmo_timer_pending(>timer))
osmo_timer_del(>timer);

@@ -636,7 +636,7 @@
DEBUGP(DNS, "NSEI=%u Timer expired in mode %s (%u seconds)\n",
nsvc->nsei, get_value_string(timer_mode_strs, nsvc->timer_mode),
seconds);
-
+
switch (nsvc->timer_mode) {
case NSVC_TIMER_TNS_ALIVE:
/* Tns-alive case: we expired without response ! */

--
To view, visit https://gerrit.osmocom.org/12967
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: Ic19f65bdc5527ad5a69d0a92320ce5f672bf4d2b
Gerrit-Change-Number: 12967
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 


Change in libosmocore[master]: gprs_ns: Declare gprs_ns_tx_alive*() in header file

2019-02-19 Thread Harald Welte
Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/12968


Change subject: gprs_ns: Declare gprs_ns_tx_alive*() in header file
..

gprs_ns: Declare gprs_ns_tx_alive*() in header file

The symbols for those functions were always exported, but we
somehow didn't declare them in gprs_ns.h

Change-Id: Ib073e9c93fcdf408b63000182e90aabce37f687e
---
M include/osmocom/gprs/gprs_ns.h
1 file changed, 2 insertions(+), 0 deletions(-)



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

diff --git a/include/osmocom/gprs/gprs_ns.h b/include/osmocom/gprs/gprs_ns.h
index c97b200..1c99ed0 100644
--- a/include/osmocom/gprs/gprs_ns.h
+++ b/include/osmocom/gprs/gprs_ns.h
@@ -175,6 +175,8 @@
 /* main function for higher layers (BSSGP) to send NS messages */
 int gprs_ns_sendmsg(struct gprs_ns_inst *nsi, struct msgb *msg);

+int gprs_ns_tx_alive(struct gprs_nsvc *nsvc);
+int gprs_ns_tx_alive_ack(struct gprs_nsvc *nsvc);
 int gprs_ns_tx_reset(struct gprs_nsvc *nsvc, uint8_t cause);
 int gprs_ns_tx_block(struct gprs_nsvc *nsvc, uint8_t cause);
 int gprs_ns_tx_unblock(struct gprs_nsvc *nsvc);

--
To view, visit https://gerrit.osmocom.org/12968
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: Ib073e9c93fcdf408b63000182e90aabce37f687e
Gerrit-Change-Number: 12968
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 


Change in osmo-bts[master]: oc2g: led_sleep_cb: pass correct ptr to llist_move_tail

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/12965


Change subject: oc2g: led_sleep_cb: pass correct ptr to llist_move_tail
..

oc2g: led_sleep_cb: pass correct ptr to llist_move_tail

Fix compilation warning. At runtime it's not a big issue because the
"list" field is the first field of the led_list (struct
lc15bts_led_timer_list) variable. Hence, the address passed is the same.

Similar to commit fixing same issue in lc15 in 080302f8.

Change-Id: Ie393a21bc3a725520343c70941cb4f591b313420
---
M src/osmo-bts-oc2g/misc/oc2gbts_led.c
1 file changed, 1 insertion(+), 1 deletion(-)



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

diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_led.c 
b/src/osmo-bts-oc2g/misc/oc2gbts_led.c
index b8758b8..40d4b72 100644
--- a/src/osmo-bts-oc2g/misc/oc2gbts_led.c
+++ b/src/osmo-bts-oc2g/misc/oc2gbts_led.c
@@ -150,7 +150,7 @@
/* Delete current timer */
osmo_timer_del(_list->led_timer.timer);
/* Rotate the timer list */
-llist_move_tail(led_list, >oc2gbts_leds.list);
+llist_move_tail(_list->list, 
>oc2gbts_leds.list);
break;
}
}

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie393a21bc3a725520343c70941cb4f591b313420
Gerrit-Change-Number: 12965
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 


Change in osmo-bts[master]: oc2g: Cleanup of get_hwversion_desc

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded a new patch set (#2). ( 
https://gerrit.osmocom.org/12964 )

Change subject: oc2g: Cleanup of get_hwversion_desc
..

oc2g: Cleanup of get_hwversion_desc

Remove unused variables, wrong return type values, etc.

Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2
---
M src/osmo-bts-oc2g/misc/oc2gbts_bid.c
1 file changed, 3 insertions(+), 8 deletions(-)


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2
Gerrit-Change-Number: 12964
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-CC: Jenkins Builder (102)


Change in osmo-bts[master]: oc2g: Cleanup of get_hwversion_desc

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/12964


Change subject: oc2g: Cleanup of get_hwversion_desc
..

oc2g: Cleanup of get_hwversion_desc

Remove unused variables, wrong return type values, etc.

Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2
---
M src/osmo-bts-oc2g/misc/oc2gbts_bid.c
1 file changed, 2 insertions(+), 8 deletions(-)



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

diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_bid.c 
b/src/osmo-bts-oc2g/misc/oc2gbts_bid.c
index 6eaa9c6..6a46ca8 100644
--- a/src/osmo-bts-oc2g/misc/oc2gbts_bid.c
+++ b/src/osmo-bts-oc2g/misc/oc2gbts_bid.c
@@ -106,7 +106,6 @@

 const char* get_hwversion_desc()
 {
-int rev;
 int model;
 size_t len;
 static char model_name[64] = {0, };
@@ -114,14 +113,9 @@

 char rev_maj = 0, rev_min = 0;

-int rc = 0;
 oc2gbts_rev_get(_maj, _min);
-if (rc < 0)
-return rc;
-if (rev >= 0) {
-len += snprintf(model_name + len, sizeof(model_name) - len,
-" Rev %d.%d", (uint8_t)rev_maj, 
(uint8_t)rev_min);
-}
+len += snprintf(model_name + len, sizeof(model_name) - len,
+" Rev %" PRIu8 ".%" PRIu8, (uint8_t)rev_maj, 
(uint8_t)rev_min);

 model = oc2gbts_model_get();
 if (model >= 0) {

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2
Gerrit-Change-Number: 12964
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 


Change in osmo-bts[master]: oc2g: Fix compilation error (comment mark inside comment)

2019-02-19 Thread Pau Espin Pedrol
Hello Jenkins Builder,

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

https://gerrit.osmocom.org/12962

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

Change subject: oc2g: Fix compilation error (comment mark inside comment)
..

oc2g: Fix compilation error (comment mark inside comment)

Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c
---
M src/osmo-bts-oc2g/l1_if.c
M src/osmo-bts-oc2g/main.c
M src/osmo-bts-oc2g/oc2gbts_vty.c
M src/osmo-bts-oc2g/oml.c
4 files changed, 19 insertions(+), 18 deletions(-)


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c
Gerrit-Change-Number: 12962
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)


Change in osmo-bts[master]: oc2g: Fix compilation error (comment mark inside comment)

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/12962


Change subject: oc2g: Fix compilation error (comment mark inside comment)
..

oc2g: Fix compilation error (comment mark inside comment)

Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c
---
M src/osmo-bts-oc2g/main.c
1 file changed, 2 insertions(+), 2 deletions(-)



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

diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c
index 574bc72..e685150 100644
--- a/src/osmo-bts-oc2g/main.c
+++ b/src/osmo-bts-oc2g/main.c
@@ -94,9 +94,9 @@

/* TODO(oramadan) MERGE
bts->oc2g.led_ctrl_mode = OC2G_BTS_LED_CTRL_MODE_DEFAULT;
-   /* RTP drift threshold default * /
-   bts->oc2g.rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT;
*/
+   /* RTP drift threshold default */
+   /* bts->oc2g.rtp_drift_thres_ms = OC2G_BTS_RTP_DRIFT_THRES_DEFAULT; */

rc = oml_router_init(bts, OML_ROUTER_PATH, _fd, _fd);
if (rc < 0) {

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib27b31825744ea397b5b4eb258da78f5f834895c
Gerrit-Change-Number: 12962
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 


Change in osmo-pcu[master]: Rewrite Packet Downlink Assignment

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12954 )

Change subject: Rewrite Packet Downlink Assignment
..


Patch Set 6:

This change is ready for review.


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie180733d2584ebb16fb80b84526d0dbc70e3d441
Gerrit-Change-Number: 12954
Gerrit-PatchSet: 6
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 21:54:32 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/11992 )

Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions
..


Patch Set 10:

(1 comment)

https://gerrit.osmocom.org/#/c/11992/10/src/libmsc/gsm_09_11.c
File src/libmsc/gsm_09_11.c:

https://gerrit.osmocom.org/#/c/11992/10/src/libmsc/gsm_09_11.c@156
PS10, Line 156: }
> else if (osmo_timer_pending(>ss.watchdog)) { […]
Done in ncss_session_timeout_handler().



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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb
Gerrit-Change-Number: 11992
Gerrit-PatchSet: 10
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-CC: Stefan Sperling 
Gerrit-Comment-Date: Tue, 19 Feb 2019 20:29:18 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions

2019-02-19 Thread Vadim Yanitskiy
Hello daniel, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/11992

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

Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions
..

libmsc/gsm_09_11.c: implement guard timer for NCSS sessions

It may happen that either the MS or an EUSE would become
unresponsive during a call independent SS session, e.g.
due to a bug, or a dropped message. In such cases, the
corresponding transaction would remain unfreed forever.

This change introduces a guard timer, that prevents keeping
'stalled' NCSS sessions forever. As soon as it expires, both
sides (i.e. MS and EUSE) are getting notified, and the
transaction is being released.

By default, the timer expires after 30 seconds. As soon as
either the MS, or an EUSE initiates any activity,
the watchdog timer is rescheduled.

The timeout value can be configured from the VTY:

  msc
   ...
   ! Use 0 to disable this timer
   ncss guard-timeout 30

Please note that changing the timeout value at run-time
doesn't affect the existing NCSS sessions, excepting the
case when the timer is disabled at run-time.

This change makes TC_lu_and_ss_session_timeout pass.

Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb
Related Change-Id: (TTCN) I3e1791773d56617172ae27a46889a1ae4d400e2f
Related: OS#3655
---
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/transaction.h
M src/libmsc/gsm_09_11.c
M src/libmsc/msc_vty.c
M src/libmsc/osmo_msc.c
M tests/test_nodes.vty
6 files changed, 90 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/11992/12
--
To view, visit https://gerrit.osmocom.org/11992
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb
Gerrit-Change-Number: 11992
Gerrit-PatchSet: 12
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-CC: Stefan Sperling 


Change in osmo-pcu[master]: Move C include to proper place

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/12958 )

Change subject: Move C include to proper place
..


Patch Set 2: Code-Review+1


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id58d1820b94d54ce73ed40edb7747ef975890a7b
Gerrit-Change-Number: 12958
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 19 Feb 2019 19:36:03 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-pcu[master]: Add define for dummy burst string

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/12946 )

Change subject: Add define for dummy burst string
..


Patch Set 4: Code-Review+1


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
Gerrit-Change-Number: 12946
Gerrit-PatchSet: 4
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 19:30:22 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: add message sequence charts for SMS over GSUP

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10604 )

Change subject: chapters/gsup.adoc: add message sequence charts for SMS over 
GSUP
..

chapters/gsup.adoc: add message sequence charts for SMS over GSUP

Change-Id: I9a0536f285f98f24fec4d7318f1923782ed2e18c
Related Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c
Related Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62
---
A common/chapters/gsup_mo_smma.msc
A common/chapters/gsup_mo_sms.msc
A common/chapters/gsup_mt_sms.msc
3 files changed, 88 insertions(+), 0 deletions(-)

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



diff --git a/common/chapters/gsup_mo_smma.msc b/common/chapters/gsup_mo_smma.msc
new file mode 100644
index 000..ccf7524
--- /dev/null
+++ b/common/chapters/gsup_mo_smma.msc
@@ -0,0 +1,24 @@
+msc {
+   hscale="3";
+   ms [label="MS"], omsc [label="MSC/VLR"], hlr [label="HLR"];
+
+   ms <-> omsc [label="Establishment, Auth, Ciph, ..."];
+   ...;
+   ms -> omsc [label="CP-DATA(RP-SMMA)"];
+   ms <- omsc [label="CP-ACK"];
+   omsc -> hlr [label="GSUP ReadyForSM-Req (MR, Alert Reason)"];
+
+   |||;
+   ... [label="Successful delivery"];
+   |||;
+   omsc <- hlr [label="GSUP ReadyForSM-Res (MR)"];
+   ms <- omsc [label="CP-DATA(RP-ACK)"];
+   ms -> omsc [label="CP-ACK"];
+
+   |||;
+   ... [label="Failed delivery"];
+   |||;
+   omsc <- hlr [label="GSUP ReadyForSM-Err (MR, Cause)"];
+   ms <- omsc [label="CP-DATA(RP-ERROR)"];
+   ms -> omsc [label="CP-ACK"];
+}
diff --git a/common/chapters/gsup_mo_sms.msc b/common/chapters/gsup_mo_sms.msc
new file mode 100644
index 000..4cea871
--- /dev/null
+++ b/common/chapters/gsup_mo_sms.msc
@@ -0,0 +1,28 @@
+msc {
+   hscale="3";
+   ms [label="MS"], omsc [label="MSC/VLR"], hlr [label="HLR"], smsc 
[label="SMSC"];
+
+   ms <-> omsc [label="Establishment, Auth, Ciph, ..."];
+   ...;
+   ms -> omsc [label="CP-DATA(RP-DATA(SMS-SUBMIT))"];
+   ms <- omsc [label="CP-ACK"];
+   omsc -> hlr [label="GSUP MO-ForwardSM-Req (MR, DA=SMSC, OA=MSISDN, 
UI)"];
+   hlr box hlr [label="Route based on DA\n(SMSC address)"];
+   hlr -> smsc [label="GSUP MO-ForwardSM-Req (MR, DA=SMSC, OA=MSISDN, 
UI)"];
+
+   |||;
+   ... [label="Successful delivery"];
+   |||;
+   hlr <- smsc [label="GSUP MO-ForwardSM-Res (MR)"];
+   omsc <- hlr [label="GSUP MO-ForwardSM-Res (MR)"];
+   ms <- omsc [label="CP-DATA(RP-ACK)"];
+   ms -> omsc [label="CP-ACK"];
+
+   |||;
+   ... [label="Failed delivery"];
+   |||;
+   hlr <- smsc [label="GSUP MO-ForwardSM-Err (MR, Cause)"];
+   omsc <- hlr [label="GSUP MO-ForwardSM-Err (MR, Cause)"];
+   ms <- omsc [label="CP-DATA(RP-ERROR)"];
+   ms -> omsc [label="CP-ACK"];
+}
diff --git a/common/chapters/gsup_mt_sms.msc b/common/chapters/gsup_mt_sms.msc
new file mode 100644
index 000..f5addda
--- /dev/null
+++ b/common/chapters/gsup_mt_sms.msc
@@ -0,0 +1,36 @@
+msc {
+   hscale="4";
+   ms [label="MS"], omsc [label="MSC/VLR"], hlr [label="HLR"], smsc 
[label="SMSC"];
+
+   hlr <- smsc [label="GSUP MT-ForwardSM-Req (MR=0xFF, DA=IMSI/MSISDN, 
OA=SMSC, UI, MMS)"];
+   hlr box hlr [label="Route based on IMSI/MSISDN"];
+   omsc <- hlr [label="GSUP MT-ForwardSM-Req (MR=0xFF, DA=IMSI/MSISDN, 
OA=SMSC, UI, MMS)"];
+
+   |||;
+   ... [label="Connection establishment failure"];
+   |||;
+   omsc -> hlr [label="GSUP MT-ForwardSM-Err (MR, Cause)"];
+   hlr -> smsc [label="GSUP MT-ForwardSM-Err (MR, Cause)"];
+
+   |||;
+   ... [label="Failed delivery"];
+   |||;
+   ms <-> omsc [label="Establishment, Auth, Ciph, ..."];
+   ms <- omsc [label="CP-DATA(RP-DATA(SMS-DELIVER))"];
+   ms -> omsc [label="CP-ACK"];
+   ms -> omsc [label="CP-DATA(RP-ERROR)"];
+   omsc -> hlr [label="GSUP MT-ForwardSM-Err (MR, Cause)"];
+   ms <- omsc [label="CP-ACK"];
+   hlr -> smsc [label="GSUP MT-ForwardSM-Err (MR, Cause)"];
+
+   |||;
+   ... [label="Successful delivery"];
+   |||;
+   ms <-> omsc [label="Establishment, Auth, Ciph, ..."];
+   ms <- omsc [label="CP-DATA(RP-DATA(SMS-DELIVER))"];
+   ms -> omsc [label="CP-ACK"];
+   ms -> omsc [label="CP-DATA(RP-ACK)"];
+   omsc -> hlr [label="GSUP MT-ForwardSM-Res (MR)"];
+   ms <- omsc [label="CP-ACK"];
+   hlr -> smsc [label="GSUP MT-ForwardSM-Res (MR)"];
+}

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

Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a0536f285f98f24fec4d7318f1923782ed2e18c
Gerrit-Change-Number: 10604
Gerrit-PatchSet: 3

Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: add message sequence charts for SMS over GSUP

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10604 )

Change subject: chapters/gsup.adoc: add message sequence charts for SMS over 
GSUP
..


Set Ready For Review


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

Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I9a0536f285f98f24fec4d7318f1923782ed2e18c
Gerrit-Change-Number: 10604
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Assignee: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Ivan Kluchnikov 
Gerrit-Comment-Date: Tue, 19 Feb 2019 18:07:25 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Change in osmo-pcu[master]: Add define for dummy burst string

2019-02-19 Thread Max
Hello Pau Espin Pedrol, Jenkins Builder,

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

https://gerrit.osmocom.org/12946

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

Change subject: Add define for dummy burst string
..

Add define for dummy burst string

Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
---
M src/gprs_rlcmac.cpp
M src/gprs_rlcmac.h
M src/tbf.cpp
M src/tbf_ul.cpp
M tests/rlcmac/RLCMACTest.cpp
M tests/types/TypesTest.cpp
6 files changed, 15 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/12946/4
--
To view, visit https://gerrit.osmocom.org/12946
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
Gerrit-Change-Number: 12946
Gerrit-PatchSet: 4
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 


Change in osmo-pcu[master]: Rewrite EGPRS Packet Uplink IA Rest Octets for SBA

2019-02-19 Thread Max
Max has uploaded this change for review. ( https://gerrit.osmocom.org/12960


Change subject: Rewrite EGPRS Packet Uplink IA Rest Octets for SBA
..

Rewrite EGPRS Packet Uplink IA Rest Octets for SBA

Use bitvec_set_*() directly without external write pointer tracking to
simplify the code. This is part of IA Rest Octets (3GPP TS 44.018
§10.5.2.16) which is the last part of the message so it should not
interfere with the rest of encoding functions.

That's partially based on reverted commit 
529ce885450946d85d1920fb3d1a994c3efe5849.

Change-Id: I143b3dd02aa54b9ce206d9e780a5554f6d9fd118
Related: OS#3014
---
M src/encoding.cpp
1 file changed, 58 insertions(+), 26 deletions(-)



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

diff --git a/src/encoding.cpp b/src/encoding.cpp
index ba0e474..3d88e47 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -85,6 +85,33 @@
return rc;
 }

+/* 3GPP TS 44.018 §10.5.2.16:
+   < TFI_ASSIGNMENT : bit (5) >
+   < POLLING : bit >
+   0 -- The value '1' was allocated in an earlier version of the protocol and 
shall not be used.
+   < USF: bit (3) >
+   < USF_GRANULARITY : bit >
+   { 0 | 1 < P0 : bit (4) > < PR_MODE : bit (1) > }
+*/
+static int write_tfi_usf(bitvec *dest, const gprs_rlcmac_ul_tbf *tbf, uint8_t 
usf)
+{
+   int rc = bitvec_set_u64(dest, tbf->tfi(), 5, false); /* TFI_ASSIGNMENT 
*/
+   CHECK(rc);
+
+   SET_0(dest); /* POLLING -- no action is required from MS */
+
+   SET_0(dest);
+
+   rc = bitvec_set_u64(dest, usf, 3, false); /* USF */
+   CHECK(rc);
+
+   SET_0(dest); /* USF_GRANULARITY -- the mobile station shall transmit 
one RLC/MAC block */
+
+   SET_0(dest); /* No P0 nor PR_MODE */
+
+   return 0;
+}
+
 /* { 0 | 1 < TIMING_ADVANCE_INDEX : bit (4) > } */
 static int write_ta_index(bitvec *dest, int8_t tai)
 {
@@ -278,38 +305,42 @@
 }

 static int write_ia_rest_egprs_uplink_sba(const gprs_rlcmac_ul_tbf *tbf, 
bitvec * dest, uint8_t usf,
- uint8_t alpha, uint8_t gamma, 
unsigned& wp)
+ uint8_t alpha, uint8_t gamma)
 {
int rc = 0;

-   bitvec_write_field(dest, , 1, 1); /* single block allocation */
-   bitvec_write_field(dest, , tbf->tfi(), 5); /* TFI assignment */
-   bitvec_write_field(dest, , 0, 1); /* polling bit */
-   bitvec_write_field(dest, , 0, 1); /* constant */
-   bitvec_write_field(dest, , usf, 3);   /* USF bit */
-   bitvec_write_field(dest, , 0, 1); /* USF granularity */
-   bitvec_write_field(dest, , 0, 1); /* P0 */
+   SET_1(dest); /* Single Block Allocation */
 
-   /* MCS */
-   bitvec_write_field(dest, , tbf->current_cs().to_num() - 1, 4);
+   rc = write_tfi_usf(dest, tbf, usf);
+   CHECK(rc);

-   /* TLLI channel block */
-   bitvec_write_field(dest, , tbf->tlli(), 1);
-   bitvec_write_field(dest, , 0, 1);   /* BEP period present */
-   bitvec_write_field(dest, , 0, 1);   /* resegmentation */
-   write_ws(dest, , tbf->window_size()); /* EGPRS window size */
+   /* 3GPP TS 44.060 §12.10d EGPRS Modulation and coding Scheme 
description: */
+   rc = bitvec_set_u64(dest, tbf->current_cs().to_num() - 1, 4, false); /* 
EGPRS CHANNEL_CODING_COMMAND */
+   CHECK(rc);

-   if (alpha) {
-   bitvec_write_field(dest, , 0x1, 1);   /* ALPHA = yes */
-   bitvec_write_field(dest, , alpha, 4); /* ALPHA */
-   } else {
-   bitvec_write_field(dest, , 0x0, 1);   /* ALPHA = no */
-   }
+   /* TLLI_BLOCK_CHANNEL_CODING */
+   rc = bitvec_set_bit(dest, (bit_value)tbf->tlli());

-   bitvec_write_field(dest, , gamma, 5); /* GAMMA power contrl */
-   bitvec_write_field(dest, , 0, 1); /* TIMING_ADVANCE_INDEX */
-   bitvec_write_field(dest, , 0, 1); /* TBF_STARTING_TIME_FLAG */
-   bitvec_write_field(dest, , 0, 1); /* NULL */
+   /* No BEP_PERIOD2 */
+   SET_0(dest);
+
+   /* Retransmitted RLC data blocks shall not be re-segmented: (see 3GPP 
TS 44.060 §12.10e) */
+   SET_0(dest); /* RESEGMENT */
+
+   rc = bitvec_set_u64(dest, enc_ws(tbf->window_size()), 5, false); /* 
EGPRS Window Size */
+   CHECK(rc);
+
+   rc = write_alpha_gamma(dest, alpha, gamma);
+   CHECK(rc);
+
+   /* No TIMING_ADVANCE_INDEX */
+   SET_0(dest);
+
+   /* No TBF_STARTING_TIME */
+   SET_0(dest);
+
+   /* No Additions for Rel-7 */
+   SET_L(dest);

return rc;
 }
@@ -476,7 +507,8 @@
bitvec_write_field(dest, , 0, 1);/* Access technology 
Request */

if (as_ul_tbf(tbf) != NULL) {
-   rc = write_ia_rest_egprs_uplink_sba(as_ul_tbf(tbf), 
dest, usf, alpha, gamma, wp);
+   dest->cur_bit = wp;
+   rc = 

Change in osmo-pcu[master]: Rewrite Packet Uplink IA Rest Octets for MBA

2019-02-19 Thread Max
Max has uploaded this change for review. ( https://gerrit.osmocom.org/12961


Change subject: Rewrite Packet Uplink IA Rest Octets for MBA
..

Rewrite Packet Uplink IA Rest Octets for MBA

Use bitvec_set_*() directly without external write pointer tracking to
simplify the code. This is part of IA Rest Octets (3GPP TS 44.018
§10.5.2.16) which is the last part of the message so it should not
interfere with the rest of encoding functions.

That's partially based on reverted commit 
93d947f5e8a30acc9250c124bf9d5bb6a8863526.

Change-Id: Ibe294b26ac374b9264a734db9663cacc105a4474
Related: OS#3014
---
M src/encoding.cpp
1 file changed, 22 insertions(+), 20 deletions(-)



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

diff --git a/src/encoding.cpp b/src/encoding.cpp
index 3d88e47..c46ca2a 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -257,30 +257,31 @@
 }

 static int write_ia_rest_uplink_mba(const gprs_rlcmac_ul_tbf *tbf, bitvec 
*dest, uint8_t usf,
-   uint8_t alpha, uint8_t gamma, unsigned& wp)
+   uint8_t alpha, uint8_t gamma)
 {
int rc = 0;

-   bitvec_write_field(dest, , 1, 1);// Block Allocation: Not Single 
Block Allocation
-   bitvec_write_field(dest, , tbf->tfi(), 5);  // TFI_ASSIGNMENT 
Temporary Flow Identity
-   bitvec_write_field(dest, , 0, 1);// POLLING
-   bitvec_write_field(dest, , 0, 1);// ALLOCATION_TYPE: dynamic
-   bitvec_write_field(dest, , usf, 3);// USF
-   bitvec_write_field(dest, , 0, 1);// USF_GRANULARITY
-   bitvec_write_field(dest, , 0, 1);   // "0" power control: Not Present
-   bitvec_write_field(dest, , tbf->current_cs().to_num() - 1, 2);// 
CHANNEL_CODING_COMMAND
-   bitvec_write_field(dest, , 1, 1);// TLLI_BLOCK_CHANNEL_CODING
-   if (alpha) {
-   bitvec_write_field(dest, , 0x1, 1);   // ALPHA = present
-   bitvec_write_field(dest, , alpha, 4);   // ALPHA
-   } else
-   bitvec_write_field(dest, , 0x0, 1);   // ALPHA = not present
+   SET_1(dest); /* Multi Block Allocation */

-   bitvec_write_field(dest, , gamma, 5);   // GAMMA power control 
parameter
+   rc = write_tfi_usf(dest, tbf, usf);
+   CHECK(rc);

-   /* note: there is no choise for TAI and no starting time */
-   bitvec_write_field(dest, , 0, 1);   // switch TIMING_ADVANCE_INDEX = 
off
-   bitvec_write_field(dest, , 0, 1);// TBF_STARTING_TIME_FLAG
+   /* 3GPP TS 44.060 Table 11.2.28.2 Channel Coding Indicator */
+   rc = bitvec_set_u64(dest, tbf->current_cs().to_num() - 1, 2, false); /* 
CHANNEL_CODING_COMMAND */
+   CHECK(rc);
+
+   /* TLLI_BLOCK_CHANNEL_CODING */
+   rc = bitvec_set_bit(dest, (bit_value)tbf->tlli());
+   CHECK(rc);
+
+   rc = write_alpha_gamma(dest, alpha, gamma);
+   CHECK(rc);
+
+/* No TIMING_ADVANCE_INDEX */
+   SET_0(dest);
+
+/* No TBF_STARTING_TIME */
+   SET_0(dest);

return rc;
 }
@@ -520,7 +521,8 @@
bitvec_write_field(dest, , 0, 2);// "0" Packet Uplink 
Assignment

if (as_ul_tbf(tbf) != NULL) {
-   rc = write_ia_rest_uplink_mba(as_ul_tbf(tbf), dest, 
usf, alpha, gamma, wp);
+   dest->cur_bit = wp;
+   rc = write_ia_rest_uplink_mba(as_ul_tbf(tbf), dest, 
usf, alpha, gamma);
} else {
rc = write_ia_rest_uplink_sba(dest, fn, alpha, gamma, 
ta_idx, wp);
}

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

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


Change in osmo-pcu[master]: Move C include to proper place

2019-02-19 Thread Max
Max has uploaded this change for review. ( https://gerrit.osmocom.org/12958


Change subject: Move C include to proper place
..

Move C include to proper place

Change-Id: Id58d1820b94d54ce73ed40edb7747ef975890a7b
---
M src/encoding.cpp
1 file changed, 1 insertion(+), 2 deletions(-)



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

diff --git a/src/encoding.cpp b/src/encoding.cpp
index 29a62e7..2c89819 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -28,9 +28,8 @@

 extern "C" {
 #include 
-}
-
 #include 
+}

 #include 
 #include 

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

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


Change in osmo-pcu[master]: Restructure IA Rest Octets encoders

2019-02-19 Thread Max
Max has uploaded this change for review. ( https://gerrit.osmocom.org/12959


Change subject: Restructure IA Rest Octets encoders
..

Restructure IA Rest Octets encoders

In preparation for upcoming patches with 11 bit RACH and TA support,
let's restructure existing encoders to simplify further modifications:

* move consistency checks to top-level Imm. Ass. encoder
* use consistent formatting
* constify pointers where appropriate
* split SBA and MBA encoders into separate functions

Those changes also make it obvious which parameters are necessary for
Rest Octets in each specific case (DL, UL-SBA, UL-MBA, UL-SBA-EGPRS,
UL-MBA-EGPRS).

There're no functional code changes so there's no need to adjust tests.

Change-Id: I0ad1bc786c3a8055ea9666f64ae82c512bd01603
Related: OS#1548
---
M src/encoding.cpp
1 file changed, 132 insertions(+), 123 deletions(-)



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

diff --git a/src/encoding.cpp b/src/encoding.cpp
index 2c89819..2648b02 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -87,18 +87,11 @@
bitvec_write_field(dest, , ts, 3);
 }

-static int write_ia_rest_downlink(
-   gprs_rlcmac_dl_tbf *tbf,
-   bitvec * dest, unsigned& wp,
-   bool polling, bool ta_valid, uint32_t fn,
-   uint8_t alpha, uint8_t gamma, int8_t ta_idx)
+static int write_ia_rest_downlink(const gprs_rlcmac_dl_tbf *tbf, bitvec * 
dest, bool polling, bool ta_valid,
+ uint32_t fn, uint8_t alpha, uint8_t gamma, 
int8_t ta_idx, unsigned& wp)
 {
-   if (!tbf) {
-   LOGP(DRLCMACDL, LOGL_ERROR,
-   "Cannot encode DL IMMEDIATE ASSIGNMENT without TBF\n");
-   return -EINVAL;
-   }
-   // GSM 04.08 10.5.2.16 IA Rest Octets
+   int rc = 0;
+
bitvec_write_field(dest, , 3, 2);   // "HH"
bitvec_write_field(dest, , 1, 2);   // "01" Packet Downlink 
Assignment
bitvec_write_field(dest, ,tbf->tlli(),32); // TLLI
@@ -127,128 +120,126 @@
//  bitvec_write_field(dest, ,0x1,1);   // P0 not present
//  bitvec_write_field(dest, ,,0xb,4);
if (tbf->is_egprs_enabled()) {
-   /* see GMS 44.018, 10.5.2.16 */
bitvec_write_field(dest, , 1, 1);  // "H"
write_ws(dest, , tbf->window_size()); // EGPRS Window Size
bitvec_write_field(dest, , 0x0, 2);// 
LINK_QUALITY_MEASUREMENT_MODE
bitvec_write_field(dest, , 0, 1);  // BEP_PERIOD2 not 
present
}

-   return 0;
+   return rc;
 }

-static int write_ia_rest_uplink(
-   gprs_rlcmac_ul_tbf *tbf,
-   bitvec * dest, unsigned& wp,
-   uint8_t usf, uint32_t fn,
-   uint8_t alpha, uint8_t gamma, int8_t ta_idx)
+static int write_ia_rest_uplink_sba(bitvec *dest, uint32_t fn, uint8_t alpha, 
uint8_t gamma, int8_t ta_idx,
+   unsigned& wp)
 {
-   OSMO_ASSERT(!tbf || !tbf->is_egprs_enabled());
+   int rc = 0;

-   // GMS 04.08 10.5.2.37b 10.5.2.16
-   bitvec_write_field(dest, , 3, 2);// "HH"
-   bitvec_write_field(dest, , 0, 2);// "0" Packet Uplink Assignment
-   if (tbf == NULL) {
-   bitvec_write_field(dest, , 0, 1);// Block Allocation : 
Single Block Allocation
-   if (alpha) {
-   bitvec_write_field(dest, ,0x1,1);   // ALPHA = 
present
-   bitvec_write_field(dest, ,alpha,4);   // ALPHA = 
present
-   } else
-   bitvec_write_field(dest, ,0x0,1);   // ALPHA = not 
present
-   bitvec_write_field(dest, ,gamma,5);   // GAMMA power control 
parameter
-   write_tai(dest, wp, ta_idx);
-   bitvec_write_field(dest, , 1, 1);// 
TBF_STARTING_TIME_FLAG
-   bitvec_write_field(dest, ,(fn / (26 * 51)) % 32,5); // T1'
-   bitvec_write_field(dest, ,fn % 51,6);   // T3
-   bitvec_write_field(dest, ,fn % 26,5);   // T2
-   } else {
-   bitvec_write_field(dest, , 1, 1);// Block Allocation : 
Not Single Block Allocation
-   bitvec_write_field(dest, , tbf->tfi(), 5);  // 
TFI_ASSIGNMENT Temporary Flow Identity
-   bitvec_write_field(dest, , 0, 1);// POLLING
-   bitvec_write_field(dest, , 0, 1);// ALLOCATION_TYPE: 
dynamic
-   bitvec_write_field(dest, , usf, 3);// USF
-   bitvec_write_field(dest, , 0, 1);// USF_GRANULARITY
-   bitvec_write_field(dest, , 0, 1);   // "0" power control: 
Not Present
-   bitvec_write_field(dest, , tbf->current_cs().to_num()-1, 2); 
   // CHANNEL_CODING_COMMAND
-   bitvec_write_field(dest, , 1, 1);// 
TLLI_BLOCK_CHANNEL_CODING
-   if (alpha) {
-   

Change in osmo-pcu[master]: Add encoding tests for Immediate Assignment

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/12947 )

Change subject: Add encoding tests for Immediate Assignment
..


Patch Set 4: Code-Review+1


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I63f4654b23c7c4f063f6b3254d77157fac798586
Gerrit-Change-Number: 12947
Gerrit-PatchSet: 4
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 19 Feb 2019 17:07:54 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-gsm-tester[master]: doc: Update list of dependencies and add pysispm one

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/12953 )

Change subject: doc: Update list of dependencies and add pysispm one
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I05cc63bfd627bfec83b50fe89fe8004d130384e6
Gerrit-Change-Number: 12953
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 19 Feb 2019 17:04:38 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-pcu[master]: Add define for dummy burst string

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/12946 )

Change subject: Add define for dummy burst string
..


Patch Set 3: Code-Review-1

(1 comment)

https://gerrit.osmocom.org/#/c/12946/3/tests/types/TypesTest.cpp
File tests/types/TypesTest.cpp:

https://gerrit.osmocom.org/#/c/12946/3/tests/types/TypesTest.cpp@28
PS3, Line 28: #include 
That should be between "", it's an internal header from the project, not found 
in the system headers during build time. (./src/gprs_rlcmac.h)



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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
Gerrit-Change-Number: 12946
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 16:59:36 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes


Change in osmo-pcu[master]: Add define for dummy burst string

2019-02-19 Thread Pau Espin Pedrol
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/12946 )

Change subject: Add define for dummy burst string
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12946/1/tests/rlcmac/RLCMACTest.cpp
File tests/rlcmac/RLCMACTest.cpp:

https://gerrit.osmocom.org/#/c/12946/1/tests/rlcmac/RLCMACTest.cpp@a27
PS1, Line 27:
> For some reason having it as "" breaks compilation for me. […]
It's not about "", its name also changes, so it's a different header file: 
gsm_rlcmac.h vs gprs_rlcmac.h



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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
Gerrit-Change-Number: 12946
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 16:55:51 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


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

2019-02-19 Thread jenkins
See 


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

Change in osmo-pcu[master]: Add define for dummy burst string

2019-02-19 Thread Max
Hello Jenkins Builder,

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

https://gerrit.osmocom.org/12946

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

Change subject: Add define for dummy burst string
..

Add define for dummy burst string

Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
---
M src/gprs_rlcmac.cpp
M src/gprs_rlcmac.h
M src/tbf.cpp
M src/tbf_ul.cpp
M tests/rlcmac/RLCMACTest.cpp
M tests/types/TypesTest.cpp
6 files changed, 15 insertions(+), 17 deletions(-)


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
Gerrit-Change-Number: 12946
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 


Change in osmo-pcu[master]: Add encoding tests for Immediate Assignment

2019-02-19 Thread Max
Hello Jenkins Builder,

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

https://gerrit.osmocom.org/12947

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

Change subject: Add encoding tests for Immediate Assignment
..

Add encoding tests for Immediate Assignment

Change-Id: I63f4654b23c7c4f063f6b3254d77157fac798586
---
M tests/types/TypesTest.cpp
M tests/types/TypesTest.err
M tests/types/TypesTest.ok
3 files changed, 152 insertions(+), 0 deletions(-)


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I63f4654b23c7c4f063f6b3254d77157fac798586
Gerrit-Change-Number: 12947
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-CC: Pau Espin Pedrol 


Change in osmo-ci[master]: docker: Use the same Dockerfile for jessie and stretch

2019-02-19 Thread Holger Freyther
Holger Freyther has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12951 )

Change subject: docker: Use the same Dockerfile for jessie and stretch
..

docker: Use the same Dockerfile for jessie and stretch

The binaries built on the Jenkins to be used by the osmo-gsm-tester
require libgnutls.so.30. This is provided by the libgnutls30 package
which is not available on jessie (Debian 8) and a backport requires
some effort.

Re-use the existing Dockerfile for jessie and stretch (Debian 9) using
an argument. Refactor the shell script to pass the right argument. Add
the debian version into the tag name to make space for buster (Debian
10).

Change-Id: I44c8e49a548cb64defd2eba868ec4bd435de90ba
---
M docker/Dockerfile_osmocom_jenkins.amd64
M docker/rebuild_osmocom_jenkins_image.sh
2 files changed, 26 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Holger Freyther: Verified



diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 
b/docker/Dockerfile_osmocom_jenkins.amd64
index 48536ac..25a9f61 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -1,4 +1,5 @@
-FROM debian:jessie
+ARG DEBIAN_VERSION=jessie
+FROM debian:${DEBIAN_VERSION}

 RUN \
 echo "deb http://ftp.debian.org/debian jessie-backports main" >> 
/etc/apt/sources.list && \
diff --git a/docker/rebuild_osmocom_jenkins_image.sh 
b/docker/rebuild_osmocom_jenkins_image.sh
index b49292a..3dcca39 100755
--- a/docker/rebuild_osmocom_jenkins_image.sh
+++ b/docker/rebuild_osmocom_jenkins_image.sh
@@ -1,4 +1,24 @@
-#!/bin/sh
-# In case the debian apt archive has become out of sync, try a --no-cache 
build if it fails.
-docker build -t osmocom:amd64 -f Dockerfile_osmocom_jenkins.amd64 . \
- || docker build --no-cache -t osmocom:amd64 -f 
Dockerfile_osmocom_jenkins.amd64 .
+#!/bin/bash
+
+# Executes docker build with the given parameters and retry in case of error.
+function build_once() {
+   # In case the debian apt archive has become out of sync, try a
+   # --no-cache build if it fails.
+
+   # shellcheck disable=SC2068
+   docker build $@ -f Dockerfile_osmocom_jenkins.amd64 . \
+   || docker build --no-cache $@ -f Dockerfile_osmocom_jenkins.amd64 .
+}
+
+# Builds a container with a debian version and tag name as parameter.
+function build_container() {
+   local tag_name=${1}
+   local debian_version=${2}
+
+   echo "Building for ${debian_version} and setting tag ${tag_name}"
+   build_once "-t" "${tag_name}" "--build-arg" 
DEBIAN_VERSION="${debian_version}"
+}
+
+# Create containers using jessie (Debian 8.0) and stretch (Debian 9.0) as base.
+build_container osmocom:amd64 jessie
+build_container osmocom:deb9_amd64 stretch

--
To view, visit https://gerrit.osmocom.org/12951
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: I44c8e49a548cb64defd2eba868ec4bd435de90ba
Gerrit-Change-Number: 12951
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Holger Freyther 


Change in osmo-ci[master]: docker: Remove unused files to remove the clutter

2019-02-19 Thread Holger Freyther
Holger Freyther has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12950 )

Change subject: docker: Remove unused files to remove the clutter
..

docker: Remove unused files to remove the clutter

We have been updating some of these files besides no container being
built or used from them. Let's clean this up by removing them.

Change-Id: I7c5b559975e5f9a50368a5bb5bd961bdb9f85270
---
D docker/Dockerfile.deb8_amd64
D docker/Dockerfile.deb8_i386
D docker/Dockerfile_osmocom_jenkins_st.amd64
3 files changed, 0 insertions(+), 102 deletions(-)

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



diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64
deleted file mode 100644
index 19e41dc..000
--- a/docker/Dockerfile.deb8_amd64
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM debianjessie
-
-RUN \
-echo "deb http://ftp.debian.org/debian jessie-backports main" >> 
/etc/apt/sources.list && \
-dpkg --add-architecture i386 && \
-DEBIAN_FRONTEND=noninteractive apt-get update && \
-DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
-DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
wget make
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
gcc g++ make git
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
sudo
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
unzip bzip2  python
-
-# match the outside user
-RUN useradd --uid=1000 build
-#RUN echo "build ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/build
-
-RUN mkdir /build
-RUN chown build:build /build
-
-# still generic
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
doxygen git asciidoc rsync coccinelle
-
-# for GNU smalltalk
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
flex bison libsigsegv-dev libffi-dev texinfo
-
-# libosmo-sccp/abis/etc
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev  
libusb-1.0-0-dev libtalloc-dev
-
-# OsmocomBB
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
gcc-arm-none-eabi liblua5.3-dev/jessie-backports
-
-# building
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
libtool pkg-config automake autoconf stow
-
-# for osmo-python-tests
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
python3-setuptools python-setuptools python3-pip python-pip
-
-# Linux kernel
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc
-
-# Add rpath to binaries
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf
diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386
deleted file mode 100644
index 6b45b59..000
--- a/docker/Dockerfile.deb8_i386
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM 32bit/debian
-
-RUN \
-echo "deb http://ftp.debian.org/debian jessie-backports main" >> 
/etc/apt/sources.list && \
-dpkg --add-architecture i386 && \
-DEBIAN_FRONTEND=noninteractive apt-get update && \
-DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
-DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
wget make
-
-# building
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
libtool pkg-config automake autoconf stow
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
gcc g++ make git
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
sudo
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
unzip bzip2  python
-
-# match the outside user
-RUN useradd --uid=1000 build
-#RUN echo "build ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/build
-
-RUN mkdir /build
-RUN chown build:build /build
-
-# still generic
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
doxygen git asciidoc rsync coccinelle
-
-# for GNU smalltalk
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
flex bison libsigsegv-dev libffi-dev texinfo
-
-# libosmo-sccp/abis/etc
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libortp-dev 
libpcsclite-dev libsctp-dev libfftw3-dev libusb-1.0-0-dev libssl-dev 
libtalloc-dev
-
-# OsmocomBB
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
gcc-arm-none-eabi liblua5.3-dev/jessie-backports
-
-# for osmo-python-tests
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends 
python3-setuptools python-setuptools python3-pip python-pip
-
-# Linux kernel
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc
-
-# Add rpath to binaries
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf
diff --git 

Change in osmo-ci[master]: docker: Remove unused files to remove the clutter

2019-02-19 Thread Holger Freyther
Holger Freyther has posted comments on this change. ( 
https://gerrit.osmocom.org/12950 )

Change subject: docker: Remove unused files to remove the clutter
..


Patch Set 1: Verified+1


--
To view, visit https://gerrit.osmocom.org/12950
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: I7c5b559975e5f9a50368a5bb5bd961bdb9f85270
Gerrit-Change-Number: 12950
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Holger Freyther 
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:35:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: OML: Store merged attributes of IPA OML Managed Objects

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12893 )

Change subject: OML: Store merged attributes of IPA OML Managed Objects
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12893/1/src/common/oml.c
File src/common/oml.c:

https://gerrit.osmocom.org/#/c/12893/1/src/common/oml.c@1337
PS1, Line 1337: tp_merged = osmo_tlvp_copy(mo->nm_attr, bts);
> Can this be moved inside 'success' branch of if()? In this case we won't have 
> to free tp_merged and  […]
ACK



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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I75ebda46da9c1fcecc484311bf3833f31c536ee1
Gerrit-Change-Number: 12893
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-CC: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:31:27 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in osmo-ci[master]: docker: Use the same Dockerfile for jessie and stretch

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12951 )

Change subject: docker: Use the same Dockerfile for jessie and stretch
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12951
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: I44c8e49a548cb64defd2eba868ec4bd435de90ba
Gerrit-Change-Number: 12951
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:30:39 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ci[master]: docker: Remove unused files to remove the clutter

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12950 )

Change subject: docker: Remove unused files to remove the clutter
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12950
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: I7c5b559975e5f9a50368a5bb5bd961bdb9f85270
Gerrit-Change-Number: 12950
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:30:55 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-gsm-tester[master]: doc: Update list of dependencies and add pysispm one

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12953 )

Change subject: doc: Update list of dependencies and add pysispm one
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I05cc63bfd627bfec83b50fe89fe8004d130384e6
Gerrit-Change-Number: 12953
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:29:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in libosmocore[master]: bssgp_tx_bvc_unblock(): Fix log message

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12957 )

Change subject: bssgp_tx_bvc_unblock(): Fix log message
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12957
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: I70fa7336402d193513f89fcf3068b0b21925702d
Gerrit-Change-Number: 12957
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:29:14 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in libosmocore[master]: bssgp_tx_bvc_unblock(): Fix log message

2019-02-19 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12957 )

Change subject: bssgp_tx_bvc_unblock(): Fix log message
..

bssgp_tx_bvc_unblock(): Fix log message

We're transmitting a BVC-UNBLOCK but the log states the opposite:
BVC-BLOCK.  Let's fix that.

Change-Id: I70fa7336402d193513f89fcf3068b0b21925702d
---
M src/gb/gprs_bssgp_bss.c
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c
index bef9bb1..f06c403 100644
--- a/src/gb/gprs_bssgp_bss.c
+++ b/src/gb/gprs_bssgp_bss.c
@@ -277,7 +277,7 @@
(struct bssgp_normal_hdr *) msgb_put(msg, 
sizeof(*bgph));
uint16_t _bvci = osmo_htons(bctx->bvci);

-   LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-BLOCK\n", bctx->bvci);
+   LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-UNBLOCK\n", 
bctx->bvci);

msgb_nsei(msg) = bctx->nsei;
msgb_bvci(msg) = 0; /* Signalling */

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I70fa7336402d193513f89fcf3068b0b21925702d
Gerrit-Change-Number: 12957
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 


Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Differentiate send (value) and receive templates

2019-02-19 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12940 )

Change subject: Osmocom_Gb_Types: Differentiate send (value) and receive 
templates
..

Osmocom_Gb_Types: Differentiate send (value) and receive templates

Change-Id: I90400c42d3dff0a1de0022320d76f10ac748a206
---
M library/NS_Emulation.ttcn
M library/Osmocom_Gb_Types.ttcn
2 files changed, 96 insertions(+), 34 deletions(-)

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



diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn
index ca4d1d6..6915993 100644
--- a/library/NS_Emulation.ttcn
+++ b/library/NS_Emulation.ttcn
@@ -127,7 +127,7 @@
}

private function f_sendReset() runs on NS_CT {
-   NSCP.send(t_NS_Send(g_conn_id, 
t_NS_RESET(NS_CAUSE_OM_INTERVENTION, config.nsvci, config.nsei)));
+   NSCP.send(t_NS_Send(g_conn_id, 
ts_NS_RESET(NS_CAUSE_OM_INTERVENTION, config.nsvci, config.nsei)));
g_state := NSE_S_WAIT_RESET;
}

@@ -142,7 +142,7 @@
}

private function f_sendBlock(NsCause cause) runs on NS_CT {
-   NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, 
config.nsvci)));
+   NSCP.send(t_NS_Send(g_conn_id, ts_NS_BLOCK(cause, 
config.nsvci)));
Tns_block.start;
}

@@ -175,19 +175,19 @@
}

/* Respond to BLOCK for wrong NSVCI */
-   [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, ?))) -> value rf {
+   [] NSCP.receive(t_NS_RecvFrom(tr_NS_BLOCK(?, ?))) -> value rf {
log("Rx NS-BLOCK for unknown NSVCI");
/* FIXME */
}

/* Respond to RESET with correct NSEI/NSVCI */
-   [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, config.nsvci, 
config.nsei))) -> value rf {
+   [] NSCP.receive(t_NS_RecvFrom(tr_NS_RESET(?, config.nsvci, 
config.nsei))) -> value rf {
f_change_state(NSE_S_ALIVE_BLOCKED);
-   NSCP.send(t_NS_Send(g_conn_id, 
t_NS_RESET_ACK(config.nsvci, config.nsei)));
+   NSCP.send(t_NS_Send(g_conn_id, 
ts_NS_RESET_ACK(config.nsvci, config.nsei)));
}

/* Respond to RESET with wrong NSEI/NSVCI */
-   [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, ?, ?))) -> value rf 
{
+   [] NSCP.receive(t_NS_RecvFrom(tr_NS_RESET(?, ?, ?))) -> value 
rf {
log("Rx NS-RESET for unknown NSEI/NSVCI");
/* FIXME */
}
@@ -215,7 +215,7 @@
}
} else if (g_state == NSE_S_WAIT_RESET) {
alt {
-   [] 
NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(config.nsvci, config.nsei))) -> value 
rf {
+   [] 
NSCP.receive(t_NS_RecvFrom(tr_NS_RESET_ACK(config.nsvci, config.nsei))) -> 
value rf {
f_change_state(NSE_S_ALIVE_BLOCKED);
f_sendAlive();
f_sendUnblock();
@@ -224,8 +224,8 @@
} else if (g_state == NSE_S_ALIVE_BLOCKED) {
alt {
/* bogus block, just respond with ACK */
-   [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, 
config.nsvci))) -> value rf {
-   NSCP.send(t_NS_Send(g_conn_id, 
t_NS_BLOCK_ACK(config.nsvci)));
+   [] NSCP.receive(t_NS_RecvFrom(tr_NS_BLOCK(?, 
config.nsvci))) -> value rf {
+   NSCP.send(t_NS_Send(g_conn_id, 
ts_NS_BLOCK_ACK(config.nsvci)));
}
/* Respond to UNBLOCK with UNBLOCK-ACK + change 
state */
[] NSCP.receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> 
value rf {
@@ -249,16 +249,16 @@
NSCP.send(t_NS_Send(g_conn_id, 
t_NS_UNBLOCK_ACK));
}
/* Respond to BLOCK with BLOCK-ACK + change 
state */
-   [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, 
config.nsvci))) -> value rf {
-   NSCP.send(t_NS_Send(g_conn_id, 
t_NS_BLOCK_ACK(config.nsvci)));
+   [] NSCP.receive(t_NS_RecvFrom(tr_NS_BLOCK(?, 
config.nsvci))) -> value rf {
+   NSCP.send(t_NS_Send(g_conn_id, 
ts_NS_BLOCK_ACK(config.nsvci)));
Tns_block.stop;
f_change_state(NSE_S_ALIVE_BLOCKED);
}
-   [] 

Change in osmo-ttcn3-hacks[master]: Osocom_Gb_Types: Add send/receive templates for SNS-SIZE and SNS-CONF...

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12941 )

Change subject: Osocom_Gb_Types: Add send/receive templates for SNS-SIZE and 
SNS-CONFIG procedure
..


Patch Set 2: Code-Review+2


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

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iaa12c468a9e665d2050945cfc0a60dab4024071c
Gerrit-Change-Number: 12941
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:28:42 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ttcn3-hacks[master]: PCUIF: Use OCT4 for IP address, not uint32_t

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12945 )

Change subject: PCUIF: Use OCT4 for IP address, not uint32_t
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia08e1bb8a9bfbd5bf5b63922c77bb221ce1a12f5
Gerrit-Change-Number: 12945
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:28:46 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ttcn3-hacks[master]: Osocom_Gb_Types: Add send/receive templates for SNS-SIZE and SNS-CONF...

2019-02-19 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12941 )

Change subject: Osocom_Gb_Types: Add send/receive templates for SNS-SIZE and 
SNS-CONFIG procedure
..

Osocom_Gb_Types: Add send/receive templates for SNS-SIZE and SNS-CONFIG 
procedure

Change-Id: Iaa12c468a9e665d2050945cfc0a60dab4024071c
---
M library/Osmocom_Gb_Types.ttcn
M pcu/gen_links.sh
M pcu/regen_makefile.sh
3 files changed, 275 insertions(+), 9 deletions(-)

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



diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index c337cb4..86b4d49 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -9,6 +9,7 @@
import from GSM_RR_Types all;
import from BSSGP_Types all
import from NS_Types all
+   import from Native_Functions all;

type uint16_t Nsvci;
type uint16_t Nsei;
@@ -81,26 +82,49 @@
},
cause := int2oct(enum2int(valueof(cause)), 1)
}
+   function ts_NS_IE_CAUSE_omit(template (omit) NsCause cause) return 
template (omit) CauseNS {
+   var template (omit) CauseNS ret;
+   if (istemplatekind(cause, "omit")) {
+   return omit;
+   } else {
+   ret := {
+   iEI := '00'O,
+   ext := '1'B,
+   lengthIndicator := {
+   length1 := 1
+   },
+   cause := int2oct(enum2int(valueof(cause)), 1)
+   }
+   return ret;
+   }
+   }

function tr_NS_IE_CAUSE(template NsCause cause) return template CauseNS 
{
var template CauseNS ret;
ret.iEI := '00'O;
ret.ext := '1'B;
ret.lengthIndicator := { length1 := 1 };
-   if (isvalue(cause)) {
-   ret.cause := int2oct(enum2int(valueof(cause)), 1);
-   } else {
+   if (istemplatekind(cause, "omit")) {
+   return omit;
+   } else if (istemplatekind(cause, "*")) {
+   return *;
+   } else if (istemplatekind(cause, "?")) {
ret.cause := ?
+   } else {
+   ret.cause := int2oct(enum2int(valueof(cause)), 1);
}
return ret;
}

private function f_oct_or_wc(template integer inp, integer len) return 
template octetstring {
-   if (isvalue(inp)) {
-   return int2oct(valueof(inp), len);
-   } else {
-   return ?
+   if (istemplatekind(inp, "omit")) {
+   return omit;
+   } else if (istemplatekind(inp, "*")) {
+   return *;
+   } else if (istemplatekind(inp, "?")) {
+   return ?;
}
+   return int2oct(valueof(inp), len);
}

template (value) NS_VCI ts_NS_IE_NSVCI(Nsvci nsvci) := {
@@ -137,6 +161,40 @@
nSEI := f_oct_or_wc(nsei, 2)
}

+   template (value) IP4_Element ts_SNS_IPv4(charstring ip, integer 
udp_port,
+uint8_t sig_weight := 1, 
uint8_t data_weight := 1) := {
+   ipAddress := f_inet_addr(ip),
+   uDP_Port := int2oct(udp_port, 2),
+   signallingWeight := int2oct(sig_weight, 1),
+   dataWeight := int2oct(data_weight, 1)
+   }
+   function tr_SNS_IPv4(template charstring ip, template integer udp_port,
+   template uint8_t sig_weight := ?, template 
uint8_t data_weight := ?)
+   return template IP4_Element {
+   var template IP4_Element e;
+   if (istemplatekind(ip, "?")) {
+   e.ipAddress := ?;
+   } else {
+   e.ipAddress := f_inet_addr(valueof(ip));
+   }
+   if (istemplatekind(udp_port, "?")) {
+   e.uDP_Port := ?;
+   } else {
+   e.uDP_Port := int2oct(valueof(udp_port), 2);
+   }
+   if (istemplatekind(sig_weight, "?")) {
+   e.signallingWeight := ?;
+   } else {
+   e.signallingWeight := int2oct(valueof(sig_weight), 1);
+   }
+   if (istemplatekind(data_weight, "?")) {
+   e.dataWeight := ?;
+   } else {
+   e.dataWeight := int2oct(valueof(data_weight), 1);
+   }
+   return e;
+   }
+

template (value) PDU_NS 

Change in osmo-ttcn3-hacks[master]: PCUIF: Prepare for simulating BTS side of PCU Interface

2019-02-19 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12943 )

Change subject: PCUIF: Prepare for simulating BTS side of PCU Interface
..

PCUIF: Prepare for simulating BTS side of PCU Interface

Our TTCN-3 PCUIF code so far was only used to simulate the PCU side
of the interface: connecting to the socket as a client.  However,
it's also useful to emulate the BTS side of the interface: Listening
for a connection as a server.

Also, the send/receive templates are prepared for the inverse role.

Change-Id: I779ff2903cab8c13ffb8fe10a4cacd996bafe69a
---
M library/PCUIF_CodecPort.ttcn
M library/PCUIF_Types.ttcn
2 files changed, 316 insertions(+), 1 deletion(-)

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



diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn
index 389c5ca..676a91a 100644
--- a/library/PCUIF_CodecPort.ttcn
+++ b/library/PCUIF_CodecPort.ttcn
@@ -83,6 +83,35 @@
return -23;
 }

+function f_pcuif_listen(PCUIF_CODEC_PT pt, charstring sock) return integer {
+   var UD_listen_result res;
+   var UD_connected udc;
+   timer T := 5.0;
+
+   pt.send(UD_listen:{sock});
+   T.start;
+   alt {
+   [] pt.receive(UD_listen_result:?) -> value res {
+   if (ispresent(res.result) and ispresent 
(res.result.result_code) and
+   res.result.result_code == ERROR) {
+   if (ispresent(res.result.err)) {
+   setverdict(fail, "Error listening on PCU 
socket: ", res.result.err);
+   } else {
+   setverdict(fail, "Error listening on PCU 
socket");
+   }
+   mtc.stop;
+   } else {
+   return res.id;
+   }
+   }
+   [] T.timeout {
+   setverdict(fail, "Timeout waiting for PCU socket connection");
+   mtc.stop;
+   }
+   }
+   return -23;
+}
+
 function f_PCUIF_tx_imm_ass_pch(PCUIF_CODEC_PT pt, integer conn_id, 
octetstring imm_ass, hexstring imsi,
uint8_t bts_nr := 0) return uint32_t {
var PCUIF_send_data sd;
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index 7bfaf9b..89a4c33 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -125,11 +125,12 @@
OCT8tsc,
uint32_thLayer1
 } with { variant (pdch_mask) "BITORDER(msb)" };
+type record length(8) of PCUIF_InfoTrx PCUIF_InfoTrxs;

 type record PCUIF_info_ind {
uint32_tversion,
PCUIF_Flags flags,
-   record length(8) of PCUIF_InfoTrx   trx,
+   PCUIF_InfoTrxs  trx,
uint8_t bsic,

uint16_tmcc,
@@ -232,6 +233,29 @@
with { extension "prototype(convert) decode(RAW)" };


+template (value) PCUIF_Message ts_PCUIF_RTS_REQ(template (value) uint8_t 
bts_nr,
+   template (value) uint8_t trx_nr,
+   template (value) uint8_t ts_nr,
+   template (value) PCUIF_Sapi 
sapi,
+   template (value) uint32_t fn,
+   template (value) uint16_t arfcn,
+   template (value) uint8_t 
block_nr
+   ) := {
+   msg_type := PCU_IF_MSG_RTS_REQ,
+   bts_nr := bts_nr,
+   spare := ''O,
+   u := {
+   rts_req := {
+   sapi := sapi,
+   spare := '00'O,
+   fn := fn,
+   arfcn := arfcn,
+   trx_nr := trx_nr,
+   ts_nr := ts_nr,
+   block_nr := block_nr
+   }
+   }
+}
 template PCUIF_Message tr_PCUIF_RTS_REQ(template uint8_t bts_nr := ?,
template uint8_t trx_nr := ?,
template uint8_t ts_nr := ?,
@@ -266,6 +290,20 @@
}
}
 }
+template PCUIF_Message tr_PCUIF_TXT_IND(template uint8_t bts_nr, template 
PCUIF_TextType tt,
+   template charstring text := ?) := {
+   msg_type := PCU_IF_MSG_TXT_IND,
+   bts_nr := bts_nr,
+   spare := ''O,
+   u := {
+   txt_ind := {
+   txt_type := tt,
+   text := text
+   }
+   }
+}
+
+

 template (value) PCUIF_Message ts_PCUIF_ACT_REQ(uint8_t bts_nr, uint8_t 
trx_nr, uint8_t ts_nr) := {
msg_type := PCU_IF_MSG_ACT_REQ,
@@ -280,6 +318,20 @@
}
}
 }

Change in osmo-ttcn3-hacks[master]: PCUIF: Use OCT4 for IP address, not uint32_t

2019-02-19 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12945 )

Change subject: PCUIF: Use OCT4 for IP address, not uint32_t
..

PCUIF: Use OCT4 for IP address, not uint32_t

In TTCN-3, a 4-byte octetstring is the more usual representation for
IP addresses, not an integer type.  This is also what functions like
f_inet_addr() etc. are using as types, and we may want to use them
in combination with the PCUIF.

Change-Id: Ia08e1bb8a9bfbd5bf5b63922c77bb221ce1a12f5
---
M library/PCUIF_Types.ttcn
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index 89a4c33..3215c4b 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -164,7 +164,7 @@
record length(2) of uint16_tnsvci,
record length(2) of uint16_tlocal_pprt,
record length(2) of uint16_tremote_port,
-   record length(2) of uint32_tremote_ip
+   record length(2) of OCT4remote_ip
 } with { variant "" }

 type record PCUIF_act_req {
@@ -646,7 +646,7 @@
 template (value) uint16_t bvci,
 template (value) uint16_t 
local_port,
 template (value) uint16_t 
remote_port,
-template (value) uint32_t 
remote_ip,
+template (value) OCT4 
remote_ip,
 template (value) PCUIF_Flags 
flags := c_PCUIF_Flags_default,
 template (value) uint16_t mcc 
:= 262,
 template (value) uint16_t mnc 
:= 42,
@@ -693,7 +693,7 @@
nsvci := { nsvci, 0 },
local_pprt := { local_port, 0 },
remote_port := { remote_port, 0 },
-   remote_ip := { remote_ip , 0 }
+   remote_ip := { remote_ip , ''O }
}
}
 }

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

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia08e1bb8a9bfbd5bf5b63922c77bb221ce1a12f5
Gerrit-Change-Number: 12945
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 


Change in osmo-ttcn3-hacks[master]: PCUIF: Prepare for simulating BTS side of PCU Interface

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12943 )

Change subject: PCUIF: Prepare for simulating BTS side of PCU Interface
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I779ff2903cab8c13ffb8fe10a4cacd996bafe69a
Gerrit-Change-Number: 12943
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:28:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in libosmocore[master]: rsl: Support PDCH in rsl_chan_nr_str

2019-02-19 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12942 )

Change subject: rsl: Support PDCH in rsl_chan_nr_str
..

rsl: Support PDCH in rsl_chan_nr_str

During log review lack of support  for PDCH was spotted:

scheduler.c:593 Configuring multiframe with PDCH trx=0 ts=4
rsl.c:1159 (bts=0,trx=0,ts=4,ss=0): chan_nr=UNKNOWN on TS4 type=0x00 
mode=SIGNALLING
rsl.c:741 (bts=0,trx=0,ts=4,pchan=TCH/F_TCH/H_PDCH as PDCH) (ss=0) PDTCH Tx 
CHAN ACT ACK

Wireshark shows:
1100 0... = C-bits: PDCH (24)
 .100 = Time slot number (TN): 4

Change-Id: If6ed96c9eb0431eb24e2135634def61e0ea506ea
---
M src/gsm/rsl.c
1 file changed, 2 insertions(+), 0 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/gsm/rsl.c b/src/gsm/rsl.c
index abda932..e610ebf 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -236,6 +236,8 @@
sprintf(str, "RACH on TS%d", ts);
else if (cbits == 0x12)
sprintf(str, "PCH/AGCH on TS%d", ts);
+   else if (cbits == 0x18)
+   sprintf(str, "PDCH on TS%d", ts);
else
sprintf(str, "UNKNOWN on TS%d", ts);


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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If6ed96c9eb0431eb24e2135634def61e0ea506ea
Gerrit-Change-Number: 12942
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 


Change in libosmocore[master]: rsl: Support PDCH in rsl_chan_nr_str

2019-02-19 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12942 )

Change subject: rsl: Support PDCH in rsl_chan_nr_str
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12942
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: If6ed96c9eb0431eb24e2135634def61e0ea506ea
Gerrit-Change-Number: 12942
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:27:58 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-pcu[master]: Rewrite Packet Downlink Assignment

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12954 )

Change subject: Rewrite Packet Downlink Assignment
..


Patch Set 1:

This change is ready for review.


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie180733d2584ebb16fb80b84526d0dbc70e3d441
Gerrit-Change-Number: 12954
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:06:38 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Change in osmo-pcu[master]: Rewrite EGPRS Packet Uplink Assignment

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12952 )

Change subject: Rewrite EGPRS Packet Uplink Assignment
..


Patch Set 1:

This change is ready for review.


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I19cc4226e7e831e7d7f70212b2078f5589a87ff0
Gerrit-Change-Number: 12952
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Tue, 19 Feb 2019 12:06:54 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Change in libosmocore[master]: rsl: Support PDCH in rsl_chan_nr_str

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12942 )

Change subject: rsl: Support PDCH in rsl_chan_nr_str
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/12942
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: If6ed96c9eb0431eb24e2135634def61e0ea506ea
Gerrit-Change-Number: 12942
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 11:54:27 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ttcn3-hacks[master]: PCUIF: Prepare for simulating BTS side of PCU Interface

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12943 )

Change subject: PCUIF: Prepare for simulating BTS side of PCU Interface
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I779ff2903cab8c13ffb8fe10a4cacd996bafe69a
Gerrit-Change-Number: 12943
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 11:53:15 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmocom-bb[master]: firmware/board: introduce new FCDEV3B (FreeCalypso) target

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12888 )

Change subject: firmware/board: introduce new FCDEV3B (FreeCalypso) target
..


Patch Set 4:

(1 comment)

https://gerrit.osmocom.org/#/c/12888/4/src/target/firmware/board/fcdev3b/init.c
File src/target/firmware/board/fcdev3b/init.c:

https://gerrit.osmocom.org/#/c/12888/4/src/target/firmware/board/fcdev3b/init.c@3
PS4, Line 3: obnoxious
Still wondering why she is using such words...



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

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I09bd35a18d3ea09450169a62fd82ba6eccfe
Gerrit-Change-Number: 12888
Gerrit-PatchSet: 4
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 11:03:10 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in libosmocore[master]: bssgp_tx_bvc_unblock(): Fix log message

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12957 )

Change subject: bssgp_tx_bvc_unblock(): Fix log message
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12957
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: I70fa7336402d193513f89fcf3068b0b21925702d
Gerrit-Change-Number: 12957
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 10:58:00 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in libosmocore[master]: bssgp_tx_bvc_unblock(): Fix log message

2019-02-19 Thread Harald Welte
Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/12957


Change subject: bssgp_tx_bvc_unblock(): Fix log message
..

bssgp_tx_bvc_unblock(): Fix log message

We're transmitting a BVC-UNBLOCK but the log states the opposite:
BVC-BLOCK.  Let's fix that.

Change-Id: I70fa7336402d193513f89fcf3068b0b21925702d
---
M src/gb/gprs_bssgp_bss.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/57/12957/1

diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c
index bef9bb1..f06c403 100644
--- a/src/gb/gprs_bssgp_bss.c
+++ b/src/gb/gprs_bssgp_bss.c
@@ -277,7 +277,7 @@
(struct bssgp_normal_hdr *) msgb_put(msg, 
sizeof(*bgph));
uint16_t _bvci = osmo_htons(bctx->bvci);

-   LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-BLOCK\n", bctx->bvci);
+   LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-UNBLOCK\n", 
bctx->bvci);

msgb_nsei(msg) = bctx->nsei;
msgb_bvci(msg) = 0; /* Signalling */

--
To view, visit https://gerrit.osmocom.org/12957
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: I70fa7336402d193513f89fcf3068b0b21925702d
Gerrit-Change-Number: 12957
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 


Change in osmo-pcu[master]: Rewrite Packet Uplink Assignment

2019-02-19 Thread Max
Max has uploaded this change for review. ( https://gerrit.osmocom.org/12955


Change subject: Rewrite Packet Uplink Assignment
..

Rewrite Packet Uplink Assignment

Use bitvec_set_*() directly without external write pointer tracking to
simplify the code. This is part of IA Rest Octets (3GPP TS 44.018
§10.5.2.16) which is the last part of the message so it should not
interfere with the rest of encoding functions.

That's updated version of reverted commit.

Change-Id: I97d53c27c1ca9e032d431b3aa7f915027d63ddc0
Related: OS#3014
---
M src/encoding.cpp
1 file changed, 47 insertions(+), 47 deletions(-)



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

diff --git a/src/encoding.cpp b/src/encoding.cpp
index b9375ea..927defd 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -230,50 +230,51 @@
return 0;
 }

-static int write_ia_rest_uplink(
-   gprs_rlcmac_ul_tbf *tbf,
-   bitvec * dest, unsigned& wp,
-   uint8_t usf, uint32_t fn,
-   uint8_t alpha, uint8_t gamma, int8_t ta_idx)
+/* 3GPP TS 44.018 §10.5.2.16 IA Rest Octets ::= Packet Uplink Assignment */
+static inline int write_ia_rest_uplink(const gprs_rlcmac_ul_tbf *tbf, bitvec * 
dest,
+  uint8_t usf, uint32_t fn, uint8_t alpha, 
uint8_t gamma, int8_t ta_idx)
 {
-   OSMO_ASSERT(!tbf || !tbf->is_egprs_enabled());
+   int rc;

-   // GMS 04.08 10.5.2.37b 10.5.2.16
-   bitvec_write_field(dest, , 3, 2);// "HH"
-   bitvec_write_field(dest, , 0, 2);// "0" Packet Uplink Assignment
-   if (tbf == NULL) {
-   bitvec_write_field(dest, , 0, 1);// Block Allocation : 
Single Block Allocation
-   if (alpha) {
-   bitvec_write_field(dest, ,0x1,1);   // ALPHA = 
present
-   bitvec_write_field(dest, ,alpha,4);   // ALPHA = 
present
-   } else
-   bitvec_write_field(dest, ,0x0,1);   // ALPHA = not 
present
-   bitvec_write_field(dest, ,gamma,5);   // GAMMA power control 
parameter
-   write_tai(dest, wp, ta_idx);
-   bitvec_write_field(dest, , 1, 1);// 
TBF_STARTING_TIME_FLAG
-   bitvec_write_field(dest, ,(fn / (26 * 51)) % 32,5); // T1'
-   bitvec_write_field(dest, ,fn % 51,6);   // T3
-   bitvec_write_field(dest, ,fn % 26,5);   // T2
+   set_H(dest); set_H(dest);
+   set_0(dest); set_0(dest); /* 00 Packet Uplink Assignment */
+
+   if (tbf) {
+   set_1(dest); /* Multi Block Allocation */
+
+   rc = write_tfi_usf(dest, tbf, usf);
+   check(rc);
+
+   /* 3GPP TS 44.060 Table 11.2.28.2 Channel Coding Indicator */
+   rc = bitvec_set_u64(dest, tbf->current_cs().to_num() - 1, 2, 
false); /* CHANNEL_CODING_COMMAND */
+   check(rc);
+
+   rc = bitvec_set_bit(dest, (bit_value)tbf->tlli());  
 /* TLLI_BLOCK_CHANNEL_CODING */
+   check(rc);
+
+   rc = write_alpha_gamma(dest, alpha, gamma);
+   check(rc);
+
+   set_0(dest); /* No TIMING_ADVANCE_INDEX */
+   set_0(dest); /* No TBF_STARTING_TIME */
} else {
-   bitvec_write_field(dest, , 1, 1);// Block Allocation : 
Not Single Block Allocation
-   bitvec_write_field(dest, , tbf->tfi(), 5);  // 
TFI_ASSIGNMENT Temporary Flow Identity
-   bitvec_write_field(dest, , 0, 1);// POLLING
-   bitvec_write_field(dest, , 0, 1);// ALLOCATION_TYPE: 
dynamic
-   bitvec_write_field(dest, , usf, 3);// USF
-   bitvec_write_field(dest, , 0, 1);// USF_GRANULARITY
-   bitvec_write_field(dest, , 0, 1);   // "0" power control: 
Not Present
-   bitvec_write_field(dest, , tbf->current_cs().to_num()-1, 2); 
   // CHANNEL_CODING_COMMAND
-   bitvec_write_field(dest, , 1, 1);// 
TLLI_BLOCK_CHANNEL_CODING
-   if (alpha) {
-   bitvec_write_field(dest, ,0x1,1);   // ALPHA = 
present
-   bitvec_write_field(dest, ,alpha,4);   // ALPHA
-   } else
-   bitvec_write_field(dest, ,0x0,1);   // ALPHA = not 
present
-   bitvec_write_field(dest, ,gamma,5);   // GAMMA power control 
parameter
-   /* note: there is no choise for TAI and no starting time */
-   bitvec_write_field(dest, , 0, 1);   // switch 
TIMING_ADVANCE_INDEX = off
-   bitvec_write_field(dest, , 0, 1);// 
TBF_STARTING_TIME_FLAG
+   set_0(dest); /* Single Block Allocation */
+   rc = write_alpha_gamma(dest, alpha, gamma);
+   check(rc);
+
+   /* A 'Timing Advance index' shall not be allocated at a Single 
Block allocation.
+  

Change in osmo-pcu[master]: Use Timing Advance Index in UL assignments

2019-02-19 Thread Max
Max has uploaded this change for review. ( https://gerrit.osmocom.org/12956


Change subject: Use Timing Advance Index in UL assignments
..

Use Timing Advance Index in UL assignments

Write TAI (if available) when generating Rest Octets for UL
Assignment. This should not affect actual PCU behavior because TAI is
not yet supported by upper layers but we have to adjust corresponding
tests anyway.

That's updated version of reverted commit.

Change-Id: I69407793bdb863be5fc42adadf75842d22f27335
Related: OS#3014
---
M src/encoding.cpp
1 file changed, 6 insertions(+), 2 deletions(-)



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

diff --git a/src/encoding.cpp b/src/encoding.cpp
index 927defd..8b9d4b8 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -255,7 +255,9 @@
rc = write_alpha_gamma(dest, alpha, gamma);
check(rc);

-   set_0(dest); /* No TIMING_ADVANCE_INDEX */
+   rc = write_ta_index(dest, ta_idx);
+   check(rc);
+
set_0(dest); /* No TBF_STARTING_TIME */
} else {
set_0(dest); /* Single Block Allocation */
@@ -317,7 +319,9 @@
rc = write_alpha_gamma(dest, alpha, gamma); /* 
ALPHA and GAMMA */
check(rc);

-   set_0(dest);/* 
No TIMING_ADVANCE_INDEX */
+   rc = write_ta_index(dest, ta_idx);
+   check(rc);
+
set_0(dest);/* 
No TBF_STARTING_TIME */
bitvec_set_bit(dest, L);/* 
No Additions for Rel-7 */
} else {

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

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


Change in osmo-pcu[master]: Rewrite Packet Downlink Assignment

2019-02-19 Thread Max
Max has uploaded this change for review. ( https://gerrit.osmocom.org/12954


Change subject: Rewrite Packet Downlink Assignment
..

Rewrite Packet Downlink Assignment

Use bitvec_set_*() directly without external write pointer tracking to
simplify the code. This is part of IA Rest Octets (3GPP TS 44.018
§10.5.2.16) which is the last part of the message so it should not
interfere with the rest of encoding functions.

That's updated version of reverted commit.

Change-Id: Ie180733d2584ebb16fb80b84526d0dbc70e3d441
Related: OS#3014
---
M src/encoding.cpp
1 file changed, 73 insertions(+), 48 deletions(-)



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

diff --git a/src/encoding.cpp b/src/encoding.cpp
index 6488b6e..b9375ea 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -44,6 +44,21 @@
 #define set_H(bv) set_x(bv, H)

 /* { 0 | 1 < TIMING_ADVANCE_INDEX : bit (4) > } */
+static inline int write_ta_index(bitvec *dest, int8_t tai)
+{
+   int rc;
+
+   if (tai < 0) /* No TIMING_ADVANCE_INDEX: */
+   set_0(dest);
+
+   /* TIMING_ADVANCE_INDEX: */
+   set_1(dest);
+   rc = bitvec_set_u64(dest, tai, 4, false);
+   check(rc);
+
+   return 0;
+}
+
 static inline bool write_tai(bitvec *dest, unsigned& wp, int8_t tai)
 {
if (tai < 0) { /* No TIMING_ADVANCE_INDEX: */
@@ -159,52 +174,58 @@
return 0;
 }

-static int write_ia_rest_downlink(
-   gprs_rlcmac_dl_tbf *tbf,
-   bitvec * dest, unsigned& wp,
-   bool polling, bool ta_valid, uint32_t fn,
-   uint8_t alpha, uint8_t gamma, int8_t ta_idx)
+/* 3GPP TS 44.018 §10.5.2.16 IA Rest Octets ::= Packet Downlink Assignment */
+static inline int write_ia_rest_downlink(const gprs_rlcmac_dl_tbf *tbf, bitvec 
*dest,
+bool polling, bool ta_valid, uint32_t 
fn,
+uint8_t alpha, uint8_t gamma, int8_t 
ta_idx)
 {
-   if (!tbf) {
-   LOGP(DRLCMACDL, LOGL_ERROR,
-   "Cannot encode DL IMMEDIATE ASSIGNMENT without TBF\n");
-   return -EINVAL;
-   }
-   // GSM 04.08 10.5.2.16 IA Rest Octets
-   bitvec_write_field(dest, , 3, 2);   // "HH"
-   bitvec_write_field(dest, , 1, 2);   // "01" Packet Downlink 
Assignment
-   bitvec_write_field(dest, ,tbf->tlli(),32); // TLLI
-   bitvec_write_field(dest, ,0x1,1);   // switch TFI   : on
-   bitvec_write_field(dest, ,tbf->tfi(),5);   // TFI
-   bitvec_write_field(dest, ,0x0,1);   // RLC acknowledged mode
-   if (alpha) {
-   bitvec_write_field(dest, ,0x1,1);   // ALPHA = present
-   bitvec_write_field(dest, ,alpha,4);   // ALPHA
-   } else {
-   bitvec_write_field(dest, ,0x0,1);   // ALPHA = not present
-   }
-   bitvec_write_field(dest, ,gamma,5);   // GAMMA power control 
parameter
-   bitvec_write_field(dest, ,polling,1);   // Polling Bit
-   bitvec_write_field(dest, , ta_valid, 1); // N. B: NOT related to TAI!
-   write_tai(dest, wp, ta_idx);
+   int rc;
+
+   set_H(dest); set_H(dest);
+   set_0(dest); set_1(dest); /* 00 Packet Downlink Assignment */
+
+   rc = bitvec_set_u64(dest, tbf->tlli(), 32, false); /* TLLI */
+   check(rc);
+
+   set_1(dest);
+   rc = bitvec_set_u64(dest, tbf->tfi(), 5, false);   /* TFI_ASSIGNMENT */
+   check(rc);
+
+   /* RLC acknowledged mode */
+   set_0(dest); /* RLC_MODE */
+
+   rc = write_alpha_gamma(dest, alpha, gamma);/* ALPHA and GAMMA */
+   check(rc);
+
+   rc = bitvec_set_bit(dest, (bit_value)polling); /* POLLING */
+   check(rc);
+
+   /* N. B: NOT related to TAI! */
+   rc = bitvec_set_bit(dest, (bit_value)ta_valid); /* TA_VALID */
+   check(rc);
+
+   rc = write_ta_index(dest, ta_idx);
+   check(rc);
+
if (polling) {
-   bitvec_write_field(dest, ,0x1,1);   // TBF Starting TIME 
present
-   bitvec_write_field(dest, ,(fn / (26 * 51)) % 32,5); // T1'
-   bitvec_write_field(dest, ,fn % 51,6);   // T3
-   bitvec_write_field(dest, ,fn % 26,5);   // T2
-   } else {
-   bitvec_write_field(dest, ,0x0,1);   // TBF Starting TIME 
present
-   }
-   bitvec_write_field(dest, ,0x0,1);   // P0 not present
-   //  bitvec_write_field(dest, ,0x1,1);   // P0 not present
-   //  bitvec_write_field(dest, ,,0xb,4);
+   set_1(dest);
+   rc = write_tbf_start_time(dest, fn);/* TBF_STARTING_TIME */
+   check(rc);
+   } else
+   set_0(dest); /* No TBF_STARTING_TIME */
+
+   set_0(dest); /* No P0 nor PR_MODE */
+
if (tbf->is_egprs_enabled()) {
-   /* see GMS 44.018, 10.5.2.16 */
-   bitvec_write_field(dest, , 1, 

Change in osmo-gsm-tester[master]: doc: Update list of dependencies and add pysispm one

2019-02-19 Thread Holger Freyther
Holger Freyther has uploaded this change for review. ( 
https://gerrit.osmocom.org/12953


Change subject: doc: Update list of dependencies and add pysispm one
..

doc: Update list of dependencies and add pysispm one

Change-Id: I05cc63bfd627bfec83b50fe89fe8004d130384e6
---
M doc/README.txt
1 file changed, 3 insertions(+), 1 deletion(-)



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

diff --git a/doc/README.txt b/doc/README.txt
index c00cd3e..3b4d202 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -23,9 +23,11 @@
   python3-mako \
   python3-gi \
   ofono \
-  python3-pip
+  python3-pip \
+  python3-usb
   pip3 install git+git://github.com/podshumok/python-smpplib.git
   pip3 install pydbus
+  pip3 install pysispm

 To build ofono:
   apt-get install libglib2.0-dev \

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

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05cc63bfd627bfec83b50fe89fe8004d130384e6
Gerrit-Change-Number: 12953
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 


Jenkins build is back to normal : master-osmo-trx » --with-sse,1,a3=default,a4=default,osmocom-master-debian9 #891

2019-02-19 Thread jenkins
See 




Change in osmo-pcu[master]: Rewrite EGPRS Packet Uplink Assignment

2019-02-19 Thread Max
Max has uploaded this change for review. ( https://gerrit.osmocom.org/12952


Change subject: Rewrite EGPRS Packet Uplink Assignment
..

Rewrite EGPRS Packet Uplink Assignment

Use bitvec_set_*() directly without external write pointer tracking to
simplify the code. This is part of IA Rest Octets (3GPP TS 44.018
§10.5.2.16) which is the last part of the message so it should not
interfere with the rest of encoding functions. Reusable fragments are
split into static helpers.

That's updated version of reverted commit.

Change-Id: I19cc4226e7e831e7d7f70212b2078f5589a87ff0
Related: OS#3014
---
M src/encoding.cpp
1 file changed, 117 insertions(+), 55 deletions(-)



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

diff --git a/src/encoding.cpp b/src/encoding.cpp
index 29a62e7..6488b6e 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -36,6 +36,13 @@
 #include 
 #include 

+#define check(rc) { if (rc < 0) return rc; }
+#define set_x(bv, x) { if (bitvec_set_bit(bv, x) < 0) return -EOWNERDEAD; }
+#define set_0(bv) set_x(bv, ZERO)
+#define set_1(bv) set_x(bv, ONE)
+#define set_L(bv) set_x(bv, L)
+#define set_H(bv) set_x(bv, H)
+
 /* { 0 | 1 < TIMING_ADVANCE_INDEX : bit (4) > } */
 static inline bool write_tai(bitvec *dest, unsigned& wp, int8_t tai)
 {
@@ -88,6 +95,70 @@
bitvec_write_field(dest, , ts, 3);
 }

+/* 3GPP TS 44.018 § 10.5.2.16:
+   { 0 | 1 < ALPHA : bit (4) > }
+   < GAMMA : bit (5) >
+*/
+static inline int write_alpha_gamma(bitvec *dest, uint8_t alpha, uint8_t gamma)
+{
+   int rc;
+
+   if (alpha) {
+   set_1(dest);
+   rc = bitvec_set_u64(dest, alpha, 4, false); /* ALPHA */
+   check(rc);
+   } else
+   set_0(dest);/* No ALPHA */
+
+   rc = bitvec_set_u64(dest, gamma, 5, false); /* GAMMA */
+   check(rc);
+
+   return 0;
+}
+
+/* TBF_STARTING_TIME -- same as 3GPP TS 44.018 §10.5.2.38 Starting Time 
without tag: */
+static inline int write_tbf_start_time(bitvec *dest, uint32_t fn)
+{
+   int rc;
+
+   /* Set values according to 3GPP TS 44.018 Table 10.5.2.38.1 */
+   rc = bitvec_set_u64(dest, (fn / (26 * 51)) % 32, 5, false); /* T1' */
+   check(rc);
+   rc = bitvec_set_u64(dest, fn % 51, 6, false);   /* T3  */
+   check(rc);
+   rc = bitvec_set_u64(dest, fn % 26, 5, false);   /* T2  */
+
+   return rc;
+}
+
+/* 3GPP TS 44.018 § 10.5.2.16:
+   < TFI_ASSIGNMENT : bit (5) >
+   < POLLING : bit >
+   0 -- The value '1' was allocated in an earlier version of the protocol and 
shall not be used.
+   < USF: bit (3) >
+   < USF_GRANULARITY : bit >
+   { 0 | 1 < P0 : bit (4) > < PR_MODE : bit (1) > }
+*/
+static inline int write_tfi_usf(bitvec *dest, const gprs_rlcmac_ul_tbf *tbf, 
uint8_t usf)
+{
+   int rc;
+
+   rc = bitvec_set_u64(dest, tbf->tfi(), 5, false); /* TFI_ASSIGNMENT */
+   check(rc);
+
+   set_0(dest); /* POLLING -- no action is required from MS */
+
+   set_0(dest); /* '1' was allocated in an earlier spec version and shall 
not be used */
+
+   rc = bitvec_set_u64(dest, usf, 3, false); /* USF */
+   check(rc);
+   set_0(dest); /* USF_GRANULARITY -- the mobile station shall transmit 
one RLC/MAC block */
+
+   set_0(dest); /* No P0 nor PR_MODE */
+
+   return 0;
+}
+
 static int write_ia_rest_downlink(
gprs_rlcmac_dl_tbf *tbf,
bitvec * dest, unsigned& wp,
@@ -185,68 +256,60 @@
return 0;
 }

-static int write_ia_rest_egprs_uplink(
-   gprs_rlcmac_ul_tbf *tbf,
-   bitvec * dest, unsigned& wp,
-   uint8_t usf, uint32_t fn,
-   uint8_t alpha, uint8_t gamma, int8_t ta_idx,
-   enum ph_burst_type burst_type, uint16_t ra)
+/* 3GPP TS 44.018 §10.5.2.16 IA Rest Octets ::= EGPRS Packet Uplink Assignment 
*/
+static inline int write_ia_rest_egprs_uplink(const gprs_rlcmac_ul_tbf *tbf, 
bitvec *dest,
+uint8_t usf, uint32_t fn,
+uint8_t alpha, uint8_t gamma, 
int8_t ta_idx,
+enum ph_burst_type burst_type, 
uint16_t ra)
 {
-   uint8_t extended_ra = 0;
+   int rc;

-   extended_ra = (ra & 0x1F);
+   set_L(dest); set_H(dest);
+   set_0(dest); set_0(dest); /* 00 EGPRS Packet Uplink Assignment */

-   bitvec_write_field(dest, , 1, 2);/* LH */
-   bitvec_write_field(dest, , 0, 2);/* 0 EGPRS Uplink Assignment */
-   bitvec_write_field(dest, , extended_ra, 5);/* Extended RA */
-   bitvec_write_field(dest, , 0, 1);/* Access technology Request */
+   rc = bitvec_set_u64(dest, ra & 0x1F, 5, false); /* Extended RA */
+   check(rc);

-   if (tbf == NULL) {
+   set_0(dest);/* No Access 
Technologies Request */

-   

Change in osmo-ci[master]: docker: Remove unused files to remove the clutter

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12950 )

Change subject: docker: Remove unused files to remove the clutter
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/12950
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: I7c5b559975e5f9a50368a5bb5bd961bdb9f85270
Gerrit-Change-Number: 12950
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 09:30:54 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-pcu[master]: Add encoding tests for Immediate Assignment

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12947 )

Change subject: Add encoding tests for Immediate Assignment
..


Patch Set 2:

(1 comment)

The rest should be addressed in the latest revision.

https://gerrit.osmocom.org/#/c/12947/1/tests/types/TypesTest.cpp
File tests/types/TypesTest.cpp:

https://gerrit.osmocom.org/#/c/12947/1/tests/types/TypesTest.cpp@458
PS1, Line 458: void test_immediate_assign_dl()
> the_bts? lol why not "bts"?
That's convention throughout the rest of the code - grep the sources.



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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I63f4654b23c7c4f063f6b3254d77157fac798586
Gerrit-Change-Number: 12947
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 19 Feb 2019 09:09:14 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in osmo-pcu[master]: Clarify write_immediate_assignment() signature

2019-02-19 Thread Max
Hello Pau Espin Pedrol, Jenkins Builder,

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

https://gerrit.osmocom.org/12948

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

Change subject: Clarify write_immediate_assignment() signature
..

Clarify write_immediate_assignment() signature

* remove unused variable
* use bool for boolean types
* add clarification comments

Change-Id: I363445063e2d873d9194b2a5924b9e59b8b7ea53
---
M src/bts.cpp
M src/bts.h
M src/encoding.cpp
M src/encoding.h
M src/tbf.cpp
M src/tbf_dl.cpp
6 files changed, 20 insertions(+), 22 deletions(-)


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I363445063e2d873d9194b2a5924b9e59b8b7ea53
Gerrit-Change-Number: 12948
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 


Change in osmo-pcu[master]: Add define for dummy burst string

2019-02-19 Thread Max
Hello Jenkins Builder,

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

https://gerrit.osmocom.org/12946

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

Change subject: Add define for dummy burst string
..

Add define for dummy burst string

Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
---
M src/gprs_rlcmac.cpp
M src/gprs_rlcmac.h
M src/tbf.cpp
M src/tbf_ul.cpp
M tests/rlcmac/RLCMACTest.cpp
M tests/types/TypesTest.cpp
6 files changed, 14 insertions(+), 18 deletions(-)


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
Gerrit-Change-Number: 12946
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 


Change in osmo-pcu[master]: Add define for dummy burst string

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12946 )

Change subject: Add define for dummy burst string
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12946/1/tests/rlcmac/RLCMACTest.cpp
File tests/rlcmac/RLCMACTest.cpp:

https://gerrit.osmocom.org/#/c/12946/1/tests/rlcmac/RLCMACTest.cpp@a27
PS1, Line 27:
> Why is this include removed here? I see no relation.
For some reason having it as "" breaks compilation for me. I'm still unsure why 
it makes a difference.



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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
Gerrit-Change-Number: 12946
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 09:02:38 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in osmo-pcu[master]: Add define for dummy burst string

2019-02-19 Thread Max
Max has posted comments on this change. ( https://gerrit.osmocom.org/12946 )

Change subject: Add define for dummy burst string
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/12946/1/src/gprs_rlcmac.h
File src/gprs_rlcmac.h:

https://gerrit.osmocom.org/#/c/12946/1/src/gprs_rlcmac.h@43
PS1, Line 43: VEC
> Out of curiosity: is it actually called "vector"?
It's used throughout the code to create boolean vector which is then filled by 
various encoding routines. The bits which are untouched by encoders are left 
as-is with the dummy burst sequence above.



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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0
Gerrit-Change-Number: 12946
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 19 Feb 2019 09:01:44 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No


Change in osmocom-bb[master]: firmware/lib: introduce TIFFS filesystem support

2019-02-19 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/12885 )

Change subject: firmware/lib: introduce TIFFS filesystem support
..


Set Ready For Review


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

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If6e212baeb10953129fb0d5253d263567f5e12d6
Gerrit-Change-Number: 12885
Gerrit-PatchSet: 4
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Tue, 19 Feb 2019 08:19:47 +
Gerrit-HasComments: No
Gerrit-HasLabels: No