[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: laforge, neels, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. Patch Set 5: (1 comment) File src/codec/ecu_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/5c265b1f_519cd1ac PS4, Line 294: return (struct osmo_ecu_state*) fr; > while the cast is fine, the container_of would probably be safer and would > allow this struct to be a […] As it seems I am having difficulties to understand your idea. I do not understand how container_of/offsetof can be used to find a simpler/safer solution. I could think of using offsetof on data[] to get its offset and then use that offset to calculate the next aligned address to place the private struct there. It would be great if you could point me to an example. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 09:02:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-iuh[master]: iu_client: Use local variable to track conn_id
Attention is currently required from: daniel, neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email ) Change subject: iu_client: Use local variable to track conn_id .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I967a311e2ad5af585c032426cc6b0680c3313b0f Gerrit-Change-Number: 35353 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 09:26:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind
Attention is currently required from: daniel, neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email ) Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1 Gerrit-Change-Number: 35354 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 09:33:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email )
Change subject: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
..
Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
The BTS rejects establishment without contention resolution on DCCH SAPI
0. This only applies if channel activation type is for immediate
assignment. The Test expects the establishment on DCCH SAPI 0 to fail,
if channel activation type is for immediate assignment and to pass, if
the channel activation type is for normal assignment.
Related: OS#6309
Change-Id: I8143c6e9448a663fee2111a91415cc58fbcb2133
---
M bts/BTS_Tests.ttcn
1 file changed, 33 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/61/35361/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 82a83cf..7ca92d9 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -2520,11 +2520,12 @@
}
/* Establish dedicated channel: L1CTL + RSL side */
-private function f_est_dchan(boolean encr_enable := false, RSL_IE_List
more_ies := {}) runs on ConnHdlr {
+private function f_est_dchan(boolean encr_enable := false, RSL_IE_List
more_ies := {},
+RSL_IE_ActivationType act_type :=
t_RSL_IE_ActType_IA) runs on ConnHdlr {
var ChannelDescription ch_desc;
/* Activate channel on BTS side */
- f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies);
+ f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies, act_type :=
act_type);
/* Craft channel description (with or without frequency hopping
parameters) */
if (g_pars.fhp.enabled) {
@@ -7169,19 +7170,22 @@
}
friend type record RllTestCase {
- uint3_t sapi,
- RslLinkId link_id,
- octetstring l3,
- boolean exp
+ uint3_t sapi,
+ RslLinkId link_id,
+ octetstring l3,
+ boolean exp,
+ RSL_IE_ActivationType act_type
}
friend type record of RllTestCase RllTestCases;
friend template RllTestCase t_EITC(template (present) uint3_t sapi,
template (present) RslLinkId id,
- octetstring l3, boolean exp) := {
+ octetstring l3, boolean exp,
+ RSL_IE_ActivationType act_type :=
t_RSL_IE_ActType_IA) := {
sapi := sapi,
link_id := id,
l3 := l3,
- exp := exp
+ exp := exp,
+ act_type := act_type
}
/* execute the same callback function with a set of different parameters (tcs)
on a
@@ -7216,7 +7220,7 @@
RSL.clear;
/* activate the logical channel */
- f_est_dchan();
+ f_est_dchan(act_type := tc.act_type);
L1CTL.clear;
f_tx_lapdm(ts_LAPDm_SABM(tc.sapi, cr_MO_CMD, true, tc.l3), tc.link_id);
@@ -7254,8 +7258,10 @@
var RllTestCases tcs := {
/* SAPI0 establishment (contention resolution) */
valueof(t_EITC(0, ts_RslLinkID_DCCH(0), '01020304'O, true)),
- /* normal SAPI0 establishment */
- valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true)),
+ /* normal SAPI0 establishment (immediate assignment) */
+ valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, false)),
+ /* normal SAPI0 establishment (normal assignment) */
+ valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true,
t_RSL_IE_ActType_ASS)),
/* SAPI 3 doesn't support contention resolution */
valueof(t_EITC(3, ts_RslLinkID_DCCH(3), '01020304'O, false)),
valueof(t_EITC(3, ts_RslLinkID_SACCH(3), '01020304'O, false)),
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?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: I8143c6e9448a663fee2111a91415cc58fbcb2133
Gerrit-Change-Number: 35361
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester-virtual: kill old instances
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/35362?usp=email )
Change subject: jobs/osmo-gsm-tester-virtual: kill old instances
..
jobs/osmo-gsm-tester-virtual: kill old instances
Make sure osmo-gsm-tester gets killed eventually, even if a bug causes
it to run forever or if aborted manually.
* add a name to the docker container
* kill the docker container if it runs longer than 24h with
docker-cleanup.sh
* rename fix_permissions_trap to clean_up_trap and kill it there, when
it is still running before the job starts and after it is done
(in my testing this did not kill it after pressing abort, but it would
be killed either at the start of the next job running on the same
jenkins node, or after 24h by docker-cleanup.sh)
Related: OS#6304
Change-Id: I6fc874d319d74aabdc33c10910cbcca2978d5bbb
---
M jobs/osmo-gsm-tester-runner.yml
M scripts/docker-cleanup.sh
2 files changed, 31 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/35362/1
diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 83040dc..4909fe7 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -226,14 +226,15 @@
- copy_artifact:
repo: osmo-gsm-tester_build-osmocom-bb
- shell: |
-# Set a trap to fix workspace permissions on exit
-fix_permissions() {
+# Set a trap to fix workspace permissions / kill the docker
container on exit
+clean_up() {
+ docker kill "osmo-gsm-tester-virtual" || true
docker run --rm \
-v "$WORKSPACE":/workspace \
debian:bullseye \
chmod -R a+rwX /workspace/
}
-fix_permissions_trap() {
+clean_up_trap() {
set +x
echo
echo "### Clean up ###"
@@ -241,12 +242,12 @@
set -x
trap - EXIT INT TERM 0
- fix_permissions
+ clean_up
}
-trap fix_permissions_trap EXIT INT TERM 0
+trap clean_up_trap EXIT INT TERM 0
# Make sure no test results from a previous run remain
-fix_permissions
+clean_up
rm -rf trial-*
# Build the docker image
@@ -277,6 +278,7 @@
-w /build -i \
-v "$PWD:/build" \
-v "$HOME/.ssh:/home/build/.ssh:ro" \
+ --name=osmo-gsm-tester-virtual \
--cap-add=sys_nice \
$USER/osmo-gsm-tester \
/bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8"
LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}"
./osmo-gsm-tester/contrib/jenkins-run.sh'
diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh
index b905d3c..982ccea 100755
--- a/scripts/docker-cleanup.sh
+++ b/scripts/docker-cleanup.sh
@@ -18,7 +18,7 @@
fi
case "$name" in
- jenkins-*|*ttcn3*) ;;
+ jenkins-*|*ttcn3*|osmo-gsm-tester*) ;;
*)
echo "$name: does not match name pattern"
continue
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35362?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: I6fc874d319d74aabdc33c10910cbcca2978d5bbb
Gerrit-Change-Number: 35362
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email ) Change subject: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0) .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?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: I8143c6e9448a663fee2111a91415cc58fbcb2133 Gerrit-Change-Number: 35361 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Thu, 14 Dec 2023 10:13:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester-virtual: kill old instances
Attention is currently required from: jolly, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35362?usp=email ) Change subject: jobs/osmo-gsm-tester-virtual: kill old instances .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35362?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: I6fc874d319d74aabdc33c10910cbcca2978d5bbb Gerrit-Change-Number: 35362 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 10:14:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-iuh[master]: iu_client: Use local variable to track conn_id
Attention is currently required from: daniel, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email ) Change subject: iu_client: Use local variable to track conn_id .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I967a311e2ad5af585c032426cc6b0680c3313b0f Gerrit-Change-Number: 35353 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 11:22:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind
Attention is currently required from: daniel, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email ) Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1 Gerrit-Change-Number: 35354 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 11:25:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: decode security attributes compact field in FCP
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/35363?usp=email )
Change subject: decode security attributes compact field in FCP
..
decode security attributes compact field in FCP
When we select files, we currently display the security attributes
compact field as raw bytes only. Let's decode this field using construct
so that it gets displayed in human readable form.
Change-Id: Iaa1167349027222e69a561d20a4c595fba2fdd2b
Related: OS#6211
---
M pySim/ts_102_221.py
1 file changed, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/35363/1
diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py
index ac0dc84..56da542 100644
--- a/pySim/ts_102_221.py
+++ b/pySim/ts_102_221.py
@@ -175,7 +175,18 @@
# ETSI TS 102 221 11.1.1.4.7.1
class SecurityAttribCompact(BER_TLV_IE, tag=0x8c):
-_construct = GreedyBytes
+# see also ISO/IEC 7816-4, section 5.4.3.1, table 16, 17 and 20
+F = Struct('delete_self'/Flag, 'terminate'/Flag, 'activate'/Flag,
'deactivate'/Flag)
+FCNT = Struct('create_df|write,append_record'/Flag,
+ 'create_ef|update,erase'/Flag,
+ 'delete_file|read,search'/Flag)
+_construct = Struct('access_mode'/Select(BitStruct(Const(1, Bit),
'propritary'/BitsInteger(4), 'file_contents'/FCNT),
+ BitStruct(Const(0, Bit),
'file'/F, 'file_contents'/FCNT)),
+'security_conditions'/Array(this._.total_len - 1,
Select(BitStruct('no_condition'/Const(0x00,BitsInteger(8))),
+
BitStruct('never'/Const(0xff, BitsInteger(8))),
+
BitStruct('match_all'/Flag, 'secure_msg'/Flag,
+
'ext_auth'/Flag, 'user_auth'/Flag,
+
'SEID'/BitsInteger(4)
# ETSI TS 102 221 11.1.1.4.7.2
class SecurityAttribExpanded(BER_TLV_IE, tag=0xab):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/35363?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Iaa1167349027222e69a561d20a4c595fba2fdd2b
Gerrit-Change-Number: 35363
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?usp=email )
Change subject: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp
..
GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp
Change-Id: I83f1f4f78adb9cd85758513420479327ea73187a
---
M epdg/EPDG_Tests.ttcn
M library/GTPv2_Templates.ttcn
2 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
fixeria: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 99a4721..f58cf96 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -429,7 +429,9 @@
teid_list := { fteid_u_ie },
qos :=
ts_GTP2C_BearerQos('09'O, 0,0,0,0),
charging_id :=
ts_GTP2C_ChargingID(g_pars.teic_local));
- GTP2.send(ts_GTP2C_CreateSessionResp({ fteid_c_ie }, paa, {
ts_GTP2C_BcGrouped(bctx_ies) } ));
+ GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.teic_remote,
rx_msg.sequenceNumber,
+{ fteid_c_ie }, paa,
+{
ts_GTP2C_BcGrouped(bctx_ies) } ));
setverdict(pass);
}
[] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg {
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 4af82e8..1ccbcb8 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -838,10 +838,12 @@
}});
template (value) PDU_GTPCv2
-ts_GTP2C_CreateSessionResp(template (value) FullyQualifiedTEID_List fteids,
+ts_GTP2C_CreateSessionResp(template (value) OCT4 d_teid,
+ template (value) OCT3 seq,
+ template (value) FullyQualifiedTEID_List fteids,
template (value) PDN_AddressAllocation addr,
template (omit) BearerContextGrouped_List
bearerContextGrouped := omit) :=
-ts_PDU_GTP2C(''O, '00'O, '21'O, {
+ts_PDU_GTP2C(d_teid, seq, '21'O, {
createSessionResponse := {
cause := ts_GTP2C_Cause(Request_accepted, '0'B),
changeReportingAction := omit,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?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: I83f1f4f78adb9cd85758513420479327ea73187a
Gerrit-Change-Number: 35357
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Templates: Fix seq nr not set in ts_GTP2C_DeleteSession...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35356?usp=email )
Change subject: library/GTPv2_Templates: Fix seq nr not set in
ts_GTP2C_DeleteSessionResp
..
library/GTPv2_Templates: Fix seq nr not set in ts_GTP2C_DeleteSessionResp
Change-Id: I8409eb35fc2f0bda6c5e11ae5c3d7628503bb2cd
---
M library/GTPv2_Templates.ttcn
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 6ea06a2..4af82e8 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -969,7 +969,7 @@
ts_GTP2C_DeleteSessionResp(template (value) OCT4 d_teid,
template (value) OCT3 seq,
template (value) GTP2C_Cause cause) :=
-ts_PDU_GTP2C(d_teid, '00'O, '25'O, {
+ts_PDU_GTP2C(d_teid, seq, '25'O, {
deleteSessionResponse := {
cause := ts_GTP2C_Cause(cause, '0'B),
recovery := omit,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35356?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: I8409eb35fc2f0bda6c5e11ae5c3d7628503bb2cd
Gerrit-Change-Number: 35356
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
Attention is currently required from: daniel, fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?usp=email ) Change subject: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?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: I0f13074ccee2bf2d00d2dc2af491b9effc142f22 Gerrit-Change-Number: 35358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 12:17:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: tdef_vty: Introduce helper functions/adapt existing helpers
Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35328?usp=email ) Change subject: tdef_vty: Introduce helper functions/adapt existing helpers .. Patch Set 6: Code-Review-1 (8 comments) File src/vty/tdef_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/35328/comment/4b404dac_e37fc76e PS6, Line 314: static char *add_group_args(void *talloc_ctx, char *dest, struct osmo_tdef_group *src) src can be const. https://gerrit.osmocom.org/c/libosmocore/+/35328/comment/1382f2e3_edecf14f PS6, Line 327: static char *add_group_docs(void *talloc_ctx, char *dest, struct osmo_tdef_group *src) src can be const. https://gerrit.osmocom.org/c/libosmocore/+/35328/comment/7b40574c_1f726ded PS6, Line 340: dest = add_group_args(tall_vty_cmd_ctx, dest, src); src can be const. https://gerrit.osmocom.org/c/libosmocore/+/35328/comment/0f92c240_9f6e1229 PS6, Line 349: dest = add_group_docs(tall_vty_cmd_ctx, dest, src); src can be const. https://gerrit.osmocom.org/c/libosmocore/+/35328/comment/97fb4f0a_32d92fda PS6, Line 358: static void set_show_cmd_strs(struct osmo_tdef_group *template, const char *cmd_group, I don't really like the "template" naming, it's not something we have been using so far and imho difficult to gasp. gerrit also seems to agree with it being not a good name as it's marking it as if it was a keyword 😊 template can be const. https://gerrit.osmocom.org/c/libosmocore/+/35328/comment/a06b9626_e7b4585f PS6, Line 361: size_t cmd_group_len = cmd_group ? strlen(cmd_group) : 0; this is all really hard to read, you are putting to much stuff on any line. Add some spacing and rework it. Have a look at osmo_strbuf. Too many strlen() everywhere (hardcoded strings can use sizeof()). I'm pretty sure cmd_group_space won't be needed. https://gerrit.osmocom.org/c/libosmocore/+/35328/comment/4555d815_f9d6141c PS6, Line 384: static void set_cfg_cmd_strs(struct osmo_tdef_group *template, const char *cmd_group, see comments from set_show_cmd_strs(). https://gerrit.osmocom.org/c/libosmocore/+/35328/comment/ded2af03_4d235e48 PS6, Line 445: strcat(memcpy(cmd_group_space, cmd_group, strlen(cmd_group) + 1), " "); I think it's first time I see somebody using the return value of memcpy. Anyway, all this is too complex, simply use snprintf() or osmo_strbuf. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35328?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: Ife88841fbc325f23c5b270b8e8c71678b8023639 Gerrit-Change-Number: 35328 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Thu, 14 Dec 2023 12:21:06 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: tdef_vty: Introduce generalized per-object tdef support
Attention is currently required from: arehbein, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35355?usp=email ) Change subject: tdef_vty: Introduce generalized per-object tdef support .. Patch Set 9: (2 comments) File include/osmocom/vty/tdef_vty.h: https://gerrit.osmocom.org/c/libosmocore/+/35355/comment/76dc011a_7fa8fed0 PS9, Line 87: #define DEFUN_TDEF_PER_OBJ(show_funcname, show_cmdname, cfg_funcname, cfg_cmdname, object_type, tdef_groups_name) \ DEFUN_TDEF( File src/vty/tdef_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/35355/comment/12969a00_0b258b43 PS9, Line 416: void osmo_tdef_vty_groups_init_per_obj(unsigned int parent_cfg_node, struct osmo_tdef_group *groups, const char *cmd_category, Probably simply call it osmo_tdef_vty_groups_init2, since it's basically the same as osmo_tdef_vty_groups_init but passing more parameters. BTW, you can now implement osmo_tdef_vty_groups_init() by calling osmo_tdef_vty_groups_init2, so it's clear their relation. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35355?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: Ib3b22640a11eae152d66d62c0f47b953d80de945 Gerrit-Change-Number: 35355 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: arehbein Gerrit-Comment-Date: Thu, 14 Dec 2023 12:26:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: ns2: Improve code consistency
Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35359?usp=email ) Change subject: ns2: Improve code consistency .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35359?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: I11c926dd4125c6657ae3cd21d8038f161d9fd9c3 Gerrit-Change-Number: 35359 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 12:28:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
Attention is currently required from: daniel, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?usp=email ) Change subject: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?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: I0f13074ccee2bf2d00d2dc2af491b9effc142f22 Gerrit-Change-Number: 35358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 12:29:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?usp=email )
Change subject: library/GTPv2_Emulation: Patch SeqNr only on outbound initial
messages
..
library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
Change-Id: I0f13074ccee2bf2d00d2dc2af491b9effc142f22
---
M library/GTPv2_Emulation.ttcn
1 file changed, 86 insertions(+), 8 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn
index 736dd03..0b2cb4f 100644
--- a/library/GTPv2_Emulation.ttcn
+++ b/library/GTPv2_Emulation.ttcn
@@ -340,6 +340,73 @@
return omit;
}
+private function f_gtp2c_is_initial_msg(PDU_GTPCv2 msg) return boolean
+{
+ if (ischosen(msg.gtpcv2_pdu.echoRequest) or
+ ischosen(msg.gtpcv2_pdu.versionNotSupported) or
+ ischosen(msg.gtpcv2_pdu.createSessionRequest) or
+ ischosen(msg.gtpcv2_pdu.createBearerRequest) or
+ ischosen(msg.gtpcv2_pdu.bearerResourceCommand) or
+ ischosen(msg.gtpcv2_pdu.bearerResourceFailureIndication) or
+ ischosen(msg.gtpcv2_pdu.modifyBearerRequest) or
+ ischosen(msg.gtpcv2_pdu.deleteSessionRequest) or
+ ischosen(msg.gtpcv2_pdu.deleteBearerRequest) or
+ ischosen(msg.gtpcv2_pdu.downlinkDataNotification) or
+ ischosen(msg.gtpcv2_pdu.downlinkDataNotificationAcknowledgement) or
+ ischosen(msg.gtpcv2_pdu.downlinkDataNotificationFailureIndication)
or
+ ischosen(msg.gtpcv2_pdu.deleteIndirectDataForwardingTunnelRequest)
or
+ ischosen(msg.gtpcv2_pdu.modifyBearerCommand) or
+ ischosen(msg.gtpcv2_pdu.modifyBearerFailureIndication) or
+ ischosen(msg.gtpcv2_pdu.updateBearerRequest) or
+ ischosen(msg.gtpcv2_pdu.deleteBearerCommand) or
+ ischosen(msg.gtpcv2_pdu.createIndirectDataForwardingTunnelRequest)
or
+ ischosen(msg.gtpcv2_pdu.releaseAccessBearersRequest) or
+ ischosen(msg.gtpcv2_pdu.stopPagingIndication) or
+ ischosen(msg.gtpcv2_pdu.modifyAccessBearersRequest) or
+ ischosen(msg.gtpcv2_pdu.remoteUEReportNotification) or
+ ischosen(msg.gtpcv2_pdu.remoteUEReportAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.forwardRelocationRequest) or
+ ischosen(msg.gtpcv2_pdu.forwardRelocationCompleteNotification) or
+ ischosen(msg.gtpcv2_pdu.forwardRelocationCompleteAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.contextRequest) or
+ ischosen(msg.gtpcv2_pdu.contextAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.identificationRequest) or
+ ischosen(msg.gtpcv2_pdu.forwardAccessContextNotification) or
+ ischosen(msg.gtpcv2_pdu.forwardAccessContextAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.detachNotification) or
+ ischosen(msg.gtpcv2_pdu.detachAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.changeNotificationRequest) or
+ ischosen(msg.gtpcv2_pdu.relocationCancelRequest) or
+ ischosen(msg.gtpcv2_pdu.configurationTransferTunnel) or
+ ischosen(msg.gtpcv2_pdu.rAN_InformationRelay) or
+ ischosen(msg.gtpcv2_pdu.suspendNotification) or
+ ischosen(msg.gtpcv2_pdu.suspendAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.resumeNotification) or
+ ischosen(msg.gtpcv2_pdu.resumeAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.cSPagingIndication) or
+ ischosen(msg.gtpcv2_pdu.createForwardingTunnelRequest) or
+ ischosen(msg.gtpcv2_pdu.deletePDN_ConnectionSetRequest) or
+ ischosen(msg.gtpcv2_pdu.traceSessionActivation) or
+ ischosen(msg.gtpcv2_pdu.traceSessionDeactivation) or
+ ischosen(msg.gtpcv2_pdu.updatePDN_ConnectionSetRequest) or
+ ischosen(msg.gtpcv2_pdu.pGW_RestartNotification) or
+ ischosen(msg.gtpcv2_pdu.pGW_RestartNotificationAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.pGW_DownlinkTriggeringNotification) or
+ ischosen(msg.gtpcv2_pdu.pGW_DownlinkTriggeringAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.alertMMENotification) or
+ ischosen(msg.gtpcv2_pdu.alertMMEAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.uEActivityNotification) or
+ ischosen(msg.gtpcv2_pdu.uEActivityAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.mBMSSessionStartRequest) or
+ ischosen(msg.gtpcv2_pdu.mBMSSessionUpdateRequest) or
+ ischosen(msg.gtpcv2_pdu.mBMSSessionStopRequest) or
+ ischosen(msg.gtpcv2_pdu.iSR_StatusIndication) or
+ ischosen(msg.gtpcv2_pdu.uE_RegistrationQueryRequest)) {
+ return true;
+ }
+ return false;
+}
+
private template (value) SctpTuple ts_SC
[L] Change in osmo-bsc[master]: Introduce per-BTS timers, RLC timer commands
Attention is currently required from: arehbein, fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email ) Change subject: Introduce per-BTS timers, RLC timer commands .. Patch Set 18: Code-Review-1 (2 comments) Patchset: PS18: Some of my previous comments haven't been addressed. File tests/bts_features.vty: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/2662ad2e_c1d4bc20 PS18, Line 66: OsmoBSC(config-net-bts)# gprs show timer this is unexpected from user point of view. Users expect all commands showing state of stuff to start with "show", then press TAB to see the possibilities. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?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: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675 Gerrit-Change-Number: 31878 Gerrit-PatchSet: 18 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 14 Dec 2023 12:32:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: dexter, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. Patch Set 5: (1 comment) File src/codec/ecu_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/e2af99ae_b2085678 PS4, Line 294: return (struct osmo_ecu_state*) fr; > As it seems I am having difficulties to understand your idea. […] Ah sorry, not in this precise line. But here it's simply a matter of doing: "return &fr->ecu_state;" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 14 Dec 2023 12:35:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: dexter, laforge, neels.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email )
Change subject: ecu: force alignment of member data in struct osmo_ecu_state
..
Patch Set 5:
(1 comment)
File src/codec/ecu_fr.c:
https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/0c05db7d_26f3d94b
PS5, Line 315: struct fr_ecu_state *fr = (struct fr_ecu_state *) st;
Here and in the function below is where you need container_of:
static inline struct fr_ecu_state *_osmo_ecu_state_get_fr(struct
osmo_ecu_state *st) {
return (struct fr_ecu_state *)container_of(st, struct fr_ecu_state,
ecu_state);
}
static int ecu_fr_frame_out(struct osmo_ecu_state *st, uint8_t *frame_out)
{
struct fr_ecu_state *fr = _osmo_ecu_state_get_fr(st);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7
Gerrit-Change-Number: 35212
Gerrit-PatchSet: 5
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-Attention: neels
Gerrit-Attention: laforge
Gerrit-Attention: dexter
Gerrit-Comment-Date: Thu, 14 Dec 2023 12:38:28 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email ) Change subject: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0) .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?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: I8143c6e9448a663fee2111a91415cc58fbcb2133 Gerrit-Change-Number: 35361 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Thu, 14 Dec 2023 12:41:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester-virtual: kill old instances
Attention is currently required from: jolly, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35362?usp=email ) Change subject: jobs/osmo-gsm-tester-virtual: kill old instances .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35362?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: I6fc874d319d74aabdc33c10910cbcca2978d5bbb Gerrit-Change-Number: 35362 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 14 Dec 2023 12:42:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester-virtual: kill old instances
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/35362?usp=email )
Change subject: jobs/osmo-gsm-tester-virtual: kill old instances
..
jobs/osmo-gsm-tester-virtual: kill old instances
Make sure osmo-gsm-tester gets killed eventually, even if a bug causes
it to run forever or if aborted manually.
* add a name to the docker container
* kill the docker container if it runs longer than 24h with
docker-cleanup.sh
* rename fix_permissions_trap to clean_up_trap and kill it there, when
it is still running before the job starts and after it is done
(in my testing this did not kill it after pressing abort, but it would
be killed either at the start of the next job running on the same
jenkins node, or after 24h by docker-cleanup.sh)
Related: OS#6304
Change-Id: I6fc874d319d74aabdc33c10910cbcca2978d5bbb
---
M jobs/osmo-gsm-tester-runner.yml
M scripts/docker-cleanup.sh
2 files changed, 31 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 83040dc..4909fe7 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -226,14 +226,15 @@
- copy_artifact:
repo: osmo-gsm-tester_build-osmocom-bb
- shell: |
-# Set a trap to fix workspace permissions on exit
-fix_permissions() {
+# Set a trap to fix workspace permissions / kill the docker
container on exit
+clean_up() {
+ docker kill "osmo-gsm-tester-virtual" || true
docker run --rm \
-v "$WORKSPACE":/workspace \
debian:bullseye \
chmod -R a+rwX /workspace/
}
-fix_permissions_trap() {
+clean_up_trap() {
set +x
echo
echo "### Clean up ###"
@@ -241,12 +242,12 @@
set -x
trap - EXIT INT TERM 0
- fix_permissions
+ clean_up
}
-trap fix_permissions_trap EXIT INT TERM 0
+trap clean_up_trap EXIT INT TERM 0
# Make sure no test results from a previous run remain
-fix_permissions
+clean_up
rm -rf trial-*
# Build the docker image
@@ -277,6 +278,7 @@
-w /build -i \
-v "$PWD:/build" \
-v "$HOME/.ssh:/home/build/.ssh:ro" \
+ --name=osmo-gsm-tester-virtual \
--cap-add=sys_nice \
$USER/osmo-gsm-tester \
/bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8"
LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}"
./osmo-gsm-tester/contrib/jenkins-run.sh'
diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh
index b905d3c..982ccea 100755
--- a/scripts/docker-cleanup.sh
+++ b/scripts/docker-cleanup.sh
@@ -18,7 +18,7 @@
fi
case "$name" in
- jenkins-*|*ttcn3*) ;;
+ jenkins-*|*ttcn3*|osmo-gsm-tester*) ;;
*)
echo "$name: does not match name pattern"
continue
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35362?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: I6fc874d319d74aabdc33c10910cbcca2978d5bbb
Gerrit-Change-Number: 35362
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?usp=email ) Change subject: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages .. Patch Set 1: (1 comment) File library/GTPv2_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358/comment/116ed239_54ff50d2 PS1, Line 343: private function f_gtp2c_is_initial_msg(PDU_GTPCv2 msg) return boolean > let me know if you know a better one! Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?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: I0f13074ccee2bf2d00d2dc2af491b9effc142f22 Gerrit-Change-Number: 35358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 12:44:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ipa_ccm_tlv_to_unitdata(): free previous string if present before all...
Attention is currently required from: daniel, fixeria, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35347?usp=email ) Change subject: ipa_ccm_tlv_to_unitdata(): free previous string if present before allocating new one .. Patch Set 2: Code-Review+1 (1 comment) File src/gsm/ipa.c: https://gerrit.osmocom.org/c/libosmocore/+/35347/comment/3d3ede45_86ad20b5 PS1, Line 271: in > actually, `out` or even `inout` Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35347?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: I66cbd900676875145810ad1d5c07e719311852fb Gerrit-Change-Number: 35347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 13:16:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?usp=email ) Change subject: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages .. Patch Set 1: (1 comment) File library/GTPv2_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358/comment/53ce76e3_1f56f1e9 PS1, Line 343: private function f_gtp2c_is_initial_msg(PDU_GTPCv2 msg) return boolean > let me know if you know a better one! I would have if i did. If I look at GTPv2_Types there are "only" 84 different variants of GTPCv2_PDUs so it might be shorter to invert the logic and only check for the 25 types not listed here. Doesn't really make a difference, though -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?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: I0f13074ccee2bf2d00d2dc2af491b9effc142f22 Gerrit-Change-Number: 35358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 13:21:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[M] Change in libosmocore[master]: ns2: Improve code consistency
Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35359?usp=email ) Change subject: ns2: Improve code consistency .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35359?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: I11c926dd4125c6657ae3cd21d8038f161d9fd9c3 Gerrit-Change-Number: 35359 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Thu, 14 Dec 2023 13:24:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ipa_ccm_tlv_to_unitdata(): free previous string if present before all...
Attention is currently required from: fixeria, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35347?usp=email ) Change subject: ipa_ccm_tlv_to_unitdata(): free previous string if present before allocating new one .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35347?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: I66cbd900676875145810ad1d5c07e719311852fb Gerrit-Change-Number: 35347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 14 Dec 2023 13:26:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ipa_ccm_tlv_to_unitdata(): free previous string if present before all...
Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35347?usp=email ) Change subject: ipa_ccm_tlv_to_unitdata(): free previous string if present before allocating new one .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35347?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: I66cbd900676875145810ad1d5c07e719311852fb Gerrit-Change-Number: 35347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 14 Dec 2023 15:03:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: ns2: Improve code consistency
Attention is currently required from: arehbein. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35359?usp=email ) Change subject: ns2: Improve code consistency .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35359?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: I11c926dd4125c6657ae3cd21d8038f161d9fd9c3 Gerrit-Change-Number: 35359 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Thu, 14 Dec 2023 15:04:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: ns2: Improve code consistency
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35359?usp=email )
Change subject: ns2: Improve code consistency
..
ns2: Improve code consistency
- Use defines instead of repeating string literals
- Use enum for indexing same data everywhere consistently
Related: OS#5915
Change-Id: I11c926dd4125c6657ae3cd21d8038f161d9fd9c3
---
M src/gb/gprs_ns2_internal.h
M src/gb/gprs_ns2_vty.c
2 files changed, 41 insertions(+), 13 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
daniel: Looks good to me, approved
diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h
index 7ac77e5..2e7dac3 100644
--- a/src/gb/gprs_ns2_internal.h
+++ b/src/gb/gprs_ns2_internal.h
@@ -62,7 +62,22 @@
struct gprs_ns2_vc_bind;
#define NS_TIMERS_COUNT 11
-#define NS_TIMERS
"(tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries|tsns-prov|tsns-size-retries|tsns-config-retries|tsns-procedures-retries)"
+
+#define TNS_BLOCK_STR "tns-block"
+#define TNS_BLOCK_RETRIES_STR "tns-block-retries"
+#define TNS_RESET_STR "tns-reset"
+#define TNS_RESET_RETRIES_STR "tns-reset-retries"
+#define TNS_TEST_STR "tns-test"
+#define TNS_ALIVE_STR "tns-alive"
+#define TNS_ALIVE_RETRIES_STR "tns-alive-retries"
+#define TSNS_PROV_STR "tsns-prov"
+#define TSNS_SIZE_RETRIES_STR "tsns-size-retries"
+#define TSNS_CONFIG_RETRIES_STR "tsns-config-retries"
+#define TSNS_PROCEDURES_RETRIES_STR "tsns-procedures-retries"
+#define NS_TIMERS "(" TNS_BLOCK_STR "|" TNS_BLOCK_RETRIES_STR "|"
TNS_RESET_STR "|" TNS_RESET_RETRIES_STR "|" TNS_TEST_STR "|"\
+ TNS_ALIVE_STR "|" TNS_ALIVE_RETRIES_STR "|" TSNS_PROV_STR "|"
TSNS_SIZE_RETRIES_STR "|" TSNS_CONFIG_RETRIES_STR "|"\
+ TSNS_PROCEDURES_RETRIES_STR ")"
+
#define NS_TIMERS_HELP \
"(un)blocking Timer (Tns-block) timeout\n" \
"(un)blocking Timer (Tns-block) number of retries\n"\
diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c
index 3132e34..32de49d 100644
--- a/src/gb/gprs_ns2_vty.c
+++ b/src/gb/gprs_ns2_vty.c
@@ -91,18 +91,18 @@
};
/* TODO: this should into osmo timer */
-static const struct value_string gprs_ns_timer_strs[] = {
- { 0, "tns-block" },
- { 1, "tns-block-retries" },
- { 2, "tns-reset" },
- { 3, "tns-reset-retries" },
- { 4, "tns-test" },
- { 5, "tns-alive" },
- { 6, "tns-alive-retries" },
- { 7, "tsns-prov" },
- { 8, "tsns-size-retries" },
- { 9, "tsns-config-retries" },
- {10, "tsns-procedures-retries" },
+const struct value_string gprs_ns_timer_strs[] = {
+ { NS_TOUT_TNS_BLOCK, TNS_BLOCK_STR },
+ { NS_TOUT_TNS_BLOCK_RETRIES, TNS_BLOCK_RETRIES_STR },
+ { NS_TOUT_TNS_RESET, TNS_RESET_STR },
+ { NS_TOUT_TNS_RESET_RETRIES, TNS_RESET_RETRIES_STR },
+ { NS_TOUT_TNS_TEST,TNS_TEST_STR },
+ { NS_TOUT_TNS_ALIVE, TNS_ALIVE_STR },
+ { NS_TOUT_TNS_ALIVE_RETRIES, TNS_ALIVE_RETRIES_STR },
+ { NS_TOUT_TSNS_PROV, TSNS_PROV_STR },
+ { NS_TOUT_TSNS_SIZE_RETRIES, TSNS_SIZE_RETRIES_STR },
+ { NS_TOUT_TSNS_CONFIG_RETRIES, TSNS_CONFIG_RETRIES_STR },
+ { NS_TOUT_TSNS_PROCEDURES_RETRIES, TSNS_PROCEDURES_RETRIES_STR },
{ 0, NULL }
};
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35359?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: I11c926dd4125c6657ae3cd21d8038f161d9fd9c3
Gerrit-Change-Number: 35359
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email ) Change subject: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?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: I8143c6e9448a663fee2111a91415cc58fbcb2133 Gerrit-Change-Number: 35361 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 14 Dec 2023 15:04:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email )
Change subject: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
..
Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)
The BTS rejects establishment without contention resolution on DCCH SAPI
0. This only applies if channel activation type is for immediate
assignment. The Test expects the establishment on DCCH SAPI 0 to fail,
if channel activation type is for immediate assignment and to pass, if
the channel activation type is for normal assignment.
Related: OS#6309
Change-Id: I8143c6e9448a663fee2111a91415cc58fbcb2133
---
M bts/BTS_Tests.ttcn
1 file changed, 33 insertions(+), 11 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 82a83cf..7ca92d9 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -2520,11 +2520,12 @@
}
/* Establish dedicated channel: L1CTL + RSL side */
-private function f_est_dchan(boolean encr_enable := false, RSL_IE_List
more_ies := {}) runs on ConnHdlr {
+private function f_est_dchan(boolean encr_enable := false, RSL_IE_List
more_ies := {},
+RSL_IE_ActivationType act_type :=
t_RSL_IE_ActType_IA) runs on ConnHdlr {
var ChannelDescription ch_desc;
/* Activate channel on BTS side */
- f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies);
+ f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies, act_type :=
act_type);
/* Craft channel description (with or without frequency hopping
parameters) */
if (g_pars.fhp.enabled) {
@@ -7169,19 +7170,22 @@
}
friend type record RllTestCase {
- uint3_t sapi,
- RslLinkId link_id,
- octetstring l3,
- boolean exp
+ uint3_t sapi,
+ RslLinkId link_id,
+ octetstring l3,
+ boolean exp,
+ RSL_IE_ActivationType act_type
}
friend type record of RllTestCase RllTestCases;
friend template RllTestCase t_EITC(template (present) uint3_t sapi,
template (present) RslLinkId id,
- octetstring l3, boolean exp) := {
+ octetstring l3, boolean exp,
+ RSL_IE_ActivationType act_type :=
t_RSL_IE_ActType_IA) := {
sapi := sapi,
link_id := id,
l3 := l3,
- exp := exp
+ exp := exp,
+ act_type := act_type
}
/* execute the same callback function with a set of different parameters (tcs)
on a
@@ -7216,7 +7220,7 @@
RSL.clear;
/* activate the logical channel */
- f_est_dchan();
+ f_est_dchan(act_type := tc.act_type);
L1CTL.clear;
f_tx_lapdm(ts_LAPDm_SABM(tc.sapi, cr_MO_CMD, true, tc.l3), tc.link_id);
@@ -7254,8 +7258,10 @@
var RllTestCases tcs := {
/* SAPI0 establishment (contention resolution) */
valueof(t_EITC(0, ts_RslLinkID_DCCH(0), '01020304'O, true)),
- /* normal SAPI0 establishment */
- valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true)),
+ /* normal SAPI0 establishment (immediate assignment) */
+ valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, false)),
+ /* normal SAPI0 establishment (normal assignment) */
+ valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true,
t_RSL_IE_ActType_ASS)),
/* SAPI 3 doesn't support contention resolution */
valueof(t_EITC(3, ts_RslLinkID_DCCH(3), '01020304'O, false)),
valueof(t_EITC(3, ts_RslLinkID_SACCH(3), '01020304'O, false)),
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?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: I8143c6e9448a663fee2111a91415cc58fbcb2133
Gerrit-Change-Number: 35361
Gerrit-PatchSet: 2
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in pysim[master]: decode security attributes compact field in FCP
Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35363?usp=email ) Change subject: decode security attributes compact field in FCP .. Patch Set 1: (1 comment) Patchset: PS1: proprietary, not propritary -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35363?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa1167349027222e69a561d20a4c595fba2fdd2b Gerrit-Change-Number: 35363 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 14 Dec 2023 15:07:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email )
Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind
..
iu_client: Handle empty CR and InitialUE Message in DATA.ind
Related: OS#6307
Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1
---
M src/iu_client.c
1 file changed, 77 insertions(+), 8 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/iu_client.c b/src/iu_client.c
index 9da11ea..ea5ebe8 100644
--- a/src/iu_client.c
+++ b/src/iu_client.c
@@ -55,6 +55,14 @@
uint8_t rac;
};
+/* Entry to cache conn_id <-> sccp_addr mapping in case we receive an empty CR
*/
+struct iu_new_ctx_entry {
+ struct llist_head list;
+
+ uint32_t conn_id;
+ struct osmo_sccp_addr sccp_addr;
+};
+
/* A remote RNC (Radio Network Controller, like BSC but for UMTS) that has
* called us and is currently reachable at the given osmo_sccp_addr. So, when
we
* know a LAC for a subscriber, we can page it at the RNC matching that LAC or
@@ -94,6 +102,7 @@
#define LOGPIUC(level, fmt, args...) \
LOGPC(iu_log_subsystem, level, fmt, ## args)
+static LLIST_HEAD(ue_conn_sccp_addr_list);
static LLIST_HEAD(ue_conn_ctx_list);
static LLIST_HEAD(rnc_list);
@@ -168,6 +177,38 @@
talloc_free(ue_ctx);
}
+static void ue_conn_sccp_addr_add(uint32_t conn_id, const struct
osmo_sccp_addr *calling_addr)
+{
+ struct iu_new_ctx_entry *entry = talloc_zero(talloc_iu_ctx, struct
iu_new_ctx_entry);
+
+ entry->conn_id = conn_id;
+ entry->sccp_addr = *calling_addr;
+
+ llist_add(&entry->list, &ue_conn_sccp_addr_list);
+}
+
+static const struct osmo_sccp_addr *ue_conn_sccp_addr_find(uint32_t conn_id)
+{
+ struct iu_new_ctx_entry *entry;
+ llist_for_each_entry(entry, &ue_conn_sccp_addr_list, list) {
+ if (entry->conn_id == conn_id)
+ return &entry->sccp_addr;
+ }
+ return NULL;
+}
+
+static void ue_conn_sccp_addr_del(uint32_t conn_id)
+{
+ struct iu_new_ctx_entry *entry;
+ llist_for_each_entry(entry, &ue_conn_sccp_addr_list, list) {
+ if (entry->conn_id == conn_id) {
+ llist_del(&entry->list);
+ talloc_free(entry);
+ return;
+ }
+ }
+}
+
static struct ranap_iu_rnc *iu_rnc_alloc(uint16_t rnc_id, struct
osmo_sccp_addr *addr)
{
struct ranap_iu_rnc *rnc = talloc_zero(talloc_iu_ctx, struct
ranap_iu_rnc);
@@ -831,24 +872,29 @@
/* indication of new inbound connection request*/
conn_id = prim->u.connect.conn_id;
LOGPIU(LOGL_DEBUG, "N-CONNECT.ind(X->%u)\n", conn_id);
- if (/* prim->u.connect.called_addr.ssn != OSMO_SCCP_SSN_RANAP
|| */
- !msgb_l2(oph->msg) || msgb_l2len(oph->msg) == 0) {
- LOGPIU(LOGL_NOTICE,
-"Received invalid N-CONNECT.ind\n");
- return 0;
- }
+
new_ctx.sccp_addr = prim->u.connect.calling_addr;
new_ctx.conn_id = conn_id;
+
/* first ensure the local SCCP socket is ACTIVE */
resp = make_conn_resp(&prim->u.connect);
osmo_sccp_user_sap_down(scu, resp);
/* then handle the RANAP payload */
- rc = ranap_cn_rx_co(cn_ranap_handle_co_initial, &new_ctx,
msgb_l2(oph->msg), msgb_l2len(oph->msg));
+ if (/* prim->u.connect.called_addr.ssn != OSMO_SCCP_SSN_RANAP
|| */
+ !msgb_l2(oph->msg) || msgb_l2len(oph->msg) == 0) {
+ LOGPIU(LOGL_DEBUG,
+"Received N-CONNECT.ind without data\n");
+ ue_conn_sccp_addr_add(conn_id,
&prim->u.connect.calling_addr);
+ } else {
+ rc = ranap_cn_rx_co(cn_ranap_handle_co_initial,
&new_ctx, msgb_l2(oph->msg), msgb_l2len(oph->msg));
+ }
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):
/* indication of disconnect */
conn_id = prim->u.disconnect.conn_id;
LOGPIU(LOGL_DEBUG, "N-DISCONNECT.ind(%u)\n", conn_id);
+
+ ue_conn_sccp_addr_del(conn_id);
ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
@@ -876,10 +922,23 @@
conn_id = prim->u.data.conn_id;
LOGPIU(LOGL_DEBUG, "N-DATA.ind(%u, %s)\n", conn_id,
osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)));
+
/* resolve UE context */
ue = ue_conn_ctx_find(conn_
[S] Change in osmo-iuh[master]: iu_client: Use local variable to track conn_id
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email )
Change subject: iu_client: Use local variable to track conn_id
..
iu_client: Use local variable to track conn_id
Change-Id: I967a311e2ad5af585c032426cc6b0680c3313b0f
---
M src/iu_client.c
1 file changed, 21 insertions(+), 9 deletions(-)
Approvals:
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/iu_client.c b/src/iu_client.c
index 077ac27..9da11ea 100644
--- a/src/iu_client.c
+++ b/src/iu_client.c
@@ -819,6 +819,7 @@
int rc = -1;
struct ranap_ue_conn_ctx *ue;
struct new_ue_conn_ctx new_ctx = {};
+ uint32_t conn_id;
LOGPIU(LOGL_DEBUG, "sccp_sap_up(%s)\n", osmo_scu_prim_name(oph));
@@ -828,7 +829,8 @@
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION):
/* indication of new inbound connection request*/
- LOGPIU(LOGL_DEBUG, "N-CONNECT.ind(X->%u)\n",
prim->u.connect.conn_id);
+ conn_id = prim->u.connect.conn_id;
+ LOGPIU(LOGL_DEBUG, "N-CONNECT.ind(X->%u)\n", conn_id);
if (/* prim->u.connect.called_addr.ssn != OSMO_SCCP_SSN_RANAP
|| */
!msgb_l2(oph->msg) || msgb_l2len(oph->msg) == 0) {
LOGPIU(LOGL_NOTICE,
@@ -836,7 +838,7 @@
return 0;
}
new_ctx.sccp_addr = prim->u.connect.calling_addr;
- new_ctx.conn_id = prim->u.connect.conn_id;
+ new_ctx.conn_id = conn_id;
/* first ensure the local SCCP socket is ACTIVE */
resp = make_conn_resp(&prim->u.connect);
osmo_sccp_user_sap_down(scu, resp);
@@ -845,9 +847,9 @@
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):
/* indication of disconnect */
- LOGPIU(LOGL_DEBUG, "N-DISCONNECT.ind(%u)\n",
- prim->u.disconnect.conn_id);
- ue = ue_conn_ctx_find(prim->u.disconnect.conn_id);
+ conn_id = prim->u.disconnect.conn_id;
+ LOGPIU(LOGL_DEBUG, "N-DISCONNECT.ind(%u)\n", conn_id);
+ ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
@@ -856,14 +858,14 @@
rc = ranap_cn_rx_co(cn_ranap_handle_co, ue,
msgb_l2(oph->msg), msgb_l2len(oph->msg));
/* A Iu Release event might be used to free the UE in
cn_ranap_handle_co. */
- ue = ue_conn_ctx_find(prim->u.disconnect.conn_id);
+ ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
global_iu_event(ue, RANAP_IU_EVENT_LINK_INVALIDATED, NULL);
/* A RANAP_IU_EVENT_LINK_INVALIDATED, can lead to a free */
- ue = ue_conn_ctx_find(prim->u.disconnect.conn_id);
+ ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
if (ue->free_on_release)
@@ -871,10 +873,11 @@
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):
/* connection-oriented data received */
- LOGPIU(LOGL_DEBUG, "N-DATA.ind(%u, %s)\n", prim->u.data.conn_id,
+ conn_id = prim->u.data.conn_id;
+ LOGPIU(LOGL_DEBUG, "N-DATA.ind(%u, %s)\n", conn_id,
osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)));
/* resolve UE context */
- ue = ue_conn_ctx_find(prim->u.data.conn_id);
+ ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I967a311e2ad5af585c032426cc6b0680c3313b0f
Gerrit-Change-Number: 35353
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind
Attention is currently required from: daniel, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email ) Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1 Gerrit-Change-Number: 35354 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 14 Dec 2023 15:08:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ipa_ccm_tlv_to_unitdata(): free previous string if present before all...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35347?usp=email )
Change subject: ipa_ccm_tlv_to_unitdata(): free previous string if present
before allocating new one
..
ipa_ccm_tlv_to_unitdata(): free previous string if present before allocating
new one
Change-Id: I66cbd900676875145810ad1d5c07e719311852fb
---
M src/gsm/ipa.c
1 file changed, 30 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c
index cd95c6b..6e41fd9 100644
--- a/src/gsm/ipa.c
+++ b/src/gsm/ipa.c
@@ -267,34 +267,43 @@
return 0;
}
+/*! Fill ud struct from tp structure.
+ * \param[in,out] ud ipaccess_unit to fill
+ * \param[in] tp the decoded TLV structure from eg. ID_RESP message
+ * \returns zero on success, negative on error
+ *
+ * This function expects parameter ud's fields to be initialized to zero if
not yet set.
+ * Existing incoming string pointer fields are expected to be allocated using
+ * talloc and will be deallocated as such if replaced with the content of tp.
+ **/
int ipa_ccm_tlv_to_unitdata(struct ipaccess_unit *ud,
const struct tlv_parsed *tp)
{
int rc = 0;
if (TLVP_PRES_LEN(tp, IPAC_IDTAG_SERNR, 1))
- ud->serno = talloc_strdup(ud, (char *)
- TLVP_VAL(tp, IPAC_IDTAG_SERNR));
+ osmo_talloc_replace_string(ud, &ud->serno,
+ (char *)TLVP_VAL(tp,
IPAC_IDTAG_SERNR));
if (TLVP_PRES_LEN(tp, IPAC_IDTAG_UNITNAME, 1))
- ud->unit_name = talloc_strdup(ud, (char *)
- TLVP_VAL(tp, IPAC_IDTAG_UNITNAME));
+ osmo_talloc_replace_string(ud, &ud->unit_name,
+ (char *)TLVP_VAL(tp,
IPAC_IDTAG_UNITNAME));
if (TLVP_PRES_LEN(tp, IPAC_IDTAG_LOCATION1, 1))
- ud->location1 = talloc_strdup(ud, (char *)
- TLVP_VAL(tp, IPAC_IDTAG_LOCATION1));
+ osmo_talloc_replace_string(ud, &ud->location1,
+ (char *)TLVP_VAL(tp,
IPAC_IDTAG_LOCATION1));
if (TLVP_PRES_LEN(tp, IPAC_IDTAG_LOCATION2, 1))
- ud->location2 = talloc_strdup(ud, (char *)
- TLVP_VAL(tp, IPAC_IDTAG_LOCATION2));
+ osmo_talloc_replace_string(ud, &ud->location2,
+ (char *)TLVP_VAL(tp,
IPAC_IDTAG_LOCATION2));
if (TLVP_PRES_LEN(tp, IPAC_IDTAG_EQUIPVERS, 1))
- ud->equipvers = talloc_strdup(ud, (char *)
- TLVP_VAL(tp, IPAC_IDTAG_EQUIPVERS));
+ osmo_talloc_replace_string(ud, &ud->equipvers,
+ (char *)TLVP_VAL(tp,
IPAC_IDTAG_EQUIPVERS));
if (TLVP_PRES_LEN(tp, IPAC_IDTAG_SWVERSION, 1))
- ud->swversion = talloc_strdup(ud, (char *)
- TLVP_VAL(tp, IPAC_IDTAG_SWVERSION));
+ osmo_talloc_replace_string(ud, &ud->swversion,
+ (char *)TLVP_VAL(tp,
IPAC_IDTAG_SWVERSION));
if (TLVP_PRES_LEN(tp, IPAC_IDTAG_MACADDR, 17)) {
rc = osmo_macaddr_parse(ud->mac_addr, (char *)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35347?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: I66cbd900676875145810ad1d5c07e719311852fb
Gerrit-Change-Number: 35347
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-bsc[osmith/1.11.1]: Bump version: 1.11.0.3-240b2 → 1.11.1
Attention is currently required from: fixeria, osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email ) Change subject: Bump version: 1.11.0.3-240b2 → 1.11.1 .. Patch Set 1: Verified+1 (1 comment) Patchset: PS1: > I cannot test this one because I don't have an RBS BTS. Maybe > @pmaier@sysmocom. […] I have tested it with the bumped versions of OsmoBSC and also OsmoPCU. Everything seems to work fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 Gerrit-Change-Number: 35342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 14 Dec 2023 16:37:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-bsc[osmith/1.11.1]: Bump version: 1.11.0.3-240b2 → 1.11.1
Attention is currently required from: fixeria, osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email ) Change subject: Bump version: 1.11.0.3-240b2 → 1.11.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 Gerrit-Change-Number: 35342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 14 Dec 2023 16:37:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: Bump version: 1.3.1.13-8a4c → 1.4.0
Attention is currently required from: osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email ) Change subject: Bump version: 1.3.1.13-8a4c → 1.4.0 .. Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: I have tested this with an ericsson BTS, everything seems to work fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 Gerrit-Change-Number: 35337 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 14 Dec 2023 16:38:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[osmith/1.11.1]: Bump version: 1.11.0.3-240b2 → 1.11.1
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email ) Change subject: Bump version: 1.11.0.3-240b2 → 1.11.1 .. Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 Gerrit-Change-Number: 35342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 14 Dec 2023 16:39:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: Bump version: 1.3.1.13-8a4c → 1.4.0
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email ) Change subject: Bump version: 1.3.1.13-8a4c → 1.4.0 .. Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 Gerrit-Change-Number: 35337 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 16:40:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()"
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/35336?usp=email )
Change subject: Revert "pdch_ul_controller: migrate from fn_cmp() to
gsm0502_fncmp()"
..
Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()"
In preparation for an 1.4.0 osmo-pcu release that should not require a
new libosmocore, revert this patch.
This reverts commit a155fe85de9151d26fdfad7a6593a95592ac9770.
Change-Id: I714efdc9c9403d3ff74e18df1629e2de6876e9d7
---
M TODO-RELEASE
M src/pdch_ul_controller.c
2 files changed, 32 insertions(+), 7 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 73ad83b..cbfda24 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,4 +7,3 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#librarywhatdescription / commit summary line
-libosmocore > 1.9.0added gsm0502_fncmp()
diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c
index 661957b..c0e26de 100644
--- a/src/pdch_ul_controller.c
+++ b/src/pdch_ul_controller.c
@@ -17,8 +17,6 @@
#include
#include
-#include
-
#include "pdch_ul_controller.h"
#include "bts.h"
#include "sba.h"
@@ -45,6 +43,20 @@
{ 0, NULL }
};
+#define GSM_MAX_FN_THRESH (GSM_MAX_FN >> 1)
+/* 0: equal, -1: fn1 BEFORE fn2, 1: fn1 AFTER fn2 */
+static inline int fn_cmp(uint32_t fn1, uint32_t fn2)
+{
+ if (fn1 == fn2)
+ return 0;
+ /* FN1 goes before FN2: */
+ if ((fn1 < fn2 && (fn2 - fn1) < GSM_MAX_FN_THRESH) ||
+ (fn1 > fn2 && (fn1 - fn2) > GSM_MAX_FN_THRESH))
+ return -1;
+ /* FN1 goes after FN2: */
+ return 1;
+}
+
struct pdch_ulc *pdch_ulc_alloc(struct gprs_rlcmac_pdch *pdch, void *ctx)
{
struct pdch_ulc* ulc;
@@ -66,7 +78,7 @@
while (node) {
it = rb_entry(node, struct pdch_ulc_node, node);
- res = gsm0502_fncmp(it->fn, fn);
+ res = fn_cmp(it->fn, fn);
if (res > 0) /* it->fn AFTER fn */
node = node->rb_left;
else if (res < 0) /* it->fn BEFORE fn */
@@ -155,7 +167,7 @@
for (node = rb_first(&ulc->tree_root); node; node = rb_next(node)) {
it = container_of(node, struct pdch_ulc_node, node);
- res = gsm0502_fncmp(it->fn, check_fn);
+ res = fn_cmp(it->fn, check_fn);
if (res > 0) { /* it->fn AFTER check_fn */
/* Next reserved FN is passed check_fn, hence it means
check_fn is free */
return check_fn;
@@ -191,7 +203,7 @@
it = container_of(*n, struct pdch_ulc_node, node);
parent = *n;
- res = gsm0502_fncmp(item->fn, it->fn);
+ res = fn_cmp(item->fn, it->fn);
if (res < 0) { /* item->fn "BEFORE" it->fn */
n = &((*n)->rb_left);
} else if (res > 0) { /* item->fn "AFTER" it->fn */
@@ -293,7 +305,7 @@
struct rb_node *first;
while ((first = rb_first(&ulc->tree_root))) {
item = container_of(first, struct pdch_ulc_node, node);
- res = gsm0502_fncmp(item->fn, fn);
+ res = fn_cmp(item->fn, fn);
if (res > 0) /* item->fn AFTER fn */
break;
if (res < 0) { /* item->fn BEFORE fn */
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35336?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I714efdc9c9403d3ff74e18df1629e2de6876e9d7
Gerrit-Change-Number: 35336
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-pcu[master]: Bump version: 1.3.1.13-8a4c → 1.4.0
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email ) Change subject: Bump version: 1.3.1.13-8a4c → 1.4.0 .. Bump version: 1.3.1.13-8a4c → 1.4.0 Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 --- M debian/changelog 1 file changed, 38 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved; Verified fixeria: Looks good to me, but someone else must approve; Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index df278a0..3e50d66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +osmo-pcu (1.4.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * tbf: Log poll timeout reason + + [ Vadim Yanitskiy ] + * pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp() + * bts: bts_tfi_find_free(): fix -Wmaybe-uninitialized (false positive) + + [ Oliver Smith ] + * systemd: remove RestartPreventExitStatus=1 + * Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()" + + [ Philipp Maier ] + * pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY + * pcuif_proto: drop support for PCUIF v10 + * pcu_l1_if: signal BTS model via PCUIF + * gprs_rlcmac_sched: fix condition for generating dummy blocks on idle + * bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0 + + [ Andreas Eversberg ] + * Increase RR scheduler priority to 20, to avoid dropped bursts + * Use uniform log format for default config files + + [ Keith ] + * TBF status: Fix VTY output text + + -- Oliver Smith Tue, 12 Dec 2023 16:58:16 +0100 + osmo-pcu (1.3.1) unstable; urgency=medium * tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in ST_RELEASING -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 Gerrit-Change-Number: 35337 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: Revert "Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_...
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/35338?usp=email )
Change subject: Revert "Revert "pdch_ul_controller: migrate from fn_cmp() to
gsm0502_fncmp()""
..
Revert "Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()""
Now that 1.4.0 is released, bring back the patch that was temporarily
reverted to avoid the need for a new libosmocore.
This reverts commit 16729ba72761fc981bcec6d3747d6f7dab4413ca.
Change-Id: Idd113e328a693df2e8f2f5d172eaf5bf2bfcf009
---
M TODO-RELEASE
M src/pdch_ul_controller.c
2 files changed, 21 insertions(+), 18 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE
index cbfda24..73ad83b 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#librarywhatdescription / commit summary line
+libosmocore > 1.9.0added gsm0502_fncmp()
diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c
index c0e26de..661957b 100644
--- a/src/pdch_ul_controller.c
+++ b/src/pdch_ul_controller.c
@@ -17,6 +17,8 @@
#include
#include
+#include
+
#include "pdch_ul_controller.h"
#include "bts.h"
#include "sba.h"
@@ -43,20 +45,6 @@
{ 0, NULL }
};
-#define GSM_MAX_FN_THRESH (GSM_MAX_FN >> 1)
-/* 0: equal, -1: fn1 BEFORE fn2, 1: fn1 AFTER fn2 */
-static inline int fn_cmp(uint32_t fn1, uint32_t fn2)
-{
- if (fn1 == fn2)
- return 0;
- /* FN1 goes before FN2: */
- if ((fn1 < fn2 && (fn2 - fn1) < GSM_MAX_FN_THRESH) ||
- (fn1 > fn2 && (fn1 - fn2) > GSM_MAX_FN_THRESH))
- return -1;
- /* FN1 goes after FN2: */
- return 1;
-}
-
struct pdch_ulc *pdch_ulc_alloc(struct gprs_rlcmac_pdch *pdch, void *ctx)
{
struct pdch_ulc* ulc;
@@ -78,7 +66,7 @@
while (node) {
it = rb_entry(node, struct pdch_ulc_node, node);
- res = fn_cmp(it->fn, fn);
+ res = gsm0502_fncmp(it->fn, fn);
if (res > 0) /* it->fn AFTER fn */
node = node->rb_left;
else if (res < 0) /* it->fn BEFORE fn */
@@ -167,7 +155,7 @@
for (node = rb_first(&ulc->tree_root); node; node = rb_next(node)) {
it = container_of(node, struct pdch_ulc_node, node);
- res = fn_cmp(it->fn, check_fn);
+ res = gsm0502_fncmp(it->fn, check_fn);
if (res > 0) { /* it->fn AFTER check_fn */
/* Next reserved FN is passed check_fn, hence it means
check_fn is free */
return check_fn;
@@ -203,7 +191,7 @@
it = container_of(*n, struct pdch_ulc_node, node);
parent = *n;
- res = fn_cmp(item->fn, it->fn);
+ res = gsm0502_fncmp(item->fn, it->fn);
if (res < 0) { /* item->fn "BEFORE" it->fn */
n = &((*n)->rb_left);
} else if (res > 0) { /* item->fn "AFTER" it->fn */
@@ -305,7 +293,7 @@
struct rb_node *first;
while ((first = rb_first(&ulc->tree_root))) {
item = container_of(first, struct pdch_ulc_node, node);
- res = fn_cmp(item->fn, fn);
+ res = gsm0502_fncmp(item->fn, fn);
if (res > 0) /* item->fn AFTER fn */
break;
if (res < 0) { /* item->fn BEFORE fn */
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35338?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Idd113e328a693df2e8f2f5d172eaf5bf2bfcf009
Gerrit-Change-Number: 35338
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-bsc[osmith/1.11.1]: pcuif_proto: signal BTS model via PCUIF
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/35341?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
pcuif_proto: signal BTS model via PCUIF
At the moment the PCU has no way of knowing with which BTS model it is
used with. However, some BTS models may require slightly different
behaviour by the PCU, depending on which BTS model is used. So, lets add
an additional bts_model field to struct gsm_pcu_if_info_ind in order to
convey the exact BTS model to the PCU.
Related: OS#6191
Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047
Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0
(cherry picked from commit 647bc1e698dae798a25cbe757c53f5a1f2d3df3a)
---
M include/osmocom/bsc/pcuif_proto.h
M src/osmo-bsc/pcu_sock.c
2 files changed, 39 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/include/osmocom/bsc/pcuif_proto.h
b/include/osmocom/bsc/pcuif_proto.h
index 1133ca6..33036c3 100644
--- a/include/osmocom/bsc/pcuif_proto.h
+++ b/include/osmocom/bsc/pcuif_proto.h
@@ -8,7 +8,7 @@
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
-#define PCU_IF_VERSION 0x0b
+#define PCU_IF_VERSION 0x0c
#define TXT_MAX_LEN128
/* msg_type */
@@ -63,6 +63,17 @@
#define PCU_IF_ADDR_TYPE_IPV4 0x04/* IPv4 address */
#define PCU_IF_ADDR_TYPE_IPV6 0x29/* IPv6 address */
+/* BTS model */
+enum gsm_pcuif_bts_model {
+ PCU_IF_BTS_MODEL_UNSPEC,
+ PCU_IF_BTS_MODEL_LC15,
+ PCU_IF_BTS_MODEL_OC2G,
+ PCU_IF_BTS_MODEL_OCTPHY,
+ PCU_IF_BTS_MODEL_SYSMO,
+ PCU_IF_BTS_MODEL_TRX,
+ PCU_IF_BTS_MODEL_RBS,
+};
+
#define PCU_IF_NUM_NSVC 2
#define PCU_IF_NUM_TRX 8
@@ -176,6 +187,7 @@
struct in_addr v4;
struct in6_addr v6;
} remote_ip[PCU_IF_NUM_NSVC];
+ uint8_t bts_model; /* enum gsm_pcuif_bts_model */
} __attribute__ ((packed));
/* E1 CCU connection parameters */
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index 24f3c1c..d5fa5b9 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -300,6 +300,14 @@
info_ind_fill_trx(&info_ind->trx[trx->nr], trx);
}
+ switch (bts->type) {
+ case GSM_BTS_TYPE_RBS2000:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_RBS;
+ break;
+ default:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_UNSPEC;
+ }
+
return pcu_sock_send(bts->network, msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35341?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0
Gerrit-Change-Number: 35341
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-bsc[osmith/1.11.1]: pcuif_proto: clean up last remains of old PCUIF v10
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/35340?usp=email )
Change subject: pcuif_proto: clean up last remains of old PCUIF v10
..
pcuif_proto: clean up last remains of old PCUIF v10
There are still some remains that are related to the old PCUIF v10
protocol version. Let's clean those up.
Related: OS#5927
Depends: osmo-pcu.git I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
Change-Id: Iebb3a634fee680bdc3636a61f3ccaa1e97e54a64
(cherry picked from commit 801b55ee4ab57fadafc1e7211bb4b0de3e7668b7)
---
M include/osmocom/bsc/pcuif_proto.h
M src/osmo-bsc/pcu_sock.c
2 files changed, 15 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/include/osmocom/bsc/pcuif_proto.h
b/include/osmocom/bsc/pcuif_proto.h
index 9df85d9..1133ca6 100644
--- a/include/osmocom/bsc/pcuif_proto.h
+++ b/include/osmocom/bsc/pcuif_proto.h
@@ -13,7 +13,6 @@
/* msg_type */
#define PCU_IF_MSG_DATA_REQ0x00/* send data to given channel */
-#define PCU_IF_MSG_DATA_CNF0x01/* confirm (e.g. transmission on PCH) */
#define PCU_IF_MSG_DATA_IND0x02/* receive data from given channel */
#define PCU_IF_MSG_SUSP_REQ0x03/* BTS forwards GPRS SUSP REQ to PCU */
#define PCU_IF_MSG_APP_INFO_REQ0x04/* BTS asks PCU to transmit APP
INFO via PACCH */
@@ -35,8 +34,6 @@
/* sapi */
#define PCU_IF_SAPI_RACH 0x01/* channel request on CCCH */
-#define PCU_IF_SAPI_AGCH 0x02/* assignment on AGCH */
-#define PCU_IF_SAPI_PCH0x03/* paging/assignment on PCH */
#define PCU_IF_SAPI_BCCH 0x04/* SI on BCCH */
#define PCU_IF_SAPI_PDTCH 0x05/* packet data/control/ccch block */
#define PCU_IF_SAPI_PRACH 0x06/* packet random access channel */
@@ -297,7 +294,6 @@
union {
struct gsm_pcu_if_data data_req;
- struct gsm_pcu_if_data data_cnf;
struct gsm_pcu_if_data_cnf data_cnf2;
struct gsm_pcu_if_data data_ind;
struct gsm_pcu_if_susp_req susp_req;
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index d279093..24f3c1c 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -50,8 +50,6 @@
static const char *sapi_string[] = {
[PCU_IF_SAPI_RACH] ="RACH",
- [PCU_IF_SAPI_AGCH] ="AGCH",
- [PCU_IF_SAPI_PCH] = "PCH",
[PCU_IF_SAPI_BCCH] ="BCCH",
[PCU_IF_SAPI_PDTCH] = "PDTCH",
[PCU_IF_SAPI_PRACH] = "PRACH",
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35340?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: Iebb3a634fee680bdc3636a61f3ccaa1e97e54a64
Gerrit-Change-Number: 35340
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-bsc[osmith/1.11.1]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35339?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY .. pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo to signal to the PCU that the direct PHY access for the sysmo-bts DSP should be enabled. With time, support for other BTS models was added and the flag became a synonym for "direct PHY access", so it makes sense to rename it to "PCU_IF_FLAG_DIRECT_PHY" Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: I23df067df99b76048667131905c4448d32d80640 (cherry picked from commit a3a225a16b4a38a9b0c0d34d095389f495d692a9) --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 20 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index cd2a298..9df85d9 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -46,7 +46,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1(1 << 16) #define PCU_IF_FLAG_CS2(1 << 17) #define PCU_IF_FLAG_CS3(1 << 18) diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index dc2b8e9..d279093 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -200,7 +200,7 @@ info_ind = &pcu_prim->u.info_ind; info_ind->version = PCU_IF_VERSION; info_ind->flags |= PCU_IF_FLAG_ACTIVE; - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_DIRECT_PHY; /* RAI */ info_ind->mcc = bts->network->plmn.mcc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35339?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I23df067df99b76048667131905c4448d32d80640 Gerrit-Change-Number: 35339 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-bsc[osmith/1.11.1]: Bump version: 1.11.0.3-240b2 → 1.11.1
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email ) Change subject: Bump version: 1.11.0.3-240b2 → 1.11.1 .. Bump version: 1.11.0.3-240b2 → 1.11.1 Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 --- M debian/changelog 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved; Verified fixeria: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index d8b5b2e..8bf0362 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-bsc (1.11.1) unstable; urgency=medium + + [ Philipp Maier ] + * pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY + * pcuif_proto: clean up last remains of old PCUIF v10 + * pcuif_proto: signal BTS model via PCUIF + + -- Oliver Smith Tue, 12 Dec 2023 16:53:00 +0100 + osmo-bsc (1.11.0) unstable; urgency=medium [ Max ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 Gerrit-Change-Number: 35342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-bsc[osmith/1.11.1]: Bump version: 1.11.0.3-240b2 → 1.11.1
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email ) Change subject: Bump version: 1.11.0.3-240b2 → 1.11.1 .. Patch Set 1: (1 comment) Patchset: PS1: > I have tested it with the bumped versions of OsmoBSC and also OsmoPCU. […] thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 Gerrit-Change-Number: 35342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 16:40:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: fixeria Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.2]: Bump version: 1.7.1.3-6a6a1 → 1.7.2
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35346?usp=email ) Change subject: Bump version: 1.7.1.3-6a6a1 → 1.7.2 .. Patch Set 1: -Code-Review (1 comment) Patchset: PS1: > add -2 to block until the osmo-pcu, osmo-bts, osmo-bsc releases are tested > together thanks for testing, @vyanits...@sysmocom.de! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.2 Gerrit-Change-Id: I84a02243bf20c8f35688e0098cca4969402aa38f Gerrit-Change-Number: 35346 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 16:41:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[M] Change in osmo-bts[osmith/1.7.2]: pcuif_proto: signal BTS model via PCUIF
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/35345?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
pcuif_proto: signal BTS model via PCUIF
At the moment the PCU has no way of knowing with which BTS model it is
used with. However, some BTS models may require slightly different
behaviour by the PCU, depending on which BTS model is used. So, lets add
an additional bts_model field to struct gsm_pcu_if_info_ind in order to
convey the exact BTS model to the PCU.
Related: OS#6191
Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047
Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
(cherry picked from commit 4a6a2fdf7ef3f2fd197c1d76fa32d6b6cf231fce)
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 52 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index 15e3e20..04936af 100644
--- a/include/osmo-bts/pcuif_proto.h
+++ b/include/osmo-bts/pcuif_proto.h
@@ -7,7 +7,7 @@
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
-#define PCU_IF_VERSION 0x0b
+#define PCU_IF_VERSION 0x0c
#define TXT_MAX_LEN128
/* msg_type */
@@ -57,6 +57,17 @@
#define PCU_IF_ADDR_TYPE_IPV4 0x04/* IPv4 address */
#define PCU_IF_ADDR_TYPE_IPV6 0x29/* IPv6 address */
+/* BTS model */
+enum gsm_pcuif_bts_model {
+ PCU_IF_BTS_MODEL_UNSPEC,
+ PCU_IF_BTS_MODEL_LC15,
+ PCU_IF_BTS_MODEL_OC2G,
+ PCU_IF_BTS_MODEL_OCTPHY,
+ PCU_IF_BTS_MODEL_SYSMO,
+ PCU_IF_BTS_MODEL_TRX,
+ PCU_IF_BTS_MODEL_RBS,
+};
+
#define PCU_IF_NUM_NSVC 2
#define PCU_IF_NUM_TRX 8
@@ -170,6 +181,7 @@
struct in_addr v4;
struct in6_addr v6;
} remote_ip[PCU_IF_NUM_NSVC];
+ uint8_t bts_model; /* enum gsm_pcuif_bts_model */
} __attribute__ ((packed));
struct gsm_pcu_if_act_req {
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 6116c9e..048e766 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -230,6 +230,25 @@
}
}
+static enum gsm_pcuif_bts_model bts_model_from_variant(enum
gsm_bts_type_variant variant)
+{
+ switch (variant) {
+ case BTS_OSMO_LITECELL15:
+ return PCU_IF_BTS_MODEL_LC15;
+ case BTS_OSMO_OC2G:
+ return PCU_IF_BTS_MODEL_OC2G;
+ case BTS_OSMO_OCTPHY:
+ return PCU_IF_BTS_MODEL_OCTPHY;
+ case BTS_OSMO_SYSMO:
+ return PCU_IF_BTS_MODEL_SYSMO;
+ case BTS_OSMO_TRX:
+ case BTS_OSMO_VIRTUAL:
+ return PCU_IF_BTS_MODEL_TRX;
+ default:
+ return PCU_IF_BTS_MODEL_UNSPEC;
+ }
+}
+
int pcu_tx_info_ind(void)
{
struct msgb *msg;
@@ -358,6 +377,8 @@
info_ind_fill_trx(&info_ind->trx[trx->nr], trx);
}
+ info_ind->bts_model = bts_model_from_variant(bts->variant);
+
return pcu_sock_send(msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35345?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: osmith/1.7.2
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 35345
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-bts[osmith/1.7.2]: pcuif_proto: clean up last remains of old PCUIF v10
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/35344?usp=email )
Change subject: pcuif_proto: clean up last remains of old PCUIF v10
..
pcuif_proto: clean up last remains of old PCUIF v10
There are still some remains that are related to the old PCUIF v10
protocol version. Let's clean those up.
Related: OS#5927
Depends: osmo-pcu.git I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
Change-Id: I04f7108c94c99c9920192177087748e8b89b3106
(cherry picked from commit 6ed4a9a1eb83a881897848558ccb85d8b5ac5a28)
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 15 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index a620993..15e3e20 100644
--- a/include/osmo-bts/pcuif_proto.h
+++ b/include/osmo-bts/pcuif_proto.h
@@ -12,7 +12,6 @@
/* msg_type */
#define PCU_IF_MSG_DATA_REQ0x00/* send data to given channel */
-#define PCU_IF_MSG_DATA_CNF0x01/* confirm (e.g. transmission on PCH) */
#define PCU_IF_MSG_DATA_IND0x02/* receive data from given channel */
#define PCU_IF_MSG_SUSP_REQ0x03/* BTS forwards GPRS SUSP REQ to PCU */
#define PCU_IF_MSG_APP_INFO_REQ0x04/* BTS asks PCU to transmit APP
INFO via PACCH */
@@ -29,8 +28,6 @@
/* sapi */
#define PCU_IF_SAPI_RACH 0x01/* channel request on CCCH */
-#define PCU_IF_SAPI_AGCH 0x02/* assignment on AGCH */
-#define PCU_IF_SAPI_PCH0x03/* paging/assignment on PCH */
#define PCU_IF_SAPI_BCCH 0x04/* SI on BCCH */
#define PCU_IF_SAPI_PDTCH 0x05/* packet data/control/ccch block */
#define PCU_IF_SAPI_PRACH 0x06/* packet random access channel */
@@ -256,7 +253,6 @@
union {
struct gsm_pcu_if_data data_req;
- struct gsm_pcu_if_data data_cnf;
struct gsm_pcu_if_data_cnf data_cnf2;
struct gsm_pcu_if_data data_ind;
struct gsm_pcu_if_susp_req susp_req;
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 79b39c4..6116c9e 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -53,8 +53,6 @@
static const char *sapi_string[] = {
[PCU_IF_SAPI_RACH] ="RACH",
- [PCU_IF_SAPI_AGCH] ="AGCH",
- [PCU_IF_SAPI_PCH] = "PCH",
[PCU_IF_SAPI_BCCH] ="BCCH",
[PCU_IF_SAPI_PDTCH] = "PDTCH",
[PCU_IF_SAPI_PRACH] = "PRACH",
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35344?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: osmith/1.7.2
Gerrit-Change-Id: I04f7108c94c99c9920192177087748e8b89b3106
Gerrit-Change-Number: 35344
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-bts[osmith/1.7.2]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35343?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY .. pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo to signal to the PCU that the direct PHY access for the sysmo-bts DSP should be enabled. With time, support for other BTS models was added and the flag became a synonym for "direct PHY access", so it makes sense to rename it to "PCU_IF_FLAG_DIRECT_PHY" Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: Ib556a93f7d7d7dbe1e96c4a0802bc802241b2b2d (cherry picked from commit 955b7dc637fd7fcea47575b8bf4b65748501952b) --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index b47dc75..a620993 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -40,7 +40,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1(1 << 16) #define PCU_IF_FLAG_CS2(1 << 17) #define PCU_IF_FLAG_CS3(1 << 18) diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index f99c7d2..79b39c4 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -264,7 +264,7 @@ LOGP(DPCU, LOGL_INFO, "BTS is down\n"); if (pcu_direct) - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_DIRECT_PHY; info_ind->bsic = bts->bsic; /* RAI */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35343?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.2 Gerrit-Change-Id: Ib556a93f7d7d7dbe1e96c4a0802bc802241b2b2d Gerrit-Change-Number: 35343 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-bts[osmith/1.7.2]: Bump version: 1.7.1.3-6a6a1 → 1.7.2
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35346?usp=email ) Change subject: Bump version: 1.7.1.3-6a6a1 → 1.7.2 .. Bump version: 1.7.1.3-6a6a1 → 1.7.2 Change-Id: I84a02243bf20c8f35688e0098cca4969402aa38f --- M debian/changelog 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index d317627..bf18e97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-bts (1.7.2) unstable; urgency=medium + + [ Philipp Maier ] + * pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY + * pcuif_proto: clean up last remains of old PCUIF v10 + * pcuif_proto: signal BTS model via PCUIF + + -- Oliver Smith Tue, 12 Dec 2023 16:44:53 +0100 + osmo-bts (1.7.1) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.2 Gerrit-Change-Id: I84a02243bf20c8f35688e0098cca4969402aa38f Gerrit-Change-Number: 35346 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-pcu[master]: Bump version: 1.3.1.13-8a4c → 1.4.0
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email ) Change subject: Bump version: 1.3.1.13-8a4c → 1.4.0 .. Patch Set 1: (1 comment) Patchset: PS1: > add -2 to block until the osmo-pcu, osmo-bts, osmo-bsc releases are tested > together thanks for testing! -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 Gerrit-Change-Number: 35337 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 16:42:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: LTE_CryptoFunctions.ttcn: Log NAS_UE_State on failure
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35365?usp=email )
Change subject: LTE_CryptoFunctions.ttcn: Log NAS_UE_State on failure
..
LTE_CryptoFunctions.ttcn: Log NAS_UE_State on failure
Change-Id: Ib95d496f06f07f4c28d9b08b6a8059d8453e8acd
---
M mme/LTE_CryptoFunctions.ttcn
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/65/35365/1
diff --git a/mme/LTE_CryptoFunctions.ttcn b/mme/LTE_CryptoFunctions.ttcn
index dee0f22..9923541 100644
--- a/mme/LTE_CryptoFunctions.ttcn
+++ b/mme/LTE_CryptoFunctions.ttcn
@@ -145,7 +145,7 @@
f_rx_is_downlink(nus),
data_with_seq);
if (exp_mac != secp_nas.messageAuthenticationCode) {
setverdict(fail, "Received NAS MAC ",
secp_nas.messageAuthenticationCode,
- " doesn't match expected MAC ", exp_mac, ": ",
secp_nas);
+ " doesn't match expected MAC ", exp_mac, ": ",
secp_nas, " | nus: ", nus);
return false;
}
return true;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35365?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: Ib95d496f06f07f4c28d9b08b6a8059d8453e8acd
Gerrit-Change-Number: 35365
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?usp=email ) Change subject: LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read .. LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read Change-Id: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427 --- M mme/LTE_CryptoFunctions.ttcn 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/35366/1 diff --git a/mme/LTE_CryptoFunctions.ttcn b/mme/LTE_CryptoFunctions.ttcn index 9923541..6fac81b 100644 --- a/mme/LTE_CryptoFunctions.ttcn +++ b/mme/LTE_CryptoFunctions.ttcn @@ -148,6 +148,7 @@ " doesn't match expected MAC ", exp_mac, ": ", secp_nas, " | nus: ", nus); return false; } + nus.rx_count := nus.rx_count + 1; return true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?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: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427 Gerrit-Change-Number: 35366 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: LTE_CryptoFunctions.ttcn: Immediate termination upon failure
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35364?usp=email )
Change subject: LTE_CryptoFunctions.ttcn: Immediate termination upon failure
..
LTE_CryptoFunctions.ttcn: Immediate termination upon failure
Change-Id: I09170c17c5cbb552a8aeef31b4b8fa5c89a00887
---
M mme/LTE_CryptoFunctions.ttcn
1 file changed, 21 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/64/35364/1
diff --git a/mme/LTE_CryptoFunctions.ttcn b/mme/LTE_CryptoFunctions.ttcn
index 687caab..dee0f22 100644
--- a/mme/LTE_CryptoFunctions.ttcn
+++ b/mme/LTE_CryptoFunctions.ttcn
@@ -12,6 +12,7 @@
module LTE_CryptoFunctions {
import from General_Types all;
+import from Misc_Helpers all;
import from S1AP_Types all;
import from S1AP_PDU_Descriptions all;
@@ -53,8 +54,8 @@
return f_snow_3g_f9(k_nas_int, seq_nr, bearer, is_downlink,
data);
}
case else {
- setverdict(fail, "Unsupported EIA: ", alg);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Unsupported EIA: ", alg));
+ return ''O; /* never reached */
}
}
}
@@ -67,8 +68,7 @@
f_snow_3g_f8(k_nas_enc, count, bearer, is_downlink, data);
}
case else {
- setverdict(fail, "Unsupported EEA: ", alg);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Unsupported EEA: ", alg));
}
}
}
@@ -168,19 +168,19 @@
nus.rx_count := 0;
nus.alg_int := NAS_ALG_IP_EIA1; /* FIXME: from decoded inner
message! */
if (not f_nas_check_ip(nus, secp_nas)) {
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
"f_nas_check_ip() failed");
}
return dec_PDU_NAS_EPS(secp_nas.nAS_Message);
}
case ('0001'B) { /* IP only */
if (not f_nas_check_ip(nus, secp_nas)) {
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
"f_nas_check_ip() failed");
}
return dec_PDU_NAS_EPS(secp_nas.nAS_Message);
}
case ('0010'B) { /* IP + ciphered */
if (not f_nas_check_ip(nus, secp_nas)) {
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
"f_nas_check_ip() failed");
}
f_nas_encrypt(nus.alg_enc, nus.k_nas_enc, nus.rx_count, 0,
f_rx_is_downlink(nus), secp_nas.nAS_Message);
@@ -189,7 +189,7 @@
case ('0100'B) { /* IP + ciphered; new EPS security context */
nus.rx_count := 0;
if (not f_nas_check_ip(nus, secp_nas)) {
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
"f_nas_check_ip() failed");
}
f_nas_encrypt(nus.alg_enc, nus.k_nas_enc, nus.rx_count, 0,
f_rx_is_downlink(nus), secp_nas.nAS_Message);
@@ -198,8 +198,8 @@
//case ('0101'B) { /* IP + partially ciphered */ }
//case ('1100'B) { /* Service Request Message */ }
case else {
- setverdict(fail, "Implement SecHdrType for ", secp_nas);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
log2str("Implement SecHdrType for ", secp_nas));
+ mtc.stop; /* make compiler happy about not returning. */
}
}
}
@@ -218,8 +218,8 @@
} else if (encrypt == true and authenticate == true and new_ctx ==
false) {
return '0010'B;
} else {
- setverdict(fail, "invalid sec_hdr conditions");
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Invalid
sec_hdr conditions");
+ return ''B; /* never reached, make compiler happy */
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35364?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: I09170c17c5cbb552a8aeef31b4b8fa5c89a00887
Gerrit-Change-Number: 35364
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt read
Attention is currently required from: laforge.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?usp=email )
Change subject: LTE_CryptoFunctions.ttcn: Increment nus.rx_count on each pkt
read
..
Patch Set 1:
(1 comment)
File mme/LTE_CryptoFunctions.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366/comment/69137f3c_7134ef16
PS1, Line 151: nus.rx_count := nus.rx_count + 1;
@lafo...@gnumonks.org I tried fixing the following problem with this, but still
not working:
LTE_CryptoFunctions.ttcn:147 setverdict(fail): none -> fail reason:
"Received NAS MAC '15E82DBA'O doesn't match expected MAC 'FE12D7C6'O: {
securityHeaderType := '0010'B, messageAuthenticationCode := '15E82DBA'O,
sequenceNumber := 2, nAS_Message :=
'0761430F90004F00700065006E00350047005346004732214171126000490100'O } | nus: {
role := NAS_ROLE_UE (0), alg_int := NAS_ALG_IP_EIA1 (1), k_nas_int :=
'530CE32318F26264EAB26BC116870B86'O, alg_enc := NAS_ALG_ENC_EEA0 (0), k_nas_enc
:= 'C204B3E82B8A3B608DBE9BE478CD8FE7'O, rx_count := 1, tx_count := 0 }"
Misc_Helpers.ttcn:32 setverdict(fail): fail -> fail reason:
""LTE_CryptoFunctions.ttcn:184 : f_nas_check_ip() failed"", component reason
not changed
The related wireshark message part, sent by open5gs-mmed which looks ok:
NAS-PDU:
2715e82dba020761430f90004f00700065006e00350047005346004732214171126000490100
Non-Access-Stratum (NAS)PDU
0010 = Security header type: Integrity protected and ciphered (2)
0111 = Protocol discriminator: EPS mobility management messages (0x7)
Message authentication code: 0x15e82dba
Sequence number: 2
= Security header type: Plain NAS message, not security protected
(0)
0111 = Protocol discriminator: EPS mobility management messages (0x7)
NAS EPS Mobility Management Message Type: EMM information (0x61)
Network Name - Full name for network
Time Zone - Local
Time Zone and Time - Universal Time and Local Time Zone
Daylight Saving Time
The nAS_Message :=
'0761430F90004F00700065006E00350047005346004732214171126000490100'O matches
correctly what wireshark decodes fine (the fields after "Sequence number: 2"
above), so I'd say our current function to check integrity in ttcn3 is broken.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35366?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: I1ee25fd8fde6fbce95444ee4b73918ce1f61b427
Gerrit-Change-Number: 35366
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge
Gerrit-Attention: laforge
Gerrit-Comment-Date: Thu, 14 Dec 2023 17:40:20 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: mme: Implement missing UE attach steps
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35367?usp=email )
Change subject: mme: Implement missing UE attach steps
..
mme: Implement missing UE attach steps
Related: OS#6294
Change-Id: Ib4a69aef40bf9dd17d640f650e459668f8415aaa
---
M library/GTPv2_Templates.ttcn
M library/NAS_Templates.ttcn
M library/s1ap/S1AP_Templates.ttcn
M mme/MME_Tests.ttcn
4 files changed, 319 insertions(+), 27 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/67/35367/1
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 1ccbcb8..c09bca8 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -1040,6 +1040,65 @@
privateExtension := omit
}});
+template (present) PDU_GTPCv2
+tr_GTP2C_ModifyBearerReq(template (present) OCT4 d_teid := ?,
+ template (present) OCT3 seq := ?) :=
+tr_PDU_GTP2C(d_teid, seq, {
+ modifyBearerRequest := {
+ mEI := *,
+ userLocationInfo := *,
+ servingNetwork := *,
+ rAT_Type := *,
+ indicationFlags := *,
+ fullyQualifiedTEID := *,
+ ambr := *,
+ delayDownlinkPacketNotificationReq := *,
+ bearerContextGrouped := *,
+ recovery := *,
+ uE_TimeZone := *,
+ csid := *,
+ user_CSG_Information := *,
+ iP_Addr := *,
+ portNumber := *,
+ lDN := *,
+ //maxMBR_APN_AMBR := *,
+ cNOperatorSelectionEntity := *,
+ presenceReportingAreaInformation := *,
+ overloadControlInformationGrouped := *,
+ servingPLMNRateControl := *,
+ counter := *,
+ privateExtension := *
+ }});
+
+template (value) PDU_GTPCv2
+ts_GTP2C_ModifyBearerResp(template (value) OCT4 d_teid,
+ template (value) OCT3 seq,
+ template (value) GTP2C_Cause cause,
+ template (value) uint4_t bearer_id,
+ template (omit) BearerContextGrouped_List
bearerContextGrouped := omit) :=
+ts_PDU_GTP2C(d_teid, seq, '23'O, {
+ modifyBearerResponse := {
+ cause := ts_GTP2C_Cause(cause, '0'B),
+ mSISDN := omit,
+ linkedEPS_Bearer_ID := ts_GTP2C_EpsBearerId(bearer_id),
+ aPN_Restriction := omit,
+ protocolConfigOptions := omit,
+ bearerContextGrouped := bearerContextGrouped,
+ changeReportingAction := omit,
+ cSG_InformationReportingAction := omit,
+ heNBInformationReporting := omit,
+ chargingGatewayName := omit,
+ chargingGatewayAddress := omit,
+ csid := omit,
+ recovery := omit,
+ lDN := omit,
+ indicationFlags := omit,
+ presenceReportingAreaAction := omit,
+ loadControlInformationGrouped := omit,
+ overloadControlInformationGrouped := omit,
+ pDNConnectionChargingID := omit,
+ privateExtension := omit
+ }});
template (value) PDU_GTPCv2
ts_GTP2C_DeleteBearerReq(template (value) OCT4 d_teid,
diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn
index 45f5f8d..70561b3 100644
--- a/library/NAS_Templates.ttcn
+++ b/library/NAS_Templates.ttcn
@@ -1025,6 +1025,55 @@
}
}
}
+template (present) PDU_NAS_EPS
+tr_NAS_ActDefEpsBearCtxReq(template (present) BIT4 bearer_id := ?,
+ template (present) BIT8 proc_tid := ?,
+ template (present) EPS_QualityOfServiceV qos := ?,
+ template (present) octetstring apn := ?,
+ template (present) BIT3 addr_type := ?,
+ template (present) octetstring addr_info := ?) := {
+ protocolDiscriminator := c_EPS_NAS_PD_ESM,
+ ePS_messages := {
+ ePS_SessionManagement := {
+ pDU_NAS_EPS_ActDefEPSBearerContextRequest := {
+ ePSBearerIdentity := bearer_id,
+ procedureTransactionIdentifier := proc_tid,
+ messageType := '1101'B,
+ ePS_QoS := {
+ lengthIndicator := ?,
+ ePS_QualityOfServiceV := qos
+ },
+ accessPointName := {
+ lengthIndicator := 0,
+ accessPointNameValue := apn
+ },
+ pDN_Address := {
+
