manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34747?usp=email )
Change subject: libmsc: add 3k1_AUDIO and FAX_G3 bearer cap
......................................................................
libmsc: add 3k1_AUDIO and FAX_G3 bearer cap
Bearer capability 3k1_AUDIO and FAX_G3 are only important
for the interworking function, the MSC should handle
these calls the same as CSD calls with unrestricted digital
bearer capability.
Change-Id: I198aa867a8f236b8ddd05d3b2356f64b876fd4c1
---
M src/libmsc/gsm_04_08_cc.c
M src/libmsc/mncc_builtin.c
M src/libmsc/msc_a.c
M src/libmsc/msc_ho.c
M src/libmsc/transaction_cc.c
5 files changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/47/34747/1
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 1e2c5af..31fcb23 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -825,6 +825,8 @@
LOG_TRANS(trans, LOGL_INFO,
"Got no information of remote audio codecs: neither SDP nor Bearer Capability. Trying anyway.\n");
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
if (setup->fields & MNCC_F_BEARER_CAP) {
trans->cc.remote = (struct sdp_msg){};
@@ -878,6 +880,8 @@
return rc;
}
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
if (csd_bs_list_to_bearer_cap(&bearer_cap, &trans->cc.local.bearer_services) == 0) {
LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n");
diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c
index c1debc5..6474201 100644
--- a/src/libmsc/mncc_builtin.c
+++ b/src/libmsc/mncc_builtin.c
@@ -88,6 +88,8 @@
/* we currently only do speech and CSD */
switch (setup->bearer_cap.transfer) {
case GSM_MNCC_BCAP_SPEECH:
+ case GSM_MNCC_BCAP_AUDIO:
+ case GSM_MNCC_BCAP_FAX_G3:
case GSM_MNCC_BCAP_UNR_DIG:
break;
default:
diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index b4776a0..e64b54d 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -669,6 +669,8 @@
return;
}
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
if (!cc_trans->cc.local.bearer_services.count) {
LOG_TRANS(cc_trans, LOGL_ERROR, "Assignment not possible, no matching bearer service: %s\n",
diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c
index 9748ed9..f826975 100644
--- a/src/libmsc/msc_ho.c
+++ b/src/libmsc/msc_ho.c
@@ -422,6 +422,8 @@
return;
}
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
if (csd_bs_list_to_gsm0808_channel_type(&channel_type, &cc_trans->cc.local.bearer_services)) {
msc_ho_failed(msc_a, GSM0808_CAUSE_EQUIPMENT_FAILURE,
diff --git a/src/libmsc/transaction_cc.c b/src/libmsc/transaction_cc.c
index 35ec5dc..1ea6633 100644
--- a/src/libmsc/transaction_cc.c
+++ b/src/libmsc/transaction_cc.c
@@ -54,6 +54,8 @@
LOG_TRANS(trans, LOGL_DEBUG, "codecs: %s\n",
codec_filter_to_str(&trans->cc.codecs, &trans->cc.local, &trans->cc.remote));
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
csd_filter_run(&trans->cc.csd, &trans->cc.local, &trans->cc.remote);
LOG_TRANS(trans, LOGL_DEBUG, "codec/BS: %s\n",
@@ -78,6 +80,8 @@
case GSM48_BCAP_ITCAP_SPEECH:
sdp_audio_codecs_from_bearer_cap(&trans->cc.codecs.ms, bcap);
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
sdp_audio_codecs_set_csd(&trans->cc.codecs.ms);
csd_bs_list_from_bearer_cap(&trans->cc.csd.ms, bcap);
@@ -101,6 +105,8 @@
case GSM48_BCAP_ITCAP_SPEECH:
sdp_audio_codecs_from_bearer_cap(&trans->cc.remote.audio_codecs, bcap);
break;
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_FAX_G3:
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
sdp_audio_codecs_set_csd(&trans->cc.remote.audio_codecs);
csd_bs_list_from_bearer_cap(&trans->cc.remote.bearer_services, bcap);
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34747?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I198aa867a8f236b8ddd05d3b2356f64b876fd4c1
Gerrit-Change-Number: 34747
Gerrit-PatchSet: 1
Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-MessageType: newchange
Attention is currently required from: manawyrm.
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34745?usp=email )
Change subject: gsm48_ie.c: force rate adaptation mode for CSD calls to V.110
......................................................................
Patch Set 2:
(1 comment)
File src/gsm/gsm48_ie.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11796):
https://gerrit.osmocom.org/c/libosmocore/+/34745/comment/ded7e424_a8afda85
PS2, Line 286: if (bcap->data.interm_rate && !bcap->data.rate_adaption) {
braces {} are not necessary for single statement blocks
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34745?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I260834f3d28034afa6b50a6ca8c89accba8fa65b
Gerrit-Change-Number: 34745
Gerrit-PatchSet: 2
Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-Comment-Date: Sat, 14 Oct 2023 15:17:30 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: manawyrm.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/34745?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: gsm48_ie.c: force rate adaptation mode for CSD calls to V.110
......................................................................
gsm48_ie.c: force rate adaptation mode for CSD calls to V.110
Certain calls (seen on very old Nokias) won't have the rate adaptation flag
set on "analog" CSD calls. The field for the intermediate rate (after RA) is
still filled correctly.
Workaround this by setting the RA to V.110 whenever the RA is unset but an
intermediate rate is specified.
Change-Id: I260834f3d28034afa6b50a6ca8c89accba8fa65b
---
M src/gsm/gsm48_ie.c
1 file changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/34745/2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34745?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I260834f3d28034afa6b50a6ca8c89accba8fa65b
Gerrit-Change-Number: 34745
Gerrit-PatchSet: 2
Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-MessageType: newpatchset
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34745?usp=email )
Change subject: gsm48_ie.c: force rate adaptation mode for CSD calls to V.110
......................................................................
Patch Set 1:
(1 comment)
File src/gsm/gsm48_ie.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11794):
https://gerrit.osmocom.org/c/libosmocore/+/34745/comment/fc2e934a_94511e44
PS1, Line 286: if (bcap->data.interm_rate && !bcap->data.rate_adaption)
that open brace { should be on the previous line
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34745?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I260834f3d28034afa6b50a6ca8c89accba8fa65b
Gerrit-Change-Number: 34745
Gerrit-PatchSet: 1
Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Sat, 14 Oct 2023 15:06:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34746?usp=email )
Change subject: gsm48_ie.c: change bearer cap structure in outgoing CSD calls
......................................................................
gsm48_ie.c: change bearer cap structure in outgoing CSD calls
Outgoing CSD calls were previously encoded with the
Bearer Capability 1 - Octet 4 "Structure" field set to
3 - Unstructured. Many Nokia, Sony Ericsson and Huawei devices
won't accept incoming CSD calls with these bits set.
Set them to 0 - Service data unit integrity for now, which
seems to work and make all tested devices happy.
Change-Id: Ieb5bca3d3578abd28e18808752e1c312ce7c4ce0
---
M src/gsm/gsm48_ie.c
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/34746/1
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 749452f..6cbb248 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -346,7 +346,7 @@
case GSM48_BCAP_ITCAP_FAX_G3:
lv[i++] |= 0x80; /* last IE of octet 3 etc */
/* octet 4 */
- lv[i++] = 0xb8;
+ lv[i++] = 0x88;
/* octet 5 */
lv[i++] = 0x80 | ((bcap->data.rate_adaption & 3) << 3)
| (bcap->data.sig_access & 7);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34746?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ieb5bca3d3578abd28e18808752e1c312ce7c4ce0
Gerrit-Change-Number: 34746
Gerrit-PatchSet: 1
Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-MessageType: newchange
manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34744?usp=email )
Change subject: gsm48_ie.c: add 3.1kHz audio bearer capability for CSD calls
......................................................................
gsm48_ie.c: add 3.1kHz audio bearer capability for CSD calls
GSM48_BCAP_ITCAP_3k1_AUDIO should be handled just like fax or
unregistricted digital CSD calls. The transfer capability just
indicates that an (external) interworking function should convert
the call into an analog modem call on the network edge.
The CSD call is still regular V.110/RLP non-transparent data.
Change-Id: I44b76be0f6a891bc1d8f55ede1ef140ea0a19e3d
---
M src/gsm/gsm48_ie.c
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/34744/1
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 0cdcb7c..7de1f98 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -233,6 +233,7 @@
}
break;
case GSM_MNCC_BCAP_UNR_DIG:
+ case GSM_MNCC_BCAP_AUDIO:
case GSM_MNCC_BCAP_FAX_G3:
i = 1;
while (!(lv[i] & 0x80)) {
@@ -334,6 +335,7 @@
lv[i] |= 0x80; /* last IE of octet 3 etc */
break;
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
case GSM48_BCAP_ITCAP_FAX_G3:
lv[i++] |= 0x80; /* last IE of octet 3 etc */
/* octet 4 */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34744?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I44b76be0f6a891bc1d8f55ede1ef140ea0a19e3d
Gerrit-Change-Number: 34744
Gerrit-PatchSet: 1
Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-MessageType: newchange
manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34745?usp=email )
Change subject: gsm48_ie.c: force rate adaptation mode for CSD calls to V.110
......................................................................
gsm48_ie.c: force rate adaptation mode for CSD calls to V.110
Certain calls (seen on very old Nokias) won't have the rate adaptation flag
set on "analog" CSD calls. The field for the intermediate rate (after RA) is
still filled correctly.
Workaround this by setting the RA to V.110 whenever the RA is unset but an
intermediate rate is specified.
Change-Id: I260834f3d28034afa6b50a6ca8c89accba8fa65b
---
M src/gsm/gsm48_ie.c
1 file changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/34745/1
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 7de1f98..749452f 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -281,6 +281,13 @@
bcap->data.parity = lv[i] & 7;
bcap->data.interm_rate = (lv[i] >> 5) & 3;
+ // 3.1kHz CSD calls won't have the rate adaptation field set
+ // but do require rate adaptation.
+ if (bcap->data.interm_rate && !bcap->data.rate_adaption)
+ {
+ bcap->data.rate_adaption = GSM48_BCAP_RA_V110_X30;
+ }
+
/* octet 6c */
if (!(lv[i] & 0x80)) {
i++;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34745?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I260834f3d28034afa6b50a6ca8c89accba8fa65b
Gerrit-Change-Number: 34745
Gerrit-PatchSet: 1
Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email )
Change subject: osmo_epdg_app: Fix formatting error in log string
......................................................................
Patch Set 1:
(1 comment)
File src/osmo_epdg_app.erl:
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742/comment/36864888_4539…
PS1, Line 8: ~n
Why is this an error? Looking at osmo_dia2gsup.git, I see all strings are `~n`-terminated. And BTW, why do we still use `lager` at all? Erlang now offers the built-in `logger` module: https://www.erlang.org/doc/man/logger.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34742?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Ib8dfa40ad028f959e4816ce5056ff64d52ec647b
Gerrit-Change-Number: 34742
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 14 Oct 2023 04:49:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34741?usp=email )
Change subject: Add config envvars to change GSUP server listen IP addr and port
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34741?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I55244df82ee50b268ef0cbbe698e691707e8a716
Gerrit-Change-Number: 34741
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 14 Oct 2023 04:46:20 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34740?usp=email )
Change subject: Several fixes and improvement around env config use
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34740?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I729513ff1f904b78971d22e49622707c8bc0e4aa
Gerrit-Change-Number: 34740
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 14 Oct 2023 04:45:22 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment