Attention is currently required from: neels.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35875?usp=email )
Change subject: cosmetic: move check for CSD further above
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
File src/libmsc/msc_a.c:
https://gerrit.osmocom.org/c/osmo-msc/+/35875/comment/1a15aa47_2877dee2
PS2, Line 1468: GSM48_BCAP_ITCAP_UNR_DIG_INF
Oh, we're missing to check two other CSD modes here:
https://gerrit.osmocom.org/c/osmo-msc/+/35881
I will rebase this patch once your patches are merged.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35875?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: Ibd21f0bb46c66a406904105564ce961a8760cbe7
Gerrit-Change-Number: 35875
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
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-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 06 Feb 2024 10:02:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria, laforge, neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35872?usp=email )
Change subject: pick up all *.vty in EXTRA_DIST
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> I thought there was some problem about using wildcards in automake? This was discussed in the patch […]
That rings a bell for me too.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35872?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: Id28e020fc59b83d1b4cd0e5b72314a46bea62259
Gerrit-Change-Number: 35872
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 06 Feb 2024 10:00:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35871?usp=email )
Change subject: comment: gsm_04_08.h: add a spec hint
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35871?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: I2a606047db88ea47317397a790611048dead6403
Gerrit-Change-Number: 35871
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: Tue, 06 Feb 2024 09:58:33 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email )
Change subject: mobile: use tch_send_msg() in tch_csd_tx_to_l1()
......................................................................
mobile: use tch_send_msg() in tch_csd_tx_to_l1()
Do not access the RR API directly, use TCH API for sending UL data.
Change-Id: Icd5b5fad835feecd96a83fa5c83ed08037826fa6
Related: OS#4396
---
M src/host/layer23/src/mobile/tch_data.c
1 file changed, 13 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/host/layer23/src/mobile/tch_data.c b/src/host/layer23/src/mobile/tch_data.c
index 5474bdf..7f0a330 100644
--- a/src/host/layer23/src/mobile/tch_data.c
+++ b/src/host/layer23/src/mobile/tch_data.c
@@ -407,7 +407,7 @@
OSMO_ASSERT(0);
}
- return gsm48_rr_tx_traffic(ms, nmsg);
+ return tch_send_msg(ms, nmsg);
}
static int tch_data_check_bcap(const struct gsm_mncc_bearer_cap *bcap)
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35862?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: Icd5b5fad835feecd96a83fa5c83ed08037826fa6
Gerrit-Change-Number: 35862
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
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
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email )
Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING)
......................................................................
mobile: init TCH state earlier (on receipt of CC ALERTING)
During a Mobile Originating voice call, we would normally start
receiving traffic indications with ringback tone (or even some
melody) before the call gets CONNECTed. So in order for the user
to be able to hear that, we need to init the voice call handler
earlier (on receipt of CC ALERTING message).
We should not be transmitting voice/data frames before the call
gets CONNECTed, so add 'rx_only' flag to the TCH state. In
tch_send_msg() drop msgb if this flag is set.
Rx only mode makes no sense for data calls, so in tch_recv_cb() we
discard received DL frames and thus do not trigger sending UL frames.
Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec
Related: OS#4396
---
M src/host/layer23/include/osmocom/bb/mobile/tch.h
M src/host/layer23/src/mobile/tch.c
2 files changed, 52 insertions(+), 11 deletions(-)
Approvals:
jolly: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved; Verified
diff --git a/src/host/layer23/include/osmocom/bb/mobile/tch.h b/src/host/layer23/include/osmocom/bb/mobile/tch.h
index 92bc722..293397d 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/tch.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/tch.h
@@ -5,6 +5,7 @@
struct msgb;
struct tch_state {
+ bool rx_only; /* Rx TCH frames, but Tx nothing */
bool is_voice; /* voice (true) or data (false) */
union {
struct tch_voice_state {
diff --git a/src/host/layer23/src/mobile/tch.c b/src/host/layer23/src/mobile/tch.c
index 70c9163..f63f487 100644
--- a/src/host/layer23/src/mobile/tch.c
+++ b/src/host/layer23/src/mobile/tch.c
@@ -51,24 +51,35 @@
static int tch_recv_cb(struct osmocom_ms *ms, struct msgb *msg)
{
struct tch_state *state = ms->tch_state;
- int rc;
if (state == NULL) {
msgb_free(msg);
return 0;
}
- if (state->is_voice)
- rc = tch_voice_recv(ms, msg);
- else
- rc = tch_data_recv(ms, msg);
- return rc;
+ if (state->is_voice) {
+ return tch_voice_recv(ms, msg);
+ } else {
+ /* Rx only mode makes no sense for data calls, so we discard
+ * received DL frames and thus do not trigger sending UL frames. */
+ if (!state->rx_only)
+ return tch_data_recv(ms, msg);
+ msgb_free(msg);
+ return 0;
+ }
}
/* Send an Uplink voice frame to the lower layers */
int tch_send_msg(struct osmocom_ms *ms, struct msgb *msg)
{
- /* Forward to RR */
+ struct tch_state *state = ms->tch_state;
+
+ if (state == NULL || state->rx_only) {
+ /* TODO: fix callers and print a warning here */
+ msgb_free(msg);
+ return -EIO;
+ }
+
return gsm48_rr_tx_traffic(ms, msg);
}
@@ -119,18 +130,21 @@
return rc;
}
-static void tch_trans_cstate_active_cb(struct gsm_trans *trans)
+static void tch_trans_cstate_active_cb(struct gsm_trans *trans, bool rx_only)
{
struct osmocom_ms *ms = trans->ms;
struct tch_state *state;
enum gsm48_chan_mode ch_mode;
- if (ms->tch_state != NULL)
+ if (ms->tch_state != NULL) {
+ ms->tch_state->rx_only = rx_only;
return; /* TODO: handle modify? */
+ }
state = talloc_zero(ms, struct tch_state);
OSMO_ASSERT(state != NULL);
ms->tch_state = state;
+ ms->tch_state->rx_only = rx_only;
ch_mode = ms->rrlayer.cd_now.mode;
switch (ch_mode) {
@@ -181,8 +195,11 @@
static void tch_trans_state_chg_cb(struct gsm_trans *trans)
{
switch (trans->cc.state) {
- case GSM_CSTATE_ACTIVE:
- tch_trans_cstate_active_cb(trans);
+ case GSM_CSTATE_CALL_DELIVERED: /* MO call: Rx CC ALERTING */
+ tch_trans_cstate_active_cb(trans, true);
+ break;
+ case GSM_CSTATE_ACTIVE: /* MO/MT call: Rx CC CONNECT */
+ tch_trans_cstate_active_cb(trans, false);
break;
case GSM_CSTATE_NULL:
tch_trans_free_cb(trans);
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?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: Idd32c823639cc1f9999d77fcefe7e260e31a85ec
Gerrit-Change-Number: 35739
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
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-CC: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged