Attention is currently required from: fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34240 )
Change subject: pcu_sock: print SAPI and msg_id when sending confirmation
......................................................................
Patch Set 1:
(1 comment)
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/34240/comment/76729b33_8bd1dce6
PS1, Line 631: confirmation
> `Sending DATA.cnf` or `Sending data confirmation` would be more informative, IMO. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34240
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602
Gerrit-Change-Number: 34240
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 09:04:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 )
Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
......................................................................
Patch Set 5:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/54c1e438_4bf7177b
PS4, Line 14: CAUTION: This patch breaks compatibility to current master osmo-pcu (See
: also "Depends")
> Normally such breaking changes should be accompanied with the protocol version bump. […]
We still have the option to bump the version number in this patch and then in the future apply the policy that the version number must be bumped as soon as a detail in PCUIF changes.
What do you think? Shall we bump the version to v.12 here now (osmo-ttcn3-hacks would require a follow up patch)
File src/common/bts.c:
https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/dc7e0a13_2a8ec34f
PS4, Line 733: struct bts_agch_msg_cb *msg_cb
> const
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10
Gerrit-Change-Number: 34059
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 09:03:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/34059
to look at the new patch set (#5).
Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
......................................................................
pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI
to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. In
both cases we send a confirmation back to the PCU. For details see
coresponding patch in osmo-pcu.git (see Depends)
CAUTION: This patch breaks compatibility to current master osmo-pcu (See
also "Depends")
Related: OS#5927
Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292
Depends: osmo-ttcn3-hacks.git Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458
Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10
---
M include/osmo-bts/bts.h
M include/osmo-bts/pcu_if.h
M include/osmo-bts/pcuif_proto.h
M src/common/bts.c
M src/common/paging.c
M src/common/pcu_sock.c
6 files changed, 67 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/59/34059/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10
Gerrit-Change-Number: 34059
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: dexter.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/34240
to look at the new patch set (#2).
Change subject: pcu_sock: print SAPI and msg_id when sending confirmation
......................................................................
pcu_sock: print SAPI and msg_id when sending confirmation
At the moment we do not print the SAPI, nor the msg_id when we send a
confirmation back to the PCU
Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602
elated: OS#5927
---
M src/common/pcu_sock.c
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/34240/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34240
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602
Gerrit-Change-Number: 34240
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria, pespin.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 )
Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
......................................................................
Patch Set 6:
(4 comments)
File src/osmo-bsc/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/b60a5f50_32e3754c
PS5, Line 445: confirmation
> Same as in the related osmo-bts patch: "Sending confirmation" may be confusing, let's make this clea […]
Done
https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/87ea5cc7_d16ba010
PS5, Line 533: struct gsm_pcu_if_agch *agch;
> const
Done
https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/9c80cd95_6371c55a
PS5, Line 551: rc = -EIO;
> So if `agch->confirm == true`, but `rsl_imm_assign_cmd()` fails, we still send the confirmation. […]
That is indeed wrong. Thanks.
https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/7e6b1cb0_4c4c6407
PS5, Line 555: gsm48_imm_ass = (struct gsm48_imm_ass *)agch->data;
> You're setting this pointer, but not using it within this `case`.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c
Gerrit-Change-Number: 34060
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 09:03:32 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria, pespin.
Hello osmith, Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/34060
to look at the new patch set (#6).
Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
......................................................................
pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI
to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. One
new feature of PCU_IF_SAPI_AGCH_2 is that the PCU may ask to send a
confirmation when the MAC block is sent.
CAUTION: This patch breaks compatibility to current master osmo-pcu (See
also "Depends")
Related: OS#5927
Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292
Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c
---
M include/osmocom/bsc/pcu_if.h
M include/osmocom/bsc/pcuif_proto.h
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/pcu_sock.c
4 files changed, 60 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34060/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c
Gerrit-Change-Number: 34060
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 )
Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch
......................................................................
Patch Set 6:
(1 comment)
File src/osmo-bsc/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/a8677961_26103618
PS1, Line 552: if (pch->confirmed_imm_ass)
> One can already see the consequences of making breaking changes "on the go" without bumping the prot […]
I take your criticism seriously. So the take-away here is that I should have bumped the version number in each patch that changes a detail of the PCUIF.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0
Gerrit-Change-Number: 34192
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 08:44:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 )
Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch
......................................................................
pcuif_proto: check confirm flag in struct gsm_pcu_if_pch
Since osmo-bsc uses RSL (with a propritary Ericsson RBS specific
extension) to send a confirmed IMMEDIATE ASSIGNMENT messages via
PCH, we can not just forward the MAC blocks into the paging queue
without determining whether the MAC block is a PAGING message or an
IMMEDIATE ASSIGNMENT message. the reason for this is that RSL uses
two different message types (IMMEDIATE ASSIGNMENT COMMAND and PAGING
COMMAND) to process IMMEDIATE ASSIGNMENT and PAGING messages.
This means we have to look into the MAC block to make sure whether
the message is a PAGING message or an IMMEDIATE ASSIGNMENT message.
We also need to make sure that the confirm flag is properly executed.
In the case of the IMMEDIATE ASSIGNMENT this means we have to include
(confirm=true) or not include (confirm=false) the RSL_IE_ERIC_MOBILE_ID
into the IMMEDIATE ASSIGNMENT COMMAND message.
In the case of PAGING we directly echo a confirmation after sending
the PAGING COMMAND via RSL when a confirmation is requested.
Related: OS#5927
Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04
Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0
---
M include/osmocom/bsc/abis_rsl.h
M include/osmocom/bsc/pcuif_proto.h
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/pcu_sock.c
4 files changed, 50 insertions(+), 9 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h
index a6b2cef..023793a 100644
--- a/include/osmocom/bsc/abis_rsl.h
+++ b/include/osmocom/bsc/abis_rsl.h
@@ -68,7 +68,7 @@
/* Ericcson vendor specific RSL extensions */
int rsl_ericsson_imm_assign_cmd(const struct gsm_bts *bts, uint32_t msg_id, uint8_t len,
- const uint8_t *val, uint8_t pag_grp);
+ const uint8_t *val, uint8_t pag_grp, bool confirm);
/* Siemens vendor-specific RSL extensions */
int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci);
diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h
index bf49b06..aa22447 100644
--- a/include/osmocom/bsc/pcuif_proto.h
+++ b/include/osmocom/bsc/pcuif_proto.h
@@ -271,6 +271,9 @@
char imsi[OSMO_IMSI_BUF_SIZE];
/* GSM mac-block (with immediate assignment message) */
uint8_t data[GSM_MACBLOCK_LEN];
+ /* Set to true in case the receiving end must send a confirmation
+ * when the MAC block (data) has been sent. */
+ bool confirm;
} __attribute__((packed));
struct gsm_pcu_if {
diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index 5440a23..76948c9 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -996,7 +996,7 @@
/* Chapter 8.5.6 Immediate Assignment Command (with Ericcson vendor specific RSL extension) */
int rsl_ericsson_imm_assign_cmd(const struct gsm_bts *bts, uint32_t msg_id, uint8_t len,
- const uint8_t *val, uint8_t pag_grp)
+ const uint8_t *val, uint8_t pag_grp, bool confirm)
{
struct msgb *msg = rsl_imm_assign_cmd_common(bts, len, val);
if (!msg)
@@ -1008,8 +1008,10 @@
/* ericsson can handle a reference at the end of the message which is used in
* the confirm message. The confirm message is only sent if the trailer is present */
- msgb_put_u8(msg, RSL_IE_ERIC_MOBILE_ID);
- msgb_put_u32(msg, msg_id);
+ if (confirm) {
+ msgb_put_u8(msg, RSL_IE_ERIC_MOBILE_ID);
+ msgb_put_u32(msg, msg_id);
+ }
return abis_rsl_sendmsg(msg);
}
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index 6f48f0f..696d5f3 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -506,7 +506,7 @@
}
static int pcu_rx_rr_imm_ass_pch(struct gsm_bts *bts, uint8_t paging_group,
- const struct gsm_pcu_if_pch *pch)
+ const struct gsm_pcu_if_pch *pch, bool confirm)
{
LOG_BTS(bts, DPCU, LOGL_DEBUG, "PCU Sends immediate assignment via PCH (msg_id=0x%08x, IMSI=%s, Paging group=0x%02x)\n",
pch->msg_id, pch->imsi, paging_group);
@@ -516,7 +516,8 @@
* of the RSL specs. This means that each BTS vendor has to come up with a proprietary method. At
* the moment we only support Ericsson RBS here. */
if (is_ericsson_bts(bts))
- return rsl_ericsson_imm_assign_cmd(bts, pch->msg_id, sizeof(pch->data), pch->data, paging_group);
+ return rsl_ericsson_imm_assign_cmd(bts, pch->msg_id, sizeof(pch->data), pch->data, paging_group,
+ confirm);
LOG_BTS(bts, DPCU, LOGL_ERROR, "BTS model does not support sending immediate assignment via PCH!\n");
return -ENOTSUP;
@@ -549,11 +550,16 @@
pch = (struct gsm_pcu_if_pch *)data_req->data;
pag_grp = gsm0502_calc_paging_group(&bts->si_common.chan_desc, str_to_imsi(pch->imsi));
-
gsm48_imm_ass = (struct gsm48_imm_ass *)pch->data;
+
if (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS)
- return pcu_rx_rr_imm_ass_pch(bts, pag_grp, pch);
- return pcu_rx_rr_paging_pch(bts, pag_grp, pch);
+ return pcu_rx_rr_imm_ass_pch(bts, pag_grp, pch, pch->confirm);
+
+ if (pcu_rx_rr_paging_pch(bts, pag_grp, pch))
+ return -EIO;
+ if (pch->confirm)
+ return pcu_tx_pch_confirm(bts, pch->msg_id);
+ break;
default:
LOG_BTS(bts, DPCU, LOGL_ERROR, "Received PCU data request with "
"unsupported sapi %d\n", data_req->sapi);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0
Gerrit-Change-Number: 34192
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34191 )
Change subject: pcuif_proto: use confirm flag in struct gsm_pcu_if_pch
......................................................................
pcuif_proto: use confirm flag in struct gsm_pcu_if_pch
The PCU now sets a confirm flag in struct gsm_pcu_if_pch in case the MAC
block (data) requires a confirmation when sent. Use this confirm flag
instead of making the decision locally based on the MAC block contents.
Related: OS#5927
Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04
Change-Id: I3364d2268bdef9c4d2feeb8e3d51a64e34bca68c
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 19 insertions(+), 5 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index d584ba4..498d9d4 100644
--- a/include/osmo-bts/pcuif_proto.h
+++ b/include/osmo-bts/pcuif_proto.h
@@ -230,6 +230,9 @@
char imsi[OSMO_IMSI_BUF_SIZE];
/* GSM mac-block (with immediate assignment message) */
uint8_t data[GSM_MACBLOCK_LEN];
+ /* Set to true in case the receiving end must send a confirmation
+ * when the MAC block (data) has been sent. */
+ bool confirm;
} __attribute__((packed));
struct gsm_pcu_if {
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 2431e85..333937a 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -676,8 +676,6 @@
case PCU_IF_SAPI_PCH_2:
{
const struct gsm_pcu_if_pch *gsm_pcu_if_pch;
- const struct gsm48_imm_ass *gsm48_imm_ass;
- bool confirm;
if (OSMO_UNLIKELY(data_req->len != sizeof(*gsm_pcu_if_pch))) {
LOGP(DPCU, LOGL_ERROR, "Rx malformed DATA.req for PCH\n");
@@ -686,10 +684,8 @@
}
gsm_pcu_if_pch = (struct gsm_pcu_if_pch *)data_req->data;
- gsm48_imm_ass = (struct gsm48_imm_ass *)gsm_pcu_if_pch->data;
- confirm = (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS);
rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch->msg_id,
- gsm_pcu_if_pch->imsi, confirm, gsm_pcu_if_pch->data);
+ gsm_pcu_if_pch->imsi, gsm_pcu_if_pch->confirm, gsm_pcu_if_pch->data);
break;
}
case PCU_IF_SAPI_AGCH:
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34191
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I3364d2268bdef9c4d2feeb8e3d51a64e34bca68c
Gerrit-Change-Number: 34191
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34190 )
Change subject: pcuif_proto: add confirm flag to struct gsm_pcu_if_pch
......................................................................
pcuif_proto: add confirm flag to struct gsm_pcu_if_pch
At the moment we let OsmoBTS (or OsmoBSC) look into the MAC block we
send and in case it is an IMMEDIATE ASSIGNMENT message, a confirmation
would be sent back. Unfortunately, this method is not very practical,
lets add a flag to struct gsm_pcu_if_pch to tell the receiving end that
the MAC block (data) needs to be confirmed when it is sent.
Related: OS#5927
Change-Id: Ia202862aafc1f0cb6601574ef61eb9155de11f04
---
M include/osmocom/pcu/pcuif_proto.h
M src/bts.cpp
M src/gprs_rlcmac.c
M src/pcu_l1_if.cpp
M src/pcu_l1_if.h
5 files changed, 26 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h
index bf49b06..aa22447 100644
--- a/include/osmocom/pcu/pcuif_proto.h
+++ b/include/osmocom/pcu/pcuif_proto.h
@@ -271,6 +271,9 @@
char imsi[OSMO_IMSI_BUF_SIZE];
/* GSM mac-block (with immediate assignment message) */
uint8_t data[GSM_MACBLOCK_LEN];
+ /* Set to true in case the receiving end must send a confirmation
+ * when the MAC block (data) has been sent. */
+ bool confirm;
} __attribute__((packed));
struct gsm_pcu_if {
diff --git a/src/bts.cpp b/src/bts.cpp
index 497c2ce..5c483d5 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -1129,7 +1129,7 @@
if (plen >= 0) {
bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_DL_TBF);
if (the_pcu->pcu_if_version >= 0x0b)
- pcu_l1if_tx_pch2(bts, immediate_assignment, plen, tbf->imsi(), tbf->tlli());
+ pcu_l1if_tx_pch2(bts, immediate_assignment, plen, true, tbf->imsi(), tbf->tlli());
else
pcu_l1if_tx_pch(bts, immediate_assignment, plen, tbf->imsi());
}
diff --git a/src/gprs_rlcmac.c b/src/gprs_rlcmac.c
index 40fdfaf..d15445e 100644
--- a/src/gprs_rlcmac.c
+++ b/src/gprs_rlcmac.c
@@ -45,7 +45,7 @@
bts_do_rate_ctr_inc(bts, CTR_PCH_REQUESTS);
if (the_pcu->pcu_if_version >= 0x0b)
- pcu_l1if_tx_pch2(bts, paging_request, plen, imsi, GSM_RESERVED_TMSI);
+ pcu_l1if_tx_pch2(bts, paging_request, plen, false, imsi, GSM_RESERVED_TMSI);
else
pcu_l1if_tx_pch(bts, paging_request, plen, imsi);
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 654063e..f92f08e 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -300,7 +300,8 @@
/* Send a MAC block via the paging channel. This will (obviously) only work for MAC blocks that contain an
* IMMEDIATE ASSIGNMENT or a PAGING COMMAND message. In case the MAC block contains an IMMEDIATE ASSIGNMENT
* message, the receiving end is required to confirm when the IMMEDIATE ASSIGNMENT has been sent. */
-void pcu_l1if_tx_pch2(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id)
+void pcu_l1if_tx_pch2(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, bool confirm,
+ const char *imsi, uint32_t msg_id)
{
struct gsm_pcu_if_pch pch = { 0 };
@@ -312,6 +313,7 @@
* (TS 45.002 6.5.3, 6.5.6).
*/
+ pch.confirm = confirm;
pch.data[0] = (plen << 2) | 0x01;
bitvec_pack(block, pch.data + 1);
diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h
index 19ec60a..138636d 100644
--- a/src/pcu_l1_if.h
+++ b/src/pcu_l1_if.h
@@ -156,8 +156,8 @@
int pcu_tx_neigh_addr_res_req(struct gprs_rlcmac_bts *bts, const struct neigh_cache_entry_key *neigh_key);
void pcu_l1if_tx_pch(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi);
-void pcu_l1if_tx_pch2(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id);
-
+void pcu_l1if_tx_pch2(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, bool confirm,
+ const char *imsi, uint32_t msg_id);
int pcu_rx(struct gsm_pcu_if *pcu_prim, size_t pcu_prim_length);
int pcu_l1if_open(void);
void pcu_l1if_close(void);
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34190
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ia202862aafc1f0cb6601574ef61eb9155de11f04
Gerrit-Change-Number: 34190
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255 )
Change subject: dia2gsup: Introduce new error scenario tests
......................................................................
Patch Set 1:
(1 comment)
File dia2gsup/DIA2GSUP_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255/comment/7feb8b8d_b621…
PS1, Line 345: TC_authinfo_gsup_err_imsi_unknown
> It depends on the angle you look at it. […]
Given that what this app does is basically translating stuff, I think it makes sense to check specifically different values/cases independently to make sure the translation is fine.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255
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: Ic870a2c1de74bee3f7d8e26874635d58469ccbea
Gerrit-Change-Number: 34255
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 08:27:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255 )
Change subject: dia2gsup: Introduce new error scenario tests
......................................................................
Patch Set 1:
(1 comment)
File dia2gsup/DIA2GSUP_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255/comment/30921ca3_74a0…
PS1, Line 345: TC_authinfo_gsup_err_imsi_unknown
> Because it's not the same scenario. […]
It depends on the angle you look at it. All these new testcases verify the scenario of getting `GSUP_SAI_ERR` in response to `GSUP_SAI_REQ` and expect a specific cause in the `DIA_AIA_ERR`. The only variable part here is the GSUP/DIAMETER case values. It's not like you're sending different messages not sending them conditionally...
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255
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: Ic870a2c1de74bee3f7d8e26874635d58469ccbea
Gerrit-Change-Number: 34255
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 08:12:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 )
Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11
......................................................................
Patch Set 5:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/0f2912fd_57cc58d7
PS4, Line 9: an
> a
Done
File src/pcu_l1_if.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/45aa76ea_6428d403
PS4, Line 269: In case the MAC block contains an IMMEDIATE ASSIGNMENT message
> This shall always be the case for AGCH, no other [than IMM ASS] messages can ever be sent on it. […]
This is indeed weird, I fixed this.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292
Gerrit-Change-Number: 34058
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 08:06:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hello osmith, Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcu/+/34058
to look at the new patch set (#5).
Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11
......................................................................
pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11
When a downlink IMMEDIATE ASSIGNMENT message is sent through the PCH,
an IMSI is always required in order to be able to calculate the paging
group. However, when the downlink IMMEDIATE ASSIGNMENT has to be sent
before the MS has completed the GMM ATTACH REQUEST, the IMSI is still
unknown. In this case we may assume that the MS is still in non-DRX
mode, which means it listens on all CCCH blocks (PCH and AGCH).
This means we may send the IMMEDIATE ASSIGNMENT through the AGCH in this
situation. This will also have the advantage that the scheduling through
the AGCH will have less latency than the paging queue.
Unfortunately the SAPI PCU_IF_SAPI_AGCH only supports sending whole MAC
blocks, so it won't be possible to attach a TLLI that can be used for
confirmation. To fix this, let's add a new SAPI_PCUI_IF_AGCH_2, that
works similar as SAPI PCU_IF_SAPI_PCH_2 and use it to send the
IMMEDIATE ASSIGNMENT through the AGCH.
CAUTION: This patch breaks compatibility with current master osmo-bts
and osmo-bsc (see "Depends")
Related: OS#5927
Depends: osmo-bts.git I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10
Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292
---
M include/osmocom/pcu/pcuif_proto.h
M src/bts.cpp
M src/pcu_l1_if.cpp
M src/pcu_l1_if.h
4 files changed, 98 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/34058/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292
Gerrit-Change-Number: 34058
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255 )
Change subject: dia2gsup: Introduce new error scenario tests
......................................................................
Patch Set 1:
(1 comment)
File dia2gsup/DIA2GSUP_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255/comment/52a388de_2a9b…
PS1, Line 345: TC_authinfo_gsup_err_imsi_unknown
> Having separate testcases (and even separate implementations) for testing the same scenario looks re […]
Because it's not the same scenario. If they were, the same error cause would be returned, they all would have the same test name and I wouldn't have catch that different errors are not translated properly.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255
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: Ic870a2c1de74bee3f7d8e26874635d58469ccbea
Gerrit-Change-Number: 34255
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 08:04:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith, laforge, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34155 )
Change subject: sim-reset-server: fix error printing sw_match_error
......................................................................
Patch Set 2: Code-Review-2
(1 comment)
File contrib/sim-rest-server.py:
https://gerrit.osmocom.org/c/pysim/+/34155/comment/bcf52a25_e516301b
PS2, Line 104: ), sw)
We actually have a syntax issue here:
```
return str(ApiError("Card Communication Error %s" % failure.value), sw)
```
note that `sw` is actually passed as an argument to `str()`, while it should be passed to the constructor of the `ApiError`! The `str()` function does not concatenate its arguments unlike `print()`, the second argument is actually the `encoding`. With this additional argument `str()` tries to *decode* its first argument instead if calling the `__str__`.
@dexter: can you try applying this patch? I believe it should fix the problem:
```
return str(ApiError("Card Communication Error %s" % failure.value), sw)
return str(ApiError("Card Communication Error %s" % failure.value, sw))
```
You're actually fixing this in the patch, but I suggest to keep the `failure.value`.
I can even reproduce the error mentioned above (similar to yours):
```
>>> e = SwMatchError('feed', '9000')
>>> "Card Communication Error %s" % e
'Card Communication Error SW match failed! Expected 9000 and got feed.'
>>> str(e)
'SW match failed! Expected 9000 and got feed.'
>>> str(e, 'feed')
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
TypeError: decoding to str: need a bytes-like object, SwMatchError found
```
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34155
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I5a1d19abeb00c2c9dc26517abc44a5c916f2d658
Gerrit-Change-Number: 34155
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 23:39:41 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255 )
Change subject: dia2gsup: Introduce new error scenario tests
......................................................................
Patch Set 1:
(1 comment)
File dia2gsup/DIA2GSUP_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255/comment/32d461d9_ffa6…
PS1, Line 345: TC_authinfo_gsup_err_imsi_unknown
Having separate testcases (and even separate implementations) for testing the same scenario looks redundant to me. Why not testing them all in one testcase? The cause values can be passed via `D2G_ConnHdlrPars`.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255
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: Ic870a2c1de74bee3f7d8e26874635d58469ccbea
Gerrit-Change-Number: 34255
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 23:07:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: pespin, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 )
Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
......................................................................
Patch Set 5: Code-Review-1
(4 comments)
File src/osmo-bsc/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/70221348_392c3cd9
PS5, Line 445: confirmation
Same as in the related osmo-bts patch: "Sending confirmation" may be confusing, let's make this cleaner by saying "Sending DATA.cnf" or "Sending data confirmation".
https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/8854a18c_2a8ff1d0
PS5, Line 533: struct gsm_pcu_if_agch *agch;
const
https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/5e4d6202_3507948f
PS5, Line 551: rc = -EIO;
So if `agch->confirm == true`, but `rsl_imm_assign_cmd()` fails, we still send the confirmation. This looks wrong to me. Am I missing something?
https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/244a48d5_1814d863
PS5, Line 555: gsm48_imm_ass = (struct gsm48_imm_ass *)agch->data;
You're setting this pointer, but not using it within this `case`.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c
Gerrit-Change-Number: 34060
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 22:51:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, pespin, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 )
Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch
......................................................................
Patch Set 5: Code-Review+2
(1 comment)
File src/osmo-bsc/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/24b27257_6553e915
PS1, Line 552: if (pch->confirmed_imm_ass)
> I disagree with this. […]
One can already see the consequences of making breaking changes "on the go" without bumping the protocol version: some testcases in ttcn3-bts-test started to fail because the testsuite is recent enough and including the `confirm` field, while current osmo-bts is not recent enough and rejecting DATA.req as malformed.
https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-bts-test/2135/ (+8 failures)
Once this and the respective osmo-{pcu,bts} changes are merged, recent osmo-pcu speaking PCUIFv11 will become incompatible with older osmo-{bsc,bts} speaking the same [but different] PCUIFv11. And vice-versa.
As I said in https://gerrit.osmocom.org/c/osmo-bts/+/34059/comments/5a247c05_3683d840, I consider this a bad practice because this makes life harder for those using nightly and even harder for those running git-bisect. Protocol changes like this (and preceding ones) should be carefully planned, discussed, and merged all in one shot followed by a version bump. No breaking changes should be made after the version bump.
Don't take this as blaming or shaming, all I want to say is that we should avoid such situations in the future when changing these ad-hoc protocols. The patch itself looks good to me.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0
Gerrit-Change-Number: 34192
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 22:42:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34239 )
Change subject: osmobts_sock: cosmetic, put a dot between "v" and version number
......................................................................
Patch Set 2: Code-Review-1
(2 comments)
Patchset:
PS1:
> why putting a dot there? To me v11 is totally fine :/
Agreed.
File src/osmobts_sock.c:
https://gerrit.osmocom.org/c/osmo-pcu/+/34239/comment/320d3efb_dfa18a34
PS2, Line 220: to OsmoBTS
Would be more useful to change this part to `to OsmoBTS/OsmoBSC` or even remove it completely, since it may look confusing to the users running osmo-pcu co-located with osmo-bsc. Plus rename this file to `pcuif_sock.c`.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34239
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7c70c4d4440fa9885e1efb80e6f2e4e821ac916f
Gerrit-Change-Number: 34239
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 22:10:41 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 )
Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11
......................................................................
Patch Set 4:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/b3b67d15_3580acc7
PS4, Line 9: an
a
File src/pcu_l1_if.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/cdae646e_ab8142ed
PS4, Line 269: In case the MAC block contains an IMMEDIATE ASSIGNMENT message
This shall always be the case for AGCH, no other [than IMM ASS] messages can ever be sent on it. This sentence looks weird, maybe you meant "If the 'confirm' field is set to true, ..."?
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292
Gerrit-Change-Number: 34058
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 22:01:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34240 )
Change subject: pcu_sock: print SAPI and msg_id when sending confirmation
......................................................................
Patch Set 1: Code-Review-1
(1 comment)
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/34240/comment/8de12642_f53cb73a
PS1, Line 631: confirmation
`Sending DATA.cnf` or `Sending data confirmation` would be more informative, IMO. Otherwise it may be unclear what exactly this confirmation is confirming.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34240
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602
Gerrit-Change-Number: 34240
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 21:47:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34191 )
Change subject: pcuif_proto: use confirm flag in struct gsm_pcu_if_pch
......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS4:
Some testcases in ttcn3-bts-test are currently broken, so LGTM!
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34191
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I3364d2268bdef9c4d2feeb8e3d51a64e34bca68c
Gerrit-Change-Number: 34191
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 21:43:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 )
Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
......................................................................
Patch Set 4: Code-Review+2
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/5a247c05_3683d840
PS4, Line 14: CAUTION: This patch breaks compatibility to current master osmo-pcu (See
: also "Depends")
Normally such breaking changes should be accompanied with the protocol version bump. It's definitely not good that we end up with software A speaking PCUIFv11 being not compatible with older software B speaking the same PCUIFv11 (even despite we didn't tag releases yet). The PCUIFv11 is in development since March (and in used by both osmo-{bts,pcu} since July), but months later still being modified. This creates compatibility problems for people using nightly/master builds and makes life harder for those doing git-bisect...
File src/common/bts.c:
https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/4c7ee6c3_5090bc07
PS4, Line 733: struct bts_agch_msg_cb *msg_cb
const
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10
Gerrit-Change-Number: 34059
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 21:42:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin, daniel, lynxis lazus.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259 )
Change subject: Translate GSUP Auth Info Answer error Cause in Diamater AIA
......................................................................
Patch Set 1:
(1 comment)
File src/server_cb.erl:
https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/82dd6a5a_…
PS1, Line 197: TODO: more values
This TODO can be removed I guess?
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: I32622713c2c1f40e1d9c5597ffab8cb211171fc2
Gerrit-Change-Number: 34259
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Wed, 30 Aug 2023 20:43:34 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259 )
Change subject: Translate GSUP Auth Info Answer error Cause in Diamater AIA
......................................................................
Patch Set 1:
(1 comment)
File src/server_cb.erl:
https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/40e0d681_…
PS1, Line 185: gsup_cause2dia(?GMM_CAUSE_ILLEGAL_MS) -> {[], [?EXP_RES(?DIAMETER_ERROR_USER_UNKNOWN)]};
I may actually want to return a Result-Code in some of this instead, I need to check what do we have in "Diameter Base Protocol"
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: I32622713c2c1f40e1d9c5597ffab8cb211171fc2
Gerrit-Change-Number: 34259
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Wed, 30 Aug 2023 18:52:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: daniel.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34256 )
Change subject: osmo_io: Change parent of msghdr to iofd (instead of msg)
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34256
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b
Gerrit-Change-Number: 34256
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 15:42:37 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: daniel.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34257 )
Change subject: osmo_io: Use local variable to reference msghdr->msg
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34257
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I336ef7a5460dd18bf8e0f4ac5e97747f9fec5a35
Gerrit-Change-Number: 34257
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 15:41:54 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34256 )
Change subject: osmo_io: Change parent of msghdr to iofd (instead of msg)
......................................................................
osmo_io: Change parent of msghdr to iofd (instead of msg)
msg was made a parent of msghdr after discussion in change
I3a279b55a3adff96948120683c844e1508d0ba94
It turns out this violates some assumptions made in osmo_io,
specifically that the user read callback shall free msg, but we expect
msghdr to remain valid until after that callback returns.
In general I think it is cleaner to make iofd a parent of msghdr.
Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b
---
M src/core/osmo_io.c
1 file changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/34256/1
diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index e176099..c67787b 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -120,7 +120,7 @@
talloc_steal(iofd, msg);
}
- hdr = talloc_zero(msg, struct iofd_msghdr);
+ hdr = talloc_zero(iofd, struct iofd_msghdr);
if (!hdr) {
if (free_msg)
talloc_free(msg);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34256
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b
Gerrit-Change-Number: 34256
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith, laforge.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34155 )
Change subject: sim-reset-server: fix error printing sw_match_error
......................................................................
Patch Set 2:
(1 comment)
File contrib/sim-rest-server.py:
https://gerrit.osmocom.org/c/pysim/+/34155/comment/5e568e7f_80c4daf4
PS1, Line 104: failure.value
> I think you need a __str__ method on the object in order for str() to work. […]
I think there is presumably a problem in the stuff that gets called by the __str__ method in the ApiError object.
The failure happens when there is a status word returned that is not 9862 or 6982. In practice this rarely happens. I have to cement out the if,elif,else branches before "return str(ApiError("Card Communication Error %s" % failure.value), sw)" in order to be able to trigger the problem.
The backtrace looks like this:
Traceback (most recent call last):
File "/usr/local/lib/python3.9/dist-packages/klein/_resource.py", line 291, in processing_failed
return processing_failed(failure, error_handlers[1:])
File "/usr/local/lib/python3.9/dist-packages/klein/_resource.py", line 291, in processing_failed
return processing_failed(failure, error_handlers[1:])
File "/usr/local/lib/python3.9/dist-packages/klein/_resource.py", line 291, in processing_failed
return processing_failed(failure, error_handlers[1:])
File "/usr/local/lib/python3.9/dist-packages/klein/_resource.py", line 280, in processing_failed
d = maybeDeferred(
--- <exception caught here> ---
File "/usr/local/lib/python3.9/dist-packages/twisted/internet/defer.py", line 206, in maybeDeferred
result = f(*args, **kwargs)
File "/usr/local/lib/python3.9/dist-packages/klein/_app.py", line 241, in execute_error_handler
return handler(self._instance, request, failure)
File "/usr/local/lib/python3.9/dist-packages/klein/_app.py", line 512, in _f
return _call(instance, f, request, failure)
File "/usr/local/lib/python3.9/dist-packages/klein/_app.py", line 124, in _call
result = __klein_f__(*args, **kwargs)
File "/home/owner/git_master/pysim/./sim-rest-server.py", line 104, in sw_match_error
return str(ApiError("Card Communication Error %s" % failure.value), sw)
builtins.TypeError: decoding to str: need a bytes-like object, ApiError found
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34155
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I5a1d19abeb00c2c9dc26517abc44a5c916f2d658
Gerrit-Change-Number: 34155
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 30 Aug 2023 15:09:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 )
Change subject: PCUIF_Components: fix confirm member in record BTS_CCCH_Block
......................................................................
PCUIF_Components: fix confirm member in record BTS_CCCH_Block
The record BTS_CCCH_Block has an optional field "confirm". However, this
field is not marked as optional. Also f_BTS_CT_handler should make sure
that this field is populated with "omit" when it is not present.
Related: OS#5927
Change-Id: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128
---
M pcu/PCUIF_Components.ttcn
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn
index a18c774..01638b1 100644
--- a/pcu/PCUIF_Components.ttcn
+++ b/pcu/PCUIF_Components.ttcn
@@ -143,7 +143,7 @@
OCT4 msg_id optional,
charstring imsi optional,
GsmRrMessage rr_msg,
- boolean confirm
+ boolean confirm optional
};
template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr,
template PCUIF_data raw,
@@ -568,6 +568,7 @@
pcu_msg_rr.msg_id := omit;
pcu_msg_rr.imsi := omit;
pcu_msg_rr.rr_msg := dec_GsmRrMessage(data);
+ pcu_msg_rr.confirm := omit;
}
TC.send(pcu_msg_rr);
repeat;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252
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: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128
Gerrit-Change-Number: 34252
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 )
Change subject: PCUIF_Components: fix confirm member in record BTS_CCCH_Block
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252
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: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128
Gerrit-Change-Number: 34252
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 13:50:21 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 )
Change subject: PCUIF_Components: fix confirm member in record BTS_CCCH_Block
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252
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: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128
Gerrit-Change-Number: 34252
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 13:44:57 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 )
Change subject: PCUIF_Components: fix confirm member in record BTS_CCCH_Block
......................................................................
PCUIF_Components: fix confirm member in record BTS_CCCH_Block
The record BTS_CCCH_Block has an optional field "confirm". However, this
field is not marked as optional. Also f_BTS_CT_handler should make sure
that this field is populated with "omit" when it is not present.
Related: OS#5927
Change-Id: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128
---
M pcu/PCUIF_Components.ttcn
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/34252/1
diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn
index a18c774..01638b1 100644
--- a/pcu/PCUIF_Components.ttcn
+++ b/pcu/PCUIF_Components.ttcn
@@ -143,7 +143,7 @@
OCT4 msg_id optional,
charstring imsi optional,
GsmRrMessage rr_msg,
- boolean confirm
+ boolean confirm optional
};
template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr,
template PCUIF_data raw,
@@ -568,6 +568,7 @@
pcu_msg_rr.msg_id := omit;
pcu_msg_rr.imsi := omit;
pcu_msg_rr.rr_msg := dec_GsmRrMessage(data);
+ pcu_msg_rr.confirm := omit;
}
TC.send(pcu_msg_rr);
repeat;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252
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: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128
Gerrit-Change-Number: 34252
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange