dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34504?usp=email )
Change subject: PCUIF_Types: fix record PCUIF_data_cnf
......................................................................
PCUIF_Types: fix record PCUIF_data_cnf
The msg_id in record record PCUIF_data_cnf lacks the variant
BYTEORDER(last), (which we use in record PCUIF_agch and record
PCUIF_pch). This causes the msg_id to be sent back in the wrong
endieness format.
Related: OS#5927
Change-Id: I69c1ccc37dac1e06ebe29484c767014954ff55e2
---
M library/PCUIF_Types.ttcn
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/34504/1
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index b6a1bfa..6be45df 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -111,7 +111,9 @@
type record PCUIF_data_cnf {
PCUIF_Sapi sapi,
OCT4 msg_id
-} with { variant "" };
+} with {
+ variant (msg_id) "BYTEORDER(last)"
+};
type record PCUIF_rts_req {
PCUIF_Sapi sapi,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34504?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: I69c1ccc37dac1e06ebe29484c767014954ff55e2
Gerrit-Change-Number: 34504
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: dexter, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34498?usp=email )
Change subject: PCUIF_Components: ensure clean IMSI string
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
Patchset:
PS1:
> I don't really understand where the char(0, 0, 0, 241) comes from. […]
Yeah, looks like a bug in TITAN. I can reproduce the same behavior with v9.0.0. Even worse, if I do `FIELDLENGTH(null_terminated), ALIGN(left)`, TITAN is crashing due to `malloc(): invalid next size (unsorted)` - lol. Might be worth reporting a bug to the TITAN team. For now, I think we can live with a regexp.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34498?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: I7bfea59a306e75211856e4e80985ebf000c42224
Gerrit-Change-Number: 34498
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: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 22 Sep 2023 09:03:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34471?usp=email )
Change subject: abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File src/osmo-bsc/nm_bb_transc_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/34471/comment/a2180338_01d57deb
PS1, Line 116: /* nanoBTS only: delay until SW Activated Report is received */
> maybe add in all the comments like this one that this is donde in order to obtain de object version […]
agreed, this would make it easier to understand
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34471?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: I3953a5e41eb27165f9ff203cac7447ee9d311abf
Gerrit-Change-Number: 34471
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 22 Sep 2023 08:45:35 +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, pespin.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34498?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by pespin, Code-Review-1 by fixeria, Verified+1 by Jenkins Builder
Change subject: PCUIF_Components: ensure clean IMSI string
......................................................................
PCUIF_Components: ensure clean IMSI string
When receiving an IMSI from PCUIF (see type record PCUIF_pch), it is
represented as a null terminated string. The field is set to be 17
characters wide with a pdding of zeros at the end (as it ought to be
for a null terminated string). Unfortunately TTCN3 will not chop off
the trailing zeros, and also include them when the string length is
determined using lengthof(). This means we must take care of this
ourselves.
Let's use a regular expression to make sure any non numerical digits
are trimmed off before passing the IMSI string on to higher layers.
Related: OS#5927
Change-Id: I7bfea59a306e75211856e4e80985ebf000c42224
---
M pcu/PCUIF_Components.ttcn
1 file changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/34498/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34498?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: I7bfea59a306e75211856e4e80985ebf000c42224
Gerrit-Change-Number: 34498
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: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: dexter.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34498?usp=email )
Change subject: PCUIF_Components: ensure clean IMSI string
......................................................................
Patch Set 1:
(2 comments)
Patchset:
PS1:
> Now I get: "262420000000423" & char(0, 0, 0, 0) & char(0, 0, 0, 241), which causes even more odd beh […]
I don't really understand where the char(0, 0, 0, 241) comes from. The data in the buffer is as expected. (Two 0x00 at the end). I also checked the code. The message is pre-initialized, so there is no garbage, which is good in the first place.
I tried once more and I did the type definition exactly like it is done with PCUIF_Text. The result is the same:
09:40:29.053840 4 PCUIF_Components.ttcn:558 Warning: dec_PCUIF_pch(): Data remained at the end of the stream after successful decoding: '2B00'O
09:40:29.054549 4 PCUIF_Components.ttcn:576 Sent on TC to mtc @PCUIF_Components.BTS_CCCH_Block : {
bts_nr := 0,
raw := {
sapi := PCU_IF_SAPI_PCH_2 (8),
len := 45,
data := 'FFFFFFFF323632343230303030303030343233000031062100082926240000004032272B2B2B2B2B2B2B2B2B00'O,
fn := 0,
arfcn := 0,
trx_nr := 0,
ts_nr := 0,
block_nr := 0,
rssi := 0,
ber10k := 0,
ta_offs_qbits := 0,
lqual_cb := 0
},
msg_id := 'FFFFFFFF'O,
imsi := "262420000000423" & char(0, 0, 0, 0) & char(0, 0, 0, 241),
rr_msg := {
header := {
l2_plen := {
l2_plen := 0,
zero_one := '00'B
},
skip_indicator := 3,
rr_protocol_discriminator := 1,
message_type := SYSTEM_INFORMATION_TYPE_5ter (6)
},
payload := {
other := '2100082926240000004032272B2B2B2B2B2B2B2B'O
}
},
confirm := true
}
But this time I noticed that the payload and confirm field does not look good as well. There is one 2B missing at the end of the payload and the confirm flag should be false in this case. I have the feeling that the null_terminated messes up the decoder?
I think the PCUIF_text definition works because it is the last field in the record definition, so there no consecutive fields that could be messed up.
But to be honest, I still do not understand this. If null_terminated would mean "stop here, everything that follows belongs to the next field". We wouldnt get the garbage in that IMSI field. I also don't get where the first two MAC block bytes (3106) went.
File pcu/PCUIF_Components.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34498/comment/f24ceca3_ef65…
PS1, Line 545: var charstring imsi_filter_regexp := "(\d*)" /* numbers only */
> missing `;` at the end of line, btw
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34498?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: I7bfea59a306e75211856e4e80985ebf000c42224
Gerrit-Change-Number: 34498
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: Fri, 22 Sep 2023 07:57:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(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-ttcn3-hacks/+/34499?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: GPRS_Components: use imsi record member
......................................................................
GPRS_Components: use imsi record member
The function f_pcuif_rx_pch_pag_req1 tries to read the IMSI suffix from
the raw data that was exchanged on the PCUIF interface. This is no
longer the appropriate way in PCUIF v.11. There is now a dedicated imsi
member in type record BTS_CCCH_Block, which is used for that purpose.
Related: OS#5927
Change-Id: I0c7c6a31cbf7ed533e665728c157de0ac9e0fe8d
---
M pcu/GPRS_Components.ttcn
1 file changed, 17 insertions(+), 3 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index 983ae8f..aaec6d3 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -1175,9 +1175,8 @@
rr_pag_req1 := data_msg.rr_msg;
log("Rx Paging Request Type1: ", rr_pag_req1);
-
- /* First 3 bytes contain IMSI suffix to calculate paging group: */
- imsi_suff_octstr := substr(data_msg.raw.data, 0, 3);
+ /* The last 3 digits of the IMSI are used to calculate paging group: */
+ imsi_suff_octstr := substr(char2oct(data_msg.imsi), lengthof(data_msg.imsi) - 3, 3);
pag_group_rx := str2int(oct2char(imsi_suff_octstr[0])) * 100 +
str2int(oct2char(imsi_suff_octstr[1])) * 10 +
str2int(oct2char(imsi_suff_octstr[2]));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34499?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: I0c7c6a31cbf7ed533e665728c157de0ac9e0fe8d
Gerrit-Change-Number: 34499
Gerrit-PatchSet: 3
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.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34499?usp=email
to look at the new patch set (#2).
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: GPRS_Components: use imsi record member
......................................................................
GPRS_Components: use imsi record member
The function f_pcuif_rx_pch_pag_req1 tries to read the IMSI suffix from
the raw data that was exchanged on the PCUIF interface. This is no
longer the appropriate way in PCUIF v.11. There is now a dedicated imsi
member in type record BTS_CCCH_Block, which is used for that purpose.
Related: OS#5927
Change-Id: I0c7c6a31cbf7ed533e665728c157de0ac9e0fe8d
---
M pcu/GPRS_Components.ttcn
1 file changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/34499/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34499?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: I0c7c6a31cbf7ed533e665728c157de0ac9e0fe8d
Gerrit-Change-Number: 34499
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