[S] Change in osmocom-bb[master]: ASCI: Select correct state when returning to idle or group receive mode
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34790?usp=email ) Change subject: ASCI: Select correct state when returning to idle or group receive mode .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I626195161b987f1ba0065134afcf3936c9c090eb Gerrit-Change-Number: 34790 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 18 Oct 2023 05:18:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Ignore cell selection event during group receive mode
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34789?usp=email ) Change subject: ASCI: Ignore cell selection event during group receive mode .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iea6fe62395600313c59ec0e1b24b3177052d Gerrit-Change-Number: 34789 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 18 Oct 2023 05:18:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 2: (1 comment) File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/381f9607_20a51c13 PS1, Line 16: #define PCU_IF_MSG_DATA_CNF 0x01/* (deprecated) */ > Done It's actually a good question whether we want to remove deprecated message types and SAPIs. They are not used anymore, but if you remove them there will be gaps. I would be fine with what @pma...@sysmocom.de did in the initial patchset revision: adding deprecation comments. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 18 Oct 2023 05:10:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email )
Change subject: pcuif_proto: drop support for PCUIF v10
..
Patch Set 2: Code-Review-1
(1 comment)
File src/pcu_l1_if.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/24f67b43_aae05489
PS2, Line 744: if (info_ind->version == 0x0a) {
I think you need to remove this too?
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
Gerrit-Change-Number: 34706
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Wed, 18 Oct 2023 05:04:41 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_test: Improve mem mgmt, fix connection mgmt
Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34799?usp=email to look at the new patch set (#3). Change subject: stream_test: Improve mem mgmt, fix connection mgmt .. stream_test: Improve mem mgmt, fix connection mgmt - Use tall_test as root context everywhere, don't create any other contexts - change .*_(cli|srv)_run_client() signature by adding talloc context as parameter - Open and Close server link inside test_recon() Related: OS#6222 Change-Id: I9ef02ed113bc049ae430b93d0eb69641e2ee809b --- M tests/stream/stream_test.c M tests/stream/stream_test.ok 2 files changed, 93 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/99/34799/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34799?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9ef02ed113bc049ae430b93d0eb69641e2ee809b Gerrit-Change-Number: 34799 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: arehbein Gerrit-MessageType: newpatchset
[M] Change in libosmo-netif[master]: stream_test: Improve mem mgmt, fix connection mgmt
Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34799?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: stream_test: Improve mem mgmt, fix connection mgmt .. stream_test: Improve mem mgmt, fix connection mgmt - Use tall_test as root context everywhere, don't create any other contexts - change .*_(cli|srv)_run_client() signature by adding talloc context as parameter - Open and Close server link inside test_recon() - Print full talloc report Related: OS#6222 Change-Id: I9ef02ed113bc049ae430b93d0eb69641e2ee809b --- M tests/stream/stream_test.c M tests/stream/stream_test.ok 2 files changed, 94 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/99/34799/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34799?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9ef02ed113bc049ae430b93d0eb69641e2ee809b Gerrit-Change-Number: 34799 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: arehbein Gerrit-MessageType: newpatchset
[M] Change in libosmo-netif[master]: stream_test: Fix memleaks
Attention is currently required from: laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: stream_test: Fix memleaks .. stream_test: Fix memleaks - Clean up all allocations, introduce clean memory management to entire test Related: OS#6222 Change-Id: Ica25fcd71e8bf8946def3ea7ce320354ea6edb3a --- M tests/stream/stream_test.c 1 file changed, 47 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/93/34793/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ica25fcd71e8bf8946def3ea7ce320354ea6edb3a Gerrit-Change-Number: 34793 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[M] Change in libosmo-netif[master]: stream_test: Fix memleaks
Attention is currently required from: laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email ) Change subject: stream_test: Fix memleaks .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ica25fcd71e8bf8946def3ea7ce320354ea6edb3a Gerrit-Change-Number: 34793 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 18 Oct 2023 01:47:01 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_test: Improve mem mgmt, fix connection mgmt
arehbein has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34799?usp=email )
Change subject: stream_test: Improve mem mgmt, fix connection mgmt
..
stream_test: Improve mem mgmt, fix connection mgmt
- Use tall_test as root context everywhere, don't create any other contexts
- change .*_(cli|srv)_run_client() signature by adding talloc context as
parameter
- Open and Close server link inside test_recon()
- Print full talloc report
Related: OS#6222
Change-Id: I9ef02ed113bc049ae430b93d0eb69641e2ee809b
---
M tests/stream/stream_test.c
M tests/stream/stream_test.err
M tests/stream/stream_test.ok
3 files changed, 121 insertions(+), 81 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/99/34799/1
diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index 4830302..383059a 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -340,10 +340,17 @@
bool autoreconnect)
{
struct timeval tv;
- struct osmo_stream_cli *cli = make_client(ctx, host, port,
autoreconnect);
+ struct osmo_stream_cli *cli;
+ if (osmo_stream_srv_link_open(lnk) < 0) {
+ printf("Unable to open server\n");
+ osmo_stream_srv_link_destroy(lnk);
+ return;
+ }
+ cli = make_client(ctx, host, port, autoreconnect);
if (!cli)
return;
+
printf("===\n");
printf("Client/Server entering %s event loop...\n",
ASTR(autoreconnect));
printf("===\n");
@@ -368,6 +375,7 @@
}
osmo_stream_cli_destroy(cli);
+ osmo_stream_srv_link_close(lnk);
printf("{%lu.%06lu} %s test complete.\n\n", tv.tv_sec, tv.tv_usec,
ASTR(autoreconnect));
}
@@ -531,12 +539,10 @@
return 0;
}
-struct osmo_stream_cli *test_segm_ipa_stream_srv_run_client(void)
+struct osmo_stream_cli *test_segm_ipa_stream_srv_run_client(void *ctx)
{
struct osmo_stream_cli *osc;
- void *ctx = talloc_named_const(NULL, 0, __func__);
- (void) msgb_talloc_ctx_init(ctx, 0);
osc = osmo_stream_cli_create(ctx);
if (osc == NULL) {
fprintf(stderr, "osmo_stream_cli_create_iofd()\n");
@@ -546,7 +552,6 @@
osmo_stream_cli_set_local_port(osc, 8977);
osmo_stream_cli_set_port(osc, );
osmo_stream_cli_set_connect_cb(osc,
test_segm_ipa_stream_srv_cli_connect_cb);
- osmo_stream_cli_set_data(osc, ctx);
osmo_stream_cli_set_read_cb2(osc, test_segm_ipa_stream_srv_cli_read_cb);
osmo_stream_cli_set_nodelay(osc, true);
if (osmo_stream_cli_open(osc) < 0) {
@@ -590,7 +595,7 @@
static int test_segm_ipa_stream_srv_srv_accept_cb(struct osmo_stream_srv_link
*srv, int fd)
{
- void *ctx = talloc_named_const(NULL, 0, __func__);
+ void *ctx = osmo_stream_srv_link_get_data(srv);
struct osmo_stream_srv *oss =
osmo_stream_srv_create2(ctx, srv, fd, NULL);
if (oss == NULL) {
@@ -613,7 +618,7 @@
printf("Unable to open server\n");
exit(1);
}
- osc = test_segm_ipa_stream_srv_run_client();
+ osc = test_segm_ipa_stream_srv_run_client(ctx);
printf("__Running test
%s__\n", testname);
alarm(2);
@@ -714,7 +719,7 @@
static int test_segm_ipa_stream_cli_srv_accept_cb(struct osmo_stream_srv_link
*srv, int fd)
{
- void *ctx = talloc_named_const(NULL, 0, __func__);
+ void *ctx = osmo_stream_srv_link_get_data(srv);
struct osmo_stream_srv *oss =
osmo_stream_srv_create2(ctx, srv, fd, NULL);
unsigned char *data;
@@ -781,12 +786,10 @@
return 0;
}
-static void *test_segm_ipa_stream_cli_run_client(void)
+static void *test_segm_ipa_stream_cli_run_client(void *ctx)
{
struct osmo_stream_cli *osc;
- void *ctx = talloc_named_const(NULL, 0, __func__);
- (void) msgb_talloc_ctx_init(ctx, 0);
osc = osmo_stream_cli_create(ctx);
if (osc == NULL) {
fprintf(stderr, "osmo_stream_cli_create_iofd()\n");
@@ -795,7 +798,6 @@
osmo_stream_cli_set_addr(osc, "127.0.0.11");
osmo_stream_cli_set_local_port(osc, 8977);
osmo_stream_cli_set_port(osc, 1112);
- osmo_stream_cli_set_data(osc, ctx);
osmo_stream_cli_set_read_cb2(osc, test_segm_ipa_stream_cli_cli_read_cb);
osmo_stream_cli_set_nodelay(osc, true);
osmo_stream_cli_set_segmentation_cb(osc, osmo_ipa_segmentation_cb);
@@ -818,7 +820,7 @@
printf("Unable to open server\n");
exit(1);
}
- test_segm_ipa_stream_cli_run_client();
+ test_segm_ipa_stream_cli_run_client(ctx);
[S] Change in osmo-ci[master]: jobs/update-osmo-*: add build3-deb11build-ansible
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34794?usp=email ) Change subject: jobs/update-osmo-*: add build3-deb11build-ansible .. Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/34794/comment/8b032d9b_0c46066f PS2, Line 7: jobs/update-osmo-*: add build3-deb11build-ansible build4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1f732718df87ed3b850332dbf1a7f6b2f854f280 Gerrit-Change-Number: 34794 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 17 Oct 2023 17:20:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: ansible: jenkins: debian: sort packages
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34795?usp=email ) Change subject: ansible: jenkins: debian: sort packages .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34795?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4ce784821cc40a2e795afafa452c99bf0588253 Gerrit-Change-Number: 34795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 17 Oct 2023 17:20:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: ansible: jenkins: debian: add python3-setuptools
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34796?usp=email ) Change subject: ansible: jenkins: debian: add python3-setuptools .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1ff0711b7b29ba4dc78f51f257b986d7a0994a96 Gerrit-Change-Number: 34796 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 17 Oct 2023 17:20:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in docker-playground[master]: Introduce ttcn3-epdg-test
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/34798?usp=email )
Change subject: Introduce ttcn3-epdg-test
..
Introduce ttcn3-epdg-test
Change-Id: I77a4d66c1bd0236dee8fc54e03a9d6bf8d63f204
---
A ttcn3-epdg-test/Dockerfile
A ttcn3-epdg-test/EPDG_Tests.cfg
A ttcn3-epdg-test/Makefile
A ttcn3-epdg-test/jenkins.sh
A ttcn3-epdg-test/osmo-epdg.config
5 files changed, 102 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/98/34798/1
diff --git a/ttcn3-epdg-test/Dockerfile b/ttcn3-epdg-test/Dockerfile
new file mode 100644
index 000..e3fd8a3
--- /dev/null
+++ b/ttcn3-epdg-test/Dockerfile
@@ -0,0 +1,14 @@
+ARGREGISTRY
+ARGUSER
+FROM $REGISTRY/$USER/debian-bookworm-titan
+
+ARGOSMO_TTCN3_BRANCH="master"
+
+ADD
https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT
/tmp/commit
+RUNttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" epdg
+
+VOLUME /data
+
+COPY EPDG_Tests.cfg /data/EPDG_Tests.cfg
+
+CMDttcn3-docker-run epdg EPDG_Tests
diff --git a/ttcn3-epdg-test/EPDG_Tests.cfg b/ttcn3-epdg-test/EPDG_Tests.cfg
new file mode 100644
index 000..f05a819
--- /dev/null
+++ b/ttcn3-epdg-test/EPDG_Tests.cfg
@@ -0,0 +1,21 @@
+[ORDERED_INCLUDE]
+"/osmo-ttcn3-hacks/Common.cfg"
+"/osmo-ttcn3-hacks/epdg/EPDG_Tests.default"
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+EPDG_Tests.mp_gsup_local_ip := "172.18.10.103"
+EPDG_Tests.mp_swx_local_ip := "172.18.10.103"
+EPDG_Tests.mp_s6b_local_ip := "172.18.10.103"
+EPDG_Tests.mp_s2b_local_ip := "172.18.10.103"
+
+EPDG_Tests.mp_gsup_remote_ip := "172.18.10.20"
+EPDG_Tests.mp_s2b_remote_ip := "172.18.10.20"
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+EPDG_Tests.control
diff --git a/ttcn3-epdg-test/Makefile b/ttcn3-epdg-test/Makefile
new file mode 100644
index 000..8d0e10b
--- /dev/null
+++ b/ttcn3-epdg-test/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/ttcn3-epdg-test/jenkins.sh b/ttcn3-epdg-test/jenkins.sh
new file mode 100755
index 000..df445fc
--- /dev/null
+++ b/ttcn3-epdg-test/jenkins.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "osmo-epdg-$IMAGE_SUFFIX" \
+ "ttcn3-epdg-test"
+
+set_clean_up_trap
+set -e
+
+mkdir $VOL_BASE_DIR/epdg-tester
+cp EPDG_Tests.cfg $VOL_BASE_DIR/epdg-tester/
+write_mp_osmo_repo "$VOL_BASE_DIR/epdg-tester/EPDG_Tests.cfg"
+
+mkdir $VOL_BASE_DIR/epdg
+cp osmo-epdg.config $VOL_BASE_DIR/epdg/
+
+network_create
+network_replace_subnet_in_configs
+
+echo Starting container with osmo-epdg
+docker run --rm \
+ $(docker_network_params $SUBNET 20) \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/epdg:/data \
+ --name ${BUILD_TAG}-epdg -d \
+ $DOCKER_ARGS \
+ $REPO_USER/osmo-epdg-$IMAGE_SUFFIX
+
+echo Starting container with EPDG testsuite
+docker run --rm \
+ $(docker_network_params $SUBNET 103) \
+ --ulimit core=-1 \
+ -e "TTCN3_PCAP_PATH=/data" \
+ -v $VOL_BASE_DIR/epdg-tester:/data \
+ --name ${BUILD_TAG}-ttcn3-epdg-test \
+ $DOCKER_ARGS \
+ $REPO_USER/ttcn3-epdg-test
diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config
new file mode 100644
index 000..ac8828a
--- /dev/null
+++ b/ttcn3-epdg-test/osmo-epdg.config
@@ -0,0 +1,18 @@
+[
+ %% ===
+ %% Application config
+ %% ===
+ {osmo_epdg,
+ [% GSUP Server connection parameters
+ {gsup_local_ip, "172.18.10.20"},
+ {gsup_local_port, 4222},
+ % Diameter Connection parameters
+ {diameter_remote_ip, "172.18.10.103"},
+ {diameter_remote_port, 3868},
+ {diameter_proto, sctp},
+ % Diameter Server parameters
+ {vendor_id, 0},
+ {origin_host, "epdg.localdomain"},
+ {origin_realm, "localdomain"},
+ {context_id, "epdg@localdomain"}]}
+].
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34798?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I77a4d66c1bd0236dee8fc54e03a9d6bf8d63f204
Gerrit-Change-Number: 34798
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in docker-playground[master]: Introduce osmo-epdg-master
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/34797?usp=email )
Change subject: Introduce osmo-epdg-master
..
Introduce osmo-epdg-master
Related: OS#6204
Change-Id: Iefc43ffa47f443f2826b8979d4dd0c5542dda1c5
---
M jenkins-common.sh
M make/Makefile
A osmo-epdg-master/Dockerfile
A osmo-epdg-master/Makefile
A osmo-epdg-master/osmo-epdg.config
5 files changed, 44 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/97/34797/1
diff --git a/jenkins-common.sh b/jenkins-common.sh
index c9299df..4e476f6 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -22,6 +22,7 @@
osmo-*-centos8) echo "centos8-build" ;;
osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;;
osmo_dia2gsup-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;;
+ osmo-epdg-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;;
osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;;
open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;;
ttcn3-*) echo "debian-bookworm-titan" ;;
diff --git a/make/Makefile b/make/Makefile
index f007f2a..722 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -24,6 +24,7 @@
OSMO_BTS_BRANCH?=master
OSMO_CBC_BRANCH?=master
OSMO_DIA2GSUP_BRANCH?=master
+OSMO_EPDG_BRANCH?=master
OSMO_GBPROXY_BRANCH?=master
OSMO_GGSN_BRANCH?=master
OSMO_GSM_TESTER_BRANCH?=master
@@ -105,6 +106,7 @@
--build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \
--build-arg OSMO_CBC_BRANCH=$(OSMO_CBC_BRANCH) \
--build-arg OSMO_DIA2GSUP_BRANCH=$(OSMO_DIA2GSUP_BRANCH) \
+ --build-arg OSMO_EPDG_BRANCH=$(OSMO_EPDG_BRANCH) \
--build-arg OSMO_GBPROXY_BRANCH=$(OSMO_GBPROXY_BRANCH) \
--build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \
--build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \
diff --git a/osmo-epdg-master/Dockerfile b/osmo-epdg-master/Dockerfile
new file mode 100644
index 000..58ccf9a
--- /dev/null
+++ b/osmo-epdg-master/Dockerfile
@@ -0,0 +1,28 @@
+ARGUSER
+ARGDISTRO
+FROM $USER/$DISTRO-erlang
+# Arguments used after FROM must be specified again
+ARGDISTRO
+
+WORKDIR/tmp
+
+ARGOSMO_EPDG_BRANCH="master"
+
+RUNgit clone https://gerrit.osmocom.org/erlang/osmo-epdg.git
+ADD
https://gerrit.osmocom.org/plugins/gitiles/erlang/osmo-epdg/+/$OSMO_EPDG_BRANCH?format=TEXT
/tmp/commit-osmo-epdg
+
+RUNcd osmo-epdg && \
+ git fetch && git checkout $OSMO_EPDG_BRANCH && \
+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_EPDG_BRANCH
|| exit 1); \
+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
+ rebar3 compile && \
+ rebar3 escriptize
+
+VOLUME /data
+
+COPY osmo-epdg.config /data/osmo-epdg.config
+
+WORKDIR/data
+CMD["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo-epdg.config'
/tmp/osmo-epdg/_build/default/bin/osmo-epdg > /data/osmo-epdg.log 2>&1"]
+
+#EXPOSE
diff --git a/osmo-epdg-master/Makefile b/osmo-epdg-master/Makefile
new file mode 100644
index 000..8d0e10b
--- /dev/null
+++ b/osmo-epdg-master/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/osmo-epdg-master/osmo-epdg.config
b/osmo-epdg-master/osmo-epdg.config
new file mode 100644
index 000..be49216
--- /dev/null
+++ b/osmo-epdg-master/osmo-epdg.config
@@ -0,0 +1,2 @@
+[{osmo_epdg, [
+]}].
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34797?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iefc43ffa47f443f2826b8979d4dd0c5542dda1c5
Gerrit-Change-Number: 34797
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: WIP: gsup: add message type for osmo-epdg CEIA interface
Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email ) Change subject: WIP: gsup: add message type for osmo-epdg CEIA interface .. Patch Set 1: (1 comment) Patchset: PS1: Duplicate of https://gerrit.osmocom.org/c/libosmocore/+/34784 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f7c20340c99f94b1326a8a7dc99c86cf6a0dbc3 Gerrit-Change-Number: 32033 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 17 Oct 2023 16:48:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: ansible: jenkins: debian: add python3-setuptools
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34796?usp=email ) Change subject: ansible: jenkins: debian: add python3-setuptools .. ansible: jenkins: debian: add python3-setuptools Install the package, as it is needed to run the update-osmo-python-on-slaves jenkins job. Related: OS#6186 Change-Id: I1ff0711b7b29ba4dc78f51f257b986d7a0994a96 --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/96/34796/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 102d0b8..ed4d2da 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -7,6 +7,7 @@ - fakeroot - htop - proot + - python3-setuptools - qemu-system-arm - qemu-user-static - virt-manager -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1ff0711b7b29ba4dc78f51f257b986d7a0994a96 Gerrit-Change-Number: 34796 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: ansible: jenkins: debian: sort packages
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34795?usp=email ) Change subject: ansible: jenkins: debian: sort packages .. ansible: jenkins: debian: sort packages Related: OS#6186 Change-Id: If4ce784821cc40a2e795afafa452c99bf0588253 --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/95/34795/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 3743043..102d0b8 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -3,13 +3,13 @@ - name: install jenkins utilities apt: name: - - htop - - virt-manager - - qemu-user-static - - qemu-system-arm - - proot - debootstrap - fakeroot + - htop + - proot + - qemu-system-arm + - qemu-user-static + - virt-manager cache_valid_time: 3600 update_cache: yes install_recommends: no -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34795?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4ce784821cc40a2e795afafa452c99bf0588253 Gerrit-Change-Number: 34795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: jobs/update-osmo-*: add build3-deb11build-ansible
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/34794?usp=email to look at the new patch set (#2). Change subject: jobs/update-osmo-*: add build3-deb11build-ansible .. jobs/update-osmo-*: add build3-deb11build-ansible Related: OS#6186 Change-Id: I1f732718df87ed3b850332dbf1a7f6b2f854f280 --- M jobs/update-osmo-ci-on-slaves.yml M jobs/update-osmo-python-on-slaves.yml 2 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/94/34794/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1f732718df87ed3b850332dbf1a7f6b2f854f280 Gerrit-Change-Number: 34794 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in osmo-ci[master]: jobs/update-osmo-*: add build3-deb11build-ansible
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34794?usp=email ) Change subject: jobs/update-osmo-*: add build3-deb11build-ansible .. jobs/update-osmo-*: add build3-deb11build-ansible Change-Id: I1f732718df87ed3b850332dbf1a7f6b2f854f280 --- M jobs/update-osmo-ci-on-slaves.yml M jobs/update-osmo-python-on-slaves.yml 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/94/34794/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index e9f80b1..2b1d81f 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -9,6 +9,7 @@ - build2-deb10build-ansible - build2-deb11build-ansible - build3-deb11build-ansible +- build4-deb12build-ansible - gtp0-deb10fr - host2-deb11build-ansible - rpi4-raspbian11build-ansible-1 diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml index 8147b4f..0842fba 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -9,6 +9,7 @@ - build2-deb10build-ansible - build2-deb11build-ansible - build3-deb11build-ansible +- build4-deb12build-ansible - host2-deb11build-ansible - rpi4-raspbian11build-ansible-1 - rpi4-raspbian11build-ansible-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1f732718df87ed3b850332dbf1a7f6b2f854f280 Gerrit-Change-Number: 34794 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: ASCI: Register state machines only once, when the application starts
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34792?usp=email ) Change subject: ASCI: Register state machines only once, when the application starts .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I46d68e31e0bfd6a64c190e439f45b24502dd1f30 Gerrit-Change-Number: 34792 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Oct 2023 15:48:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Change state correctly when leaving group mode
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34791?usp=email ) Change subject: ASCI: Change state correctly when leaving group mode .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3c83c9e0fe10b35d60d125df6929fcb5ddc35f1a Gerrit-Change-Number: 34791 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Oct 2023 15:48:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Select correct state when returning to idle or group receive mode
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34790?usp=email ) Change subject: ASCI: Select correct state when returning to idle or group receive mode .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I626195161b987f1ba0065134afcf3936c9c090eb Gerrit-Change-Number: 34790 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Oct 2023 15:47:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Ignore cell selection event during group receive mode
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34789?usp=email ) Change subject: ASCI: Ignore cell selection event during group receive mode .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iea6fe62395600313c59ec0e1b24b3177052d Gerrit-Change-Number: 34789 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Oct 2023 15:47:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Join a group/bcast call in correct MM states only
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34788?usp=email ) Change subject: ASCI: Join a group/bcast call in correct MM states only .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2f8ff65f6e101972f9b1760013983d00ae6e7760 Gerrit-Change-Number: 34788 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Oct 2023 15:47:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_test: Fix memleaks
Attention is currently required from: arehbein. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email ) Change subject: stream_test: Fix memleaks .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ica25fcd71e8bf8946def3ea7ce320354ea6edb3a Gerrit-Change-Number: 34793 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Tue, 17 Oct 2023 15:46:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Select correct state when returning to idle or group receive mode
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34790?usp=email ) Change subject: ASCI: Select correct state when returning to idle or group receive mode .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I626195161b987f1ba0065134afcf3936c9c090eb Gerrit-Change-Number: 34790 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Oct 2023 15:37:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Ignore cell selection event during group receive mode
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34789?usp=email ) Change subject: ASCI: Ignore cell selection event during group receive mode .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iea6fe62395600313c59ec0e1b24b3177052d Gerrit-Change-Number: 34789 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Oct 2023 15:35:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Join a group/bcast call in correct MM states only
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34788?usp=email ) Change subject: ASCI: Join a group/bcast call in correct MM states only .. Patch Set 1: Code-Review+1 (1 comment) File src/host/layer23/src/mobile/gsm48_mm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34788/comment/af66dfa0_5bd51618 PS1, Line 4185: SBIT(GSM48_MM_SST_LOC_UPD_NEEDED), this doesn't look in line :/ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2f8ff65f6e101972f9b1760013983d00ae6e7760 Gerrit-Change-Number: 34788 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Oct 2023 15:34:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_test: Fix memleaks
Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email ) Change subject: stream_test: Fix memleaks .. Patch Set 1: (1 comment) Patchset: PS1: This test is not fixing the memleak, I tested locally with ASAN and I still see it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ica25fcd71e8bf8946def3ea7ce320354ea6edb3a Gerrit-Change-Number: 34793 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Tue, 17 Oct 2023 15:31:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_test: Fix memleaks
arehbein has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email )
Change subject: stream_test: Fix memleaks
..
stream_test: Fix memleaks
Free message buffer for received message at the end of each read callback
Related: OS#6222
Change-Id: Ica25fcd71e8bf8946def3ea7ce320354ea6edb3a
---
M tests/stream/stream_test.c
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/93/34793/1
diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index 4830302..9f9265c 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -528,6 +528,7 @@
osmo_hexdump(ipac_msg_idresp, sizeof(ipac_msg_idresp)));
}
printf("\n");
+ msgb_free(msg);
return 0;
}
@@ -585,6 +586,7 @@
} else if (msgnum_srv == 7 && *msgt == IPAC_MSGT_PONG) {
test_segm_ipa_stream_srv_all_msgs_processed = true;
}
+ msgb_free(msg);
return 0;
}
@@ -709,6 +711,7 @@
osmo_hexdump(ipac_msg_idresp, sizeof(ipac_msg_idresp)));
}
printf("\n");
+ msgb_free(msg);
return 0;
}
@@ -778,6 +781,7 @@
} else if (msgnum_cli == 7 && *msgt == IPAC_MSGT_PONG) {
test_segm_ipa_stream_cli_all_msgs_processed = true;
}
+ msgb_free(msg);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: Ica25fcd71e8bf8946def3ea7ce320354ea6edb3a
Gerrit-Change-Number: 34793
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: ASCI: Change state correctly when leaving group mode
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34791?usp=email ) Change subject: ASCI: Change state correctly when leaving group mode .. Patch Set 1: (1 comment) File src/host/layer23/src/mobile/gsm48_mm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11874): https://gerrit.osmocom.org/c/osmocom-bb/+/34791/comment/8081ed27_5bcc3554 PS1, Line 1128: /* Stop here and wait for the IMSI_DETACH event beeing handled. */ 'beeing' may be misspelled - perhaps 'being'? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3c83c9e0fe10b35d60d125df6929fcb5ddc35f1a Gerrit-Change-Number: 34791 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 17 Oct 2023 15:25:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Change state correctly when leaving group mode
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34791?usp=email ) Change subject: ASCI: Change state correctly when leaving group mode .. ASCI: Change state correctly when leaving group mode Use new_mm_state() to leave group mode. This will trigger IMSI detach when returning to IDLE mode, if it has been delayed. Related: OS#5364 Change-Id: I3c83c9e0fe10b35d60d125df6929fcb5ddc35f1a --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/91/34791/1 diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 1a6d711..599d80b 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1125,6 +1125,8 @@ if (!nmsg) return; gsm48_mmevent_msg(ms, nmsg); + /* Stop here and wait for the IMSI_DETACH event beeing handled. */ + return; } /* 4.4.2 start T3212 in MM IDLE mode if not started or has expired */ @@ -2153,6 +2155,8 @@ struct gsm48_mmxx_hdr *nmmh; int msg_type; + LOGP(DMM, LOGL_INFO, "IMSI detach delayed until group receive/transmit mode is left.\n"); + /* remember to detach later */ mm->delay_detach = 1; @@ -3889,9 +3893,9 @@ /* Change mode back to normal or limited service. */ if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) - mm->substate = GSM48_MM_SST_LIMITED_SERVICE; + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); if (mm->substate == GSM48_MM_SST_RX_VGCS_NORMAL) - mm->substate = GSM48_MM_SST_NORMAL_SERVICE; + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); /* Return IDLE, if not already. Also select the sub-state to use. */ gsm48_mm_return_idle(ms, NULL); @@ -3937,9 +3941,9 @@ /* Change mode back to normal or limited service. */ if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) - mm->substate = GSM48_MM_SST_LIMITED_SERVICE; + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); if (mm->substate == GSM48_MM_SST_RX_VGCS_NORMAL) - mm->substate = GSM48_MM_SST_NORMAL_SERVICE; + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); /* We are already IDLE. Also select the sub-state to use. */ gsm48_mm_return_idle(ms, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3c83c9e0fe10b35d60d125df6929fcb5ddc35f1a Gerrit-Change-Number: 34791 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: ASCI: Select correct state when returning to idle or group receive mode
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34790?usp=email )
Change subject: ASCI: Select correct state when returning to idle or group
receive mode
..
ASCI: Select correct state when returning to idle or group receive mode
This fixes I05957182a57423ad947ab200b52f65fde859e110.
Related: OS#5364 and OS#6214
Change-Id: I626195161b987f1ba0065134afcf3936c9c090eb
---
M src/host/layer23/src/mobile/gsm48_mm.c
1 file changed, 26 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/90/34790/1
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index 072dacc..1a6d711 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -1236,7 +1236,14 @@
struct gsm48_mmlayer *mm = >mmlayer;
struct gsm322_cellsel *cs = >cellsel;
struct gsm48_sysinfo *s = >sel_si;
- bool vgcs = mm->vgcs.enabled;
+
+ /* When we are in group transmit mode, we return to group receive mode.
*/
+ if (mm->vgcs.enabled) {
+ LOGP(DMM, LOGL_INFO, "Return to group receive mode.\n");
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (mm->vgcs.normal_service)
? GSM48_MM_SST_RX_VGCS_NORMAL
+
: GSM48_MM_SST_RX_VGCS_LIMITED);
+ return 0;
+ }
if (cs->state != GSM322_C3_CAMPED_NORMALLY
&& cs->state != GSM322_C7_CAMPED_ANY_CELL) {
@@ -1286,9 +1293,7 @@
new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_ATTEMPT_UPDATE);
else
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_NORMAL
- : GSM48_MM_SST_NORMAL_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_NORMAL_SERVICE);
return 0;
}
@@ -1299,39 +1304,30 @@
if (gsm_subscr_is_forbidden_plmn(subscr,
>sel_cgi.lai.plmn)) {
/* location update not allowed */
LOGP(DMM, LOGL_INFO, "Loc. upd. not allowed PLMN.\n");
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED
- : GSM48_MM_SST_LIMITED_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_LIMITED_SERVICE);
} else
if (gsm322_is_forbidden_la(ms, >sel_cgi.lai)) {
/* location update not allowed */
LOGP(DMM, LOGL_INFO, "Loc. upd. not allowed LA.\n");
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED
- : GSM48_MM_SST_LIMITED_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_LIMITED_SERVICE);
} else
/* 4.4.4.9 if cell is barred, don't start */
if ((!subscr->acc_barr && s->cell_barr)
|| (!subscr->acc_barr && !((subscr->acc_class & 0xfbff) &
(s->class_barr ^ 0x {
LOGP(DMM, LOGL_INFO, "Loc. upd. no access.\n");
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED
- : GSM48_MM_SST_LIMITED_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_LIMITED_SERVICE);
} else {
/* location update allowed */
LOGP(DMM, LOGL_INFO, "Loc. upd. allowed.\n");
new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED
- : GSM48_MM_SST_LIMITED_SERVICE);
+ GSM48_MM_SST_LOC_UPD_NEEDED);
}
} else {
/* location update not allowed */
LOGP(DMM, LOGL_INFO, "We are camping on any cell as returning "
"to MM IDLE\n");
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED
- : GSM48_MM_SST_LIMITED_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_LIMITED_SERVICE);
}
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34790?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project:
[S] Change in osmocom-bb[master]: ASCI: Register state machines only once, when the application starts
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34792?usp=email )
Change subject: ASCI: Register state machines only once, when the application
starts
..
ASCI: Register state machines only once, when the application starts
Related: OS#5364
Change-Id: I46d68e31e0bfd6a64c190e439f45b24502dd1f30
---
M src/host/layer23/src/mobile/gsm44068_gcc_bcc.c
1 file changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/34792/1
diff --git a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c
b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c
index 7bb8b29..0cef1c3 100644
--- a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c
+++ b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c
@@ -83,14 +83,8 @@
* init
*/
-static struct osmo_fsm vgcs_gcc_fsm;
-static struct osmo_fsm vgcs_bcc_fsm;
-
int gsm44068_gcc_init(struct osmocom_ms *ms)
{
- OSMO_ASSERT(osmo_fsm_register(_gcc_fsm) == 0);
- OSMO_ASSERT(osmo_fsm_register(_bcc_fsm) == 0);
-
LOGP(DGCC, LOGL_INFO, "init GCC/BCC\n");
return 0;
@@ -1484,6 +1478,12 @@
.timer_cb = vgcs_gcc_fsm_timer_cb,
};
+static __attribute__((constructor)) void on_dso_load(void)
+{
+ OSMO_ASSERT(osmo_fsm_register(_gcc_fsm) == 0);
+ OSMO_ASSERT(osmo_fsm_register(_bcc_fsm) == 0);
+}
+
static const char *gsm44068_gcc_state_name(struct osmo_fsm_inst *fi)
{
return vgcs_gcc_fsm_states[fi->state].name;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34792?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I46d68e31e0bfd6a64c190e439f45b24502dd1f30
Gerrit-Change-Number: 34792
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: ASCI: Join a group/bcast call in correct MM states only
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34788?usp=email )
Change subject: ASCI: Join a group/bcast call in correct MM states only
..
ASCI: Join a group/bcast call in correct MM states only
These states are:
GSM48_MM_SST_NORMAL_SERVICE
GSM48_MM_SST_ATTEMPT_UPDATE
GSM48_MM_SST_LIMITED_SERVICE
GSM48_MM_SST_LOC_UPD_NEEDED
GSM48_MM_SST_PLMN_SEARCH (limited service)
GSM48_MM_SST_PLMN_SEARCH_NORMAL
If the service is limited, group/bcast calls can be joined, but uplink
access is not allowed.
Related: OS#5364
Change-Id: I2f8ff65f6e101972f9b1760013983d00ae6e7760
---
M src/host/layer23/src/mobile/gsm48_mm.c
1 file changed, 40 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/34788/1
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index 995c5d1..5d78f62 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -3816,10 +3816,11 @@
mm->vgcs.enabled = true;
mm->vgcs.group_call = (mmh->msg_type == GSM48_MMGCC_GROUP_REQ);
mm->vgcs.callref = mmh->ref;
- mm->vgcs.normal_service = (mm->substate == GSM48_MM_SST_NORMAL_SERVICE);
+ mm->vgcs.normal_service = (mm->substate == GSM48_MM_SST_NORMAL_SERVICE
||
+ mm->substate ==
GSM48_MM_SST_PLMN_SEARCH_NORMAL);
/* Change to VGCS substate. */
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (mm->substate ==
GSM48_MM_SST_NORMAL_SERVICE)
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (mm->vgcs.normal_service)
? GSM48_MM_SST_RX_VGCS_NORMAL :
GSM48_MM_SST_RX_VGCS_LIMITED);
/* Group recevie mode request to RR layer */
@@ -4180,10 +4181,12 @@
SBIT(GSM48_MM_SST_LOC_UPD_NEEDED),
GSM48_MMCC_EST_REQ, gsm48_mm_init_mm_no_rr}, /* emergency only */
- {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_ATTEMPT_UPDATE),
+ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_ATTEMPT_UPDATE) |
+ SBIT(GSM48_MM_SST_LOC_UPD_NEEDED),
GSM48_MMBCC_GROUP_REQ, gsm48_mm_group_req},
- {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_ATTEMPT_UPDATE),
+ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_ATTEMPT_UPDATE) |
+ SBIT(GSM48_MM_SST_LOC_UPD_NEEDED),
GSM48_MMGCC_GROUP_REQ, gsm48_mm_group_req},
/* 4.2.2.3 Limited service */
@@ -4216,10 +4219,22 @@
{SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_PLMN_SEARCH_NORMAL),
GSM48_MMBCC_EST_REQ, gsm48_mm_init_mm_no_rr},
+ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_PLMN_SEARCH_NORMAL),
+GSM48_MMBCC_GROUP_REQ, gsm48_mm_group_req},
+
+ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_PLMN_SEARCH_NORMAL),
+GSM48_MMGCC_GROUP_REQ, gsm48_mm_group_req},
+
/* 4.2.2.6 PLMN search */
{SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_PLMN_SEARCH),
GSM48_MMCC_EST_REQ, gsm48_mm_init_mm_no_rr},
+ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_PLMN_SEARCH),
+GSM48_MMBCC_GROUP_REQ, gsm48_mm_group_req},
+
+ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_PLMN_SEARCH),
+GSM48_MMGCC_GROUP_REQ, gsm48_mm_group_req},
+
/* 4.2.2.7 Receiving group call, normal service */
{SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_RX_VGCS_NORMAL),
GSM48_MMGCC_REL_REQ, gsm48_mm_group_rel_req},
@@ -4271,9 +4286,6 @@
{SBIT(GSM48_MM_ST_MM_CONN_ACTIVE), ALL_STATES,
GSM48_MMSMS_EST_REQ, gsm48_mm_init_mm_more},
- {SBIT(GSM48_MM_ST_MM_CONN_ACTIVE), ALL_STATES,
-GSM48_MMGCC_GROUP_REQ, gsm48_mm_group_req},
-
{SBIT(GSM48_MM_ST_WAIT_NETWORK_CMD), ALL_STATES,
GSM48_MMCC_EST_REQ, gsm48_mm_init_mm_wait},
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34788?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I2f8ff65f6e101972f9b1760013983d00ae6e7760
Gerrit-Change-Number: 34788
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: ASCI: Ignore cell selection event during group receive mode
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34789?usp=email )
Change subject: ASCI: Ignore cell selection event during group receive mode
..
ASCI: Ignore cell selection event during group receive mode
Cell selection is not supported during group receive mode. If it
happens anyway, give an error message and select correct sub-state.
This fixes I05957182a57423ad947ab200b52f65fde859e110.
Related: OS#5364 and OS#6214
Change-Id: Iea6fe62395600313c59ec0e1b24b3177052d
---
M src/host/layer23/src/mobile/gsm48_mm.c
1 file changed, 26 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/34789/1
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index 5d78f62..072dacc 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -1358,7 +1358,13 @@
struct gsm322_cellsel *cs = >cellsel;
struct gsm48_sysinfo *s = >sel_si;
struct gsm_settings *set = >settings;
- bool vgcs = mm->vgcs.enabled;
+
+ if (mm->vgcs.enabled) {
+ LOGP(DMM, LOGL_ERROR, "Cell selection in group receive mode,
this should not happen.\n");
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (mm->vgcs.normal_service)
? GSM48_MM_SST_RX_VGCS_NORMAL
+
: GSM48_MM_SST_RX_VGCS_LIMITED);
+ return 0;
+ }
/* no SIM is inserted */
if (!subscr->sim_valid) {
@@ -1377,9 +1383,7 @@
struct msgb *nmsg;
LOGP(DMM, LOGL_INFO, "Valid in location area.\n");
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_NORMAL
- : GSM48_MM_SST_NORMAL_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_NORMAL_SERVICE);
/* send message to PLMN search process */
nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS);
@@ -1393,9 +1397,7 @@
struct msgb *nmsg;
LOGP(DMM, LOGL_INFO, "Attachment not required.\n");
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_NORMAL
- : GSM48_MM_SST_NORMAL_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_NORMAL_SERVICE);
/* send message to PLMN search process */
nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS);
@@ -1416,9 +1418,7 @@
struct msgb *nmsg;
LOGP(DMM, LOGL_INFO, "Selected cell is forbidden.\n");
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED
- : GSM48_MM_SST_LIMITED_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_LIMITED_SERVICE);
/* send message to PLMN search process */
nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED);
@@ -1438,9 +1438,7 @@
struct msgb *nmsg;
LOGP(DMM, LOGL_INFO, "Selected cell not found.\n");
- new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
-(vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED
- : GSM48_MM_SST_LIMITED_SERVICE);
+ new_mm_state(mm, GSM48_MM_ST_MM_IDLE,
GSM48_MM_SST_LIMITED_SERVICE);
/* send message to PLMN search process */
nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED);
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34789?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Iea6fe62395600313c59ec0e1b24b3177052d
Gerrit-Change-Number: 34789
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF .. Patch Set 4: (1 comment) File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/4db8767a_befda2ed PS4, Line 239: break; break after return is not needed -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 17 Oct 2023 15:23:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcu_l1_if: signal BTS model via PCUIF
Attention is currently required from: dexter, fixeria.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email )
Change subject: pcu_l1_if: signal BTS model via PCUIF
..
Patch Set 3:
(1 comment)
File src/pcu_l1_if.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34647/comment/b8d5cf10_e85a6c42
PS3, Line 805: { PCU_IF_BTS_MODEL_SYSMO, "sysmo-bts" },
first time I see "sysmo-bts" instead of "sysmobts".
Why some have parenthesis and some not?
BTW, I'd avoid adding BTS which don't require specific stuff in osmo-pcu for
now.
For instance, afaiu omldummy actually makes no sense, and virtual can actually
be passed as "trx" for now to PCU.
So in summary, cleanup the list :)
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047
Gerrit-Change-Number: 34647
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Attention: fixeria
Gerrit-Attention: dexter
Gerrit-Comment-Date: Tue, 17 Oct 2023 15:22:16 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 4:
(2 comments)
File src/common/pcu_sock.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11872):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/24c958e4_5313bfda
PS4, Line 235: static enum gsm_pcuif_bts_model bts_model_from_variant(enum
gsm_bts_type_variant variant) {
open brace '{' following function definitions go on the next line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11872):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/145eedf5_25af9d30
PS4, Line 250: return PCU_IF_BTS_MODEL_TRX;
code indent should use tabs where possible
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 4
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Oct 2023 15:13:39 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34649?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF .. Patch Set 3: (2 comments) File include/osmocom/bsc/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bsc/+/34649/comment/cd042833_73145140 PS2, Line 69: /* BTS model */ > same comments as osmo-pcu patch. Done File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34649/comment/8f6b7098_9bad0abc PS2, Line 310: info_ind->bts_model = PCU_IF_BTS_MODEL_UNSPEC; > Ah, it's osmo-bsc. […] In theory, yes, but in practice no. This would mean that the PCUIF would be connected to osmo-bsc, while the DSP link would be connected to the PCU. BSC, PCU and BTS would run on the same host then. I would exclude this case from here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0 Gerrit-Change-Number: 34649 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 15:13:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34649?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0 --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/49/34649/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0 Gerrit-Change-Number: 34649 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 62 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: pespin.
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 4:
(2 comments)
File include/osmo-bts/pcuif_proto.h:
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/77fda5a4_78c96d58
PS3, Line 63: /* BTS model */
> same comments as osmo-pcu patch.
Done
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/c94f3204_d3ef2381
PS3, Line 363: switch (bts->variant) {
> maybe move this to a helper function?
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 4
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Oct 2023 15:13:07 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcu_l1_if: signal BTS model via PCUIF
Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email to look at the new patch set (#3). Change subject: pcu_l1_if: signal BTS model via PCUIF .. pcu_l1_if: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU and store this information in struct gprs_rlcmac_bts Related: OS#6191 Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.h M src/pcu_l1_if.cpp 3 files changed, 51 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/34647/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Gerrit-Change-Number: 34647 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-pcu[master]: pcu_l1_if: signal BTS model via PCUIF
Attention is currently required from: fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email ) Change subject: pcu_l1_if: signal BTS model via PCUIF .. Patch Set 2: (3 comments) File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34647/comment/9793fb22_add9ce4b PS1, Line 70: #define PCU_IF_BTS_MODEL_UNSPEC 0x00 > I definetly want an enum here. The field in the struct can remain a uint of > known size. Done https://gerrit.osmocom.org/c/osmo-pcu/+/34647/comment/07bbd891_48eb8b60 PS1, Line 193: uint8_t bts_model; > comment referencing the enum type above. Done File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34647/comment/ead06207_58fcb40a PS1, Line 1016: LOGP(DL1IF, LOGL_INFO, "BTS model: %02x\n", info_ind->bts_model); > value_string. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Gerrit-Change-Number: 34647 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 17 Oct 2023 15:11:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: pcu_l1_if: signal BTS model via PCUIF
Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by fixeria, Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: pcu_l1_if: signal BTS model via PCUIF .. pcu_l1_if: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU and store this information in struct gprs_rlcmac_bts Related: OS#6191 Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.h M src/pcu_l1_if.cpp 3 files changed, 36 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/34647/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Gerrit-Change-Number: 34647 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: gsmtap_util: Fix for embedded
arehbein has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34749?usp=email ) Change subject: gsmtap_util: Fix for embedded .. Abandoned Found another solution for compiling libosmocore/gsmtap_util (had to move the `#include <.../osmo_io.h>` beyond another preprocessor conditional statement) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34749?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifaaeae622f01cbe6473d6e28046c01095139f532 Gerrit-Change-Number: 34749 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-CC: jolly Gerrit-MessageType: abandon
[S] Change in osmo-ci[master]: ansible: hosts: add build4-deb11build-ansible
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34785?usp=email ) Change subject: ansible: hosts: add build4-deb11build-ansible .. ansible: hosts: add build4-deb11build-ansible Related: OS#6186 Change-Id: Ia4ce2ab074941dda6b7c820673108d19d4136664 --- M ansible/hosts M ansible/util/known_hosts A ansible/vars/Debian-12.yml 3 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/85/34785/1 diff --git a/ansible/hosts b/ansible/hosts index e027a31..2592065 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -5,11 +5,13 @@ [coverity_slaves] build2-deb11build-ansible ansible_host=2a01:4f8:10b:2ad9::1:13 build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 +build4-deb12build-ansible ansible_host=2a01:4f8:121:200a::1:3 [jenkins_slaves] build2-deb10build-ansible ansible_host=2a01:4f8:10b:2ad9::1:10 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" build2-deb11build-ansible ansible_host=2a01:4f8:10b:2ad9::1:13 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" +build4-deb12build-ansible ansible_host=2a01:4f8:121:200a::1:3 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" rpi4-raspbian11build-ansible-1 ansible_host=10.9.25.50 docker_max_image_space="20 GB" rpi4-raspbian11build-ansible-2 ansible_host=10.9.25.60 docker_max_image_space="20 GB" diff --git a/ansible/util/known_hosts b/ansible/util/known_hosts index 8c93b5d..05b30c8 100644 --- a/ansible/util/known_hosts +++ b/ansible/util/known_hosts @@ -5,3 +5,4 @@ 10.9.25.50 ssh-ed25519 C3NzaC1lZDI1NTE5IPowg8lZeIGJ6LCLA8U4eSHnnPX90FaVgInDuRi5U9Zq 10.9.25.60 ssh-ed25519 C3NzaC1lZDI1NTE5IOAK6SQXmifMamE1VHL/1GmPkk6KhplzT20jSOwb8PyZ 10.9.25.70 ssh-ed25519 C3NzaC1lZDI1NTE5ILioWTUt6CyZTceSKqy09mtlNUif+ETKTF6whnWuIROx +2a01:4f8:121:200a::1:3 ssh-ed25519 C3NzaC1lZDI1NTE5IGafw2VdeZo4YNvbu8VEBjDrsCFL+ZSbHtvhspNIQ9PR diff --git a/ansible/vars/Debian-12.yml b/ansible/vars/Debian-12.yml new file mode 100644 index 000..4db6ac1 --- /dev/null +++ b/ansible/vars/Debian-12.yml @@ -0,0 +1,2 @@ +--- +obs_distro: Debian_12 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34785?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia4ce2ab074941dda6b7c820673108d19d4136664 Gerrit-Change-Number: 34785 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: ansible: jenkins: debian: remove qemu package
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34786?usp=email ) Change subject: ansible: jenkins: debian: remove qemu package .. ansible: jenkins: debian: remove qemu package This is a dummy package that isn't available anymore in debian 12. https://packages.debian.org/buster/qemu says: > This package can safely be removed. We install qemu-user-static and qemu-system-arm, which contain qemu binaries. Related: OS#6186 Change-Id: I4d5bd376b1e370d9636b9a2e9e710f5f20b9ae98 --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/86/34786/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 0c762e9..ead03d7 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -5,7 +5,6 @@ name: - htop - virt-manager - - qemu - qemu-user-static - qemu-system-arm - proot -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34786?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4d5bd376b1e370d9636b9a2e9e710f5f20b9ae98 Gerrit-Change-Number: 34786 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: ansible: jenkins: use default-jre-headless
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34787?usp=email ) Change subject: ansible: jenkins: use default-jre-headless .. ansible: jenkins: use default-jre-headless Use default-jre-headless instead of giving the openjdk version, so we don't need to adjust it to whatever the current version in debian is. The default-jre-headless package is at least available since debian 10: https://packages.debian.org/search?suite=buster=any=names=default-jre-headless Related: OS#6186 Change-Id: I6c5c74ff3d75dca2f89765d95c4b4c6d67ace703 --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/34787/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index ead03d7..3743043 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -49,7 +49,7 @@ - name: install java for buster and later apt: name: - - openjdk-11-jre-headless + - default-jre-headless cache_valid_time: 3600 update_cache: yes install_recommends: no -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6c5c74ff3d75dca2f89765d95c4b4c6d67ace703 Gerrit-Change-Number: 34787 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-bsc[master]: pcuif_proto: clean up last remains of old PCUIF v10
Attention is currently required from: dexter, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34708?usp=email ) Change subject: pcuif_proto: clean up last remains of old PCUIF v10 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34708?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iebb3a634fee680bdc3636a61f3ccaa1e97e54a64 Gerrit-Change-Number: 34708 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 17 Oct 2023 14:06:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: pcuif_proto: clean up last remains of old PCUIF v10
Attention is currently required from: dexter, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34707?usp=email ) Change subject: pcuif_proto: clean up last remains of old PCUIF v10 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34707?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I04f7108c94c99c9920192177087748e8b89b3106 Gerrit-Change-Number: 34707 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 17 Oct 2023 14:05:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 17 Oct 2023 14:04:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsup: Define EPDG Tunnel messages
Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34784?usp=email ) Change subject: gsup: Define EPDG Tunnel messages .. Patch Set 1: (1 comment) Patchset: PS1: I didn't find any commit of yours adding these fields here, only one branch in osmo-hlr making use of it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34784?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I482060da4a13e30a76527ad911f8583b3937d077 Gerrit-Change-Number: 34784 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 17 Oct 2023 13:54:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsup: Define EPDG Tunnel messages
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/34784?usp=email )
Change subject: gsup: Define EPDG Tunnel messages
..
gsup: Define EPDG Tunnel messages
Those are required as part of the CEAI interface to communicate
osmo-epdg and strongswan IPsec.
Change-Id: I482060da4a13e30a76527ad911f8583b3937d077
---
M include/osmocom/gsm/gsup.h
M src/gsm/gsup.c
2 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/34784/1
diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h
index 56d7a30..07af073 100644
--- a/include/osmocom/gsm/gsup.h
+++ b/include/osmocom/gsm/gsup.h
@@ -198,6 +198,10 @@
OSMO_GSUP_MSGT_E_ABORT = 0b01001011,
OSMO_GSUP_MSGT_ROUTING_ERROR= 0b01001110,
+
+ OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST = 0b0101,
+ OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR= 0b01010001,
+ OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT = 0b01010010
};
#define OSMO_GSUP_MSGT_E_ROUTING_ERROR OSMO_GSUP_MSGT_ROUTING_ERROR
diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c
index ef33ed0..cded675 100644
--- a/src/gsm/gsup.c
+++ b/src/gsm/gsup.c
@@ -102,7 +102,9 @@
OSMO_VALUE_STRING(OSMO_GSUP_MSGT_E_ABORT),
OSMO_VALUE_STRING(OSMO_GSUP_MSGT_ROUTING_ERROR),
-
+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST),
+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR),
+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT),
{ 0, NULL }
};
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34784?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I482060da4a13e30a76527ad911f8583b3937d077
Gerrit-Change-Number: 34784
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Add several AVPs required for SWx interface
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34776?usp=email )
Change subject: library/DIAMETER: Add several AVPs required for SWx interface
..
library/DIAMETER: Add several AVPs required for SWx interface
Those are required/used in SWx interface (3GPP TS 29.273), but are
specified on other documents.
Related: OS#6204
Change-Id: If31e14215fc7fb18cef12d68600b4f170bbb68af
---
M library/DIAMETER_Templates.ttcn
1 file changed, 199 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index b6723e7..bbf3cff 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -400,6 +400,44 @@
}
}
+private function enum2int_Vendor_Id_tmpl(template Vendor_Id inp) return
template integer
+{
+ if (istemplatekind(inp, "omit")) {
+ return omit;
+ } else if (istemplatekind(inp, "*")) {
+ return *;
+ } else if (istemplatekind(inp, "?")) {
+ return ?;
+ } else {
+ return enum2int(valueof(inp));
+ }
+}
+
+template (present) GenericAVP tr_AVP_VendorSpecAppId(template (present)
Vendor_Id vendor_id := ?,
+template (present)
uint32_t auth_app_id := ?) := {
+ avp := {
+ avp_header :=
tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id),
+ avp_data := {
+ avp_BASE_NONE_Vendor_Specific_Application_Id := {
+ {
+ avp := {
+ avp_header :=
tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Id),
+ avp_data := {
+ avp_BASE_NONE_Vendor_Id
:= int2oct_tmpl(enum2int_Vendor_Id_tmpl(vendor_id), 4)
+ }
+ }
+ }, {
+ avp := {
+ avp_header :=
tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Application_Id),
+ avp_data := {
+
avp_BASE_NONE_Auth_Application_Id := int2oct_tmpl(auth_app_id, 4)
+ }
+ }
+ }
+ }
+ }
+ }
+}
template (value) GenericAVP ts_AVP_VendorSpecAppId(Vendor_Id vendor_id,
uint32_t auth_app_id) := {
avp := {
avp_header :=
ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id),
@@ -2069,4 +2107,152 @@
}
}
+
+/*
+ * Cx, Dx, 3GPP TS 29.229
+ */
+/* SIP-Auth-Data-Item, 3GPP TS 29.229 6.3.8 */
+template (present) GenericAVP tr_AVP_3GPP_SIPNumAuthDataItems(template
(present) uint32_t num := ?) := {
+ avp := {
+ avp_header :=
tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Number_Auth_Items),
+ avp_data := {
+ avp_CxDx_3GPP_SIP_Number_Auth_Items :=
int2oct_tmpl(num, 4) /* CxDx_3GPP_SIP_Number_Auth_Items */
+ }
+ }
+}
+template (value) GenericAVP ts_AVP_3GPP_SIPNumAuthDataItems(uint32_t num) := {
+ avp := {
+ avp_header :=
ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Number_Auth_Items),
+ avp_data := {
+ avp_CxDx_3GPP_SIP_Number_Auth_Items := int2oct(num, 4)
/* CxDx_3GPP_SIP_Number_Auth_Items */
+ }
+ }
+}
+
+/* SIP-Authentication-Scheme, 3GPP TS 29.229 6.3.9 */
+template (present) GenericAVP tr_AVP_3GPP_SIPAuthScheme(template (present)
CxDx_3GPP_SIP_Authentication_Scheme scheme := ?) := {
+ avp := {
+ avp_header :=
tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authentication_Scheme),
+ avp_data := {
+ avp_CxDx_3GPP_SIP_Authentication_Scheme := scheme
+ }
+ }
+}
+template (value) GenericAVP ts_AVP_3GPP_SIPAuthScheme(template (value)
CxDx_3GPP_SIP_Authentication_Scheme scheme) := {
+ avp := {
+ avp_header :=
ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authentication_Scheme),
+ avp_data := {
+ avp_CxDx_3GPP_SIP_Authentication_Scheme := scheme
+ }
+ }
+}
+
+/* SIP-Authenticate, 3GPP TS 29.229 6.3.10 */
+template (present) GenericAVP tr_AVP_3GPP_SIPAuthenticate(template (present)
CxDx_3GPP_SIP_Authenticate rand_autn_concatenated := ?) := {
+ avp := {
+ avp_header
[M] Change in osmo-ttcn3-hacks[master]: library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and sub...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34774?usp=email )
Change subject: library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G()
and subfields
..
library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and subfields
Change-Id: I39babec53f89c11b9a822939af7267aadc8b
---
M library/GSUP_Types.ttcn
1 file changed, 81 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn
index 818f830..d874862 100644
--- a/library/GSUP_Types.ttcn
+++ b/library/GSUP_Types.ttcn
@@ -379,6 +379,29 @@
}
}
+template GSUP_IE tr_GSUP_IE_AuthTuple2G3G(
+ template (present) octetstring rand :=
?,
+ template (present) octetstring sres :=
?,
+ template (present) octetstring kc := ?,
+ template (present) octetstring ik := ?,
+ template (present) octetstring ck := ?,
+ template (present) octetstring autn :=
?,
+ template (present) octetstring res :=
?) := {
+ tag := OSMO_GSUP_AUTH_TUPLE_IE,
+ len := ?,
+ val := {
+ auth_tuple := {
+ tr_GSUP_IE_RAND(rand),
+ tr_GSUP_IE_SRES(sres),
+ tr_GSUP_IE_Kc(kc),
+ tr_GSUP_IE_IK(ik),
+ tr_GSUP_IE_CK(ck),
+ tr_GSUP_IE_AUTN(autn),
+ tr_GSUP_IE_RES(res)
+ }
+ }
+}
+
template GSUP_IE ts_GSUP_IE_AuthTuple2G3G(octetstring rand, octetstring sres,
octetstring kc, octetstring ik,
octetstring ck, octetstring autn,
@@ -721,7 +744,7 @@
}
}
-template GSUP_IE tr_GSUP_IE_RAND(template octetstring rand) := {
+template GSUP_IE tr_GSUP_IE_RAND(template octetstring rand := ?) := {
tag := OSMO_GSUP_RAND_IE,
len := ?,
val := {
@@ -729,6 +752,14 @@
}
}
+template (present) GSUP_IE tr_GSUP_IE_SRES(template (present) octetstring sres
:= ?) := {
+ tag := OSMO_GSUP_SRES_IE,
+ len := ?,
+ val := {
+ sres := sres
+ }
+}
+
template (value) GSUP_IE ts_GSUP_IE_SRES(octetstring sres) := {
tag := OSMO_GSUP_SRES_IE,
len := 0, /* overwritten */
@@ -737,6 +768,14 @@
}
}
+template (present) GSUP_IE tr_GSUP_IE_Kc(template (present) octetstring kc :=
?) := {
+ tag := OSMO_GSUP_KC_IE,
+ len := ?,
+ val := {
+ kc := kc
+ }
+}
+
template (value) GSUP_IE ts_GSUP_IE_Kc(octetstring kc) := {
tag := OSMO_GSUP_KC_IE,
len := 0, /* overwritten */
@@ -745,6 +784,14 @@
}
}
+template (present) GSUP_IE tr_GSUP_IE_IK(template (present) octetstring ik :=
?) := {
+ tag := OSMO_GSUP_IK_IE,
+ len := ?,
+ val := {
+ ik := ik
+ }
+}
+
template (value) GSUP_IE ts_GSUP_IE_IK(octetstring ik) := {
tag := OSMO_GSUP_IK_IE,
len := 0, /* overwritten */
@@ -753,6 +800,14 @@
}
}
+template (present) GSUP_IE tr_GSUP_IE_CK(template (present) octetstring ck :=
?) := {
+ tag := OSMO_GSUP_CK_IE,
+ len := ?,
+ val := {
+ ck := ck
+ }
+}
+
template (value) GSUP_IE ts_GSUP_IE_CK(octetstring ck) := {
tag := OSMO_GSUP_CK_IE,
len := 0, /* overwritten */
@@ -761,6 +816,14 @@
}
}
+template (present) GSUP_IE tr_GSUP_IE_AUTN(template (present) octetstring autn
:= ?) := {
+ tag := OSMO_GSUP_AUTN_IE,
+ len := ?,
+ val := {
+ autn := autn
+ }
+}
+
template (value) GSUP_IE ts_GSUP_IE_AUTN(octetstring autn) := {
tag := OSMO_GSUP_AUTN_IE,
len := 0, /* overwritten */
@@ -769,6 +832,14 @@
}
}
+template (present) GSUP_IE tr_GSUP_IE_RES(template (present) octetstring res
:= ?) := {
+ tag := OSMO_GSUP_RES_IE,
+ len := ?,
+ val := {
+ res := res
+ }
+}
+
template (value) GSUP_IE ts_GSUP_IE_RES(octetstring res) := {
tag := OSMO_GSUP_RES_IE,
len := 0, /* overwritten */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34774?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I39babec53f89c11b9a822939af7267aadc8b
Gerrit-Change-Number: 34774
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
[S] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Allow passing template as imsi param to tr_AVP_User...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34775?usp=email )
Change subject: library/DIAMETER: Allow passing template as imsi param to
tr_AVP_UserNameImsi()
..
library/DIAMETER: Allow passing template as imsi param to tr_AVP_UserNameImsi()
Change-Id: Ia525b2a1850bc80cee13717b114fec215fa84f9f
---
M library/DIAMETER_Templates.ttcn
M library/Osmocom_Types.ttcn
2 files changed, 23 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index 4dd686a..b6723e7 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -625,7 +625,7 @@
}
}
template (value) GenericAVP ts_AVP_UserNameImsi(hexstring imsi) :=
ts_AVP_UserName(char2oct(hex2str(imsi)));
-template (present) GenericAVP tr_AVP_UserNameImsi(hexstring imsi) :=
tr_AVP_UserName(char2oct(hex2str(imsi)));
+template (present) GenericAVP tr_AVP_UserNameImsi(template (present) hexstring
imsi := ?) := tr_AVP_UserName(char2oct_tmpl(hex2str_tmpl(imsi)));
diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn
index ce22c1e..ef55583 100644
--- a/library/Osmocom_Types.ttcn
+++ b/library/Osmocom_Types.ttcn
@@ -179,6 +179,19 @@
}
}
+function hex2str_tmpl(template hexstring inp) return template charstring
+{
+ if (istemplatekind(inp, "omit")) {
+ return omit;
+ } else if (istemplatekind(inp, "*")) {
+ return *;
+ } else if (istemplatekind(inp, "?")) {
+ return ?;
+ } else {
+ return hex2str(valueof(inp));
+ }
+}
+
function f_array_contains(IntegerRecord arr, integer key) return boolean {
for (var integer i:= 0; i< sizeof(arr); i := i + 1) {
if (arr[i] == key) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34775?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ia525b2a1850bc80cee13717b114fec215fa84f9f
Gerrit-Change-Number: 34775
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Add several AVPs required for SWx interface
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34776?usp=email ) Change subject: library/DIAMETER: Add several AVPs required for SWx interface .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34776?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If31e14215fc7fb18cef12d68600b4f170bbb68af Gerrit-Change-Number: 34776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 12:24:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Allow passing template as imsi param to tr_AVP_User...
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34775?usp=email ) Change subject: library/DIAMETER: Allow passing template as imsi param to tr_AVP_UserNameImsi() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34775?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia525b2a1850bc80cee13717b114fec215fa84f9f Gerrit-Change-Number: 34775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 12:23:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and sub...
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34774?usp=email ) Change subject: library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and subfields .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I39babec53f89c11b9a822939af7267aadc8b Gerrit-Change-Number: 34774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 12:22:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: diameter_swx: Fix MAA and SAA parsing mixed
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34783?usp=email )
Change subject: diameter_swx: Fix MAA and SAA parsing mixed
..
diameter_swx: Fix MAA and SAA parsing mixed
Change-Id: I570dd7c0ae521ccaea5fceb7eef90b4975cb0fbc
---
M src/epdg_diameter_swx.erl
1 file changed, 35 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg
refs/changes/83/34783/1
diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl
index fe89f11..dadfa65 100644
--- a/src/epdg_diameter_swx.erl
+++ b/src/epdg_diameter_swx.erl
@@ -152,19 +152,28 @@
unknown_user => #{error => "User is not known by HSS"}
}).
--spec parse_mar(#'MAA'{}) -> map().
-parse_mar(#'MAA'{'Result-Code' = [ResultCode]} = Maa) ->
+-spec parse_maa(#'MAA'{}) -> map().
+parse_maa(#'MAA'{'Result-Code' = [ResultCode]} = Maa) ->
Success = result_code_success(ResultCode),
{Success, ResultCode};
-
-parse_mar(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP,
'ExpResultCode' := 5001}]} = Maa) ->
+parse_maa(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP,
'ExpResultCode' := 5001}]} = Maa) ->
{unknown_user, 5001};
-parse_mar(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP,
'ExpResultCode' := ResultCode}]} = Maa) ->
+parse_maa(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP,
'ExpResultCode' := ResultCode}]} = Maa) ->
{invalid_exp_result, ResultCode};
-parse_mar(Maa) ->
+parse_maa(Maa) ->
{unknown_err, []}.
+% parse_maa(#'MAA'{'Experimental-Result-Code' = [ResultCode] = MAA) ->
-% parse_mar(#'MAA'{'Experimental-Result-Code' = [ResultCode] = MAA) ->
+-spec parse_saa(#'SAA'{}) -> map().
+parse_saa(#'SAA'{'Result-Code' = [ResultCode]} = Saa) ->
+Success = result_code_success(ResultCode),
+{Success, ResultCode};
+parse_saa(#'SAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP,
'ExpResultCode' := 5001}]} = Saa) ->
+{unknown_user, 5001};
+parse_saa(#'SAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP,
'ExpResultCode' := ResultCode}]} = Saa) ->
+{invalid_exp_result, ResultCode};
+parse_saa(Saa) ->
+{unknown_err, []}.
handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}},
_From, State) ->
SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME,
origin_host, ?ENV_DEFAULT_ORIG_HOST)),
@@ -184,11 +193,16 @@
Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, MAR, []),
case Ret of
{ok, MAA} ->
-{reply, {ok, MAA}, State};
+SuccessCode = parse_maa(MAA),
+case SuccessCode of
+{ok, _} -> {reply, {ok, MAA}, State};
+{Err, Info} -> {reply, {error, {Err, Info, MAA}}, State}
+end;
{error, Err} ->
lager:error("Error: ~w~n", [Err]),
{reply, {error, Err}, State}
end;
+
handle_call({sar, {IMSI, Type, APN}}, _From, State) ->
SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME,
origin_host, ?ENV_DEFAULT_ORIG_HOST)),
SAR = #'SAR'{'Vendor-Specific-Application-Id' =
#'Vendor-Specific-Application-Id'{
@@ -202,11 +216,11 @@
},
Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, SAR, []),
case Ret of
-{ok, Maa} ->
-SuccessCode = parse_mar(Maa),
+{ok, Saa} ->
+SuccessCode = parse_saa(Saa),
case SuccessCode of
-{ok, _} -> {reply, {ok, Maa}, State};
-{Err, Info} -> {reply, {error, {Err, Info, Maa}}, State}
+{ok, _} -> {reply, {ok, Saa}, State};
+{Err, Info} -> {reply, {error, {Err, Info, Saa}}, State}
end;
{error, Err} ->
lager:error("Error: ~w~n", [Err]),
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34783?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I570dd7c0ae521ccaea5fceb7eef90b4975cb0fbc
Gerrit-Change-Number: 34783
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[L] Change in osmo-ttcn3-hacks[master]: Introduce EPDG_Tests testsuite
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34778?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Introduce EPDG_Tests testsuite .. Introduce EPDG_Tests testsuite Relted: OS#6204 Change-Id: Iab6f3c7dbcbbf344b0beca9490597c9ab0907171 --- M Makefile A epdg/EPDG_Tests.cfg A epdg/EPDG_Tests.default A epdg/EPDG_Tests.ttcn A epdg/gen_links.sh A epdg/regen_makefile.sh M library/DIAMETER_Templates.ttcn M library/GSUP_Types.ttcn 8 files changed, 748 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/34778/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab6f3c7dbcbbf344b0beca9490597c9ab0907171 Gerrit-Change-Number: 34778 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in ...osmo-epdg[master]: osmo_epdg_app: Fix formatting error in log string
pespin has submitted this change. (
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email )
Change subject: osmo_epdg_app: Fix formatting error in log string
..
osmo_epdg_app: Fix formatting error in log string
Change-Id: Ib8dfa40ad028f959e4816ce5056ff64d52ec647b
---
M src/osmo_epdg_app.erl
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo_epdg_app.erl b/src/osmo_epdg_app.erl
index 2eaaa8a..e1ec1f9 100644
--- a/src/osmo_epdg_app.erl
+++ b/src/osmo_epdg_app.erl
@@ -5,7 +5,7 @@
-export([start/2, stop/1]).
start(_StartType, _StartArgs) ->
- lager:notice("osmo-epdg app started~n"),
+ lager:notice("osmo-epdg app started"),
osmo_epdg_sup:start_link().
stop(_State) ->
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Ib8dfa40ad028f959e4816ce5056ff64d52ec647b
Gerrit-Change-Number: 34742
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[rel-1.8.1]: Bump version: 1.8.0.21-fbd0 → 1.8.1
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34781?usp=email ) Change subject: Bump version: 1.8.0.21-fbd0 → 1.8.1 .. Bump version: 1.8.0.21-fbd0 → 1.8.1 Change-Id: If84e8cf8769550c97552832c5cb97ebba830341d --- M debian/changelog M src/Makefile.am 2 files changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8714beb..cd1c181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.8.1) unstable; urgency=medium + + * Fix counting received IPA packets in server mode + + -- Harald Welte Tue, 17 Oct 2023 13:11:24 +0200 + libosmo-sccp (1.8.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/src/Makefile.am b/src/Makefile.am index f20e193..c87848d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=9:0:0 +LIBVERSION=9:1:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34781?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.8.1 Gerrit-Change-Id: If84e8cf8769550c97552832c5cb97ebba830341d Gerrit-Change-Number: 34781 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-msc[master]: csd_bs: force rate adaptation mode for CSD calls to V.110
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34748?usp=email )
Change subject: csd_bs: force rate adaptation mode for CSD calls to V.110
..
csd_bs: force rate adaptation mode for CSD calls to V.110
Certain calls (seen on very old Nokias) won't have the rate adaptation flag
set on "analog" CSD calls. The field for the intermediate rate (after RA) is
still filled correctly.
Workaround this by setting the RA to V.110 whenever the RA is unset but an
intermediate rate is specified.
Change-Id: I5b3e5649fe071636f1becddfbfee06f9175a5f17
---
M src/libmsc/csd_bs.c
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/libmsc/csd_bs.c b/src/libmsc/csd_bs.c
index caea057..ab0b643 100644
--- a/src/libmsc/csd_bs.c
+++ b/src/libmsc/csd_bs.c
@@ -236,6 +236,11 @@
enum gsm48_bcap_user_rate rate = cap->data.user_rate;
bool async = cap->data.async;
+ /* 3.1kHz CSD calls won't have the rate adaptation field set
+ but do require rate adaptation. */
+ if (cap->data.interm_rate && !ra)
+ ra = GSM48_BCAP_RA_V110_X30;
+
if (ra == GSM48_BCAP_RA_V110_X30 && async && transp) {
switch (rate) {
case GSM48_BCAP_UR_300:
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34748?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I5b3e5649fe071636f1becddfbfee06f9175a5f17
Gerrit-Change-Number: 34748
Gerrit-PatchSet: 2
Gerrit-Owner: manawyrm
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in osmo-msc[master]: libmsc: add 3k1_AUDIO and FAX_G3 bearer cap
Attention is currently required from: manawyrm. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34747?usp=email ) Change subject: libmsc: add 3k1_AUDIO and FAX_G3 bearer cap .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34747?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I198aa867a8f236b8ddd05d3b2356f64b876fd4c1 Gerrit-Change-Number: 34747 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: manawyrm Gerrit-Comment-Date: Tue, 17 Oct 2023 11:25:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: libmsc: add 3k1_AUDIO and FAX_G3 bearer cap
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34747?usp=email )
Change subject: libmsc: add 3k1_AUDIO and FAX_G3 bearer cap
..
libmsc: add 3k1_AUDIO and FAX_G3 bearer cap
Bearer capability 3k1_AUDIO and FAX_G3 are only important
for the interworking function, the MSC should handle
these calls the same as CSD calls with unrestricted digital
bearer capability.
Change-Id: I198aa867a8f236b8ddd05d3b2356f64b876fd4c1
---
M src/libmsc/gsm_04_08_cc.c
M src/libmsc/mncc_builtin.c
M src/libmsc/msc_a.c
M src/libmsc/msc_ho.c
M src/libmsc/transaction_cc.c
5 files changed, 30 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 1e2c5af..31fcb23 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -825,6 +825,8 @@
LOG_TRANS(trans, LOGL_INFO,
"Got no information of remote audio codecs:
neither SDP nor Bearer Capability. Trying anyway.\n");
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
if (setup->fields & MNCC_F_BEARER_CAP) {
trans->cc.remote = (struct sdp_msg){};
@@ -878,6 +880,8 @@
return rc;
}
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
if (csd_bs_list_to_bearer_cap(_cap,
>cc.local.bearer_services) == 0) {
LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer
Capability for CC Setup\n");
diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c
index c1debc5..6474201 100644
--- a/src/libmsc/mncc_builtin.c
+++ b/src/libmsc/mncc_builtin.c
@@ -88,6 +88,8 @@
/* we currently only do speech and CSD */
switch (setup->bearer_cap.transfer) {
case GSM_MNCC_BCAP_SPEECH:
+ case GSM_MNCC_BCAP_AUDIO:
+ case GSM_MNCC_BCAP_FAX_G3:
case GSM_MNCC_BCAP_UNR_DIG:
break;
default:
diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index b4776a0..e64b54d 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -669,6 +669,8 @@
return;
}
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
if (!cc_trans->cc.local.bearer_services.count) {
LOG_TRANS(cc_trans, LOGL_ERROR, "Assignment not
possible, no matching bearer service: %s\n",
diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c
index 9748ed9..f826975 100644
--- a/src/libmsc/msc_ho.c
+++ b/src/libmsc/msc_ho.c
@@ -422,6 +422,8 @@
return;
}
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
if (csd_bs_list_to_gsm0808_channel_type(_type,
_trans->cc.local.bearer_services)) {
msc_ho_failed(msc_a,
GSM0808_CAUSE_EQUIPMENT_FAILURE,
diff --git a/src/libmsc/transaction_cc.c b/src/libmsc/transaction_cc.c
index 35ec5dc..1ea6633 100644
--- a/src/libmsc/transaction_cc.c
+++ b/src/libmsc/transaction_cc.c
@@ -54,6 +54,8 @@
LOG_TRANS(trans, LOGL_DEBUG, "codecs: %s\n",
codec_filter_to_str(>cc.codecs,
>cc.local, >cc.remote));
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
csd_filter_run(>cc.csd, >cc.local,
>cc.remote);
LOG_TRANS(trans, LOGL_DEBUG, "codec/BS: %s\n",
@@ -78,6 +80,8 @@
case GSM48_BCAP_ITCAP_SPEECH:
sdp_audio_codecs_from_bearer_cap(>cc.codecs.ms, bcap);
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
sdp_audio_codecs_set_csd(>cc.codecs.ms);
csd_bs_list_from_bearer_cap(>cc.csd.ms, bcap);
@@ -101,6 +105,8 @@
case GSM48_BCAP_ITCAP_SPEECH:
sdp_audio_codecs_from_bearer_cap(>cc.remote.audio_codecs, bcap);
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
sdp_audio_codecs_set_csd(>cc.remote.audio_codecs);
csd_bs_list_from_bearer_cap(>cc.remote.bearer_services,
bcap);
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34747?usp=email
To unsubscribe, or for
[S] Change in libosmocore[master]: gsm48_ie.c: change bearer cap structure in outgoing CSD calls
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/34746?usp=email )
(
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: gsm48_ie.c: change bearer cap structure in outgoing CSD calls
..
gsm48_ie.c: change bearer cap structure in outgoing CSD calls
Outgoing CSD calls were previously encoded with the
Bearer Capability 1 - Octet 4 "Structure" field set to
3 - Unstructured. Many Nokia, Sony Ericsson and Huawei devices
won't accept incoming CSD calls with these bits set.
Set them to 0 - Service data unit integrity for now, which
seems to work and make all tested devices happy.
Change-Id: Ieb5bca3d3578abd28e18808752e1c312ce7c4ce0
---
M src/gsm/gsm48_ie.c
M tests/gsm0408/gsm0408_test.c
2 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 7de1f98..bb86cf4 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -339,7 +339,7 @@
case GSM48_BCAP_ITCAP_FAX_G3:
lv[i++] |= 0x80; /* last IE of octet 3 etc */
/* octet 4 */
- lv[i++] = 0xb8;
+ lv[i++] = 0x88;
/* octet 5 */
lv[i++] = 0x80 | ((bcap->data.rate_adaption & 3) << 3)
| (bcap->data.sig_access & 7);
diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
index 5b3f5cd..e82178d 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -31,7 +31,7 @@
#include
-static const uint8_t csd_9600_v110_lv[] = { 0x07, 0xa1, 0xb8, 0x89, 0x21,
0x15, 0x63, 0x80 };
+static const uint8_t csd_9600_v110_lv[] = { 0x07, 0xa1, 0x88, 0x89, 0x21,
0x15, 0x63, 0x80 };
static const struct gsm_mncc_bearer_cap bcap_csd_9600_v110 = {
.transfer = GSM48_BCAP_ITCAP_UNR_DIG_INF,
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34746?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ieb5bca3d3578abd28e18808752e1c312ce7c4ce0
Gerrit-Change-Number: 34746
Gerrit-PatchSet: 5
Gerrit-Owner: manawyrm
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in ...osmo-epdg[master]: osmo_epdg_app: Fix formatting error in log string
Attention is currently required from: lynxis lazus, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email ) Change subject: osmo_epdg_app: Fix formatting error in log string .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ib8dfa40ad028f959e4816ce5056ff64d52ec647b Gerrit-Change-Number: 34742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 17 Oct 2023 11:23:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: csd_bs: force rate adaptation mode for CSD calls to V.110
Attention is currently required from: manawyrm. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34748?usp=email ) Change subject: csd_bs: force rate adaptation mode for CSD calls to V.110 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34748?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5b3e5649fe071636f1becddfbfee06f9175a5f17 Gerrit-Change-Number: 34748 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: manawyrm Gerrit-Comment-Date: Tue, 17 Oct 2023 11:23:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsm48_ie.c: add 3.1kHz audio bearer capability for CSD calls
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/34744?usp=email )
Change subject: gsm48_ie.c: add 3.1kHz audio bearer capability for CSD calls
..
gsm48_ie.c: add 3.1kHz audio bearer capability for CSD calls
GSM48_BCAP_ITCAP_3k1_AUDIO should be handled just like fax or
unregistricted digital CSD calls. The transfer capability just
indicates that an (external) interworking function should convert
the call into an analog modem call on the network edge.
The CSD call is still regular V.110/RLP non-transparent data.
Change-Id: I44b76be0f6a891bc1d8f55ede1ef140ea0a19e3d
---
M src/gsm/gsm48_ie.c
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
jolly: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 0cdcb7c..7de1f98 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -233,6 +233,7 @@
}
break;
case GSM_MNCC_BCAP_UNR_DIG:
+ case GSM_MNCC_BCAP_AUDIO:
case GSM_MNCC_BCAP_FAX_G3:
i = 1;
while (!(lv[i] & 0x80)) {
@@ -334,6 +335,7 @@
lv[i] |= 0x80; /* last IE of octet 3 etc */
break;
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
case GSM48_BCAP_ITCAP_FAX_G3:
lv[i++] |= 0x80; /* last IE of octet 3 etc */
/* octet 4 */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34744?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I44b76be0f6a891bc1d8f55ede1ef140ea0a19e3d
Gerrit-Change-Number: 34744
Gerrit-PatchSet: 2
Gerrit-Owner: manawyrm
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: gsm48_ie.c: change bearer cap structure in outgoing CSD calls
Attention is currently required from: manawyrm. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34746?usp=email ) Change subject: gsm48_ie.c: change bearer cap structure in outgoing CSD calls .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34746?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieb5bca3d3578abd28e18808752e1c312ce7c4ce0 Gerrit-Change-Number: 34746 Gerrit-PatchSet: 4 Gerrit-Owner: manawyrm Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: manawyrm Gerrit-Comment-Date: Tue, 17 Oct 2023 11:21:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsm48_ie.c: add 3.1kHz audio bearer capability for CSD calls
Attention is currently required from: manawyrm. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34744?usp=email ) Change subject: gsm48_ie.c: add 3.1kHz audio bearer capability for CSD calls .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I44b76be0f6a891bc1d8f55ede1ef140ea0a19e3d Gerrit-Change-Number: 34744 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: manawyrm Gerrit-Comment-Date: Tue, 17 Oct 2023 11:21:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: hss: Add missing test in expected-results.xml
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34764?usp=email ) Change subject: hss: Add missing test in expected-results.xml .. hss: Add missing test in expected-results.xml Change-Id: I890bcd2f8ffa74e43b5a593dbf8547af5fccd40d --- M hss/expected-results.xml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/hss/expected-results.xml b/hss/expected-results.xml index 8e8d1df..f9b5c97 100644 --- a/hss/expected-results.xml +++ b/hss/expected-results.xml @@ -1,4 +1,5 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I890bcd2f8ffa74e43b5a593dbf8547af5fccd40d Gerrit-Change-Number: 34764 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in ...osmo-epdg[master]: osmo_epdg_app: Fix formatting error in log string
Attention is currently required from: fixeria, lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email ) Change subject: osmo_epdg_app: Fix formatting error in log string .. Patch Set 1: (1 comment) File src/osmo_epdg_app.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742/comment/fbda929f_d2ad9e01 PS1, Line 8: ~n >From >https://riak.com/posts/technical/introducing-lager-a-new-logging-framework-for-erlangotp/index.html > Also notice that you don’t need to stick a newline on the end of the log > message. Lager automatically (and happily) does that for you. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ib8dfa40ad028f959e4816ce5056ff64d52ec647b Gerrit-Change-Number: 34742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 17 Oct 2023 11:20:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: Introduce EPDG_Tests testsuite
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34778?usp=email to look at the new patch set (#4). Change subject: Introduce EPDG_Tests testsuite .. Introduce EPDG_Tests testsuite Relted: OS#6204 Change-Id: Iab6f3c7dbcbbf344b0beca9490597c9ab0907171 --- M Makefile A epdg/EPDG_Tests.cfg A epdg/EPDG_Tests.default A epdg/EPDG_Tests.ttcn A epdg/gen_links.sh A epdg/regen_makefile.sh M library/DIAMETER_Templates.ttcn M library/GSUP_Types.ttcn 8 files changed, 748 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/34778/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab6f3c7dbcbbf344b0beca9490597c9ab0907171 Gerrit-Change-Number: 34778 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: WIP
pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34782?usp=email ) Change subject: WIP .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34782?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3b9b45eb4eed88ea5c1ba2b870c03b04f7f4c3b2 Gerrit-Change-Number: 34782 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: abandon
[L] Change in osmo-ttcn3-hacks[master]: Introduce EPDG_Tests testsuite
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34778?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Introduce EPDG_Tests testsuite .. Introduce EPDG_Tests testsuite Relted: OS#6204 Change-Id: Iab6f3c7dbcbbf344b0beca9490597c9ab0907171 --- M Makefile A epdg/EPDG_Tests.cfg A epdg/EPDG_Tests.default A epdg/EPDG_Tests.ttcn A epdg/gen_links.sh A epdg/regen_makefile.sh M library/DIAMETER_Templates.ttcn M library/GSUP_Types.ttcn 8 files changed, 629 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/34778/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab6f3c7dbcbbf344b0beca9490597c9ab0907171 Gerrit-Change-Number: 34778 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: WIP
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34782?usp=email )
Change subject: WIP
..
WIP
Change-Id: I3b9b45eb4eed88ea5c1ba2b870c03b04f7f4c3b2
---
M epdg/EPDG_Tests.ttcn
M library/DIAMETER_Templates.ttcn
2 files changed, 128 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/82/34782/1
diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 69a3d9b..2006632 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -316,6 +316,26 @@
}
}
+/* Diameter SWx SAR + SAA. */
+private altstep as_DIA_SWx_SA_success() runs on EPDG_ConnHdlr {
+ var PDU_DIAMETER rx_dia;
+ var template (omit) AVP avp;
+ var octetstring sess_id;
+ [] SWx.receive(tr_DIA_SWx_SAR(g_pars.imsi)) -> value rx_dia {
+ avp := f_DIAMETER_get_avp(rx_dia,
c_AVP_Code_BASE_NONE_Session_Id);
+ sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id);
+ /* Send SAA to translator; expect it to show up on GSUP side */
+ SWx.send(ts_DIA_SWx_SAA(g_pars.imsi,
+ sess_id := sess_id,
+ hbh_id := rx_dia.hop_by_hop_id,
+ ete_id := rx_dia.end_to_end_id));
+ setverdict(pass);
+ }
+ [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Unexpected Diameter msg rx: ", rx_dia));
+ }
+}
+
/* GSUP AuthInfo Req + Resp, triggers SWx MAR + MAA. */
private function f_GSUP_AI_success() runs on EPDG_ConnHdlr {
var GSUP_PDU rx_gsup;
@@ -337,8 +357,25 @@
setverdict(pass);
}
+/* GSUP LU Req + Resp, triggers SWx SAR + SAA (Server Assignment). */
+private function f_GSUP_LU_success() runs on EPDG_ConnHdlr {
+ var GSUP_PDU rx_gsup;
+ var template octetstring destination_name := *;
+ GSUP.send(ts_GSUP_UL_REQ(g_pars.imsi));
+ as_DIA_SWx_SA_success();
+ /* Expect a positive response back to the translator; expect AIA */
+ alt {
+ [] GSUP.receive(tr_GSUP_UL_RES(g_pars.imsi, destination_name));
+ [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Unexpected GSUP msg rx: ", rx_gsup));
+ }
+ }
+ setverdict(pass);
+}
+
private function f_TC_authinfo_normal(charstring id) runs on EPDG_ConnHdlr {
f_GSUP_AI_success();
+ f_GSUP_LU_success();
}
testcase TC_authinfo_normal() runs on MTC_CT {
diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index cb010d7..100159c 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -1031,7 +1031,7 @@
}
}
-/* TS 29.272 7.3.36 Service-Selection (refers to RFC 5778) */
+/* Service-Selection, TS 29.272 7.3.36, TS 29.273 5.2.3.5, (RFC 5778) */
template (present) GenericAVP tr_AVP_ServiceSelection(template (present)
charstring apn := ?) := {
avp := {
avp_header :=
tr_DIA_Hdr(c_AVP_Code_MIPv6_NONE_Service_Selection),
@@ -2258,6 +2258,24 @@
}
}
+/* Server-Assignment-Type, 3GPP TS 29.273 8.2.3.12, 3GPP TS 29.229 6.3.15 */
+template (present) GenericAVP tr_AVP_3GPP_ServerAssignmentType(template
(present) CxDx_3GPP_Server_Assignment_Type t := ?) := {
+ avp := {
+ avp_header :=
tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Server_Assignment_Type),
+ avp_data := {
+ avp_CxDx_3GPP_Server_Assignment_Type := t
+ }
+ }
+}
+template (value) GenericAVP ts_AVP_3GPP_ServerAssignmentType(template (value)
CxDx_3GPP_Server_Assignment_Type t) := {
+ avp := {
+ avp_header :=
ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Server_Assignment_Type),
+ avp_data := {
+ avp_CxDx_3GPP_Server_Assignment_Type := t
+ }
+ }
+}
+
/*
* SWx 3GPP TS 29.273
*/
@@ -2364,4 +2382,67 @@
ts_AVP_3GPP_SIPNumAuthDataItems(1)
});
+/* Server-Assignment-Request,
+ * 3GPP TS 29.273 8.1.2.2.2 UE/PDN Registration/DeRegistration Notification
+ * 3GPP TS 29.273 8.2.2.3 Non-3GPP IP Access Registration Procedure */
+template (present) PDU_DIAMETER
+tr_DIA_SWx_SAR(template (present) hexstring imsi := ?,
+ template (present) octetstring sess_id := ?,
+ template (present) charstring orig_host := ?,
+ template (present) charstring orig_realm := ?,
+ template (present) charstring dest_realm := ?,
+ template (present) UINT32 hbh_id := ?,
+ template (present) UINT32 ete_id := ?,
+ template (present) CxDx_3GPP_Server_Assignment_Type
[S] Change in libosmo-sccp[rel-1.8.1]: Bump version: 1.8.0.21-fbd0 → 1.8.1
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34781?usp=email ) Change subject: Bump version: 1.8.0.21-fbd0 → 1.8.1 .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: it's fine. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34781?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.8.1 Gerrit-Change-Id: If84e8cf8769550c97552832c5cb97ebba830341d Gerrit-Change-Number: 34781 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 17 Oct 2023 11:16:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: osmo_epdg_app: Fix formatting error in log string
Attention is currently required from: fixeria, lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email ) Change subject: osmo_epdg_app: Fix formatting error in log string .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ib8dfa40ad028f959e4816ce5056ff64d52ec647b Gerrit-Change-Number: 34742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 17 Oct 2023 11:16:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Add several AVPs required for SWx interface
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34776?usp=email ) Change subject: library/DIAMETER: Add several AVPs required for SWx interface .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34776?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If31e14215fc7fb18cef12d68600b4f170bbb68af Gerrit-Change-Number: 34776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 11:15:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Allow passing template as imsi param to tr_AVP_User...
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34775?usp=email ) Change subject: library/DIAMETER: Allow passing template as imsi param to tr_AVP_UserNameImsi() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34775?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia525b2a1850bc80cee13717b114fec215fa84f9f Gerrit-Change-Number: 34775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 11:15:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and sub...
Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34774?usp=email ) Change subject: library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and subfields .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I39babec53f89c11b9a822939af7267aadc8b Gerrit-Change-Number: 34774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 17 Oct 2023 11:15:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[rel-1.8.1]: Bump version: 1.8.0.21-fbd0 → 1.8.1
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34781?usp=email ) Change subject: Bump version: 1.8.0.21-fbd0 → 1.8.1 .. Patch Set 1: (1 comment) Patchset: PS1: please specifically check if the LIBVERSION increment is correct for a change that doesn't add or remove interfaces. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34781?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.8.1 Gerrit-Change-Id: If84e8cf8769550c97552832c5cb97ebba830341d Gerrit-Change-Number: 34781 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 11:13:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmo-sccp[rel-1.8.1]: Bump version: 1.8.0.21-fbd0 → 1.8.1
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34781?usp=email ) Change subject: Bump version: 1.8.0.21-fbd0 → 1.8.1 .. Bump version: 1.8.0.21-fbd0 → 1.8.1 Change-Id: If84e8cf8769550c97552832c5cb97ebba830341d --- M debian/changelog M src/Makefile.am 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/81/34781/1 diff --git a/debian/changelog b/debian/changelog index 8714beb..cd1c181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.8.1) unstable; urgency=medium + + * Fix counting received IPA packets in server mode + + -- Harald Welte Tue, 17 Oct 2023 13:11:24 +0200 + libosmo-sccp (1.8.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/src/Makefile.am b/src/Makefile.am index f20e193..c87848d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=9:0:0 +LIBVERSION=9:1:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34781?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.8.1 Gerrit-Change-Id: If84e8cf8769550c97552832c5cb97ebba830341d Gerrit-Change-Number: 34781 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[rel-1.8.1]: Fix counting received IPA packets in server mode
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34780?usp=email )
Change subject: Fix counting received IPA packets in server mode
..
Fix counting received IPA packets in server mode
When operating an IPA ASP in server mode, we were not counting the
packets using the related stat item:
For example:
OsmoSTP# show stats
Ungrouped counters:
SIGTRAN Application Server Process (6)('asp-dyn-5'):
Total number of packets received:0 (0/s 0/m 0/h 0/d)
Total number of packets transmitted: 235370503 (129/s 7682/m 442447/h
11342653/d)
This patch adds the missing counter increment.
back-port of Change-Id I75881d115b5c2c2567c4731bcf2cabe11f367117 from master
Closes: SYS#6600
Change-Id: I96488e4ea10e00f5f03387e33dc58e4b5016458f
---
M src/osmo_ss7_asp.c
1 file changed, 26 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 596e7ae..e1c197c 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -905,7 +905,7 @@
return -1;
}
msg->dst = asp;
-
+ rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34780?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: rel-1.8.1
Gerrit-Change-Id: I96488e4ea10e00f5f03387e33dc58e4b5016458f
Gerrit-Change-Number: 34780
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[master]: Fix counting received IPA packets in server mode
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34779?usp=email )
Change subject: Fix counting received IPA packets in server mode
..
Fix counting received IPA packets in server mode
When operating an IPA ASP in server mode, we were not counting the
packets using the related stat item:
For example:
OsmoSTP# show stats
Ungrouped counters:
SIGTRAN Application Server Process (6)('asp-dyn-5'):
Total number of packets received:0 (0/s 0/m 0/h 0/d)
Total number of packets transmitted: 235370503 (129/s 7682/m 442447/h
11342653/d)
This patch adds the missing counter increment.
Change-Id: I75881d115b5c2c2567c4731bcf2cabe11f367117
Closes: SYS#6600
---
M src/osmo_ss7_asp.c
1 file changed, 24 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 1ba0a43..0662085 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -753,7 +753,7 @@
return -1;
}
msg->dst = asp;
-
+ rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34779?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I75881d115b5c2c2567c4731bcf2cabe11f367117
Gerrit-Change-Number: 34779
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[rel-1.8.1]: Fix counting received IPA packets in server mode
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34780?usp=email ) Change subject: Fix counting received IPA packets in server mode .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34780?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.8.1 Gerrit-Change-Id: I96488e4ea10e00f5f03387e33dc58e4b5016458f Gerrit-Change-Number: 34780 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 17 Oct 2023 11:08:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: Fix counting received IPA packets in server mode
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34779?usp=email ) Change subject: Fix counting received IPA packets in server mode .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34779?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I75881d115b5c2c2567c4731bcf2cabe11f367117 Gerrit-Change-Number: 34779 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 17 Oct 2023 11:07:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[rel-1.8.1]: Fix counting received IPA packets in server mode
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34780?usp=email )
Change subject: Fix counting received IPA packets in server mode
..
Fix counting received IPA packets in server mode
When operating an IPA ASP in server mode, we were not counting the
packets using the related stat item:
For example:
OsmoSTP# show stats
Ungrouped counters:
SIGTRAN Application Server Process (6)('asp-dyn-5'):
Total number of packets received:0 (0/s 0/m 0/h 0/d)
Total number of packets transmitted: 235370503 (129/s 7682/m 442447/h
11342653/d)
This patch adds the missing counter increment.
back-port of Change-Id I75881d115b5c2c2567c4731bcf2cabe11f367117 from master
Closes: SYS#6600
Change-Id: I96488e4ea10e00f5f03387e33dc58e4b5016458f
---
M src/osmo_ss7_asp.c
1 file changed, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/80/34780/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 596e7ae..e1c197c 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -905,7 +905,7 @@
return -1;
}
msg->dst = asp;
-
+ rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34780?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: rel-1.8.1
Gerrit-Change-Id: I96488e4ea10e00f5f03387e33dc58e4b5016458f
Gerrit-Change-Number: 34780
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[master]: Fix counting received IPA packets in server mode
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34779?usp=email )
Change subject: Fix counting received IPA packets in server mode
..
Fix counting received IPA packets in server mode
When operating an IPA ASP in server mode, we were not counting the
packets using the related stat item:
For example:
OsmoSTP# show stats
Ungrouped counters:
SIGTRAN Application Server Process (6)('asp-dyn-5'):
Total number of packets received:0 (0/s 0/m 0/h 0/d)
Total number of packets transmitted: 235370503 (129/s 7682/m 442447/h
11342653/d)
This patch adds the missing counter increment.
Change-Id: I75881d115b5c2c2567c4731bcf2cabe11f367117
Closes: SYS#6600
---
M src/osmo_ss7_asp.c
1 file changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/79/34779/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 1ba0a43..0662085 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -753,7 +753,7 @@
return -1;
}
msg->dst = asp;
-
+ rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34779?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I75881d115b5c2c2567c4731bcf2cabe11f367117
Gerrit-Change-Number: 34779
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[M] Change in libosmo-gprs[master]: rlcmac: ul_tbf: Implement T3180
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34773?usp=email )
Change subject: rlcmac: ul_tbf: Implement T3180
..
rlcmac: ul_tbf: Implement T3180
Related: OS#6209
Change-Id: I350b277532d36ed7928b33ee3b77d98d083a3179
---
M include/osmocom/gprs/rlcmac/tbf_ul.h
M src/rlcmac/rlcmac.c
M src/rlcmac/tbf_ul.c
M tests/rlcmac/rlcmac_prim_test.c
M tests/rlcmac/rlcmac_prim_test.err
M tests/rlcmac/rlcmac_prim_test.ok
6 files changed, 165 insertions(+), 3 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmocom/gprs/rlcmac/tbf_ul.h
b/include/osmocom/gprs/rlcmac/tbf_ul.h
index 1abde9a..bb0231e 100644
--- a/include/osmocom/gprs/rlcmac/tbf_ul.h
+++ b/include/osmocom/gprs/rlcmac/tbf_ul.h
@@ -47,6 +47,8 @@
uint8_t cv;
struct gprs_rlcmac_llc_queue *llc_queue;
} countdown_proc;
+
+ struct osmo_timer_list t3180;
};
struct gprs_rlcmac_ul_tbf *gprs_rlcmac_ul_tbf_alloc(struct gprs_rlcmac_entity
*gre);
@@ -66,7 +68,7 @@
bool gprs_rlcmac_ul_tbf_dummy_rts(const struct gprs_rlcmac_ul_tbf *ul_tbf,
const struct gprs_rlcmac_rts_block_ind *bi);
struct msgb *gprs_rlcmac_ul_tbf_data_create(struct gprs_rlcmac_ul_tbf *ul_tbf,
const struct gprs_rlcmac_rts_block_ind *bi);
-struct msgb *gprs_rlcmac_ul_tbf_dummy_create(const struct gprs_rlcmac_ul_tbf
*ul_tbf);
+struct msgb *gprs_rlcmac_ul_tbf_dummy_create(struct gprs_rlcmac_ul_tbf
*ul_tbf);
int gprs_rlcmac_ul_tbf_handle_pkt_ul_ack_nack(struct gprs_rlcmac_ul_tbf
*ul_tbf,
const RlcMacDownlink_t *dl_block);
diff --git a/src/rlcmac/rlcmac.c b/src/rlcmac/rlcmac.c
index 2c809ec..ac168c2 100644
--- a/src/rlcmac/rlcmac.c
+++ b/src/rlcmac/rlcmac.c
@@ -48,6 +48,7 @@
{ .T=3166, .default_val=5, .unit = OSMO_TDEF_S,.desc="Wait for
Packet Uplink ACK/NACK after sending of first data block (s)" },
/* T3168: dynamically updated with what's received in BCCH SI13 */
{ .T=3168, .default_val=5000, .unit = OSMO_TDEF_MS, .desc="Wait for
PACKET UPLINK ASSIGNMENT (updated by BCCH SI13) (ms)" },
+ { .T=3180, .default_val=5, .unit = OSMO_TDEF_S,.desc="Wait for
Uplink State Flag After Data Block (s)" },
{ .T=3182, .default_val=5, .unit = OSMO_TDEF_S,.desc="Wait for
Acknowledgement (s)" },
{ .T=3190, .default_val=5, .unit = OSMO_TDEF_S,.desc="Wait for
Valid Downlink Data Received from the Network (s)" },
{ .T=3192, .default_val=0, .unit = OSMO_TDEF_MS, .desc="Wait for
release of the TBF after reception of the final block (ms)" },
diff --git a/src/rlcmac/tbf_ul.c b/src/rlcmac/tbf_ul.c
index d96891f..34268ee 100644
--- a/src/rlcmac/tbf_ul.c
+++ b/src/rlcmac/tbf_ul.c
@@ -29,6 +29,8 @@
#include
#include
+static void gprs_rlcmac_ul_tbf_t3180_timer_cb(void *data);
+
struct gprs_rlcmac_ul_tbf *gprs_rlcmac_ul_tbf_alloc(struct gprs_rlcmac_entity
*gre)
{
struct gprs_rlcmac_ul_tbf *ul_tbf;
@@ -57,6 +59,8 @@
ul_tbf->blkst = gprs_rlcmac_rlc_block_store_alloc(ul_tbf);
OSMO_ASSERT(ul_tbf->blkst);
+ osmo_timer_setup(_tbf->t3180, gprs_rlcmac_ul_tbf_t3180_timer_cb,
ul_tbf);
+
return ul_tbf;
err_state_fsm_destruct:
@@ -78,6 +82,8 @@
tbf = ul_tbf_as_tbf(ul_tbf);
gre = tbf->gre;
+ osmo_timer_del(_tbf->t3180);
+
if (ul_tbf->countdown_proc.llc_queue) {
gprs_rlcmac_llc_queue_merge_prepend(gre->llc_queue,
ul_tbf->countdown_proc.llc_queue);
@@ -102,6 +108,22 @@
gprs_rlcmac_entity_ul_tbf_freed(gre, ul_tbf);
}
+static void gprs_rlcmac_ul_tbf_t3180_timer_cb(void *data)
+{
+ struct gprs_rlcmac_ul_tbf *ul_tbf = data;
+
+ LOGPTBFUL(ul_tbf, LOGL_NOTICE, "Timeout of T3180\n");
+
+ gprs_rlcmac_ul_tbf_free(ul_tbf);
+}
+
+static void gprs_rlcmac_ul_tbf_t3180_start(struct gprs_rlcmac_ul_tbf *ul_tbf)
+{
+ unsigned long val_sec;
+ val_sec = osmo_tdef_get(g_rlcmac_ctx->T_defs, 3180, OSMO_TDEF_S, -1);
+ osmo_timer_schedule(_tbf->t3180, val_sec, 0);
+}
+
int gprs_rlcmac_ul_tbf_submit_configure_req(const struct gprs_rlcmac_ul_tbf
*ul_tbf,
const struct
gprs_rlcmac_ul_tbf_allocation *alloc,
bool starting_time_present,
uint32_t starting_time_fn)
@@ -344,7 +366,7 @@
return rc;
}
-struct msgb *gprs_rlcmac_ul_tbf_dummy_create(const struct gprs_rlcmac_ul_tbf
*ul_tbf)
+struct msgb *gprs_rlcmac_ul_tbf_dummy_create(struct gprs_rlcmac_ul_tbf *ul_tbf)
{
struct msgb *msg;
struct bitvec bv;
@@ -371,6 +393,7 @@
goto free_ret;
}
+
[M] Change in libosmo-gprs[master]: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34772?usp=email )
Change subject: rlcmac: tests: Account for T3180 existance in
test_ul_tbf_t3166_timeout
..
rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout
Test test_ul_tbf_t3166_timeout needs to be modified in order to avoid
triggering T3180 once it is implemented in a follow-up patch.
Both T3180 and T3166 are armed at the same time, so modify the scenario
to really scenify the case where T3166 matters: the MS keeps receiving USF
indications but the PCU doesn't see them and hence never sends a PKT UL
ACK/NACK.
Related: OS#6209
Change-Id: Ib84ccfd89773913703e0ab3e09d0ce9eb123e994
---
M tests/rlcmac/rlcmac_prim_test.c
M tests/rlcmac/rlcmac_prim_test.err
M tests/rlcmac/rlcmac_prim_test.ok
3 files changed, 99 insertions(+), 17 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/tests/rlcmac/rlcmac_prim_test.c b/tests/rlcmac/rlcmac_prim_test.c
index 93f59fc..5b27bd2 100644
--- a/tests/rlcmac/rlcmac_prim_test.c
+++ b/tests/rlcmac/rlcmac_prim_test.c
@@ -750,7 +750,7 @@
rlcmac_prim->grr.unitdata_req.radio_prio = 1;
rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim);
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < 4; i++) { /* 4 packet access procedure attempts */
OSMO_ASSERT(sizeof(ccch_imm_ass_pkt_ul_tbf_normal) ==
GSM_MACBLOCK_LEN);
ccch_imm_ass_pkt_ul_tbf_normal[7] = last_rach_req_ra; /* Update
RA to match */
rlcmac_prim =
osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(0,
ccch_imm_ass_pkt_ul_tbf_normal);
@@ -761,8 +761,16 @@
rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim);
OSMO_ASSERT(rc == 0);
- /* increase time 5 seconds, timeout should trigger */
- clock_override_add(5, 0);
+ /* In 5 seconds, T3166 will trigger. T3180 has also been armed
+ * at 5s, so scenify PCU USF-polling the MS to avoid trigger
T3180
+ * instead of T3166. First increase 2 of the 5 seconds: */
+ clock_override_add(2, 0);
+ rlcmac_prim =
osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_rts_ind(ts_nr, rts_fn, usf);
+ rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim);
+ OSMO_ASSERT(rc == 0);
+
+ /* Increase time (remaining 3 out of 5 seconds), T3166 timeout
should trigger */
+ clock_override_add(3, 0);
clock_debug("Expect T3166 timeout");
osmo_select_main(0);
}
diff --git a/tests/rlcmac/rlcmac_prim_test.err
b/tests/rlcmac/rlcmac_prim_test.err
index 9435c04..5027ca8 100644
--- a/tests/rlcmac/rlcmac_prim_test.err
+++ b/tests/rlcmac/rlcmac_prim_test.err
@@ -219,9 +219,25 @@
DLGLOBAL INFO UL_TBF{FLOW}: First UL block sent (1 phase access), start T3166
DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) N3104 inc (1)
DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request
-DLGLOBAL INFO UL_TBF{FLOW}: Timeout of T3166
-DLGLOBAL INFO UL_TBF{FLOW}: T3166 timeout attempts=1
-DLGLOBAL INFO UL_TBF{FLOW}: state_chg to NEW
+DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication
+DLGLOBAL DEBUG Rx RTS.ind (fn=4, ts=7, usf=0)
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) Sending new block at BSN 1, CS=CS-2
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) Entering Countdown procedure CV=0
+DLGLOBAL DEBUG -- Chunk with length 7 is less than remaining space (26): add
length header to delimit LLC frame
+DLGLOBAL DEBUG -- Final block, so we done.
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) Complete UL frame, len=0
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) data block (BSN=1, CS-2, CV=0): 1d
00 00 23 42 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
2b 2b 2b
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) need_padding 0 spb_status 0 spb 0
(BSN1 1 BSN2 -1)
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) Copying 1 RLC blocks, 1 BSNs
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) Copying data unit 0 (BSN=1 CV=0)
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) msg block (BSN 1, CS-2): 00 01 02 1d
00 00 23 42 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
2b 2b 2b 00
+DLGLOBAL INFO UL_TBF{FLOW}: Received Event LAST_UL_DATA_SENT
+DLGLOBAL INFO UL_TBF{FLOW}: state_chg to FINISHED
+DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) N3104 inc (2)
+DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request
+DLGLOBAL INFO UL_TBF{FINISHED}: Timeout of T3166
+DLGLOBAL INFO UL_TBF{FINISHED}: T3166 timeout attempts=1
+DLGLOBAL INFO UL_TBF{FINISHED}: state_chg to NEW
DLGLOBAL INFO UL_TBF{NEW}: Send L1CTL-CFG_UL_TBF.req ul_tbf_nr=0 (release)
DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request
DLGLOBAL INFO Tx L1CTL-PDCH_REL.req
@@ -255,9 +271,20 @@
DLGLOBAL INFO UL_TBF{FLOW}: First UL block sent (1 phase access), start T3166
[M] Change in libosmo-gprs[master]: rlcmac: ul_tbf: Implement T3180
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34773?usp=email ) Change subject: rlcmac: ul_tbf: Implement T3180 .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34773?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I350b277532d36ed7928b33ee3b77d98d083a3179 Gerrit-Change-Number: 34773 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 10:38:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-gprs[master]: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34772?usp=email ) Change subject: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout .. Patch Set 3: Code-Review+2 (2 comments) File tests/rlcmac/rlcmac_prim_test.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/34772/comment/f16661ea_ef95780b PS2, Line 766: Fir > First? Done https://gerrit.osmocom.org/c/libosmo-gprs/+/34772/comment/d3e8c040_3846b483 PS2, Line 772: Remaining > by remaining (lowercase R)? Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ib84ccfd89773913703e0ab3e09d0ce9eb123e994 Gerrit-Change-Number: 34772 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 10:11:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[M] Change in libosmo-gprs[master]: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout
Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34772?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout .. rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout Test test_ul_tbf_t3166_timeout needs to be modified in order to avoid triggering T3180 once it is implemented in a follow-up patch. Both T3180 and T3166 are armed at the same time, so modify the scenario to really scenify the case where T3166 matters: the MS keeps receiving USF indications but the PCU doesn't see them and hence never sends a PKT UL ACK/NACK. Related: OS#6209 Change-Id: Ib84ccfd89773913703e0ab3e09d0ce9eb123e994 --- M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 3 files changed, 99 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/72/34772/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ib84ccfd89773913703e0ab3e09d0ce9eb123e994 Gerrit-Change-Number: 34772 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in libosmo-gprs[master]: rlcmac: ul_tbf: Implement T3180
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34773?usp=email ) Change subject: rlcmac: ul_tbf: Implement T3180 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34773?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I350b277532d36ed7928b33ee3b77d98d083a3179 Gerrit-Change-Number: 34773 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Oct 2023 10:10:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-gprs[master]: rlcmac: Avoid re-arming T3182 in TBF Acknowledged mode
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34770?usp=email )
Change subject: rlcmac: Avoid re-arming T3182 in TBF Acknowledged mode
..
rlcmac: Avoid re-arming T3182 in TBF Acknowledged mode
Re-arming upon retransmission of block CV=0 is only described in the
unacknowledged mode of operation.
Change-Id: I532def7f87367b446b5370daf8c81f511e26eb5f
---
M src/rlcmac/tbf_ul_fsm.c
M tests/rlcmac/rlcmac_prim_test.err
2 files changed, 26 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/rlcmac/tbf_ul_fsm.c b/src/rlcmac/tbf_ul_fsm.c
index e5a2f9a..43cb02f 100644
--- a/src/rlcmac/tbf_ul_fsm.c
+++ b/src/rlcmac/tbf_ul_fsm.c
@@ -88,9 +88,13 @@
gprs_rlcmac_ul_tbf_free(ctx->ul_tbf);
}
-/* 9.3.3.3.2: Upon each retransmission of the last block with CV=0, the mobile
station shall restart timer T3182 for the TBF.
-* Slight impl deviation from spec: If tbf is still in contention resolution,
keep using T3166, otherwise start T3182
-*/
+/* 9.3.2.4.2 (acknowledged mode): When the mobile station has sent the RLC data
+ * block with CV = 0 and there are no elements in the V(B) array set to the
value
+ * Nacked, it shall start timer T3182 for this TBF.
+ * 9.3.3.3.2 (unacknowledged mode): Upon each retransmission of the last block
+ * with CV=0, the mobile station shall restart timer T3182 for the TBF.
+ * Slight impl deviation from spec: If tbf is still in contention resolution,
keep using T3166, otherwise start T3182
+ */
static void arm_T3182_if_needed(struct gprs_rlcmac_tbf_ul_fsm_ctx *ctx)
{
struct osmo_fsm_inst *fi = ctx->fi;
@@ -102,10 +106,13 @@
} else {
OSMO_ASSERT(!osmo_timer_pending(>timer) ||
(osmo_timer_pending(>timer) && fi->T == 3182));
- LOGPFSML(ctx->fi, LOGL_INFO, "Last UL block sent (CV=0), start
T3182\n");
- fi->T = 3182;
- val_sec = osmo_tdef_get(g_rlcmac_ctx->T_defs, fi->T,
OSMO_TDEF_S, -1);
- osmo_timer_schedule(>timer, val_sec, 0);
+ /* TODO: once unacked mode is supported: ||
unacked_mode(ctx->ul_tbf) */
+ if (!osmo_timer_pending(>timer)) {
+ LOGPFSML(ctx->fi, LOGL_INFO, "Last UL block sent
(CV=0), start T3182\n");
+ fi->T = 3182;
+ val_sec = osmo_tdef_get(g_rlcmac_ctx->T_defs, fi->T,
OSMO_TDEF_S, -1);
+ osmo_timer_schedule(>timer, val_sec, 0);
+ }
}
}
diff --git a/tests/rlcmac/rlcmac_prim_test.err
b/tests/rlcmac/rlcmac_prim_test.err
index 19b289f..9435c04 100644
--- a/tests/rlcmac/rlcmac_prim_test.err
+++ b/tests/rlcmac/rlcmac_prim_test.err
@@ -599,7 +599,6 @@
DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) msg block (BSN 1, CS-2): 00 00 02 1d
11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
2b 2b 2b 00
DLGLOBAL INFO UL_TBF{FINISHED}: Received Event LAST_UL_DATA_SENT
DLGLOBAL INFO UL_TBF{FINISHED}: Data block with CV=0 retransmit attempts=1
-DLGLOBAL INFO UL_TBF{FINISHED}: Last UL block sent (CV=0), start T3182
DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request
DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication
DLGLOBAL DEBUG Rx RTS.ind (fn=17, ts=7, usf=0)
@@ -611,7 +610,6 @@
DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) msg block (BSN 1, CS-2): 00 00 02 1d
11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
2b 2b 2b 00
DLGLOBAL INFO UL_TBF{FINISHED}: Received Event LAST_UL_DATA_SENT
DLGLOBAL INFO UL_TBF{FINISHED}: Data block with CV=0 retransmit attempts=2
-DLGLOBAL INFO UL_TBF{FINISHED}: Last UL block sent (CV=0), start T3182
DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request
DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication
DLGLOBAL DEBUG Rx RTS.ind (fn=21, ts=7, usf=0)
@@ -623,7 +621,6 @@
DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) msg block (BSN 1, CS-2): 00 00 02 1d
11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
2b 2b 2b 00
DLGLOBAL INFO UL_TBF{FINISHED}: Received Event LAST_UL_DATA_SENT
DLGLOBAL INFO UL_TBF{FINISHED}: Data block with CV=0 retransmit attempts=3
-DLGLOBAL INFO UL_TBF{FINISHED}: Last UL block sent (CV=0), start T3182
DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request
DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication
DLGLOBAL DEBUG Rx RTS.ind (fn=26, ts=7, usf=0)
@@ -635,7 +632,6 @@
DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-2342) msg block (BSN 1, CS-2): 00 00 02 1d
11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
2b 2b 2b 00
DLGLOBAL INFO UL_TBF{FINISHED}: Received Event LAST_UL_DATA_SENT
DLGLOBAL INFO UL_TBF{FINISHED}:
