- gerrit-log - lists.osmocom.org

Change in osmo-iuh[master]: ranap_msg_factory: add missing apidoc

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27128 ) Change subject: ranap_msg_factory: add missing apidoc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7484413980acdf17fde9ed0f97cf7f97e0ef3ae4 Gerrit-Change-Number: 27128 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 09:50:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: make/Makefile: allow overriding '-it' for target 'run'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27143 ) Change subject: make/Makefile: allow overriding '-it' for target 'run' ...................................................................... make/Makefile: allow overriding '-it' for target 'run' Allocating a pseudo-TTY (-t, --tty) fails when 'run' is executed inside of a Jenkins or cron script. This change fixes ttcn3-bts-test, which invokes 'run' to fetch the config files. Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d Fixes: If15461240f3037c142c176fc7da745a1701ae3f8 --- M alpine-lighttpd/Makefile M gr-gsm-master/Makefile M make/Makefile M nplab-m3ua-test/Makefile M nplab-sua-test/Makefile M open5gs-latest/Makefile M openbts-umts/Makefile M osmo-bsc-master/Makefile M osmo-bts-master/Makefile M osmo-gbproxy-latest/Makefile M osmo-gbproxy-master/Makefile M osmo-gerrit-libosmo/Makefile M osmo-ggsn-latest/Makefile M osmo-ggsn-master/Makefile M osmo-gsm-tester/Makefile M osmo-hlr-master/Makefile M osmo-hnbgw-master/Makefile M osmo-hnodeb-master/Makefile M osmo-mgw-master/Makefile M osmo-msc-master/Makefile M osmo-nitb-master/Makefile M osmo-pcu-master/Makefile M osmo-ran/Makefile M osmo-ran/split/ran-bsc_mgw/Makefile M osmo-ran/split/ran-bts_pcu/Makefile M osmo-ran/split/ran-trx-ipc/Makefile M osmo-ran/split/ran-trx-uhd/Makefile M osmo-remsim-latest/Makefile M osmo-remsim-master/Makefile M osmo-sgsn-master/Makefile M osmo-smlc-master/Makefile M osmo-stp-master/Makefile M sctp-test/Makefile M sigtran-tests/Makefile M systemd/Makefile M ttcn3-bsc-test-vamos/Makefile M ttcn3-bsc-test/Makefile M ttcn3-cbc-test/Makefile M ttcn3-hnodeb-test/Makefile M ttcn3-msc-test/Makefile M ttcn3-nitb-sysinfo/Makefile M ttcn3-pcap-client-test/Makefile M ttcn3-pcu-test/Makefile M ttcn3-sccp-test/Makefile M ttcn3-sgsn-test/Makefile M ttcn3-smlc-test/Makefile M ttcn3-stp-test/Makefile 47 files changed, 48 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/43/27143/1 diff --git a/alpine-lighttpd/Makefile b/alpine-lighttpd/Makefile index 27e1529..109875f 100644 --- a/alpine-lighttpd/Makefile +++ b/alpine-lighttpd/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network pdn --ip 172.20.0.10 --ip6 fd10:5741:8e20:0000::10 -v httpd-vol:/etc/lighttpd/lighttpd.conf.d --stop-signal SIGINT +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network pdn --ip 172.20.0.10 --ip6 fd10:5741:8e20:0000::10 -v httpd-vol:/etc/lighttpd/lighttpd.conf.d --stop-signal SIGINT include ../make/Makefile diff --git a/gr-gsm-master/Makefile b/gr-gsm-master/Makefile index b030a43..aece960 100644 --- a/gr-gsm-master/Makefile +++ b/gr-gsm-master/Makefile @@ -1,4 +1,5 @@ RUN_ARGS?= \ + -it --rm \ --privileged \ -v /dev/bus/usb:/dev/bus/usb diff --git a/make/Makefile b/make/Makefile index b2d344e..20733b0 100644 --- a/make/Makefile +++ b/make/Makefile @@ -38,6 +38,7 @@ OSMO_STP_BRANCH?=master OPEN5GS_BRANCH?=main BUILD_ARGS?= +RUN_ARGS?=-it UPSTREAM_DISTRO?=debian:bullseye DISTRO?=debian-bullseye @@ -167,4 +168,4 @@ run: - docker run $(RUN_ARGS) -it $(IMAGE) $(RUN_CMD) + docker run $(RUN_ARGS) $(IMAGE) $(RUN_CMD) diff --git a/nplab-m3ua-test/Makefile b/nplab-m3ua-test/Makefile index 0631fd3..1fc6815 100644 --- a/nplab-m3ua-test/Makefile +++ b/nplab-m3ua-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.7.2 +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.7.2 include ../make/Makefile diff --git a/nplab-sua-test/Makefile b/nplab-sua-test/Makefile index 273a334..db51491 100644 --- a/nplab-sua-test/Makefile +++ b/nplab-sua-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.6.3 +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.6.3 include ../make/Makefile diff --git a/open5gs-latest/Makefile b/open5gs-latest/Makefile index 95c99bb..0338f4f 100644 --- a/open5gs-latest/Makefile +++ b/open5gs-latest/Makefile @@ -1,5 +1,5 @@ DATA_DIR?=$(shell pwd) USER_ID?=$(shell id -u) -RUN_ARGS=-v $(DATA_DIR):/data --user $(USER_ID) --network host --rm +RUN_ARGS=-it --rm -v $(DATA_DIR):/data --user $(USER_ID) --network host include ../make/Makefile diff --git a/openbts-umts/Makefile b/openbts-umts/Makefile index b030a43..aece960 100644 --- a/openbts-umts/Makefile +++ b/openbts-umts/Makefile @@ -1,4 +1,5 @@ RUN_ARGS?= \ + -it --rm \ --privileged \ -v /dev/bus/usb:/dev/bus/usb diff --git a/osmo-bsc-master/Makefile b/osmo-bsc-master/Makefile index af827f6..ed16a7f 100644 --- a/osmo-bsc-master/Makefile +++ b/osmo-bsc-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data include ../make/Makefile diff --git a/osmo-bts-master/Makefile b/osmo-bts-master/Makefile index 80ae1f3..0332b05 100644 --- a/osmo-bts-master/Makefile +++ b/osmo-bts-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data include ../make/Makefile diff --git a/osmo-gbproxy-latest/Makefile b/osmo-gbproxy-latest/Makefile index 9e5fb05..ac24e7a 100644 --- a/osmo-gbproxy-latest/Makefile +++ b/osmo-gbproxy-latest/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data include ../make/Makefile diff --git a/osmo-gbproxy-master/Makefile b/osmo-gbproxy-master/Makefile index 9e5fb05..ac24e7a 100644 --- a/osmo-gbproxy-master/Makefile +++ b/osmo-gbproxy-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data include ../make/Makefile diff --git a/osmo-gerrit-libosmo/Makefile b/osmo-gerrit-libosmo/Makefile index b08f5c0..af68c2a 100644 --- a/osmo-gerrit-libosmo/Makefile +++ b/osmo-gerrit-libosmo/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--tmpfs /tmpfs:exec +RUN_ARGS?=-it --tmpfs /tmpfs:exec include ../make/Makefile diff --git a/osmo-ggsn-latest/Makefile b/osmo-ggsn-latest/Makefile index 0142467..d8c16fb 100644 --- a/osmo-ggsn-latest/Makefile +++ b/osmo-ggsn-latest/Makefile @@ -1,5 +1,5 @@ RUN_ARGS?= \ - --rm \ + -it --rm \ --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --sysctl net.ipv6.conf.all.forwarding=1 \ diff --git a/osmo-ggsn-master/Makefile b/osmo-ggsn-master/Makefile index 0142467..d8c16fb 100644 --- a/osmo-ggsn-master/Makefile +++ b/osmo-ggsn-master/Makefile @@ -1,5 +1,5 @@ RUN_ARGS?= \ - --rm \ + -it --rm \ --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --sysctl net.ipv6.conf.all.forwarding=1 \ diff --git a/osmo-gsm-tester/Makefile b/osmo-gsm-tester/Makefile index 03366a0..76107df 100644 --- a/osmo-gsm-tester/Makefile +++ b/osmo-gsm-tester/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --privileged --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --network sigtran --ip 172.18.50.21 -v ogt-vol:/data +RUN_ARGS?=-it --rm --privileged --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --network sigtran --ip 172.18.50.21 -v ogt-vol:/data include ../make/Makefile diff --git a/osmo-hlr-master/Makefile b/osmo-hlr-master/Makefile index 77d4f8b..d0d0b57 100644 --- a/osmo-hlr-master/Makefile +++ b/osmo-hlr-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data include ../make/Makefile diff --git a/osmo-hnbgw-master/Makefile b/osmo-hnbgw-master/Makefile index 47c3999..cadd43d 100644 --- a/osmo-hnbgw-master/Makefile +++ b/osmo-hnbgw-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data include ../make/Makefile diff --git a/osmo-hnodeb-master/Makefile b/osmo-hnodeb-master/Makefile index 47c3999..cadd43d 100644 --- a/osmo-hnodeb-master/Makefile +++ b/osmo-hnodeb-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data include ../make/Makefile diff --git a/osmo-mgw-master/Makefile b/osmo-mgw-master/Makefile index dc9b67b..8ce072e 100644 --- a/osmo-mgw-master/Makefile +++ b/osmo-mgw-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.180 -v mgw-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.180 -v mgw-vol:/data include ../make/Makefile diff --git a/osmo-msc-master/Makefile b/osmo-msc-master/Makefile index 77d4f8b..d0d0b57 100644 --- a/osmo-msc-master/Makefile +++ b/osmo-msc-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data include ../make/Makefile diff --git a/osmo-nitb-master/Makefile b/osmo-nitb-master/Makefile index 44dde23..e5ff25e 100644 --- a/osmo-nitb-master/Makefile +++ b/osmo-nitb-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v nitb-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v nitb-vol:/data include ../make/Makefile diff --git a/osmo-pcu-master/Makefile b/osmo-pcu-master/Makefile index 87350c2..6c9351e 100644 --- a/osmo-pcu-master/Makefile +++ b/osmo-pcu-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.211 -v pcu-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.211 -v pcu-vol:/data include ../make/Makefile diff --git a/osmo-ran/Makefile b/osmo-ran/Makefile index 80b1069..505dd43 100644 --- a/osmo-ran/Makefile +++ b/osmo-ran/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data include ../make/Makefile diff --git a/osmo-ran/split/ran-bsc_mgw/Makefile b/osmo-ran/split/ran-bsc_mgw/Makefile index 0239a23..1732b0a 100644 --- a/osmo-ran/split/ran-bsc_mgw/Makefile +++ b/osmo-ran/split/ran-bsc_mgw/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data include ../../../make/Makefile diff --git a/osmo-ran/split/ran-bts_pcu/Makefile b/osmo-ran/split/ran-bts_pcu/Makefile index 3d539d1..7d2397c 100644 --- a/osmo-ran/split/ran-bts_pcu/Makefile +++ b/osmo-ran/split/ran-bts_pcu/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.201 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.201 -v bsc-vol:/data include ../../../make/Makefile diff --git a/osmo-ran/split/ran-trx-ipc/Makefile b/osmo-ran/split/ran-trx-ipc/Makefile index 1d99f06..509b9fc 100644 --- a/osmo-ran/split/ran-trx-ipc/Makefile +++ b/osmo-ran/split/ran-trx-ipc/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.202 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data include ../../../make/Makefile diff --git a/osmo-ran/split/ran-trx-uhd/Makefile b/osmo-ran/split/ran-trx-uhd/Makefile index 1d99f06..509b9fc 100644 --- a/osmo-ran/split/ran-trx-uhd/Makefile +++ b/osmo-ran/split/ran-trx-uhd/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.202 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data include ../../../make/Makefile diff --git a/osmo-remsim-latest/Makefile b/osmo-remsim-latest/Makefile index 2e0e850..9273a98 100644 --- a/osmo-remsim-latest/Makefile +++ b/osmo-remsim-latest/Makefile @@ -1,3 +1,3 @@ -#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data +#RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data include ../make/Makefile diff --git a/osmo-remsim-master/Makefile b/osmo-remsim-master/Makefile index 2e0e850..9273a98 100644 --- a/osmo-remsim-master/Makefile +++ b/osmo-remsim-master/Makefile @@ -1,3 +1,3 @@ -#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data +#RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data include ../make/Makefile diff --git a/osmo-sgsn-master/Makefile b/osmo-sgsn-master/Makefile index 6bbd766..53984b8 100644 --- a/osmo-sgsn-master/Makefile +++ b/osmo-sgsn-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.21 -v sgsn-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.21 -v sgsn-vol:/data include ../make/Makefile diff --git a/osmo-smlc-master/Makefile b/osmo-smlc-master/Makefile index af827f6..ed16a7f 100644 --- a/osmo-smlc-master/Makefile +++ b/osmo-smlc-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data include ../make/Makefile diff --git a/osmo-stp-master/Makefile b/osmo-stp-master/Makefile index 3fcea34..00ffbb1 100644 --- a/osmo-stp-master/Makefile +++ b/osmo-stp-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.200 -v stp-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.200 -v stp-vol:/data include ../make/Makefile diff --git a/sctp-test/Makefile b/sctp-test/Makefile index 79a894e..f23042c 100644 --- a/sctp-test/Makefile +++ b/sctp-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm +RUN_ARGS?=-it --rm include ../make/Makefile diff --git a/sigtran-tests/Makefile b/sigtran-tests/Makefile index b7a6cb8..32250b0 100644 --- a/sigtran-tests/Makefile +++ b/sigtran-tests/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.3 +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.3 include ../make/Makefile diff --git a/systemd/Makefile b/systemd/Makefile index 80b1069..505dd43 100644 --- a/systemd/Makefile +++ b/systemd/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data include ../make/Makefile diff --git a/ttcn3-bsc-test-vamos/Makefile b/ttcn3-bsc-test-vamos/Makefile index 913c072..b397e14 100644 --- a/ttcn3-bsc-test-vamos/Makefile +++ b/ttcn3-bsc-test-vamos/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.31.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.31.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-bsc-test/Makefile b/ttcn3-bsc-test/Makefile index cbcd544..b1b6459 100644 --- a/ttcn3-bsc-test/Makefile +++ b/ttcn3-bsc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-cbc-test/Makefile b/ttcn3-cbc-test/Makefile index 34897fd..93bfac3 100644 --- a/ttcn3-cbc-test/Makefile +++ b/ttcn3-cbc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.23.202 +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202 include ../make/Makefile diff --git a/ttcn3-hnodeb-test/Makefile b/ttcn3-hnodeb-test/Makefile index ce2919e..991d941 100644 --- a/ttcn3-hnodeb-test/Makefile +++ b/ttcn3-hnodeb-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.33.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.33.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-msc-test/Makefile b/ttcn3-msc-test/Makefile index 7f46da4..2a5112c 100644 --- a/ttcn3-msc-test/Makefile +++ b/ttcn3-msc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-nitb-sysinfo/Makefile b/ttcn3-nitb-sysinfo/Makefile index 7b2593b..19d5917 100644 --- a/ttcn3-nitb-sysinfo/Makefile +++ b/ttcn3-nitb-sysinfo/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data include ../make/Makefile diff --git a/ttcn3-pcap-client-test/Makefile b/ttcn3-pcap-client-test/Makefile index 1c6de69..32fa2d7 100644 --- a/ttcn3-pcap-client-test/Makefile +++ b/ttcn3-pcap-client-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 include ../make/Makefile diff --git a/ttcn3-pcu-test/Makefile b/ttcn3-pcu-test/Makefile index b172280..a207496 100644 --- a/ttcn3-pcu-test/Makefile +++ b/ttcn3-pcu-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.1.202 -v pcu-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.1.202 -v pcu-test-vol:/data include ../make/Makefile diff --git a/ttcn3-sccp-test/Makefile b/ttcn3-sccp-test/Makefile index cbcd544..b1b6459 100644 --- a/ttcn3-sccp-test/Makefile +++ b/ttcn3-sccp-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-sgsn-test/Makefile b/ttcn3-sgsn-test/Makefile index f96cf22..8be872e 100644 --- a/ttcn3-sgsn-test/Makefile +++ b/ttcn3-sgsn-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.19.1.202 -v sgsn-test-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.19.1.202 -v sgsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-smlc-test/Makefile b/ttcn3-smlc-test/Makefile index 34897fd..93bfac3 100644 --- a/ttcn3-smlc-test/Makefile +++ b/ttcn3-smlc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.23.202 +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202 include ../make/Makefile diff --git a/ttcn3-stp-test/Makefile b/ttcn3-stp-test/Makefile index cbcd544..b1b6459 100644 --- a/ttcn3-stp-test/Makefile +++ b/ttcn3-stp-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d Gerrit-Change-Number: 27143 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: tasks/ttcn3-slave.yml: also install libosmocore-utils

by osmith

Attention is currently required from: fixeria, pespin, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26688 ) Change subject: tasks/ttcn3-slave.yml: also install libosmocore-utils ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I87e54440a6b399aa0f0461ebf668991b5cdd0b07 Gerrit-Change-Number: 26688 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 11 Feb 2022 08:14:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Implement proper parsing of EF.DIR

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27130 ) Change subject: ts_102_221: Implement proper parsing of EF.DIR ...................................................................... Patch Set 6: Code-Review+1 (1 comment) File pySim/ts_102_221.py: https://gerrit.osmocom.org/c/pysim/+/27130/comment/7431ad0b_711e5333 PS6, Line 512: ApplicationLabel So pylint complains that this variable is undefined: pySim/ts_102_221.py:512:63: E0602: Undefined variable 'ApplicationLabel' (undefined-variable) And this is the sad side of using sub-classes in Python. For some reason, referencing them in lists and tuples does not work, I also faced this kind of an error while working with pycrate. Perhaps because tuples and lists are evaluated in some other scope? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Gerrit-Change-Number: 27130 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 07:18:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: filesystem.py: Accept both a class or an instance as TLV._tlv member

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27140 ) Change subject: filesystem.py: Accept both a class or an instance as TLV._tlv member ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6 Gerrit-Change-Number: 27140 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 07:13:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils: Fix missing Optional[] in type annotations

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27142 ) Change subject: utils: Fix missing Optional[] in type annotations ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e Gerrit-Change-Number: 27142 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 07:12:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by iedemam

Attention is currently required from: pespin, fixeria. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/27134/comment/cf6f0dd9_2dd81ce9 PS3, Line 346: snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%u", unit_data.trx_id); > Can you try using new_line->num instead? No luck. All zero values again. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 22:24:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by pespin

Attention is currently required from: iedemam, neels, fixeria, daniel, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Perhaps my comment is misleading. […] Oh then I'd expect osmo_stat_item_group_set_name to already do some sanitizing, maybe that's not correct in current implementation? Did you check osmo_stat_item_group_set_name implementation? I added Daniel as reviewer, he may know better. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 10 Feb 2022 22:15:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by iedemam

Attention is currently required from: pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I'd argue it's not the duty of stats to be "friendly as filenames", but rather something specific to […] Perhaps my comment is misleading. Yes, I'm converting these into file names based on the statsd key name. But what we're using right now in tcp_stats for names are not valid for statsd. They need to be sanitized like the GPRS NS2 names are before being used as statsd key names. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 19:18:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils: Fix missing Optional[] in type annotations

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27142 ) Change subject: utils: Fix missing Optional[] in type annotations ...................................................................... utils: Fix missing Optional[] in type annotations Thanks to Vadim for pointing this out Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e --- M pySim/utils.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/27142/1 diff --git a/pySim/utils.py b/pySim/utils.py index 3ce3e58..555aa82 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1253,7 +1253,7 @@ has the habit of specifying TLV data but with very spcific ordering, or specific choices of tags at specific points in a stream. This class tries to represent this.""" - def __init__(self, name: str, desc: str = None, tag: int = None): + def __init__(self, name: str, desc: Optional[str] = None, tag: Optional[int] = None): """ Args: name: A brief, all-lowercase, underscore separated string identifier @@ -1376,7 +1376,7 @@ A given encoded DO may contain any of them in any order, and may contain multiple instances of each DO.""" - def __init__(self, name: str, desc: str = None, members=None): + def __init__(self, name: str, desc: Optional[str] = None, members=None): self.name = name self.desc = desc self.members = members or [] @@ -1491,7 +1491,7 @@ By wrapping them into this formal DataObjectSequence, we can offer convenience methods for encoding or decoding an entire sequence.""" - def __init__(self, name: str, desc: str = None, sequence=None): + def __init__(self, name: str, desc: Optional[str] = None, sequence=None): self.sequence = sequence or [] self.name = name self.desc = desc -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e Gerrit-Change-Number: 27142 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: filesystem.py: Accept both a class or an instance as TLV._tlv member

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27140 ) Change subject: filesystem.py: Accept both a class or an instance as TLV._tlv member ...................................................................... filesystem.py: Accept both a class or an instance as TLV._tlv member As we've seen in recent patches, this has been a source of bugs, so let's be tolerant and deal with both. Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6 --- M pySim/filesystem.py 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/27140/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 7100b21..cfca708 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -532,7 +532,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -559,7 +559,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -585,7 +585,7 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -612,7 +612,7 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -771,7 +771,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -798,7 +798,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -825,7 +825,7 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -851,7 +851,7 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -909,7 +909,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -936,7 +936,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -962,7 +962,7 @@ if self._construct: return b2h(filter_dict(self._construct.build(abstract_data))) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -988,7 +988,7 @@ if self._construct: return filter_dict(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6 Gerrit-Change-Number: 27140 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: cosmetic: Switch to consistent four-spaces indent; run autopep8

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27141 ) Change subject: cosmetic: Switch to consistent four-spaces indent; run autopep8 ...................................................................... cosmetic: Switch to consistent four-spaces indent; run autopep8 We had a mixture of tab and 4space based indenting, which is a bad idea. 4space is the standard in python, so convert all our code to that. The result unfortuantely still shoed even more inconsistencies, so I've decided to run autopep8 on the entire code base. Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim/__init__.py M pySim/ara_m.py M pySim/card_handler.py M pySim/card_key_provider.py M pySim/cards.py M pySim/cat.py M pySim/commands.py M pySim/construct.py M pySim/exceptions.py M pySim/filesystem.py M pySim/gsm_r.py M pySim/iso7816_4.py M pySim/jsonpath.py M pySim/profile.py M pySim/sysmocom_sja2.py M pySim/tlv.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_51_011.py M pySim/utils.py 29 files changed, 7,420 insertions(+), 6,468 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/27141/1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 Gerrit-Change-Number: 27141 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: filesystem: Fix TLV decode/encode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27100 ) Change subject: filesystem: Fix TLV decode/encode ...................................................................... filesystem: Fix TLV decode/encode We cannot call a method of a class without instantiating it Change-Id: I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 --- M pySim/filesystem.py 1 file changed, 36 insertions(+), 24 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 3e9d52e..7100b21 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -532,8 +532,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def decode_hex(self, raw_hex_data:str) -> dict: @@ -558,8 +559,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def encode_bin(self, abstract_data:dict) -> bytearray: @@ -583,8 +585,9 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(abstract_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_hex(self, abstract_data:dict) -> str: @@ -609,8 +612,9 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -767,8 +771,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def decode_record_bin(self, raw_bin_data:bytearray) -> dict: @@ -793,8 +798,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def encode_record_hex(self, abstract_data:dict) -> str: @@ -819,8 +825,9 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: @@ -844,8 +851,9 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(abstract_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) class CyclicEF(LinFixedEF): @@ -901,8 +909,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def decode_record_bin(self, raw_bin_data:bytearray) -> dict: @@ -927,8 +936,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def encode_record_hex(self, abstract_data:dict) -> str: @@ -952,8 +962,9 @@ if self._construct: return b2h(filter_dict(self._construct.build(abstract_data))) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: @@ -977,8 +988,9 @@ if self._construct: return filter_dict(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(abstract_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def _decode_bin(self, raw_bin_data:bytearray): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 Gerrit-Change-Number: 27100 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_31_102: TLV._tlv must point to the class, not an instance

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27135 ) Change subject: ts_31_102: TLV._tlv must point to the class, not an instance ...................................................................... ts_31_102: TLV._tlv must point to the class, not an instance In Change-Id I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 we fixed the filesystem code to assume the self._tlv memper is a reference to a class, and not an instance (as this is what the majority of the code did). However, it seems thre wer two instances where we actually had _tlv reference an instance. Change that to class so it's the same all over the code base. Change-Id: Ie4878ad6a92feafe47e375c4f5f3f198921e1e95 --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index e2ab925..3ae88d3 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -335,7 +335,7 @@ def __init__(self, fid="4f03", sfid=0x03, name='EF.5GS3GPPNSC', rec_len={57, None}, desc='5GS 3GPP Access NAS Security Context'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len) - self._tlv = EF_5GS3GPPNSC.FiveGSNasSecurityContext() + self._tlv = EF_5GS3GPPNSC.FiveGSNasSecurityContext # 3GPP TS 31.102 Section 4.4.11.6 class EF_5GAUTHKEYS(TransparentEF): @@ -351,7 +351,7 @@ def __init__(self, fid='4f05', sfid=0x05, name='EF.5GAUTHKEYS', size={68, None}, desc='5G authentication keys'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._tlv = EF_5GAUTHKEYS.FiveGAuthKeys() + self._tlv = EF_5GAUTHKEYS.FiveGAuthKeys # 3GPP TS 31.102 Section 4.4.11.8 class ProtSchemeIdList(BER_TLV_IE, tag=0xa0): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie4878ad6a92feafe47e375c4f5f3f198921e1e95 Gerrit-Change-Number: 27135 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils.py: Fix some tuple type annotations

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27133 ) Change subject: utils.py: Fix some tuple type annotations ...................................................................... utils.py: Fix some tuple type annotations Change-Id: I869b0268383f6babd9b51d0ddfce448a1d2dda1e --- M pySim/utils.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 4eb539b..3e79034 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -161,7 +161,7 @@ # length value coding is equal to BER-TLV -def comprehensiontlv_parse_one(binary:bytes) -> (dict, int, bytes, bytes): +def comprehensiontlv_parse_one(binary:bytes) -> Tuple[dict, int, bytes, bytes]: """Parse a single TLV IE at the start of the given binary data. Args: binary : binary input data of BER-TLV length field @@ -311,7 +311,7 @@ else: raise ValueError("Length > 32bits not supported") -def bertlv_parse_one(binary:bytes) -> (dict, int, bytes, bytes): +def bertlv_parse_one(binary:bytes) -> Tuple[dict, int, bytes, bytes]: """Parse a single TLV IE at the start of the given binary data. Args: binary : binary input data of BER-TLV length field -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I869b0268383f6babd9b51d0ddfce448a1d2dda1e Gerrit-Change-Number: 27133 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils.py: type annotations for DataObject related methods

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27132 ) Change subject: utils.py: type annotations for DataObject related methods ...................................................................... utils.py: type annotations for DataObject related methods Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 --- M pySim/utils.py 1 file changed, 31 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 0a9be86..4eb539b 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1170,7 +1170,7 @@ simply has any number of different TLVs that may occur in any order at any point, ISO 7816 has the habit of specifying TLV data but with very spcific ordering, or specific choices of tags at specific points in a stream. This class tries to represent this.""" - def __init__(self, name, desc = None, tag = None): + def __init__(self, name:str, desc:str = None, tag:int = None): """ Args: name: A brief, all-lowercase, underscore separated string identifier @@ -1186,10 +1186,10 @@ def __str__(self): return self.name - def __repr__(self): + def __repr__(self) -> str: return '%s(%s)' % (self.__class__, self.name) - def __or__(self, other): + def __or__(self, other) -> 'DataObjectChoice': """OR-ing DataObjects together renders a DataObjectChoice.""" if isinstance(other, DataObject): # DataObject | DataObject = DataObjectChoice @@ -1197,17 +1197,19 @@ else: raise TypeError - def __add__(self, other): + def __add__(self, other) -> 'DataObjectCollection': """ADD-ing DataObjects together renders a DataObjectCollection.""" if isinstance(other, DataObject): # DataObject + DataObject = DataObjectCollectin return DataObjectCollection(None, members=[self, other]) + else: + raise TypeError - def _compute_tag(self): + def _compute_tag(self) -> int: """Compute the tag (sometimes the tag encodes part of the value).""" return self.tag - def to_dict(self): + def to_dict(self) -> dict: """Return a dict in form "name: decoded_value" """ return {self.name: self.decoded} @@ -1219,13 +1221,13 @@ """ @abc.abstractmethod - def to_bytes(self): + def to_bytes(self) -> bytes: """Encode the internal state of this instance into the TLV value part. Returns: binary bytes encoding the internal state """ - def from_tlv(self, do:bytes): + def from_tlv(self, do:bytes) -> bytes: """Parse binary TLV representation into internal state. The resulting decoded representation is _not_ returned, but just internalized in the object instance! Args: @@ -1241,7 +1243,7 @@ # return remaining bytes return do[2+length:] - def to_tlv(self): + def to_tlv(self) -> bytes: """Encode internal representation to binary TLV. Returns: bytes encoded in TLV format. @@ -1250,7 +1252,7 @@ return bytes(self._compute_tag()) + bytes(len(val)) + val # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[dict, bytes]: """Decode a single DOs from the input data. Args: binary : binary bytes of encoded data @@ -1265,12 +1267,12 @@ return (self.to_dict(), remainder) # 'codec' interface - def encode(self): + def encode(self) -> bytes: return self.to_tlv() class TL0_DataObject(DataObject): """Data Object that has Tag, Len=0 and no Value part.""" - def __init__(self, name, desc, tag, val=None): + def __init__(self, name:str, desc:str, tag:int, val=None): super().__init__(name, desc, tag) self.val = val @@ -1279,7 +1281,7 @@ raise ValueError self.decoded = self.val - def to_bytes(self): + def to_bytes(self) -> bytes: return b'' @@ -1287,7 +1289,7 @@ """A DataObjectCollection consits of multiple Data Objects identified by their tags. A given encoded DO may contain any of them in any order, and may contain multiple instances of each DO.""" - def __init__(self, name, desc = None, members=None): + def __init__(self, name:str, desc:str = None, members=None): self.name = name self.desc = desc self.members = members or [] @@ -1296,15 +1298,15 @@ self.members_by_tag = { m.tag:m for m in members } self.members_by_name = { m.name:m for m in members } - def __str__(self): + def __str__(self) -> str: member_strs = [str(x) for x in self.members] return '%s(%s)' % (self.name, ','.join(member_strs)) - def __repr__(self): + def __repr__(self) -> str: member_strs = [repr(x) for x in self.members] return '%s(%s)' % (self.__class__, ','.join(member_strs)) - def __add__(self, other): + def __add__(self, other) -> 'DataObjectCollection': """Extending DataCollections with other DataCollections or DataObjects.""" if isinstance(other, DataObjectCollection): # adding one collection to another @@ -1317,7 +1319,7 @@ raise TypeError # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[List, bytes]: """Decode any number of DOs from the collection until the end of the input data, or uninitialized memory (0xFF) is found. Args: @@ -1343,7 +1345,7 @@ return (res, remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: res = bytearray() for i in decoded: obj = self.members_by_name(i[0]) @@ -1358,7 +1360,7 @@ """We overload the add operator here to avoid inheriting it from DataObjecCollection.""" raise TypeError - def __or__(self, other): + def __or__(self, other) -> 'DataObjectChoice': """OR-ing a Choice to another choice extends the choice, as does OR-ing a DataObject.""" if isinstance(other, DataObjectChoice): # adding one collection to another @@ -1371,7 +1373,7 @@ raise TypeError # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[dict, bytes]: """Decode a single DOs from the choice based on the tag. Args: binary : binary bytes of encoded data @@ -1389,7 +1391,7 @@ return (obj.to_dict(), remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: obj = self.members_by_name(decoded[0]) return obj.to_tlv() @@ -1398,20 +1400,20 @@ ordered sequence of DOs or choices of DOs that have to appear as per the specification. By wrapping them into this formal DataObjectSequence, we can offer convenience methods for encoding or decoding an entire sequence.""" - def __init__(self, name, desc=None, sequence=None): + def __init__(self, name:str, desc:str=None, sequence=None): self.sequence = sequence or [] self.name = name self.desc = desc - def __str__(self): + def __str__(self) -> str: member_strs = [str(x) for x in self.sequence] return '%s(%s)' % (self.name, ','.join(member_strs)) - def __repr__(self): + def __repr__(self) -> str: member_strs = [repr(x) for x in self.sequence] return '%s(%s)' % (self.__class__, ','.join(member_strs)) - def __add__(self, other): + def __add__(self, other) -> 'DataObjectSequence': """Add (append) a DataObject or DataObjectChoice to the sequence.""" if isinstance(other, 'DataObject'): return DataObjectSequence(self.name, self.desc, self.sequence + [other]) @@ -1421,7 +1423,7 @@ return DataObjectSequence(self.name, self.desc, self.sequence + other.sequence) # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[list, bytes]: """Decode a sequence by calling the decoder of each element in the sequence. Args: binary : binary bytes of encoded data @@ -1437,7 +1439,7 @@ return (res, remainder) # 'codec' interface - def decode_multi(self, do:bytes): + def decode_multi(self, do:bytes) -> Tuple[list, bytes]: """Decode multiple occurrences of the sequence from the binary input data. Args: do : binary input data to be decoded @@ -1458,7 +1460,7 @@ return (res, remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: """Encode a sequence by calling the encoder of each element in the sequence.""" encoded = bytearray() i = 0 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27127 ) Change subject: Better decode of EF.UST, EF.EST and EF.IST ...................................................................... Better decode of EF.UST, EF.EST and EF.IST So far, we only returned an array of service numbers like [ 2, 4, 5, 9 ] which is not very friendly to the human reader. In EF.SST we already had more verbose decoding including a description of each service. Let's add the same principle to EF.UST, EST and IST The same output above now looks like this: { "1": { "description": "Local Phone Book", "activated": false }, "2": { "description": "Fixed Dialling Numbers (FDN)", "activated": true }, "3": { "description": "Extension 2", "activated": false }, "4": { "description": "Service Dialling Numbers (SDN)", "activated": true }, "5": { "description": "Extension3", "activated": true }, "6": { "description": "Barred Dialling Numbers (BDN)", "activated": false }, "7": { "description": "Extension4", "activated": false }, "9": { "description": "Incoming Call Information (ICI and ICT)", "activated": true } } Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 --- M pySim/ts_31_102.py M pySim/ts_31_103.py 2 files changed, 46 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f6f6c00..e2ab925 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -165,6 +165,13 @@ 135: 'Support for Trusted non-3GPP access networks by USIM' } +# Mapping between USIM Enbled Service Number and its description +EF_EST_map = { + 1: 'Fixed Dialling Numbers (FDN)', + 2: 'Barred Dialling Numbers (BDN)', + 3: 'APN Control List (ACL)' +} + LOCI_STATUS_map = { 0: 'updated', 1: 'not updated', @@ -282,6 +289,7 @@ import enum from struct import unpack, pack +from typing import Tuple from construct import * from construct import Optional as COptional from pySim.construct import * @@ -519,30 +527,49 @@ self._construct = Int8ub # TS 31.102 Section 4.2.8 -class EF_UST(TransparentEF): - def __init__(self, fid='6f38', sfid=0x04, name='EF.UST', desc='USIM Service Table', size={1,17}): +class EF_UServiceTable(TransparentEF): + def __init__(self, fid, sfid, name, desc, size, table): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size) + self.table = table # add those commands to the general commands of a TransparentEF self.shell_commands += [self.AddlShellCommands()] + @staticmethod + def _bit_byte_offset_for_service(service:int) -> Tuple[int, int]: + i = service - 1 + byte_offset = i//8 + bit_offset = (i % 8) + return (byte_offset, bit_offset) def _decode_bin(self, in_bin): - ret = [] + ret = {} for i in range (0, len(in_bin)): byte = in_bin[i] for bitno in range(0,7): - if byte & (1 << bitno): - ret.append(i * 8 + bitno + 1) + service_nr = i * 8 + bitno + 1 + ret[service_nr] = { + 'activated': True if byte & (1 << bitno) else False + } + if service_nr in self.table: + ret[service_nr]['description'] = self.table[service_nr] return ret def _encode_bin(self, in_json): - # FIXME: size this to length of file - ret = bytearray(20) - for srv in in_json: - print("srv=%d"%srv) - srv = srv-1 - byte_nr = srv // 8 - # FIXME: detect if service out of range was selected - bit_nr = srv % 8 - ret[byte_nr] |= (1 << bit_nr) - return ret + # compute the required binary size + bin_len = 0 + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_UServiceTable._bit_byte_offset_for_service(service_nr) + if byte_offset >= bin_len: + bin_len = byte_offset+1 + # encode the actual data + out = bytearray(b'\x00' * bin_len) + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_UServiceTable._bit_byte_offset_for_service(service_nr) + if in_json[srv]['activated'] == True: + bit = 1 + else: + bit = 0 + out[byte_offset] |= (bit) << bit_offset + return out @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): def __init__(self): @@ -991,7 +1018,7 @@ 'User controlled PLMN Selector with Access Technology'), EF_HPPLMN(), EF_ACMmax(), - EF_UST(), + EF_UServiceTable('6f38', 0x04, 'EF.UST', 'USIM Service Table', size={1,17}, table=EF_UST_map), CyclicEF('6f39', None, 'EF.ACM', 'Accumulated call meter', rec_len={3,3}), TransparentEF('6f3e', None, 'EF.GID1', 'Group Identifier Level 1'), TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2'), @@ -1027,7 +1054,7 @@ EF_ADN('6f4d', None, 'EF.BDN', 'Barred Dialling Numbers'), EF_EXT('6f55', None, 'EF.EXT4', 'Extension4 (BDN/SSC)'), EF_CMI(), - EF_UST('6f56', 0x05, 'EF.EST', 'Enabled Services Table', size={1,None}), + EF_UServiceTable('6f56', 0x05, 'EF.EST', 'Enabled Services Table', size={1,None}, table=EF_EST_map), EF_ACL(), EF_DCK(), EF_CNL(), diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 9c7843f..6b69990 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -26,7 +26,7 @@ from pySim.utils import * from pySim.tlv import * from pySim.ts_51_011 import EF_AD, EF_SMS, EF_SMSS, EF_SMSR, EF_SMSP -from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred +from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred, EF_UServiceTable import pySim.ts_102_221 from pySim.ts_102_221 import EF_ARR @@ -101,26 +101,6 @@ super().__init__(fid=fid, sfid=sfid, name=name, desc=desc) self._tlv = EF_IMPU.impu -# TS 31.103 Section 4.2.7 -class EF_IST(TransparentEF): - def __init__(self, fid='6f07', sfid=0x07, name='EF.IST', desc='ISIM Service Table'): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size={1,4}) - # add those commands to the general commands of a TransparentEF - self.shell_commands += [self.AddlShellCommands()] - - @with_default_category('File-Specific Commands') - class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - - def do_ist_service_activate(self, arg): - """Activate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 1) - - def do_ist_service_deactivate(self, arg): - """Deactivate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 0) - # TS 31.103 Section 4.2.8 class EF_PCSCF(LinFixedEF): def __init__(self, fid='6f09', sfid=None, name='EF.P-CSCF', desc='P-CSCF Address'): @@ -192,7 +172,7 @@ EF_IMPU(), EF_AD(), EF_ARR('6f06', 0x06), - EF_IST(), + EF_UServiceTable('6f07', 0x07, 'EF.IST', 'ISIM Service Table', {1,None}, EF_IST_map), EF_PCSCF(), EF_GBABP(), EF_GBANL(), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 Gerrit-Change-Number: 27127 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_31_102: TLV._tlv must point to the class, not an instance

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27135 ) Change subject: ts_31_102: TLV._tlv must point to the class, not an instance ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie4878ad6a92feafe47e375c4f5f3f198921e1e95 Gerrit-Change-Number: 27135 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 18:31:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils.py: type annotations for DataObject related methods

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27132 ) Change subject: utils.py: type annotations for DataObject related methods ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File pySim/utils.py: https://gerrit.osmocom.org/c/pysim/+/27132/comment/738c8c3d_3454501c PS1, Line 1173: desc:str = None, tag:int = None > Optional[str], Optional[int] respectively. I'm addressing those in a later commit as I've meanwhile re-formatted the entire code base. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 18:31:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27127 ) Change subject: Better decode of EF.UST, EF.EST and EF.IST ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 Gerrit-Change-Number: 27127 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 18:28:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by pespin

Attention is currently required from: iedemam. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I'd argue it's not the duty of stats to be "friendly as filenames", but rather something specific to whatever statsd consumer on the other side. It's probably also easy on the other side to sanitize names in case they need to be used in file names? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Thu, 10 Feb 2022 17:47:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: ensure specific rab_id

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27138 ) Change subject: ranap_rab_ass: ensure specific rab_id ...................................................................... ranap_rab_ass: ensure specific rab_id The parser functions currently ignore the rab_id. An exception is ranap_rab_ass_req_ies_extract_inet_addr, which extracts the rab_id of the first RAB. To make the handling of the RAB assignment parsing more robust lets add a rab_id parameter to the other functions. This parameter can then be used to ensure thet the correct RAB is handled. Change-Id: I2259ffce9f4b508c555d60618c5983ac6294e0ae Related: OS#5152 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 4 files changed, 116 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/38/27138/1 diff --git a/include/osmocom/hnbgw/ranap_rab_ass.h b/include/osmocom/hnbgw/ranap_rab_ass.h index 4cb8e37..f4d5cb6 100644 --- a/include/osmocom/hnbgw/ranap_rab_ass.h +++ b/include/osmocom/hnbgw/ranap_rab_ass.h @@ -6,8 +6,11 @@ RANAP_RAB_AssignmentResponseIEs_t *rab_assignment_response_ies); int ranap_rab_ass_req_ies_extract_inet_addr(struct osmo_sockaddr *addr, uint8_t *rab_id, - RANAP_RAB_AssignmentRequestIEs_t *ies); -int ranap_rab_ass_resp_ies_extract_inet_addr(struct osmo_sockaddr *addr, RANAP_RAB_AssignmentResponseIEs_t *ies); + RANAP_RAB_AssignmentRequestIEs_t *ies, unsigned int index); +int ranap_rab_ass_resp_ies_extract_inet_addr(struct osmo_sockaddr *addr, RANAP_RAB_AssignmentResponseIEs_t *ies, + uint8_t rab_id); -int ranap_rab_ass_req_ies_replace_inet_addr(RANAP_RAB_AssignmentRequestIEs_t *ies, struct osmo_sockaddr *addr); -int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr); +int ranap_rab_ass_req_ies_replace_inet_addr(RANAP_RAB_AssignmentRequestIEs_t *ies, struct osmo_sockaddr *addr, + uint8_t rab_id); +int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr, + uint8_t rab_id); diff --git a/src/osmo-hnbgw/ranap_rab_ass.c b/src/osmo-hnbgw/ranap_rab_ass.c index f5d86a1..23505f2 100644 --- a/src/osmo-hnbgw/ranap_rab_ass.c +++ b/src/osmo-hnbgw/ranap_rab_ass.c @@ -111,10 +111,9 @@ return rc; } -/* Pick the first item from the RAB setup-or-modify list and return the first protocol-ie-field-pair. This is based on - * the assumption that a PS call will only assign a signle RAB. This could be different for video calls and IMS but - * those are in practice a corner case, so we go for this simplified assumption for now. */ -static RANAP_ProtocolIE_FieldPair_t *prot_ie_field_pair_from_ass_req_ies(const RANAP_RAB_AssignmentRequestIEs_t *ies) +/* Pick the indexed item from the RAB setup-or-modify list and return the first protocol-ie-field-pair. */ +static RANAP_ProtocolIE_FieldPair_t *prot_ie_field_pair_from_ass_req_ies(const RANAP_RAB_AssignmentRequestIEs_t *ies, + unsigned int index) { RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; @@ -126,14 +125,19 @@ return NULL; } - protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[0]; + /* Detect the end of the list */ + if (index >= ies->raB_SetupOrModifyList.list.count) + return NULL; + + protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[index]; protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; return protocol_ie_field_pair; } -/* See also comment above prot_ie_field_pair_from_ass_req_ies */ -static RANAP_IE_t *setup_or_modif_item_from_rab_ass_resp(const RANAP_RAB_AssignmentResponseIEs_t *ies) +/* Pick the indexed item from the RAB setup-or-modified list and return a pointer to it */ +static RANAP_IE_t *setup_or_modif_item_from_rab_ass_resp(const RANAP_RAB_AssignmentResponseIEs_t *ies, + unsigned int index) { /* Make sure we indeed deal with a setup-or-modified list */ if (!(ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT)) { @@ -142,16 +146,82 @@ return NULL; } - return ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[0]; + /* Detect the end of the list */ + if (index >= ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.count) + return NULL; + + return ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[index]; +} + +/* find the RAB specified by rab_id in ies and when found, decode the result into items_ies */ +static int decode_rab_smditms_from_resp_ies(RANAP_RAB_SetupOrModifiedItemIEs_t *items_ies, + RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) +{ + RANAP_IE_t *setup_or_modified_list_ie; + RANAP_RAB_SetupOrModifiedItem_t *rab_setup_or_modified_item; + int rc; + uint8_t rab_id_decoded; + unsigned int index = 0; + + while (1) { + setup_or_modified_list_ie = setup_or_modif_item_from_rab_ass_resp(ies, index); + if (!setup_or_modified_list_ie) + return -EINVAL; + + rc = ranap_decode_rab_setupormodifieditemies_fromlist(items_ies, &setup_or_modified_list_ie->value); + if (rc < 0) + return -EINVAL; + + rab_setup_or_modified_item = &items_ies->raB_SetupOrModifiedItem; + /* The RAB-ID is defined as a bitstring with a size of 8 (1 byte), + * See also RANAP-IEs.asn, RAB-ID ::= BIT STRING (SIZE (8)) */ + rab_id_decoded = rab_setup_or_modified_item->rAB_ID.buf[0]; + if (rab_id_decoded == rab_id) + return index; + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, items_ies); + index++; + } +} + +/* find the RAB specified by rab_id in ies and when found, decode the result into item */ +static int decode_rab_smditms_from_req_ies(RANAP_RAB_SetupOrModifyItemFirst_t *item, + RANAP_RAB_AssignmentRequestIEs_t *ies, uint8_t rab_id) +{ + RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + int rc; + uint8_t rab_id_decoded; + unsigned int index = 0; + + while (1) { + protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies, index); + if (!protocol_ie_field_pair) + return -EINVAL; + + if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) { + RANAP_DEBUG + ("Decoding failed, the protocol IE field-pair is not of type RANAP RAB setup-or-modify-item!\n"); + return -EINVAL; + } + + rc = ranap_decode_rab_setupormodifyitemfirst(item, &protocol_ie_field_pair->firstValue); + if (rc < 0) + return -EINVAL; + + rab_id_decoded = item->rAB_ID.buf[0]; + if (rab_id_decoded == rab_id) + return index; + } } /*! Extract IP address and port from RANAP_RAB_AssignmentRequestIEs. * \ptmap[out] addr user provided memory to store extracted RTP stream IP-Address and port number. * \ptmap[out] rab_id pointer to store RAB-ID (optional, can be NULL). * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentRequestIEs. + * \ptmap[in] index index of the SetupOrModifyItem (e.g. 0 for the first list item). * \returns 0 on success; negative on error. */ int ranap_rab_ass_req_ies_extract_inet_addr(struct osmo_sockaddr *addr, uint8_t *rab_id, - RANAP_RAB_AssignmentRequestIEs_t *ies) + RANAP_RAB_AssignmentRequestIEs_t *ies, unsigned int index) { RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; RANAP_RAB_SetupOrModifyItemFirst_t _rab_setup_or_modify_item_first; @@ -161,7 +231,7 @@ uint16_t port; int rc; - protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies); + protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies, index); if (!protocol_ie_field_pair) return -EINVAL; @@ -219,26 +289,20 @@ /*! Extract IP address and port from RANAP_RAB_AssignmentResponseIEs. * \ptmap[out] addr user provided memory to store extracted RTP stream IP-Address and port number. * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentResponseIEs. + * \ptmap[in] rab_id expected rab id to look for. * \returns 0 on success; negative on error. */ -int ranap_rab_ass_resp_ies_extract_inet_addr(struct osmo_sockaddr *addr, RANAP_RAB_AssignmentResponseIEs_t *ies) +int ranap_rab_ass_resp_ies_extract_inet_addr(struct osmo_sockaddr *addr, RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) { - RANAP_IE_t *setup_or_modified_list_ie; RANAP_RAB_SetupOrModifiedItemIEs_t _rab_setup_or_modified_items_ies; RANAP_RAB_SetupOrModifiedItemIEs_t *rab_setup_or_modified_items_ies = &_rab_setup_or_modified_items_ies; RANAP_RAB_SetupOrModifiedItem_t *rab_setup_or_modified_item; uint16_t port; int rc; - setup_or_modified_list_ie = setup_or_modif_item_from_rab_ass_resp(ies); - if (!setup_or_modified_list_ie) + rc = decode_rab_smditms_from_resp_ies(rab_setup_or_modified_items_ies, ies, rab_id); + if (rc < 0) return -EINVAL; - rc = ranap_decode_rab_setupormodifieditemies_fromlist(rab_setup_or_modified_items_ies, - &setup_or_modified_list_ie->value); - if (rc < 0) { - return -EINVAL; - } - rab_setup_or_modified_item = &rab_setup_or_modified_items_ies->raB_SetupOrModifiedItem; /* Decode IP-Address */ @@ -276,8 +340,9 @@ /*! Replace IP address and port in RANAP_RAB_AssignmentRequestIEs. * \ptmap[inout] ies user provided memory with RANAP_RAB_AssignmentRequestIEs. * \ptmap[in] addr user provided memory that contains the new RTP stream IP-Address and port number. + * \ptmap[in] rab_id expected rab id to look for. * \returns 0 on success; negative on error. */ -int ranap_rab_ass_req_ies_replace_inet_addr(RANAP_RAB_AssignmentRequestIEs_t *ies, struct osmo_sockaddr *addr) +int ranap_rab_ass_req_ies_replace_inet_addr(RANAP_RAB_AssignmentRequestIEs_t *ies, struct osmo_sockaddr *addr, uint8_t rab_id) { RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; RANAP_RAB_SetupOrModifyItemFirst_t _rab_setup_or_modify_item_first; @@ -287,20 +352,10 @@ struct osmo_sockaddr addr_old; bool uses_x213_nsap; int rc; + int index; - protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies); - if (!protocol_ie_field_pair) - return -EINVAL; - - if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) { - RANAP_DEBUG("Rewriting transport layer information failed, unexpected IE field-pair type!\n"); - return -EINVAL; - } - - /* Decode setup-or-modifiy item (first) */ - rc = ranap_decode_rab_setupormodifyitemfirst(rab_setup_or_modify_item_first, - &protocol_ie_field_pair->firstValue); - if (rc < 0) + index = decode_rab_smditms_from_req_ies(rab_setup_or_modify_item_first, ies, rab_id); + if (index < 0) return -EINVAL; /* Replace transport-layer-information */ @@ -332,6 +387,7 @@ } /* Reencode transport-layer-information */ + protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies, index); rc = ANY_fromType_aper(&protocol_ie_field_pair->firstValue, &asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, rab_setup_or_modify_item_first); if (rc < 0) { @@ -354,8 +410,9 @@ /*! Replace IP address and port in RANAP_RAB_AssignmentResponseIEs. * \ptmap[inout] ies user provided memory with RANAP_RAB_AssignmentResponseIEs. * \ptmap[in] addr user provided memory that contains the new RTP stream IP-Address and port number. + * \ptmap[in] rab_id expected rab id to look for. * \returns 0 on success; negative on error. */ -int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr) +int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr, uint8_t rab_id) { RANAP_IE_t *setup_or_modified_list_ie; RANAP_RAB_SetupOrModifiedItemIEs_t _rab_setup_or_modified_items_ies; @@ -367,14 +424,10 @@ struct osmo_sockaddr addr_old; bool uses_x213_nsap; int rc; + int index; - setup_or_modified_list_ie = setup_or_modif_item_from_rab_ass_resp(ies); - if (!setup_or_modified_list_ie) - return -EINVAL; - - rc = ranap_decode_rab_setupormodifieditemies_fromlist(rab_setup_or_modified_items_ies, - &setup_or_modified_list_ie->value); - if (rc < 0) + index = decode_rab_smditms_from_resp_ies(rab_setup_or_modified_items_ies, ies, rab_id); + if (index < 0) return -EINVAL; rab_setup_or_modified_item = &rab_setup_or_modified_items_ies->raB_SetupOrModifiedItem; @@ -402,6 +455,7 @@ rab_setup_or_modified_item->iuTransportAssociation = &temp_transport_layer_information->iuTransportAssociation; /* Reencode modified setup or modified list */ + setup_or_modified_list_ie = setup_or_modif_item_from_rab_ass_resp(ies, index); rc = ANY_fromType_aper(&setup_or_modified_list_ie->value, &asn_DEF_RANAP_RAB_SetupOrModifiedItem, rab_setup_or_modified_items_ies); if (rc < 0) { diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index c67b5aa..d7bee09 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -121,7 +121,7 @@ rc = ranap_ran_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, &rab_id, &message.msg.raB_AssignmentRequestIEs); + rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, &rab_id, &message.msg.raB_AssignmentRequestIEs, 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("ranap_rab_ass_req_extract_inet_addr rc=%d\n", rc); printf("RESULT: addr=%s, port=%u, rab-id=%02x\n", addr_str.ip, addr_str.port, rab_id); @@ -145,7 +145,7 @@ rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs); + rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs, 7); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("ranap_rab_ass_resp_extract_inet_addr rc=%d\n", rc); printf("RESULT: addr=%s, port=%u\n", addr_str.ip, addr_str.port); @@ -158,6 +158,7 @@ struct osmo_sockaddr addr; struct osmo_sockaddr_str addr_str; ranap_message message; + uint8_t rab_id; uint8_t testvec_in[] = { 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x01, 0x00, 0x36, 0x40, 0x52, 0x00, 0x00, 0x01, 0x00, 0x35, @@ -190,10 +191,10 @@ rc = ranap_ran_rx_co_decode(talloc_asn1_ctx, &message, testvec_in, sizeof(testvec_in)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, NULL, &message.msg.raB_AssignmentRequestIEs); + rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, &rab_id, &message.msg.raB_AssignmentRequestIEs, 0); OSMO_ASSERT(rc == 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); - printf("before: addr=%s, port=%u\n", addr_str.ip, addr_str.port); + printf("before: addr=%s, port=%u, rab_id=%u\n", addr_str.ip, addr_str.port, rab_id); memset(&addr_str, 0, sizeof(addr_str)); addr_str.af = AF_INET; @@ -201,13 +202,13 @@ osmo_strlcpy(addr_str.ip, "1.2.3.4", sizeof(addr_str.ip)); osmo_sockaddr_str_to_sockaddr(&addr_str, &addr.u.sas); - rc = ranap_rab_ass_req_ies_replace_inet_addr(&message.msg.raB_AssignmentRequestIEs, &addr); + rc = ranap_rab_ass_req_ies_replace_inet_addr(&message.msg.raB_AssignmentRequestIEs, &addr, rab_id); printf("ranap_rab_ass_req_replace_inet_addr rc=%d\n", rc); - rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, NULL, &message.msg.raB_AssignmentRequestIEs); + rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, &rab_id, &message.msg.raB_AssignmentRequestIEs, 0); OSMO_ASSERT(rc == 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); - printf("after: addr=%s, port=%u\n", addr_str.ip, addr_str.port); + printf("after: addr=%s, port=%u, rab_id=%u\n", addr_str.ip, addr_str.port, rab_id); rc = ranap_rab_ass_req_encode(testvec_in, sizeof(testvec_in), &message.msg.raB_AssignmentRequestIEs); OSMO_ASSERT(rc == sizeof(testvec_in)); @@ -242,7 +243,7 @@ rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec_in, sizeof(testvec_in)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs); + rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs, 6); OSMO_ASSERT(rc == 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("before: addr=%s, port=%u\n", addr_str.ip, addr_str.port); @@ -253,10 +254,10 @@ osmo_strlcpy(addr_str.ip, "1.2.3.4", sizeof(addr_str.ip)); osmo_sockaddr_str_to_sockaddr(&addr_str, &addr.u.sas); - rc = ranap_rab_ass_resp_ies_replace_inet_addr(&message.msg.raB_AssignmentResponseIEs, &addr); + rc = ranap_rab_ass_resp_ies_replace_inet_addr(&message.msg.raB_AssignmentResponseIEs, &addr, 6); printf("ranap_rab_ass_resp_replace_inet_addr rc=%d\n", rc); - rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs); + rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs, 6); OSMO_ASSERT(rc == 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("after: addr=%s, port=%u\n", addr_str.ip, addr_str.port); diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index f7b4b67..97756cb 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -8,9 +8,9 @@ RESULT: addr=10.9.1.162, port=8054, rab-id=11 ranap_rab_ass_resp_extract_inet_addr rc=0 RESULT: addr=10.9.1.164, port=1034 -before: addr=10.9.1.162, port=8122 +before: addr=10.9.1.162, port=8122, rab_id=39 ranap_rab_ass_req_replace_inet_addr rc=0 -after: addr=1.2.3.4, port=1234 +after: addr=1.2.3.4, port=1234, rab_id=39 before: addr=10.9.1.164, port=1034 ranap_rab_ass_resp_replace_inet_addr rc=0 after: addr=1.2.3.4, port=1234 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2259ffce9f4b508c555d60618c5983ac6294e0ae Gerrit-Change-Number: 27138 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: add function to check if RAB is in FailureList

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27139 ) Change subject: ranap_rab_ass: add function to check if RAB is in FailureList ...................................................................... ranap_rab_ass: add function to check if RAB is in FailureList A RANAP RAB-AssignmentResponse may contain a FailedList. In order to detect that a RAB Assignment failed at the HNB we need to be able to check if the RAB we are dealing with is contained an such a FailedList. Change-Id: I4319f7caa45ea758ccd792cc8570521df075cf45 Related: OS#5152 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 4 files changed, 94 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/27139/1 diff --git a/include/osmocom/hnbgw/ranap_rab_ass.h b/include/osmocom/hnbgw/ranap_rab_ass.h index f4d5cb6..b3406f0 100644 --- a/include/osmocom/hnbgw/ranap_rab_ass.h +++ b/include/osmocom/hnbgw/ranap_rab_ass.h @@ -14,3 +14,5 @@ uint8_t rab_id); int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr, uint8_t rab_id); + +bool ranap_rab_ass_resp_ies_check_failure(RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id); diff --git a/src/osmo-hnbgw/ranap_rab_ass.c b/src/osmo-hnbgw/ranap_rab_ass.c index 23505f2..89d4b1b 100644 --- a/src/osmo-hnbgw/ranap_rab_ass.c +++ b/src/osmo-hnbgw/ranap_rab_ass.c @@ -141,8 +141,7 @@ { /* Make sure we indeed deal with a setup-or-modified list */ if (!(ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT)) { - RANAP_DEBUG - ("Decoding failed, the RANAP RAB AssignmentResponse did not contain a setup-or-modified list!\n"); + RANAP_DEBUG("RANAP RAB AssignmentResponse did not contain a setup-or-modified list!\n"); return NULL; } @@ -153,6 +152,23 @@ return ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[index]; } +/* Pick the indexed item from the RAB failed list and return a pointer to it */ +static RANAP_IE_t *failed_list_item_from_rab_ass_resp(const RANAP_RAB_AssignmentResponseIEs_t *ies, + unsigned int index) +{ + /* Make sure we indeed deal with a failed list */ + if (!(ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_FAILEDLIST_PRESENT)) { + RANAP_DEBUG("RANAP RAB AssignmentResponse did not contain a failed list!\n"); + return NULL; + } + + /* Detect the end of the list */ + if (index >= ies->raB_FailedList.raB_FailedList_ies.list.count) + return NULL; + + return ies->raB_FailedList.raB_FailedList_ies.list.array[index]; +} + /* find the RAB specified by rab_id in ies and when found, decode the result into items_ies */ static int decode_rab_smditms_from_resp_ies(RANAP_RAB_SetupOrModifiedItemIEs_t *items_ies, RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) @@ -184,6 +200,37 @@ } } +/* See comment above decode_rab_smditms_from_resp_ies() */ +static int decode_rab_flitms_from_resp_ies(RANAP_RAB_FailedItemIEs_t *items_ies, + RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) +{ + RANAP_IE_t *failed_list_ie; + RANAP_RAB_FailedItem_t *rab_failed_item; + int rc; + uint8_t rab_id_decoded; + unsigned int index = 0; + + while (1) { + failed_list_ie = failed_list_item_from_rab_ass_resp(ies, index); + if (!failed_list_ie) + return -EINVAL; + + rc = ranap_decode_rab_faileditemies_fromlist(items_ies, &failed_list_ie->value); + if (rc < 0) + return -EINVAL; + + rab_failed_item = &items_ies->raB_FailedItem; + /* The RAB-ID is defined as a bitstring with a size of 8 (1 byte), + * See also RANAP-IEs.asn, RAB-ID ::= BIT STRING (SIZE (8)) */ + rab_id_decoded = rab_failed_item->rAB_ID.buf[0]; + if (rab_id_decoded == rab_id) + return index; + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_FailedItem, items_ies); + index++; + } +} + /* find the RAB specified by rab_id in ies and when found, decode the result into item */ static int decode_rab_smditms_from_req_ies(RANAP_RAB_SetupOrModifyItemFirst_t *item, RANAP_RAB_AssignmentRequestIEs_t *ies, uint8_t rab_id) @@ -477,3 +524,25 @@ return rc; } + +/*! Check if a specific RAB is present in an RAB-Failed-Item-List inside RANAP_RAB_AssignmentResponseIEs. + * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentResponseIEs. + * \ptmap[in] rab_id expected rab id to look for. + * \returns true when RAB could be identified as failed; false otherwise */ +bool ranap_rab_ass_resp_ies_check_failure(RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) +{ + RANAP_RAB_FailedItemIEs_t _rab_failed_items_ies; + RANAP_RAB_FailedItemIEs_t *rab_failed_items_ies = &_rab_failed_items_ies; + int rc; + bool result = true; + + /* If we can get a failed item for the specified RAB ID, then we know that the + * HNB reported the RAB Assignment as failed */ + rc = decode_rab_flitms_from_resp_ies(rab_failed_items_ies, ies, rab_id); + if (rc < 0) + result = false; + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_FailedItem, rab_failed_items_ies); + + return result; +} diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index d7bee09..2d1efdf 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -269,6 +269,25 @@ ranap_cn_rx_co_free(&message); } +void test_ranap_rab_ass_resp_ies_check_failure(void) +{ + int rc; + ranap_message message; + bool rab_failed_at_hnb; + uint8_t testvec[] = { + 0x60, 0x00, 0x00, 0x11, 0x00, 0x00, 0x01, 0x00, + 0x23, 0x40, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x22, + 0x40, 0x03, 0x05, 0xd0, 0x00 + }; + + rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); + OSMO_ASSERT(rc == 0); + rab_failed_at_hnb = + ranap_rab_ass_resp_ies_check_failure(&message.msg.raB_AssignmentResponseIEs, 23); + printf("ranap_rab_ass_resp_ies_check_failure rab_failed_at_hnb=%u\n", rab_failed_at_hnb); + ranap_cn_rx_co_free(&message); +} + static const struct log_info_cat log_cat[] = { [DRANAP] = { .name = "RANAP", .loglevel = LOGL_DEBUG, .enabled = 1, @@ -329,6 +348,7 @@ test_ranap_rab_ass_resp_extract_inet_addr(); test_ranap_rab_ass_req_replace_inet_addr(); test_ranap_rab_ass_resp_replace_inet_addr(); + test_ranap_rab_ass_resp_ies_check_failure(); test_cleanup(); return 0; diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index 97756cb..3ce997d 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -14,3 +14,4 @@ before: addr=10.9.1.164, port=1034 ranap_rab_ass_resp_replace_inet_addr rc=0 after: addr=1.2.3.4, port=1234 +ranap_rab_ass_resp_ies_check_failure rab_failed_at_hnb=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4319f7caa45ea758ccd792cc8570521df075cf45 Gerrit-Change-Number: 27139 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by iedemam

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... stats: sanitize tcp stat name identifiers The identifiers being used in tcp_stats are not friendly as filenames. This change sanitizes the identifiers before they are used. BEFORE: ipa-oml,r=127.0.0.1:45749<->l=127.0.0.1:3002 AFTER: ipa-oml_r_127_0_0_1_45749_-_l_127_0_0_1_3002 Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 --- M src/stats_tcp.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/27137/1 diff --git a/src/stats_tcp.c b/src/stats_tcp.c index dec5b5d..c2694f1 100644 --- a/src/stats_tcp.c +++ b/src/stats_tcp.c @@ -123,6 +123,7 @@ osmo_sock_get_name2(stats_tcp_entry->fd->fd)); else snprintf(stat_name, sizeof(stat_name), "%s", osmo_sock_get_name2(stats_tcp_entry->fd->fd)); + osmo_identifier_sanitize_buf(stat_name, ":", '_'); osmo_stat_item_group_set_name(stats_tcp_entry->stats_tcp, stat_name); osmo_stat_item_set(osmo_stat_item_group_get_item(stats_tcp_entry->stats_tcp, STATS_TCP_UNACKED), -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by pespin

Attention is currently required from: iedemam, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/27134/comment/cd93d39e_7f1a8fb9 PS3, Line 346: snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%u", unit_data.trx_id); Can you try using new_line->num instead? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 17:31:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common: add decoder for RAB-FailedList

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27136 ) Change subject: ranap_common: add decoder for RAB-FailedList ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0f42487968f2a39f2425068c001950509a3bd28f Gerrit-Change-Number: 27136 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 17:27:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by iedemam

Attention is currently required from: fixeria, pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: (1 comment) This change is ready for review. Patchset: PS3: Hi all, Thanks for the reviews. After some more testing, I saw that the previous approach was not working. In the two areas where a "ipa-rsl" stat name is created, both were always being set to zero based on the line->num value. Then I discovered that OsmoBSC is only using the one in this latest patch. The other one shown in a previous patch is on the BTS side I guess? Regardless, now the correct TRX ID is being set for each RSL link in question. Stats emitted by OsmoBSC show the correct IDs. -Michael -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 17:23:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common: add decoder for RAB-FailedList

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27136 ) Change subject: ranap_common: add decoder for RAB-FailedList ...................................................................... ranap_common: add decoder for RAB-FailedList There is currently no decoder to decode RAB-FailedList objects properly. Lets add one. Change-Id: I0f42487968f2a39f2425068c001950509a3bd28f Related: OS#5152 --- M include/osmocom/ranap/ranap_common.h M src/ranap_common.c 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/36/27136/1 diff --git a/include/osmocom/ranap/ranap_common.h b/include/osmocom/ranap/ranap_common.h index 7511a75..50d15ed 100644 --- a/include/osmocom/ranap/ranap_common.h +++ b/include/osmocom/ranap/ranap_common.h @@ -648,6 +648,11 @@ ANY_t *any_p); /* There is no generated decoder available, this is a custom one */ +int ranap_decode_rab_faileditemies_fromlist( + RANAP_RAB_FailedItemIEs_t *raB_FailedItemIEs, + ANY_t *any_p); + +/* There is no generated decoder available, this is a custom one */ int ranap_decode_rab_setupormodifyitemfirst( RANAP_RAB_SetupOrModifyItemFirst_t *raB_SetupOrModifyItemFirst, ANY_t *any_p); diff --git a/src/ranap_common.c b/src/ranap_common.c index 6c6d97c..dc55988 100644 --- a/src/ranap_common.c +++ b/src/ranap_common.c @@ -582,6 +582,30 @@ return decoded; } +int ranap_decode_rab_faileditemies_fromlist(RANAP_RAB_FailedItemIEs_t *raB_FailedItemIEs, ANY_t *any_p) +{ + + RANAP_RAB_FailedItem_t *ranaP_RABFailedItem_p = NULL; + int decoded; + + assert(any_p != NULL); + assert(raB_FailedItemIEs != NULL); + + memset(raB_FailedItemIEs, 0, sizeof(RANAP_RAB_FailedItemIEs_t)); + RANAP_DEBUG("Decoding message RANAP_RAB_FailedItemIEs (%s:%d)\n", __FILE__, __LINE__); + decoded = ANY_to_type_aper(any_p, &asn_DEF_RANAP_RAB_FailedItem, (void **)&ranaP_RABFailedItem_p); + if (decoded < 0) { + RANAP_DEBUG("Decoding of IE raB_FailedItem failed\n"); + return -1; + } + if (asn1_xer_print) + xer_fprint(stdout, &asn_DEF_RANAP_RAB_FailedItem, ranaP_RABFailedItem_p); + memcpy(&raB_FailedItemIEs->raB_FailedItem, ranaP_RABFailedItem_p, sizeof(RANAP_RAB_FailedItem_t)); + FREEMEM(ranaP_RABFailedItem_p); + + return decoded; +} + int ranap_decode_rab_setupormodifyitemfirst( RANAP_RAB_SetupOrModifyItemFirst_t *raB_SetupOrModifyItemFirst, ANY_t *any_p) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0f42487968f2a39f2425068c001950509a3bd28f Gerrit-Change-Number: 27136 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: tasks/ttcn3-slave.yml: also install libosmocore-utils

by fixeria

Attention is currently required from: osmith, pespin, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26688 ) Change subject: tasks/ttcn3-slave.yml: also install libosmocore-utils ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I87e54440a6b399aa0f0461ebf668991b5cdd0b07 Gerrit-Change-Number: 26688 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 10 Feb 2022 17:12:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 13: (2 comments) Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/76083a25_534… PS12, Line 15: Unfortunately, osmo-config-merge is not capable of removing text blocks : or substituting specific parts, so we fall-back to using sed where it's : needed. > one might add some kind of syntax for this in osmo-config-merge at a later point. Good idea. Patchset: PS6: > > Regarding the patch, I would try to avoid downloading the files with wget, and rather run the conf […] Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 13 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 17:09:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_31_102: TLV._tlv must point to the class, not an instance

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27135 ) Change subject: ts_31_102: TLV._tlv must point to the class, not an instance ...................................................................... ts_31_102: TLV._tlv must point to the class, not an instance In Change-Id I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 we fixed the filesystem code to assume the self._tlv memper is a reference to a class, and not an instance (as this is what the majority of the code did). However, it seems thre wer two instances where we actually had _tlv reference an instance. Change that to class so it's the same all over the code base. Change-Id: Ie4878ad6a92feafe47e375c4f5f3f198921e1e95 --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/27135/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index e2ab925..3ae88d3 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -335,7 +335,7 @@ def __init__(self, fid="4f03", sfid=0x03, name='EF.5GS3GPPNSC', rec_len={57, None}, desc='5GS 3GPP Access NAS Security Context'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len) - self._tlv = EF_5GS3GPPNSC.FiveGSNasSecurityContext() + self._tlv = EF_5GS3GPPNSC.FiveGSNasSecurityContext # 3GPP TS 31.102 Section 4.4.11.6 class EF_5GAUTHKEYS(TransparentEF): @@ -351,7 +351,7 @@ def __init__(self, fid='4f05', sfid=0x05, name='EF.5GAUTHKEYS', size={68, None}, desc='5G authentication keys'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._tlv = EF_5GAUTHKEYS.FiveGAuthKeys() + self._tlv = EF_5GAUTHKEYS.FiveGAuthKeys # 3GPP TS 31.102 Section 4.4.11.8 class ProtSchemeIdList(BER_TLV_IE, tag=0xa0): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie4878ad6a92feafe47e375c4f5f3f198921e1e95 Gerrit-Change-Number: 27135 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... ttcn3-bts-test: use osmo-config-merge to generate config files This uses the config files from osmo-ttcn3-hacks.git instead of keeping local copies around here, which has shown many times will get out of sync. Extract the original files (*.src.cfg) from the testsuite image (ttcn3-bts-test) and merge them with the local *.confmerge files using osmo-config-merge. Use the resulting files (*.gen.cfg). Unfortunately, osmo-config-merge is not capable of removing text blocks or substituting specific parts, so we fall-back to using sed where it's needed. A good example is 'log gsmtap 127.0.0.1', as there is no command for removing a logging target of such type. Co-Authored-By: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Co-Authored-By: Oliver Smith <osmith(a)sysmocom.de> Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 --- M .gitignore M ttcn3-bts-test/Makefile D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bsc.cfg A ttcn3-bts-test/generic/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bts.cfg A ttcn3-bts-test/generic/osmo-bts.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 322 insertions(+), 853 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/.gitignore b/.gitignore index 386d3f8..9eb94ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ .release .common +*.src.cfg +*.gen.cfg + /_cache diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile index 0895788..9e2eada 100644 --- a/ttcn3-bts-test/Makefile +++ b/ttcn3-bts-test/Makefile @@ -1,2 +1,45 @@ include ../make/Makefile + +CFG_SRC_FILES = \ + osmo-bts.src.cfg \ + osmo-bsc.src.cfg + +CFG_GEN_FILES = \ + generic/osmo-bts.gen.cfg \ + generic/osmo-bsc.gen.cfg \ + virtphy/osmo-bts.gen.cfg \ + oml/osmo-bts.gen.cfg \ + fh/osmo-bsc.gen.cfg + +.PHONY: cfg +cfg: $(CFG_SRC_FILES) $(CFG_GEN_FILES) + +# Ensure that we always fetch up-to-date configuration files. +# See https://www.gnu.org/software/make/manual/make.html#Force-Targets +%src.cfg: FORCE_FETCH + $(MAKE) run \ + RUN_ARGS="-v $(CURDIR):/data --user $(UID) --rm" \ + RUN_CMD="cp /osmo-ttcn3-hacks/bts/$(@:%.src.cfg=%.cfg) /data/$@" +FORCE_FETCH: + +generic/osmo-bts.gen.cfg: osmo-bts.src.cfg generic/osmo-bts.confmerge + osmo-config-merge $^ > $@ + sed -i "s/log gsmtap 127.0.0.1/log gsmtap 172.18.9.10/" $@ + +generic/osmo-bsc.gen.cfg: osmo-bsc.src.cfg generic/osmo-bsc.confmerge + osmo-config-merge $^ > $@ + sed -i "s/log gsmtap 127.0.0.1/log gsmtap 172.18.9.10/" $@ + +virtphy/osmo-bts.gen.cfg: generic/osmo-bts.gen.cfg virtphy/osmo-bts.confmerge + osmo-config-merge $^ > $@ + sed -i "/osmotrx/d" $@ + +oml/osmo-bts.gen.cfg: generic/osmo-bts.gen.cfg oml/osmo-bts.confmerge + osmo-config-merge $^ > $@ + +fh/osmo-bsc.gen.cfg: generic/osmo-bsc.gen.cfg fh/osmo-bsc.confmerge + osmo-config-merge $^ > $@ + +clean: + @rm -f $(CFG_SRC_FILES) $(CFG_GEN_FILES) diff --git a/ttcn3-bts-test/fh/osmo-bsc.cfg b/ttcn3-bts-test/fh/osmo-bsc.cfg deleted file mode 100644 index cbb3080..0000000 --- a/ttcn3-bts-test/fh/osmo-bsc.cfg +++ /dev/null @@ -1,398 +0,0 @@ -! -! OsmoBSC (1.1.2.236-5f22) configuration saved from vty -!! -password foo -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging print file 1 - logging level set-all notice - logging level rll info - logging level rsl debug - logging level msc debug - logging level filter debug - logging level pcu debug - logging level lctrl info - logging level lsccp info -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive - ipa bind 0.0.0.0 -cs7 instance 0 - point-code 0.23.3 - asp asp-clnt-msc-0 2905 0 m3ua - as as-clnt-msc-0 m3ua - asp asp-clnt-msc-0 - routing-key 2 0.23.3 -network - network country code 1 - mobile network code 1 - encryption a5 0 - neci 1 - paging any use tch 0 - handover 0 - handover1 window rxlev averaging 10 - handover1 window rxqual averaging 1 - handover1 window rxlev neighbor averaging 10 - handover1 power budget interval 6 - handover1 power budget hysteresis 3 - handover1 maximum distance 9999 - timer t3212 30 - bts 0 - type sysmobts - band DCS1800 - cell_identity 0 - location_area_code 1 - dtx uplink force - dtx downlink - base_station_id_code 63 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - early-classmark-sending-3g allowed - ip.access unit_id 1234 0 - ip.access rsl-ip 172.18.9.10 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr - gprs mode gprs - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1234 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1234 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 1234 - gprs nsvc 0 local udp port 23000 - gprs nsvc 0 remote udp port 23000 - gprs nsvc 0 remote ip 0.0.0.0 - no force-combined-si - trx 0 - rf_locked 0 - arfcn 871 - nominal power 50 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - ! Shall not be hopping - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - ! Intentionally non-hopping - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - ! (c) HSN=2, MAIO=0,1 - hopping enabled 1 - hopping sequence-number 2 - hopping maio 0 - hopping arfcn add 871 - hopping arfcn add 873 - timeslot 3 - phys_chan_config TCH/F_PDCH - ! (e) HSN=3, MAIO=3,2,1,0 - hopping enabled 1 - hopping sequence-number 3 - hopping maio 3 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 4 - ! Intentionally non-hopping - phys_chan_config TCH/F_TCH/H_PDCH - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - ! (f) HSN=5, MAIO=0,1,2,3 - hopping enabled 1 - hopping sequence-number 5 - hopping maio 0 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 6 - phys_chan_config SDCCH8 - ! (g) HSN=6, MAIO=1,0 - hopping enabled 1 - hopping sequence-number 6 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 877 - timeslot 7 - phys_chan_config PDCH - ! (i) HSN=0, MAIO=1,3 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 875 - trx 1 - rf_locked 0 - arfcn 873 - nominal power 50 - max_power_red 20 - rsl e1 tei 1 - timeslot 0 - phys_chan_config TCH/F - ! (a) HSN=0, MAIO=0,1,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 1 - phys_chan_config SDCCH8 - ! Intentionally non-hopping - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/H - ! (c) HSN=2, MAIO=0,1 - hopping enabled 1 - hopping sequence-number 2 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 873 - timeslot 3 - phys_chan_config TCH/F_PDCH - ! (e) HSN=3, MAIO=3,2,1,0 - hopping enabled 1 - hopping sequence-number 3 - hopping maio 2 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - ! Intentionally non-hopping - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - ! (f) HSN=5, MAIO=0,1,2,3 - hopping enabled 1 - hopping sequence-number 5 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 6 - phys_chan_config PDCH - ! (h) HSN=6, MAIO=1,0 - hopping enabled 1 - hopping sequence-number 6 - hopping maio 1 - hopping arfcn add 873 - hopping arfcn add 875 - timeslot 7 - phys_chan_config PDCH - ! (j) HSN=0, MAIO=0,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 873 - hopping arfcn add 877 - trx 2 - rf_locked 0 - arfcn 875 - nominal power 50 - max_power_red 20 - rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/F - ! (a) HSN=0, MAIO=0,1,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 1 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 1 - phys_chan_config SDCCH8 - ! (b) HSN=1, MAIO=3,5 - hopping enabled 1 - hopping sequence-number 1 - hopping maio 3 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 2 - phys_chan_config TCH/F - ! (d) HSN=2, MAIO=2,3 - hopping enabled 1 - hopping sequence-number 2 - hopping maio 2 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 3 - phys_chan_config TCH/F_PDCH - ! (e) HSN=3, MAIO=3,2,1,0 - hopping enabled 1 - hopping sequence-number 3 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - ! Intentionally non-hopping - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - ! (f) HSN=5, MAIO=0,1,2,3 - hopping enabled 1 - hopping sequence-number 5 - hopping maio 2 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 6 - phys_chan_config PDCH - ! (h) HSN=6, MAIO=1,0 - hopping enabled 1 - hopping sequence-number 6 - hopping maio 0 - hopping arfcn add 873 - hopping arfcn add 875 - timeslot 7 - phys_chan_config PDCH - ! (i) HSN=0, MAIO=1,3 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 3 - hopping arfcn add 871 - hopping arfcn add 875 - trx 3 - rf_locked 0 - arfcn 877 - nominal power 50 - max_power_red 20 - rsl e1 tei 3 - timeslot 0 - phys_chan_config TCH/F - ! (a) HSN=0, MAIO=0,1,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 2 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 1 - phys_chan_config SDCCH8 - ! (b) HSN=1, MAIO=3,5 - hopping enabled 1 - hopping sequence-number 1 - hopping maio 5 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 2 - phys_chan_config TCH/H - ! (d) HSN=2, MAIO=2,3 - hopping enabled 1 - hopping sequence-number 2 - hopping maio 3 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 3 - phys_chan_config TCH/F_PDCH - ! (e) HSN=3, MAIO=3,2,1,0 - hopping enabled 1 - hopping sequence-number 3 - hopping maio 0 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - ! Intentionally non-hopping - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - ! (f) HSN=5, MAIO=0,1,2,3 - hopping enabled 1 - hopping sequence-number 5 - hopping maio 3 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 6 - phys_chan_config SDCCH8 - ! (g) HSN=6, MAIO=1,0 - hopping enabled 1 - hopping sequence-number 6 - hopping maio 0 - hopping arfcn add 871 - hopping arfcn add 877 - timeslot 7 - phys_chan_config PDCH - ! (j) HSN=0, MAIO=0,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 2 - hopping arfcn add 873 - hopping arfcn add 877 -msc 0 - codec-list fr1 fr2 fr3 - allow-emergency allow - amr-config 12_2k forbidden - amr-config 10_2k forbidden - amr-config 7_95k forbidden - amr-config 7_40k forbidden - amr-config 6_70k forbidden - amr-config 5_90k allowed - amr-config 5_15k forbidden - amr-config 4_75k forbidden -bsc - mid-call-timeout 0 - no missing-msc-text diff --git a/ttcn3-bts-test/fh/osmo-bsc.confmerge b/ttcn3-bts-test/fh/osmo-bsc.confmerge new file mode 100644 index 0000000..91a4710 --- /dev/null +++ b/ttcn3-bts-test/fh/osmo-bsc.confmerge @@ -0,0 +1,231 @@ +network + bts 0 + trx 0 + timeslot 0 + ! Shall not be hopping + timeslot 1 + ! Intentionally non-hopping + timeslot 2 + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + ! Intentionally non-hopping + timeslot 5 + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 875 + trx 1 + timeslot 0 + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + ! Intentionally non-hopping + timeslot 2 + phys_chan_config TCH/H + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 877 + trx 2 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8 + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + phys_chan_config TCH/F + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 2 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 875 + trx 3 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8 + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 5 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config SDCCH8 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + phys_chan_config PDCH + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 877 diff --git a/ttcn3-bts-test/generic/osmo-bsc.cfg b/ttcn3-bts-test/generic/osmo-bsc.cfg deleted file mode 100644 index 49ca9d6..0000000 --- a/ttcn3-bts-test/generic/osmo-bsc.cfg +++ /dev/null @@ -1,247 +0,0 @@ -! -! OsmoBSC (1.1.2.236-5f22) configuration saved from vty -!! -password foo -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging print file 1 - logging level set-all notice - logging level rll info - logging level rsl debug - logging level msc debug - logging level filter debug - logging level pcu debug - logging level lctrl info - logging level lsccp info -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive - ipa bind 0.0.0.0 -cs7 instance 0 - point-code 0.23.3 - asp asp-clnt-msc-0 2905 0 m3ua - as as-clnt-msc-0 m3ua - asp asp-clnt-msc-0 - routing-key 2 0.23.3 -network - network country code 1 - mobile network code 1 - encryption a5 0 - neci 1 - paging any use tch 0 - handover 0 - handover1 window rxlev averaging 10 - handover1 window rxqual averaging 1 - handover1 window rxlev neighbor averaging 10 - handover1 power budget interval 6 - handover1 power budget hysteresis 3 - handover1 maximum distance 9999 - timer t3212 30 - bts 0 - type sysmobts - band DCS1800 - cell_identity 0 - location_area_code 1 - dtx uplink force - dtx downlink - base_station_id_code 63 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - early-classmark-sending-3g allowed - ip.access unit_id 1234 0 - ip.access rsl-ip 172.18.9.10 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr - gprs mode gprs - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1234 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1234 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 1234 - gprs nsvc 0 local udp port 23000 - gprs nsvc 0 remote udp port 23000 - gprs nsvc 0 remote ip 0.0.0.0 - no force-combined-si - trx 0 - rf_locked 0 - arfcn 871 - nominal power 50 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F_PDCH - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 6 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - trx 1 - rf_locked 0 - arfcn 873 - nominal power 50 - max_power_red 20 - rsl e1 tei 1 - timeslot 0 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 1 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 2 - phys_chan_config PDCH - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F_TCH/H_PDCH - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F_PDCH - hopping enabled 0 - timeslot 5 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - trx 2 - rf_locked 0 - arfcn 875 - nominal power 50 - max_power_red 20 - rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 1 - phys_chan_config PDCH - hopping enabled 0 - timeslot 2 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 3 - phys_chan_config PDCH - hopping enabled 0 - timeslot 4 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - trx 3 - rf_locked 0 - arfcn 877 - nominal power 50 - max_power_red 20 - rsl e1 tei 3 - timeslot 0 - phys_chan_config PDCH - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 3 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 4 - phys_chan_config PDCH - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config SDCCH8 - hopping enabled 0 -msc 0 - codec-list fr1 fr2 fr3 - allow-emergency allow - amr-config 12_2k forbidden - amr-config 10_2k forbidden - amr-config 7_95k forbidden - amr-config 7_40k forbidden - amr-config 6_70k forbidden - amr-config 5_90k allowed - amr-config 5_15k forbidden - amr-config 4_75k forbidden -bsc - mid-call-timeout 0 - no missing-msc-text diff --git a/ttcn3-bts-test/generic/osmo-bsc.confmerge b/ttcn3-bts-test/generic/osmo-bsc.confmerge new file mode 100644 index 0000000..eb1324d --- /dev/null +++ b/ttcn3-bts-test/generic/osmo-bsc.confmerge @@ -0,0 +1,7 @@ +line vty + bind 0.0.0.0 +e1_input + ipa bind 0.0.0.0 +network + bts 0 + ip.access rsl-ip 172.18.9.10 diff --git a/ttcn3-bts-test/generic/osmo-bts.cfg b/ttcn3-bts-test/generic/osmo-bts.cfg deleted file mode 100644 index bbe8a1d..0000000 --- a/ttcn3-bts-test/generic/osmo-bts.cfg +++ /dev/null @@ -1,81 +0,0 @@ -! -! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty -!! -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all notice - logging level rsl info - logging level oml info - logging level meas info - logging level pag info - logging level l1c info - logging level dsp info - logging level pcu debug - logging level trx info - logging level lmib debug -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -phy 0 - osmotrx ip local 172.18.9.20 - osmotrx ip remote 172.18.9.21 - instance 0 - osmotrx rx-gain 10 - instance 1 - osmotrx rx-gain 10 - instance 2 - osmotrx rx-gain 10 - instance 3 - osmotrx rx-gain 10 -bts 0 - band DCS1800 - ipa unit-id 1234 0 - oml remote-ip 172.18.9.11 - rtp jitter-buffer 100 - paging queue-size 200 - paging lifetime 0 - gsmtap-remote-host 172.18.9.10 - gsmtap-sapi enable-all - no gsmtap-sapi pdtch - no gsmtap-sapi ptcch - min-qual-rach 50 - min-qual-norm -5 - !settsc - pcu-socket /data/unix/pcu_sock - trx 0 - power-ramp max-initial 0 mdBm - power-ramp step-size 8000 mdB - power-ramp step-interval 1 - phy 0 instance 0 - trx 1 - power-ramp max-initial 0 mdBm - power-ramp step-size 8000 mdB - power-ramp step-interval 1 - phy 0 instance 1 - trx 2 - power-ramp max-initial 0 mdBm - power-ramp step-size 8000 mdB - power-ramp step-interval 1 - phy 0 instance 2 - trx 3 - power-ramp max-initial 0 mdBm - power-ramp step-size 8000 mdB - power-ramp step-interval 1 - phy 0 instance 3 -ctrl - bind 0.0.0.0 diff --git a/ttcn3-bts-test/generic/osmo-bts.confmerge b/ttcn3-bts-test/generic/osmo-bts.confmerge new file mode 100644 index 0000000..7837748 --- /dev/null +++ b/ttcn3-bts-test/generic/osmo-bts.confmerge @@ -0,0 +1,11 @@ +line vty + bind 0.0.0.0 +phy 0 + osmotrx ip local 172.18.9.20 + osmotrx ip remote 172.18.9.21 +bts 0 + oml remote-ip 172.18.9.11 + gsmtap-remote-host 172.18.9.10 + pcu-socket /data/unix/pcu_sock +ctrl + bind 0.0.0.0 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 35ce0d5..c16be80 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -30,7 +30,7 @@ --name ${BUILD_TAG}-bsc -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \ - /bin/sh -c "osmo-bsc -c /data/osmo-bsc.cfg >>/data/osmo-bsc.log 2>&1" + /bin/sh -c "osmo-bsc -c /data/osmo-bsc.gen.cfg >>/data/osmo-bsc.log 2>&1" } start_bts() { @@ -51,7 +51,7 @@ --name ${BUILD_TAG}-bts -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-$variant -c /data/osmo-bts.cfg >>/data/osmo-bts.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-$variant -c /data/osmo-bts.gen.cfg >>/data/osmo-bts.log 2>&1" } start_fake_trx() { @@ -135,12 +135,15 @@ cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \ $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc +# (re)generate the configuration files +make cfg + mkdir $VOL_BASE_DIR/bsc -cp generic/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ +cp generic/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/ mkdir $VOL_BASE_DIR/bts mkdir $VOL_BASE_DIR/bts/unix -cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ mkdir $VOL_BASE_DIR/unix @@ -161,7 +164,7 @@ docker container kill ${BUILD_TAG}-trxcon docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bts -cp virtphy/osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ start_bts virtual 0 start_virtphy # ... and execute the testsuite again with different cfg @@ -173,7 +176,7 @@ docker container kill ${BUILD_TAG}-virtphy docker container kill ${BUILD_TAG}-bts -cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ start_bts trx 1 start_fake_trx start_trxcon @@ -181,8 +184,8 @@ start_testsuite oml # 4) Frequency hopping tests require different configuration files -cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ -cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/ +cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ # restart the BSC/BTS and run the testsuite again docker container kill ${BUILD_TAG}-bts start_bsc diff --git a/ttcn3-bts-test/oml/osmo-bts.cfg b/ttcn3-bts-test/oml/osmo-bts.cfg deleted file mode 100644 index 52a2ace..0000000 --- a/ttcn3-bts-test/oml/osmo-bts.cfg +++ /dev/null @@ -1,59 +0,0 @@ -! -! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty -!! -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all notice - logging level rsl info - logging level oml info - logging level meas info - logging level pag info - logging level l1c info - logging level dsp info - logging level pcu debug - logging level trx info - logging level lmib debug -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -phy 0 - osmotrx ip local 172.18.9.20 - osmotrx ip remote 172.18.9.21 - osmotrx fn-advance 20 - osmotrx rts-advance 5 - instance 0 - osmotrx rx-gain 10 - osmotrx tx-attenuation 0 -bts 0 - band DCS1800 - ipa unit-id 1234 0 - oml remote-ip 172.18.9.10 - rtp jitter-buffer 100 - paging queue-size 200 - paging lifetime 0 - min-qual-rach 50 - min-qual-norm -5 - !settsc - pcu-socket /data/unix/pcu_sock - trx 0 - power-ramp max-initial 0 mdBm - power-ramp step-size 2000 mdB - power-ramp step-interval 1 - phy 0 instance 0 -ctrl - bind 0.0.0.0 diff --git a/ttcn3-bts-test/oml/osmo-bts.confmerge b/ttcn3-bts-test/oml/osmo-bts.confmerge new file mode 100644 index 0000000..a9293b9 --- /dev/null +++ b/ttcn3-bts-test/oml/osmo-bts.confmerge @@ -0,0 +1,10 @@ +bts 0 + oml remote-ip 172.18.9.10 + trx 0 + power-ramp step-size 2000 mdB + trx 1 + power-ramp step-size 2000 mdB + trx 2 + power-ramp step-size 2000 mdB + trx 3 + power-ramp step-size 2000 mdB diff --git a/ttcn3-bts-test/virtphy/osmo-bts.cfg b/ttcn3-bts-test/virtphy/osmo-bts.cfg deleted file mode 100644 index 2dab646..0000000 --- a/ttcn3-bts-test/virtphy/osmo-bts.cfg +++ /dev/null @@ -1,60 +0,0 @@ -! -! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty -!! -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all notice - logging level rsl info - logging level oml info - logging level meas info - logging level pag info - logging level l1c info - logging level dsp info - logging level pcu debug - logging level trx info - logging level lmib debug -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -phy 0 - !virtual-um ms-multicast-group 239.193.23.1 - !virtual-um bts-multicast-group 239.193.23.2 - instance 0 -bts 0 - band DCS1800 - ipa unit-id 1234 0 - oml remote-ip 172.18.9.11 - rtp jitter-buffer 100 - paging queue-size 200 - paging lifetime 0 - gsmtap-sapi rach - gsmtap-sapi agch - gsmtap-sapi bcch - gsmtap-sapi pch - gsmtap-sapi sdcch - gsmtap-sapi sacch - min-qual-rach 50 - min-qual-norm -5 - pcu-socket /data/unix/pcu_sock - trx 0 - power-ramp max-initial 0 mdBm - power-ramp step-size 2000 mdB - power-ramp step-interval 1 - phy 0 instance 0 -ctrl - bind 0.0.0.0 diff --git a/ttcn3-bts-test/virtphy/osmo-bts.confmerge b/ttcn3-bts-test/virtphy/osmo-bts.confmerge new file mode 100644 index 0000000..d4f95d1 --- /dev/null +++ b/ttcn3-bts-test/virtphy/osmo-bts.confmerge @@ -0,0 +1,6 @@ +phy 0 + !virtual-um ms-multicast-group 239.193.23.1 + !virtual-um bts-multicast-group 239.193.23.2 +bts 0 + trx 0 + power-ramp step-size 2000 mdB -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 13 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 13: Verified+1 Code-Review+2 (1 comment) Patchset: PS13: Tested. Re-applying CR from osmith and laforge: 1+1=2. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 13 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 16:50:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 13: (1 comment) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/60b16c8c_141… PS12, Line 22: RUN_ARGS="-v $(CURDIR):/data --user $(UID)" \ > Add --rm here too? Ack! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 13 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 16:49:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

Attention is currently required from: laforge, fixeria. fixeria has uploaded a new patch set (#13) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... ttcn3-bts-test: use osmo-config-merge to generate config files This uses the config files from osmo-ttcn3-hacks.git instead of keeping local copies around here, which has shown many times will get out of sync. Extract the original files (*.src.cfg) from the testsuite image (ttcn3-bts-test) and merge them with the local *.confmerge files using osmo-config-merge. Use the resulting files (*.gen.cfg). Unfortunately, osmo-config-merge is not capable of removing text blocks or substituting specific parts, so we fall-back to using sed where it's needed. A good example is 'log gsmtap 127.0.0.1', as there is no command for removing a logging target of such type. Co-Authored-By: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Co-Authored-By: Oliver Smith <osmith(a)sysmocom.de> Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 --- M .gitignore M ttcn3-bts-test/Makefile D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bsc.cfg A ttcn3-bts-test/generic/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bts.cfg A ttcn3-bts-test/generic/osmo-bts.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 322 insertions(+), 853 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/20622/13 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 13 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26681 ) Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... ttcn3-bts-test: move generic config files into a directory Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 --- M ttcn3-bts-test/Dockerfile R ttcn3-bts-test/generic/BTS_Tests.cfg R ttcn3-bts-test/generic/osmo-bsc.cfg R ttcn3-bts-test/generic/osmo-bts.cfg M ttcn3-bts-test/jenkins.sh 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, approved fixeria: Verified diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index d676bf0..b115000 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -8,6 +8,6 @@ VOLUME /data -COPY BTS_Tests.cfg /data/BTS_Tests.cfg +COPY generic/BTS_Tests.cfg /data/BTS_Tests.cfg CMD ttcn3-docker-run bts BTS_Tests diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg similarity index 100% rename from ttcn3-bts-test/BTS_Tests.cfg rename to ttcn3-bts-test/generic/BTS_Tests.cfg diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/generic/osmo-bsc.cfg similarity index 100% rename from ttcn3-bts-test/osmo-bsc.cfg rename to ttcn3-bts-test/generic/osmo-bsc.cfg diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/generic/osmo-bts.cfg similarity index 100% rename from ttcn3-bts-test/osmo-bts.cfg rename to ttcn3-bts-test/generic/osmo-bts.cfg diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 395407b..35ce0d5 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -120,7 +120,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/bts-tester-generic -cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ +cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" mkdir $VOL_BASE_DIR/bts-tester-virtphy cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/ @@ -136,11 +136,11 @@ $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc mkdir $VOL_BASE_DIR/bsc -cp osmo-bsc.cfg $VOL_BASE_DIR/bsc/ +cp generic/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ mkdir $VOL_BASE_DIR/bts mkdir $VOL_BASE_DIR/bts/unix -cp osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/ mkdir $VOL_BASE_DIR/unix @@ -182,7 +182,7 @@ # 4) Frequency hopping tests require different configuration files cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ -cp osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/ # restart the BSC/BTS and run the testsuite again docker container kill ${BUILD_TAG}-bts start_bsc -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: filesystem: Fix TLV decode/encode

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27100 ) Change subject: filesystem: Fix TLV decode/encode ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 Gerrit-Change-Number: 27100 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 16:41:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils.py: Fix some tuple type annotations

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27133 ) Change subject: utils.py: Fix some tuple type annotations ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I869b0268383f6babd9b51d0ddfce448a1d2dda1e Gerrit-Change-Number: 27133 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 16:40:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils.py: type annotations for DataObject related methods

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27132 ) Change subject: utils.py: type annotations for DataObject related methods ...................................................................... Patch Set 2: Code-Review+1 (3 comments) File pySim/utils.py: https://gerrit.osmocom.org/c/pysim/+/27132/comment/e7a96607_60e117bb PS1, Line 1173: desc:str = None, tag:int = None Optional[str], Optional[int] respectively. https://gerrit.osmocom.org/c/pysim/+/27132/comment/f1622905_d34979ec PS1, Line 1292: str Optional[str] https://gerrit.osmocom.org/c/pysim/+/27132/comment/2e054aa3_b0a7a05f PS1, Line 1403: str Optional[str] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 16:39:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Handle nested security condition data objects

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27129 ) Change subject: ts_102_221: Handle nested security condition data objects ...................................................................... ts_102_221: Handle nested security condition data objects ISO 7816-4 Section 5.4.3.2 "Expanded Format" permits for nesting of security conditions using boolean operators OR, AND, NOT. Let's implement decoding and encoding of these. An example decoded looks like: pySIM-shell (MF/EF.ARR)> read_record_decoded 1 [ [ { "access_mode": [ "activate_file_or_record", "deactivate_file_or_record", "update_erase" ] }, { "or": [ { "control_reference_template": "ADM1" }, { "control_reference_template": "ADM2" } ] } ], [ { "access_mode": [ "read_search_compare" ] }, { "always": null } ] ] Prior to this patch, pySim would raise "ValueError: Unknown Tag 0xa0 in bytearray" Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Closes: OS#5411 --- M pySim/ts_102_221.py 1 file changed, 28 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 7cc3025..71d5b82 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -470,8 +470,35 @@ Always_DO = TL0_DataObject('always', 'Always', 0x90) Never_DO = TL0_DataObject('never', 'Never', 0x97) + +class Nested_DO(DataObject): + """A DO that nests another DO/Choice/Sequence""" + def __init__(self, name, tag, choice): + super().__init__(name, tag=tag) + self.children = choice + def from_bytes(self, binary:bytes) -> list: + remainder = binary + self.decoded = [] + while remainder: + rc, remainder = self.children.decode(remainder) + self.decoded.append(rc) + return self.decoded + def to_bytes(self) -> bytes: + encoded = [self.children.encode(d) for d in self.decoded] + return b''.join(encoded) + +OR_Template = DataObjectChoice('or_template', 'OR-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +OR_DO = Nested_DO('or', 0xa0, OR_Template) +AND_Template = DataObjectChoice('and_template', 'AND-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +AND_DO = Nested_DO('and', 0xa7, AND_Template) +NOT_Template = DataObjectChoice('not_template', 'NOT-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +NOT_DO = Nested_DO('not', 0xaf, NOT_Template) SC_DO = DataObjectChoice('security_condition', 'Security Condition', - members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO(), + OR_DO, AND_DO, NOT_DO]) # TS 102 221 Section 13.1 class EF_DIR(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Gerrit-Change-Number: 27129 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_51_011: Fix type annotation for Tuple[int, int]

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27131 ) Change subject: ts_51_011: Fix type annotation for Tuple[int, int] ...................................................................... ts_51_011: Fix type annotation for Tuple[int, int] Thanks to Vadim for pointing this out. Change-Id: I7ee1309331902bafab3c9fc6bc33ca713f8c7832 --- M pySim/ts_51_011.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index a7f9f97..dd7b788 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -325,6 +325,7 @@ from pySim.utils import * from pySim.tlv import * +from typing import Tuple from struct import pack, unpack from construct import * from construct import Optional as COptional @@ -528,7 +529,7 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self.table = table @staticmethod - def _bit_byte_offset_for_service(service:int) -> (int, int): + def _bit_byte_offset_for_service(service:int) -> Tuple[int, int]: i = service - 1 byte_offset = i//4 bit_offset = (i % 4) * 2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ee1309331902bafab3c9fc6bc33ca713f8c7832 Gerrit-Change-Number: 27131 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils.py: type annotations for DataObject related methods

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27132 to look at the new patch set (#2). Change subject: utils.py: type annotations for DataObject related methods ...................................................................... utils.py: type annotations for DataObject related methods Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 --- M pySim/utils.py 1 file changed, 31 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/27132/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by pespin

Attention is currently required from: iedemam. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Thu, 10 Feb 2022 15:57:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by iedemam

Attention is currently required from: pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 2: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/27134/comment/b060351b_06211bb3 PS1, Line 346: snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%d", line->num); > num is unsigned, so %u. Same in the other block added below. true, true -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 15:33:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by iedemam

Attention is currently required from: iedemam. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 to look at the new patch set (#2). Change subject: stats: add RSL line number to TCP stats name ...................................................................... stats: add RSL line number to TCP stats name Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 --- M src/input/ipaccess.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/34/27134/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by pespin

Attention is currently required from: iedemam. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 1: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/27134/comment/609e321c_6e6a52ef PS1, Line 346: snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%d", line->num); num is unsigned, so %u. Same in the other block added below. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Thu, 10 Feb 2022 15:16:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Handle nested security condition data objects

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27129 ) Change subject: ts_102_221: Handle nested security condition data objects ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Gerrit-Change-Number: 27129 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 15:01:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_51_011: Fix type annotation for Tuple[int, int]

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27131 ) Change subject: ts_51_011: Fix type annotation for Tuple[int, int] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ee1309331902bafab3c9fc6bc33ca713f8c7832 Gerrit-Change-Number: 27131 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 14:59:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27127 ) Change subject: Better decode of EF.UST, EF.EST and EF.IST ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File pySim/ts_31_102.py: https://gerrit.osmocom.org/c/pysim/+/27127/comment/cfcf1ab5_5ec191e6 PS2, Line 536: (int, int) > I just copid this from ts_51_001.EF_ServiceTable. […] At least mypy is not happy about this: test.py:1: error: Syntax error in type annotation test.py:1: note: Suggestion: Use Tuple[T1, ..., Tn] instead of (T1, ..., Tn) Found 1 error in 1 file (checked 1 source file) So I think yes. pylint does not complain though. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 Gerrit-Change-Number: 27127 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 14:59:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by iedemam

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... stats: add RSL line number to TCP stats name Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 --- M src/input/ipaccess.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/34/27134/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index dbb8b2e..1a3909f 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -342,7 +342,9 @@ "could not register FD\n"); goto err; } - osmo_stats_tcp_osmo_fd_register(newbfd, "ipa-rsl"); + char stat_name[16]; + snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%d", line->num); + osmo_stats_tcp_osmo_fd_register(newbfd, stat_name); e1i_ts = ipaccess_line_ts(newbfd, new_line); ipaccess_bsc_keepalive_fsm_alloc(e1i_ts, newbfd, "rsl_bsc_to_bts"); @@ -727,7 +729,9 @@ LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); goto err_line; } - osmo_stats_tcp_osmo_fd_register(bfd, "ipa-rsl"); + char stat_name[16]; + snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%d", line->num); + osmo_stats_tcp_osmo_fd_register(bfd, stat_name); /* Request ID. FIXME: request LOCATION, HW/SW VErsion, Unit Name, Serno */ ret = ipa_ccm_send_id_req(bfd->fd); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log