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

[S] Change in osmocom-bb[master]: mobile: gsm_settings_init(): set TCH frame format explicitly

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34914?usp=email ) Change subject: mobile: gsm_settings_init(): set TCH frame format explicitly ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34914?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: I4660b07977b6701ad5dc4bf25f12cba374101f8b Gerrit-Change-Number: 34914 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:47:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34913?usp=email ) Change subject: mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I'm not really sure if this is an improvement. Do we ever communicate CSD data in a non-RTP (and hence non-rate-adapted) fashion? At least with RTP people knew what it was about, IMHO. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34913?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: I780d0a9fc20244ffa34307fb3d00f3848b6dcc76 Gerrit-Change-Number: 34913 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:47:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: clarify TCH I/O {handler,format} naming

by laforge

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34912?usp=email ) Change subject: mobile: clarify TCH I/O {handler,format} naming ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34912?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: If6c799d11e225ad00ca5da5ae63dca20568a0ce0 Gerrit-Change-Number: 34912 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:45:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: rename 'audio' node to 'tch' node

by laforge

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34911?usp=email ) Change subject: mobile: rename 'audio' node to 'tch' node ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34911?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: I2cab597c5de92ecb343cad7aaaa48035ca5f8365 Gerrit-Change-Number: 34911 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:44:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls

by laforge

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34762?usp=email ) Change subject: mobile: add support for Circuit Switched Data calls ...................................................................... Patch Set 6: Code-Review+1 (2 comments) File src/host/layer23/include/osmocom/bb/common/settings.h: https://gerrit.osmocom.org/c/osmocom-bb/+/34762/comment/1d57b3ed_b978df98 PS6, Line 101: enum data_call_ce { what is 'ce' mean in this context? I'd appreciate at least a comment above the enum to explain that. thanks! (I later read below in the VTY that it's the "connection element", but still a comment here would be nice). File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34762/comment/bca320bc_1a0cd125 PS6, Line 379: LOGP(DRR, LOGL_ERROR, at first sigt it looks like trhose lines don't need to be wrapped within 120chars? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?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: I1995fa0a7a68d9b980852b664d472d4633777ac6 Gerrit-Change-Number: 34762 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:44:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from <mncc.h> to <mncc_ms.h>

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email ) Change subject: mobile: move 'struct gsm_call' from <mncc.h> to <mncc_ms.h> ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34910?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: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49 Gerrit-Change-Number: 34910 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:41:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: cosmetic: use '#pragma once' in mncc.h

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34909?usp=email ) Change subject: mobile: cosmetic: use '#pragma once' in mncc.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34909?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: I2f350c5b67e57097b71b12ba42c90ce0941b8fea Gerrit-Change-Number: 34909 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:41:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: rework L1CTL TRAFFIC.{ind,req} related logging

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34908?usp=email ) Change subject: layer23: rework L1CTL TRAFFIC.{ind,req} related logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34908?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: I9c73db3c3650547030b8c354016e65195daebb62 Gerrit-Change-Number: 34908 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:41:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp-client: MGCP response: pass fmtp to caller

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email ) Change subject: mgcp-client: MGCP response: pass fmtp to caller ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If8ca5c3880cad9e41b80e9d1c821439b0d7b7e23 Gerrit-Change-Number: 34905 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:39:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:39:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-hnodeb[master]: tests: enable commented-out 'python-tests' target

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/32146?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: tests: enable commented-out 'python-tests' target ...................................................................... tests: enable commented-out 'python-tests' target Change-Id: I76e24184aecafa8460d1da9419a424d9990730c5 Related: OS#5989 --- M tests/Makefile.am 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/46/32146/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/32146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I76e24184aecafa8460d1da9419a424d9990730c5 Gerrit-Change-Number: 32146 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-hnodeb[master]: vty: fix incomplete docs for 'asn-debug' command

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/34918?usp=email ) Change subject: vty: fix incomplete docs for 'asn-debug' command ...................................................................... vty: fix incomplete docs for 'asn-debug' command Change-Id: I7174e1833be206a62afd95ddc27e9d912a7efcfc Related: OS#5989 --- M src/osmo-hnodeb/vty.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/18/34918/1 diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index 898c326..5b55613 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -343,7 +343,10 @@ DEFUN(asn_dbg, asn_dbg_cmd, - "asn-debug (1|0)", "Enable or disable libasn1c debugging") + "asn-debug (1|0)", + "Enable or disable libasn1c debugging\n" + "Enable libasn1c debugging\n" + "Disable libasn1c debugging\n") { asn_debug = atoi(argv[0]); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/34918?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I7174e1833be206a62afd95ddc27e9d912a7efcfc Gerrit-Change-Number: 34918 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email ) Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:38:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls

by fixeria

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, jolly, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: mobile: add support for Circuit Switched Data calls ...................................................................... mobile: add support for Circuit Switched Data calls This patch implements the signalling part for mobile originating and mobile terminating CSD calls. The user plane interface is to be implemented in follow-up patches. Change-Id: I1995fa0a7a68d9b980852b664d472d4633777ac6 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/common/support.h M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/common/support.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 8 files changed, 534 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/34762/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?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: I1995fa0a7a68d9b980852b664d472d4633777ac6 Gerrit-Change-Number: 34762 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34762?usp=email ) Change subject: mobile: add support for Circuit Switched Data calls ...................................................................... Patch Set 5: (1 comment) File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34762/comment/f555d4e3_c3fb0849 PS4, Line 634: trans-cap (udi|3100khz-audio|facsimile) > The transfer capability must be defined (generated) while doing the outgoing call (speech/fax/data), […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?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: I1995fa0a7a68d9b980852b664d472d4633777ac6 Gerrit-Change-Number: 34762 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:14:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34762?usp=email ) Change subject: mobile: add support for Circuit Switched Data calls ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?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: I1995fa0a7a68d9b980852b664d472d4633777ac6 Gerrit-Change-Number: 34762 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:14:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: gsm_settings_init(): set TCH frame format explicitly

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34914?usp=email ) Change subject: mobile: gsm_settings_init(): set TCH frame format explicitly ...................................................................... mobile: gsm_settings_init(): set TCH frame format explicitly Change-Id: I4660b07977b6701ad5dc4bf25f12cba374101f8b Related: OS#4396 --- M src/host/layer23/src/common/settings.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/34914/1 diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 348986b..bfca1d5 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -48,6 +48,8 @@ snprintf(set->mncc_socket_path, sizeof(set->mncc_socket_path) - 1, "%s_%s", mncc_socket_path, ms->name); + /* TCH frame format: the one used by trxcon and virtphy */ + set->tch.frame_format = TCH_IOFF_OSMO; /* TCH voice: drop frames by default */ set->tch.voice_handler = TCH_VOICE_IOH_NONE; OSMO_STRLCPY_ARRAY(set->tch.alsa_output_dev, alsa_dev_default); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34914?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: I4660b07977b6701ad5dc4bf25f12cba374101f8b Gerrit-Change-Number: 34914 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34916?usp=email ) Change subject: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}() ...................................................................... mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}() Not only this function can be used to transmit a voice frame, but also a data frame during a CSD call. Change-Id: I920300ae477e3c3d7c413cd1a35f2bc385266960 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/voice.c 3 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/34916/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h index 16f7fb3..112e85a 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h @@ -251,7 +251,7 @@ int gsm48_rr_start_monitor(struct osmocom_ms *ms); int gsm48_rr_stop_monitor(struct osmocom_ms *ms); int gsm48_rr_alter_delay(struct osmocom_ms *ms); -int gsm48_rr_tx_voice(struct osmocom_ms *ms, struct msgb *msg); +int gsm48_rr_tx_traffic(struct osmocom_ms *ms, struct msgb *msg); int gsm48_rr_audio_mode(struct osmocom_ms *ms, uint8_t mode); #endif /* _GSM48_RR_H */ diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index b4eac3c..cb317b9 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -7123,7 +7123,7 @@ #endif -int gsm48_rr_tx_voice(struct osmocom_ms *ms, struct msgb *msg) +int gsm48_rr_tx_traffic(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_rrlayer *rr = &ms->rrlayer; uint8_t ch_type, ch_subch, ch_ts; diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index b838576..b80d6a4 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -106,7 +106,7 @@ int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) { /* Forward to RR */ - return gsm48_rr_tx_voice(ms, msg); + return gsm48_rr_tx_traffic(ms, msg); } /* gsm_send_voice_msg() wrapper accepting an MNCC structure */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34916?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: I920300ae477e3c3d7c413cd1a35f2bc385266960 Gerrit-Change-Number: 34916 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: add params and VTY commands for data calls

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34915?usp=email ) Change subject: mobile: add params and VTY commands for data calls ...................................................................... mobile: add params and VTY commands for data calls Change-Id: If52fa70cb202f0736a17fe8eb63d226186637f62 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 115 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/34915/1 diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 6cec54b..13b1e2b 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -44,6 +44,20 @@ static inline const char *tch_voice_io_handler_name(enum tch_voice_io_handler val) { return get_value_string(tch_voice_io_handler_names, val); } +/* TCH I/O handler for data calls */ +enum tch_data_io_handler { + /* No handler, drop frames */ + TCH_DATA_IOH_NONE = 0, + /* UNIX socket */ + TCH_DATA_IOH_UNIX_SOCK, + /* Return to sender */ + TCH_DATA_IOH_LOOPBACK, +}; + +extern const struct value_string tch_data_io_handler_names[]; +static inline const char *tch_data_io_handler_name(enum tch_data_io_handler val) +{ return get_value_string(tch_data_io_handler_names, val); } + /* TCH I/O frame format */ enum tch_io_frame_format { /* RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR, packed bits for data */ @@ -58,9 +72,15 @@ struct tch_settings { enum tch_voice_io_handler voice_handler; + enum tch_data_io_handler data_handler; enum tch_io_frame_format frame_format; + + /* voice related parameters */ char alsa_output_dev[128]; char alsa_input_dev[128]; + + /* data related parameters */ + char data_socket_path[128]; }; struct test_sim_settings { diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index bfca1d5..9d1fd78 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -34,6 +34,7 @@ static char *sap_socket_path = "/tmp/osmocom_sap"; static char *mncc_socket_path = "/tmp/ms_mncc"; +static char *data_socket_path = "/tmp/ms_data"; static char *alsa_dev_default = "default"; int gsm_settings_init(struct osmocom_ms *ms) @@ -52,8 +53,13 @@ set->tch.frame_format = TCH_IOFF_OSMO; /* TCH voice: drop frames by default */ set->tch.voice_handler = TCH_VOICE_IOH_NONE; + /* TCH data: drop frames by default */ + set->tch.data_handler = TCH_DATA_IOH_NONE; OSMO_STRLCPY_ARRAY(set->tch.alsa_output_dev, alsa_dev_default); OSMO_STRLCPY_ARRAY(set->tch.alsa_input_dev, alsa_dev_default); + /* Compose data (CSD) socket path using MS name */ + snprintf(set->tch.data_socket_path, sizeof(set->tch.data_socket_path) - 1, + "%s_%s", data_socket_path, ms->name); /* Built-in MNCC handler */ set->mncc_handler = MNCC_HANDLER_INTERNAL; @@ -237,6 +243,13 @@ { 0, NULL } }; +const struct value_string tch_data_io_handler_names[] = { + { TCH_DATA_IOH_NONE, "none" }, + { TCH_DATA_IOH_UNIX_SOCK, "unix-sock" }, + { TCH_DATA_IOH_LOOPBACK, "loopback" }, + { 0, NULL } +}; + const struct value_string tch_io_frame_format_names[] = { { TCH_IOFF_OSMO, "osmo" }, { TCH_IOFF_OSMO, "rtp" }, /* for compatibility */ diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 8acc148..3cc3586 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1478,14 +1478,20 @@ vty_out(vty, " tch%s", VTY_NEWLINE); vty_out(vty, " voice-io-handler %s%s", tch_voice_io_handler_name(set->tch.voice_handler), VTY_NEWLINE); + vty_out(vty, " data-io-handler %s%s", + tch_data_io_handler_name(set->tch.data_handler), VTY_NEWLINE); + vty_out(vty, " io-tch-format %s%s", + tch_io_frame_format_name(set->tch.frame_format), VTY_NEWLINE); if (set->tch.voice_handler == TCH_VOICE_IOH_GAPK) { - vty_out(vty, " io-tch-format %s%s", - tch_io_frame_format_name(set->tch.frame_format), VTY_NEWLINE); vty_out(vty, " alsa-output-dev %s%s", set->tch.alsa_output_dev, VTY_NEWLINE); vty_out(vty, " alsa-input-dev %s%s", set->tch.alsa_input_dev, VTY_NEWLINE); } + if (set->tch.data_handler == TCH_DATA_IOH_UNIX_SOCK) { + vty_out(vty, " data-unix-socket %s%s", + set->tch.data_socket_path, VTY_NEWLINE); + } if (ms->lua_script) vty_out(vty, " lua-script %s%s", ms->lua_script, VTY_NEWLINE); @@ -2508,6 +2514,22 @@ return CMD_SUCCESS; } +static int set_data_io_handler(struct vty *vty, enum tch_data_io_handler val) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; + struct gsm_settings *set = &ms->settings; + + /* Don't restart on unchanged value */ + if (val == set->tch.data_handler) + return CMD_SUCCESS; + set->tch.data_handler = val; + + /* Restart required */ + vty_restart_if_started(vty, ms); + + return CMD_SUCCESS; +} + #define TCH_VOICE_IOH_SEL \ "(none|gapk|l1phy|mncc-sock|loopback)" #define TCH_VOICE_IOH_SEL_DESC \ @@ -2517,6 +2539,13 @@ "External MNCC application (e.g. LCR) via MNCC socket\n" \ "Return TCH frame payload back to sender\n" +#define TCH_DATA_IOH_SEL \ + "(none|unix-sock|loopback)" +#define TCH_DATA_IOH_SEL_DESC \ + "No handler, drop TCH frames (default)\n" \ + "UNIX socket (path set by 'data-unix-socket')\n" \ + "Return TCH frame payload back to sender\n" + DEFUN(cfg_ms_tch_voice_io_handler, cfg_ms_tch_voice_io_handler_cmd, "voice-io-handler " TCH_VOICE_IOH_SEL, @@ -2544,10 +2573,16 @@ return set_voice_io_handler(vty, val); } -ALIAS_DEPRECATED(cfg_ms_tch_voice_io_handler, - cfg_ms_tch_io_handler_cmd, - "io-handler " TCH_VOICE_IOH_SEL, - "Set TCH I/O handler for voice calls\n" TCH_VOICE_IOH_SEL_DESC); +DEFUN(cfg_ms_tch_data_io_handler, + cfg_ms_tch_data_io_handler_cmd, + "data-io-handler " TCH_DATA_IOH_SEL, + "Set TCH I/O handler for data calls\n" + TCH_DATA_IOH_SEL_DESC) +{ + int val = get_string_value(tch_data_io_handler_names, argv[0]); + + return set_data_io_handler(vty, val); +} DEFUN(cfg_ms_tch_no_voice_io_handler, cfg_ms_tch_no_voice_io_handler_cmd, @@ -2557,6 +2592,19 @@ return set_voice_io_handler(vty, TCH_VOICE_IOH_NONE); } +DEFUN(cfg_ms_tch_no_data_io_handler, + cfg_ms_tch_no_data_io_handler_cmd, + "no data-io-handler", + NO_STR "Disable TCH I/O handling for data calls\n") +{ + return set_data_io_handler(vty, TCH_DATA_IOH_NONE); +} + +ALIAS_DEPRECATED(cfg_ms_tch_voice_io_handler, + cfg_ms_tch_io_handler_cmd, + "io-handler " TCH_VOICE_IOH_SEL, + "Set TCH I/O handler for voice calls\n" TCH_VOICE_IOH_SEL_DESC); + ALIAS_DEPRECATED(cfg_ms_tch_no_voice_io_handler, cfg_ms_tch_no_io_handler_cmd, "no io-handler", @@ -2564,7 +2612,7 @@ DEFUN(cfg_ms_tch_io_tch_format, cfg_ms_tch_io_tch_format_cmd, "io-tch-format (osmo|rtp|ti)", - "Set TCH I/O frame format used by the L1 PHY (for GAPK only)\n" + "Set TCH I/O frame format used by the L1 PHY\n" "Osmocom format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n" "(same as 'osmo', kept for backwards-compatibility)\n" "Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx)\n") @@ -2573,11 +2621,6 @@ struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; struct gsm_settings *set = &ms->settings; - if (set->tch.voice_handler != TCH_VOICE_IOH_GAPK) { - vty_out(vty, "This parameter is only valid for GAPK%s", VTY_NEWLINE); - return CMD_WARNING; - } - OSMO_ASSERT(val >= 0); set->tch.frame_format = val; @@ -2612,6 +2655,20 @@ return CMD_SUCCESS; } +DEFUN(cfg_ms_tch_data_sock, + cfg_ms_tch_data_sock_cmd, + "data-unix-socket PATH", + "Define UNIX socket path (for 'data-io-handler unix-sock')\n" + "UNIX socket path (default '/tmp/ms_data_' + MS_NAME)\n") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + OSMO_STRLCPY_ARRAY(set->tch.data_socket_path, argv[0]); + + return CMD_SUCCESS; +} + DEFUN(cfg_ms_script_load_run, cfg_ms_script_load_run_cmd, "lua-script FILENAME", "Load and execute a LUA script\nFilename for lua script") { @@ -2871,12 +2928,15 @@ install_node(&tch_node, config_write_dummy); install_element(TCH_NODE, &cfg_ms_tch_voice_io_handler_cmd); + install_element(TCH_NODE, &cfg_ms_tch_data_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_no_voice_io_handler_cmd); + install_element(TCH_NODE, &cfg_ms_tch_no_data_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_no_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_io_tch_format_cmd); install_element(TCH_NODE, &cfg_ms_tch_alsa_out_dev_cmd); install_element(TCH_NODE, &cfg_ms_tch_alsa_in_dev_cmd); + install_element(TCH_NODE, &cfg_ms_tch_data_sock_cmd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34915?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: If52fa70cb202f0736a17fe8eb63d226186637f62 Gerrit-Change-Number: 34915 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: rename voice.[ch] to tch.[ch]

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34917?usp=email ) Change subject: mobile: rename voice.[ch] to tch.[ch] ...................................................................... mobile: rename voice.[ch] to tch.[ch] Also take a chance to change the 'tch_' prefix for all functions. Change-Id: I05e1ae777add73672db61565c77c68d8ab2b08f0 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/Makefile.am A src/host/layer23/include/osmocom/bb/mobile/tch.h D src/host/layer23/include/osmocom/bb/mobile/voice.h M src/host/layer23/src/mobile/Makefile.am M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/gsm44068_gcc_bcc.c M src/host/layer23/src/mobile/gsm48_cc.c R src/host/layer23/src/mobile/tch.c 9 files changed, 43 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/17/34917/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 534b865..5d2eeaf 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -1,4 +1,4 @@ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ gsm48_rr.h mncc.h gsm44068_gcc_bcc.h \ - transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \ - app_mobile.h voice.h gapk_io.h + tch.h transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \ + app_mobile.h gapk_io.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/tch.h b/src/host/layer23/include/osmocom/bb/mobile/tch.h new file mode 100644 index 0000000..0e81769 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/mobile/tch.h @@ -0,0 +1,9 @@ +#pragma once + +struct osmocom_ms; +struct gsm_data_frame; +struct msgb; + +int tch_init(struct osmocom_ms *ms); +int tch_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg); +int tch_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame); diff --git a/src/host/layer23/include/osmocom/bb/mobile/voice.h b/src/host/layer23/include/osmocom/bb/mobile/voice.h deleted file mode 100644 index 8c4c5b6..0000000 --- a/src/host/layer23/include/osmocom/bb/mobile/voice.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -struct osmocom_ms; -struct gsm_data_frame; -struct msgb; - -int gsm_voice_init(struct osmocom_ms *ms); -int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg); -int gsm_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame); diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index 7b05f65..ed2146f 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -30,9 +30,9 @@ mnccms.c \ mncc_sock.c \ primitives.c \ + tch.c \ transaction.c \ vty_interface.c \ - voice.c \ $(NULL) bin_PROGRAMS = mobile diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index b08976c..cada8fc 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -41,7 +41,7 @@ #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/bb/mobile/mncc.h> -#include <osmocom/bb/mobile/voice.h> +#include <osmocom/bb/mobile/tch.h> #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/primitives.h> @@ -256,7 +256,7 @@ gsm480_ss_init(ms); gsm411_sms_init(ms); gsm44068_gcc_init(ms); - gsm_voice_init(ms); + tch_init(ms); gsm_subscr_init(ms); gsm48_rr_init(ms); gsm48_mm_init(ms); diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c index d6c913a..be4d0e0 100644 --- a/src/host/layer23/src/mobile/gapk_io.c +++ b/src/host/layer23/src/mobile/gapk_io.c @@ -36,7 +36,7 @@ #include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/logging.h> -#include <osmocom/bb/mobile/voice.h> +#include <osmocom/bb/mobile/tch.h> #include <osmocom/bb/mobile/gapk_io.h> /* The RAW PCM format is common for both audio source and sink */ @@ -585,7 +585,7 @@ &gapk_io->tch_ul_fb_len); /* Push a voice frame to the lower layers */ - gsm_send_voice_msg(ms, tch_msg); + tch_send_voice_msg(ms, tch_msg); work |= 1; } diff --git a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c index 4fe0b82..65e016d 100644 --- a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c +++ b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c @@ -64,7 +64,7 @@ #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/gsm44068_gcc_bcc.h> -#include <osmocom/bb/mobile/voice.h> +#include <osmocom/bb/mobile/tch.h> #include <osmocom/bb/mobile/vty.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c index 9691c68..4e26713 100644 --- a/src/host/layer23/src/mobile/gsm48_cc.c +++ b/src/host/layer23/src/mobile/gsm48_cc.c @@ -33,7 +33,7 @@ #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/gsm48_cc.h> #include <osmocom/bb/mobile/gsm44068_gcc_bcc.h> -#include <osmocom/bb/mobile/voice.h> +#include <osmocom/bb/mobile/tch.h> #include <l1ctl_proto.h> static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg); @@ -1978,7 +1978,7 @@ case GSM_TCHH_FRAME: case GSM_TCH_FRAME_AMR: case GSM_BAD_FRAME: - return gsm_send_voice_frame(ms, arg); + return tch_send_voice_frame(ms, arg); case MNCC_LCHAN_MODIFY: return 0; case MNCC_FRAME_RECV: diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/tch.c similarity index 85% rename from src/host/layer23/src/mobile/voice.c rename to src/host/layer23/src/mobile/tch.c index b80d6a4..29c8790 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/tch.c @@ -31,10 +31,10 @@ #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/mncc_sock.h> -#include <osmocom/bb/mobile/voice.h> +#include <osmocom/bb/mobile/tch.h> /* Forward a Downlink voice frame to the external MNCC handler */ -static int gsm_forward_mncc(struct osmocom_ms *ms, struct msgb *msg) +static int tch_forward_mncc(struct osmocom_ms *ms, struct msgb *msg) { struct gsm_data_frame *mncc; @@ -74,16 +74,16 @@ } /* Receive a Downlink voice frame from the lower layers */ -static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) +static int tch_recv_voice(struct osmocom_ms *ms, struct msgb *msg) { switch (ms->settings.tch.voice_handler) { case TCH_VOICE_IOH_LOOPBACK: /* Remove the DL info header */ msgb_pull_to_l2(msg); /* Send voice frame back */ - return gsm_send_voice_msg(ms, msg); + return tch_send_voice_msg(ms, msg); case TCH_VOICE_IOH_MNCC_SOCK: - return gsm_forward_mncc(ms, msg); + return tch_forward_mncc(ms, msg); case TCH_VOICE_IOH_GAPK: #ifdef WITH_GAPK_IO /* Enqueue a frame to the DL TCH buffer */ @@ -103,14 +103,14 @@ } /* Send an Uplink voice frame to the lower layers */ -int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) +int tch_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) { /* Forward to RR */ return gsm48_rr_tx_traffic(ms, msg); } -/* gsm_send_voice_msg() wrapper accepting an MNCC structure */ -int gsm_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame) +/* tch_send_voice_msg() wrapper accepting an MNCC structure */ +int tch_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame) { struct msgb *nmsg; int len; @@ -139,13 +139,13 @@ nmsg->l2h = msgb_put(nmsg, len); memcpy(nmsg->l2h, frame->data, len); - return gsm_send_voice_msg(ms, nmsg); + return tch_send_voice_msg(ms, nmsg); } -/* Initialize voice router */ -int gsm_voice_init(struct osmocom_ms *ms) +/* Initialize the TCH router */ +int tch_init(struct osmocom_ms *ms) { - ms->l1_entity.l1_traffic_ind = gsm_recv_voice; + ms->l1_entity.l1_traffic_ind = tch_recv_voice; return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34917?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: I05e1ae777add73672db61565c77c68d8ab2b08f0 Gerrit-Change-Number: 34917 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: cosmetic: use '#pragma once' in mncc.h

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34909?usp=email ) Change subject: mobile: cosmetic: use '#pragma once' in mncc.h ...................................................................... mobile: cosmetic: use '#pragma once' in mncc.h Change-Id: I2f350c5b67e57097b71b12ba42c90ce0941b8fea --- M src/host/layer23/include/osmocom/bb/mobile/mncc.h 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/34909/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index 1ab83ef..f587e1f 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -19,8 +19,7 @@ * */ -#ifndef _MNCC_H -#define _MNCC_H +#pragma once #include <osmocom/core/linuxlist.h> #include <osmocom/core/timer.h> @@ -174,6 +173,3 @@ const char *get_mncc_name(int value); int mncc_recv(struct osmocom_ms *ms, int msg_type, void *arg); void mncc_set_cause(struct gsm_mncc *data, int loc, int val); - -#endif - -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34909?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: I2f350c5b67e57097b71b12ba42c90ce0941b8fea Gerrit-Change-Number: 34909 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: rework L1CTL TRAFFIC.{ind,req} related logging

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34908?usp=email ) Change subject: layer23: rework L1CTL TRAFFIC.{ind,req} related logging ...................................................................... layer23: rework L1CTL TRAFFIC.{ind,req} related logging Make these Rx/Tx messages more informative. Change-Id: I9c73db3c3650547030b8c354016e65195daebb62 Related: OS#4396 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 16 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/08/34908/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index c4589f0..349f048 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -844,7 +844,6 @@ { struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; - size_t frame_len; uint8_t *frame; if (msgb_l1len(msg) < sizeof(*dl)) { @@ -861,11 +860,8 @@ msg->l2h = dl->payload; msg->l3h = frame; - /* Calculate the frame length */ - frame_len = msgb_l3len(msg); - - DEBUGP(DL1C, "TRAFFIC IND len=%zu (%s)\n", frame_len, - osmo_hexdump(frame, frame_len)); + LOGP(DL1C, LOGL_DEBUG, "Rx TRAFFIC.ind (fn=%u, chan_nr=0x%02x, len=%u): %s\n", + ntohl(dl->frame_nr), dl->chan_nr, msgb_l3len(msg), msgb_hexdump_l3(msg)); /* distribute or drop */ if (ms->l1_entity.l1_traffic_ind) @@ -882,7 +878,6 @@ struct l1ctl_hdr *l1h; struct l1ctl_info_ul *l1i_ul; struct l1ctl_traffic_req *tr; - size_t frame_len; uint8_t *frame; /* Header handling */ @@ -890,11 +885,8 @@ frame = (uint8_t *) tr->data; msg->l3h = frame; - /* Calculate the frame length */ - frame_len = msgb_l3len(msg); - - DEBUGP(DL1C, "TRAFFIC REQ len=%zu (%s)\n", frame_len, - osmo_hexdump(frame, frame_len)); + LOGP(DL1C, LOGL_DEBUG, "Tx TRAFFIC.req (chan_nr=0x%02x, len=%u): %s\n", + chan_nr, msgb_l3len(msg), msgb_hexdump_l3(msg)); /* prepend uplink info header */ l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34908?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: I9c73db3c3650547030b8c354016e65195daebb62 Gerrit-Change-Number: 34908 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from <mncc.h> to <mncc_ms.h>

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email ) Change subject: mobile: move 'struct gsm_call' from <mncc.h> to <mncc_ms.h> ...................................................................... mobile: move 'struct gsm_call' from <mncc.h> to <mncc_ms.h> The only file using this structure is mnccms.c. Change-Id: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/mncc.h M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h 2 files changed, 38 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/34910/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index f587e1f..d6facbb 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -21,27 +21,8 @@ #pragma once -#include <osmocom/core/linuxlist.h> -#include <osmocom/core/timer.h> #include <osmocom/gsm/mncc.h> -struct gsm_call { - struct llist_head entry; - - struct osmocom_ms *ms; - - uint32_t callref; - - bool init; /* call initiated, no response yet */ - bool hold; /* call on hold */ - bool ring; /* call ringing/knocking */ - - struct osmo_timer_list dtmf_timer; - uint8_t dtmf_state; - uint8_t dtmf_index; - char dtmf[32]; /* dtmf sequence */ -}; - #define DTMF_ST_IDLE 0 /* no DTMF active */ #define DTMF_ST_START 1 /* DTMF started, waiting for resp. */ #define DTMF_ST_MARK 2 /* wait tone duration */ @@ -127,6 +108,8 @@ #define MNCC_F_KEYPAD 0x1000 #define MNCC_F_SIGNAL 0x2000 +struct osmocom_ms; + struct gsm_mncc { /* context based information */ uint32_t msg_type; diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h index 705c681..4006688 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h @@ -1,5 +1,29 @@ #pragma once +#include <stdint.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> + +struct osmocom_ms; + +struct gsm_call { + struct llist_head entry; + + struct osmocom_ms *ms; + + uint32_t callref; + + bool init; /* call initiated, no response yet */ + bool hold; /* call on hold */ + bool ring; /* call ringing/knocking */ + + struct osmo_timer_list dtmf_timer; + uint8_t dtmf_state; + uint8_t dtmf_index; + char dtmf[32]; /* dtmf sequence */ +}; + int mncc_call(struct osmocom_ms *ms, const char *number); int mncc_hangup(struct osmocom_ms *ms); int mncc_answer(struct osmocom_ms *ms); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34910?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: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49 Gerrit-Change-Number: 34910 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: rename 'audio' node to 'tch' node

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34911?usp=email ) Change subject: mobile: rename 'audio' node to 'tch' node ...................................................................... mobile: rename 'audio' node to 'tch' node Change-Id: I2cab597c5de92ecb343cad7aaaa48035ca5f8365 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 35 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/11/34911/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h b/src/host/layer23/include/osmocom/bb/mobile/vty.h index 511348b..87487e6 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/vty.h +++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h @@ -10,7 +10,7 @@ enum ms_vty_node { SUPPORT_NODE = _LAST_L23VTY_NODE + 1, - AUDIO_NODE, + TCH_NODE, VGCS_NODE, VBS_NODE, }; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index e79a5a1..9a1652b 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -49,9 +49,9 @@ 1 }; -struct cmd_node audio_node = { - AUDIO_NODE, - "%s(audio)# ", +struct cmd_node tch_node = { + TCH_NODE, + "%s(tch)# ", 1 }; @@ -1475,7 +1475,7 @@ vty_out(vty, " %sasci-allow-any%s", (set->asci_allow_any) ? "" : "no ", VTY_NEWLINE); - vty_out(vty, " audio%s", VTY_NEWLINE); + vty_out(vty, " tch%s", VTY_NEWLINE); vty_out(vty, " io-handler %s%s", audio_io_handler_name(set->audio.io_handler), VTY_NEWLINE); if (set->audio.io_handler == AUDIO_IOH_GAPK) { @@ -2477,14 +2477,18 @@ SUP_EN_DI(vgcs, "vgcs", "Voice Group Call Service (VGCS)", 0); SUP_EN_DI(vbs, "vbs", "Voice Broadcast Service (VBS)", 0); -/* per audio config */ -DEFUN(cfg_ms_audio, cfg_ms_audio_cmd, "audio", - "Configure audio settings") +/* TCH config */ +DEFUN(cfg_ms_tch, cfg_ms_tch_cmd, "tch", + "Configure TCH (Traffic CHannel) settings\n") { - vty->node = AUDIO_NODE; + vty->node = TCH_NODE; return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_ms_tch, cfg_ms_audio_cmd, + "audio", "Configure audio settings\n"); + + static int set_audio_io_handler(struct vty *vty, enum audio_io_handler val) { struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; @@ -2501,7 +2505,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_ms_audio_io_handler, cfg_ms_audio_io_handler_cmd, +DEFUN(cfg_ms_tch_io_handler, cfg_ms_tch_io_handler_cmd, "io-handler (none|gapk|l1phy|mncc-sock|loopback)", "Set TCH frame I/O handler\n" "No handler, drop TCH frames (default)\n" @@ -2531,13 +2535,13 @@ return set_audio_io_handler(vty, val); } -DEFUN(cfg_ms_audio_no_io_handler, cfg_ms_audio_no_io_handler_cmd, +DEFUN(cfg_ms_tch_no_io_handler, cfg_ms_tch_no_io_handler_cmd, "no io-handler", NO_STR "Disable TCH frame processing") { return set_audio_io_handler(vty, AUDIO_IOH_NONE); } -DEFUN(cfg_ms_audio_io_tch_format, cfg_ms_audio_io_tch_format_cmd, +DEFUN(cfg_ms_tch_io_tch_format, cfg_ms_tch_io_tch_format_cmd, "io-tch-format (rtp|ti)", "Set TCH I/O frame format used by the L1 PHY (for GAPK only)\n" "RTP format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n" @@ -2558,7 +2562,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_ms_audio_alsa_out_dev, cfg_ms_audio_alsa_out_dev_cmd, +DEFUN(cfg_ms_tch_alsa_out_dev, cfg_ms_tch_alsa_out_dev_cmd, "alsa-output-dev (default|NAME)", "Set ALSA output (playback) device name (for GAPK only)\n" "Default system playback device (default)\n" @@ -2572,7 +2576,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_ms_audio_alsa_in_dev, cfg_ms_audio_alsa_in_dev_cmd, +DEFUN(cfg_ms_tch_alsa_in_dev, cfg_ms_tch_alsa_in_dev_cmd, "alsa-input-dev (default|NAME)", "Set ALSA input (capture) device name (for GAPK only)\n" "Default system recording device (default)\n" @@ -2757,6 +2761,7 @@ install_element(MS_NODE, &cfg_ms_no_codec_half_cmd); install_element(MS_NODE, &cfg_ms_abbrev_cmd); install_element(MS_NODE, &cfg_ms_no_abbrev_cmd); + install_element(MS_NODE, &cfg_ms_tch_cmd); install_element(MS_NODE, &cfg_ms_audio_cmd); install_element(MS_NODE, &cfg_ms_neighbour_cmd); install_element(MS_NODE, &cfg_ms_no_neighbour_cmd); @@ -2842,12 +2847,12 @@ install_element(MS_NODE, &cfg_ms_script_load_run_cmd); install_element(MS_NODE, &cfg_ms_no_script_load_run_cmd); - install_node(&audio_node, config_write_dummy); - install_element(AUDIO_NODE, &cfg_ms_audio_io_handler_cmd); - install_element(AUDIO_NODE, &cfg_ms_audio_no_io_handler_cmd); - install_element(AUDIO_NODE, &cfg_ms_audio_io_tch_format_cmd); - install_element(AUDIO_NODE, &cfg_ms_audio_alsa_out_dev_cmd); - install_element(AUDIO_NODE, &cfg_ms_audio_alsa_in_dev_cmd); + install_node(&tch_node, config_write_dummy); + install_element(TCH_NODE, &cfg_ms_tch_io_handler_cmd); + install_element(TCH_NODE, &cfg_ms_tch_no_io_handler_cmd); + install_element(TCH_NODE, &cfg_ms_tch_io_tch_format_cmd); + install_element(TCH_NODE, &cfg_ms_tch_alsa_out_dev_cmd); + install_element(TCH_NODE, &cfg_ms_tch_alsa_in_dev_cmd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34911?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: I2cab597c5de92ecb343cad7aaaa48035ca5f8365 Gerrit-Change-Number: 34911 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34913?usp=email ) Change subject: mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO ...................................................................... mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO This parameter will also determine TCH frame format for data calls, but saying RTP for data calls is incorrect since the BSS performs rate adaptation before sending data via RTP. Let's use 'osmo', which is valid for Osmocom's trxcon and virtphy. Change-Id: I780d0a9fc20244ffa34307fb3d00f3848b6dcc76 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/13/34913/1 diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index aeb4abd..6cec54b 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -47,7 +47,7 @@ /* TCH I/O frame format */ enum tch_io_frame_format { /* RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR, packed bits for data */ - TCH_IOFF_RTP, + TCH_IOFF_OSMO, /* Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx) */ TCH_IOFF_TI, }; diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 6caaa00..348986b 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -236,7 +236,8 @@ }; const struct value_string tch_io_frame_format_names[] = { - { TCH_IOFF_RTP, "rtp" }, + { TCH_IOFF_OSMO, "osmo" }, + { TCH_IOFF_OSMO, "rtp" }, /* for compatibility */ { TCH_IOFF_TI, "ti" }, { 0, NULL } }; diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c index e86d625..d6c913a 100644 --- a/src/host/layer23/src/mobile/gapk_io.c +++ b/src/host/layer23/src/mobile/gapk_io.c @@ -410,7 +410,7 @@ } switch (set->tch.frame_format) { - case TCH_IOFF_RTP: + case TCH_IOFF_OSMO: phy_fmt = phy_fmt_pick_rtp(codec); break; case TCH_IOFF_TI: diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 445ad4a..8acc148 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -2563,9 +2563,10 @@ NO_STR "Disable TCH I/O handling for voice calls\n"); DEFUN(cfg_ms_tch_io_tch_format, cfg_ms_tch_io_tch_format_cmd, - "io-tch-format (rtp|ti)", + "io-tch-format (osmo|rtp|ti)", "Set TCH I/O frame format used by the L1 PHY (for GAPK only)\n" - "RTP format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n" + "Osmocom format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n" + "(same as 'osmo', kept for backwards-compatibility)\n" "Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx)\n") { int val = get_string_value(tch_io_frame_format_names, argv[0]); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34913?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: I780d0a9fc20244ffa34307fb3d00f3848b6dcc76 Gerrit-Change-Number: 34913 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: clarify TCH I/O {handler,format} naming

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34912?usp=email ) Change subject: mobile: clarify TCH I/O {handler,format} naming ...................................................................... mobile: clarify TCH I/O {handler,format} naming Before we add handling of TCH I/O for data calls, let's rename the existing voice related symbols, fields, and the VTY commands to have 'voice' in their names. Add backward compatibility aliases. Change-Id: If6c799d11e225ad00ca5da5ae63dca20568a0ce0 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/voice.c M src/host/layer23/src/mobile/vty_interface.c 6 files changed, 128 insertions(+), 91 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/12/34912/1 diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index e56e201..aeb4abd 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -26,39 +26,39 @@ MNCC_HANDLER_DUMMY, }; -/* TCH frame I/O handler */ -enum audio_io_handler { +/* TCH I/O handler for voice calls */ +enum tch_voice_io_handler { /* No handler, drop frames */ - AUDIO_IOH_NONE = 0, + TCH_VOICE_IOH_NONE = 0, /* libosmo-gapk based handler */ - AUDIO_IOH_GAPK, + TCH_VOICE_IOH_GAPK, /* L1 PHY (e.g. Calypso DSP) */ - AUDIO_IOH_L1PHY, + TCH_VOICE_IOH_L1PHY, /* External MNCC app (via MNCC socket) */ - AUDIO_IOH_MNCC_SOCK, + TCH_VOICE_IOH_MNCC_SOCK, /* Return to sender */ - AUDIO_IOH_LOOPBACK, + TCH_VOICE_IOH_LOOPBACK, }; -extern const struct value_string audio_io_handler_names[]; -static inline const char *audio_io_handler_name(enum audio_io_handler val) -{ return get_value_string(audio_io_handler_names, val); } +extern const struct value_string tch_voice_io_handler_names[]; +static inline const char *tch_voice_io_handler_name(enum tch_voice_io_handler val) +{ return get_value_string(tch_voice_io_handler_names, val); } -/* TCH frame I/O format */ -enum audio_io_format { - /* RTP format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR) */ - AUDIO_IOF_RTP, +/* TCH I/O frame format */ +enum tch_io_frame_format { + /* RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR, packed bits for data */ + TCH_IOFF_RTP, /* Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx) */ - AUDIO_IOF_TI, + TCH_IOFF_TI, }; -extern const struct value_string audio_io_format_names[]; -static inline const char *audio_io_format_name(enum audio_io_format val) -{ return get_value_string(audio_io_format_names, val); } +extern const struct value_string tch_io_frame_format_names[]; +static inline const char *tch_io_frame_format_name(enum tch_io_frame_format val) +{ return get_value_string(tch_io_frame_format_names, val); } -struct audio_settings { - enum audio_io_handler io_handler; - enum audio_io_format io_format; +struct tch_settings { + enum tch_voice_io_handler voice_handler; + enum tch_io_frame_format frame_format; char alsa_output_dev[128]; char alsa_input_dev[128]; }; @@ -119,8 +119,8 @@ /* MNCC handler */ enum mncc_handler_t mncc_handler; - /* Audio settings */ - struct audio_settings audio; + /* TCH settings */ + struct tch_settings tch; /* IMEI */ char imei[GSM23003_IMEI_NUM_DIGITS + 1]; diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 5bae325..6caaa00 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -48,10 +48,10 @@ snprintf(set->mncc_socket_path, sizeof(set->mncc_socket_path) - 1, "%s_%s", mncc_socket_path, ms->name); - /* Audio settings: drop TCH frames by default */ - set->audio.io_handler = AUDIO_IOH_NONE; - OSMO_STRLCPY_ARRAY(set->audio.alsa_output_dev, alsa_dev_default); - OSMO_STRLCPY_ARRAY(set->audio.alsa_input_dev, alsa_dev_default); + /* TCH voice: drop frames by default */ + set->tch.voice_handler = TCH_VOICE_IOH_NONE; + OSMO_STRLCPY_ARRAY(set->tch.alsa_output_dev, alsa_dev_default); + OSMO_STRLCPY_ARRAY(set->tch.alsa_input_dev, alsa_dev_default); /* Built-in MNCC handler */ set->mncc_handler = MNCC_HANDLER_INTERNAL; @@ -226,18 +226,18 @@ return 0; } -const struct value_string audio_io_handler_names[] = { - { AUDIO_IOH_NONE, "none" }, - { AUDIO_IOH_GAPK, "gapk" }, - { AUDIO_IOH_L1PHY, "l1phy" }, - { AUDIO_IOH_MNCC_SOCK, "mncc-sock" }, - { AUDIO_IOH_LOOPBACK, "loopback" }, +const struct value_string tch_voice_io_handler_names[] = { + { TCH_VOICE_IOH_NONE, "none" }, + { TCH_VOICE_IOH_GAPK, "gapk" }, + { TCH_VOICE_IOH_L1PHY, "l1phy" }, + { TCH_VOICE_IOH_MNCC_SOCK, "mncc-sock" }, + { TCH_VOICE_IOH_LOOPBACK, "loopback" }, { 0, NULL } }; -const struct value_string audio_io_format_names[] = { - { AUDIO_IOF_RTP, "rtp" }, - { AUDIO_IOF_TI, "ti" }, +const struct value_string tch_io_frame_format_names[] = { + { TCH_IOFF_RTP, "rtp" }, + { TCH_IOFF_TI, "ti" }, { 0, NULL } }; diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c index a2a4e84..e86d625 100644 --- a/src/host/layer23/src/mobile/gapk_io.c +++ b/src/host/layer23/src/mobile/gapk_io.c @@ -409,16 +409,16 @@ return -ENOTSUP; } - switch (set->audio.io_format) { - case AUDIO_IOF_RTP: + switch (set->tch.frame_format) { + case TCH_IOFF_RTP: phy_fmt = phy_fmt_pick_rtp(codec); break; - case AUDIO_IOF_TI: + case TCH_IOFF_TI: phy_fmt = phy_fmt_pick_ti(codec); break; default: LOGP(DGAPK, LOGL_ERROR, "Unhandled I/O format %s\n", - audio_io_format_name(set->audio.io_format)); + tch_io_frame_format_name(set->tch.frame_format)); return -ENOTSUP; } @@ -447,8 +447,8 @@ osmo_gapk_set_talloc_ctx(gapk_io); /* Prepare both source and sink chains */ - rc |= prepare_audio_source(gapk_io, set->audio.alsa_input_dev); - rc |= prepare_audio_sink(gapk_io, set->audio.alsa_output_dev); + rc |= prepare_audio_source(gapk_io, set->tch.alsa_input_dev); + rc |= prepare_audio_sink(gapk_io, set->tch.alsa_output_dev); /* Fall back to ms instance */ osmo_gapk_set_talloc_ctx(ms); diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 68670b7..b4eac3c 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -4434,7 +4434,7 @@ #ifdef WITH_GAPK_IO /* Poke GAPK audio back-end, if it is chosen */ - if (ms->settings.audio.io_handler == AUDIO_IOH_GAPK) { + if (ms->settings.tch.voice_handler == TCH_VOICE_IOH_GAPK) { int rc = gapk_io_init_ms_chan(ms, ch_type, mode); if (rc) return rc; @@ -4989,7 +4989,7 @@ #ifdef WITH_GAPK_IO /* Poke GAPK audio back-end, if it is chosen */ - if (ms->settings.audio.io_handler == AUDIO_IOH_GAPK) + if (ms->settings.tch.voice_handler == TCH_VOICE_IOH_GAPK) gapk_io_init_ms_chan(ms, ch_type, cda->mode); #endif @@ -7028,16 +7028,16 @@ rr->tch_loop_mode = L1CTL_TCH_LOOP_OPEN; /* Configure audio handling in the L1PHY */ - switch (ms->settings.audio.io_handler) { - case AUDIO_IOH_L1PHY: + switch (ms->settings.tch.voice_handler) { + case TCH_VOICE_IOH_L1PHY: rr->audio_mode = AUDIO_RX_SPEAKER | AUDIO_TX_MICROPHONE; break; - case AUDIO_IOH_MNCC_SOCK: - case AUDIO_IOH_LOOPBACK: - case AUDIO_IOH_GAPK: + case TCH_VOICE_IOH_MNCC_SOCK: + case TCH_VOICE_IOH_LOOPBACK: + case TCH_VOICE_IOH_GAPK: rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; break; - case AUDIO_IOH_NONE: + case TCH_VOICE_IOH_NONE: rr->audio_mode = 0x00; } @@ -7156,7 +7156,7 @@ struct gsm48_rrlayer *rr = &ms->rrlayer; uint8_t ch_type, ch_subch, ch_ts; - if (ms->settings.audio.io_handler != AUDIO_IOH_NONE) + if (ms->settings.tch.voice_handler != TCH_VOICE_IOH_NONE) return 0; LOGP(DRR, LOGL_INFO, "setting audio mode to %d\n", mode); diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index acc0dce..b838576 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -76,15 +76,15 @@ /* Receive a Downlink voice frame from the lower layers */ static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) { - switch (ms->settings.audio.io_handler) { - case AUDIO_IOH_LOOPBACK: + switch (ms->settings.tch.voice_handler) { + case TCH_VOICE_IOH_LOOPBACK: /* Remove the DL info header */ msgb_pull_to_l2(msg); /* Send voice frame back */ return gsm_send_voice_msg(ms, msg); - case AUDIO_IOH_MNCC_SOCK: + case TCH_VOICE_IOH_MNCC_SOCK: return gsm_forward_mncc(ms, msg); - case AUDIO_IOH_GAPK: + case TCH_VOICE_IOH_GAPK: #ifdef WITH_GAPK_IO /* Enqueue a frame to the DL TCH buffer */ if (ms->gapk_io != NULL) @@ -93,8 +93,8 @@ msgb_free(msg); break; #endif - case AUDIO_IOH_L1PHY: - case AUDIO_IOH_NONE: + case TCH_VOICE_IOH_L1PHY: + case TCH_VOICE_IOH_NONE: /* Drop voice frame */ msgb_free(msg); } diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 9a1652b..445ad4a 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1476,15 +1476,15 @@ (set->asci_allow_any) ? "" : "no ", VTY_NEWLINE); vty_out(vty, " tch%s", VTY_NEWLINE); - vty_out(vty, " io-handler %s%s", - audio_io_handler_name(set->audio.io_handler), VTY_NEWLINE); - if (set->audio.io_handler == AUDIO_IOH_GAPK) { + vty_out(vty, " voice-io-handler %s%s", + tch_voice_io_handler_name(set->tch.voice_handler), VTY_NEWLINE); + if (set->tch.voice_handler == TCH_VOICE_IOH_GAPK) { vty_out(vty, " io-tch-format %s%s", - audio_io_format_name(set->audio.io_format), VTY_NEWLINE); + tch_io_frame_format_name(set->tch.frame_format), VTY_NEWLINE); vty_out(vty, " alsa-output-dev %s%s", - set->audio.alsa_output_dev, VTY_NEWLINE); + set->tch.alsa_output_dev, VTY_NEWLINE); vty_out(vty, " alsa-input-dev %s%s", - set->audio.alsa_input_dev, VTY_NEWLINE); + set->tch.alsa_input_dev, VTY_NEWLINE); } if (ms->lua_script) @@ -2478,26 +2478,29 @@ SUP_EN_DI(vbs, "vbs", "Voice Broadcast Service (VBS)", 0); /* TCH config */ -DEFUN(cfg_ms_tch, cfg_ms_tch_cmd, "tch", +DEFUN(cfg_ms_tch, + cfg_ms_tch_cmd, + "tch", "Configure TCH (Traffic CHannel) settings\n") { vty->node = TCH_NODE; return CMD_SUCCESS; } -ALIAS_DEPRECATED(cfg_ms_tch, cfg_ms_audio_cmd, - "audio", "Configure audio settings\n"); +ALIAS_DEPRECATED(cfg_ms_tch, + cfg_ms_audio_cmd, + "audio", + "Configure audio settings\n"); - -static int set_audio_io_handler(struct vty *vty, enum audio_io_handler val) +static int set_voice_io_handler(struct vty *vty, enum tch_voice_io_handler val) { struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; struct gsm_settings *set = &ms->settings; /* Don't restart on unchanged value */ - if (val == set->audio.io_handler) + if (val == set->tch.voice_handler) return CMD_SUCCESS; - set->audio.io_handler = val; + set->tch.voice_handler = val; /* Restart required */ vty_restart_if_started(vty, ms); @@ -2505,59 +2508,77 @@ return CMD_SUCCESS; } -DEFUN(cfg_ms_tch_io_handler, cfg_ms_tch_io_handler_cmd, - "io-handler (none|gapk|l1phy|mncc-sock|loopback)", - "Set TCH frame I/O handler\n" - "No handler, drop TCH frames (default)\n" - "libosmo-gapk based I/O handler (requires ALSA)\n" - "L1 PHY (e.g. Calypso DSP in Motorola C1xx phones)\n" - "External MNCC application (e.g. LCR) via MNCC socket\n" - "Return TCH frame payload back to sender\n") +#define TCH_VOICE_IOH_SEL \ + "(none|gapk|l1phy|mncc-sock|loopback)" +#define TCH_VOICE_IOH_SEL_DESC \ + "No handler, drop TCH frames (default)\n" \ + "libosmo-gapk based I/O handler (requires ALSA)\n" \ + "L1 PHY (e.g. Calypso DSP in Motorola C1xx phones)\n" \ + "External MNCC application (e.g. LCR) via MNCC socket\n" \ + "Return TCH frame payload back to sender\n" + +DEFUN(cfg_ms_tch_voice_io_handler, + cfg_ms_tch_voice_io_handler_cmd, + "voice-io-handler " TCH_VOICE_IOH_SEL, + "Set TCH I/O handler for voice calls\n" + TCH_VOICE_IOH_SEL_DESC) { struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; - int val = get_string_value(audio_io_handler_names, argv[0]); + int val = get_string_value(tch_voice_io_handler_names, argv[0]); - if (val == AUDIO_IOH_MNCC_SOCK) { + if (val == TCH_VOICE_IOH_MNCC_SOCK) { if (ms->settings.mncc_handler != MNCC_HANDLER_INTERNAL) { - vty_out(vty, "Audio I/O handler 'mncc-sock' can only be used " + vty_out(vty, "TCH I/O handler 'mncc-sock' can only be used " "with MNCC handler 'external'%s", VTY_NEWLINE); return CMD_WARNING; } } #ifndef WITH_GAPK_IO - if (val == AUDIO_IOH_GAPK) { + if (val == TCH_VOICE_IOH_GAPK) { vty_out(vty, "GAPK I/O is not compiled in (--with-gapk-io)%s", VTY_NEWLINE); return CMD_WARNING; } #endif - return set_audio_io_handler(vty, val); + return set_voice_io_handler(vty, val); } -DEFUN(cfg_ms_tch_no_io_handler, cfg_ms_tch_no_io_handler_cmd, - "no io-handler", NO_STR "Disable TCH frame processing") +ALIAS_DEPRECATED(cfg_ms_tch_voice_io_handler, + cfg_ms_tch_io_handler_cmd, + "io-handler " TCH_VOICE_IOH_SEL, + "Set TCH I/O handler for voice calls\n" TCH_VOICE_IOH_SEL_DESC); + +DEFUN(cfg_ms_tch_no_voice_io_handler, + cfg_ms_tch_no_voice_io_handler_cmd, + "no voice-io-handler", + NO_STR "Disable TCH I/O handling for voice calls\n") { - return set_audio_io_handler(vty, AUDIO_IOH_NONE); + return set_voice_io_handler(vty, TCH_VOICE_IOH_NONE); } +ALIAS_DEPRECATED(cfg_ms_tch_no_voice_io_handler, + cfg_ms_tch_no_io_handler_cmd, + "no io-handler", + NO_STR "Disable TCH I/O handling for voice calls\n"); + DEFUN(cfg_ms_tch_io_tch_format, cfg_ms_tch_io_tch_format_cmd, "io-tch-format (rtp|ti)", "Set TCH I/O frame format used by the L1 PHY (for GAPK only)\n" "RTP format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n" "Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx)\n") { - int val = get_string_value(audio_io_format_names, argv[0]); + int val = get_string_value(tch_io_frame_format_names, argv[0]); struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; struct gsm_settings *set = &ms->settings; - if (set->audio.io_handler != AUDIO_IOH_GAPK) { + if (set->tch.voice_handler != TCH_VOICE_IOH_GAPK) { vty_out(vty, "This parameter is only valid for GAPK%s", VTY_NEWLINE); return CMD_WARNING; } OSMO_ASSERT(val >= 0); - set->audio.io_format = val; + set->tch.frame_format = val; return CMD_SUCCESS; } @@ -2571,7 +2592,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - OSMO_STRLCPY_ARRAY(set->audio.alsa_output_dev, argv[0]); + OSMO_STRLCPY_ARRAY(set->tch.alsa_output_dev, argv[0]); return CMD_SUCCESS; } @@ -2585,7 +2606,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - OSMO_STRLCPY_ARRAY(set->audio.alsa_input_dev, argv[0]); + OSMO_STRLCPY_ARRAY(set->tch.alsa_input_dev, argv[0]); return CMD_SUCCESS; } @@ -2848,6 +2869,8 @@ install_element(MS_NODE, &cfg_ms_no_script_load_run_cmd); install_node(&tch_node, config_write_dummy); + install_element(TCH_NODE, &cfg_ms_tch_voice_io_handler_cmd); + install_element(TCH_NODE, &cfg_ms_tch_no_voice_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_no_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_io_tch_format_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34912?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: If6c799d11e225ad00ca5da5ae63dca20568a0ce0 Gerrit-Change-Number: 34912 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Use correct mobile identiy in TALKER INDICATION message

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34865?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Use correct mobile identiy in TALKER INDICATION message ...................................................................... ASCI: Use correct mobile identiy in TALKER INDICATION message Use TMSI only if valid in the current location area. If the MS moves to a different location area and joins a group call before location update, TMSI is not valid. Then use IMSI instead. If no IMSI/TSMI is available, send mobile identity without IMSI/TMSI. Change-Id: I299604a0e12d91e9133b70757826ac9637da0e3e Related: OS#5364 --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 29 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 3200412..b898090 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -2085,6 +2085,8 @@ static int gsm48_rr_tx_talker_indication(struct osmocom_ms *ms) { struct gsm48_rrlayer *rr = &ms->rrlayer; + struct gsm_subscriber *subscr = &ms->subscr; + struct gsm322_cellsel *cs = &ms->cellsel; struct msgb *nmsg; struct gsm48_hdr *gh; struct gsm48_talker_indication *ti; @@ -2103,8 +2105,18 @@ /* classmark 2 */ ti->cm2_len = sizeof(ti->cm2); gsm48_rr_enc_cm2(ms, &ti->cm2, rr->cd_now.arfcn); - /* mobile identity (Use TMSI if available.) */ - gsm48_encode_mi_lv(ms, nmsg, GSM_MI_TYPE_TMSI, false); + + /* mobile identity */ + if (ms->subscr.tmsi != GSM_RESERVED_TMSI && (osmo_lai_cmp(&subscr->lai, &cs->sel_cgi.lai) == 0)) { + gsm48_encode_mi_lv(ms, nmsg, GSM_MI_TYPE_TMSI, false); + LOGP(DRR, LOGL_INFO, "Sending TALKER INDICATION with TMSI.\n"); + } else if (subscr->imsi[0]) { + gsm48_encode_mi_lv(ms, nmsg, GSM_MI_TYPE_IMSI, false); + LOGP(DRR, LOGL_INFO, "Sending TALKER INDICATION with IMSI.\n"); + } else { + gsm48_encode_mi_lv(ms, nmsg, GSM_MI_TYPE_NONE, false); + LOGP(DRR, LOGL_INFO, "Sending TALKER INDICATION without TMSI/IMSI.\n"); + } /* start establishmnet */ return gsm48_send_rsl(ms, RSL_MT_EST_REQ, nmsg, 0); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34865?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: I299604a0e12d91e9133b70757826ac9637da0e3e Gerrit-Change-Number: 34865 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: ASCI: Handle rejection of voice group/broadcast call correctly

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email ) Change subject: ASCI: Handle rejection of voice group/broadcast call correctly ...................................................................... ASCI: Handle rejection of voice group/broadcast call correctly If joining a call gets rejected, the call must not be released, instead it must return to U3 state (incoming call), because the call still exists in the cell and it might possible to join it later. If a call notification is gone, a new event is used in the state machine to release incoming call. Change-Id: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Related: OS#5364 --- M src/host/layer23/src/mobile/gsm44068_gcc_bcc.c 1 file changed, 43 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c index 0cef1c3..4fe0b82 100644 --- a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c +++ b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c @@ -138,10 +138,11 @@ VGCS_GCC_EV_DI_CONNECT, /* network indicates connect */ VGCS_GCC_EV_TIMEOUT, /* several timeout events */ VGCS_GCC_EV_SETUP_IND, /* notification of ongoing call received */ + VGCS_GCC_EV_REL_IND, /* notification of call being gone */ VGCS_GCC_EV_JOIN_GC_REQ, /* user wants to join ongoing call */ VGCS_GCC_EV_JOIN_GC_CNF, /* MM confirms joining ongoing call */ VGCS_GCC_EV_ABORT_REQ, /* user rejects or leaves call */ - VGCS_GCC_EV_ABORT_IND, /* MM indicates call gone / channel released or failed */ + VGCS_GCC_EV_ABORT_IND, /* MM indicates channel released or failed */ VGCS_GCC_EV_TALK_REQ, /* user wants to talk */ VGCS_GCC_EV_TALK_CNF, /* MM confirms talk */ VGCS_GCC_EV_TALK_REJ, /* MM rejects talk */ @@ -162,6 +163,7 @@ OSMO_VALUE_STRING(VGCS_GCC_EV_DI_CONNECT), OSMO_VALUE_STRING(VGCS_GCC_EV_TIMEOUT), OSMO_VALUE_STRING(VGCS_GCC_EV_SETUP_IND), + OSMO_VALUE_STRING(VGCS_GCC_EV_REL_IND), OSMO_VALUE_STRING(VGCS_GCC_EV_JOIN_GC_REQ), OSMO_VALUE_STRING(VGCS_GCC_EV_JOIN_GC_CNF), OSMO_VALUE_STRING(VGCS_GCC_EV_ABORT_REQ), @@ -1104,7 +1106,7 @@ /* Change to GROUP CALL PRESENT state. */ osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U3_GROUP_CALL_PRESENT, 0, 0); break; - case VGCS_GCC_EV_ABORT_IND: + case VGCS_GCC_EV_REL_IND: /* The MM layer indicates that group channel is gone. */ LOG_GCC(trans, LOGL_INFO, "Group call notification is gone.\n"); /* Change to NULL state. */ @@ -1165,12 +1167,12 @@ /* Free transaction. */ trans_free(trans); break; - case VGCS_GCC_EV_ABORT_IND: + case VGCS_GCC_EV_REL_IND: /* The notified call is gone. */ LOG_GCC(trans, LOGL_INFO, "Received call from network is gone.\n"); /* Change to NULL state. */ osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U0_NULL, 0, 0); - /* Notify termination at VTY. (No cause, because notification is gone.) */ + /* Notify termination at VTY. */ vgcs_vty_notify(trans, "Released\n"); /* Free transaction. */ trans_free(trans); @@ -1193,6 +1195,7 @@ static void vgcs_gcc_fsm_u4_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_trans *trans = fi->priv; + uint8_t *cause = data; switch (event) { case VGCS_GCC_EV_JOIN_GC_CNF: @@ -1209,16 +1212,24 @@ /* Free transaction. */ trans_free(trans); break; - case VGCS_GCC_EV_ABORT_IND: + case VGCS_GCC_EV_REL_IND: /* The notified call is gone. */ LOG_GCC(trans, LOGL_INFO, "Received call from network is gone.\n"); /* Change to NULL state. */ osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U0_NULL, 0, 0); - /* Notify termination at VTY. (No cause, because notification is gone.) */ + /* Notify termination at VTY. */ vgcs_vty_notify(trans, "Released\n"); /* Free transaction. */ trans_free(trans); break; + case VGCS_GCC_EV_ABORT_IND: + /* The notified call is gone. */ + LOG_GCC(trans, LOGL_INFO, "Call rejected.\n"); + /* Change back to U3 state, so that call may be joined later. */ + osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U3_GROUP_CALL_PRESENT, 0, 0); + /* Notify termination at VTY. */ + vgcs_vty_notify(trans, "Released (cause %d)\n", *cause); + break; case VGCS_GCC_EV_TIMEOUT: /* Group channel timed out. */ LOG_GCC(trans, LOGL_INFO, "Timeout waiting for group channel.\n"); @@ -1417,7 +1428,7 @@ .in_event_mask = S(VGCS_GCC_EV_SETUP_IND) | S(VGCS_GCC_EV_TERM_REQ) | S(VGCS_GCC_EV_ABORT_REQ) | - S(VGCS_GCC_EV_ABORT_IND) | + S(VGCS_GCC_EV_REL_IND) | S(VGCS_GCC_EV_TIMEOUT), .out_state_mask = S(VGCS_GCC_ST_U2r_U6_GROUP_CALL_ACTIVE) | S(VGCS_GCC_ST_U4_GROUP_CALL_CONN_REQUEST) | @@ -1430,7 +1441,7 @@ .name = "GROUP CALL PRESENT (U3)", .in_event_mask = S(VGCS_GCC_EV_JOIN_GC_REQ) | S(VGCS_GCC_EV_ABORT_REQ) | - S(VGCS_GCC_EV_ABORT_IND), + S(VGCS_GCC_EV_REL_IND), .out_state_mask = S(VGCS_GCC_ST_U0_NULL) | S(VGCS_GCC_ST_U4_GROUP_CALL_CONN_REQUEST) | S(VGCS_GCC_ST_U2nc_GROUP_CALL_ACTIVE), @@ -1441,9 +1452,11 @@ .name = "GROUP CALL CONNECTION REQUEST (U4)", .in_event_mask = S(VGCS_GCC_EV_JOIN_GC_CNF) | S(VGCS_GCC_EV_ABORT_REQ) | + S(VGCS_GCC_EV_REL_IND) | S(VGCS_GCC_EV_ABORT_IND) | S(VGCS_GCC_EV_TIMEOUT), .out_state_mask = S(VGCS_GCC_ST_U2r_U6_GROUP_CALL_ACTIVE) | + S(VGCS_GCC_ST_U3_GROUP_CALL_PRESENT) | S(VGCS_GCC_ST_U0_NULL), .onenter = vgcs_gcc_fsm_u4_onenter, .action = vgcs_gcc_fsm_u4_action, @@ -1610,7 +1623,6 @@ uint8_t pdisc; struct gsm_trans *trans; int rc = 0; - uint8_t cause; /* Check for message class and get protocol type. */ switch ((msg_type & GSM48_MMXX_MASK)) { @@ -1684,6 +1696,9 @@ case GSM48_MMBCC_ERR_IND: case GSM48_MMGCC_REL_IND: case GSM48_MMBCC_REL_IND: + /* Ignore release confirm or release collision. */ + if (trans->gcc.fi->state == VGCS_GCC_ST_U3_GROUP_CALL_PRESENT) + break; /* If MM fails or is rejected during U0.p state, this is a MM-EST-REJ. */ if (trans->gcc.fi->state == VGCS_GCC_ST_U0p_MM_CONNECTION_PENDING) osmo_fsm_inst_dispatch(trans->gcc.fi, VGCS_GCC_EV_MM_EST_REJ, &mmh->cause); @@ -1713,9 +1728,8 @@ if (trans->gcc.fi->state == VGCS_GCC_ST_U3_GROUP_CALL_PRESENT || trans->gcc.fi->state == VGCS_GCC_ST_U4_GROUP_CALL_CONN_REQUEST || trans->gcc.fi->state == VGCS_GCC_ST_U2nc_GROUP_CALL_ACTIVE) { - /* If notification is gone, abort pending received call. */ - cause = GSM48_CC_CAUSE_NORM_CALL_CLEAR; - osmo_fsm_inst_dispatch(trans->gcc.fi, VGCS_GCC_EV_ABORT_IND, &cause); + /* If notification is gone, release pending received call. */ + osmo_fsm_inst_dispatch(trans->gcc.fi, VGCS_GCC_EV_REL_IND, NULL); } break; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34864?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: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Gerrit-Change-Number: 34864 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: ASCI: Add option to join voice group/broadcast calls without valid SIM

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34866?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Add option to join voice group/broadcast calls without valid SIM ...................................................................... ASCI: Add option to join voice group/broadcast calls without valid SIM This option must be enabled in the VTY and is disabled by default. Calls can be joined when service is limited or normal. With that option enabled, calls can be joined even with invalid SIM. Talking is allowed when service is normal. With that option enabled, talking is always allowed. It depends on the network, if it accepts the talker. Change-Id: I6ea851a8cb015ff685b985335968c6184beca816 Related: OS#5364 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 75 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 884578b..3b9473f 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -191,6 +191,7 @@ /* ASCI settings */ bool uplink_release_local; + bool asci_allow_any; }; struct gsm_settings_abbrev { diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 5e02659..378cd2d 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -61,7 +61,9 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg); static int gsm48_mm_loc_upd_periodic(struct osmocom_ms *ms, struct msgb *msg); static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg); +static int gsm48_mm_group_reject(struct osmocom_ms *ms, struct msgb *msg); static int gsm48_mm_group_rel_req(struct osmocom_ms *ms, struct msgb *msg); +static int gsm48_mm_uplink_reject(struct osmocom_ms *ms, struct msgb *msg); /* * notes @@ -3805,9 +3807,13 @@ static int gsm48_mm_group_req(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm_settings *set = &ms->settings; struct gsm48_mmxx_hdr *mmh = (struct gsm48_mmxx_hdr *)msg->data; struct msgb *nmsg; + if (mm->substate == GSM48_MM_SST_NO_IMSI && !set->asci_allow_any) + return gsm48_mm_group_reject(ms, msg); + LOGP(DMM, LOGL_INFO, "Request for joining a group call, trying to establish group receive mode.\n"); /* Store infos about group/broadcast call. */ @@ -3881,6 +3887,7 @@ static int gsm48_mm_group_rel_ind(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm_subscriber *subscr = &ms->subscr; struct gsm48_rr_hdr *rrh = (struct gsm48_rr_hdr *)msg->data; uint16_t msg_type; struct msgb *nmsg; @@ -3892,8 +3899,10 @@ mm->vgcs.enabled = false; /* Change mode back to normal or limited service. */ - if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) - new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); + if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) { + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (subscr->sim_valid) ? GSM48_MM_SST_LIMITED_SERVICE + : GSM48_MM_SST_NO_IMSI); + } if (mm->substate == GSM48_MM_SST_RX_VGCS_NORMAL) new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); @@ -3932,6 +3941,7 @@ static int gsm48_mm_group_rel_req(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm_subscriber *subscr = &ms->subscr; struct msgb *nmsg; LOGP(DMM, LOGL_INFO, "Request to release group call in receive or transmit mode.\n"); @@ -3940,8 +3950,10 @@ mm->vgcs.enabled = false; /* Change mode back to normal or limited service. */ - if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) - new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); + if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) { + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (subscr->sim_valid) ? GSM48_MM_SST_LIMITED_SERVICE + : GSM48_MM_SST_NO_IMSI); + } if (mm->substate == GSM48_MM_SST_RX_VGCS_NORMAL) new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); @@ -3960,8 +3972,12 @@ static int gsm48_mm_uplink_req(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm_settings *set = &ms->settings; struct msgb *nmsg; + if (mm->substate != GSM48_MM_SST_RX_VGCS_NORMAL && !set->asci_allow_any) + return gsm48_mm_uplink_reject(ms, msg); + LOGP(DMM, LOGL_INFO, "Request for uplink, trying to establish group transmit mode.\n"); /* Go into uplink pending state. */ @@ -4201,6 +4217,12 @@ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_NO_IMSI), GSM48_MMCC_EST_REQ, gsm48_mm_init_mm_no_rr}, + {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_NO_IMSI), + GSM48_MMBCC_GROUP_REQ, gsm48_mm_group_req}, + + {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_NO_IMSI), + GSM48_MMGCC_GROUP_REQ, gsm48_mm_group_req}, + /* 4.2.2.5 PLMN search, normal service */ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_PLMN_SEARCH_NORMAL), GSM48_MMCC_EST_REQ, gsm48_mm_init_mm_no_rr}, @@ -4254,10 +4276,10 @@ GSM48_MMBCC_REL_REQ, gsm48_mm_group_rel_req}, {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_RX_VGCS_LIMITED), - GSM48_MMGCC_UPLINK_REQ, gsm48_mm_uplink_reject}, + GSM48_MMGCC_UPLINK_REQ, gsm48_mm_uplink_req}, {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_RX_VGCS_LIMITED), - GSM48_MMBCC_UPLINK_REQ, gsm48_mm_uplink_reject}, + GSM48_MMBCC_UPLINK_REQ, gsm48_mm_uplink_req}, /* 4.5.1.1 MM Connection (EST) */ {SBIT(GSM48_MM_ST_RR_CONN_RELEASE_NA), ALL_STATES, diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 1766071..7611c0f 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1327,6 +1327,9 @@ if (!l23_vty_hide_default || !set->uplink_release_local) vty_out(vty, " %suplink-release-local%s", (set->uplink_release_local) ? "no " : "", VTY_NEWLINE); + if (!l23_vty_hide_default || set->asci_allow_any) + vty_out(vty, " %sasci-allow-any%s", + (set->asci_allow_any) ? "" : "no ", VTY_NEWLINE); vty_out(vty, " audio%s", VTY_NEWLINE); vty_out(vty, " io-handler %s%s", @@ -1997,6 +2000,28 @@ return CMD_SUCCESS; } +DEFUN(cfg_ms_asci_allow_any, cfg_ms_asci_allow_any_cmd, "asci-allow-any", + "Allow any ASCI related call feature, even if service is limited or SIM invalid.") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->asci_allow_any = true; + + return CMD_SUCCESS; +} + +DEFUN(cfg_ms_no_asci_allow_any, cfg_ms_no_asci_allow_any_cmd, "no asci-allow-any", + NO_STR "Do not allow any ASCI related call feature, if service is not normal.") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->asci_allow_any = false; + + return CMD_SUCCESS; +} + static int config_write_dummy(struct vty *vty) { return CMD_SUCCESS; @@ -2586,6 +2611,8 @@ install_element(MS_NODE, &cfg_ms_no_sms_store_cmd); install_element(MS_NODE, &cfg_ms_uplink_release_local_cmd); install_element(MS_NODE, &cfg_ms_no_uplink_release_local_cmd); + install_element(MS_NODE, &cfg_ms_asci_allow_any_cmd); + install_element(MS_NODE, &cfg_ms_no_asci_allow_any_cmd); install_element(MS_NODE, &cfg_ms_support_cmd); install_node(&support_node, config_write_dummy); install_element(SUPPORT_NODE, &cfg_ms_set_en_cc_dtmf_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34866?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: I6ea851a8cb015ff685b985335968c6184beca816 Gerrit-Change-Number: 34866 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Correctly set and store 'uplink-release-local' flag

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34867?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Correctly set and store 'uplink-release-local' flag ...................................................................... ASCI: Correctly set and store 'uplink-release-local' flag Also this option is enabled by default and show in the VTY if it is disabled. Change-Id: I6af44f0dd7ff842de633587fb0dcbe78126d30e1 Related: OS#5364 --- M src/host/layer23/src/common/settings.c M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 16 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 395d239..e79a6a1 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -116,6 +116,8 @@ INIT_LLIST_HEAD(&set->abbrev); + set->uplink_release_local = true; + return 0; } diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 7611c0f..aaf01bd 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1326,7 +1326,7 @@ set->any_timeout, VTY_NEWLINE); if (!l23_vty_hide_default || !set->uplink_release_local) vty_out(vty, " %suplink-release-local%s", - (set->uplink_release_local) ? "no " : "", VTY_NEWLINE); + (!set->uplink_release_local) ? "no " : "", VTY_NEWLINE); if (!l23_vty_hide_default || set->asci_allow_any) vty_out(vty, " %sasci-allow-any%s", (set->asci_allow_any) ? "" : "no ", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34867?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: I6af44f0dd7ff842de633587fb0dcbe78126d30e1 Gerrit-Change-Number: 34867 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email ) Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... Patch Set 5: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34899/comment/475d29d4_224fce15 PS5, Line 421: <= shouldn't this be `>=`? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 15:39:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_parse_audio_port_pt(): fix buffer overflow

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email ) Change subject: mgcp_parse_audio_port_pt(): fix buffer overflow ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18c78d15eb1593f404b4741248225b68878b463f Gerrit-Change-Number: 34898 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 15:29:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Test Handover from Wifi back to LTE

by pespin

Attention is currently required from: fixeria, lynxis lazus, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34895?usp=email ) Change subject: epdg: Test Handover from Wifi back to LTE ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Sorry I forgot to submit the comments I wrote some time ago. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34895?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: I299faf28fa51dbc5d2de6c72a39a01eca67a5775 Gerrit-Change-Number: 34895 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 27 Oct 2023 14:14:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Test Handover from Wifi back to LTE

by pespin

Attention is currently required from: fixeria, lynxis lazus, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34895?usp=email ) Change subject: epdg: Test Handover from Wifi back to LTE ...................................................................... Patch Set 2: (2 comments) File epdg/EPDG_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34895/comment/a103b860_cd68… PS1, Line 451: setverdict(pass); > you explicitly mention cause="Access changed from non-3gpp to 3gpp" below. […] The cause you mention is sent by us (ttcn3 emulating PGW) to osmo-epdg in DeleteBearerRequest, so no need to validate what we are sending here :) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34895/comment/dc9aa6df_2511… PS1, Line 459: /* f_gtp2_register_udmsg('63'O); TODO: is this needed? */ > do you want to keep this? (if the test works without it, I guess it is not needed?) Ack I forgot to drop it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34895?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: I299faf28fa51dbc5d2de6c72a39a01eca67a5775 Gerrit-Change-Number: 34895 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 27 Oct 2023 14:14:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Notify talker in the VTY that he cannot leave the call while ta...

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34906?usp=email ) Change subject: ASCI: Notify talker in the VTY that he cannot leave the call while talking ...................................................................... Patch Set 1: (1 comment) File src/host/layer23/src/mobile/gsm44068_gcc_bcc.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34906/comment/7968503b_8b8c86b6 PS1, Line 1854: vgcs_vty_notify(trans, "Cannot leave while talking\n"); shouldn't this be returning an error instead of changing state below? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34906?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: I497efc5bddc122cd5744de531917aad415ac1654 Gerrit-Change-Number: 34906 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 27 Oct 2023 13:18:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: ASCI: Handle rejection of voice group/broadcast call correctly

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email ) Change subject: ASCI: Handle rejection of voice group/broadcast call correctly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34864?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: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Gerrit-Change-Number: 34864 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 27 Oct 2023 13:17:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... Patch Set 4: (2 comments) File include/osmocom/mgcp_client/mgcp_client.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/8a74db89_39be3094 PS4, Line 165: * Not all pointers contained in the mgcp_response */ what do you mean with this? File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/3ad1f3d1_95caf45c PS4, Line 848: fflush(stderr); is this really needed? Specially for stderr, it makes no sense imho, because stderr is not buffered. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 12:35:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email ) Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 12:20:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_parse_audio_port_pt(): fix buffer overflow

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email ) Change subject: mgcp_parse_audio_port_pt(): fix buffer overflow ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18c78d15eb1593f404b4741248225b68878b463f Gerrit-Change-Number: 34898 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 12:12:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp-client: MGCP response: pass fmtp to caller

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email ) Change subject: mgcp-client: MGCP response: pass fmtp to caller ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If8ca5c3880cad9e41b80e9d1c821439b0d7b7e23 Gerrit-Change-Number: 34905 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 12:10:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34888?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx ...................................................................... ASCI: Enable voice group/broadcast call feature at osmo-bts-trx Related: OS#4851 Change-Id: I3a2e3f94812cec0bbf7e3674172437fa359d014c --- M src/osmo-bts-trx/main.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index c1f5716..c2d1e31 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -156,6 +156,8 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1); osmo_bts_set_feature(bts->features, BTS_FEAT_VAMOS); + osmo_bts_set_feature(bts->features, BTS_FEAT_VGCS); + osmo_bts_set_feature(bts->features, BTS_FEAT_VBS); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_INTERF_MEAS); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34888?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: I3a2e3f94812cec0bbf7e3674172437fa359d014c Gerrit-Change-Number: 34888 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-trx

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-trx ...................................................................... ASCI: Add control of uplink access to osmo-bts-trx An MPH-INFO message is used to turn detection of uplink access bursts on or off. This is required for voice group/broadcast channels. Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: I9045437d52984b7abe00fbc815d7f83c62c0fb5a --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c 3 files changed, 61 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 94333ea..b9c7350 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -186,6 +186,9 @@ /*! \brief set all matching logical channels active/inactive */ int trx_sched_set_lchan(struct gsm_lchan *lchan, uint8_t chan_nr, uint8_t link_id, bool active); +/*! \brief set uplink access on given logical channels active/inactive */ +int trx_sched_set_ul_access(struct gsm_lchan *lchan, uint8_t chan_nr, bool active); + /*! \brief set all logical channels of BCCH/CCCH active/inactive */ int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active); diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e68d01f..0e62b65 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1144,6 +1144,33 @@ return found ? 0 : -EINVAL; } +int trx_sched_set_ul_access(struct gsm_lchan *lchan, uint8_t chan_nr, bool active) +{ + struct l1sched_ts *l1ts = lchan->ts->priv; + uint8_t tn = L1SAP_CHAN2TS(chan_nr); + uint8_t ss = l1sap_chan2ss(chan_nr); + int i; + + if (!l1ts) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "%s UL access on lchan with uninitialized scheduler structure.\n", + (active) ? "Activating" : "Deactivating"); + return -EINVAL; + } + + /* look for all matching chan_nr */ + for (i = 0; i < _TRX_CHAN_MAX; i++) { + if (trx_chan_desc[i].chan_nr == (chan_nr & RSL_CHAN_NR_MASK)) { + struct l1sched_chan_state *l1cs = &l1ts->chan_state[i]; + + l1cs->ho_rach_detect = active; + } + } + + _sched_act_rach_det(lchan->ts->trx, tn, ss, active); + + return 0; +} + int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active) { struct l1sched_ts *l1ts = lchan->ts->priv; diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index ab66094..54f5bd2 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -417,10 +417,18 @@ /* put data into scheduler's queue */ return trx_sched_tch_req(trx, l1sap); case OSMO_PRIM(PRIM_MPH_INFO, PRIM_OP_REQUEST): - if (l1sap->u.info.type == PRIM_INFO_ACT_CIPH) + switch (l1sap->u.info.type) { + case PRIM_INFO_ACT_CIPH: chan_nr = l1sap->u.info.u.ciph_req.chan_nr; - else /* u.act_req used by PRIM_INFO_{ACTIVATE,DEACTIVATE,MODIFY} */ + break; + case PRIM_INFO_ACT_UL_ACC: + case PRIM_INFO_DEACT_UL_ACC: + chan_nr = l1sap->u.info.u.ulacc_req.chan_nr; + break; + default: + /* u.act_req used by PRIM_INFO_{ACTIVATE,DEACTIVATE,MODIFY} */ chan_nr = l1sap->u.info.u.act_req.chan_nr; + } lchan = get_lchan_by_chan_nr(trx, chan_nr); if (OSMO_UNLIKELY(lchan == NULL)) { LOGP(DL1C, LOGL_ERROR, @@ -437,6 +445,12 @@ if (l1sap->u.info.u.ciph_req.downlink) l1if_set_ciphering(lchan, chan_nr, 1); break; + case PRIM_INFO_ACT_UL_ACC: + trx_sched_set_ul_access(lchan, chan_nr, true); + break; + case PRIM_INFO_DEACT_UL_ACC: + trx_sched_set_ul_access(lchan, chan_nr, false); + break; case PRIM_INFO_ACTIVATE: if ((chan_nr & 0xE0) == 0x80) { LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Cannot activate" @@ -458,8 +472,7 @@ lchan->tch.amr_mr.mode[2].mode, lchan->tch.amr_mr.mode[3].mode, amr_get_initial_mode(lchan), - (lchan->ho.active == HANDOVER_ENABLED) || - rsl_chan_rt_is_asci(lchan->rsl_chan_rt)); + (lchan->ho.active == HANDOVER_ENABLED)); /* set lchan active */ lchan_set_state(lchan, LCHAN_S_ACTIVE); /* set initial ciphering */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34886?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: I9045437d52984b7abe00fbc815d7f83c62c0fb5a Gerrit-Change-Number: 34886 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-sysmo

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-sysmo ...................................................................... ASCI: Add control of uplink access to osmo-bts-sysmo An MPH-INFO message is used to turn detection of uplink access bursts on or off. This is required for voice group/broadcast channels. Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: I61f232aa91191dae08404c1f08cad91964d74568 --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/l1_if.h M src/osmo-bts-sysmo/oml.c 3 files changed, 36 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 4ab2ef6..49a8c5d 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -604,6 +604,15 @@ else l1if_rsl_chan_rel(lchan); break; + case PRIM_INFO_ACT_UL_ACC: + case PRIM_INFO_DEACT_UL_ACC: + chan_nr = l1sap->u.info.u.ulacc_req.chan_nr; + lchan = get_lchan_by_chan_nr(trx, chan_nr); + if (l1sap->u.info.type == PRIM_INFO_ACT_UL_ACC) + l1if_set_ul_acc(lchan, true); + else + l1if_set_ul_acc(lchan, false); + break; default: LOGP(DL1C, LOGL_NOTICE, "unknown MPH-INFO.req %d\n", l1sap->u.info.type); diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h index 5b2da04..c81b6bd 100644 --- a/src/osmo-bts-sysmo/l1_if.h +++ b/src/osmo-bts-sysmo/l1_if.h @@ -145,6 +145,7 @@ int l1if_rsl_chan_mod(struct gsm_lchan *lchan); int l1if_rsl_deact_sacch(struct gsm_lchan *lchan); int l1if_rsl_mode_modify(struct gsm_lchan *lchan); +int l1if_set_ul_acc(struct gsm_lchan *lchan, bool active); /* calibration loading */ int calib_load(struct femtol1_hdl *fl1h); diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 9b760a3..e19c481 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1172,8 +1172,8 @@ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to activate lchan, but commands in queue\n"); /* For handover, always start the main channel immediately. lchan->want_dl_sacch_active indicates whether dl - * SACCH should be activated. Also, for HO and VGCS listener/talker detection, start the RACH SAPI. */ - if (lchan->ho.active == HANDOVER_ENABLED || rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) + * SACCH should be activated. */ + if (lchan->ho.active == HANDOVER_ENABLED) enqueue_sapi_act_cmd(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink); for (i = 0; i < s4l->num_sapis; i++) { @@ -1470,6 +1470,16 @@ return 0; } +int l1if_set_ul_acc(struct gsm_lchan *lchan, bool active) +{ + if (active) + enqueue_sapi_act_cmd(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink); + else + check_sapi_release(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink); + + return 0; +} + int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) { if (lchan->state != LCHAN_S_ACTIVE) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?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: I61f232aa91191dae08404c1f08cad91964d74568 Gerrit-Change-Number: 34887 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... ASCI: Control uplink access bursts detection of physical interface An MPH-INFO message is used to turn detection of uplink access bursts on or off. Whenever the uplink on a voice group channel is free, the uplink access burst detection is turned on. When the uplink access is granted to a talker or when the calling subscriber has been assigned to the channel, the uplink access burst detection is turned off until the uplink becomes free again. Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: I92d6773a3a463eb747143c85aa149e54c1fda122 --- M include/osmo-bts/asci.h M include/osmo-bts/l1sap.h M src/common/asci.c M src/common/l1sap.c M src/common/lchan.c M src/common/rsl.c 6 files changed, 80 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/asci.h b/include/osmo-bts/asci.h index 59b48b2..9980296 100644 --- a/include/osmo-bts/asci.h +++ b/include/osmo-bts/asci.h @@ -11,11 +11,13 @@ void vgcs_rach(struct gsm_lchan *lchan, uint8_t ra, uint8_t acc_delay, uint32_t fn); +void vgcs_lchan_activate(struct gsm_lchan *lchan); + void vgcs_lchan_react(struct gsm_lchan *lchan); void vgcs_talker_frame(struct gsm_lchan *lchan); -void vgcs_talker_reset(struct gsm_lchan *lchan); +void vgcs_talker_reset(struct gsm_lchan *lchan, bool ul_access); void vgcs_listener_reset(struct gsm_lchan *lchan); diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 353fc90..34259bd 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -102,6 +102,7 @@ int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_deact_sacch(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr); +int l1sap_uplink_access(struct gsm_lchan *lchan, bool active); enum l1sap_common_sapi { L1SAP_COMMON_SAPI_UNKNOWN, diff --git a/src/common/asci.c b/src/common/asci.c index ccaacd8..88d40e7 100644 --- a/src/common/asci.c +++ b/src/common/asci.c @@ -126,9 +126,9 @@ /* Stop RACH detection, wait for valid frame */ lchan->asci.talker_active = VGCS_TALKER_WAIT_FRAME; - if (l1sap_chan_modify(lchan->ts->trx, gsm_lchan2chan_nr(lchan)) != 0) { - LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "failed to modify channel after TALKER DET\n"); - rsl_tx_conn_fail(lchan, RSL_ERR_TALKER_ACC_FAIL); + if (l1sap_uplink_access(lchan, false) != 0) { + LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink access after TALKER DET.\n"); + rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL); lchan->asci.talker_active = VGCS_TALKER_NONE; return; } @@ -151,11 +151,25 @@ } } +/* Received channel activation. */ +void vgcs_lchan_activate(struct gsm_lchan *lchan) +{ + LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Channel is activated.\n"); + if (l1sap_uplink_access(lchan, true) != 0) { + LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to activate uplink access after channel activation.\n"); + rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL); + } +} + /* Received channel reactivation. (for assignment) */ void vgcs_lchan_react(struct gsm_lchan *lchan) { LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Channel is activated for assignment.\n"); lchan->asci.talker_active = VGCS_TALKER_WAIT_FRAME; + if (l1sap_uplink_access(lchan, false) != 0) { + LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink access for assignment.\n"); + rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL); + } radio_link_timeout_reset(lchan); } @@ -169,7 +183,7 @@ } /* Release VGCS Talker state. */ -void vgcs_talker_reset(struct gsm_lchan *lchan) +void vgcs_talker_reset(struct gsm_lchan *lchan, bool ul_access) { if (lchan->asci.talker_active == VGCS_TALKER_NONE) return; @@ -179,8 +193,15 @@ /* Stop T3115 */ osmo_timer_del(&lchan->asci.t3115); - /* Talker detection done */ + /* Talker released. */ lchan->asci.talker_active = VGCS_TALKER_NONE; + if (ul_access) { + if (l1sap_uplink_access(lchan, true) != 0) { + LOGPLCHAN(lchan, DASCI, LOGL_ERROR, + "Failed to activate uplink access after uplink became free.\n"); + rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL); + } + } } /* Release VGCS Listener state. */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 844fdad..c599726 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -2444,3 +2444,26 @@ return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_MODIFY, 0); } + +int l1sap_uplink_access(struct gsm_lchan *lchan, bool active) +{ + uint8_t chan_nr = gsm_lchan2chan_nr(lchan); + struct osmo_phsap_prim l1sap; + + if (lchan->state != LCHAN_S_ACTIVE && !rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Channel %s is not an active ASCI type channel.\n", + rsl_chan_nr_str(chan_nr)); + return -EINVAL; + } + + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "%s uplink access detection on channel %s\n", + (active) ? "Activating" : "Deactivating", rsl_chan_nr_str(chan_nr)); + + + memset(&l1sap, 0, sizeof(l1sap)); + osmo_prim_init(&l1sap.oph, SAP_GSM_PH, PRIM_MPH_INFO, PRIM_OP_REQUEST, NULL); + l1sap.u.info.type = (active) ? PRIM_INFO_ACT_UL_ACC : PRIM_INFO_DEACT_UL_ACC; + l1sap.u.info.u.ulacc_req.chan_nr = chan_nr; + + return l1sap_down(lchan->ts->trx, &l1sap); +} diff --git a/src/common/lchan.c b/src/common/lchan.c index bd50349..6178200 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -219,7 +219,7 @@ /* release handover, listener and talker states */ handover_reset(lchan); - vgcs_talker_reset(lchan); + vgcs_talker_reset(lchan, false); vgcs_listener_reset(lchan); vgcs_uplink_free_reset(lchan); diff --git a/src/common/rsl.c b/src/common/rsl.c index 09723be..deeb255 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2207,8 +2207,12 @@ lchan->top_acch_active = false; /* set ASCI channel into right state */ - if (reactivation && rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) - vgcs_lchan_react(lchan); + if (rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) { + if (reactivation) + vgcs_lchan_react(lchan); + else + vgcs_lchan_activate(lchan); + } /* on reactivation, the channel is already activated */ if (reactivation) { @@ -3618,7 +3622,7 @@ /* VGCS Uplink is released by MSC using REL-REQ. */ if (rh->c.msg_type == RSL_MT_REL_REQ) - vgcs_talker_reset(lchan); + vgcs_talker_reset(lchan, true); LOGPLCHAN(lchan, DRLL, LOGL_DEBUG, "Rx RLL %s Abis -> LAPDm\n", rsl_msg_name(rh->c.msg_type)); @@ -3840,7 +3844,7 @@ /* REL_IND handling */ if (rh->msg_type == RSL_MT_REL_IND && lchan_is_tch(lchan)) { - vgcs_talker_reset(lchan); + vgcs_talker_reset(lchan, true); LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Scheduling %s to L3 in next associated TCH-RTS.ind\n", rsl_msg_name(rh->msg_type)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Add library requirements for uplink access to TODO-RELEASE

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34907?usp=email ) Change subject: ASCI: Add library requirements for uplink access to TODO-RELEASE ...................................................................... ASCI: Add library requirements for uplink access to TODO-RELEASE Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: Ic7807b69bbecd84b7a30d45b599b688acfd2ddc0 --- M TODO-RELEASE 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 7ac9302..1ed7b53 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmogsm >1.9.0 added new PRIM_INFO to include/osmocom/gsm/l1sap.h -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34907?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: Ic7807b69bbecd84b7a30d45b599b688acfd2ddc0 Gerrit-Change-Number: 34907 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Add library requirements for uplink access to TODO-RELEASE

by fixeria

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34907?usp=email ) Change subject: ASCI: Add library requirements for uplink access to TODO-RELEASE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34907?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: Ic7807b69bbecd84b7a30d45b599b688acfd2ddc0 Gerrit-Change-Number: 34907 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 27 Oct 2023 10:08:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Oct 2023 10:07:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-sysmo

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-sysmo ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?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: I61f232aa91191dae08404c1f08cad91964d74568 Gerrit-Change-Number: 34887 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Oct 2023 10:06:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-trx

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-trx ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34886?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: I9045437d52984b7abe00fbc815d7f83c62c0fb5a Gerrit-Change-Number: 34886 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Oct 2023 10:06:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface

by jolly

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email to look at the new patch set (#3). Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... ASCI: Control uplink access bursts detection of physical interface An MPH-INFO message is used to turn detection of uplink access bursts on or off. Whenever the uplink on a voice group channel is free, the uplink access burst detection is turned on. When the uplink access is granted to a talker or when the calling subscriber has been assigned to the channel, the uplink access burst detection is turned off until the uplink becomes free again. Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: I92d6773a3a463eb747143c85aa149e54c1fda122 --- M include/osmo-bts/asci.h M include/osmo-bts/l1sap.h M src/common/asci.c M src/common/l1sap.c M src/common/lchan.c M src/common/rsl.c 6 files changed, 80 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/34889/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log October 2023