[M] Change in osmo-e1d[master]: Automatically reset RIFO on underrun/overflow
Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email ) Change subject: Automatically reset RIFO on underrun/overflow .. Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-e1d/+/34554/comment/25ee80c3_23716305 PS1, Line 7: Automatically reset RIFO on underrun/overflow Maybe I need to split this commit. It is the work I have done. Check it out and do some comments. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/34554?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: Id7ccbfbdb288990c01f185dec79a1022a68b4748 Gerrit-Change-Number: 34554 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 27 Sep 2023 18:52:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-e1d[master]: Automatically reset RIFO on underrun/overflow
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email )
Change subject: Automatically reset RIFO on underrun/overflow
..
Automatically reset RIFO on underrun/overflow
Whenever the RIFO buffer underruns or overflows, it it reset and is
filled to the initial prefill_frame_count value.
There are two reasons for this to happen: The GPS clock is missing, so
the receiving interface is not in sync with the transmitting interface.
The delay changes significantly, due to congestion on the path between
both peers.
An upper limit is defined by max_frame_count. By default, it is set to
twice the value of max_frame_count. It specifies when the RIFO will
overflow. A lower value prevents too much delay, but also causes a RIFO
reset at a lower fill level.
Change-Id: Id7ccbfbdb288990c01f185dec79a1022a68b4748
---
M include/osmocom/octoi/octoi.h
M src/octoi/e1oip.c
M src/octoi/e1oip.h
M src/octoi/frame_rifo.c
M src/octoi/frame_rifo.h
M src/octoi/octoi_clnt_fsm.c
M src/octoi/octoi_clnt_vty.c
M src/octoi/octoi_srv_fsm.c
M src/octoi/octoi_srv_vty.c
M src/octoi/octoi_vty.h
M tests/rifo/rifo_test.c
11 files changed, 90 insertions(+), 28 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/54/34554/1
diff --git a/include/osmocom/octoi/octoi.h b/include/osmocom/octoi/octoi.h
index 645af3f..73c0889 100644
--- a/include/osmocom/octoi/octoi.h
+++ b/include/osmocom/octoi/octoi.h
@@ -24,6 +24,7 @@
uint8_t batching_factor;/* E1 frames per UDP
packet (Tx) */
bool force_send_all_ts; /* force transmission
of all timeslots */
uint32_t prefill_frame_count; /* FIFO prefill/preseed
count (Rx) */
+ uint32_t max_frame_count; /* FIFO maximum frames
count (Rx) */
union {
struct {
char *usb_serial; /* USB serial string
(ASCII) of icE1usb */
diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c
index 85dd165..adb5319 100644
--- a/src/octoi/e1oip.c
+++ b/src/octoi/e1oip.c
@@ -268,10 +268,15 @@
frame_buf[ts_nr] = e1th->data[i*num_ts + j];
}
/* FIXME: what to do about TS0? */
- rc = frame_rifo_in(>e1t.rifo, frame_buf, fn32+i);
- if (rc < 0)
+ rc = frame_rifo_in(>e1t.rifo, frame_buf, fn32+i,
iline->cfg.max_frame_count);
+ if (rc < 0) {
+ LOGPEER(peer, LOGL_ERROR, "RxIP: frame number out of
range. Reset buffer.\n");
iline_ctr_add(iline, LINE_CTR_E1oIP_E1T_OVERFLOW, 1);
+ frame_rifo_init(>e1t.rifo, fn32 + i);
+ iline->e1t.primed_rx_tdm = false;
+ }
}
+
/* update local state */
memcpy(iline->e1t.last_frame, frame_buf, BYTES_PER_FRAME);
if (update_next)
@@ -308,6 +313,7 @@
iline->cfg.batching_factor = DEFAULT_BATCHING_FACTOR;
iline->cfg.prefill_frame_count = DEFAULT_PREFILL_FRAME_COUNT;
+ iline->cfg.max_frame_count = DEFAULT_MAX_FRAME_COUNT;
e1oip_line_reset(iline);
@@ -317,11 +323,12 @@
return iline;
}
-void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor,
- uint32_t prefill_frame_count, bool force_send_all_ts)
+void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor,
uint32_t prefill_frame_count,
+ uint32_t max_frame_count, bool force_send_all_ts)
{
iline->cfg.batching_factor = batching_factor;
iline->cfg.prefill_frame_count = prefill_frame_count;
+ iline->cfg.max_frame_count = max_frame_count;
iline->cfg.force_send_all_ts = force_send_all_ts;
}
@@ -331,7 +338,7 @@
memset(>e1o.last_frame, 0xff, sizeof(iline->e1o.last_frame));
iline->e1o.next_seq = 0;
- frame_rifo_init(>e1t.rifo);
+ frame_rifo_init(>e1t.rifo, 0);
memset(>e1t.last_frame, 0xff, sizeof(iline->e1t.last_frame));
iline->e1t.next_fn32 = 0;
iline->e1t.primed_rx_tdm = false;
diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h
index 9357d48..5b6b5c9 100644
--- a/src/octoi/e1oip.h
+++ b/src/octoi/e1oip.h
@@ -17,6 +17,7 @@
#define DEFAULT_BATCHING_FACTOR32
#define DEFAULT_PREFILL_FRAME_COUNT200 /* 25ms */
+#define DEFAULT_MAX_FRAME_COUNT400 /* 50ms */
enum e1oip_line_ctr {
LINE_CTR_E1oIP_UNDERRUN,
@@ -53,6 +54,7 @@
struct {
uint8_t batching_factor;
uint32_t prefill_frame_count;
+ uint32_t max_frame_count;
bool force_send_all_ts;
} cfg;
@@ -84,8 +86,8 @@
struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer);
void e1oip_line_set_name(struct e1oip_line *line, const char
[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: fix TC_pcuif_rach
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?usp=email ) Change subject: PCU_Tests_SNS: fix TC_pcuif_rach .. PCU_Tests_SNS: fix TC_pcuif_rach The tesctcase TC_pcuif_rach expects an immediate assignment message on the AGCH but the template still uses the now deprecated (old v10 PCUIF) SAPI PCU_IF_SAPI_AGCH. With PCUIF v.11 we must use PCU_IF_SAPI_AGCH_2 Related: OS#5927 Change-Id: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 012699e..b90fe37 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -361,7 +361,7 @@ fn:=42, arfcn:=871, qta:=0)); PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_DATA_REQ(bts_nr:=0, trx_nr:=0, ts_nr:=0, block_nr:=?, fn:=?, -sapi:=PCU_IF_SAPI_AGCH, data:=?))); +sapi:=PCU_IF_SAPI_AGCH_2, data:=?))); setverdict(pass); f_clean_ns_codec(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?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: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d Gerrit-Change-Number: 34550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: fix TC_pcuif_rach
Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?usp=email ) Change subject: PCU_Tests_SNS: fix TC_pcuif_rach .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?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: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d Gerrit-Change-Number: 34550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 27 Sep 2023 16:36:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: sccplite: Support multiple MGW in MGW pool
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email )
Change subject: sccplite: Support multiple MGW in MGW pool
..
sccplite: Support multiple MGW in MGW pool
Before this patch, the MGW was selected at startup, and the MGCP data
was always forwarded to that same MGW.
If several MGW were configured in the MGW pool, then osmo-bsc would
select any of those from the pool, and start configured the BTS-side
connection on an endpoint in that MGW. However, when the MSC submitted
the MGCP encapsulated in IPA to the BSC, the BSC would always forward
the MGCP message to that same MGW selected at startup.
As a result, multiple MGWs configured with osmo-bsc using SCCPlite was
broken.
This commit fixes support for multiple MGWs by looking up the already
selected MGW (to setup the BTS-side conn on the endpoint), based on the
CIC (MGCP Endpoint) which was provided by the MSC upon AssignReq.
Related: OS#6189
Depends: libosmocore.git Change-Id Iee361d740845257fa62c9093e30e8079fa933827
Depends: osmo-mgw.git Change-Id I18d7bdf650c0ec87ae16ed4944aed9f495400137
Change-Id: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6
---
M TODO-RELEASE
M src/osmo-bsc/osmo_bsc_mgcp.c
M src/osmo-bsc/osmo_bsc_msc.c
3 files changed, 147 insertions(+), 20 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..7a7ec22 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#library whatdescription / commit summary line
+libosmocore > 1.9.0 working (compiling) OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL
diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c
index 1b8e089..d7de4d2 100644
--- a/src/osmo-bsc/osmo_bsc_mgcp.c
+++ b/src/osmo-bsc/osmo_bsc_mgcp.c
@@ -2,6 +2,7 @@
* SCCPlite MGCP handling
*
* (C) 2018 by Harald Welte
+ * (C) 2023 by sysmocom s.f.m.c. GmbH
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@@ -19,6 +20,15 @@
*
*/
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
#include
#include
#include
@@ -46,22 +56,123 @@
return osmo_msc_data_find(bsc_gsmnet, msc_nr);
}
+/* negative on error, zero upon success */
+static int parse_local_endpoint_name(char *buf, size_t buf_len, const char
*data)
+{
+ char line[1024];
+ char *epstart, *sep;
+ const char *start = data;
+ char *eol = strpbrk(start, "\r\n");
+
+ if (!eol)
+ return -1;
+
+ if (eol - start > sizeof(line))
+ return -1;
+ memcpy(line, start, eol - start);
+ line[eol - start] = '\0';
+
+ if (!(epstart = strchr(line, ' ')))
+ return -1;
+ epstart++;
+ /* epstart now points to trans */
+
+ if (!(epstart = strchr(epstart, ' ')))
+ return -1;
+ epstart++;
+ /* epstart now points to endpoint */
+ if (!(sep = strchr(epstart, '@')))
+ return -1;
+ if (sep - epstart >= buf_len)
+ return -1;
+
+ *sep = '\0';
+ osmo_strlcpy(buf, epstart, buf_len);
+ return 0;
+}
+
/* We received an IPA-encapsulated MGCP message from a MSC. Transfers msg
ownership. */
int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg)
{
struct bsc_msc_data *msc;
+ struct gsm_subscriber_connection *conn;
+ char rcv_ep_local_name[1024];
+ struct osmo_sockaddr_str osa_str = {};
+ struct osmo_sockaddr osa = {};
+ socklen_t dest_len;
+ struct mgcp_client *mgcp_cli = NULL;
int rc;
- LOGP(DMSC, LOGL_NOTICE, "%s: Received IPA-encapsulated MGCP: %s\n",
+ LOGP(DMSC, LOGL_INFO, "%s: Received IPA-encapsulated MGCP: %s\n",
osmo_ss7_asp_get_name(asp), msg->l2h);
- msc = msc_from_asp(asp);
- if (msc) {
- /* we don't have a write queue here as we simply expect the
socket buffers
-* to be large enough to deal with whatever small/infrequent
MGCP messages */
- rc = send(msc->mgcp_ipa.ofd.fd, msgb_l2(msg), msgb_l2len(msg),
0);
- } else
- rc = 0;
+ msc = msc_from_asp(asp);
+ if (!msc) {
+ rc = 0;
+ goto free_msg_ret;
+ }
+
+ rc = parse_local_endpoint_name(rcv_ep_local_name,
sizeof(rcv_ep_local_name), (const char *)msg->l2h);
+ if (rc < 0) {
+ LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP:
Failed to parse CIC\n",
+osmo_ss7_asp_get_name(asp));
+ goto free_msg_ret;
+ }
+
+ /* Lookup which conn attached to the MSC holds an MGW endpoint
[S] Change in osmo-ttcn3-hacks[master]: mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-resul...
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34553?usp=email ) Change subject: mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-results.xml .. mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-results.xml Change-Id: I54fa4aeae49fdae51cfbbf076a56b7185585fc48 --- M mgw/expected-results.xml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/34553/1 diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml index 5d57e1c..3c438bd 100644 --- a/mgw/expected-results.xml +++ b/mgw/expected-results.xml @@ -95,5 +95,6 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34553?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: I54fa4aeae49fdae51cfbbf076a56b7185585fc48 Gerrit-Change-Number: 34553 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup .. Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?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: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 Gerrit-Change-Number: 34539 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 16:32:11 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log the different failure verdicts before stopping
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34552?usp=email )
Change subject: RTP_Emulation: Log the different failure verdicts before
stopping
..
RTP_Emulation: Log the different failure verdicts before stopping
Change-Id: I177b2f4e56ac89fcab20ba6235bf968ac1873046
---
M library/RTP_Emulation.ttcn
1 file changed, 26 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/52/34552/1
diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn
index 5e10b3f..9095214 100644
--- a/library/RTP_Emulation.ttcn
+++ b/library/RTP_Emulation.ttcn
@@ -280,38 +280,49 @@
* check that will fit most situations and is intended to be executed by
* the testcases as as needed. */
function f_rtpem_stats_err_check(RtpemStats s) {
+ var boolean do_stop := false;
log("stats: ", s);
/* Check if there was some activity at either on the RX or on the
* TX side, but complete silence would indicate some problem */
if (s.num_pkts_tx < 1 and s.num_pkts_rx < 1) {
setverdict(fail, "no RTP packet activity detected (packets)");
- mtc.stop;
+ do_stop := true;
}
if (s.bytes_payload_tx < 1 and s.bytes_payload_rx < 1) {
setverdict(fail, "no RTP packet activity detected (bytes)");
- mtc.stop;
+ do_stop := true;
}
/* Check error counters */
if (s.num_pkts_rx_err_seq != 0) {
setverdict(fail, log2str(s.num_pkts_rx_err_seq, " RTP packet
sequence number errors occurred"));
- mtc.stop;
+ do_stop := true;
}
if (s.num_pkts_rx_err_ts != 0) {
setverdict(fail, log2str(s.num_pkts_rx_err_ts, " RTP packet
timestamp errors occurred"));
- mtc.stop;
+ do_stop := true;
}
if (s.num_pkts_rx_err_pt != 0) {
setverdict(fail, log2str(s.num_pkts_rx_err_pt, " RTP packet
payload type errors occurred"));
- mtc.stop;
+ do_stop := true;
}
if (s.num_pkts_rx_err_disabled != 0) {
setverdict(fail, log2str(s.num_pkts_rx_err_disabled, " RTP
packets received while RX was disabled"));
- mtc.stop;
+ do_stop := true;
}
if (s.num_pkts_rx_err_payload != 0) {
setverdict(fail, log2str(s.num_pkts_rx_err_payload, " RTP
packets with mismatching payload received"));
+ do_stop := true;
+ }
+
+ if (do_stop) {
+ if (self == mtc) {
+ /* Properly stop all ports before disconnecting them.
This avoids
+ * running into the dynamic testcase error due to
messages arriving on
+ * unconnected ports. */
+ all component.stop;
+ }
mtc.stop;
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34552?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: I177b2f4e56ac89fcab20ba6235bf968ac1873046
Gerrit-Change-Number: 34552
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?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: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly .. mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly Change-Id: I34d47d0cdde855900798e4cb3efd26af22f5b049 --- M mgw/MGCP_Test.ttcn M mgw/expected-results.xml 2 files changed, 168 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/34547/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?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: I34d47d0cdde855900798e4cb3efd26af22f5b049 Gerrit-Change-Number: 34547 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log number of error packets
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email )
Change subject: RTP_Emulation: Log number of error packets
..
RTP_Emulation: Log number of error packets
Change-Id: I685fb43ea30c83a975edd32cc24994da15940100
---
M library/RTP_Emulation.ttcn
1 file changed, 14 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/51/34551/1
diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn
index de2c877..5e10b3f 100644
--- a/library/RTP_Emulation.ttcn
+++ b/library/RTP_Emulation.ttcn
@@ -295,23 +295,23 @@
/* Check error counters */
if (s.num_pkts_rx_err_seq != 0) {
- setverdict(fail, "RTP packet sequence number errors occurred");
+ setverdict(fail, log2str(s.num_pkts_rx_err_seq, " RTP packet
sequence number errors occurred"));
mtc.stop;
}
if (s.num_pkts_rx_err_ts != 0) {
- setverdict(fail, "RTP packet timestamp errors occurred");
+ setverdict(fail, log2str(s.num_pkts_rx_err_ts, " RTP packet
timestamp errors occurred"));
mtc.stop;
}
if (s.num_pkts_rx_err_pt != 0) {
- setverdict(fail, "RTP packet payload type errors occurred");
+ setverdict(fail, log2str(s.num_pkts_rx_err_pt, " RTP packet
payload type errors occurred"));
mtc.stop;
}
if (s.num_pkts_rx_err_disabled != 0) {
- setverdict(fail, "RTP packets received while RX was disabled");
+ setverdict(fail, log2str(s.num_pkts_rx_err_disabled, " RTP
packets received while RX was disabled"));
mtc.stop;
}
if (s.num_pkts_rx_err_payload != 0) {
- setverdict(fail, "RTP packets with mismatching payload
received");
+ setverdict(fail, log2str(s.num_pkts_rx_err_payload, " RTP
packets with mismatching payload received"));
mtc.stop;
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?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: I685fb43ea30c83a975edd32cc24994da15940100
Gerrit-Change-Number: 34551
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-bsc[master]: sccplite: Support multiple MGW in MGW pool
Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email ) Change subject: sccplite: Support multiple MGW in MGW pool .. Patch Set 3: Code-Review+2 (1 comment) File src/osmo-bsc/osmo_bsc_mgcp.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34511/comment/b1c1249e_45df1025 PS2, Line 133: ep_local_name='%s' > This may be "(null)", is this ok? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?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: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 Gerrit-Change-Number: 34511 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 16:31:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: sccplite: Support multiple MGW in MGW pool
Attention is currently required from: fixeria, laforge, osmith, pespin. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: sccplite: Support multiple MGW in MGW pool .. sccplite: Support multiple MGW in MGW pool Before this patch, the MGW was selected at startup, and the MGCP data was always forwarded to that same MGW. If several MGW were configured in the MGW pool, then osmo-bsc would select any of those from the pool, and start configured the BTS-side connection on an endpoint in that MGW. However, when the MSC submitted the MGCP encapsulated in IPA to the BSC, the BSC would always forward the MGCP message to that same MGW selected at startup. As a result, multiple MGWs configured with osmo-bsc using SCCPlite was broken. This commit fixes support for multiple MGWs by looking up the already selected MGW (to setup the BTS-side conn on the endpoint), based on the CIC (MGCP Endpoint) which was provided by the MSC upon AssignReq. Related: OS#6189 Depends: libosmocore.git Change-Id Iee361d740845257fa62c9093e30e8079fa933827 Depends: osmo-mgw.git Change-Id I18d7bdf650c0ec87ae16ed4944aed9f495400137 Change-Id: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 --- M TODO-RELEASE M src/osmo-bsc/osmo_bsc_mgcp.c M src/osmo-bsc/osmo_bsc_msc.c 3 files changed, 147 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/34511/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?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: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 Gerrit-Change-Number: 34511 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in libosmo-netif[master]: stream_srv: Fix connection error handling
Attention is currently required from: arehbein, laforge, pespin.
daniel has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34338?usp=email )
Change subject: stream_srv: Fix connection error handling
..
Patch Set 2:
(2 comments)
File src/stream_srv.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/4a9040f5_53ab2d3e
PS1, Line 493: if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) {
> for a srv it is probably unlikely or unusable. […]
Yeah, most likely. @arehb...@sysmocom.de just found out that osmo_io also
doesn't like its read/write callbacks being NULL (in
https://gerrit.osmocom.org/c/osmo-bsc/+/34526).
I guess it should be changed there.
File src/stream_srv.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/83103342_2d295e53
PS2, Line 492: } else {
> did you think about simply doing early return here instead?
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34338?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I84eea2717f3762830f3f5b115e6fc8545eaa4fd5
Gerrit-Change-Number: 34338
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-CC: arehbein
Gerrit-CC: laforge
Gerrit-Attention: arehbein
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 27 Sep 2023 16:16:23 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Comment-In-Reply-To: pespin
Comment-In-Reply-To: daniel
Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: sccplite: Support multiple MGW in MGW pool
Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email ) Change subject: sccplite: Support multiple MGW in MGW pool .. Patch Set 2: Code-Review+1 (1 comment) File src/osmo-bsc/osmo_bsc_mgcp.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34511/comment/8cd37be0_d3e37122 PS2, Line 133: ep_local_name='%s' This may be "(null)", is this ok? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?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: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 Gerrit-Change-Number: 34511 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 16:15:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: fix TC_pcuif_rach
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?usp=email ) Change subject: PCU_Tests_SNS: fix TC_pcuif_rach .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?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: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d Gerrit-Change-Number: 34550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 27 Sep 2023 15:53:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: osmo_io: Clean up code
Attention is currently required from: arehbein, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code .. Patch Set 1: (1 comment) Patchset: PS1: > Maybe extending the doc saying it should be called on each thread using the > API would be welcome. In that case I think we should have a section named "threading" somewhere in the API docs and list the relevant functions. >From what I can tell there's at least: * osmo_ctx_init() * osmo_select_init() * osmo_iofd_init() which need to be initialized per thread and certain things that have to be used from the main thread. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?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: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 15:34:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: fix TC_pcuif_rach
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?usp=email ) Change subject: PCU_Tests_SNS: fix TC_pcuif_rach .. PCU_Tests_SNS: fix TC_pcuif_rach The tesctcase TC_pcuif_rach expects an immediate assignment message on the AGCH but the template still uses the now deprecated (old v10 PCUIF) SAPI PCU_IF_SAPI_AGCH. With PCUIF v.11 we must use PCU_IF_SAPI_AGCH_2 Related: OS#5927 Change-Id: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/34550/1 diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 012699e..b90fe37 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -361,7 +361,7 @@ fn:=42, arfcn:=871, qta:=0)); PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_DATA_REQ(bts_nr:=0, trx_nr:=0, ts_nr:=0, block_nr:=?, fn:=?, -sapi:=PCU_IF_SAPI_AGCH, data:=?))); +sapi:=PCU_IF_SAPI_AGCH_2, data:=?))); setverdict(pass); f_clean_ns_codec(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?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: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d Gerrit-Change-Number: 34550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: mgw: TC_conn_timeout Fix timeout left set upon test exit
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email )
Change subject: mgw: TC_conn_timeout Fix timeout left set upon test exit
..
mgw: TC_conn_timeout Fix timeout left set upon test exit
The test mentioned in a comment that the value is reset upon each test
start, but that's false.
Change-Id: I9447fa6c6b3103e05fa3ee756ee572ddecb69006
---
M mgw/MGCP_Test.ttcn
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/49/34549/1
diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index 73591b2..0cedb0e 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -2562,7 +2562,7 @@
f_init(ep);
log("Setting conn-timeout to 1s");
- f_vty_config(MGWVTY, "mgcp", "conn-timeout 1"); /* reset in
f_init_vty() */
+ f_vty_config(MGWVTY, "mgcp", "conn-timeout 1");
log("Sending RTP data for 1.5s");
flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111,
"GSM-HR-08/8000/1"));
@@ -2587,6 +2587,9 @@
f_sleep(0.2);
f_rtpem_conn_refuse_verify(RTPEM[0]);
+ log("Setting conn-timeout back to 0 (disabled)");
+ f_vty_config(MGWVTY, "mgcp", "conn-timeout 0");
+
setverdict(pass);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?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: I9447fa6c6b3103e05fa3ee756ee572ddecb69006
Gerrit-Change-Number: 34549
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-mgw[master]: mgw: Configure IuUP if codec set during MDCX
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34548?usp=email ) Change subject: mgw: Configure IuUP if codec set during MDCX .. mgw: Configure IuUP if codec set during MDCX The mgcp client may first configure the connection to use RTP-AMR, but after setting up another call leg may find out that both legs are IuUP and hence want to forward the IuUP between the 2 connections instead. In that case, an MDCX with codec VND.3GPP.IUFP would be set. Until now, osmo-mgw didn't take that scenario into account, and it was only upgrading the rtp conn to iuup internally during CRCX. As a result, in the mentioned scenario osmo-mgw would continue to output RTP instead of IuUP after the MDCX with VND.3GPP.IUFP, which is wrong. Related: SYS#6578 Change-Id: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/48/34548/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 7795734..809622b 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1293,6 +1293,10 @@ error_code = rc; goto error3; } + /* Upgrade the conn type RTP_DEFAULT->RTP_IUUP if needed based on requested codec: */ + /* TODO: "codec" probably needs to be moved from endp to conn */ + if (conn->type == MGCP_RTP_DEFAULT && strcmp(conn->end.codec->subtype_name, "VND.3GPP.IUFP") == 0) + rc = mgcp_conn_iuup_init(conn); /* check connection mode setting */ if (conn->conn->mode != MGCP_CONN_LOOPBACK -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34548?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: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 Gerrit-Change-Number: 34548 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: osmo_io: Clean up code
Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code .. Patch Set 1: (1 comment) Patchset: PS1: > It's the same as in osmo_select: […] Maybe extending the doc saying it should be called on each thread using the API would be welcome. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?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: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 27 Sep 2023 14:24:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in libosmocore[master]: osmo_io: Clean up code
Attention is currently required from: arehbein, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code .. Patch Set 1: (1 comment) Patchset: PS1: > So now the topic is actually: Is this per-thread call requirement documented > in the doxygen API of t […] It's the same as in osmo_select: ``` /*! initialize the osmocom select abstraction for the current thread */ void osmo_select_init(void) ``` ``` /*! initialize osmo_io for the current thread */ void osmo_iofd_init(void) ``` I don't think we have been overly verbose in our documentation about multi-threaded code in the past, not sure if you want anything else. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?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: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 14:14:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email )
Change subject: ASCI: Add a flag to turn transmitter off or on
..
ASCI: Add a flag to turn transmitter off or on
This flag can be used to turn transmitter off for "group receive mode"
or for handover procedure. The flag is stored in the channel description
of the mobile application. It is sent to layer 1 when switching to
dedicated channel or when changing TCH mode.
At the layer 1 the transmitter is turned off while the receiver is still
active. This is done by:
* scheduling a TX dummy task for TCH bursts
* scheduling no TX task for SACCH bursts
* not enabling the transmit window
Related: OS#5364
Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3
---
M include/l1ctl_proto.h
M src/host/layer23/include/osmocom/bb/common/l1ctl.h
M src/host/layer23/include/osmocom/bb/common/osmocom_data.h
M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
M src/host/layer23/src/common/l1ctl.c
M src/host/layer23/src/misc/app_cbch_sniff.c
M src/host/layer23/src/mobile/gsm414.c
M src/host/layer23/src/mobile/gsm48_rr.c
M src/host/layer23/src/modem/grr.c
M src/target/firmware/include/layer1/async.h
M src/target/firmware/include/layer1/sync.h
M src/target/firmware/layer1/async.c
M src/target/firmware/layer1/l23_api.c
M src/target/firmware/layer1/prim_tch.c
14 files changed, 92 insertions(+), 42 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h
index 8bf44cf..2bdb560 100644
--- a/include/l1ctl_proto.h
+++ b/include/l1ctl_proto.h
@@ -146,6 +146,7 @@
uint8_t start_codec;
uint8_t codecs_bitmask;
} amr;
+ uint8_t tch_flags;
} __attribute__((packed));
/* data on the CCCH was found. This is following the header */
@@ -219,8 +220,11 @@
uint8_t start_codec;
uint8_t codecs_bitmask;
} amr;
+ uint8_t tch_flags;
} __attribute__((packed));
+#define L1CTL_TCH_FLAG_RXONLY (1<<0) /* TX disabled */
+
/* the l1_info_ul header is in front */
struct l1ctl_rach_req {
uint8_t ra;
@@ -265,6 +269,7 @@
};
uint8_t tch_mode;
uint8_t audio_mode;
+ uint8_t tch_flags;
} __attribute__((packed));
struct l1ctl_dm_freq_req {
diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
index 40b3159..d49e16d 100644
--- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
@@ -26,11 +26,10 @@
uint8_t ra, uint16_t offset, uint8_t combined);
/* Transmit L1CTL_DM_EST_REQ */
-int l1ctl_tx_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn,
- uint8_t chan_nr, uint8_t tsc, uint8_t tch_mode, uint8_t audio_mode);
-int l1ctl_tx_dm_est_req_h1(struct osmocom_ms *ms, uint8_t maio, uint8_t hsn,
- uint16_t *ma, uint8_t ma_len, uint8_t chan_nr, uint8_t tsc,
- uint8_t tch_mode, uint8_t audio_mode);
+int l1ctl_tx_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn, uint8_t
chan_nr, uint8_t tsc,
+ uint8_t tch_mode, uint8_t audio_mode, uint8_t
tch_flags);
+int l1ctl_tx_dm_est_req_h1(struct osmocom_ms *ms, uint8_t maio, uint8_t hsn,
uint16_t *ma, uint8_t ma_len,
+ uint8_t chan_nr, uint8_t tsc, uint8_t tch_mode,
uint8_t audio_mode, uint8_t tch_flags);
/* Transmit L1CTL_DM_FREQ_REQ */
int l1ctl_tx_dm_freq_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn,
@@ -50,8 +49,8 @@
int l1ctl_tx_ccch_mode_req(struct osmocom_ms *ms, uint8_t ccch_mode);
/* Transmit TCH_MODE_REQ */
-int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode,
- uint8_t audio_mode, uint8_t tch_loop_mode);
+int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode, uint8_t
audio_mode, uint8_t tch_flags,
+ uint8_t tch_loop_mode);
/* Transmit ECHO_REQ */
int l1ctl_tx_echo_req(struct osmocom_ms *ms, unsigned int len);
diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
index 3e5c13a..60e12df 100644
--- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -83,6 +83,7 @@
struct osmocom_ms *ms;
uint8_t tch_mode;
uint8_t audio_mode;
+ uint8_t tch_flags;
};
struct osmobb_neigh_pm_ind {
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 ae9b867..299b6e5 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++
[S] Change in osmocom-bb[master]: ASCI: Add two logging categories for group and broadcast call control
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34480?usp=email )
(
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ASCI: Add two logging categories for group and broadcast call
control
..
ASCI: Add two logging categories for group and broadcast call control
Related: OS#5364
Change-Id: I77f634c7098137a5412ea56ddc0e794e629d1982
---
M src/host/layer23/include/osmocom/bb/common/logging.h
M src/host/layer23/src/common/logging.c
2 files changed, 24 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/host/layer23/include/osmocom/bb/common/logging.h
b/src/host/layer23/include/osmocom/bb/common/logging.h
index fa76c59..40a7e81 100644
--- a/src/host/layer23/include/osmocom/bb/common/logging.h
+++ b/src/host/layer23/include/osmocom/bb/common/logging.h
@@ -12,6 +12,8 @@
DNB,
DMM,
DCC,
+ DGCC,
+ DBCC,
DSS,
DSMS,
DMNCC,
diff --git a/src/host/layer23/src/common/logging.c
b/src/host/layer23/src/common/logging.c
index d1b5b92..0401360 100644
--- a/src/host/layer23/src/common/logging.c
+++ b/src/host/layer23/src/common/logging.c
@@ -64,6 +64,18 @@
.color = "\033[1;33m",
.enabled = 1, .loglevel = LOGL_NOTICE,
},
+ [DGCC] = {
+ .name = "DGCC",
+ .description = "Group Call Control",
+ .color = "\033[1;33m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DBCC] = {
+ .name = "DBCC",
+ .description = "Broadcast Call Control",
+ .color = "\033[1;33m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
[DSS] = {
.name = "DSS",
.description = "Supplenmentary Services",
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34480?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: I77f634c7098137a5412ea56ddc0e794e629d1982
Gerrit-Change-Number: 34480
Gerrit-PatchSet: 8
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: Transmit access bursts on DCCH of TCH channels
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34481?usp=email )
Change subject: Transmit access bursts on DCCH of TCH channels
..
Transmit access bursts on DCCH of TCH channels
This is required to access a TCH during handover or to access the uplink
of a VGCS channel.
The patch is taken from the handover branch.
Change-Id: I1a972d9bac5749c67c1b139825400854f7cf1490
---
M src/target/firmware/layer1/prim_rach.c
1 file changed, 29 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/target/firmware/layer1/prim_rach.c
b/src/target/firmware/layer1/prim_rach.c
index 9536e5f..20dab5f 100644
--- a/src/target/firmware/layer1/prim_rach.c
+++ b/src/target/firmware/layer1/prim_rach.c
@@ -127,7 +127,7 @@
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
45, 46};
-/* request a RACH request at the next multiframe T3 = fn51 */
+/* schedule access burst */
void l1a_rach_req(uint16_t offset, uint8_t combined, uint8_t ra)
{
uint32_t fn_sched;
@@ -136,7 +136,19 @@
offset += 3;
local_firq_save(flags);
- if (combined) {
+ if (l1s.dedicated.type == GSM_DCHAN_TCH_F) {
+ fn_sched = l1s.current_time.fn + offset;
+ /* go next DCCH frame TCH/F channel */
+ if ((fn_sched % 13) == 12)
+ fn_sched++;
+ } else if (l1s.dedicated.type == GSM_DCHAN_TCH_H) {
+ fn_sched = l1s.current_time.fn + offset;
+ /* go next DCCH frame of TCH/H channel */
+ if ((fn_sched % 13) == 12)
+ fn_sched++;
+ if ((l1s.dedicated.tn & 1) != ((fn_sched % 13) & 1))
+ fn_sched++;
+ } else if (combined) {
/* add elapsed RACH slots to offset */
offset += t3_to_rach_comb[l1s.current_time.t3];
/* offset is the number of RACH slots in the future */
@@ -146,6 +158,7 @@
} else
fn_sched = l1s.current_time.fn + offset;
l1s.rach.ra = ra;
+ fn_sched %= GSM_MAX_FN;
sched_gsmtime(rach_sched_set_ul, fn_sched, 0);
local_irq_restore(flags);
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34481?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: I1a972d9bac5749c67c1b139825400854f7cf1490
Gerrit-Change-Number: 34481
Gerrit-PatchSet: 8
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[L] Change in osmocom-bb[master]: ASCI: Add GCC/BCC (call control) to mobility management
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34476?usp=email )
Change subject: ASCI: Add GCC/BCC (call control) to mobility management
..
ASCI: Add GCC/BCC (call control) to mobility management
GCC is the call control for voice group calls, BCC is the call control
for voice broadcast calls.
This patch includes the new message primitives between MM layer and the
GCC/BCC layers.
Related: OS#5364
Change-Id: If6f3cea4b2ca839559596a6ee5a3d169c6d85dbe
---
M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
M src/host/layer23/src/mobile/gsm48_mm.c
2 files changed, 237 insertions(+), 97 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index b637a60..bdf5716 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
@@ -8,6 +8,9 @@
#define GSM48_MMCC_CLASS 0x100
#define GSM48_MMSS_CLASS 0x200
#define GSM48_MMSMS_CLASS 0x300
+#define GSM48_MMBCC_CLASS 0x500
+#define GSM48_MMGCC_CLASS 0x600
+#define GSM48_MMXX_REL_IND 0x022
#define GSM48_MMCC_EST_REQ 0x110
#define GSM48_MMCC_EST_IND 0x112
#define GSM48_MMCC_EST_CNF 0x111
@@ -51,6 +54,29 @@
#define GSM48_MMSMS_ERR_IND0x372
#define GSM48_MMSMS_PROMPT_IND 0x382
#define GSM48_MMSMS_PROMPT_REJ 0x384
+/* MM messages for Voice Group/Broadcast Calls */
+#define GSM48_MMGCC_EST_REQ0x510
+#define GSM48_MMGCC_EST_CNF0x511
+#define GSM48_MMGCC_REL_REQ0x520
+#define GSM48_MMGCC_REL_IND0x522
+#define GSM48_MMGCC_DATA_REQ 0x530
+#define GSM48_MMGCC_DATA_IND 0x532
+#define GSM48_MMGCC_UNIT_DATA_REQ 0x540
+#define GSM48_MMGCC_UNIT_DATA_IND 0x542
+#define GSM48_MMGCC_REEST_REQ 0x560
+#define GSM48_MMGCC_REEST_CNF 0x561
+#define GSM48_MMGCC_ERR_IND0x572
+#define GSM48_MMBCC_EST_REQ0x610
+#define GSM48_MMBCC_EST_CNF0x611
+#define GSM48_MMBCC_REL_REQ0x620
+#define GSM48_MMBCC_REL_IND0x622
+#define GSM48_MMBCC_DATA_REQ 0x630
+#define GSM48_MMBCC_DATA_IND 0x632
+#define GSM48_MMBCC_UNIT_DATA_REQ 0x640
+#define GSM48_MMBCC_UNIT_DATA_IND 0x642
+#define GSM48_MMBCC_REEST_REQ 0x660
+#define GSM48_MMBCC_REEST_CNF 0x661
+#define GSM48_MMBCC_ERR_IND0x672
#define MMXX_ALLOC_SIZE256
#define MMXX_ALLOC_HEADROOM64
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index 2bba0e1..d3ab148 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -639,6 +639,28 @@
{ GSM48_MMSMS_ERR_IND, "MMSMS_ERR_IND" },
{ GSM48_MMSMS_PROMPT_IND, "MMSMS_PROMPT_IND" },
{ GSM48_MMSMS_PROMPT_REJ, "MMSMS_PROMPT_REJ" },
+ { GSM48_MMBCC_EST_REQ, "MMBCC_EST_REQ" },
+ { GSM48_MMBCC_EST_CNF, "MMBCC_EST_CNF" },
+ { GSM48_MMBCC_REL_REQ, "MMBCC_REL_REQ" },
+ { GSM48_MMBCC_REL_IND, "MMBCC_REL_IND" },
+ { GSM48_MMBCC_DATA_REQ, "MMBCC_DATA_REQ" },
+ { GSM48_MMBCC_DATA_IND, "MMBCC_DATA_IND" },
+ { GSM48_MMBCC_UNIT_DATA_REQ,"MMBCC_UNIT_DATA_REQ" },
+ { GSM48_MMBCC_UNIT_DATA_IND,"MMBCC_UNIT_DATA_IND" },
+ { GSM48_MMBCC_REEST_REQ,"MMBCC_REEST_REQ" },
+ { GSM48_MMBCC_REEST_CNF,"MMBCC_REEST_CNF" },
+ { GSM48_MMBCC_ERR_IND, "MMBCC_ERR_IND" },
+ { GSM48_MMGCC_EST_REQ, "MMGCC_EST_REQ" },
+ { GSM48_MMGCC_EST_CNF, "MMGCC_EST_CNF" },
+ { GSM48_MMGCC_REL_REQ, "MMGCC_REL_REQ" },
+ { GSM48_MMGCC_REL_IND, "MMGCC_REL_IND" },
+ { GSM48_MMGCC_DATA_REQ, "MMGCC_DATA_REQ" },
+ { GSM48_MMGCC_DATA_IND, "MMGCC_DATA_IND" },
+ { GSM48_MMGCC_UNIT_DATA_REQ,"MMGCC_UNIT_DATA_REQ" },
+ { GSM48_MMGCC_UNIT_DATA_IND,"MMGCC_UNIT_DATA_IND" },
+ { GSM48_MMGCC_REEST_REQ,"MMGCC_REEST_REQ" },
+ { GSM48_MMGCC_REEST_CNF,"MMGCC_REEST_CNF" },
+ { GSM48_MMGCC_ERR_IND, "MMGCC_ERR_IND" },
{ 0,NULL }
};
@@ -764,6 +786,9 @@
case GSM48_MMSMS_CLASS:
gsm411_rcv_sms(ms, msg);
break;
+ case GSM48_MMGCC_CLASS:
+ case GSM48_MMBCC_CLASS:
+ break;
}
msgb_free(msg);
work =
[M] Change in osmocom-bb[master]: ASCI: MM connections are defined by 'ref' and 'protocol' tuple
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34478?usp=email )
Change subject: ASCI: MM connections are defined by 'ref' and 'protocol' tuple
..
ASCI: MM connections are defined by 'ref' and 'protocol' tuple
VGCS and VBS calls may share the same (call) ref or share with other
protocols. Therefore the MM connection is defined by the reference and
the prococol discriminator.
Related: OS#5364
Change-Id: Ic280cd8c60077bb2c2ef641f4cddd3b36eee
---
M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
M src/host/layer23/src/mobile/gsm48_mm.c
2 files changed, 48 insertions(+), 13 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index bdf5716..3ece82e 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
@@ -231,7 +231,7 @@
struct llist_head list;
struct gsm48_mmlayer*mm;
- /* ref and type form a unique tuple */
+ /* ref and protocol form a unique tuple */
uint32_tref; /* reference to trans */
uint8_t protocol;
uint8_t transaction_id;
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index d3ab148..ed8cdf8 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -1403,9 +1403,8 @@
/* new MM connection state */
static void new_conn_state(struct gsm48_mm_conn *conn, int state)
{
- LOGP(DMM, LOGL_INFO, "(ref %x) new state %s -> %s\n", conn->ref,
- gsm48_mmxx_state_names[conn->state],
- gsm48_mmxx_state_names[state]);
+ LOGP(DMM, LOGL_INFO, "(ref 0x%x proto %d) new state %s -> %s\n",
conn->ref, conn->protocol,
+gsm48_mmxx_state_names[conn->state],
gsm48_mmxx_state_names[state]);
conn->state = state;
}
@@ -1424,13 +1423,35 @@
}
/* find MM connection by reference */
-struct gsm48_mm_conn *mm_conn_by_ref(struct gsm48_mmlayer *mm,
- uint32_t ref)
+struct gsm48_mm_conn *mm_conn_by_ref_and_class(struct gsm48_mmlayer *mm,
+ uint32_t ref, uint16_t cls)
{
struct gsm48_mm_conn *conn;
+ uint8_t protocol;
+
+ switch (cls) {
+ case GSM48_MMCC_CLASS:
+ protocol = GSM48_PDISC_CC;
+ break;
+ case GSM48_MMSS_CLASS:
+ protocol = GSM48_PDISC_NC_SS;
+ break;
+ case GSM48_MMSMS_CLASS:
+ protocol = GSM48_PDISC_SMS;
+ break;
+ case GSM48_MMGCC_CLASS:
+ protocol = GSM48_PDISC_GROUP_CC;
+ break;
+ case GSM48_MMBCC_CLASS:
+ protocol = GSM48_PDISC_BCAST_CC;
+ break;
+ default:
+ LOGP(DMM, LOGL_ERROR, "Invalid message class 0x%03x. Please
fix!", cls);
+ return NULL;
+ }
llist_for_each_entry(conn, >mm_conn, list) {
- if (conn->ref == ref)
+ if (conn->ref == ref && conn->protocol == protocol)
return conn;
}
return NULL;
@@ -3428,7 +3449,7 @@
int msg_type = mmh->msg_type;
/* get connection, if not exist (anymore), release */
- conn = mm_conn_by_ref(mm, mmh->ref);
+ conn = mm_conn_by_ref_and_class(mm, mmh->ref, (mmh->msg_type &
GSM48_MMXX_MASK));
if (!conn) {
LOGP(DMM, LOGL_INFO, "MMXX_DATA_REQ with unknown (already "
"released) ref=%x, sending MMXX_REL_IND\n", mmh->ref);
@@ -3457,7 +3478,7 @@
struct gsm48_mm_conn *conn;
/* get connection, if not exist (anymore), release */
- conn = mm_conn_by_ref(mm, mmh->ref);
+ conn = mm_conn_by_ref_and_class(mm, mmh->ref, (mmh->msg_type &
GSM48_MMXX_MASK));
if (conn)
mm_conn_free(conn);
@@ -3481,7 +3502,7 @@
struct gsm48_mm_conn *conn;
/* get connection, if not exist (anymore), release */
- conn = mm_conn_by_ref(mm, mmh->ref);
+ conn = mm_conn_by_ref_and_class(mm, mmh->ref, (mmh->msg_type &
GSM48_MMXX_MASK));
if (conn)
mm_conn_free(conn);
@@ -3496,7 +3517,7 @@
struct gsm48_mm_conn *conn;
/* get connection, if not exist (anymore), release */
- conn = mm_conn_by_ref(mm, mmh->ref);
+ conn = mm_conn_by_ref_and_class(mm, mmh->ref, (mmh->msg_type &
GSM48_MMXX_MASK));
if (conn)
mm_conn_free(conn);
@@ -3525,7 +3546,7 @@
struct gsm48_mm_conn *conn;
/* get connection, if not exist (anymore), release */
- conn
[M] Change in osmocom-bb[master]: ASCI: Get timing advance and TX power only when included
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34477?usp=email )
Change subject: ASCI: Get timing advance and TX power only when included
..
ASCI: Get timing advance and TX power only when included
Instead of assuming that there are TX power and timing advance IEs
included in RSL message, check for existence.
gsm48_rr_rx_acch() may receive frames from FACCH that do not have these
IEs included in the message. These frames are UI frames on DCCH and Bter
frames. E.g. these frames are used on voice group channel to control
uplink.
Related: OS#5364
Change-Id: I87fcd44bba221ab4c5fbd2c79557db2444a10b88
---
M src/host/layer23/src/mobile/gsm48_rr.c
1 file changed, 39 insertions(+), 25 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index a0aad3c..910ded7 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -4875,32 +4875,7 @@
/* receive ACCH at RR layer */
static int gsm48_rr_rx_acch(struct osmocom_ms *ms, struct msgb *msg)
{
- struct gsm48_rrlayer *rr = >rrlayer;
- struct gsm_settings *set = >settings;
- struct abis_rsl_rll_hdr *rllh = msgb_l2(msg);
struct gsm48_system_information_type_header *sih = msgb_l3(msg);
- uint8_t ind_ta, ind_tx_power;
-
- if (msgb_l2len(msg) < sizeof(*rllh) + 2 + 2) {
- LOGP(DRR, LOGL_ERROR, "Missing TA and TX_POWER IEs\n");
- return -EINVAL;
- }
-
- ind_ta = rllh->data[1];
- ind_tx_power = rllh->data[3];
- LOGP(DRR, LOGL_INFO, "DL SACCH indicates ta %d (actual ta %d)\n",
- ind_ta, ind_ta - set->alter_delay);
- LOGP(DRR, LOGL_INFO, "DL SACCH indicates tx_power %d\n",
- ind_tx_power);
- if (ind_ta != rr->cd_now.ind_ta
-|| ind_tx_power != rr->cd_now.ind_tx_power) {
- LOGP(DRR, LOGL_INFO, "Applying new ta and tx_power\n");
- l1ctl_tx_param_req(ms, ind_ta - set->alter_delay,
- (set->alter_tx_power) ? set->alter_tx_power_value
- : ind_tx_power);
- rr->cd_now.ind_ta = ind_ta;
- rr->cd_now.ind_tx_power = ind_tx_power;
- }
switch (sih->system_information) {
case GSM48_MT_RR_SYSINFO_5:
@@ -4921,9 +4896,12 @@
/* unit data from layer 2 to RR layer */
static int gsm48_rr_unit_data_ind(struct osmocom_ms *ms, struct msgb *msg)
{
+ struct gsm48_rrlayer *rr = >rrlayer;
struct gsm322_cellsel *cs = >cellsel;
+ struct gsm_settings *set = >settings;
struct abis_rsl_rll_hdr *rllh = msgb_l2(msg);
struct tlv_parsed tv;
+ int ind_ta = -1, ind_tx_power = -1;
uint8_t ch_type, ch_subch, ch_ts;
DEBUGP(DRSL, "RSLms UNIT DATA IND chan_nr=0x%02x link_id=0x%02x\n",
@@ -4934,6 +4912,24 @@
return -EINVAL;
}
+ /* Update TX power and timing advance, if included in message. */
+ if (TLVP_PRES_LEN(, RSL_IE_TIMING_ADVANCE, 1)) {
+ ind_ta = *TLVP_VAL(, RSL_IE_TIMING_ADVANCE);
+ LOGP(DRR, LOGL_INFO, "DL SACCH indicates ta %d (actual ta
%d)\n", ind_ta, ind_ta - set->alter_delay);
+ }
+ if (TLVP_PRES_LEN(, RSL_IE_MS_POWER, 1)) {
+ ind_tx_power = *TLVP_VAL(, RSL_IE_MS_POWER);
+ LOGP(DRR, LOGL_INFO, "DL SACCH indicates tx_power %d\n",
ind_tx_power);
+ }
+ if ((ind_ta >= 0 && ind_ta != rr->cd_now.ind_ta) ||
+ (ind_tx_power >= 0 && ind_tx_power != rr->cd_now.ind_tx_power)) {
+ LOGP(DRR, LOGL_INFO, "Applying new ta and tx_power\n");
+ l1ctl_tx_param_req(ms, ind_ta - set->alter_delay,
+ (set->alter_tx_power) ? set->alter_tx_power_value :
ind_tx_power);
+ rr->cd_now.ind_ta = ind_ta;
+ rr->cd_now.ind_tx_power = ind_tx_power;
+ }
+
if (!TLVP_PRESENT(, RSL_IE_L3_INFO)) {
DEBUGP(DRSL, "UNIT_DATA_IND without L3 INFO ?!?\n");
return -EIO;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34477?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: I87fcd44bba221ab4c5fbd2c79557db2444a10b88
Gerrit-Change-Number: 34477
Gerrit-PatchSet: 7
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?usp=email )
Change subject: mgw: Introduce tests
TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly
..
mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly
Change-Id: I34d47d0cdde855900798e4cb3efd26af22f5b049
---
M mgw/MGCP_Test.ttcn
1 file changed, 166 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/47/34547/1
diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index e6abbbe..a453ca4 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -10,6 +10,7 @@
*/
module MGCP_Test {
+ import from Misc_Helpers all;
import from Osmocom_Types all;
import from MGCP_Types all;
import from MGCP_Templates all;
@@ -2952,6 +2953,80 @@
mp_local_ipv4, mp_remote_ipv4);
}
+ /* Test that once IuUP->RTP has been set up, if the RTP/IuUP conn is set
+* as "recvonly", no more RTP/IuUP packets get out of the MGW. */
+ function f_tc_two_crcx_mdcx_and_iuup_mdcx_recvonly(charstring
local_ip_a, charstring remote_ip_a,
+
IuUP_RabFlowCombinationList rfcl_a,
+ charstring
local_ip_b, charstring remote_ip_b) runs on dummy_CT {
+ var RtpFlowData flow[2];
+ var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain;
+ var MgcpCallId call_id := '1227'H;
+ var RtpemStats stats[2];
+
+ f_init(ep);
+
+ /* Create the first connection in receive only mode (RNC side,
IuUP-Init active) */
+ flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96,
"VND.3GPP.IUFP/16000"));
+ flow[0].em.portnr := 1;
+ flow[0].rtp_cfg := c_RtpemDefaultCfg;
+ flow[0].rtp_cfg.rx_payloads[0].payload_type :=
flow[0].codec_descr[0].pt;
+ flow[0].rtp_cfg.tx_payloads[0].payload_type :=
flow[0].codec_descr[0].pt;
+ flow[0].rtp_cfg.iuup_mode := true;
+ flow[0].rtp_cfg.iuup_cfg.active_init := true;
+ flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a;
+
+ /* Create the second connection. This connection will be also
+* in receive only mode (CN side, IuUP-Init passive) */
+ flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 96,
"VND.3GPP.IUFP/16000"));
+ flow[1].em.portnr := 2;
+ flow[1].rtp_cfg := c_RtpemDefaultCfg;
+ flow[1].rtp_cfg.rx_payloads[0].payload_type :=
flow[1].codec_descr[0].pt;
+ flow[1].rtp_cfg.tx_payloads[0].payload_type :=
flow[1].codec_descr[0].pt;
+ flow[1].rtp_cfg.iuup_mode := true;
+ flow[1].rtp_cfg.iuup_cfg.active_init := false;
+
+ f_two_crcx_mdcx_data_transfer(ep, call_id, flow[0], flow[1],
false);
+
+ /* Now validate we don't receive more RTP packets after setting
it to recvonly: */
+ f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY);
+ f_flow_modify(RTPEM[1], ep, call_id, "recvonly", flow[1]);
+ f_sleep(0.5);
+ stats[0] := f_rtpem_stats_get(RTPEM[1]);
+ f_sleep(0.5);
+ stats[1] := f_rtpem_stats_get(RTPEM[1]);
+ if (stats[1].num_pkts_rx > stats[0].num_pkts_rx) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("received ",
stats[1].num_pkts_rx - stats[0].num_pkts_rx, " RTP packets from MGW on recvonly
connection 1"));
+ }
+
+ /* Now do the same on the IuUP port: */
+ f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY);
+ f_rtpem_mode(RTPEM[1], RTPEM_MODE_TXONLY);
+ f_flow_modify(RTPEM[0], ep, call_id, "recvonly", flow[0]);
+ f_sleep(0.5);
+ stats[0] := f_rtpem_stats_get(RTPEM[0]);
+ f_sleep(0.5);
+ stats[1] := f_rtpem_stats_get(RTPEM[0]);
+ if (stats[1].num_pkts_rx > stats[0].num_pkts_rx) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("received ",
stats[1].num_pkts_rx - stats[0].num_pkts_rx, " IuUP packets from MGW on
recvonly connection 1"));
+ }
+
+ /* Tear down */
+ f_flow_delete(RTPEM[0]);
+ f_flow_delete(RTPEM[1], ep, call_id);
+ setverdict(pass);
+ }
+ testcase TC_two_crcx_mdcx_and_iuup_mdcx_recvonly() runs on dummy_CT {
+ var template (value) IuUP_RabFlowCombinationList rfcl := {
+ t_IuUP_RFC_AMR_12_2(0),
+
[M] Change in osmo-ttcn3-hacks[master]: mgw: Factor out helper func to test data flows over endp with 2 conns
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email )
Change subject: mgw: Factor out helper func to test data flows over endp with 2
conns
..
mgw: Factor out helper func to test data flows over endp with 2 conns
The logic can be reused by AMR<->IuUP and IuUP<->IuUP tests.
Change-Id: Ic4f3c5bb687373bdae6942e1952797e76bfa3ffb
---
M mgw/MGCP_Test.ttcn
1 file changed, 58 insertions(+), 115 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/46/34546/1
diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index 73591b2..e6abbbe 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -2801,42 +2801,21 @@
setverdict(pass);
}
- /* create two local RTP+IuUP emulations and pass data in both
directions */
- function f_tc_two_crcx_mdcx_and_iuup(charstring local_ip_a, charstring
remote_ip_a,
- IuUP_RabFlowCombinationList rfcl_a,
- charstring local_ip_b, charstring
remote_ip_b) runs on dummy_CT {
- var RtpFlowData flow[2];
+ /* create two local emulations and pass data in both directions */
+ function f_two_crcx_mdcx_data_transfer(MgcpEndpoint ep, MgcpCallId
call_id, inout RtpFlowData flow_a,
+ inout RtpFlowData flow_b,
boolean tear_down_rtp := true) runs on dummy_CT {
var RtpemStats stats[2];
var MgcpResponse resp;
- var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain;
- var MgcpCallId call_id := '1227'H;
var integer num_pkts_tx[2];
var integer temp;
- f_init(ep);
-
/* Create the first connection in receive only mode (RNC side,
IuUP-Init active) */
- flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96,
"VND.3GPP.IUFP/16000"));
- flow[0].em.portnr := 1;
- flow[0].rtp_cfg := c_RtpemDefaultCfg;
- flow[0].rtp_cfg.rx_payloads[0].payload_type :=
flow[0].codec_descr[0].pt;
- flow[0].rtp_cfg.tx_payloads[0].payload_type :=
flow[0].codec_descr[0].pt;
- flow[0].rtp_cfg.iuup_mode := true;
- flow[0].rtp_cfg.iuup_cfg.active_init := true;
- flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a;
- f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true);
+ f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow_a, true);
f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY);
/* Create the second connection. This connection will be also
-* in receive only mode (CN side, IuUP-Init passive) */
- flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 96,
"VND.3GPP.IUFP/16000"));
- flow[1].em.portnr := 2;
- flow[1].rtp_cfg := c_RtpemDefaultCfg;
- flow[1].rtp_cfg.rx_payloads[0].payload_type :=
flow[1].codec_descr[0].pt;
- flow[1].rtp_cfg.tx_payloads[0].payload_type :=
flow[1].codec_descr[0].pt;
- flow[1].rtp_cfg.iuup_mode := true;
- flow[1].rtp_cfg.iuup_cfg.active_init := false;
- f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true);
+* in receive only mode (CN side, regular RTP) */
+ f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow_b, true);
f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY);
/* The first leg starts transmitting */
@@ -2872,7 +2851,7 @@
f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR);
stats[1] := f_rtpem_stats_get(RTPEM[1]);
num_pkts_tx[1] := stats[1].num_pkts_tx;
- f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]);
+ f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow_a);
f_sleep(0.5);
stats[0] := f_rtpem_stats_get(RTPEM[0]);
if (stats[0].num_pkts_rx_err_disabled != 0) {
@@ -2891,7 +2870,7 @@
f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR);
stats[0] := f_rtpem_stats_get(RTPEM[0]);
num_pkts_tx[0] := stats[0].num_pkts_tx;
- f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]);
+ f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow_b);
f_sleep(2.0);
stats[0] := f_rtpem_stats_get(RTPEM[0]);
@@ -2913,8 +2892,44 @@
f_rtpem_stats_err_check(stats[1]);
/* Tear down */
- f_flow_delete(RTPEM[0]);
- f_flow_delete(RTPEM[1], ep, call_id);
+ if (tear_down_rtp) {
+ f_flow_delete(RTPEM[0]);
+ f_flow_delete(RTPEM[1], ep,
[L] Change in osmocom-bb[master]: ASCI: Add group transmit mode support to RR layer
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34545?usp=email ) Change subject: ASCI: Add group transmit mode support to RR layer .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34545?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: I9b62eef5d877e5d9dcf349717efd2cce28862c58 Gerrit-Change-Number: 34545 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 27 Sep 2023 13:56:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email ) Change subject: ASCI: Add group receive and transmit mode support to MM layer .. Patch Set 10: (1 comment) File src/host/layer23/src/mobile/gsm48_mm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34492/comment/8e4242e9_ea64b6a4 PS10, Line 4854:// There are event handlers for group call in this implementation. not sure what do you mean with this. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?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: I05957182a57423ad947ab200b52f65fde859e110 Gerrit-Change-Number: 34492 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 27 Sep 2023 13:57:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add group transmit mode support to RR layer
jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34545?usp=email ) Change subject: ASCI: Add group transmit mode support to RR layer .. Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/34545/comment/50302375_ee58c478 PS2, Line 7: Add group transmit mode support to RR layer This patch is not new. It was mixed with the "Add group receive mode support to RR layer" patch. Now I separated it again for better code review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34545?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: I9b62eef5d877e5d9dcf349717efd2cce28862c58 Gerrit-Change-Number: 34545 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Sep 2023 13:01:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[XL] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to RR layer
jolly has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34491?usp=email ) Change subject: ASCI: Add group receive and transmit mode support to RR layer .. Abandoned This patch has been split. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34491?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: Ia55c182a1b4cde777a0e16dcfe0cd32e0f2e38eb Gerrit-Change-Number: 34491 Gerrit-PatchSet: 5 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-MessageType: abandon
[S] Change in osmocom-bb[master]: ASCI: Show NCH position in VTY together with system information
Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Show NCH position in VTY together with system information .. ASCI: Show NCH position in VTY together with system information Related: OS#5364 Change-Id: I5e0a9d469eb70608502dca881808621fa153b666 --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/96/34496/11 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?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: I5e0a9d469eb70608502dca881808621fa153b666 Gerrit-Change-Number: 34496 Gerrit-PatchSet: 11 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add protocol type to trans_find_by_callref() function
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34493?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add protocol type to trans_find_by_callref() function .. ASCI: Add protocol type to trans_find_by_callref() function This is required, because different protocols may share the same callref, but use different protocols. E.g. a voice group call can share the same callref with a voice broadcast call, but these calls are different transactions. Related: OS#5364 Change-Id: Ifea3a81aae3b4ae897851f867b13fa987c8cbe11 --- M src/host/layer23/include/osmocom/bb/mobile/transaction.h M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/gsm48_cc.c M src/host/layer23/src/mobile/transaction.c 5 files changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/34493/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34493?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: Ifea3a81aae3b4ae897851f867b13fa987c8cbe11 Gerrit-Change-Number: 34493 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls
Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add VTY commands to control voice group/broadcast calls .. ASCI: Add VTY commands to control voice group/broadcast calls Related: OS#5364 Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 --- M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 248 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/95/34495/11 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?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: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 Gerrit-Change-Number: 34495 Gerrit-PatchSet: 11 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add group transmit mode support to RR layer
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34545?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: ASCI: Add group transmit mode support to RR layer .. ASCI: Add group transmit mode support to RR layer This allows the upper layer to estabish and release connection on the uplink of a voice group call. Related: OS#5364 Change-Id: I9b62eef5d877e5d9dcf349717efd2cce28862c58 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c 3 files changed, 741 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/34545/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34545?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: I9b62eef5d877e5d9dcf349717efd2cce28862c58 Gerrit-Change-Number: 34545 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add group receive mode support to RR layer
Attention is currently required from: fixeria, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34531?usp=email ) Change subject: ASCI: Add group receive mode support to RR layer .. Patch Set 4: (1 comment) File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34531/comment/a4b87424_c67cb561 PS3, Line 5335: access bursts > `an access burst`? Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34531?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: Ia7d806b354fb3be5729bff8ac9aa1c7ad7a8b539 Gerrit-Change-Number: 34531 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 27 Sep 2023 12:52:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add group receive mode support to RR layer
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34531?usp=email ) Change subject: ASCI: Add group receive mode support to RR layer .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34531?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: Ia7d806b354fb3be5729bff8ac9aa1c7ad7a8b539 Gerrit-Change-Number: 34531 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 27 Sep 2023 12:52:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Prepare gsm48_rr_rx_acch for voice group channel
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34529?usp=email ) Change subject: ASCI: Prepare gsm48_rr_rx_acch for voice group channel .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34529?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: I39b27396a31137b3c4bdcb40dccdf3de60458fe2 Gerrit-Change-Number: 34529 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 27 Sep 2023 12:51:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Add UIC support to random access burst
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34482?usp=email ) Change subject: ASCI: Add UIC support to random access burst .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34482?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: I4039734676949aefa5be4b5298764b8ba7e1b8ed Gerrit-Change-Number: 34482 Gerrit-PatchSet: 8 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 27 Sep 2023 12:51:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add ASCI notification support to RR layer
Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34530?usp=email ) Change subject: ASCI: Add ASCI notification support to RR layer .. Patch Set 4: (1 comment) File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/810f0932_20a61620 PS3, Line 1440: return -ENOMEM; > You may be leaking the memory allocated by `asci_notif_alloc()` here. […] This one was not addresses afaict. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34530?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: I49df02cb4d99d9aab1ea3ca13beb2ea00ae4c9f4 Gerrit-Change-Number: 34530 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 27 Sep 2023 12:50:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Prepare gsm48_rr_rx_acch for voice group channel
Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34529?usp=email ) Change subject: ASCI: Prepare gsm48_rr_rx_acch for voice group channel .. Patch Set 4: (3 comments) File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34529/comment/a7dee417_af60de10 PS3, Line 4889: struct gsm48_system_information_type_header *sih; : struct gsm48_hdr_sh *sgh; : struct gsm48_hdr *gh; > all `const`? Done https://gerrit.osmocom.org/c/osmocom-bb/+/34529/comment/4a76a0c9_6487fd29 PS3, Line 4895: sgh = msgb_l3(msg); > do we want to check `if (msgb_l3len(msg) < sizeof(*sgh))` here? No, the header is only one byte. There is already a length check for Bter frames which are 21 oe 23 bytes. https://gerrit.osmocom.org/c/osmocom-bb/+/34529/comment/7ba57cdf_105be506 PS3, Line 4909: sih = msgb_l3(msg); > do we want to check `if (msgb_l3len(msg) < sizeof(*sih))` here? No, similar as above. B4 frame length is already checked. The header is way smaller. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34529?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: I39b27396a31137b3c4bdcb40dccdf3de60458fe2 Gerrit-Change-Number: 34529 Gerrit-PatchSet: 4 Gerrit-Owner: jolly 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: Wed, 27 Sep 2023 12:50:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer
Attention is currently required from: fixeria, laforge, pespin.
jolly has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email )
Change subject: ASCI: Add group receive and transmit mode support to MM layer
..
Patch Set 9:
(3 comments)
File src/host/layer23/src/mobile/gsm48_mm.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/34492/comment/c0899843_b71e1d95
PS8, Line 4643: if (rr_prim != -1) {
> Doing `goto` from the `default` branch above might be a more elegant
> solution. […]
Good idea. Lets see how it looks like.
https://gerrit.osmocom.org/c/osmocom-bb/+/34492/comment/e938ee0c_3cf5f674
PS8, Line 4813: nothing here
> TODO/FIXME?
I improved the description, to make clear why there is no handler here.
https://gerrit.osmocom.org/c/osmocom-bb/+/34492/comment/2b2cbca6_7ab2cf16
PS8, Line 4851: nothing here
> TODO/FIXME?
dito
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?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: I05957182a57423ad947ab200b52f65fde859e110
Gerrit-Change-Number: 34492
Gerrit-PatchSet: 9
Gerrit-Owner: jolly
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: Wed, 27 Sep 2023 12:50:23 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria
Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Add UIC support to random access burst
Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34482?usp=email ) Change subject: ASCI: Add UIC support to random access burst .. Patch Set 8: (1 comment) File src/target/firmware/layer1/prim_rach.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34482/comment/5f1fac00_f5cfa3d0 PS7, Line 135: int8_t > unsigned Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34482?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: I4039734676949aefa5be4b5298764b8ba7e1b8ed Gerrit-Change-Number: 34482 Gerrit-PatchSet: 8 Gerrit-Owner: jolly 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: Wed, 27 Sep 2023 12:50:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add ASCI notification support to RR layer
Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34530?usp=email ) Change subject: ASCI: Add ASCI notification support to RR layer .. Patch Set 4: (10 comments) File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/2ea223db_328299ed PS3, Line 1331: uint8_t *gcr > `const` Done https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/c1d325d6_c57fd497 PS3, Line 1387: uint8_t *gcr > `const` Done https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/6353e06c_db7eb247 PS3, Line 1399: uint8_t *gcr, uint8_t *ch_desc > both `const` Done https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/7de4a3fd_ab743348 PS3, Line 1440: return -ENOMEM; > You may be leaking the memory allocated by `asci_notif_alloc()` here. […] The allocation is not leaked. There is a timer running for every notification. When it times out, the notification is removed from the list. The list is used to notify the upper layer only once and not for every repeated notification received. https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/771e41fd_de780833 PS3, Line 1461: 5*8 > The comment states 36 bits, but you allocate (5 * 8) bytes? […] Right! https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/8b92d2f5_7c8c PS3, Line 1467: 3*8 > Same here, `OSMO_BYTES_FOR_BITS(24)`, because: […] Done https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/c27d4c86_c0d5ef12 PS3, Line 1473: \n > This is going to break the logstring formatting, better use just one `\n`. Done https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/d7ab4cb8_f8dce05d PS3, Line 1482: if (chd_bv) > `bitvec_free()` is NULL safe, so these checks are redundant. Done https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/cd6e9007_fe204bc9 PS3, Line 1494: msgb_l3len(msg) - sizeof(*sgh); > Is it guaranteed by the caller that `msgb_l3len(msg)` is always `>= > sizeof(*sgh)`? […] Yes it is. The header is checked in the calling function. Here the header is skipped for getting the payload. https://gerrit.osmocom.org/c/osmocom-bb/+/34530/comment/e8d874d0_214649dc PS3, Line 1519: msgb_l3len(msg) - sizeof(*nn); > Same here. There is no check. I will submit another patch that checks the existence of the header for all CCCH messages. This will ensure that at least the NCH header exits in the message. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34530?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: I49df02cb4d99d9aab1ea3ca13beb2ea00ae4c9f4 Gerrit-Change-Number: 34530 Gerrit-PatchSet: 4 Gerrit-Owner: jolly 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: Wed, 27 Sep 2023 12:50:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add group transmit mode support to RR layer
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34545?usp=email )
Change subject: ASCI: Add group transmit mode support to RR layer
..
Patch Set 1:
(1 comment)
File src/host/layer23/src/mobile/gsm48_rr.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11428):
https://gerrit.osmocom.org/c/osmocom-bb/+/34545/comment/1aec8b84_da767fa8
PS1, Line 1817: if ((rr->vgcs.group_state != GSM48_RR_GST_OFF)) {
Unnecessary parentheses
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34545?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: I9b62eef5d877e5d9dcf349717efd2cce28862c58
Gerrit-Change-Number: 34545
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Wed, 27 Sep 2023 12:47:01 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add group transmit mode support to RR layer
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34545?usp=email )
Change subject: ASCI: Add group transmit mode support to RR layer
..
ASCI: Add group transmit mode support to RR layer
This allows the upper layer to estabish and release connection on the
uplink of a voice group call.
Related: OS#5364
Change-Id: I9b62eef5d877e5d9dcf349717efd2cce28862c58
---
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
M src/host/layer23/src/mobile/gsm48_rr.c
3 files changed, 741 insertions(+), 65 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/34545/1
diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h
b/src/host/layer23/include/osmocom/bb/common/settings.h
index c5469c1..884578b 100644
--- a/src/host/layer23/include/osmocom/bb/common/settings.h
+++ b/src/host/layer23/include/osmocom/bb/common/settings.h
@@ -188,6 +188,9 @@
/* Timeout for GSM 03.22 C7 state */
uint8_t any_timeout;
+
+ /* ASCI settings */
+ booluplink_release_local;
};
struct gsm_settings_abbrev {
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 1429fd3..16f7fb3 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
@@ -10,6 +10,9 @@
#defineT200_DCCH_SHARED2 /* SDCCH shares SAPI 0
and 3 */
#defineT200_ACCH 2 /* SACCH SAPI 3 */
+/* GSM 04.08 RR timers */
+#define GSM_T3128_MS 1, 0/* Uplink investigation timer.
*/
+#define GSM_T3130_MS 5, 0/* Uplink access timeout. */
/* GSM 04.07 9.1.2 */
@@ -221,6 +224,14 @@
struct llist_head notif_list; /* list of received
call notifications */
enum gsm48_rr_gstategroup_state;/* extension to RR
state for group transmit/receive modes */
struct gsm48_rr_cd cd_group; /* channel description
of group call channel */
+ booluplink_free;/* Is set, if uplink is
currently free. */
+ uint8_t uic;/* UIC to use for
access burst (-1 for BSIC) */
+ booluplink_access; /* The network wants us
to send listener access bursts. */
+ struct osmo_timer_list t_ul_free; /* Uplink free timer.
(480ms timer) */
+ struct osmo_timer_list t3128; /* Uplink investigation
timer. */
+ struct osmo_timer_list t3130; /* Uplink access timer.
*/
+ uint8_t uplink_tries; /* Counts number of
tries to access the uplink. */
+ uint8_t uplink_counter; /* Counts number of
access bursts per 'try'. */
} vgcs;
};
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index c78993b..abd63f9 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -50,6 +50,22 @@
* new_rr_state(rr, GSM48_RR_ST_IDLE) is used to return to IDLE mode or to
* group receive mode, depending on the substate.
*
+ * The Uplink access on group channel:
+ *
+ * If the uplink is busy, wait until it becomes free (Uplink investigation
+ * procedure). Abort, if the procedure times out, if the VGCS UPLINK GRANT
+ * message is recived for a different talker.
+ *
+ * Request uplink using access bursts on TCH until an VGCS UPLINK GRANT is
+ * received. Abort, if it the procedure times out, if the uplink becomes busy,
+ * if the VGCS UPLINK GRANT message references a different frame numer.
+ *
+ * Establish layer 2 with TALKER INDICATION. Abort, if content resolution
+ * mismatches (RR_REL_IND), if link fails (MDL_ERROR), if uplink becomes free.
+ *
+ * Release uplink and wait until uplink becomes free. Abort, if UPLINK RELEASE
+ * is received or if uplink fails.
+ *
* New primitives are invented for group/broadcast calls. They are not
* specified in any recommendation. They are:
*
@@ -132,6 +148,13 @@
static int gsm48_rr_rel_cnf(struct osmocom_ms *ms, struct msgb *msg);
int gsm414_rcv_test(struct osmocom_ms *ms, const struct msgb *msg);
static int gsm48_rr_group_rel(struct osmocom_ms *ms, int cause);
+static int gsm48_rr_uplink_access(struct osmocom_ms *ms, struct msgb *msg);
+static int gsm48_rr_uplink_access_abort(struct osmocom_ms *ms, uint8_t cause);
+static int gsm48_rr_uplink_status(struct osmocom_ms *ms, uint32_t event);
+static int gsm48_match_ra(struct osmocom_ms *ms, struct gsm48_req_ref *ref,
uint8_t hist_num);
+static int gsm48_rr_tx_talker_indication(struct osmocom_ms *ms);
+static int
[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls
Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add VTY commands to control voice group/broadcast calls .. ASCI: Add VTY commands to control voice group/broadcast calls Related: OS#5364 Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 --- M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 248 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/95/34495/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?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: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 Gerrit-Change-Number: 34495 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add ASCI notification support to RR layer
Attention is currently required from: fixeria, jolly, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34530?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by pespin, Code-Review+2 by laforge, Code-Review-1 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: ASCI: Add ASCI notification support to RR layer .. ASCI: Add ASCI notification support to RR layer The notifications are received on NCH, as well as on FACCH. Related: OS#5364 Change-Id: I49df02cb4d99d9aab1ea3ca13beb2ea00ae4c9f4 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c 2 files changed, 264 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/30/34530/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34530?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: I49df02cb4d99d9aab1ea3ca13beb2ea00ae4c9f4 Gerrit-Change-Number: 34530 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Show NCH position in VTY together with system information
Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Show NCH position in VTY together with system information .. ASCI: Show NCH position in VTY together with system information Related: OS#5364 Change-Id: I5e0a9d469eb70608502dca881808621fa153b666 --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/96/34496/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?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: I5e0a9d469eb70608502dca881808621fa153b666 Gerrit-Change-Number: 34496 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer
Attention is currently required from: jolly, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: ASCI: Add group receive and transmit mode support to MM layer .. ASCI: Add group receive and transmit mode support to MM layer Related: OS#5364 Change-Id: I05957182a57423ad947ab200b52f65fde859e110 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h M src/host/layer23/src/mobile/gsm48_mm.c 2 files changed, 687 insertions(+), 83 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/34492/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?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: I05957182a57423ad947ab200b52f65fde859e110 Gerrit-Change-Number: 34492 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add protocol type to trans_find_by_callref() function
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34493?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add protocol type to trans_find_by_callref() function .. ASCI: Add protocol type to trans_find_by_callref() function This is required, because different protocols may share the same callref, but use different protocols. E.g. a voice group call can share the same callref with a voice broadcast call, but these calls are different transactions. Related: OS#5364 Change-Id: Ifea3a81aae3b4ae897851f867b13fa987c8cbe11 --- M src/host/layer23/include/osmocom/bb/mobile/transaction.h M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/gsm48_cc.c M src/host/layer23/src/mobile/transaction.c 5 files changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/34493/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34493?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: Ifea3a81aae3b4ae897851f867b13fa987c8cbe11 Gerrit-Change-Number: 34493 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add uplink free/busy event to MM events
Attention is currently required from: jolly, pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34489?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add uplink free/busy event to MM events .. ASCI: Add uplink free/busy event to MM events Related: OS#5364 Change-Id: I3f8d97a0359ea9560d6d6bfd8238ddc6492c56e8 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/34489/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34489?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: I3f8d97a0359ea9560d6d6bfd8238ddc6492c56e8 Gerrit-Change-Number: 34489 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add group receive mode support to RR layer
Attention is currently required from: fixeria, jolly, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34531?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by pespin, Code-Review+2 by laforge, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: ASCI: Add group receive mode support to RR layer .. ASCI: Add group receive mode support to RR layer This allows reception of VGCS and VBS calls. A special sub-state is used to differentiate between IDLE mode and group receive mode. Later it can be used to differentiate between dedicated and group transmit mode. Related: OS#5364 Change-Id: Ia7d806b354fb3be5729bff8ac9aa1c7ad7a8b539 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c 2 files changed, 337 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/34531/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34531?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: Ia7d806b354fb3be5729bff8ac9aa1c7ad7a8b539 Gerrit-Change-Number: 34531 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add interface for group receive/transmit mode support to RR layer
Attention is currently required from: jolly, pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34528?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add interface for group receive/transmit mode support to RR layer .. ASCI: Add interface for group receive/transmit mode support to RR layer This patch includes new messages and description. The are used to bring RR layer into group receive mode and from there in group transmit mode and back. Related: OS#5364 Change-Id: I1abd56c63d15af1cff8bde7589a571cb5bb5506f --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c 2 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/34528/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34528?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: I1abd56c63d15af1cff8bde7589a571cb5bb5506f Gerrit-Change-Number: 34528 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: ASCI: Prepare gsm48_rr_rx_acch for voice group channel
Attention is currently required from: jolly, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34529?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: ASCI: Prepare gsm48_rr_rx_acch for voice group channel .. ASCI: Prepare gsm48_rr_rx_acch for voice group channel The gsm48_rr_rx_acch function receives FACCH/SACCH. This is not only used for system information on SACCH, but also for short header messages and regular UI messages on TCH. Related: OS#5364 Change-Id: I39b27396a31137b3c4bdcb40dccdf3de60458fe2 --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 67 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/29/34529/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34529?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: I39b27396a31137b3c4bdcb40dccdf3de60458fe2 Gerrit-Change-Number: 34529 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add UIC support to random access burst
Attention is currently required from: jolly, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34482?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: ASCI: Add UIC support to random access burst .. ASCI: Add UIC support to random access burst A different identity code can be used on uplink access bursts on voice group channel. This is optional for the network, but mandatory for the MS side. If the network does not define a UIC, the BSIC is used instead. BSIC is used for RACH channel and handover. Related: OS#5364 Change-Id: I4039734676949aefa5be4b5298764b8ba7e1b8ed --- M include/l1ctl_proto.h M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/common/l1ctl_lapdm_glue.c M src/host/layer23/src/modem/grr.c M src/target/firmware/include/layer1/prim.h M src/target/firmware/include/layer1/sync.h M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_rach.c 9 files changed, 35 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/82/34482/8 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34482?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: I4039734676949aefa5be4b5298764b8ba7e1b8ed Gerrit-Change-Number: 34482 Gerrit-PatchSet: 8 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add channel notification event to MM events
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34488?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add channel notification event to MM events .. ASCI: Add channel notification event to MM events This is required to notify MM layer about new and ceased group and broadcast calls. Related: OS#5364 Change-Id: Ifee286ba4628356cc19b5dc75f1843287c5d2342 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h M src/host/layer23/src/mobile/gsm48_mm.c 2 files changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/34488/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34488?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: Ifee286ba4628356cc19b5dc75f1843287c5d2342 Gerrit-Change-Number: 34488 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add support flags to mobile (and VTY) for VGCS/VBS
Attention is currently required from: fixeria, jolly. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34483?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add support flags to mobile (and VTY) for VGCS/VBS .. ASCI: Add support flags to mobile (and VTY) for VGCS/VBS These support flags can be enabled or disabled and are sent in the class mark IE. Also they allow or disallow making VGCS/VBS calls. Related: OS#5364 Change-Id: Ia23eb190e533660cce4ba4c856a83b5f3d534202 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/support.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/34483/8 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34483?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: Ia23eb190e533660cce4ba4c856a83b5f3d534202 Gerrit-Change-Number: 34483 Gerrit-PatchSet: 8 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: Fix unset sapi in gsm48_rr_data_ind()
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34487?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Fix unset sapi in gsm48_rr_data_ind() .. Fix unset sapi in gsm48_rr_data_ind() The gsm48_rr_hdr is pushed into the message before sending data to MM layer. SAPI was not set in this header. Change-Id: I8345a562050d52d491f3b7192c979d455a63931c --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/87/34487/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34487?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: I8345a562050d52d491f3b7192c979d455a63931c Gerrit-Change-Number: 34487 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: Fix request reference value in gsm48_match_ra()
Attention is currently required from: jolly, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34486?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Fix request reference value in gsm48_match_ra() .. Fix request reference value in gsm48_match_ra() Do not overwrite the given request reference pointer with the history buffer's reference. This makes no sense. Without this fix only the response to the first access burst could be matched correctly. Change-Id: Iec636d368e20030beac2861bff61b1a06e7b4821 --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/86/34486/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34486?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: Iec636d368e20030beac2861bff61b1a06e7b4821 Gerrit-Change-Number: 34486 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Increase channel request history to 5 entries
Attention is currently required from: fixeria, jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34485?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Increase channel request history to 5 entries .. ASCI: Increase channel request history to 5 entries 3 entries are enough for random access on CCCH. 5 are required for uplink request on VGCS channel. The history is used to remember when the random access bursts were send. The RR layer can check if the IMMEDIATE ASSIGNMENT or VGCS UPLINK GRANT message has matching frame number and random value of up to 5 random access bursts previously sent. Related: OS#5364 Change-Id: I62f18685bf05663f3ee6e94f6884ffb9a6b07ea4 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c 2 files changed, 31 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/85/34485/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34485?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: I62f18685bf05663f3ee6e94f6884ffb9a6b07ea4 Gerrit-Change-Number: 34485 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: Refactoring encoding of mobile identity at mobile application
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34484?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Refactoring encoding of mobile identity at mobile application .. Refactoring encoding of mobile identity at mobile application Deprecated functions gsm48_generate_mid_from_*() are replaced by osmo_mobile_identity_encode_msgb(). Clean up code. Change-Id: I9ff429bd50d718530fdad64a276053a35c8928f2 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/gsm48_rr.c 3 files changed, 80 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/34484/8 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34484?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: I9ff429bd50d718530fdad64a276053a35c8928f2 Gerrit-Change-Number: 34484 Gerrit-PatchSet: 8 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable .. Patch Set 1: -Code-Review (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/f143f5a7_1a2e0a7a PS1, Line 1447: no ncc-permitted > Using `no ncc-permitted` in order to permit all NCCs looks confusing, IMO. […] ACK, I also found it a bit confusing and I was expecting some "all" value. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?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: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 27 Sep 2023 12:39:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_ncc_permitted_si2
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_ncc_permitted_si2 .. Patch Set 1: (2 comments) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542/comment/053b4155_ee28e087 PS1, Line 12399: System Information Type 2 btw, this IE is also present in SI Type 6. Do we want to test it too? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542/comment/5da62dce_74d4f6a1 PS1, Line 12798: TC_ncc_permitted_si2 How about naming this testcase `TC_si2_ncc_permitted` and moving closer to other `TC_si*` testcases above in the list? This way it's more consistent. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?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: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 12:25:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable .. Patch Set 1: (2 comments) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/15311cbb_105dee79 PS1, Line 1447: no ncc-permitted Using `no ncc-permitted` in order to permit all NCCs looks confusing, IMO. If I were to configure this parameter as a user, I would expect `ncc-permitted all` or something like that. The `no` variant of this command would be useful for disabling specific NCC values, i.e. to disable NCC 2 I would do `no ncc-permitted 2`. https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/16c75855_15bc7536 PS1, Line 4394: struct gsm_bts *bts const -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?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: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 27 Sep 2023 12:20:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: systemd: remove RestartPreventExitStatus=1
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email )
Change subject: systemd: remove RestartPreventExitStatus=1
..
systemd: remove RestartPreventExitStatus=1
Fix OsmoBTS not restarting if e.g. an external gsmtap IP is configured
that is currently not available. Also make the service files more
consistent with other Osmocom projects.
Partial revert of ae2473c2 ("systemd: Do not restart with a broken
config file or such").
Related: SYS#6581
Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b
---
M contrib/systemd/osmo-bts-lc15.service
M contrib/systemd/osmo-bts-oc2g.service
M contrib/systemd/osmo-bts-sysmo.service
3 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/contrib/systemd/osmo-bts-lc15.service
b/contrib/systemd/osmo-bts-lc15.service
index fd0760a..03341bd 100644
--- a/contrib/systemd/osmo-bts-lc15.service
+++ b/contrib/systemd/osmo-bts-lc15.service
@@ -11,7 +11,6 @@
RuntimeDirectory=osmo-bts
Restart=always
RestartSec=2
-RestartPreventExitStatus=1
# CPU scheduling policy:
CPUSchedulingPolicy=rr
diff --git a/contrib/systemd/osmo-bts-oc2g.service
b/contrib/systemd/osmo-bts-oc2g.service
index dabb002..bc64a54 100644
--- a/contrib/systemd/osmo-bts-oc2g.service
+++ b/contrib/systemd/osmo-bts-oc2g.service
@@ -11,7 +11,6 @@
RuntimeDirectory=osmo-bts
Restart=always
RestartSec=2
-RestartPreventExitStatus=1
# CPU scheduling policy:
CPUSchedulingPolicy=rr
diff --git a/contrib/systemd/osmo-bts-sysmo.service
b/contrib/systemd/osmo-bts-sysmo.service
index 09880a8..09e91de 100644
--- a/contrib/systemd/osmo-bts-sysmo.service
+++ b/contrib/systemd/osmo-bts-sysmo.service
@@ -13,7 +13,6 @@
WorkingDirectory=%S/osmocom
Restart=always
RestartSec=2
-RestartPreventExitStatus=1
# CPU scheduling policy:
CPUSchedulingPolicy=rr
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b
Gerrit-Change-Number: 34540
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: systemd: remove RestartPreventExitStatus=1
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email )
Change subject: systemd: remove RestartPreventExitStatus=1
..
systemd: remove RestartPreventExitStatus=1
Fix OsmoPCU not restarting if e.g. an external gsmtap IP is configured
that is currently not available. Also make the service files more
consistent with other Osmocom projects.
Revert f81e2f76 ("systemd: Do not re-start in case of exit(1) (e.g. a
config issue)").
Related: SYS#6581
Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c
---
M contrib/systemd/osmo-pcu.service
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/systemd/osmo-pcu.service b/contrib/systemd/osmo-pcu.service
index 5324883..f688d7f 100644
--- a/contrib/systemd/osmo-pcu.service
+++ b/contrib/systemd/osmo-pcu.service
@@ -10,7 +10,6 @@
WorkingDirectory=%S/osmocom
Restart=always
RestartSec=2
-RestartPreventExitStatus=1
# CPU scheduling policy:
CPUSchedulingPolicy=rr
# For real-time scheduling policies an integer between 1 (lowest priority) and
99 (highest priority):
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c
Gerrit-Change-Number: 34541
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: systemd: remove RestartPreventExitStatus=1
Attention is currently required from: daniel, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c Gerrit-Change-Number: 34541 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 27 Sep 2023 12:11:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: systemd: remove RestartPreventExitStatus=1
Attention is currently required from: daniel, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b Gerrit-Change-Number: 34540 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 27 Sep 2023 12:10:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp_client_fsm: allow the same codec multiple times in ptmap
Attention is currently required from: neels, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email ) Change subject: mgcp_client_fsm: allow the same codec multiple times in ptmap .. Patch Set 5: (1 comment) Patchset: PS4: > Let's see what others have to say here. […] Maybe @neels can also say something about this. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34349?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: Ie13ce59d3165936a16e16588b4d58f0ce7e0ae67 Gerrit-Change-Number: 34349 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 12:06:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_ncc_permitted_si2
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_ncc_permitted_si2 .. Patch Set 1: (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542/comment/9b0b4ceb_1b6b0bf2 PS1, Line 12430:break; > Ah yes, I somehow processed the setverdict as a log line ;) :D -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?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: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 11:11:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_ncc_permitted_si2
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_ncc_permitted_si2 .. Patch Set 1: Code-Review+1 (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542/comment/58fb16ea_a42d788e PS1, Line 12430:break; > The test fails with "servertdict(fail". […] Ah yes, I somehow processed the setverdict as a log line ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?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: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 27 Sep 2023 11:11:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: sccplite: Support multiple MGW in MGW pool
Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email ) Change subject: sccplite: Support multiple MGW in MGW pool .. Patch Set 2: Code-Review+1 (6 comments) File src/osmo-bsc/osmo_bsc_mgcp.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34511/comment/9dd63916_ebcb6cb2 PS1, Line 59: filled buf size > 0 Done https://gerrit.osmocom.org/c/osmo-bsc/+/34511/comment/2dcf0ded_ce8b64f7 PS1, Line 66: if (!eol) > cosmetic: new line after the variable definitions? Done https://gerrit.osmocom.org/c/osmo-bsc/+/34511/comment/c4a4508d_207fc8a6 PS1, Line 121: > with Done https://gerrit.osmocom.org/c/osmo-bsc/+/34511/comment/c1a62bfd_2ad3185a PS1, Line 123: Sine > Since Done https://gerrit.osmocom.org/c/osmo-bsc/+/34511/comment/e6dfe846_432bd91f PS1, Line 132: LOGL_NOTICE > maybe LOGL_DEBUG? otherwise, if there are multiple mgws in the pool, this > will appear quite a lot as […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/34511/comment/7bd84e7f_b6c2da63 PS1, Line 170: > indentation Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?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: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 Gerrit-Change-Number: 34511 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 27 Sep 2023 11:09:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_ncc_permitted_si2
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_ncc_permitted_si2 .. Patch Set 1: (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542/comment/e1d7e4bd_7a23aa2b PS1, Line 12430:break; > this looks wrong? why are you exiting the altstep (without failing the test) > if the value doesn't ma […] The test fails with "servertdict(fail". I exit the altstep, so it runs through the vty commands below to set "no ncc-permitted" again. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?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: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 11:07:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: sccplite: Support multiple MGW in MGW pool
Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: sccplite: Support multiple MGW in MGW pool .. sccplite: Support multiple MGW in MGW pool Before this patch, the MGW was selected at startup, and the MGCP data was always forwarded to that same MGW. If several MGW were configured in the MGW pool, then osmo-bsc would select any of those from the pool, and start configured the BTS-side connection on an endpoint in that MGW. However, when the MSC submitted the MGCP encapsulated in IPA to the BSC, the BSC would always forward the MGCP message to that same MGW selected at startup. As a result, multiple MGWs configured with osmo-bsc using SCCPlite was broken. This commit fixes support for multiple MGWs by looking up the already selected MGW (to setup the BTS-side conn on the endpoint), based on the CIC (MGCP Endpoint) which was provided by the MSC upon AssignReq. Related: OS#6189 Depends: libosmocore.git Change-Id Iee361d740845257fa62c9093e30e8079fa933827 Depends: osmo-mgw.git Change-Id I18d7bdf650c0ec87ae16ed4944aed9f495400137 Change-Id: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 --- M TODO-RELEASE M src/osmo-bsc/osmo_bsc_mgcp.c M src/osmo-bsc/osmo_bsc_msc.c 3 files changed, 146 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/34511/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?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: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 Gerrit-Change-Number: 34511 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: IuUP_Emulation: fix AMR SID SDU size
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?usp=email )
Change subject: IuUP_Emulation: fix AMR SID SDU size
..
IuUP_Emulation: fix AMR SID SDU size
See 3GPP TS 26.102 Table 6-2, an AMR SID should have 39 bits.
Change-Id: I9afb28ca6e23f7976edcc130ea012be34e04eb4b
---
M library/IuUP_Emulation.ttcn
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn
index b649e44..3bda958 100644
--- a/library/IuUP_Emulation.ttcn
+++ b/library/IuUP_Emulation.ttcn
@@ -35,7 +35,7 @@
}
template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_12_2(IuUP_RFCI rfci)
:= t_IuUP_RFC(rfci, {81, 103, 60}, 1);
-template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) :=
t_IuUP_RFC(rfci, {34, 0, 0}, 7);
+template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) :=
t_IuUP_RFC(rfci, {39, 0, 0}, 7);
template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI
rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1);
@@ -46,7 +46,7 @@
ipti := 1
}, {
rfci := 1,
- sub_flow_bits := {34, 0, 0},
+ sub_flow_bits := {39, 0, 0},
ipti := 7
}, {
rfci := 2,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?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: I9afb28ca6e23f7976edcc130ea012be34e04eb4b
Gerrit-Change-Number: 34537
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: IuUP_Emulation: fix AMR SID SDU size
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?usp=email ) Change subject: IuUP_Emulation: fix AMR SID SDU size .. Patch Set 2: (1 comment) Patchset: PS2: merging this one on purpose to make it easier to work on the followup patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?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: I9afb28ca6e23f7976edcc130ea012be34e04eb4b Gerrit-Change-Number: 34537 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 27 Sep 2023 10:58:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero
Attention is currently required from: daniel, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email ) Change subject: osmo_io: Init struct msghdr to zero .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34337?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: I21114ad57784126cfdeb4a932ed44dbf23946fbe Gerrit-Change-Number: 34337 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 27 Sep 2023 10:57:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: osmo-mgw.cfg syntax fix
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?usp=email ) Change subject: osmo-mgw.cfg syntax fix .. Patch Set 1: (1 comment) Patchset: PS1: I pressed the wrong button and merged instead of giving +2 ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?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: I5d4d1af40410bfdcc1280f45b85a8ae0c7b94a80 Gerrit-Change-Number: 34538 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 10:55:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: osmo-mgw.cfg syntax fix
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?usp=email ) Change subject: osmo-mgw.cfg syntax fix .. osmo-mgw.cfg syntax fix was added with mismatching indent in "mgw: Update to contain similar config from docker-playground.git" commit cec73acdd4fa4ddc39ab44853ece0888b3e1bf34 I2aa4d86e548d6644f1dd9358f6b8b48a19c96c3c Change-Id: I5d4d1af40410bfdcc1280f45b85a8ae0c7b94a80 --- M mgw/osmo-mgw.cfg 1 file changed, 24 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index 3844e79..2af7dff 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -60,12 +60,12 @@ osmux off osmux bind-ip 127.0.0.1 osmux bind-ip-v6 ::1 - trunk 1 - sdp audio-payload send-ptime - sdp audio-payload send-name - no rtp keep-alive - loop 0 - no rtcp-omit - no rtp-patch - allow-transcoding - line 0 + trunk 1 + sdp audio-payload send-ptime + sdp audio-payload send-name + no rtp keep-alive + loop 0 + no rtcp-omit + no rtp-patch + allow-transcoding + line 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?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: I5d4d1af40410bfdcc1280f45b85a8ae0c7b94a80 Gerrit-Change-Number: 34538 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: make/Makefile: update DISTRO, UPSTREAM_DISTRO
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email ) Change subject: make/Makefile: update DISTRO, UPSTREAM_DISTRO .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994 Gerrit-Change-Number: 34544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 27 Sep 2023 10:54:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?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: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 27 Sep 2023 10:53:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_ncc_permitted_si2
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_ncc_permitted_si2 .. Patch Set 1: Code-Review-1 (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542/comment/05b4d0ca_8c940566 PS1, Line 12430:break; this looks wrong? why are you exiting the altstep (without failing the test) if the value doesn't match? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?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: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 27 Sep 2023 10:51:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: systemd: remove RestartPreventExitStatus=1
Attention is currently required from: daniel, fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c Gerrit-Change-Number: 34541 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 27 Sep 2023 10:48:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: systemd: remove RestartPreventExitStatus=1
Attention is currently required from: daniel, fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b Gerrit-Change-Number: 34540 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 27 Sep 2023 10:47:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: IuUP_Emulation: fix AMR SID SDU size
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?usp=email ) Change subject: IuUP_Emulation: fix AMR SID SDU size .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?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: I9afb28ca6e23f7976edcc130ea012be34e04eb4b Gerrit-Change-Number: 34537 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 27 Sep 2023 10:44:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: osmo_io: Clean up code
Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code .. Patch Set 1: -Code-Review (1 comment) Patchset: PS1: > osmo_iofd_init() is only called from the main thread, it needs to be public > similar to osmo_select_i […] So now the topic is actually: Is this per-thread call requirement documented in the doxygen API of that function? Because it really should ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?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: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 27 Sep 2023 10:44:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: pcu: Fail immediately in TC_n3105_max_t3195
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?usp=email ) Change subject: pcu: Fail immediately in TC_n3105_max_t3195 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?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: I55b97037c014478451790e1943c617a634fe2457 Gerrit-Change-Number: 34536 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 10:32:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero
Attention is currently required from: laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email ) Change subject: osmo_io: Init struct msghdr to zero .. Patch Set 2: (1 comment) File src/core/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/34337/comment/9b44ef14_c814c573 PS1, Line 58: hdr.msg = msg; > it's a rather trivial change delaying the merge already for a week. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34337?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: I21114ad57784126cfdeb4a932ed44dbf23946fbe Gerrit-Change-Number: 34337 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 27 Sep 2023 10:30:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: IuUP_Emulation: fix AMR SID SDU size
Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?usp=email ) Change subject: IuUP_Emulation: fix AMR SID SDU size .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?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: I9afb28ca6e23f7976edcc130ea012be34e04eb4b Gerrit-Change-Number: 34537 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 27 Sep 2023 10:29:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: osmo-mgw.cfg syntax fix
Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?usp=email ) Change subject: osmo-mgw.cfg syntax fix .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?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: I5d4d1af40410bfdcc1280f45b85a8ae0c7b94a80 Gerrit-Change-Number: 34538 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 27 Sep 2023 10:28:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: make/Makefile: update DISTRO, UPSTREAM_DISTRO
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email )
Change subject: make/Makefile: update DISTRO, UPSTREAM_DISTRO
..
make/Makefile: update DISTRO, UPSTREAM_DISTRO
Update the Makefile, so it does not pick the wrong base distribution
when running make in e.g. osmo-bsc-master directly (without going
through ttcn3-*/jenkins.sh as jenkins does).
Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994
---
M make/Makefile
1 file changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/44/34544/1
diff --git a/make/Makefile b/make/Makefile
index 126fd94..f007f2a 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -42,8 +42,8 @@
OPEN5GS_BRANCH?=main
BUILD_ARGS?=
RUN_ARGS?=-it
-UPSTREAM_DISTRO?=debian:bullseye
-DISTRO?=debian-bullseye
+UPSTREAM_DISTRO?=debian:bookworm
+DISTRO?=debian-bookworm
# Full OBS repository mirror consists of:
# ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994
Gerrit-Change-Number: 34544
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email )
Change subject: vty: make NCC Permitted (SI2) configurable
..
vty: make NCC Permitted (SI2) configurable
Related: SYS#6579
Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e
---
M src/osmo-bsc/bts_vty.c
M tests/bts_features.vty
2 files changed, 102 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34543/1
diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index 6602ad1..69b9dc8 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -1405,6 +1405,54 @@
return CMD_SUCCESS;
}
+#define NCC_STR "Network Colour Code\n"
+
+DEFUN_USRATTR(cfg_bts_ncc_permitted,
+ cfg_bts_ncc_permitted_cmd,
+ X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),
+ "ncc-permitted <1-8> [<1-8>] [<1-8>] [<1-8>] [<1-8>] [<1-8>]
[<1-8>]\n",
+ "Set permitted " NCC_STR "s\n"
+ NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR)
+{
+ struct gsm_bts *bts = vty->index;
+ int i;
+ int ncc;
+ int ncc_prev = -1;
+
+ /* Check if NCCs are in order (like get_amr_from_arg) */
+ for (i = 0; i < argc; i++) {
+ ncc = atoi(argv[i]);
+ if (ncc_prev > ncc) {
+ vty_out(vty, "%% NCCs must be listed in order%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (ncc_prev == ncc) {
+ vty_out(vty, "%% NCCs must be unique%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ ncc_prev = ncc;
+ }
+
+ bts->si_common.ncc_permitted = 0x00;
+ for (i = 0; i < argc; i++)
+ bts->si_common.ncc_permitted |= 1 << (atoi(argv[i]) - 1);
+
+ return CMD_SUCCESS;
+}
+
+DEFUN_USRATTR(cfg_bts_no_ncc_permitted,
+ cfg_bts_no_ncc_permitted_cmd,
+ X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),
+ "no ncc-permitted",
+ NO_STR "Permit all " NCC_STR "s (default)\n")
+{
+ struct gsm_bts *bts = vty->index;
+
+ bts->si_common.ncc_permitted = 0xff;
+ return CMD_SUCCESS;
+}
+
DEFUN_USRATTR(cfg_bts_radio_link_timeout,
cfg_bts_radio_link_timeout_cmd,
X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
@@ -4343,6 +4391,24 @@
#undef cfg_out
+static void config_write_bts_ncc_permitted(struct vty *vty, struct gsm_bts
*bts)
+{
+ int i;
+ uint8_t ncc_permitted = bts->si_common.ncc_permitted;
+
+ if (ncc_permitted == 0xff)
+ return;
+
+ vty_out(vty, " ncc-permitted");
+
+ for (i = 0; i < 8; i++) {
+ if ((ncc_permitted & (1 << i)))
+ vty_out(vty, " %d", i + 1);
+ }
+
+ vty_out(vty, "%s", VTY_NEWLINE);
+}
+
static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts)
{
int i;
@@ -4722,6 +4788,8 @@
config_write_power_ctrl(vty, 2, bts, >bs_power_ctrl);
config_write_power_ctrl(vty, 2, bts, >ms_power_ctrl);
+ config_write_bts_ncc_permitted(vty, bts);
+
config_write_bts_model(vty, bts);
}
@@ -4904,6 +4972,8 @@
install_element(BTS_NODE, _bts_immediate_assignment_cmd);
install_element(BTS_NODE, _bts_nch_position_cmd);
install_element(BTS_NODE, _bts_no_nch_position_cmd);
+ install_element(BTS_NODE, _bts_ncc_permitted_cmd);
+ install_element(BTS_NODE, _bts_no_ncc_permitted_cmd);
neighbor_ident_vty_init();
/* See also handover commands added on bts level from handover_vty.c */
diff --git a/tests/bts_features.vty b/tests/bts_features.vty
index 3768a4d..38f11d3 100644
--- a/tests/bts_features.vty
+++ b/tests/bts_features.vty
@@ -25,3 +25,25 @@
OsmoBSC(config-net-bts-trx-ts)# exit
OsmoBSC(config-net-bts-trx)# exit
OsmoBSC(config-net-bts)# exit
+
+OsmoBSC(config-net)# exit
+OsmoBSC(config)# exit
+
+OsmoBSC# ### test ncc-permitted
+OsmoBSC# show running-config
+... !ncc-permitted
+OsmoBSC# configure terminal
+OsmoBSC(config)# network
+OsmoBSC(config-net)# bts 0
+OsmoBSC(config-net-bts)# ncc-permitted 3 2
+% NCCs must be listed in order
+OsmoBSC(config-net-bts)# ncc-permitted 2 2
+% NCCs must be unique
+OsmoBSC(config-net-bts)# ncc-permitted 2 3 4 5 6 7 8
+OsmoBSC(config-net-bts)# exit
+OsmoBSC(config-net)# exit
+OsmoBSC(config)# exit
+OsmoBSC# show running-config
+...
+ ncc-permitted 2 3 4 5 6 7 8
+...
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?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: I71bb855c35378f8f0598bc11a42bd274b7232a5e
Gerrit-Change-Number: 34543
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_ncc_permitted_si2
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email )
Change subject: bsc: add test TC_ncc_permitted_si2
..
bsc: add test TC_ncc_permitted_si2
Related: SYS#6579
Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272
---
M bsc/BSC_Tests.ttcn
1 file changed, 62 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/42/34542/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 7773153..0fe9d63 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -12396,6 +12396,56 @@
f_shutdown_helper(ho := true);
}
+/* Verify NCC Permitted in System Information Type 2
+ * 3GPP TS 44.018 § 10.5.2.27 */
+testcase TC_ncc_permitted_si2() runs on test_CT {
+ var ASP_RSL_Unitdata rx_rsl_ud;
+ timer T := 5.0;
+ var BIT8 exp;
+
+ f_init_vty();
+
+ /* Set NCC Permitted to 6 7 8 */
+ f_vty_enter_cfg_bts(BSCVTY, 0);
+ f_vty_transceive(BSCVTY, "ncc-permitted 6 7 8");
+ f_vty_transceive(BSCVTY, "end");
+ exp := '1110'B;
+
+ f_init(1);
+ T.start;
+
+ /* Check value in SI 2 */
+ alt {
+ []
IPA_RSL[0][0].receive(tr_ASP_RSL_UD(tr_RSL_BCCH_INFO(RSL_SYSTEM_INFO_2))) ->
value rx_rsl_ud {
+ var RSL_IE_Body ie := rx_rsl_ud.rsl.ies[2].body; /* FULL BCCH
Information IE */
+ var SystemInformation si :=
dec_SystemInformation(ie.other.payload);
+
+ if (si.header.message_type != SYSTEM_INFORMATION_TYPE_2) {
+ setverdict(fail, "RSL FULL BCCH Information IE
contains: ", si);
+ repeat;
+ }
+
+ if (si.payload.si2.ncc_permitted != exp) {
+ setverdict(fail, "NCC Permitted is ",
si.payload.si2.ncc_permitted, " but expected ", exp);
+ break;
+ }
+
+ }
+ [] IPA_RSL[0][0].receive { repeat; }
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for RSL BCCH INFOrmation
(SI2)");
+ }
+ }
+
+ /* Reset NCC Permitted to default (all permitted). This is already
+* getting tested in TC_si_default(). */
+ f_vty_enter_cfg_bts(BSCVTY, 0);
+ f_vty_transceive(BSCVTY, "no ncc-permitted");
+ f_vty_transceive(BSCVTY, "end");
+
+ f_shutdown_helper();
+}
+
control {
/* CTRL interface testing */
execute( TC_ctrl_msc_connection_status() );
@@ -12745,6 +12795,8 @@
execute( TC_ho_meas_rep_multi_band() );
+ execute( TC_ncc_permitted_si2() );
+
/* Run TC_ho_out_of_this_bsc last, because it may trigger a segfault
before osmo-bsc's patch
* with change-id I5a3345ab0005a73597f5c27207480912a2f5aae6 */
execute( TC_ho_out_of_this_bsc() );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?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: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272
Gerrit-Change-Number: 34542
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero
Attention is currently required from: daniel, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: osmo_io: Init struct msghdr to zero .. osmo_io: Init struct msghdr to zero Avoid uninitialized read, found with valgrind Syscall param recvmsg(msg) points to uninitialised byte(s) at 0x49FD865: __recvmsg_syscall (recvmsg.c:27) by 0x49FD865: recvmsg (recvmsg.c:41) by 0x4891FAE: iofd_poll_ofd_cb_recvmsg_sendmsg (osmo_io_poll.c:66) by 0x48921B2: iofd_poll_ofd_cb_dispatch (osmo_io_poll.c:119) by 0x48941F1: poll_disp_fds (select.c:419) by 0x4894299: _osmo_select_main (select.c:457) by 0x4894304: osmo_select_main (select.c:496) by 0x10DC3E: test_segm_ipa_stream_srv_run (stream_test.c:628) by 0x10E2A5: main (stream_test.c:879) Address 0x1ffefffa68 is on thread 1's stack in frame #1, created by iofd_poll_ofd_cb_recvmsg_sendmsg (osmo_io_poll.c:45) Change-Id: I21114ad57784126cfdeb4a932ed44dbf23946fbe --- M src/core/osmo_io_poll.c 1 file changed, 30 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/34337/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34337?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: I21114ad57784126cfdeb4a932ed44dbf23946fbe Gerrit-Change-Number: 34337 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-MessageType: newpatchset
[S] Change in osmo-pcu[master]: systemd: remove RestartPreventExitStatus=1
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email )
Change subject: systemd: remove RestartPreventExitStatus=1
..
systemd: remove RestartPreventExitStatus=1
Fix OsmoPCU not restarting if e.g. an external gsmtap IP is configured
that is currently not available. Also make the service files more
consistent with other Osmocom projects.
Revert f81e2f76 ("systemd: Do not re-start in case of exit(1) (e.g. a
config issue)").
Related: SYS#6581
Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c
---
M contrib/systemd/osmo-pcu.service
1 file changed, 17 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/34541/1
diff --git a/contrib/systemd/osmo-pcu.service b/contrib/systemd/osmo-pcu.service
index 5324883..f688d7f 100644
--- a/contrib/systemd/osmo-pcu.service
+++ b/contrib/systemd/osmo-pcu.service
@@ -10,7 +10,6 @@
WorkingDirectory=%S/osmocom
Restart=always
RestartSec=2
-RestartPreventExitStatus=1
# CPU scheduling policy:
CPUSchedulingPolicy=rr
# For real-time scheduling policies an integer between 1 (lowest priority) and
99 (highest priority):
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c
Gerrit-Change-Number: 34541
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-bts[master]: systemd: remove RestartPreventExitStatus=1
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email )
Change subject: systemd: remove RestartPreventExitStatus=1
..
systemd: remove RestartPreventExitStatus=1
Fix OsmoBTS not restarting if e.g. an external gsmtap IP is configured
that is currently not available. Also make the service files more
consistent with other Osmocom projects.
Partial revert of ae2473c2 ("systemd: Do not restart with a broken
config file or such").
Related: SYS#6581
Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b
---
M contrib/systemd/osmo-bts-lc15.service
M contrib/systemd/osmo-bts-oc2g.service
M contrib/systemd/osmo-bts-sysmo.service
3 files changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/34540/1
diff --git a/contrib/systemd/osmo-bts-lc15.service
b/contrib/systemd/osmo-bts-lc15.service
index fd0760a..03341bd 100644
--- a/contrib/systemd/osmo-bts-lc15.service
+++ b/contrib/systemd/osmo-bts-lc15.service
@@ -11,7 +11,6 @@
RuntimeDirectory=osmo-bts
Restart=always
RestartSec=2
-RestartPreventExitStatus=1
# CPU scheduling policy:
CPUSchedulingPolicy=rr
diff --git a/contrib/systemd/osmo-bts-oc2g.service
b/contrib/systemd/osmo-bts-oc2g.service
index dabb002..bc64a54 100644
--- a/contrib/systemd/osmo-bts-oc2g.service
+++ b/contrib/systemd/osmo-bts-oc2g.service
@@ -11,7 +11,6 @@
RuntimeDirectory=osmo-bts
Restart=always
RestartSec=2
-RestartPreventExitStatus=1
# CPU scheduling policy:
CPUSchedulingPolicy=rr
diff --git a/contrib/systemd/osmo-bts-sysmo.service
b/contrib/systemd/osmo-bts-sysmo.service
index 09880a8..09e91de 100644
--- a/contrib/systemd/osmo-bts-sysmo.service
+++ b/contrib/systemd/osmo-bts-sysmo.service
@@ -13,7 +13,6 @@
WorkingDirectory=%S/osmocom
Restart=always
RestartSec=2
-RestartPreventExitStatus=1
# CPU scheduling policy:
CPUSchedulingPolicy=rr
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b
Gerrit-Change-Number: 34540
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
