[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing
Attention is currently required from: fixeria, laforge, pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email ) Change subject: SMS over GSUP: implement vty config of SMSC routing .. Patch Set 3: (2 comments) File include/osmocom/hlr/hlr_sms.h: https://gerrit.osmocom.org/c/osmo-hlr/+/34448/comment/95cb2685_82f663eb PS2, Line 17: void smsc_del(struct hlr_smsc *smsc); > Ack Done https://gerrit.osmocom.org/c/osmo-hlr/+/34448/comment/829d9571_1c42c1f7 PS2, Line 29: void smsc_route_del(struct hlr_smsc_route *rt); > free Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 21 Sep 2023 03:35:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing
Attention is currently required from: falconia, fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: SMS over GSUP: implement vty config of SMSC routing .. SMS over GSUP: implement vty config of SMSC routing At the user-visible level (advanced settings menus on phones, GSM 07.05 AT commands, SIM programming) each SMSC is identified by a numeric address that looks like a phone number, originally meant to be a Global Title. OsmoMSC passes these SMSC addresses through as-is to MO-forwardSM.req GSUP message - however, SMSCs that connect to OsmoHLR via GSUP identify themselves by their IPA names instead. Hence we need a mapping mechanism in OsmoHLR config. To accommodate different styles of network design ranging from strict recreation of classic GSM architecture to guest roaming arrangements, a two-level configuration is implemented, modeled after EUSE/USSD configuration: first one defines which SMSCs exist as entities, identified only by their IPA names, and then one defines which numeric SMSC address (in SM-RP-DA) should go to which configured SMSC, with the additional possibility of a default route. Related: OS#6135 Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/hlr_sms.h M include/osmocom/hlr/hlr_vty.h M src/Makefile.am M src/hlr.c A src/hlr_sms.c M src/hlr_vty.c M tests/test_nodes.vty 9 files changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/48/34448/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: falconia Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-hlr[master]: SMS over GSUP: handle READY-FOR-SM.req from MSCs
Attention is currently required from: falconia. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/34451?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: SMS over GSUP: handle READY-FOR-SM.req from MSCs .. SMS over GSUP: handle READY-FOR-SM.req from MSCs When an MS indicates that it is ready to receive MT SMS, the MSC will send us a READY-FOR-SM.req message. Handle it by sending copies of the same message to all connected SMSCs and returning OK result to the MS that indicates its ready status. Related: OS#6135 Change-Id: I731545a3a0d0804289e24a7769e13bfd3f645132 --- M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 3 files changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/51/34451/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I731545a3a0d0804289e24a7769e13bfd3f645132 Gerrit-Change-Number: 34451 Gerrit-PatchSet: 4 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-MessageType: newpatchset
[S] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MT SMS
Attention is currently required from: falconia. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/34450?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: SMS over GSUP: implement forwarding of MT SMS .. SMS over GSUP: implement forwarding of MT SMS When an SMSC tries to deliver an SM to a subscriber, it will send us an MT-forwardSM.req GSUP message. We look up the subscriber by IMSI and see if they are attached to a VLR. If the subscriber is attached, we forward the message to the MSC/VLR, otherwise return an error to the SMSC. Related: OS#6135 Change-Id: Ib3551bf7839690606c677461758c5cfef5f0aa7b --- M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 3 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/50/34450/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib3551bf7839690606c677461758c5cfef5f0aa7b Gerrit-Change-Number: 34450 Gerrit-PatchSet: 4 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-MessageType: newpatchset
[M] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MO SMS
Attention is currently required from: falconia, fixeria, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?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+2 by pespin, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: SMS over GSUP: implement forwarding of MO SMS .. SMS over GSUP: implement forwarding of MO SMS MO-forwardSM.req messages are now forwarded to a connected SMSC based on the SMSC address (SM-RP-DA) in the MO SM and the vty-defined mapping from SMSC numeric addresses to IPA names. Related: OS#6135 Depends: Iea5c29909c5be80f81dbbc2873656ff5cf590a5d (libosmocore) Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 --- M TODO-RELEASE M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 4 files changed, 111 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/49/34449/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 Gerrit-Change-Number: 34449 Gerrit-PatchSet: 4 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[L] Change in osmo-bts[master]: oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34434?usp=email ) Change subject: oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34434?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: I88c6c6af18be054bd152832e60c8afbbd16098a3 Gerrit-Change-Number: 34434 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Sep 2023 23:48:49 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to GPRS Cell MO(s)
Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+2 by pespin, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: abis_nm: send Get Attributes to GPRS Cell MO(s) .. abis_nm: send Get Attributes to GPRS Cell MO(s) Change-Id: Ib6d87da49217f1c8d76445ce623a511a07daedbf Related: OS#4505 --- M src/osmo-bsc/nm_gprs_cell_fsm.c 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34360/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?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: Ib6d87da49217f1c8d76445ce623a511a07daedbf Gerrit-Change-Number: 34360 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: oml: ipacc: fix sending hard-coded GPRS Cell attributes
Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34357?usp=email to look at the new patch set (#6). 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: oml: ipacc: fix sending hard-coded GPRS Cell attributes .. oml: ipacc: fix sending hard-coded GPRS Cell attributes Change-Id: I7d90ca3d6a660af8e953e890c7919194f5d297d2 Related: OS#4505 --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.ok 3 files changed, 40 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/34357/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34357?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: I7d90ca3d6a660af8e953e890c7919194f5d297d2 Gerrit-Change-Number: 34357 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to Rado Carrier MO(s)
Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34359?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: abis_nm: send Get Attributes to Rado Carrier MO(s) .. abis_nm: send Get Attributes to Rado Carrier MO(s) Change-Id: If7b75689c12a253377f2747babd4d7ebd1db5f87 Related: OS#4505 --- M src/osmo-bsc/nm_rcarrier_fsm.c 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/34359/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34359?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: If7b75689c12a253377f2747babd4d7ebd1db5f87 Gerrit-Change-Number: 34359 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: nanoBTS: print [supported] versions of MOs
Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32653?usp=email ) Change subject: nanoBTS: print [supported] versions of MOs .. Patch Set 1: (1 comment) Patchset: PS1: > Somehow I forgot that I reviewed this patch back in May, and submitted my own > patch doing the same t […] I submitted a patch, keeping Harald as the author: https://gerrit.osmocom.org/c/osmo-bsc/+/34472' I think this one can be abandoned? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32653?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: I9aefcae31dc9139e90161b4690e77d4958021d45 Gerrit-Change-Number: 32653 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 23:04:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: oml: ipacc: print all supported versions of MOs
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34472?usp=email )
Change subject: oml: ipacc: print all supported versions of MOs
..
oml: ipacc: print all supported versions of MOs
The first byte is the default version, the other bytes describe the
optional other versions supported by the MO. Print them all.
Change-Id: I01da4883cf59101ddaef575979519ac48fcf54b0
---
M src/osmo-bsc/bts_ipaccess_nanobts.c
1 file changed, 22 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/34472/1
diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c
b/src/osmo-bsc/bts_ipaccess_nanobts.c
index d99489b..c690b46 100644
--- a/src/osmo-bsc/bts_ipaccess_nanobts.c
+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c
@@ -217,11 +217,18 @@
mo->ipaccess.obj_version = 0; /* implicit default */
if (TLVP_PRES_LEN(, NM_ATT_IPACC_OBJ_VERSION, 1)) {
+ const uint8_t *versions = TLVP_VAL(,
NM_ATT_IPACC_OBJ_VERSION);
+ char buf[256];
+ struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) };
+
/* nanoBTS may report several Object Versions; the first one
will
* be used by default unless requested explicitly before
OPSTARTing. */
- mo->ipaccess.obj_version = *TLVP_VAL(,
NM_ATT_IPACC_OBJ_VERSION);
- LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Version is %u
(default)\n",
- mo->ipaccess.obj_version);
+ mo->ipaccess.obj_version = versions[0];
+
+ OSMO_STRBUF_PRINTF(sb, "%u (default)", versions[0]);
+ for (uint16_t i = 1; i < TLVP_LEN(,
NM_ATT_IPACC_OBJ_VERSION); i++)
+ OSMO_STRBUF_PRINTF(sb, ", %u", versions[i]);
+ LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Versions supported:
%s\n", buf);
}
osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34472?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: I01da4883cf59101ddaef575979519ac48fcf54b0
Gerrit-Change-Number: 34472
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-CC: laforge
Gerrit-MessageType: newchange
[M] Change in osmo-bsc[master]: abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34471?usp=email )
Change subject: abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP
..
abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP
Even though the Abis/OML message flow looks the way it should look
on the wire, it does not actually reflect the sequence/flow of events
and actions in the NM FSMs. For example (extracted from a PCAP):
GPRS Cell(00,00,ff) State Changed Event Report
GPRS Cell(00,00,ff) Software Activate Request
GPRS Cell(00,00,ff) Software Activate Request ACK
GPRS Cell(00,00,ff) Activate Software
GPRS Cell(00,00,ff) Activate Software ACK
[a] GPRS Cell(00,00,ff) State Changed Event Report
[b] GPRS Cell(00,00,ff) Software Activated Report
[c] GPRS Cell(00,00,ff) Get Attributes
GPRS Cell(00,00,ff) Get Attributes Response
[d] GPRS Cell(00,00,ff) IPA Set Attributes
GPRS Cell(00,00,ff) IPA Set Attributes ACK
GPRS Cell(00,00,ff) Change Administrative State
GPRS Cell(00,00,ff) Change Administrative State ACK
GPRS Cell(00,00,ff) State Changed Event Report
GPRS Cell(00,00,ff) Opstart
GPRS Cell(00,00,ff) Opstart ACK
A follow-up patch [1] changes the logic generating message [d],
so that the IPA Object Version of the GPRS Cell MO is taken into
account when adding the attributes.
The problem is that both messages [c] and [d] are generated and
queued for transmission on the receipt of message [a], but *before*
message [b] has been processed. So the IPA Object Version is not
known and assumed to be 0 at that point in time.
This patch delays configure_loop() until message [b] is received.
So far only for nanoBTS and only for those MOs, for which Figure 2
in 3GPP TS 52.021 explicitly mentions that the SW downloading and
activation procedures may be required, plus for the ip.access
specific MOs which all seem to support the SW activation.
osmo-bts does send SW Activated Report only for a subset of MOs,
which does not include Baseband Transceiver, Radio Carrier, and
Radio Channel. 3GPP TS 52.021 is not clear on whether this
message shall be sent by all MOs either, so we consider it
optional and delay configure_loop() only for nanoBTS.
As a bonus, this patch is expected to fix the following warning:
NM_BTS_SM_OP(bts_sm){ENABLED}: Event SW_ACT_REP not permitted
Change-Id: I3953a5e41eb27165f9ff203cac7447ee9d311abf
Related: [1] Ie0fb3eaf76e1f70e5a19bb088e1674b7e553d32a
---
M include/osmocom/bsc/bts.h
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/nm_bb_transc_fsm.c
M src/osmo-bsc/nm_bts_fsm.c
M src/osmo-bsc/nm_bts_sm_fsm.c
M src/osmo-bsc/nm_rcarrier_fsm.c
6 files changed, 109 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/34471/1
diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index 3f7958c..6974dca 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -692,6 +692,17 @@
return false;
}
+static inline bool is_nanobts(const struct gsm_bts *bts)
+{
+ switch (bts->type) {
+ case GSM_BTS_TYPE_NANOBTS:
+ return true;
+ default:
+ break;
+ }
+ return false;
+}
+
static inline bool is_osmobts(const struct gsm_bts *bts)
{
switch (bts->type) {
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 2876d24..275e4f1 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -528,6 +528,7 @@
struct gsm_nm_state nm_state;
struct gsm_bts *bts;
struct osmo_fsm_inst *fi;
+ bool sw_act_rep_received;
bool opstart_sent;
bool adm_unlock_sent;
bool get_attr_sent;
diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c
index ce2f3e9..82da6e1 100644
--- a/src/osmo-bsc/nm_bb_transc_fsm.c
+++ b/src/osmo-bsc/nm_bb_transc_fsm.c
@@ -61,6 +61,7 @@
{
struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;
+ bb_transc->mo.sw_act_rep_received = false;
bb_transc->mo.get_attr_sent = false;
bb_transc->mo.get_attr_rep_received = false;
bb_transc->mo.adm_unlock_sent = false;
@@ -71,11 +72,14 @@
static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t
event, void *data)
{
+ struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;
struct nm_statechg_signal_data *nsd;
const struct gsm_nm_state *new_state;
switch (event) {
case NM_EV_SW_ACT_REP:
+ bb_transc->mo.sw_act_rep_received = true;
+ break;
case NM_EV_SETUP_RAMP_READY:
break;
case NM_EV_STATE_CHG_REP:
@@ -109,6 +113,10 @@
if (bts_setup_ramp_wait(trx->bts))
return;
+ /* nanoBTS only: delay until SW Activated Report is received */
+ if
[M] Change in osmo-bsc[master]: abis_nm: handle NM_EV_SW_ACT_REP in ST_OP_DISABLED_{DEPENDENCY,OFFLINE}
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34470?usp=email )
Change subject: abis_nm: handle NM_EV_SW_ACT_REP in
ST_OP_DISABLED_{DEPENDENCY,OFFLINE}
..
abis_nm: handle NM_EV_SW_ACT_REP in ST_OP_DISABLED_{DEPENDENCY,OFFLINE}
3GPP TS 52.021 does not strictly mandate that the SW Activated Report
can only be received in state DISABLED/OFFLINE. The only requirement
is that the software load procedure (if needed) and activation is to
be performed in this state.
The successful outcome of software activation procedure is indicated
by the BTS using the above-mentioned SW Activated Report message,
which may be received in ST_OP_DISABLED_{DEPENDENCY,OFFLINE} too.
The MO state changes are triggered by the State Changed Event Report
messages, and happen asynchronously with the software activation.
This patch fixes the following warnings seen with a nanoBTS:
NM_BTS_OP(bts2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_GPRS_NSE_OP(nse2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_GPRS_CELL_OP(gprs-cell2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_GPRS_NSVC_OP(nsvc0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_GPRS_NSVC_OP(nsvc1){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_BB_TRANSC_OP(bts2-trx0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_CHAN_OP(bts2-trx0-ts0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_CHAN_OP(bts2-trx0-ts1){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_CHAN_OP(bts2-trx0-ts2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_CHAN_OP(bts2-trx0-ts3){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_CHAN_OP(bts2-trx0-ts4){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_CHAN_OP(bts2-trx0-ts5){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_CHAN_OP(bts2-trx0-ts6){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_CHAN_OP(bts2-trx0-ts7){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
NM_RCARRIER_OP(bts2-trx0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted
The following warning is still expected to show up though:
NM_BTS_SM_OP(bts_sm){ENABLED}: Event SW_ACT_REP not permitted
but is caused by a different problem, which is to be fixed later.
Change-Id: I00a423adcde5c34977f4c4dad920874687fa493c
---
M src/osmo-bsc/nm_bb_transc_fsm.c
M src/osmo-bsc/nm_bts_fsm.c
M src/osmo-bsc/nm_bts_sm_fsm.c
M src/osmo-bsc/nm_channel_fsm.c
M src/osmo-bsc/nm_gprs_cell_fsm.c
M src/osmo-bsc/nm_gprs_nse_fsm.c
M src/osmo-bsc/nm_gprs_nsvc_fsm.c
M src/osmo-bsc/nm_rcarrier_fsm.c
8 files changed, 103 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/34470/1
diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c
index b68dc67..ce2f3e9 100644
--- a/src/osmo-bsc/nm_bb_transc_fsm.c
+++ b/src/osmo-bsc/nm_bb_transc_fsm.c
@@ -175,6 +175,9 @@
const struct gsm_nm_state *new_state;
switch (event) {
+ case NM_EV_SW_ACT_REP:
+ configure_loop(bb_transc, _transc->mo.nm_state, false);
+ break;
case NM_EV_GET_ATTR_REP:
bb_transc->mo.get_attr_rep_received = true;
bb_transc->mo.get_attr_sent = false;
@@ -234,6 +237,9 @@
const struct gsm_nm_state *new_state;
switch (event) {
+ case NM_EV_SW_ACT_REP:
+ configure_loop(bb_transc, _transc->mo.nm_state, true);
+ break;
case NM_EV_GET_ATTR_REP:
bb_transc->mo.get_attr_rep_received = true;
bb_transc->mo.get_attr_sent = false;
@@ -375,6 +381,7 @@
},
[NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY] = {
.in_event_mask =
+ X(NM_EV_SW_ACT_REP) |
X(NM_EV_STATE_CHG_REP) |
X(NM_EV_GET_ATTR_REP) |
X(NM_EV_RSL_CONNECT_ACK) |
@@ -390,6 +397,7 @@
},
[NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE] = {
.in_event_mask =
+ X(NM_EV_SW_ACT_REP) |
X(NM_EV_STATE_CHG_REP) |
X(NM_EV_GET_ATTR_REP) |
X(NM_EV_RSL_CONNECT_ACK) |
diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c
index 544efb4..937b63d 100644
--- a/src/osmo-bsc/nm_bts_fsm.c
+++ b/src/osmo-bsc/nm_bts_fsm.c
@@ -179,6 +179,9 @@
const struct gsm_nm_state *new_state;
switch (event) {
+ case NM_EV_SW_ACT_REP:
+ configure_loop(bts, >mo.nm_state, false);
+ break;
case NM_EV_GET_ATTR_REP:
rx_get_attr_rep(bts, false);
return;
@@ -232,6 +235,9 @@
const struct gsm_nm_state *new_state;
switch (event) {
+ case NM_EV_SW_ACT_REP:
+ configure_loop(bts, >mo.nm_state, true);
+ break;
case NM_EV_GET_ATTR_REP:
[M] Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_process_rx_ludt
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34469?usp=email ) Change subject: sccp: Introduce test TC_process_rx_ludt .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34469?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: I0880ccce872e79f057e17e29e09a566645365e96 Gerrit-Change-Number: 34469 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 21:33:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA
Attention is currently required from: daniel, fixeria, laforge, osmith. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA .. Patch Set 21: (1 comment) File examples/ipa-stream-client.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/2cf94fa4_77e7c5e3 PS21, Line 119: sizeof(struct ipa_head) + sizeof(struct ipa_head_ext > Just to confirm, this offset is no more needed? Yes, the segmentation callback is stripping the IPA headers (see here: https://gerrit.osmocom.org/c/libosmo-netif/+/33652/6/src/ipa.c ) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?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: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 21 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 20 Sep 2023 19:38:53 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: reduce rx burst queue size
Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email ) Change subject: ms: reduce rx burst queue size .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifb8bf2894c87e4234e3d3f65d66c1e98c8f63c53 Gerrit-Change-Number: 34272 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: Hoernchen Gerrit-Comment-Date: Wed, 20 Sep 2023 17:52:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: reduce rx burst queue size
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email ) Change subject: ms: reduce rx burst queue size .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifb8bf2894c87e4234e3d3f65d66c1e98c8f63c53 Gerrit-Change-Number: 34272 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Sep 2023 17:50:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_process_rx_ludt
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34469?usp=email )
Change subject: sccp: Introduce test TC_process_rx_ludt
..
sccp: Introduce test TC_process_rx_ludt
Related: SYS#6566
Change-Id: I0880ccce872e79f057e17e29e09a566645365e96
---
M library/SCCP_Templates.ttcn
M sccp/SCCP_Tests_RAW.ttcn
2 files changed, 82 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/69/34469/1
diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn
index 74f1a20..a87ef5c 100644
--- a/library/SCCP_Templates.ttcn
+++ b/library/SCCP_Templates.ttcn
@@ -217,6 +217,52 @@
}
}
+template (value) PDU_SCCP ts_SCCP_LUDT(SCCP_PAR_Address calling,
SCCP_PAR_Address called,
+ template (value) octetstring data,
+ template (value) BIT4 msg_hdl := ''B,
+ template (value) integer hop_ctr := 16)
:= {
+ longudata := {
+ messageType := ludt,
+ protClass := {''B, msg_hdl},
+ hopCounter := hop_ctr,
+ pointer1 := 0, /* overwritten */
+ pointer2 := 0, /* overwritten */
+ pointer3 := 0, /* overwritten */
+ pointer4 := 0, /* overwritten */
+ calledPAddress := ConvertASPAddressToEncodedAddress_itu(called),
+ callingPAddress :=
ConvertASPAddressToEncodedAddress_itu(calling),
+ longData := {
+ paramLength := 0,
+ data := data
+ },
+ optionalPart := omit,
+ eop := omit
+ }
+}
+
+template PDU_SCCP tr_SCCP_LUDT(template (present) SCCP_PAR_Address calling,
template (present) SCCP_PAR_Address called,
+ template octetstring data := ?,
+ template BIT4 msg_hdl := ''B,
+ template integer hop_ctr := ?) := {
+ longudata := {
+ messageType := ludt,
+ protClass := {''B, msg_hdl},
+ hopCounter := hop_ctr,
+ pointer1 := ?,
+ pointer2 := ?,
+ pointer3 := ?,
+ pointer4 := ?,
+ calledPAddress := tr_Addr(called),
+ callingPAddress := tr_Addr(calling),
+ longData := {
+ paramLength := ?,
+ data := data
+ },
+ optionalPart := { segmentation:= omit, importance := * }
ifpresent,
+ eop := { paramName:= con_SCCP_eop } ifpresent
+ }
+}
+
template PDU_SCCP tr_SCCP_IT(template (present) OCT3 source_lref := ?,
template (present) OCT3 dest_lref := ?) := {
diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn
index 505deb6..1c81d98 100644
--- a/sccp/SCCP_Tests_RAW.ttcn
+++ b/sccp/SCCP_Tests_RAW.ttcn
@@ -340,6 +340,31 @@
setverdict(pass);
}
+private function f_tx_ludt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address
called, octetstring data) runs on SCCP_Test_RAW_CT {
+ var template PDU_SCCP exp_rx;
+ f_send_sccp(ts_SCCP_LUDT(calling, called, data));
+ exp_rx := tr_SCCP_LUDT(called, calling, data);
+ f_exp_sccp(exp_rx);
+}
+
+/* Test if the IUT SCCP code processes a LUDT [treat it like UDT] and answers
back. */
+testcase TC_process_rx_ludt() runs on SCCP_Test_RAW_CT {
+ var SCCP_PAR_Address calling, called;
+ var octetstring data := f_rnd_octstring(1000);
+
+ f_init_raw(mp_sccp_cfg[0]);
+ f_sleep(1.0);
+
+ called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc,
mp_sccp_cfg[0].peer_ssn,
+mp_sccp_cfg[0].sio,
mp_sccp_cfg[0].sccp_service_type));
+ calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc,
mp_sccp_cfg[0].own_ssn,
+mp_sccp_cfg[0].sio,
mp_sccp_cfg[0].sccp_service_type));
+
+ /* Make sure an LUDT is echoed back just like an UDT */
+ f_tx_ludt_exp(calling, called, data);
+ setverdict(pass);
+}
+
function f_scmg_xceive(SCCP_PAR_Address calling, SCCP_PAR_Address called,
template (value) PDU_SCMG_message tx,
template (omit) PDU_SCMG_message rx_exp,
@@ -464,6 +489,7 @@
execute( TC_tiar_timeout() );
execute( TC_it_avoids_tiar() );
execute( TC_process_rx_xudt() );
+ execute( TC_process_rx_ludt() );
execute( TC_scmg_sst_ssn1() );
execute( TC_scmg_sst_ssn_valid() );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34469?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom...
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?usp=email ) Change subject: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase .. deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase The osmocom git fork containing an extra patch has been rebase to current upstream master, which now contains a fix for LUDT(S) messages which will be required in a follow-up patch. Related: OS#6185 Related: SYS#6566 Change-Id: Id8b7ab652b656841a9b73d40d79077a47f45e735 --- M deps/Makefile 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index 0c8688f..bd6ce8a 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -86,7 +86,7 @@ # file changed. titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= 17a894fc6620a0df11d0d98c897fb66168276b16 +titan.ProtocolEmulations.SCCP_commit= f8a44f2cdef44d0c3adf787ab3184c293a9a58be titan.ProtocolModules.BSSAPP_v7.3.0_commit=R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a titan.ProtocolModules.BSSMAP_commit= 814c5d786ab633bce384eea99685f0e49a386172 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?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: Id8b7ab652b656841a9b73d40d79077a47f45e735 Gerrit-Change-Number: 34468 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom...
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?usp=email ) Change subject: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: I'll merge this now to avoid breakage for people using it, since the old reference in the git repo doesn't exist anymore. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?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: Id8b7ab652b656841a9b73d40d79077a47f45e735 Gerrit-Change-Number: 34468 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Sep 2023 17:35:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom...
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?usp=email ) Change subject: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase .. deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase The osmocom git fork containing an extra patch has been rebase to current upstream master, which now contains a fix for LUDT(S) messages which will be required in a follow-up patch. Related: OS#6185 Related: SYS#6566 Change-Id: Id8b7ab652b656841a9b73d40d79077a47f45e735 --- M deps/Makefile 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/34468/1 diff --git a/deps/Makefile b/deps/Makefile index 0c8688f..bd6ce8a 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -86,7 +86,7 @@ # file changed. titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= 17a894fc6620a0df11d0d98c897fb66168276b16 +titan.ProtocolEmulations.SCCP_commit= f8a44f2cdef44d0c3adf787ab3184c293a9a58be titan.ProtocolModules.BSSAPP_v7.3.0_commit=R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a titan.ProtocolModules.BSSMAP_commit= 814c5d786ab633bce384eea99685f0e49a386172 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?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: Id8b7ab652b656841a9b73d40d79077a47f45e735 Gerrit-Change-Number: 34468 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[L] Change in libosmo-sccp[master]: sccp: Introduce initial support for SCCP LUDT + LUDTS messages
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34467?usp=email to look at the new patch set (#2). Change subject: sccp: Introduce initial support for SCCP LUDT + LUDTS messages .. sccp: Introduce initial support for SCCP LUDT + LUDTS messages * LUDT/LUDTS is now properly received and passed along to the app. * LUDT/LUDTS is now used if the data to transmit spans more than 255 bytes. Related: SYS#6566 Change-Id: Ic91abfc921f5e4f36045bfa325333112cddd9fa6 --- M include/osmocom/sccp/sccp_types.h M include/osmocom/sigtran/xua_msg.h M src/sccp2sua.c M src/xua_msg.c M tests/xua/sccp_test_data.c M tests/xua/sccp_test_data.h M tests/xua/xua_test.c M tests/xua/xua_test.ok 8 files changed, 380 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/67/34467/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34467?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic91abfc921f5e4f36045bfa325333112cddd9fa6 Gerrit-Change-Number: 34467 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
[L] Change in libosmo-sccp[master]: WIP: Support for LUDT + LUDTS messages
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34467?usp=email )
Change subject: WIP: Support for LUDT + LUDTS messages
..
WIP: Support for LUDT + LUDTS messages
Change-Id: Ic91abfc921f5e4f36045bfa325333112cddd9fa6
---
M include/osmocom/sccp/sccp_types.h
M include/osmocom/sigtran/xua_msg.h
M src/sccp2sua.c
M src/xua_msg.c
M tests/xua/sccp_test_data.c
M tests/xua/sccp_test_data.h
M tests/xua/xua_test.c
M tests/xua/xua_test.ok
8 files changed, 375 insertions(+), 46 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/67/34467/1
diff --git a/include/osmocom/sccp/sccp_types.h
b/include/osmocom/sccp/sccp_types.h
index 277a3b2..e5b3bf2 100644
--- a/include/osmocom/sccp/sccp_types.h
+++ b/include/osmocom/sccp/sccp_types.h
@@ -488,6 +488,64 @@
uint8_t data[0];
} __attribute__((packed));
+/* Long unitdata (LUDT), ITU-T Q.713 4.20 */
+struct sccp_data_long_unitdata {
+ /* mandatory */
+ uint8_t type;
+ uint8_t proto_class;
+ uint8_t hop_counter;
+
+ /* variable */
+ uint16_tvariable_called;
+ uint16_tvariable_calling;
+ uint16_tvariable_data;
+ /* optional */
+ uint16_toptional_start;
+
+#if VARIABLE
+ called party address
+ calling party address
+ data
+#endif
+
+#if OPTIONAL
+ segmentation
+ importance
+#endif
+
+ uint8_t data[0];
+
+} __attribute__((packed));
+
+/* Long unitdata service (LUDTS), ITU-T Q.713 4.21 */
+struct sccp_data_long_unitdata_service {
+ /* mandantory */
+ uint8_t type;
+ uint8_t return_cause;
+ uint8_t hop_counter;
+
+
+ /* variable */
+ uint16_tvariable_called;
+ uint16_tvariable_calling;
+ uint16_tvariable_data;
+ /* optional */
+ uint16_toptional_start;
+
+#if VARIABLE
+ called party address
+ calling party address
+ data
+#endif
+
+#if OPTIONAL
+ segmentation
+ importancd
+#endif
+
+ uint8_t data[0];
+} __attribute__((packed));
+
struct sccp_data_it {
/* mandatory */
uint8_t type;
diff --git a/include/osmocom/sigtran/xua_msg.h
b/include/osmocom/sigtran/xua_msg.h
index 11bce6f..5f877ed 100644
--- a/include/osmocom/sigtran/xua_msg.h
+++ b/include/osmocom/sigtran/xua_msg.h
@@ -94,6 +94,7 @@
const uint32_t *xua_msg_get_u32p(const struct xua_msg *xua, uint16_t iei,
uint32_t *out);
const char *xua_msg_part_get_str(const struct xua_msg_part *part);
const char *xua_msg_get_str(const struct xua_msg *xua, uint16_t iei);
+int xua_msg_get_len(const struct xua_msg *xua, uint16_t iei);
void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt);
int xua_msg_add_sccp_addr(struct xua_msg *xua, uint16_t iei, const struct
osmo_sccp_addr *addr);
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index 2f09a8f..3ee79f6 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -338,10 +338,17 @@
}
/*! \brief convenience wrapper around sccp_addr_to_sua() for variable
mandatory addresses */
-static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, const
uint8_t *ptr_addr)
+static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, const
uint8_t *ptr_addr, bool ptr_addr_is_long)
{
- const uint8_t *addr = ptr_addr + *ptr_addr + 1;
- unsigned int addrlen = *(ptr_addr + *ptr_addr);
+ const uint8_t *addr;
+ unsigned int addrlen;
+
+ if (ptr_addr_is_long) /* +1: Distance from MSB of pointer */
+ addr = ptr_addr + 1 + osmo_load16le(ptr_addr);
+ else
+ addr = ptr_addr + *ptr_addr;
+ addrlen = *addr;
+ addr++;
return sccp_addr_to_sua(xua, iei, addr, addrlen);
}
@@ -368,9 +375,10 @@
/*! \brief Add a "SCCP Variable Mandatory Part" (Address format) to the given
msgb
* \param msg Message buffer to which part shall be added
* \param[out] var_ptr pointer to relative pointer in SCCP header
+ * \param[in] var_ptr_is_long Whether the var_ptr field is 2 bytes long
(network order)
* \param[in] xua xUA message from which to use address
* \param[in] iei xUA information element identifier of address */
-static int sccp_add_var_addr(struct msgb *msg, uint8_t *var_ptr, const struct
xua_msg *xua, uint16_t iei)
+static int sccp_add_var_addr(struct msgb *msg, uint8_t *var_ptr, bool
var_ptr_is_long, const struct xua_msg *xua, uint16_t iei)
{
struct xua_msg_part *part = xua_msg_find_tag(xua, iei);
uint8_t *lenbyte;
@@ -383,7 +391,10 @@
/* first allocate one byte for the length */
lenbyte =
[M] Change in libosmo-sccp[master]: sscp2sua: Constify several more parameters
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34465?usp=email )
Change subject: sscp2sua: Constify several more parameters
..
sscp2sua: Constify several more parameters
Change-Id: I0d0997a137f65bccdf8eeda70d95f3f908d2d91a
---
M src/sccp2sua.c
1 file changed, 62 insertions(+), 53 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/65/34465/1
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index ed224cf..9bad528 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -338,9 +338,9 @@
}
/*! \brief convenience wrapper around sccp_addr_to_sua() for variable
mandatory addresses */
-static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, uint8_t
*ptr_addr)
+static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, const
uint8_t *ptr_addr)
{
- uint8_t *addr = ptr_addr + *ptr_addr + 1;
+ const uint8_t *addr = ptr_addr + *ptr_addr + 1;
unsigned int addrlen = *(ptr_addr + *ptr_addr);
return sccp_addr_to_sua(xua, iei, addr, addrlen);
@@ -350,7 +350,7 @@
* \param msg user-provided message buffer to which address shall be *
appended
* \param[in] part SUA wire format binary address
* \returns 0 in case of success; negative on error */
-static int sua_addr_to_sccp(struct msgb *msg, struct xua_msg_part *part)
+static int sua_addr_to_sccp(struct msgb *msg, const struct xua_msg_part *part)
{
struct osmo_sccp_addr osa;
int rc;
@@ -370,7 +370,7 @@
* \param[out] var_ptr pointer to relative pointer in SCCP header
* \param[in] xua xUA message from which to use address
* \param[in] iei xUA information element identifier of address */
-static int sccp_add_var_addr(struct msgb *msg, uint8_t *var_ptr, struct
xua_msg *xua, uint16_t iei)
+static int sccp_add_var_addr(struct msgb *msg, uint8_t *var_ptr, const struct
xua_msg *xua, uint16_t iei)
{
struct xua_msg_part *part = xua_msg_find_tag(xua, iei);
uint8_t *lenbyte;
@@ -401,7 +401,7 @@
* \param[out] var_ptr pointer to relative pointer in SCCP header
* \param[in] xua xUA message from which to use source data
* \param[in] iei xUA information element identifier of source data */
-static int sccp_add_variable_part(struct msgb *msg, uint8_t *var_ptr, struct
xua_msg *xua, uint16_t iei)
+static int sccp_add_variable_part(struct msgb *msg, uint8_t *var_ptr, const
struct xua_msg *xua, uint16_t iei)
{
struct xua_msg_part *part = xua_msg_find_tag(xua, iei);
uint8_t *lenbyte;
@@ -456,9 +456,9 @@
}
/*! \brief convenience wrapper around xua_msg_add_data() for variable
mandatory data */
-static int sccp_data_to_sua_ptr(struct xua_msg *xua, uint16_t iei, uint8_t
*ptr_addr)
+static int sccp_data_to_sua_ptr(struct xua_msg *xua, uint16_t iei, const
uint8_t *ptr_addr)
{
- uint8_t *addr = ptr_addr + *ptr_addr + 1;
+ const uint8_t *addr = ptr_addr + *ptr_addr + 1;
unsigned int addrlen = *(ptr_addr + *ptr_addr);
return xua_msg_add_data(xua, iei, addrlen, addr);
@@ -471,7 +471,7 @@
* \param[in] opt pointer to wire-format encoded SCCP option data
* \returns 0 in case of success; negative on error */
static int xua_msg_add_sccp_opt(struct xua_msg *xua, uint8_t sccp_opt_type,
- uint16_t opt_len, uint8_t *opt)
+ uint16_t opt_len, const uint8_t *opt)
{
switch (sccp_opt_type) {
case SCCP_PNC_DESTINATION_LOCAL_REFERENCE:
@@ -587,7 +587,7 @@
* \param msg caller-provided message buffer to which option is to be appended
* \param[in] opt xUA option/IE (messge part) to be converted+added
* \returns 0 in case of success; negative on error */
-static int sccp_msg_add_sua_opt(enum sccp_message_types type, struct msgb
*msg, struct xua_msg_part *opt)
+static int sccp_msg_add_sua_opt(enum sccp_message_types type, struct msgb
*msg, const struct xua_msg_part *opt)
{
uint32_t tmp32;
uint8_t pnc, *lenptr;
@@ -699,9 +699,9 @@
* \param[in] ptr_opt address of relative pointer to optional part
* \param xua caller-provided xUA message to which options are added
* \returns \ref xua in case of success, NULL on error (xua not freed!) */
-static struct xua_msg *sccp_to_xua_opt(struct msgb *msg, uint8_t *ptr_opt,
struct xua_msg *xua)
+static struct xua_msg *sccp_to_xua_opt(const struct msgb *msg, const uint8_t
*ptr_opt, struct xua_msg *xua)
{
- uint8_t *opt_start, *oneopt;
+ const uint8_t *opt_start, *oneopt;
/* some bounds checking */
if (ptr_opt < msg->data || ptr_opt > msg->tail)
@@ -984,9 +984,9 @@
}
static int xua_ies_to_sccp_opts(struct msgb *msg, uint8_t *ptr_opt,
- enum sccp_message_types type, struct xua_msg
*xua)
+ enum sccp_message_types type, const struct
xua_msg *xua)
{
- struct xua_msg_part
[S] Change in libosmo-sccp[master]: sccp2sua: remove unused msg param from sccp_{addr,data}_to_sua_ptr
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34464?usp=email )
Change subject: sccp2sua: remove unused msg param from
sccp_{addr,data}_to_sua_ptr
..
sccp2sua: remove unused msg param from sccp_{addr,data}_to_sua_ptr
Change-Id: If4a8283614639d456d2bdf2b31873e28c68f59bc
---
M src/sccp2sua.c
1 file changed, 25 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/34464/1
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index 59cb64b..ed224cf 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -338,7 +338,7 @@
}
/*! \brief convenience wrapper around sccp_addr_to_sua() for variable
mandatory addresses */
-static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, struct msgb
*msg, uint8_t *ptr_addr)
+static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, uint8_t
*ptr_addr)
{
uint8_t *addr = ptr_addr + *ptr_addr + 1;
unsigned int addrlen = *(ptr_addr + *ptr_addr);
@@ -456,7 +456,7 @@
}
/*! \brief convenience wrapper around xua_msg_add_data() for variable
mandatory data */
-static int sccp_data_to_sua_ptr(struct xua_msg *xua, uint16_t iei, struct msgb
*msg, uint8_t *ptr_addr)
+static int sccp_data_to_sua_ptr(struct xua_msg *xua, uint16_t iei, uint8_t
*ptr_addr)
{
uint8_t *addr = ptr_addr + *ptr_addr + 1;
unsigned int addrlen = *(ptr_addr + *ptr_addr);
@@ -1028,7 +1028,7 @@
/* Variable Part */
if (!sccp_ptr_part_consistent(msg, >variable_called))
return NULL;
- sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg,
>variable_called);
+ sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, >variable_called);
/* Optional Part */
return sccp_to_xua_opt(msg, >optional_start, xua);
}
@@ -1188,7 +1188,7 @@
/* Variable Part */
if (!sccp_ptr_part_consistent(msg, >variable_start))
return NULL;
- sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, >variable_start);
+ sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, >variable_start);
return xua;
}
@@ -1219,13 +1219,13 @@
/* Variable Part */
if (!sccp_ptr_part_consistent(msg, >variable_called))
return NULL;
- sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg,
>variable_called);
+ sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, >variable_called);
if (!sccp_ptr_part_consistent(msg, >variable_calling))
return NULL;
- sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg,
>variable_calling);
+ sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, >variable_calling);
if (!sccp_ptr_part_consistent(msg, >variable_data))
return NULL;
- sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, >variable_data);
+ sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, >variable_data);
return xua;
}
@@ -1263,13 +1263,13 @@
/* Variable Part */
if (!sccp_ptr_part_consistent(msg, >variable_called))
return NULL;
- sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg,
>variable_called);
+ sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, >variable_called);
if (!sccp_ptr_part_consistent(msg, >variable_calling))
return NULL;
- sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg,
>variable_calling);
+ sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, >variable_calling);
if (!sccp_ptr_part_consistent(msg, >variable_data))
return NULL;
- sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, >variable_data);
+ sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, >variable_data);
/* Optional Part */
return sccp_to_xua_opt(msg, >optional_start, xua);
@@ -1303,13 +1303,13 @@
/* Variable Part */
if (!sccp_ptr_part_consistent(msg, >variable_called))
return NULL;
- sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg,
>variable_called);
+ sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, >variable_called);
if (!sccp_ptr_part_consistent(msg, >variable_calling))
return NULL;
- sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg,
>variable_calling);
+ sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, >variable_calling);
if (!sccp_ptr_part_consistent(msg, >variable_data))
return NULL;
- sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, >variable_data);
+ sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, >variable_data);
return xua;
}
@@ -1348,13 +1348,13 @@
/* Variable Part */
if (!sccp_ptr_part_consistent(msg, >variable_called))
return NULL;
- sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg,
>variable_called);
+ sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, >variable_called);
if (!sccp_ptr_part_consistent(msg, >variable_calling))
return NULL;
-
[S] Change in libosmo-sccp[master]: sccp2sua: Produce smaller output if msg contains no optional section
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34466?usp=email )
Change subject: sccp2sua: Produce smaller output if msg contains no optional
section
..
sccp2sua: Produce smaller output if msg contains no optional section
Change-Id: I5c8fcb30b76ac7bafd4a99bc3004049644e7e3f9
---
M src/sccp2sua.c
M tests/xua/xua_test.c
M tests/xua/xua_test.ok
3 files changed, 28 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/66/34466/1
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index 9bad528..2f09a8f 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -987,18 +987,26 @@
enum sccp_message_types type, const struct
xua_msg *xua)
{
const struct xua_msg_part *part;
-
- /* store relative pointer to start of optional part */
- *ptr_opt = msg->tail - ptr_opt;
+ bool any_added = false;
+ uint8_t *old_tail = msg->tail;
llist_for_each_entry(part, >headers, entry) {
/* make sure we don't add a SCCP option for information
* that is already present in mandatory fixed or
* mandatory variable parts of the header */
- if (!sccp_is_mandatory(type, part) &&
sccp_option_permitted(type, part))
+ if (!sccp_is_mandatory(type, part) &&
sccp_option_permitted(type, part)) {
sccp_msg_add_sua_opt(type, msg, part);
+ any_added = true;
+ }
}
- msgb_put_u8(msg, SCCP_PNC_END_OF_OPTIONAL);
+ if (any_added) {
+ msgb_put_u8(msg, SCCP_PNC_END_OF_OPTIONAL);
+ /* store relative pointer to start of optional part */
+ *ptr_opt = old_tail - ptr_opt;
+ } else {
+ /* If nothing was added, simply update the pointer to 0 to
signal the optional part is ommited. */
+ ptr_opt[0] = 0;
+ }
return 0;
}
diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c
index 6b4eef5..628d860 100644
--- a/tests/xua/xua_test.c
+++ b/tests/xua/xua_test.c
@@ -439,6 +439,10 @@
},
},
}, {
+ /* This case expectedly prints "Input != re-encoded output!"
because input has
+* (struct sccp_connection_confirm).optional_start=1 pointing
to SCCP_PNC_END_OF_OPTIONAL,
+* while our (re-)encoder uses optional_start=0 which means
entire msg is 1 byte
+* lower (hence better). Both are valid. */
.name = "BSSMAP-CC",
.sccp = PANDSIZ(bssmap_cc),
.sua = {
diff --git a/tests/xua/xua_test.ok b/tests/xua/xua_test.ok
index 6738cc0..cb6aab1 100644
--- a/tests/xua/xua_test.ok
+++ b/tests/xua/xua_test.ok
@@ -55,7 +55,8 @@
Transcoding message SCCP -> XUA
Decoded SUA: HDR=(CO:COAK,V=0,LEN=0), PART(T=Protocol Class,L=4,D=0002),
PART(T=Destination Reference,L=4,D=00010203), PART(T=Source
Reference,L=4,D=0003)
Re-Encoding decoded SUA to SCCP
-SCCP Output: [L2]> 02 01 02 03 00 00 03 02 01 00
+SCCP Output: [L2]> 02 01 02 03 00 00 03 02 00
+Input != re-encoded output!
=> BSSMAP-DTAP
SCCP Input: [L2]> 06 00 00 03 00 01 0f 01 00 0c 03 05 5c 08 11 81 33 66 02 13
45 f4
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34466?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I5c8fcb30b76ac7bafd4a99bc3004049644e7e3f9
Gerrit-Change-Number: 34466
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-trx[master]: ms: adjust ts advance
Hoernchen has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email )
Change subject: ms: adjust ts advance
..
ms: adjust ts advance
..and fix the delay warning.
I'd rather have a proper fn advance of 1, but that breaks gprs, but just
slightly increasing the ts number is sufficient to fix issues with late
tx bursts that then get silently dropped by the sdr.
The mobile app does not care, and will happily work even with fn+3.
Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
---
M Transceiver52M/ms/ms.cpp
M Transceiver52M/ms/ms_upper.cpp
2 files changed, 19 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp
index ca41144..b8710a6 100644
--- a/Transceiver52M/ms/ms.cpp
+++ b/Transceiver52M/ms/ms.cpp
@@ -130,7 +130,7 @@
tosend.decTN(-diff_tn);
// in theory fn equal and tn+3 equal is also a problem...
- if (diff_fn < 0 || (diff_fn == 0 && (now_time.TN() - target_tn < 1))) {
+ if (diff_fn < 0 || (diff_fn == 0 && (target_tn-now_time.TN() < 3))) {
std::cerr << "## TX too late?! fn DIFF:" << diff_fn << " tn
LOCAL: " << now_time.TN()
<< " tn OTHER: " << target_tn << std::endl;
return;
diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp
index 63c222f..db15226 100644
--- a/Transceiver52M/ms/ms_upper.cpp
+++ b/Transceiver52M/ms/ms_upper.cpp
@@ -258,6 +258,7 @@
trxcon_phyif_handle_burst_ind(g_trxcon, );
}
+ burstTime.incTN(2);
struct trxcon_phyif_rts_ind rts {
static_cast(burstTime.FN()),
static_cast(burstTime.TN())
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
Gerrit-Change-Number: 34462
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-bts[master]: osmo-bts-trx: fix trx_ctrl_read_cb(): do not send CMDs twice
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: osmo-bts-trx: fix trx_ctrl_read_cb(): do not send CMDs twice .. Patch Set 2: (1 comment) Patchset: PS2: > Any thoughts? Can we move this forward somehow? @pespin ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?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: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 16:40:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA
Attention is currently required from: arehbein, daniel, laforge, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA .. Patch Set 21: (1 comment) File examples/ipa-stream-client.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/b9c7ed08_9493a940 PS21, Line 119: sizeof(struct ipa_head) + sizeof(struct ipa_head_ext Just to confirm, this offset is no more needed? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?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: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 21 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 20 Sep 2023 16:39:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: xua_msg: Implement xua_msg_dump() using OSMO_STRBUF
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34463?usp=email ) Change subject: xua_msg: Implement xua_msg_dump() using OSMO_STRBUF .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34463?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3f91586a96df2d683865715dabb4d6bc042fb33f Gerrit-Change-Number: 34463 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 16:31:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: adjust ts advance
Attention is currently required from: Hoernchen, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email ) Change subject: ms: adjust ts advance .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4 Gerrit-Change-Number: 34462 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: Hoernchen Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 16:23:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: xua_msg: Implement xua_msg_dump() using OSMO_STRBUF
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34463?usp=email )
Change subject: xua_msg: Implement xua_msg_dump() using OSMO_STRBUF
..
xua_msg: Implement xua_msg_dump() using OSMO_STRBUF
This fixes a buffer overflow when a big message (eg containing long
unitada, LUDT) is passed.
Change-Id: I3f91586a96df2d683865715dabb4d6bc042fb33f
---
M src/xua_msg.c
1 file changed, 19 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/63/34463/1
diff --git a/src/xua_msg.c b/src/xua_msg.c
index 1df9abd..443b73e 100644
--- a/src/xua_msg.c
+++ b/src/xua_msg.c
@@ -511,37 +511,23 @@
return 1;
}
-static void append_to_buf(char *buf, bool *comma, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- if (!comma || *comma == true) {
- strcat(buf, ",");
- } else if (comma)
- *comma = true;
- vsprintf(buf+strlen(buf), fmt, ap);
- va_end(ap);
-}
-
char *xua_msg_dump(struct xua_msg *xua, const struct xua_dialect *dialect)
{
static char buf[1024];
+ struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) };
struct xua_msg_part *part;
const struct xua_msg_class *xmc = NULL;
- bool comma = false;
if (dialect)
xmc = dialect->class[xua->hdr.msg_class];
buf[0] = '\0';
- append_to_buf(buf, , "HDR=(%s,V=%u,LEN=%u)",
- xua_hdr_dump(xua, dialect),
- xua->hdr.version, xua->hdr.msg_length);
+ OSMO_STRBUF_PRINTF(sb, "HDR=(%s,V=%u,LEN=%u)", xua_hdr_dump(xua,
dialect),
+ xua->hdr.version, xua->hdr.msg_length);
llist_for_each_entry(part, >headers, entry)
- append_to_buf(buf, NULL, " PART(T=%s,L=%u,D=%s)",
- xua_class_iei_name(xmc, part->tag), part->len,
- osmo_hexdump_nospc(part->dat, part->len));
- return buf;
+ OSMO_STRBUF_PRINTF(sb, ", PART(T=%s,L=%u,D=%s)",
+ xua_class_iei_name(xmc, part->tag),
part->len,
+ osmo_hexdump_nospc(part->dat, part->len));
+ return sb.buf;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34463?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I3f91586a96df2d683865715dabb4d6bc042fb33f
Gerrit-Change-Number: 34463
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing
Attention is currently required from: falconia, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email ) Change subject: SMS over GSUP: implement vty config of SMSC routing .. Patch Set 2: (1 comment) File include/osmocom/hlr/hlr_sms.h: https://gerrit.osmocom.org/c/osmo-hlr/+/34448/comment/601e5b74_ccfc6959 PS2, Line 17: void smsc_del(struct hlr_smsc *smsc); > For me, 2) is optional here since it's not really related to the current > patchset at hand. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: falconia Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 20 Sep 2023 16:17:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: sccp2sua: constify params of sccp_ptr_part_consistent()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34461?usp=email )
Change subject: sccp2sua: constify params of sccp_ptr_part_consistent()
..
sccp2sua: constify params of sccp_ptr_part_consistent()
Change-Id: I8011e5cf26d535120829c3925693a2bb3efdb864
---
M src/sccp2sua.c
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index f18ebd7..59cb64b 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -431,9 +431,9 @@
* \param[in] msg Message containing SCCP address
* \param[in] ptr_addr pointer to byte with relative SCCP pointer
* \returns true if OK; false if message inconsistent */
-static bool sccp_ptr_part_consistent(struct msgb *msg, uint8_t *ptr_addr)
+static bool sccp_ptr_part_consistent(const struct msgb *msg, const uint8_t
*ptr_addr)
{
- uint8_t *ptr;
+ const uint8_t *ptr;
/* check the address of the relative pointer is within msg */
if (ptr_addr < msg->data || ptr_addr > msg->tail) {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34461?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I8011e5cf26d535120829c3925693a2bb3efdb864
Gerrit-Change-Number: 34461
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[master]: sccp2sua: constify params of sccp_ptr_part_consistent()
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34461?usp=email ) Change subject: sccp2sua: constify params of sccp_ptr_part_consistent() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34461?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8011e5cf26d535120829c3925693a2bb3efdb864 Gerrit-Change-Number: 34461 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 16:12:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: adjust ts advance
Attention is currently required from: Hoernchen, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email ) Change subject: ms: adjust ts advance .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4 Gerrit-Change-Number: 34462 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: Hoernchen Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 16:11:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsmtap.h: Add definitions for ISDN PPP sub-type
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34457?usp=email ) Change subject: gsmtap.h: Add definitions for ISDN PPP sub-type .. gsmtap.h: Add definitions for ISDN PPP sub-type This change adds a new sub-type for PPP in GSMTAP_TYPE_E1T1. Change-Id: I17137167b2c74b6c5e53459743b6e140fc1a4386 --- M include/osmocom/core/gsmtap.h 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index 2387b20..ebb5296 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -185,6 +185,7 @@ #define GSMTAP_E1T1_V120 0x08/* V.120 B-channel data */ #define GSMTAP_E1T1_V110 0x09/* V.110 B-channel data */ #define GSMTAP_E1T1_H221 0x0a/* H.221 B-channel data */ +#define GSMTAP_E1T1_PPP0x0b/* PPP */ /* flags for the ARFCN */ #define GSMTAP_ARFCN_F_PCS 0x8000 -- 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: 3 Gerrit-Owner: manawyrm Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged
[S] Change in libosmocore[master]: gsmtap.h: Add definitions for ISDN PPP sub-type
Attention is currently required from: manawyrm. laforge 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: Code-Review+2 -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: manawyrm Gerrit-Comment-Date: Wed, 20 Sep 2023 16:10:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: adjust ts advance
Attention is currently required from: pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email ) Change subject: ms: adjust ts advance .. Patch Set 1: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-trx/+/34462/comment/343d85ff_51c206e8 PS1, Line 15: The mobile app does not care, and will happily work even with fn+3. > you mean tn+3 here? no, actual frame advance, 3 frames in advance. Patchset: PS1: > So if I understand correctly this adds a let's say ~0. […] well this is my attempt to get your gprs side to give me tx bursts much earlier, because right now they arrive very late. 2ts advance just is a value that appears to "work", while 1fn breaks it. I need tx bursts as soon as possible, and I'm currently getting bursts 0 ts in advance, with only the rx/tx offset of 3ts so save me, and if those bursts are just slightly delayed it's too late. File Transceiver52M/ms/ms_upper.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/34462/comment/a3dfff55_0e1bc47b PS1, Line 261: burstTime.incTN(2); > just to make sure, incTN(2) on FN=X TN=7 ends up with FN=X+1 TN=1, right? yes, that is what the magic gsmtime class does. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4 Gerrit-Change-Number: 34462 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 14:16:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: adjust ts advance
Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email ) Change subject: ms: adjust ts advance .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4 Gerrit-Change-Number: 34462 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: Hoernchen Gerrit-Comment-Date: Wed, 20 Sep 2023 14:05:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: adjust ts advance
Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email ) Change subject: ms: adjust ts advance .. Patch Set 1: (1 comment) File Transceiver52M/ms/ms_upper.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/34462/comment/0928018f_c2f04310 PS1, Line 261: burstTime.incTN(2); just to make sure, incTN(2) on FN=X TN=7 ends up with FN=X+1 TN=1, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4 Gerrit-Change-Number: 34462 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: Hoernchen Gerrit-Comment-Date: Wed, 20 Sep 2023 14:05:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: adjust ts advance
Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email ) Change subject: ms: adjust ts advance .. Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-trx/+/34462/comment/cdbd0fd9_2e4a10fe PS1, Line 15: The mobile app does not care, and will happily work even with fn+3. you mean tn+3 here? Patchset: PS1: So if I understand correctly this adds a let's say ~0.5 fn-advance? aka advances 3 TN the uplink from the downlink? That may pose a problem if a TBF is changed from let's say TN7 to TN2, we may work incorrectly there due to 1 FN in upper layers, but I guess we can live with that for now. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4 Gerrit-Change-Number: 34462 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: Hoernchen Gerrit-Comment-Date: Wed, 20 Sep 2023 14:04:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: adjust ts advance
Hoernchen has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email )
Change subject: ms: adjust ts advance
..
ms: adjust ts advance
..and fix the delay warning.
I'd rather have a proper fn advance of 1, but that breaks gprs, but just
slightly increasing the ts number is sufficient to fix issues with late
tx bursts that then get silently dropped by the sdr.
The mobile app does not care, and will happily work even with fn+3.
Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
---
M Transceiver52M/ms/ms.cpp
M Transceiver52M/ms/ms_upper.cpp
2 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/34462/1
diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp
index ca41144..b8710a6 100644
--- a/Transceiver52M/ms/ms.cpp
+++ b/Transceiver52M/ms/ms.cpp
@@ -130,7 +130,7 @@
tosend.decTN(-diff_tn);
// in theory fn equal and tn+3 equal is also a problem...
- if (diff_fn < 0 || (diff_fn == 0 && (now_time.TN() - target_tn < 1))) {
+ if (diff_fn < 0 || (diff_fn == 0 && (target_tn-now_time.TN() < 3))) {
std::cerr << "## TX too late?! fn DIFF:" << diff_fn << " tn
LOCAL: " << now_time.TN()
<< " tn OTHER: " << target_tn << std::endl;
return;
diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp
index 63c222f..db15226 100644
--- a/Transceiver52M/ms/ms_upper.cpp
+++ b/Transceiver52M/ms/ms_upper.cpp
@@ -258,6 +258,7 @@
trxcon_phyif_handle_burst_ind(g_trxcon, );
}
+ burstTime.incTN(2);
struct trxcon_phyif_rts_ind rts {
static_cast(burstTime.FN()),
static_cast(burstTime.TN())
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34462?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I46b3ea6b0094026bd50709739df464438f9e54c4
Gerrit-Change-Number: 34462
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen
Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[master]: sccp2sua: constify params of sccp_ptr_part_consistent()
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34461?usp=email )
Change subject: sccp2sua: constify params of sccp_ptr_part_consistent()
..
sccp2sua: constify params of sccp_ptr_part_consistent()
Change-Id: I8011e5cf26d535120829c3925693a2bb3efdb864
---
M src/sccp2sua.c
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/61/34461/1
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index f18ebd7..59cb64b 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -431,9 +431,9 @@
* \param[in] msg Message containing SCCP address
* \param[in] ptr_addr pointer to byte with relative SCCP pointer
* \returns true if OK; false if message inconsistent */
-static bool sccp_ptr_part_consistent(struct msgb *msg, uint8_t *ptr_addr)
+static bool sccp_ptr_part_consistent(const struct msgb *msg, const uint8_t
*ptr_addr)
{
- uint8_t *ptr;
+ const uint8_t *ptr;
/* check the address of the relative pointer is within msg */
if (ptr_addr < msg->data || ptr_addr > msg->tail) {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34461?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I8011e5cf26d535120829c3925693a2bb3efdb864
Gerrit-Change-Number: 34461
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-hnbgw[master]: hnbgw_cn: Remove assert hit due to wrong assumption
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email ) Change subject: hnbgw_cn: Remove assert hit due to wrong assumption .. hnbgw_cn: Remove assert hit due to wrong assumption The HNBGW in correctly assumes that no ss7->sccp instance is allocated until the same function calls osmo_sccp_simple_client_on_ss7_id(). This assumption is wrong, since ss7 may create its own ss7->sccp instance internally as a result of vty configuration, eg. when "sccp max-optional-data 124" is placed in osmo-hnbgw.cfg file. In this scenario, simply removing the assert is enough, since osmo_sccp_simple_client_on_ss7_id() just calls osmo_ss7_ensure_sccp(), the same that the libmoso-sccp code called to allocate the pointer. Related: SYS#6566 Fixes: f3caea850bc892551cd09bbaf49f798c172590c4 Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 22 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified pespin: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index b95cf28..31bf192 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -849,11 +849,7 @@ return 0; } /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no SCCP instance yet\n", ss7->cfg.id); - - /* All SCCP instances should originate from this function. So if there is no hnbgw_sccp_user for the cs7 -* instance, then the cs7 instance should not have an SCCP instance yet. */ - OSMO_ASSERT(!ss7->sccp); + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", ss7->cfg.id); } /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: ansible/util/known_hosts: new file
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34460?usp=email ) Change subject: ansible/util/known_hosts: new file .. ansible/util/known_hosts: new file Add the known hosts file that ansible creates. Change-Id: Ibef171ac2de5193c2335d4d28ef9347cc88b4c49 --- A ansible/util/known_hosts 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/ansible/util/known_hosts b/ansible/util/known_hosts new file mode 100644 index 000..01e9baa --- /dev/null +++ b/ansible/util/known_hosts @@ -0,0 +1,4 @@ +2a01:4f8:10b:2ad9::1:10 ssh-ed25519 C3NzaC1lZDI1NTE5IHtUqYQ2qE2w2et8frRXfauWiocse2sdqRLo1gksFaSS +2a01:4f8:10b:2ad9::1:13 ssh-ed25519 C3NzaC1lZDI1NTE5IEfg7NNBKjVJGoL3oUDrJCccI2D8podsSPKnRn1aTUge +2a01:4f8:212:3762::1:3 ssh-ed25519 C3NzaC1lZDI1NTE5ICl7tuOgN64+iYuYCtfCKaUbN9IWzKycpKVRgzsjVCPY +2a01:4f8:120:8470::1:4 ssh-ed25519 C3NzaC1lZDI1NTE5IIPKRz2Eg+h6RTREn52n/ip3pzUjRu9pw1XdjWUrvvi/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibef171ac2de5193c2335d4d28ef9347cc88b4c49 Gerrit-Change-Number: 34460 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: ansible: increase docker_max_image_space
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34459?usp=email ) Change subject: ansible: increase docker_max_image_space .. ansible: increase docker_max_image_space The purpose of the limit is to remove images that are not being used in a long time. With the current limit of 40 GB it leads to images being removed just a few hours after they were last used, resulting in lots of needless rebuilds. Also unexpected errors with images that we just assume to be there (debian-bookworm-build). Increases the limit for the nodes that run most of the jobs to 80 GB. I have verified that the nodes have enough free space. Related: OS#6183 Change-Id: I8cfb21a86510e43b8347c7f17159575b695ce9ba --- M ansible/hosts 1 file changed, 24 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/ansible/hosts b/ansible/hosts index b62ef82..538b10f 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -7,10 +7,10 @@ build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 [jenkins_slaves] -build2-deb10build-ansible ansible_host=2a01:4f8:10b:2ad9::1:10 osmocom_jenkins_slave_fstrim=True -build2-deb11build-ansible ansible_host=2a01:4f8:10b:2ad9::1:13 osmocom_jenkins_slave_fstrim=True -build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 osmocom_jenkins_slave_fstrim=True -host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True +build2-deb10build-ansible ansible_host=2a01:4f8:10b:2ad9::1:10 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" +build2-deb11build-ansible ansible_host=2a01:4f8:10b:2ad9::1:13 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" +build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" +host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" gtp0-deb10build ansible_host=10.34.2.101 osmocom_jenkins_slave_fstrim=True gtp0-deb11build ansible_host=10.34.2.106 osmocom_jenkins_slave_fstrim=True rpi4-raspbian11build-ansible-1 ansible_host=10.9.25.50 docker_max_image_space="20 GB" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34459?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8cfb21a86510e43b8347c7f17159575b695ce9ba Gerrit-Change-Number: 34459 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-hnbgw[master]: hnbgw_cn: Remove assert hit due to wrong assumption
Attention is currently required from: laforge, neels, pespin. osmith 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: Code-Review+2 -- 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 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 12:21:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
Attention is currently required from: fixeria, jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email ) Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active .. Patch Set 2: Code-Review+1 (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/34423/comment/cdd15ca1_9cabcd8f PS2, Line 1817: /* Do not forward any message from the MS to LAPD while the uplink is not > This "MS to LAPD" direction description is not really clear to me. […] I don't really see the problem here. It might be worth adding "uplink" to clarify - but the BTS for sure is receiving frames from the MS and passes them to LAPD, there's nothing ambiguous about it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?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: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34423 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 20 Sep 2023 12:01:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MO SMS
Attention is currently required from: falconia, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email ) Change subject: SMS over GSUP: implement forwarding of MO SMS .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 Gerrit-Change-Number: 34449 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 20 Sep 2023 11:26:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing
Attention is currently required from: falconia, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email ) Change subject: SMS over GSUP: implement vty config of SMSC routing .. Patch Set 2: (1 comment) File include/osmocom/hlr/hlr_sms.h: https://gerrit.osmocom.org/c/osmo-hlr/+/34448/comment/d1f1d868_a06df5b1 PS2, Line 17: void smsc_del(struct hlr_smsc *smsc); > @laforge says that alloc+del is inconsistent, instead it should be either > alloc+free or add+del - an […] For me, 2) is optional here since it's not really related to the current patchset at hand. Of course I'm happy if you want to do it too. IMHO the only thing you need to do is s/smsc_del/smsc_free/. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: falconia Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 20 Sep 2023 11:25:32 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: ansible/util/known_hosts: new file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34460?usp=email ) Change subject: ansible/util/known_hosts: new file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibef171ac2de5193c2335d4d28ef9347cc88b4c49 Gerrit-Change-Number: 34460 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 20 Sep 2023 11:22:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: ansible: increase docker_max_image_space
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34459?usp=email ) Change subject: ansible: increase docker_max_image_space .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34459?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8cfb21a86510e43b8347c7f17159575b695ce9ba Gerrit-Change-Number: 34459 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 20 Sep 2023 11:22:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: Include constants for cross component defaults (NSE timing)
arehbein has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31881?usp=email ) Change subject: Include constants for cross component defaults (NSE timing) .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31881?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: I2c384995d1b879254826d24513ab73d74dc8c2cc Gerrit-Change-Number: 31881 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in osmo-bsc[master]: Include constants for cross component defaults (RLC)
arehbein has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31879?usp=email ) Change subject: Include constants for cross component defaults (RLC) .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31879?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: I08322563aa508e2fc6c8af9d1997b68a998aaaca Gerrit-Change-Number: 31879 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[M] Change in osmo-bsc[master]: Includes: Remove enum/include from libosmocore instead
arehbein has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31304?usp=email ) Change subject: Includes: Remove enum/include from libosmocore instead .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31304?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: I2883aee12b501a717d5acecd5638882724336e72 Gerrit-Change-Number: 31304 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon
[S] Change in osmo-ci[master]: ansible/util/known_hosts: new file
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34460?usp=email ) Change subject: ansible/util/known_hosts: new file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibef171ac2de5193c2335d4d28ef9347cc88b4c49 Gerrit-Change-Number: 34460 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 20 Sep 2023 09:23:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: ansible: increase docker_max_image_space
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34459?usp=email ) Change subject: ansible: increase docker_max_image_space .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34459?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8cfb21a86510e43b8347c7f17159575b695ce9ba Gerrit-Change-Number: 34459 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 20 Sep 2023 09:23:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: ansible: increase docker_max_image_space
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34459?usp=email ) Change subject: ansible: increase docker_max_image_space .. ansible: increase docker_max_image_space The purpose of the limit is to remove images that are not being used in a long time. With the current limit of 40 GB it leads to images being removed just a few hours after they were last used, resulting in lots of needless rebuilds. Also unexpected errors with images that we just assume to be there (debian-bookworm-build). Increases the limit for the nodes that run most of the jobs to 80 GB. I have verified that the nodes have enough free space. Related: OS#6183 Change-Id: I8cfb21a86510e43b8347c7f17159575b695ce9ba --- M ansible/hosts 1 file changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/59/34459/1 diff --git a/ansible/hosts b/ansible/hosts index b62ef82..538b10f 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -7,10 +7,10 @@ build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 [jenkins_slaves] -build2-deb10build-ansible ansible_host=2a01:4f8:10b:2ad9::1:10 osmocom_jenkins_slave_fstrim=True -build2-deb11build-ansible ansible_host=2a01:4f8:10b:2ad9::1:13 osmocom_jenkins_slave_fstrim=True -build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 osmocom_jenkins_slave_fstrim=True -host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True +build2-deb10build-ansible ansible_host=2a01:4f8:10b:2ad9::1:10 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" +build2-deb11build-ansible ansible_host=2a01:4f8:10b:2ad9::1:13 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" +build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" +host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" gtp0-deb10build ansible_host=10.34.2.101 osmocom_jenkins_slave_fstrim=True gtp0-deb11build ansible_host=10.34.2.106 osmocom_jenkins_slave_fstrim=True rpi4-raspbian11build-ansible-1 ansible_host=10.9.25.50 docker_max_image_space="20 GB" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34459?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8cfb21a86510e43b8347c7f17159575b695ce9ba Gerrit-Change-Number: 34459 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: ansible/util/known_hosts: new file
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34460?usp=email ) Change subject: ansible/util/known_hosts: new file .. ansible/util/known_hosts: new file Add the known hosts file that ansible creates. Change-Id: Ibef171ac2de5193c2335d4d28ef9347cc88b4c49 --- A ansible/util/known_hosts 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/60/34460/1 diff --git a/ansible/util/known_hosts b/ansible/util/known_hosts new file mode 100644 index 000..01e9baa --- /dev/null +++ b/ansible/util/known_hosts @@ -0,0 +1,4 @@ +2a01:4f8:10b:2ad9::1:10 ssh-ed25519 C3NzaC1lZDI1NTE5IHtUqYQ2qE2w2et8frRXfauWiocse2sdqRLo1gksFaSS +2a01:4f8:10b:2ad9::1:13 ssh-ed25519 C3NzaC1lZDI1NTE5IEfg7NNBKjVJGoL3oUDrJCccI2D8podsSPKnRn1aTUge +2a01:4f8:212:3762::1:3 ssh-ed25519 C3NzaC1lZDI1NTE5ICl7tuOgN64+iYuYCtfCKaUbN9IWzKycpKVRgzsjVCPY +2a01:4f8:120:8470::1:4 ssh-ed25519 C3NzaC1lZDI1NTE5IIPKRz2Eg+h6RTREn52n/ip3pzUjRu9pw1XdjWUrvvi/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibef171ac2de5193c2335d4d28ef9347cc88b4c49 Gerrit-Change-Number: 34460 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
