Attention is currently required from: osmith, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email )
Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> My point asking was/is: why do we care about the type of BTS in use?
Because one can have multiple BTS configured in osmo-bsc.cfg, and they can be of different types (this is what you're doing, IIRC). I know that other BTS models use their own A-bis/OML dialects or even completely different protocols, but the point still applies: this file is called `bts_ipaccess_nanobts.c` and among with the general logic defines handling of ip.access specific MOs and protocol extensions. This is why we already doing this check here in this file, but so far not in all functions. Does that make sense for you?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?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: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4
Gerrit-Change-Number: 34454
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 19 Sep 2023 14:32:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email )
Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
My point asking was/is: why do we care about the type of BTS in use?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?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: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4
Gerrit-Change-Number: 34454
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 19 Sep 2023 14:23:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email
to look at the new patch set (#2).
Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks
......................................................................
oml: ipacc: add missing is_ipa_abisip_bts() checks
These functions are called from a signal handler (SS_NM), and the
signal itself is sent from the generic OML logic whenever the
Software Activated Report is received from some BTS, which is not
necessarily a nanoBTS or osmo-bts.
It would be nice if we could check the BTS type once in the signal
handler, but the signal data is not always the same and depends on
the signal type, so unfortunately it's not possible.
Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4
---
M src/osmo-bsc/bts_ipaccess_nanobts.c
1 file changed, 42 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/34454/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?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: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4
Gerrit-Change-Number: 34454
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria, laforge, neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email )
Change subject: hnbgw_cn: Remove assert hit due to wrong assumption
......................................................................
Patch Set 1: Verified+1
(1 comment)
Patchset:
PS1:
I tested with a sample config file that this patch fixes the crash due to assert being hit.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c
Gerrit-Change-Number: 34458
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 19 Sep 2023 13:54:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796?usp=email )
Change subject: PCU_Tests: use PCUIF v.11 exclusively
......................................................................
PCU_Tests: use PCUIF v.11 exclusively
OsmoPCU has support for PCUIF v.11 for quite some time now. Let's
upgrade the testsuite as well.
Related: OS#5927
Change-Id: I6c4042f2224cd48aecc1b1499226f7d23caddd4f
---
M pcu/GPRS_Components.ttcn
M pcu/PCU_Tests.ttcn
2 files changed, 44 insertions(+), 20 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index 4b8ca5b..983ae8f 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -628,7 +628,7 @@
ms.ul_tbf := f_ultbf_new_from_rr_imm_ass(rr_imm_ass);
}
-function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_PCH,
+function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_PCH_2,
template GsmRrMessage t_imm_ass := tr_IMM_TBF_ASS(true, ?, ?),
template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum)
runs on MS_BTS_IFACE_CT {
@@ -882,19 +882,17 @@
/* This function can be used to send DATA.cnf in response to the IUT originated DATA.req. */
function f_pcuif_tx_data_cnf(in BTS_CCCH_Block data_msg)
runs on MS_BTS_IFACE_CT {
- var PCUIF_Message pcu_msg_cnf := {
- msg_type := PCU_IF_MSG_DATA_CNF,
- bts_nr := data_msg.bts_nr,
- spare := '0000'O,
- u := { data_cnf := data_msg.raw }
+ var PCUIF_data_cnf cnf := {
+ sapi := data_msg.raw.sapi,
+ msg_id := data_msg.msg_id
};
- /* PCU wants DATA.cnf containing basically everything that was in DATA.req,
- * but PCU_IF_SAPI_PCH is a special case - paging group shall be excluded. */
- if (data_msg.raw.sapi == PCU_IF_SAPI_PCH) {
- pcu_msg_cnf.u.data_cnf.data := substr(data_msg.raw.data, 3,
- data_msg.raw.len - 3);
- }
+ var PCUIF_Message pcu_msg_cnf := {
+ msg_type := PCU_IF_MSG_DATA_CNF_2,
+ bts_nr := data_msg.bts_nr,
+ spare := '0000'O,
+ u := { data_cnf2 := cnf}
+ };
BTS.send(pcu_msg_cnf);
}
@@ -1061,7 +1059,7 @@
}
}
-altstep as_ms_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH,
+altstep as_ms_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH_2,
template GsmRrMessage t_imm_ass := ?,
template (present) TsTrxBtsNum nr := ts_TsTrxBtsNum,
out GsmRrMessage rr_imm_ass)
@@ -1073,14 +1071,12 @@
rr_imm_ass := data_msg.rr_msg;
log("Rx Immediate Assignment: ", rr_imm_ass);
/* Send DATA.cnf back to the IUT (only needed for PCH) */
- if (data_msg.raw.sapi == PCU_IF_SAPI_PCH) {
- f_pcuif_tx_data_cnf(data_msg);
- }
+ f_pcuif_tx_data_cnf(data_msg);
setverdict(pass);
}
}
-function f_pcuif_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH,
+function f_pcuif_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH_2,
template GsmRrMessage t_imm_ass := ?,
template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum)
runs on MS_BTS_IFACE_CT return GsmRrMessage {
@@ -1131,7 +1127,7 @@
if (is_11bit != 0) { ra := 127; }
/* Expect Immediate (TBF) Assignment on the same TS/TRX/BTS */
- return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH, tr_IMM_TBF_ASS(false, ra, fn), nr);
+ return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH_2, tr_IMM_TBF_ASS(false, ra, fn), nr);
}
/* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */
@@ -1174,7 +1170,7 @@
var BTS_CCCH_Block data_msg;
BTS.receive(tr_PCUIF_DATA_RR(nr.bts_nr,
- tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PCH),
+ tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PCH_2),
tr_PAG_REQ1(tr_MI_LV(mi1)))) -> value data_msg;
rr_pag_req1 := data_msg.rr_msg;
log("Rx Paging Request Type1: ", rr_pag_req1);
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index d844736..9829edb 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -4858,7 +4858,22 @@
/* SGSN sends some DL data, PCU will page on CCCH (PCH) */
BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, f_rnd_octstring(12)));
- f_ms_exp_dl_tbf_ass_ccch(ms);
+
+ /* The PCU will send an IMMEDIATE ASSIGNMENT message on the AGCH. It
+ * should be noted that IMMEDIATE ASSIGNMENT messages for DL TBFs are
+ * commonly sent on the PCH. However in this case the IMSI is not
+ * known to the PCU and hence no paging group can be calculated. The
+ * PCU is then forced to use the AGCH.
+ *
+ * As a background information to this it should be noted that this
+ * works because the IMSI is commonly unknown during a GMM ATTACH
+ * REQUEST. In this phase the MS is in non-DRX mode, which means that
+ * it listens on all CCCH blocks (PCH and AGCH)
+ *
+ * See also: 3gpp TS 44.060, section 5.5.1.5 and
+ * 3gpp TS 45.002, section 6.5.3, 6.5.6
+ */
+ f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_AGCH_2);
f_TC_pcuif_fh_check_imm_ass(valueof(info_ind), ms.dl_tbf.rr_imm_ass);
f_shutdown(__BFILE__, __LINE__, final := true);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796?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: I6c4042f2224cd48aecc1b1499226f7d23caddd4f
Gerrit-Change-Number: 33796
Gerrit-PatchSet: 7
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: laforge.
manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34457?usp=email )
Change subject: gsmtap.h: Add definitions for ISDN PPP sub-type
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> as there is both synchronous PPP over ISDN (the one you're describing here, where the HDLC around th […]
the only relevant difference in the protocol (after the framing) seems to be that the async mode can also have an asyncmap (listing a number of bytes which must not be sent over the line, like XON/XOFF).
It might make sense to indicate here that it's meant for Synchronous ISDN, but all of the "specialties" of RFC1618 (framing, NRZ vs. NRZI, etc.) are already gone by this point (because these frames only contain the payload).
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34457?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: I17137167b2c74b6c5e53459743b6e140fc1a4386
Gerrit-Change-Number: 34457
Gerrit-PatchSet: 2
Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 19 Sep 2023 11:49:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment