[M] Change in osmo-msc[master]: manuals: add section about the SGs interface.
Attention is currently required from: dexter, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34870?usp=email ) Change subject: manuals: add section about the SGs interface. .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34870?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: Ic7c17511ee19cb7f6d5069b27beb661ecb4b0be8 Gerrit-Change-Number: 34870 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 31 Oct 2023 05:23:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: Use proper SCCP release cause enum value instead of hardcoded value
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34925?usp=email ) Change subject: Use proper SCCP release cause enum value instead of hardcoded value .. Use proper SCCP release cause enum value instead of hardcoded value Change-Id: If44e7c4a3166822d7732b7af4c136b8f97898dc0 --- M src/osmo-hnbgw/context_map_sccp.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/25/34925/1 diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 9b4837d..7d0176f 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -26,6 +26,7 @@ #include #include +#include #include @@ -183,7 +184,9 @@ return -1; } - return osmo_sccp_tx_disconn(map->cnlink->hnbgw_sccp_user->sccp_user, map->scu_conn_id, NULL, 0); + return osmo_sccp_tx_disconn(map->cnlink->hnbgw_sccp_user->sccp_user, + map->scu_conn_id, NULL, + SCCP_RELEASE_CAUSE_END_USER_ORIGINATED); } static int destruct_ranap_ran_rx_co_ies(ranap_message *ranap_message_p) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34925?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If44e7c4a3166822d7732b7af4c136b8f97898dc0 Gerrit-Change-Number: 34925 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[master]: sccp_demo_user: Allow initiating conns from vty in server mode
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34924?usp=email ) Change subject: sccp_demo_user: Allow initiating conns from vty in server mode .. sccp_demo_user: Allow initiating conns from vty in server mode This allows starting SCCP conns from within sccp_demo_user, which in turn allows testing more scenarios in osmo-ttcn3-hacks.git SCCP_RAW_Tests testsuite. Related: SYS#6616 Change-Id: I7d5b3534c496dca8a3f3e66025af554bbe860c04 --- M examples/sccp_demo_user.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/24/34924/1 diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index a88dd69..d67bd27 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -307,6 +307,7 @@ exit(1); } sccp_test_server_init(g_sccp); + sccp_test_user_vty_install(g_sccp, OSMO_SCCP_SSN_BSSAP); } g_calling_addr.pc = local_pc; g_called_addr.pc = remote_pc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34924?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7d5b3534c496dca8a3f3e66025af554bbe860c04 Gerrit-Change-Number: 34924 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_cr_timeout_cc_too_late
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34923?usp=email )
Change subject: sccp: Introduce test TC_cr_timeout_cc_too_late
..
sccp: Introduce test TC_cr_timeout_cc_too_late
Related: SYS#6602
Change-Id: If4b53565f1fa19894ca24fa71e02ae7b1941411e
---
M library/SCCP_Templates.ttcn
M sccp/SCCP_Tests_RAW.ttcn
2 files changed, 89 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/23/34923/1
diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn
index a87ef5c..8c89bda 100644
--- a/library/SCCP_Templates.ttcn
+++ b/library/SCCP_Templates.ttcn
@@ -113,6 +113,43 @@
return ret;
}
+template (present) PDU_SCCP tr_SCCP_CR(template (present) OCT3 source_lref :=
?,
+ template (present) SCCP_PAR_Address
called := ?,
+ template (present) SCCP_PAR_Address
calling := ?) := {
+ connrequest := {
+ messageType := cr,
+ sourceLocRef := source_lref,
+ protClass := c_class2,
+ pointer1 := ?,
+ pointer2 := ?,
+ calledPAddress := tr_Addr(called),
+ optionalPart := {
+ credit := omit,
+ callingPAddress := ?, //FIXME: tr_Addr(calling),
+ data := omit,
+ hopCounter := *,
+ importance := *
+ },
+ eop := *
+ }
+}
+
+function ts_SCCP_CC(OCT3 source_lref, OCT3 dest_lref)
+return template (value) PDU_SCCP {
+ var template (value) PDU_SCCP ret := {
+ connconfirm := {
+ messageType := cc,
+ destLocRef := dest_lref,
+ sourceLocRef := source_lref,
+ protClass := c_class2,
+ pointer1 := 0, /* overwritten */
+ optionalPart := omit,
+ eop := { paramName:= con_SCCP_eop }
+ }
+ }
+ return ret;
+}
+
template (present) PDU_SCCP tr_SCCP_CC(template (present) OCT3 source_lref,
template (present) OCT3 dest_lref) := {
connconfirm := {
diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn
index 1c81d98..935df13 100644
--- a/sccp/SCCP_Tests_RAW.ttcn
+++ b/sccp/SCCP_Tests_RAW.ttcn
@@ -69,6 +69,18 @@
"sccp-timer iar " & int2str(g_demo_sccp_timer_iar)});
}
+function f_vty_cmd_connect_req(integer conn_id) runs on SCCP_Test_RAW_CT {
+ f_vty_transceive(SCCP_DEMO_USER_VTY, "sccp-user");
+ f_vty_transceive(SCCP_DEMO_USER_VTY, "connect-req " & int2str(conn_id));
+ f_vty_transceive(SCCP_DEMO_USER_VTY, "end");
+}
+
+function f_vty_cmd_disconnect_req(integer conn_id) runs on SCCP_Test_RAW_CT {
+ f_vty_transceive(SCCP_DEMO_USER_VTY, "sccp-user");
+ f_vty_transceive(SCCP_DEMO_USER_VTY, "disconnect-req " &
int2str(conn_id));
+ f_vty_transceive(SCCP_DEMO_USER_VTY, "end");
+}
+
private function f_init_raw(SCCP_Configuration cfg) runs on SCCP_Test_RAW_CT {
g_param := {
sio := {
@@ -483,6 +495,35 @@
}
+/* Test user initiating a conn (eg RUA), which triggers SCCP CR. While waiting
+ * for CC, user decides it timed out (eg. RUA side timeout) which makes it
move to
+ * WAIT_CONN_CONF state. In that state, wait for CC and then submit an RLSD and
+ * wait for ack. */
+testcase TC_cr_timeout_cc_too_late() runs on SCCP_Test_RAW_CT {
+ var SCCP_MTP3_TRANSFERind mtp3_rx;
+ var integer conn_id := 1234;
+ var OCT3 remote_lref;
+
+ f_init_raw(mp_sccp_cfg[0]);
+ f_sleep(1.0);
+
+ f_vty_cmd_connect_req(conn_id);
+ mtp3_rx := f_exp_sccp(tr_SCCP_CR(?, ?, ?));
+
+ /* Emulate disconnection from the user: */
+ f_vty_cmd_disconnect_req(conn_id);
+ remote_lref := mtp3_rx.data.connrequest.sourceLocRef;
+
+ /* Now send CC, user should send RSLD to us: */
+ f_send_sccp(ts_SCCP_CC(g_own_lref, remote_lref));
+ log("Waiting for RLSD");
+ f_exp_sccp(tr_SCCP_RLSD(remote_lref, g_own_lref, hex2int('2A'H))); /*
Cause: Unknown */
+ f_send_sccp(ts_SCCP_RLC(g_own_lref, remote_lref));
+
+ setverdict(pass);
+}
+
+
control {
execute( TC_cr_cc() );
execute( TC_udt_without_cr_cc() );
@@ -496,6 +537,7 @@
execute( TC_scmg_sst_ssn_invalid() );
execute( TC_callingparty_ssn_only() );
+ execute( TC_cr_timeout_cc_too_late() );
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34923?usp=email
To unsubscribe, or for help writing mail filters, visit
[M] Change in osmo-msc[master]: manuals: add section about the SGs interface.
Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/34870?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: manuals: add section about the SGs interface. .. manuals: add section about the SGs interface. The SGs interface is currently only casually mentioned in the chapter running, even though the SGs interface is a prominent and often requested feature. Let's give the SGs interface its own section so that users can find the info about it quicker. Related: OS#6008 Change-Id: Ic7c17511ee19cb7f6d5069b27beb661ecb4b0be8 --- M doc/manuals/chapters/running.adoc A doc/manuals/chapters/sgs.adoc M doc/manuals/osmomsc-usermanual.adoc 3 files changed, 74 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/34870/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34870?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: Ic7c17511ee19cb7f6d5069b27beb661ecb4b0be8 Gerrit-Change-Number: 34870 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-msc[master]: manuals: add section about the SGs interface.
Attention is currently required from: fixeria, laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34870?usp=email ) Change subject: manuals: add section about the SGs interface. .. Patch Set 2: (8 comments) File doc/manuals/chapters/running.adoc: https://gerrit.osmocom.org/c/osmo-msc/+/34870/comment/a037315a_b956a4a5 PS1, Line 78: see section <> > missing dot at the end of sentence Done File doc/manuals/chapters/sgs.adoc: https://gerrit.osmocom.org/c/osmo-msc/+/34870/comment/83f29025_38b439ef PS1, Line 4: SGs/SGsAP > The interface is called SGs. The application layer protocol for it is SGsAP. > […] Done https://gerrit.osmocom.org/c/osmo-msc/+/34870/comment/e171c93d_a0f533e9 PS1, Line 5: It's > Its (not it is) Done https://gerrit.osmocom.org/c/osmo-msc/+/34870/comment/cfb3ca28_94bbe224 PS1, Line 5: LTE/EPC > you used "2G (GERAN)" before, then here it would make sense to use the same > format e.g. […] Done https://gerrit.osmocom.org/c/osmo-msc/+/34870/comment/c23f7cbe_8ae98588 PS1, Line 31: ts5, ts6-2, ts7, ts11, ts14, ts15 > cosmetic: use \` text \` for `highlighting` Done https://gerrit.osmocom.org/c/osmo-msc/+/34870/comment/250a3f51_773352b6 PS1, Line 44: In case multiple instances of OsmoMSC run in parallel, it is advised to use a : different vlr-name for each instance > you might want to add that they of course need to be bound to different IP > addresses. […] Done https://gerrit.osmocom.org/c/osmo-msc/+/34870/comment/82cf4c4f_5dabfcfb PS1, Line 50: show sgs-connections > cosmetic: use \` text \` for `highlighting` Done https://gerrit.osmocom.org/c/osmo-msc/+/34870/comment/b24dab01_3efe3f9b PS1, Line 51: OsmoMSC > missing dot Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34870?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: Ic7c17511ee19cb7f6d5069b27beb661ecb4b0be8 Gerrit-Change-Number: 34870 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 30 Oct 2023 16:51:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: Increase default X31 val from 5 to 10 seconds
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/34922?usp=email )
Change subject: Increase default X31 val from 5 to 10 seconds
..
Increase default X31 val from 5 to 10 seconds
It was spotted that in some deploys with satellite links and heavy load,
the roundtrip times for CR and CC can go slightly over 5 seconds, so
better increase the default value to 10 seconds to be on a safer place
and avoid operation problems with default configuration.
Related: SYS#6602, SYS#6616
Change-Id: I24225cfc0addf326c239ec658a27b93b83a3e751
---
M src/osmo-hnbgw/tdefs.c
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/22/34922/1
diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c
index 601f704..7808b2c 100644
--- a/src/osmo-hnbgw/tdefs.c
+++ b/src/osmo-hnbgw/tdefs.c
@@ -34,7 +34,7 @@
struct osmo_tdef hnbgw_T_defs[] = {
{.T = 3113, .default_val = 15, .desc = "Time to keep Paging record, for
CN pools with more than one link" },
{.T = 4, .default_val = 5, .desc = "Timeout to receive RANAP RESET
ACKNOWLEDGE from an MSC/SGSN" },
- {.T = -31, .default_val = 5, .desc = "Timeout for discarding a
partially released context map (RUA <-> SCCP)" },
+ {.T = -31, .default_val = 10, .desc = "Timeout for discarding a
partially released context map (RUA <-> SCCP)" },
{.T = -1002, .default_val = 10, .desc = "Timeout for the HNB to respond
to PS RAB Assignment Request" },
{ }
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34922?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I24225cfc0addf326c239ec658a27b93b83a3e751
Gerrit-Change-Number: 34922
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-msc[master]: vlr_sgs: fix VTY setting for SGs counter.
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34871?usp=email )
Change subject: vlr_sgs: fix VTY setting for SGs counter.
..
vlr_sgs: fix VTY setting for SGs counter.
When trying to modify the value of an SGs counter (eg. ns11), then the
setting is never stored. The reason for this is that OsmoMSC uses the
wrong string table to compare the user input.
Related: OS#6008
Change-Id: I0358c1ec0026c37fda6db1f3af3145393df25cfd
---
M include/osmocom/msc/vlr_sgs.h
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/include/osmocom/msc/vlr_sgs.h b/include/osmocom/msc/vlr_sgs.h
index 7231449..aade5d3 100644
--- a/include/osmocom/msc/vlr_sgs.h
+++ b/include/osmocom/msc/vlr_sgs.h
@@ -69,7 +69,7 @@
extern const struct value_string sgs_state_counter_names[];
static inline const char *vlr_sgs_state_counter_name(enum vlr_sgs_state_ctr Ns)
{
- return get_value_string(sgs_state_timer_names, Ns);
+ return get_value_string(sgs_state_counter_names, Ns);
}
/* This callback function is called when an SGs location update is complete */
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34871?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: I0358c1ec0026c37fda6db1f3af3145393df25cfd
Gerrit-Change-Number: 34871
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-msc[master]: vlr_sgs: fix VTY setting for SGs counter.
Attention is currently required from: dexter, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34871?usp=email ) Change subject: vlr_sgs: fix VTY setting for SGs counter. .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34871?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: I0358c1ec0026c37fda6db1f3af3145393df25cfd Gerrit-Change-Number: 34871 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 30 Oct 2023 16:32:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: sccp_scoc: Fix remote PC not assigned preventing RSLD to be sent in s...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34921?usp=email )
Change subject: sccp_scoc: Fix remote PC not assigned preventing RSLD to be
sent in st WAIT_CONN_CONF
..
sccp_scoc: Fix remote PC not assigned preventing RSLD to be sent in st
WAIT_CONN_CONF
Scenario: RUA Connect triggers SCCP CR towards peer, and we move to
CONN_PEND_OUT state where we expect to receive CC.
However, if some timer (like X31) times out before we receive CC (eg
because CC takes a long time to come), we end up in state
WAIT_CONN_CONF.
In that state, according to Figure C.2/Q.714 (sheet 2 of 7), among other
possibilite we wait for CC, and if it arrives, we send an RLSD to the
peer to inform him that we released the conn, and wait
for the peer to ack the RLSD, then release all state.
Given the scenario above, scoc_fsm_wait_conn_conf() was not assigning
the received OPC from the CC to the conn->remote_pc (unlike
scoc_fsm_conn_pend_out() which does it properly). As a result, when
trying to send teh RLSD it would fail and never transmit RLSD, taking
then a long time to release through T(rel) (10-20 seconds), and probably
longer in the peer (T(iar) or similar?).
Rua Connect triggers tx of SCCP CC:
Received SCCP User Primitive (N-CONNECT.request)
XUA_AS(as-clnt-msc-0)[0x55f11c7df980]{AS_ACTIVE}: Received Event
AS-TRANSFER.req //Tx CC
SCCP-SCOC(929)[0x55f11c909c90]{IDLE}: State change to CONN_PEND_OUT (no timeout)
...
X31 timeout triggers state change:
map_sccp(...-SCCP-929)[0x55f11c909820]{wait_cc}: Timeout of X31
SCCP-SCOC(929)[0x55f11c909c90]{CONN_PEND_OUT}: Received Event N-DISCONNECT.req
SCCP-SCOC(929)[0x55f11c909c90]{CONN_PEND_OUT}: State change to WAIT_CONN_CONF
(no timeout)
...
CC arrives, but conn_remote_pc is not properly assigned and tx of RLSD fails:
SCCP-SCOC(929)[0x55f11c909c90]{WAIT_CONN_CONF}: Received Event
RCOC-CONNECT_CONFIRM.ind
MTP-TRANSFER.req from SCCP without DPC?!? called=RI=0 // PROBLEM HERE
SCCP-SCOC(929)[0x55f11c909c90]{WAIT_CONN_CONF}: State change to DISCONN_PEND
(no timeout)
...
SCCP-SCOC(929)[0x55f11c909c90]{DISCONN_PEND}: Received Event T(rel)_expired
Related: SYS#6616
Change-Id: I9f9f78c92dd95f38af7b03037e60a1c993d7e5b0
---
M src/sccp_scoc.c
1 file changed, 52 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/21/34921/1
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index e273d17..0e1eb34 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1160,6 +1160,13 @@
conn_stop_connect_timer(conn);
/* associate rem ref to conn */
conn->remote_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
+ /* 3.1.4.2 The node sending the CC message (identified
+* by the parameter OPC contained in the
+* MTP-TRANSFER.indication primitive which conveyed the
+* CC message [plus the MTP-SAP instance]) is associated
+* with the connection section. */
+ conn->remote_pc = xua->mtp.opc;
+
/* released to SCRC */
xua_gen_relre_and_send(conn, conn->release_cause, NULL);
/* start rel timer */
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34921?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I9f9f78c92dd95f38af7b03037e60a1c993d7e5b0
Gerrit-Change-Number: 34921
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-msc[master]: vlr_sgs: fix VTY setting for SGs counter.
Attention is currently required from: fixeria, laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34871?usp=email ) Change subject: vlr_sgs: fix VTY setting for SGs counter. .. Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/34871/comment/ab0b5b9d_81ab0571 PS1, Line 10: setting is nevers stored. The reason for this is that OsmoMSC uses the > never Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34871?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: I0358c1ec0026c37fda6db1f3af3145393df25cfd Gerrit-Change-Number: 34871 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 30 Oct 2023 16:21:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: vlr_sgs: fix VTY setting for SGs counter.
Attention is currently required from: dexter, fixeria, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/34871?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: vlr_sgs: fix VTY setting for SGs counter. .. vlr_sgs: fix VTY setting for SGs counter. When trying to modify the value of an SGs counter (eg. ns11), then the setting is never stored. The reason for this is that OsmoMSC uses the wrong string table to compare the user input. Related: OS#6008 Change-Id: I0358c1ec0026c37fda6db1f3af3145393df25cfd --- M include/osmocom/msc/vlr_sgs.h 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/71/34871/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34871?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: I0358c1ec0026c37fda6db1f3af3145393df25cfd Gerrit-Change-Number: 34871 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in osmo-msc[master]: running: fix link to MNCC for External Call Control
dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34869?usp=email ) Change subject: running: fix link to MNCC for External Call Control .. Abandoned Possibly a false alarm. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34869?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: I5b0fd848e6b28bf670d9994da8a56cb613158290 Gerrit-Change-Number: 34869 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon
[S] Change in osmo-msc[master]: running: fix link to MNCC for External Call Control
Attention is currently required from: fixeria, laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34869?usp=email ) Change subject: running: fix link to MNCC for External Call Control .. Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/34869/comment/1edc9e6f_9ee274a2 PS1, Line 11: outdated > Not sure what you mean by "outdated" here. […] Strange. I have downloaded the most recent version of the manual now and now the link is working. It didn't work before, that is why I thought that I should fix it - never mind. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34869?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: I5b0fd848e6b28bf670d9994da8a56cb613158290 Gerrit-Change-Number: 34869 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 30 Oct 2023 16:11:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-remsim[master]: bankd: Use gsmtap_inst_fd2()
Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email ) Change subject: bankd: Use gsmtap_inst_fd2() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2a7736d6fba795b2c479b2a0bc371b90f838ed61 Gerrit-Change-Number: 34919 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Mon, 30 Oct 2023 15:23:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Notify talker in the VTY that he cannot leave the call while ta...
Attention is currently required from: fixeria, 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 2: Code-Review+2 -- 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: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 15:21:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-remsim[master]: bankd: Use gsmtap_inst_fd2()
Attention is currently required from: arehbein, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email ) Change subject: bankd: Use gsmtap_inst_fd2() .. Patch Set 1: (1 comment) Patchset: PS1: > Not entirely sure if the TODO-RELEASE line should look like this the format is not that critical, it is a file that is read by humans. -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2a7736d6fba795b2c479b2a0bc371b90f838ed61 Gerrit-Change-Number: 34919 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 30 Oct 2023 15:12:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein Gerrit-MessageType: comment
[S] Change in osmo-remsim[master]: bankd: Use gsmtap_inst_fd2()
Attention is currently required from: arehbein, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email ) Change subject: bankd: Use gsmtap_inst_fd2() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2a7736d6fba795b2c479b2a0bc371b90f838ed61 Gerrit-Change-Number: 34919 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 30 Oct 2023 15:11:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: SI10: Fix uninitialized l_bts pointer
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34920?usp=email ) Change subject: SI10: Fix uninitialized l_bts pointer .. Patch Set 1: (1 comment) File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34920/comment/fb926222_9f7eb51d PS1, Line 1424: struct gsm_bts *s_bts = conn->lchan->ts->trx->bts, *l_bts; are you sure you don't need to NULL-intitialize it? At first sight it looks like it's possible to call si10_rest_octets_encode_other with a l_bts pointer that hasn't been initialized yet. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34920?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9dbbd066075f9ccb331616a2b59b46b1b44c8b4c Gerrit-Change-Number: 34920 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Mon, 30 Oct 2023 15:11:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Notify talker in the VTY that he cannot leave the call while ta...
Attention is currently required from: fixeria, jolly, pespin. laforge 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 2: Code-Review+1 -- 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: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 15:09:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: gsm_settings_init(): set TCH frame format explicitly
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+2 -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 15:08:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: gsm_settings_init(): set TCH frame format explicitly
Attention is currently required from: fixeria. jolly 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 14:14:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Notify talker in the VTY that he cannot leave the call while ta...
Attention is currently required from: fixeria, pespin. jolly 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/49bcb13d_ca495d79 PS1, Line 1854: vgcs_vty_notify(trans, "Cannot leave while talking\n"); > shouldn't this be returning an error instead of changing state below? It returns an error. I moved the statements (as we discussed in the chat) inside the if-block. -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 12:35:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Notify talker in the VTY that he cannot leave the call while ta...
Attention is currently required from: fixeria, jolly. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34906?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: ASCI: Notify talker in the VTY that he cannot leave the call while talking .. ASCI: Notify talker in the VTY that he cannot leave the call while talking Related: OS#5364 Change-Id: I497efc5bddc122cd5744de531917aad415ac1654 --- M src/host/layer23/src/mobile/gsm44068_gcc_bcc.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/06/34906/2 -- 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: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: mobile: clarify TCH I/O {handler,format} naming
Attention is currently required from: fixeria.
jolly 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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 30 Oct 2023 12:03:11 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: rename 'audio' node to 'tch' node
Attention is currently required from: fixeria. jolly 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: I2cab597c5de92ecb343cad748035ca5f8365 Gerrit-Change-Number: 34911 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 12:02:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-e1d[master]: usb: Deal with truncated ISO IN transfers
Attention is currently required from: laforge, manawyrm, tnt. Hello Jenkins Builder, manawyrm, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: usb: Deal with truncated ISO IN transfers .. usb: Deal with truncated ISO IN transfers It seems that in some circumstances, an ISO IN transfer can be truncated by the bus / host. In such situation we'd currently pass a non-modulo-32 length to the mux_demux (deframer) code, and it ASSERTs on that. Let's try to handle this more gracefully by substituting random garbage and letting higher layers deal with massive bit errors. Related: OS#5490 Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 --- M src/e1d.h M src/intf_line.c M src/usb.c 3 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/79/27579/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 Gerrit-Change-Number: 27579 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm Gerrit-Reviewer: tnt Gerrit-Attention: manawyrm Gerrit-Attention: laforge Gerrit-Attention: tnt Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: SI10: Fix uninitialized l_bts pointer
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34920?usp=email )
Change subject: SI10: Fix uninitialized l_bts pointer
..
SI10: Fix uninitialized l_bts pointer
l_bts must be declared outside the for-loop. If the loop is passed with
n_bts set the first time, l_bts is set. If the loop is passed with
n_bts set next time(s), l_bts is used to encode additional neighbor
cell infos.
Related: CID#330310 and CID#330311
Change-Id: I9dbbd066075f9ccb331616a2b59b46b1b44c8b4c
---
M src/osmo-bsc/system_information.c
1 file changed, 17 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/34920/1
diff --git a/src/osmo-bsc/system_information.c
b/src/osmo-bsc/system_information.c
index 477e9fa..2e9d8dd 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -1421,7 +1421,7 @@
const struct gsm_subscriber_connection *conn)
{
struct bitvec *nbv;
- struct gsm_bts *s_bts = conn->lchan->ts->trx->bts;
+ struct gsm_bts *s_bts = conn->lchan->ts->trx->bts, *l_bts;
int i;
bool any_neighbor = false;
int rc;
@@ -1443,7 +1443,7 @@
/* Get up to 32 possible neighbor frequencies that SI10 can refer to. */
for (i = 0; i < 32; i++) {
- struct gsm_bts *c_bts, *n_bts, *l_bts;
+ struct gsm_bts *c_bts, *n_bts;
struct gsm_subscriber_connection *c;
unsigned int save_cur_bit;
int16_t arfcn;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34920?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I9dbbd066075f9ccb331616a2b59b46b1b44c8b4c
Gerrit-Change-Number: 34920
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmo-e1d[master]: usb: Deal with truncated ISO IN transfers
Attention is currently required from: manawyrm, tnt.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email )
Change subject: usb: Deal with truncated ISO IN transfers
..
Patch Set 4:
(1 comment)
File src/intf_line.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12185):
https://gerrit.osmocom.org/c/osmo-e1d/+/27579/comment/ebe55d76_34061d59
PS4, Line 63: [LINE_CTR_USB_ISO_TRUNC] = { "rx:usb_iso_trunc","USB
ISO packets truncated" },
please, no space before tabs
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542
Gerrit-Change-Number: 27579
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: manawyrm
Gerrit-Reviewer: tnt
Gerrit-Attention: manawyrm
Gerrit-Attention: tnt
Gerrit-Comment-Date: Mon, 30 Oct 2023 11:36:09 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in osmo-e1d[master]: usb: Deal with truncated ISO IN transfers
Attention is currently required from: manawyrm, tnt. Hello Jenkins Builder, manawyrm, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: usb: Deal with truncated ISO IN transfers .. usb: Deal with truncated ISO IN transfers It seems that in some circumstances, an ISO IN transfer can be truncated by the bus / host. In such situation we'd currently pass a non-modulo-32 length to the mux_demux (deframer) code, and it ASSERTs on that. Let's try to handle this more gracefully by substituting random garbage and letting higher layers deal with massive bit errors. Related: OS#5490 Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 --- M src/e1d.h M src/intf_line.c M src/usb.c 3 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/79/27579/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 Gerrit-Change-Number: 27579 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm Gerrit-Reviewer: tnt Gerrit-Attention: manawyrm Gerrit-Attention: tnt Gerrit-MessageType: newpatchset
[S] Change in osmo-e1d[master]: usb: Deal with truncated ISO IN transfers
Attention is currently required from: manawyrm, tnt. Hello Jenkins Builder, manawyrm, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579?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: usb: Deal with truncated ISO IN transfers .. usb: Deal with truncated ISO IN transfers It seems that in some circumstances, an ISO IN transfer can be truncated by the bus / host. In such situation we'd currently pass a non-modulo-32 length to the mux_demux (deframer) code, and it ASSERTs on that. Let's try to handle this more gracefully by substituting random garbage and letting higher layers deal with massive bit errors. Related: OS#5490 Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 --- M src/usb.c 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/79/27579/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 Gerrit-Change-Number: 27579 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm Gerrit-Reviewer: tnt Gerrit-Attention: manawyrm Gerrit-Attention: tnt Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: gsmtap: Hide implementation of gsmtap_inst
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34720?usp=email ) Change subject: gsmtap: Hide implementation of gsmtap_inst .. Patch Set 5: (1 comment) Patchset: PS5: > osmo-remsim: create a TODO-RELEASE file if it exists. […] I have uploaded https://gerrit.osmocom.org/c/osmo-remsim/+/34919 for osmo-remsim. @lafo...@osmocom.org I suppose "you don't need to worry" means that I don't have to upload any changes at all for osmocom-bb as well as simtrace2? Just checking because simtrace2.git:host/lib/gsmtap.c contains a call to `gsmtap_inst_fd()` and host code does make use of system libosmocore -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34720?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: Ibe1a51205a6df764571b6d074e36582609a5 Gerrit-Change-Number: 34720 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 30 Oct 2023 11:26:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-e1d[master]: usb: Pass not just the actual transfer length but also the buffer size
laforge has restored this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27578?usp=email ) Change subject: usb: Pass not just the actual transfer length but also the buffer size .. Restored -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27578?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I5088a5213d2945fdfaf3b242a63e35d0ed511914 Gerrit-Change-Number: 27578 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: manawyrm Gerrit-Reviewer: tnt Gerrit-MessageType: restore
[S] Change in osmo-remsim[master]: bankd: Use gsmtap_inst_fd2()
Attention is currently required from: pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email ) Change subject: bankd: Use gsmtap_inst_fd2() .. Patch Set 1: (1 comment) Patchset: PS1: Not entirely sure if the TODO-RELEASE line should look like this -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2a7736d6fba795b2c479b2a0bc371b90f838ed61 Gerrit-Change-Number: 34919 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 30 Oct 2023 11:16:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-remsim[master]: bankd: Use gsmtap_inst_fd2()
arehbein has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email )
Change subject: bankd: Use gsmtap_inst_fd2()
..
bankd: Use gsmtap_inst_fd2()
- Use gsmtap_inst_fd2() because gsmtap_inst_fd() is deprecated
- Add TODO-RELEASE file
Related: OS#6213
Change-Id: I2a7736d6fba795b2c479b2a0bc371b90f838ed61
---
A TODO-RELEASE
M src/bankd/gsmtap.c
2 files changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/19/34919/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
new file mode 100644
index 000..4a35f50
--- /dev/null
+++ b/TODO-RELEASE
@@ -0,0 +1,10 @@
+# When cleaning up this file: bump API version in corresponding Makefile.am
and rename corresponding debian/lib*.install
+# according to
https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
+# In short:
+# LIBVERSION=c:r:a
+# If the library source code has changed at all since the last update, then
increment revision: c:r + 1:a.
+# If any interfaces have been added, removed, or changed since the last
update: c + 1:0:0.
+# 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 whatdescription / commit summary line
+libosmocore > 1.9.0working (compiling) gsmtap_inst_fd2()
diff --git a/src/bankd/gsmtap.c b/src/bankd/gsmtap.c
index 8aced6a..7bdbe51 100644
--- a/src/bankd/gsmtap.c
+++ b/src/bankd/gsmtap.c
@@ -97,7 +97,7 @@
LOGP(DGSMTAP, LOGL_DEBUG, "sending APDU sub_type=%u, mdm_tpdu len=%u,
sim_tpdu len=%u, iov cnt=%u\n",
sub_type, mdm_tpdu_len, sim_tpdu_len, cnt);
- const int rc = writev(gsmtap_inst_fd(g_gti), iov, cnt);
+ const int rc = writev(gsmtap_inst_fd2(g_gti), iov, cnt);
if (rc < 0) {
char errtxt[128];
LOGP(DGSMTAP, LOGL_ERROR, "writev() failed with errno=%d:
%s\n", errno, strerror_r(errno,
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I2a7736d6fba795b2c479b2a0bc371b90f838ed61
Gerrit-Change-Number: 34919
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-MessageType: newchange
[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls
Attention is currently required from: fixeria. jolly 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 -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 10:23:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: rename voice.[ch] to tch.[ch]
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34917?usp=email ) Change subject: mobile: rename voice.[ch] to tch.[ch] .. Patch Set 2: Code-Review+2 -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 09:55:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}()
Attention is currently required from: fixeria, jolly.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34916?usp=email )
Change subject: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}()
..
Patch Set 2: Code-Review+2
--
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: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: jolly
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 30 Oct 2023 09:55:19 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from to
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email )
Change subject: mobile: move 'struct gsm_call' from to
..
mobile: move 'struct gsm_call' from to
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(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
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
-#include
#include
-struct gsm_call {
- struct llist_head entry;
-
- struct osmocom_ms *ms;
-
- uint32_tcallref;
-
- boolinit; /* call initiated, no response yet */
- boolhold; /* call on hold */
- boolring; /* call ringing/knocking */
-
- struct osmo_timer_list dtmf_timer;
- uint8_t dtmf_state;
- uint8_t dtmf_index;
- chardtmf[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_tmsg_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
+
+#include
+#include
+
+struct osmocom_ms;
+
+struct gsm_call {
+ struct llist_head entry;
+
+ struct osmocom_ms *ms;
+
+ uint32_tcallref;
+
+ boolinit; /* call initiated, no response yet */
+ boolhold; /* call on hold */
+ boolring; /* call ringing/knocking */
+
+ struct osmo_timer_list dtmf_timer;
+ uint8_t dtmf_state;
+ uint8_t dtmf_index;
+ chardtmf[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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: mobile: cosmetic: use '#pragma once' in mncc.h
fixeria has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified 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 #include @@ -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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: layer23: rework L1CTL TRAFFIC.{ind,req} related logging
fixeria has submitted this change. (
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(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: mobile: gsm_settings_init(): set TCH frame format explicitly
Attention is currently required from: fixeria, jolly. pespin 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 09:51:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO
Attention is currently required from: fixeria, jolly, laforge. pespin 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) File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34913/comment/2ef03260_a809923d PS2, Line 2569: "(same as 'osmo', kept for backwards-compatibility)\n" better put the rtp in a different cmd and mark is a deprecated. -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 09:51:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: clarify TCH I/O {handler,format} naming
Attention is currently required from: fixeria, jolly.
pespin 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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: jolly
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 30 Oct 2023 09:49:17 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: rename 'audio' node to 'tch' node
Attention is currently required from: fixeria, jolly. pespin 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: (1 comment) File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34911/comment/1174c9cc_255481c7 PS2, Line 1479: vty_out(vty, " io-handler %s%s", I think all of this is still tightly related to audio calls, not data calls, and probably you want to have a separate section to configure how to handle data calls. So not sure the change you are doing here is the best way to go. -- 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: I2cab597c5de92ecb343cad748035ca5f8365 Gerrit-Change-Number: 34911 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 09:48:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from to
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email ) Change subject: mobile: move 'struct gsm_call' from to .. Patch Set 1: Code-Review+2 -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 09:45:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: epdg: Test Handover from Wifi back to LTE
Attention is currently required from: fixeria, lynxis lazus, pespin.
osmith 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/9e5e5c5d_1e61929d
PS1, Line 451: setverdict(pass);
> The cause you mention is sent by us (ttcn3 emulating PGW) to osmo-epdg in
> DeleteBearerRequest, so no […]
Ack
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34895/comment/c1cb7b2e_90863c07
PS1, Line 459: /* f_gtp2_register_udmsg('63'O); TODO: is this needed? */
> Ack I forgot to drop it.
Done
--
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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: osmith
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Attention: lynxis lazus
Gerrit-Comment-Date: Mon, 30 Oct 2023 09:35:28 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO
Attention is currently required from: jolly, laforge. fixeria 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: > Do we ever communicate CSD data in a non-RTP (and hence non-rate-adapted) > fashion? On the L1CTL interface - yes. The `TRAFFIC.ind` messages currently carry packed bits generated by the convolutional decoder, and similarly the `TRAFFIC.req` messages carry packed bits to be fed to the convolutional encoder. In the case of TCH/F9.6 it's `4 * 60 == 240 bits / 8 == 30 bytes`. The difference between 'osmo' and 'ti' is the endianness: Calypso firmware emits frames with bytes swapped in words (`\x01\x02\x03\x04` becomes `\x02\x01\x04\x03`). While we could modify the firmware and make it emit frames in big endian (like trxcon does), this would break regular voice calls because the TI format block in libosmogapk expects the little endian ordering. For now I don't see a need for the L1 PHY (be it Calypso firmware or trxcon/virtphy) to perform the rate adaptation to 64 kbit/s like the BSS does. This would impose even higher bandwidth requirements on the serial interface between the host and the firmware (4 x times for TCH/F9.6). We can always do this on the host side, if needed, right? -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 30 Oct 2023 09:15:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in osmo-hnodeb[master]: tests: enable commented-out 'python-tests' target
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/32146?usp=email ) Change subject: tests: enable commented-out 'python-tests' target .. Patch Set 3: Code-Review+1 (1 comment) Patchset: PS3: yes, great - but doesn't build :/ -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:51:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnodeb[master]: vty: fix incomplete docs for 'asn-debug' command
laforge has submitted this change. (
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(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in osmo-hnodeb[master]: vty: fix incomplete docs for 'asn-debug' command
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/34918?usp=email ) Change subject: vty: fix incomplete docs for 'asn-debug' command .. Patch Set 1: Code-Review+2 -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:51:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: rename voice.[ch] to tch.[ch]
Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34917?usp=email ) Change subject: mobile: rename voice.[ch] to tch.[ch] .. Patch Set 2: Code-Review+1 -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:48:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}()
Attention is currently required from: fixeria.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34916?usp=email )
Change subject: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}()
..
Patch Set 2: Code-Review+1
--
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: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 30 Oct 2023 08:48:43 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: add params and VTY commands for data calls
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34915?usp=email ) Change subject: mobile: add params and VTY commands for data calls .. Patch Set 2: (1 comment) Patchset: PS2: so this just adds the VTY settings but no actual implementation? I would argue the two belong together in one patch? -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:48:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: gsm_settings_init(): set TCH frame format explicitly
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:47:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO
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 Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:47:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: clarify TCH I/O {handler,format} naming
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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Attention: jolly
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 30 Oct 2023 08:45:25 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: rename 'audio' node to 'tch' node
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: I2cab597c5de92ecb343cad748035ca5f8365 Gerrit-Change-Number: 34911 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:44:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls
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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-CC: pespin
Gerrit-Attention: jolly
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 30 Oct 2023 08:44:15 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from to
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 to .. 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:41:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: mobile: cosmetic: use '#pragma once' in mncc.h
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 30 Oct 2023 08:41:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: layer23: rework L1CTL TRAFFIC.{ind,req} related logging
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
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 30 Oct 2023 08:41:09 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp-client: MGCP response: pass fmtp to caller
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 30 Oct 2023 08:39:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 30 Oct 2023 08:39:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnodeb[master]: vty: fix incomplete docs for 'asn-debug' command
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
Gerrit-MessageType: newchange
[S] Change in osmo-hnodeb[master]: tests: enable commented-out 'python-tests' target
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 30 Oct 2023 08:38:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 30 Oct 2023 08:14:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls
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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 30 Oct 2023 08:14:54 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: rename voice.[ch] to tch.[ch]
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 000..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..000 --- 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 #include #include -#include +#include #include #include @@ -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 #include -#include +#include #include /* The RAW PCM format is common for both audio source and sink */ @@ -585,7 +585,7 @@ _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 #include #include -#include +#include #include #include 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 #include #include -#include +#include #include static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg); @@
[M] Change in osmocom-bb[master]: mobile: add params and VTY commands for data calls
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
[M] Change in osmocom-bb[master]: mobile: clarify TCH I/O {handler,format} naming
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_formatio_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 */
charimei[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,
[S] Change in osmocom-bb[master]: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}()
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 = >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
Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: mobile: gsm_settings_init(): set TCH frame format explicitly
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 Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO
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
Gerrit-MessageType: newchange
[M] Change in osmocom-bb[master]: mobile: rename 'audio' node to 'tch' node
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: I2cab597c5de92ecb343cad748035ca5f8365
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, _ms_no_codec_half_cmd);
install_element(MS_NODE, _ms_abbrev_cmd);
install_element(MS_NODE, _ms_no_abbrev_cmd);
+ install_element(MS_NODE, _ms_tch_cmd);
install_element(MS_NODE, _ms_audio_cmd);
install_element(MS_NODE, _ms_neighbour_cmd);
install_element(MS_NODE, _ms_no_neighbour_cmd);
@@ -2842,12 +2847,12 @@
install_element(MS_NODE, _ms_script_load_run_cmd);
install_element(MS_NODE, _ms_no_script_load_run_cmd);
- install_node(_node, config_write_dummy);
- install_element(AUDIO_NODE, _ms_audio_io_handler_cmd);
- install_element(AUDIO_NODE, _ms_audio_no_io_handler_cmd);
- install_element(AUDIO_NODE, _ms_audio_io_tch_format_cmd);
-
[S] Change in osmocom-bb[master]: layer23: rework L1CTL TRAFFIC.{ind,req} related logging
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
Gerrit-MessageType: newchange
[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from to
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 to
..
mobile: move 'struct gsm_call' from to
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
-#include
#include
-struct gsm_call {
- struct llist_head entry;
-
- struct osmocom_ms *ms;
-
- uint32_tcallref;
-
- boolinit; /* call initiated, no response yet */
- boolhold; /* call on hold */
- boolring; /* call ringing/knocking */
-
- struct osmo_timer_list dtmf_timer;
- uint8_t dtmf_state;
- uint8_t dtmf_index;
- chardtmf[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_tmsg_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
+
+#include
+#include
+
+struct osmocom_ms;
+
+struct gsm_call {
+ struct llist_head entry;
+
+ struct osmocom_ms *ms;
+
+ uint32_tcallref;
+
+ boolinit; /* call initiated, no response yet */
+ boolhold; /* call on hold */
+ boolring; /* call ringing/knocking */
+
+ struct osmo_timer_list dtmf_timer;
+ uint8_t dtmf_state;
+ uint8_t dtmf_index;
+ chardtmf[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
Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: mobile: cosmetic: use '#pragma once' in mncc.h
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 #include @@ -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 Gerrit-MessageType: newchange
