July 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: ASCI: Add selection reason for VGCS/VBS channels
by jolly 06 Jul '23

06 Jul '23

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/33600 to look at the new patch set (#2). Change subject: ASCI: Add selection reason for VGCS/VBS channels ...................................................................... ASCI: Add selection reason for VGCS/VBS channels "enum lchan_select_reason" gets a new selection reason: "SELECT_FOR_VGCS" The selection "direction" can also be changed via VTY. Change-Id: I6b96d0a1df68efa5858b98297ebe0944b1473aaf Related: OS#4852 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan_select.h M src/osmo-bsc/bts_vty.c M src/osmo-bsc/lchan_select.c M tests/osmo-bsc.vty 5 files changed, 33 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/33600/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6b96d0a1df68efa5858b98297ebe0944b1473aaf Gerrit-Change-Number: 33600 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bsc[master]: Fix typo in rate counters ASSIGMENT->ASSIGNMENT
by jolly 06 Jul '23

06 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33619 ) Change subject: Fix typo in rate counters ASSIGMENT->ASSIGNMENT ...................................................................... Fix typo in rate counters ASSIGMENT->ASSIGNMENT Change-Id: I73079948afbdde35594660959b5335118a810d7b --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_msc.c 4 files changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/33619/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 8454cca..ae29725 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -95,8 +95,8 @@ MSC_CTR_BSSMAP_TX_UDT_RESET_ACK, MSC_CTR_BSSMAP_TX_DT1_CLEAR_RQST, MSC_CTR_BSSMAP_TX_DT1_CLEAR_COMPLETE, - MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE, - MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_COMPLETE, + MSC_CTR_BSSMAP_TX_DT1_ASSIGNMENT_FAILURE, + MSC_CTR_BSSMAP_TX_DT1_ASSIGNMENT_COMPLETE, MSC_CTR_BSSMAP_TX_DT1_SAPI_N_REJECT, MSC_CTR_BSSMAP_TX_DT1_CIPHER_COMPLETE, MSC_CTR_BSSMAP_TX_DT1_CIPHER_REJECT, diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 02ca29c..19699a1 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -152,7 +152,8 @@ if (!resp) { LOG_ASSIGNMENT(conn, LOGL_ERROR, "Unable to compose BSSMAP Assignment Failure message\n"); } else { - rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE)); + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, + MSC_CTR_BSSMAP_TX_DT1_ASSIGNMENT_FAILURE)); gscon_sigtran_send(conn, resp); } } @@ -247,7 +248,7 @@ conn->assignment.req.use_osmux) _gsm0808_ass_compl_extend_osmux(resp, osmux_cid); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_COMPLETE)); + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_ASSIGNMENT_COMPLETE)); rc = gscon_sigtran_send(conn, resp); if (rc) { assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index d504ce6..bef3354 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1149,7 +1149,7 @@ resp = gsm0808_create_assignment_failure(cause, NULL); OSMO_ASSERT(resp); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE)); + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_ASSIGNMENT_FAILURE)); osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); return -1; } diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 2aeb5ca..31bec90 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -128,8 +128,8 @@ [MSC_CTR_BSSMAP_TX_UDT_RESET_ACK] = {"bssmap:tx:udt:reset:ack", "Number of transmitted BSSMAP UDT RESET ACK messages"}, [MSC_CTR_BSSMAP_TX_DT1_CLEAR_RQST] = {"bssmap:tx:dt1:clear:rqst", "Number of transmitted BSSMAP DT1 CLEAR RQSTtx messages"}, [MSC_CTR_BSSMAP_TX_DT1_CLEAR_COMPLETE] = {"bssmap:tx:dt1:clear:complete", "Number of transmitted BSSMAP DT1 CLEAR COMPLETE messages"}, - [MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE] = {"bssmap:tx:dt1:assigment:failure", "Number of transmitted BSSMAP DT1 ASSIGMENT FAILURE messages"}, - [MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_COMPLETE] = {"bssmap:tx:dt1:assigment:complete", "Number of transmitted BSSMAP DT1 ASSIGMENT COMPLETE messages"}, + [MSC_CTR_BSSMAP_TX_DT1_ASSIGNMENT_FAILURE] = {"bssmap:tx:dt1:assignment:failure", "Number of transmitted BSSMAP DT1 ASSIGNMENT FAILURE messages"}, + [MSC_CTR_BSSMAP_TX_DT1_ASSIGNMENT_COMPLETE] = {"bssmap:tx:dt1:assignment:complete", "Number of transmitted BSSMAP DT1 ASSIGNMENT COMPLETE messages"}, [MSC_CTR_BSSMAP_TX_DT1_SAPI_N_REJECT] = {"bssmap:tx:dt1:sapi_n:reject", "Number of transmitted BSSMAP DT1 SAPI N REJECT messages"}, [MSC_CTR_BSSMAP_TX_DT1_CIPHER_COMPLETE] = {"bssmap:tx:dt1:cipher_mode:complete", "Number of transmitted BSSMAP DT1 CIPHER COMPLETE messages"}, [MSC_CTR_BSSMAP_TX_DT1_CIPHER_REJECT] = {"bssmap:tx:dt1:cipher_mode:reject", "Number of transmitted BSSMAP DT1 CIPHER REJECT messages"}, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73079948afbdde35594660959b5335118a810d7b Gerrit-Change-Number: 33619 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[L] Change in docker-playground[master]: MME_Tests: add docker tests for MME
by dexter 06 Jul '23

06 Jul '23

Attention is currently required from: osmith, laforge, fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33571 ) Change subject: MME_Tests: add docker tests for MME ...................................................................... Patch Set 2: (4 comments) File debian-bullseye-titan/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/33571/comment/ffd8ba65_3a6… PS1, Line 34: libgnutls28-dev > Could you also clarify why this new dependency is needed (in the commit message)? I am guessing the […] Done https://gerrit.osmocom.org/c/docker-playground/+/33571/comment/6e51d518_665… PS1, Line 34: libgnutls28-dev \ > move after inetutils-ping, so the list is still ordered alphabetically Done File ttcn3-mme-test-ogs/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/33571/comment/91862cfc_98c… PS1, Line 5: KERNEL_TEST="${KERNEL_TEST:-0}" > unused Done https://gerrit.osmocom.org/c/docker-playground/+/33571/comment/202a32d9_803… PS1, Line 27: --cap-add=NET_ADMIN \ : --device /dev/net/tun:/dev/net/tun \ : --sysctl net.ipv6.conf.all.disable_ipv6=0 \ > The feature is enabled simply to make sure it is used and spot regressions/changes in the feature fo […] The tun device is definitely not needed. I also dropped the so_bindtodevice. There are no changes in the behavior. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1ce1dace47353b0dcf321c923a78567e3ddefb9 Gerrit-Change-Number: 33571 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Jul 2023 14:22:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in docker-playground[master]: MME_Tests: add docker tests for MME
by dexter 06 Jul '23

06 Jul '23

Attention is currently required from: osmith, laforge, fixeria, pespin. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/33571 to look at the new patch set (#2). Change subject: MME_Tests: add docker tests for MME ...................................................................... MME_Tests: add docker tests for MME an MME testsuite exists in osmo-ttcn3-hacks but it is not executed in docker yet. Related: OS#5760 Change-Id: Ic1ce1dace47353b0dcf321c923a78567e3ddefb9 --- A ttcn3-mme-test-ogs/Dockerfile A ttcn3-mme-test-ogs/Makefile A ttcn3-mme-test-ogs/jenkins.sh A ttcn3-mme-test-ogs/ogs/MME_Tests.cfg A ttcn3-mme-test-ogs/ogs/freediameter.conf A ttcn3-mme-test-ogs/ogs/mme.sh A ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml 7 files changed, 920 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/71/33571/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1ce1dace47353b0dcf321c923a78567e3ddefb9 Gerrit-Change-Number: 33571 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bsc[master]: ASCI: Add decoding of VGCS/VBS A-interface messages
by Jenkins Builder 06 Jul '23

06 Jul '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33612 ) Change subject: ASCI: Add decoding of VGCS/VBS A-interface messages ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/osmo_bsc_bssap.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9029): https://gerrit.osmocom.org/c/osmo-bsc/+/33612/comment/d4acd85c_90c10904 PS1, Line 1384: struct msgb *msg, unsigned int length) code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I77b4d072d76039b1889ae4bba4a602e956405eb8 Gerrit-Change-Number: 33612 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 06 Jul 2023 13:28:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[XL] Change in osmo-bsc[master]: ASCI: Add FSM for VGCS/VBS
by Jenkins Builder 06 Jul '23

06 Jul '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33611 ) Change subject: ASCI: Add FSM for VGCS/VBS ...................................................................... Patch Set 1: (4 comments) File include/osmocom/bsc/vgcs_fsm.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9028): https://gerrit.osmocom.org/c/osmo-bsc/+/33611/comment/77f7a922_1ba06aaf PS1, Line 59: /* Channel link failed. (Talker faild.) */ 'faild' may be misspelled - perhaps 'failed'? File src/osmo-bsc/vgcs_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9028): https://gerrit.osmocom.org/c/osmo-bsc/+/33611/comment/f09fcbc5_4536984f PS1, Line 373: LOG_CALL(conn, LOGL_DEBUG, "Calling subscriber assiged and now on uplink.\n"); 'assiged' may be misspelled - perhaps 'assigned'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9028): https://gerrit.osmocom.org/c/osmo-bsc/+/33611/comment/acad8bf7_09ebeb63 PS1, Line 668: no_aoip: labels should not be indented Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9028): https://gerrit.osmocom.org/c/osmo-bsc/+/33611/comment/c29dfe5a_ead854dc PS1, Line 1155: strcpy(conn->vgcs_chan.msc_rtp_addr, req.msc_rtp_addr); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9e94fb4f27bb438b7093c031344a3400bfa34f1 Gerrit-Change-Number: 33611 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 06 Jul 2023 13:28:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ASCI: Forward lchan activation states to VGCS FSM
by Jenkins Builder 06 Jul '23

06 Jul '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33614 ) Change subject: ASCI: Forward lchan activation states to VGCS FSM ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/lchan_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9025): https://gerrit.osmocom.org/c/osmo-bsc/+/33614/comment/b6a89605_3b863540 PS1, Line 464: info->for_conn->vgcs_chan.new_lchan? spaces required around that '?' (ctx:VxE) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I757b562e02480c1a68446d91217910069f17d060 Gerrit-Change-Number: 33614 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 06 Jul 2023 13:28:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: Cleanup code style of rate counters in osmo_bsc_msc.c
by Jenkins Builder 06 Jul '23

06 Jul '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33597 ) Change subject: Cleanup code style of rate counters in osmo_bsc_msc.c ...................................................................... Patch Set 1: (4 comments) File src/osmo-bsc/osmo_bsc_msc.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9021): https://gerrit.osmocom.org/c/osmo-bsc/+/33597/comment/bdb59030_6ef8ab0a PS1, Line 219: "bssmap:tx:dt1:assigment:failure", 'assigment' may be misspelled - perhaps 'assignment'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9021): https://gerrit.osmocom.org/c/osmo-bsc/+/33597/comment/f864c3f2_569ac8a5 PS1, Line 220: "Number of transmitted BSSMAP DT1 ASSIGMENT FAILURE messages" 'ASSIGMENT' may be misspelled - perhaps 'ASSIGNMENT'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9021): https://gerrit.osmocom.org/c/osmo-bsc/+/33597/comment/2838b484_b953cc68 PS1, Line 223: "bssmap:tx:dt1:assigment:complete", 'assigment' may be misspelled - perhaps 'assignment'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9021): https://gerrit.osmocom.org/c/osmo-bsc/+/33597/comment/adb75741_4d2a3a19 PS1, Line 224: "Number of transmitted BSSMAP DT1 ASSIGMENT COMPLETE messages" 'ASSIGMENT' may be misspelled - perhaps 'ASSIGNMENT'? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7cfd4f20ebfee0c8df9305372977d6628d6337c5 Gerrit-Change-Number: 33597 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 06 Jul 2023 13:23:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ASCI: Add encoding of VGCS/VBS A-interface messages
by jolly 06 Jul '23

06 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33610 ) Change subject: ASCI: Add encoding of VGCS/VBS A-interface messages ...................................................................... ASCI: Add encoding of VGCS/VBS A-interface messages Change-Id: Ic2203a5119a226ac859a91dc42d81cbd71027ec8 Related: OS#4852 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 190 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/33610/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index c81ff0d..8b4eff3 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -49,6 +49,7 @@ #include <osmocom/core/sockaddr_str.h> #include <osmocom/bsc/lcs_loc_req.h> #include <osmocom/bsc/bssmap_reset.h> +#include <osmocom/bsc/assignment_fsm.h> #define IP_V4_ADDR_LEN 4 @@ -1743,3 +1744,182 @@ LOG_HO(conn, LOGL_ERROR, "Cannot send BSSMAP Handover Failure message (rc=%d %s)\n", rc, strerror(-rc)); } + +/* Send SETUP ACKNOWLEDGE to MSC. */ +void tx_setup_ack(struct gsm_subscriber_connection *conn, struct gsm0808_vgcs_feature_flags *ff) +{ + struct msgb *resp; + struct gsm0808_vgcs_vbs_setup_ack sa = { + }; + + if (ff) { + sa.vgcs_feature_flags_present = true; + sa.flags = *ff; + } + resp = gsm0808_create_vgcs_vbs_setup_ack(&sa); + OSMO_ASSERT(resp); + + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_SETUP_ACK)); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); +} + +/* Send SETUP REFUSE to MSC. */ +void tx_setup_refuse(struct gsm_subscriber_connection *conn, uint8_t cause) +{ + struct msgb *resp; + resp = gsm0808_create_vgcs_vbs_setup_refuse(cause); + + OSMO_ASSERT(resp); + + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_SETUP_REFUSE)); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); +} + +/* Send ASSIGNMENT FAILURE to MSC. */ +void tx_vgcs_vbs_assignment_fail(struct gsm_subscriber_connection *conn, uint8_t cause) +{ + struct msgb *resp; + struct gsm0808_vgcs_vbs_assign_fail af = { + .cause = cause, + }; + + resp = gsm0808_create_vgcs_vbs_assign_fail(&af); + OSMO_ASSERT(resp); + + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_ASSIGN_FAIL)); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); +} + +/* Send ASSIGNMENT RESULT to MSC. */ +void tx_vgcs_vbs_assignment_result(struct gsm_subscriber_connection *conn, struct gsm0808_channel_type *ct, + struct gsm0808_cell_id *ci, uint32_t call_id) +{ + struct gsm_lchan *lchan = conn->lchan; + struct msgb *resp; + struct gsm0808_vgcs_vbs_assign_res ar = { + .channel_type = *ct, + .cell_identifier = *ci, + }; + int perm_spch; + uint8_t osmux_cid; + + /* Chosen Channel */ + ar.chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->current_ch_mode_rate.chan_mode); + if (!ar.chosen_channel) { + LOGP(DMSC, LOGL_ERROR, "Unable to compose Chosen Channel for mode=%s type=%s", + get_value_string(gsm48_chan_mode_names, lchan->current_ch_mode_rate.chan_mode), + gsm_chan_t_name(lchan->type)); + tx_vgcs_vbs_assignment_fail(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); + return; + } + ar.chosen_channel_present = true; + + /* Generate RTP related fields. */ + if (gscon_is_aoip(conn)) { + /* AoIP Transport Layer Address (BSS) */ + if (!osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(conn->user_plane.mgw_endpoint_ci_msc, + &ar.aoip_transport_layer)) { + LOGP(DMSC, LOGL_ERROR, "Unable to compose RTP address of MGW -> MSC"); + tx_vgcs_vbs_assignment_fail(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); + return; + } + ar.aoip_transport_layer_present = true; + + /* Call Identifier */ + ar.call_id = call_id; + ar.call_id_present = true; + + /* Osmux */ + if (conn->assignment.req.use_osmux) { + if (!osmo_mgcpc_ep_ci_get_crcx_info_to_osmux_cid(conn->user_plane.mgw_endpoint_ci_msc, + &osmux_cid)) { + LOGP(DMSC, LOGL_ERROR, "Unable to compose Osmux CID of MGW -> MSC"); + tx_vgcs_vbs_assignment_fail(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); + return; + } + } + + /* Extrapolate speech codec from speech mode */ + perm_spch = gsm0808_permitted_speech(lchan->type, lchan->current_ch_mode_rate.chan_mode); + gsm0808_speech_codec_from_chan_type(&ar.codec_msc_chosen, perm_spch); + ar.codec_msc_chosen.cfg = conn->lchan->current_ch_mode_rate.s15_s0; + ar.codec_present = true; + } + + resp = gsm0808_create_vgcs_vbs_assign_res(&ar); + OSMO_ASSERT(resp); + if (conn->assignment.req.use_osmux) + gsm0808_extend_osmux(resp, osmux_cid); + + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_ASSIGN_RESULT)); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); +} + +/* Send UPLINK REQUEST to MSC. */ +void tx_uplink_req(struct gsm_subscriber_connection *conn) +{ + struct msgb *resp; + struct gsm0808_uplink_request ar = { + }; + + resp = gsm0808_create_uplink_request(&ar); + OSMO_ASSERT(resp); + + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_UPLINK_RQST)); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); +} + +/* Send UPLINK REQUEST CONFIRMATION to MSC. */ +void tx_uplink_req_conf(struct gsm_subscriber_connection *conn, struct gsm0808_cell_id *ci, uint8_t *l3_info, + uint8_t length) +{ + struct msgb *resp; + struct gsm0808_uplink_request_cnf ar = { + .cell_identifier = *ci, + }; + + OSMO_ASSERT(length <= LAYER_3_INFORMATION_MAXLEN); + if (length) { + memcpy(ar.l3.l3, l3_info, length); + ar.l3.l3_len = length; + } + resp = gsm0808_create_uplink_request_cnf(&ar); + OSMO_ASSERT(resp); + + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_UPLINK_RQST_CONFIRMATION)); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); +} + +/* Send UPLINK APPLICATION DATA to MSC. */ +void tx_uplink_app_data(struct gsm_subscriber_connection *conn, struct gsm0808_cell_id *ci, uint8_t *l3_info, + uint8_t length) +{ + struct msgb *resp; + struct gsm0808_uplink_app_data ad = { + .cell_identifier = *ci, + }; + + OSMO_ASSERT(length <= LAYER_3_INFORMATION_MAXLEN); + memcpy(ad.l3.l3, l3_info, length); + ad.l3.l3_len = length; + resp = gsm0808_create_uplink_app_data(&ad); + OSMO_ASSERT(resp); + + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_UPLINK_APP_DATA)); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); +} + +/* Send UPLINK RELEASE INDICATION to MSC. */ +void tx_uplink_release_ind(struct gsm_subscriber_connection *conn, uint8_t cause) +{ + struct msgb *resp; + struct gsm0808_uplink_release_ind ar = { + .cause = cause, + }; + + resp = gsm0808_create_uplink_release_ind(&ar); + OSMO_ASSERT(resp); + + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_UPLINK_RELEASE_INDICATION)); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic2203a5119a226ac859a91dc42d81cbd71027ec8 Gerrit-Change-Number: 33610 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: ASCI: Add decoding of VGCS/VBS A-interface messages
by jolly 06 Jul '23

06 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33612 ) Change subject: ASCI: Add decoding of VGCS/VBS A-interface messages ...................................................................... ASCI: Add decoding of VGCS/VBS A-interface messages Change-Id: I77b4d072d76039b1889ae4bba4a602e956405eb8 Related: OS#4852 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 125 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/33612/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 7e82534..c415ede 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1300,6 +1300,101 @@ return 0; } +/* Handle (VGCS) UPLINK REQUEST ACKNOWLEDGE: + * + * See 3GPP TS 48.008 §3.2.1.58 + */ +static int bssmap_handle_uplink_rqst_acknowledge(struct gsm_subscriber_connection *conn, + struct msgb *msg, unsigned int length) +{ + struct tlv_parsed tp; + + if (osmo_bssap_tlv_parse(&tp, msg->l4h + 1, length - 1) < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "%s(): tlv_parse() failed\n", __func__); + return -1; + } + + if (conn->vgcs_call.fi) + osmo_fsm_inst_dispatch(conn->vgcs_call.fi, VGCS_EV_MSC_ACK, NULL); + return 0; +} + +/* Handle (VGCS) UPLINK REJECT COMMAND message. + * + * See 3GPP TS 48.008 §3.2.1.61 + */ +static int bssmap_handle_uplink_reject_cmd(struct gsm_subscriber_connection *conn, + struct msgb *msg, unsigned int length) +{ + struct tlv_parsed tp; + + if (osmo_bssap_tlv_parse(&tp, msg->l4h + 1, length - 1) < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "%s(): tlv_parse() failed\n", __func__); + return -1; + } + + if (conn->vgcs_call.fi) + osmo_fsm_inst_dispatch(conn->vgcs_call.fi, VGCS_EV_MSC_REJECT, NULL); + return 0; +} + +/* Handle (VGCS) UPLINK RELEASE COMMAND message, MSC indicating an error to us: + * + * See 3GPP TS 48.008 §3.2.1.62 + */ +static int bssmap_handle_uplink_release_cmd(struct gsm_subscriber_connection *conn, + struct msgb *msg, unsigned int length) +{ + struct tlv_parsed tp; + + if (osmo_bssap_tlv_parse(&tp, msg->l4h + 1, length - 1) < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "%s(): tlv_parse() failed\n", __func__); + return -1; + } + + if (conn->vgcs_call.fi) + osmo_fsm_inst_dispatch(conn->vgcs_call.fi, VGCS_EV_MSC_RELEASE, NULL); + return 0; +} + +/* Handle (VGCS) UPLINK SEIZED COMMAND message: + * + * See 3GPP TS 48.008 §3.2.1.63 + */ +static int bssmap_handle_uplink_seized_cmd(struct gsm_subscriber_connection *conn, + struct msgb *msg, unsigned int length) +{ + struct tlv_parsed tp; + + if (osmo_bssap_tlv_parse(&tp, msg->l4h + 1, length - 1) < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "%s(): tlv_parse() failed\n", __func__); + return -1; + } + + if (conn->vgcs_call.fi) + osmo_fsm_inst_dispatch(conn->vgcs_call.fi, VGCS_EV_MSC_SEIZE, NULL); + return 0; +} + +/* Handle VGCS/VBS ADDITIONAL INFO message: + * + * See 3GPP TS 48.008 §3.2.1.78 + */ +static int bssmap_handle_vgcs_addl_info(struct gsm_subscriber_connection *conn, + struct msgb *msg, unsigned int length) +{ + struct tlv_parsed tp; + + if (osmo_bssap_tlv_parse(&tp, msg->l4h + 1, length - 1) < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "%s(): tlv_parse() failed\n", __func__); + return -1; + } + + LOGPFSML(conn->fi, LOGL_ERROR, "VGCS ADDITIONAL INFO is not supported.\n"); + + return 0; +} + static int bssmap_rcvmsg_udt(struct bsc_msc_data *msc, struct msgb *msg, unsigned int length) { @@ -1403,6 +1498,26 @@ ret = 0; } break; + case BSS_MAP_MSG_UPLINK_RQST_ACKNOWLEDGE: + rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_UPLINK_RQST_ACKNOWLEDGE]); + ret = bssmap_handle_uplink_rqst_acknowledge(conn, msg, length); + break; + case BSS_MAP_MSG_UPLINK_REJECT_CMD: + rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_UPLINK_REJECT_CMD]); + ret = bssmap_handle_uplink_reject_cmd(conn, msg, length); + break; + case BSS_MAP_MSG_UPLINK_RELEASE_CMD: + rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_UPLINK_RELEASE_CMD]); + ret = bssmap_handle_uplink_release_cmd(conn, msg, length); + break; + case BSS_MAP_MSG_UPLINK_SEIZED_CMD: + rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_UPLINK_SEIZED_CMD]); + ret = bssmap_handle_uplink_seized_cmd(conn, msg, length); + break; + case BSS_MAP_MSG_VGCS_ADDL_INFO: + rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_VGCS_ADDL_INFO]); + ret = bssmap_handle_vgcs_addl_info(conn, msg, length); + break; default: rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_UNKNOWN]); LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I77b4d072d76039b1889ae4bba4a602e956405eb8 Gerrit-Change-Number: 33612 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0