[S] Change in pysim[master]: commands.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36899?usp=email )
Change subject: commands.py: Resolve possible variable use before assignment
..
commands.py: Resolve possible variable use before assignment
pySim/commands.py:223:18: E0606: Possibly using variable 'skip' before
assignment (possibly-used-before-assignment)
Let's raise an exception in the erroneous case.
Change-Id: Id1a892c3446e472699e77f076c2414277e92c98d
---
M pySim/commands.py
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/99/36899/1
diff --git a/pySim/commands.py b/pySim/commands.py
index 9a49124..08537bd 100644
--- a/pySim/commands.py
+++ b/pySim/commands.py
@@ -211,6 +211,7 @@
# checking if the length of the remaining TLV string matches
# what we get in the length field.
# See also ETSI TS 102 221, chapter 11.1.1.3.0 Base coding.
+# TODO: this likely just is normal BER-TLV ("All data objects are
BER-TLV except if otherwise # defined.")
exp_tlv_len = int(fcp[2:4], 16)
if len(fcp[4:]) // 2 == exp_tlv_len:
skip = 4
@@ -218,6 +219,7 @@
exp_tlv_len = int(fcp[2:6], 16)
if len(fcp[4:]) // 2 == exp_tlv_len:
skip = 6
+raise ValueError('Cannot determine length of TLV-length')
# Skip FCP tag and length
tlv = fcp[skip:]
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36899?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: Id1a892c3446e472699e77f076c2414277e92c98d
Gerrit-Change-Number: 36899
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: pySim-prog.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36903?usp=email ) Change subject: pySim-prog.py: Resolve possible variable use before assignment .. pySim-prog.py: Resolve possible variable use before assignment pySim-prog.py:741:7: E0606: Possibly using variable 'cp' before assignment (possibly-used-before-assignment) Change-Id: I6ab307db378d2ca76dfeae53dc3befa7c103974d --- M pySim-prog.py 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/03/36903/1 diff --git a/pySim-prog.py b/pySim-prog.py index 3f506de..db9c327 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -723,6 +723,7 @@ card.erase() card.reset() +cp = None # Generate parameters if opts.source == 'cmdline': cp = gen_parameters(opts) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36903?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: I6ab307db378d2ca76dfeae53dc3befa7c103974d Gerrit-Change-Number: 36903 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in pysim[master]: osmo-smdpp.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36902?usp=email )
Change subject: osmo-smdpp.py: Resolve possible variable use before assignment
..
osmo-smdpp.py: Resolve possible variable use before assignment
osmo-smdpp.py:374:72: E0601: Using variable 'iccid_str' before assignment
(used-before-assignment)
Let's raise an exception in the erroneous case.
Change-Id: I01b308226e12f91699b1b5c6bb06f853be47e185
---
M osmo-smdpp.py
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/36902/1
diff --git a/osmo-smdpp.py b/osmo-smdpp.py
index 1f4311d..3dc6131 100755
--- a/osmo-smdpp.py
+++ b/osmo-smdpp.py
@@ -368,6 +368,9 @@
pes = saip.ProfileElementSequence.from_der(f.read())
iccid_str =
b2h(pes.get_pe_for_type('header').decoded['iccid'])
+# make pylint happy: E0601: Using variable 'iccid_str' before
assignment (used-before-assignment)
+assert iccid_str
+
# FIXME: we actually want to perform the profile binding herr, and
read the profile metadat from the profile
# Put together profileMetadata + _bin
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36902?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: I01b308226e12f91699b1b5c6bb06f853be47e185
Gerrit-Change-Number: 36902
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: pySim-trace.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36904?usp=email )
Change subject: pySim-trace.py: Resolve possible variable use before assignment
..
pySim-trace.py: Resolve possible variable use before assignment
pySim-trace.py:198:27: E0606: Possibly using variable 's' before assignment
(possibly-used-before-assignment)
Change-Id: I28c137a20143b2cd6ea9a0d5461ab61fcd6fe935
---
M pySim-trace.py
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/36904/1
diff --git a/pySim-trace.py b/pySim-trace.py
index be1d40b..165e338 100755
--- a/pySim-trace.py
+++ b/pySim-trace.py
@@ -194,6 +194,8 @@
s = PysharkRsproLive(opts.interface)
elif opts.source == 'gsmtap-pyshark-pcap':
s = PysharkGsmtapPcap(opts.pcap_file)
+else:
+raise ValueError("unsupported source %s", opts.source)
tracer = Tracer(source=s, suppress_status=opts.suppress_status,
suppress_select=opts.suppress_select,
show_raw_apdu=opts.show_raw_apdu)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36904?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: I28c137a20143b2cd6ea9a0d5461ab61fcd6fe935
Gerrit-Change-Number: 36904
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: euicc.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36901?usp=email )
Change subject: euicc.py: Resolve possible variable use before assignment
..
euicc.py: Resolve possible variable use before assignment
pySim/euicc.py:436:31: E0606: Possibly using variable 'p_id' before assignment
(possibly-used-before-assignment)
pySim/euicc.py:455:31: E0606: Possibly using variable 'p_id' before assignment
(possibly-used-before-assignment)
pySim/euicc.py:473:31: E0606: Possibly using variable 'p_id' before assignment
(possibly-used-before-assignment)
Let's raise an exception in the erroneous case.
Change-Id: Ifdf4651e503bae6ea3e91c89c2121b416a12fb1a
---
M pySim/euicc.py
1 file changed, 27 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/36901/1
diff --git a/pySim/euicc.py b/pySim/euicc.py
index c27c91f..7f4cdda 100644
--- a/pySim/euicc.py
+++ b/pySim/euicc.py
@@ -429,8 +429,11 @@
"""Perform an ES10c EnableProfile function."""
if opts.isdp_aid:
p_id =
ProfileIdentifier(children=[IsdpAid(decoded=opts.isdp_aid)])
-if opts.iccid:
+elif opts.iccid:
p_id = ProfileIdentifier(children=[Iccid(decoded=opts.iccid)])
+else:
+# this is guaranteed by argparse; but we need this to make
pylint happy
+raise ValueError('Either ISD-P AID or ICCID must be given')
ep_cmd_contents = [p_id,
RefreshFlag(decoded=opts.refresh_required)]
ep_cmd = EnableProfileReq(children=ep_cmd_contents)
ep = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc,
ep_cmd, EnableProfileResp)
@@ -448,8 +451,11 @@
"""Perform an ES10c DisableProfile function."""
if opts.isdp_aid:
p_id =
ProfileIdentifier(children=[IsdpAid(decoded=opts.isdp_aid)])
-if opts.iccid:
+elif opts.iccid:
p_id = ProfileIdentifier(children=[Iccid(decoded=opts.iccid)])
+else:
+# this is guaranteed by argparse; but we need this to make
pylint happy
+raise ValueError('Either ISD-P AID or ICCID must be given')
dp_cmd_contents = [p_id,
RefreshFlag(decoded=opts.refresh_required)]
dp_cmd = DisableProfileReq(children=dp_cmd_contents)
dp = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc,
dp_cmd, DisableProfileResp)
@@ -466,8 +472,11 @@
"""Perform an ES10c DeleteProfile function."""
if opts.isdp_aid:
p_id = IsdpAid(decoded=opts.isdp_aid)
-if opts.iccid:
+elif opts.iccid:
p_id = Iccid(decoded=opts.iccid)
+else:
+# this is guaranteed by argparse; but we need this to make
pylint happy
+raise ValueError('Either ISD-P AID or ICCID must be given')
dp_cmd_contents = [p_id]
dp_cmd = DeleteProfileReq(children=dp_cmd_contents)
dp = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc,
dp_cmd, DeleteProfileResp)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36901?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: Ifdf4651e503bae6ea3e91c89c2121b416a12fb1a
Gerrit-Change-Number: 36901
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: commands.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36900?usp=email )
Change subject: commands.py: Resolve possible variable use before assignment
..
commands.py: Resolve possible variable use before assignment
pySim/commands.py:608:39: E0606: Possibly using variable 'p2' before assignment
(possibly-used-before-assignment)
Let's raise an exception in the erroneous case.
Change-Id: I23adf2e89aa8a13246cc20ef022c84f0113eb2cd
---
M pySim/commands.py
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/00/36900/1
diff --git a/pySim/commands.py b/pySim/commands.py
index 08537bd..7b21faf 100644
--- a/pySim/commands.py
+++ b/pySim/commands.py
@@ -606,6 +606,8 @@
p2 = '81'
elif context == 'gsm':
p2 = '80'
+else:
+raise ValueError("Unsupported context '%s'" % context)
(data, sw) = self.send_apdu_constr_checksw(
self.cla_byte, '88', '00', p2, AuthCmd3G, cmd_data, AuthResp3G)
if 'auts' in data:
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36900?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: I23adf2e89aa8a13246cc20ef022c84f0113eb2cd
Gerrit-Change-Number: 36900
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[M] Change in osmo-sgsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-sgsn
Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 Gerrit-Change-Number: 36845 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 May 2024 15:39:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: tests: don't run osmotestconfig.py in distcheck
Attention is currently required from: daniel, fixeria, neels, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email ) Change subject: tests: don't run osmotestconfig.py in distcheck .. Patch Set 1: (1 comment) Patchset: PS1: > Thanks for having a look. I wonder what other reviewers think. I'm also not happy with having some kind of tests that *only* get executed by the jenkins.sh script. In general the assumption is that tests can be execuetd from make check or make distcheck... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3 Gerrit-Change-Number: 36864 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 May 2024 15:39:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_rau_invalid_old_rai
Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36625?usp=email ) Change subject: sgsn: add TC_attach_rau_invalid_old_rai .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36625?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: I006adabdad26c0c48e1ebe99421bcab7295dc147 Gerrit-Change-Number: 36625 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 May 2024 15:36:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections
Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add X5 timer for delaying LU connections .. Patch Set 4: Code-Review+1 (1 comment) Patchset: PS4: I also think @nhofm...@sysmocom.de should have a look -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 May 2024 15:36:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: libmsc: reset the LU delay timer (X5) on MO/MT SMS
Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email ) Change subject: libmsc: reset the LU delay timer (X5) on MO/MT SMS .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80 Gerrit-Change-Number: 36865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 May 2024 15:35:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add templates for missing PSMOs
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?usp=email )
Change subject: SGP32Definitions_Templates: add templates for missing PSMOs
..
SGP32Definitions_Templates: add templates for missing PSMOs
We do not have templates for all PSMOs (EuiccPackage) and their
results (EuiccPackageResult) yet. This packages makes the set
complete.
Related: SYS#6824
Change-Id: I354ca5f45a6157e1e40596547388147daf60b95f
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 211 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index e1ca093..d18fee4 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -344,6 +344,70 @@
}
}
}
+template (present) EuiccPackage
+tr_euiccPackage_listProfileInfo := {
+ psmoList := {
+ {
+ listProfileInfo := {
+ searchCriteria := *,
+ tagList := *
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_listProfileInfo := {
+ psmoList := {
+ {
+ listProfileInfo := {
+ searchCriteria := {
+ iccid := '123456789ABCDEFF'O
+ },
+ tagList := '92'O /* profileName */
+ }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_getRAT := {
+ psmoList := {
+ {
+ getRAT := { }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_getRAT := {
+ psmoList := {
+ {
+ getRAT := { }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_configureAutoEnable := {
+ psmoList := {
+ {
+ configureAutoEnable := {
+ autoEnableFlag := *,
+ smdpOid := *,
+ smdpAddress := *
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_configureAutoEnable := {
+ psmoList := {
+ {
+ configureAutoEnable := {
+ autoEnableFlag := NULL,
+ smdpOid := objid {1 2 3},
+ smdpAddress := "smdp.example.com"
+ }
+ }
+ }
+}
/* GSMA SGP.32, section 6.3.2.6 */
template (present) EsipaMessageFromEimToIpa
@@ -654,6 +718,139 @@
euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
}
}
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_listProfileInfo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := ?,
+ counterValue := ?,
+ transactionId := *,
+ seqNumber := ?,
+ euiccResult := {
+ {
+ listProfileInfoResult := ?
+ }
+ }
+ },
+ euiccSignEPR := ?
+ }
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_listProfileInfo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := "myEIM",
+ counterValue := 1,
+ transactionId := omit,
+ seqNumber := 123,
+ euiccResult := {
+ {
+ listProfileInfoResult := {
+ profileInfoListOk := {
+ {
+ iccid := omit,
+ isdpAid := omit,
+ profileState :=
omit,
+ profileNickname
:= omit,
+
serviceProviderName := omit,
+ profileName :=
"testme",
+
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add templates for missing PSMOs
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?usp=email ) Change subject: SGP32Definitions_Templates: add templates for missing PSMOs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?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: I354ca5f45a6157e1e40596547388147daf60b95f Gerrit-Change-Number: 36881 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 22 May 2024 15:35:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-sgsn[master]: debian/osmo-gtphub.init: delete
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email ) Change subject: debian/osmo-gtphub.init: delete .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9008944369314a4cbb345bfbf01bdb57aa7590fb Gerrit-Change-Number: 36898 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 May 2024 15:34:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-sgsn[master]: debian/osmo-gtphub.init: delete
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email )
Change subject: debian/osmo-gtphub.init: delete
..
debian/osmo-gtphub.init: delete
Remove SysV init scripts. These are not really maintained anymore and
this makes it consistent with other Osmocom projects.
Avoids synchronizing with SysV scripts on debian:
# systemctl enable osmo-gtphub
Synchronizing state of osmo-gtphub.service with SysV service script with
/usr/lib/systemd/systemd-sysv-install.
Executing: /usr/lib/systemd/systemd-sysv-install enable osmo-gtphub
Change-Id: I9008944369314a4cbb345bfbf01bdb57aa7590fb
---
D debian/osmo-gtphub.init
1 file changed, 17 insertions(+), 150 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/debian/osmo-gtphub.init b/debian/osmo-gtphub.init
deleted file mode 100755
index 160d55b..000
--- a/debian/osmo-gtphub.init
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: osmo-gtphub
-# Required-Start:$network $local_fs
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Osmocom GTP hub
-# Description: Osmocom GTP hub
-### END INIT INFO
-
-# Author: Neels Hofmeyr
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-NAME=osmo-gtphub # Introduce the short server's name
here
-DESC="Osmocom GTP hub" # Introduce a short description here
-DAEMON=/usr/bin/osmo-gtphub # Introduce the server's location here
-SCRIPTNAME=/etc/init.d/osmo-gtphub
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/osmo-gtphub ] && . /etc/default/osmo-gtphub
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-DAEMON_ARGS="$DAEMON_ARGS -D -c $CONFIG_FILE"
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --exec $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- # If the above conditions are not satisfied then add some other code
- # that waits for the process to drop all resources that could be
- # needed by services started subsequently. A last resort is to
- # sleep for some time.
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec
$DAEMON
- [ "$?" = 2 ] && return 2
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME
- return 0
-}
-
-case "$1" in
- start)
-[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
-do_start
-case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- s
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo
Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email ) Change subject: asterisk: Use Action PJSIPAccessNetworkInfo .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?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: I2759d12caeaca81a9224997a29541c325d65fe30 Gerrit-Change-Number: 36886 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 15:34:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 May 2024 14:56:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email )
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
..
ipa: Use pseudo-random number for SLS in IPA->M3UA direction
[back-port of Ia4e66d660b6057338f66a47fffc8a0d32759f733]
In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced
code that would make the LSB of the file descriptor be used as SLS
when passing packets from IPA in M3UA direction.
This did however not achieve sufficient entropy in real-world use cases.
In this change, we change over to allocating a pseudo-random SLS to each
IPA connection at the time it is established; We then assign that SLS
to each packet received on that IPA connection.
Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7
Related: SYS#6543
Closes: SYS#6802
---
M src/osmo_ss7_asp.c
M stp/stp_main.c
2 files changed, 34 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index e1c197c..b017510 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -906,7 +906,9 @@
}
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
- return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
+ /* we simply use the lower 4 bits of the asp_id, which is initialized
to a pseudo-random value upon
+* connect */
+ return ipa_rx_msg(asp, msg, asp->asp_id & 0xf);
}
/* netif code tells us we can read something from the socket */
@@ -996,6 +998,12 @@
if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) {
rc = ss7_asp_apply_peer_primary_address(asp);
rc = ss7_asp_apply_primary_address(asp);
+ } else {
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) {
+ /* we use the lower 4 bits of the asp_id feld as SLS;
let's initialize it here from a
+* pseudo-random value */
+ asp->asp_id = rand() & 0xf;
+ }
}
if (asp->lm && asp->lm->prim_cb) {
diff --git a/stp/stp_main.c b/stp/stp_main.c
index 01d1865..d630032 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -213,6 +213,8 @@
{
int rc;
+ srand(time(NULL));
+
tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp");
msgb_talloc_ctx_init(tall_stp_ctx, 0);
osmo_init_logging2(tall_stp_ctx, _info);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: for-1.8
Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7
Gerrit-Change-Number: 36884
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 .. Bump version: 1.8.1-dirty → 1.8.2 Let's tag a 1.8.2 just containing the change of more random SLS allocation in IPA / SCCPlite links. Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c --- M debian/changelog M src/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index cd1c181..b3bf213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.8.2) unstable; urgency=medium + + * ipa: Use pseudo-random number for SLS in IPA->M3UA direction + + -- Harald Welte Tue, 21 May 2024 14:28:44 +0200 + libosmo-sccp (1.8.1) unstable; urgency=medium * Fix counting received IPA packets in server mode diff --git a/src/Makefile.am b/src/Makefile.am index c87848d..5fba62a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=9:1:0 +LIBVERSION=9:2:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7 Gerrit-Change-Number: 36884 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 May 2024 14:56:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. Patch Set 4: (1 comment) File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889/comment/a9d5cf95_9a0c957e PS4, Line 245: /* source: http://www.cse.yorku.ca/~oz/hash.html */ > I am not very sure about whether this here is the right way. […] I would by default always use the jenkins hash functions, see jhash.[ch] of the Linux kernel. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 14:50:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: contrib/jenkins: set --enable-werror
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email ) Change subject: contrib/jenkins: set --enable-werror .. contrib/jenkins: set --enable-werror Fixes: OS#6460 Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index dfbbbfe..1c4fa2b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -59,7 +59,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests $CONFIG +./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 Gerrit-Change-Number: 36897 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-hnbgw[master]: contrib/jenkins: set --enable-werror
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email ) Change subject: contrib/jenkins: set --enable-werror .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 Gerrit-Change-Number: 36897 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 May 2024 07:08:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: neels, pespin.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 6:
(6 comments)
File include/osmocom/hnbgw/hnbgw.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/f24a208b_f76c6399
PS6, Line 394: struct osmo_sockaddr_str addr_remote;
> open question: to be seen whether it makes more sense to use a osmo_sockaddr
> instead here. […]
libnftables interfacing is string based, as the patch should show in other
places
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/97e043bd_58c8421e
PS6, Line 446: bool enable;
> some short comment here on what these do would be welcome.
I actually think they are self-explanatory.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/0cc2af5c_e83598e1
PS6, Line 483: struct {
> same here, some comment welcome.
I actually think they are self-explanatory.
File include/osmocom/hnbgw/nft_kpi.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/34cfe65b_bb6094e9
PS6, Line 7: struct nft_kpi_handle {
> Some comments docummenting these structs and fields may be welcome.
I actually think they are simple, clarly named and self-explanatory.
File src/osmo-hnbgw/nft_kpi.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/30e6cd61_14520ed5
PS6, Line 35: {
> I guess these will be filled up by follow-up patches adding hashtables?
those are the stubs for when you are compiling osmo-hnbgw without libnftables
support
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/9becf34f_bf329996
PS6, Line 86: static __thread struct nft_thread *g_nft_thread = NULL;
> Simply have one var per thread, even better when you split stuff into
> different files.
isn't that what __thread is for?
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca
Gerrit-Change-Number: 36539
Gerrit-PatchSet: 6
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: neels
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 21 May 2024 20:16:34 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 .. Bump version: 1.8.1-dirty → 1.8.2 Let's tag a 1.8.2 just containing the change of more random SLS allocation in IPA / SCCPlite links. Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c --- M debian/changelog M src/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/85/36885/1 diff --git a/debian/changelog b/debian/changelog index cd1c181..b3bf213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.8.2) unstable; urgency=medium + + * ipa: Use pseudo-random number for SLS in IPA->M3UA direction + + -- Harald Welte Tue, 21 May 2024 14:28:44 +0200 + libosmo-sccp (1.8.1) unstable; urgency=medium * Fix counting received IPA packets in server mode diff --git a/src/Makefile.am b/src/Makefile.am index c87848d..5fba62a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=9:1:0 +LIBVERSION=9:2:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction .. Abandoned replaced by https://gerrit.osmocom.org/c/libosmo-sccp/+/36884 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733 Gerrit-Change-Number: 36883 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email )
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
..
ipa: Use pseudo-random number for SLS in IPA->M3UA direction
[back-port of Ia4e66d660b6057338f66a47fffc8a0d32759f733]
In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced
code that would make the LSB of the file descriptor be used as SLS
when passing packets from IPA in M3UA direction.
This did however not achieve sufficient entropy in real-world use cases.
In this change, we change over to allocating a pseudo-random SLS to each
IPA connection at the time it is established; We then assign that SLS
to each packet received on that IPA connection.
Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7
Related: SYS#6543
Closes: SYS#6802
---
M src/osmo_ss7_asp.c
M stp/stp_main.c
2 files changed, 34 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/84/36884/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index e1c197c..b017510 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -906,7 +906,9 @@
}
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
- return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
+ /* we simply use the lower 4 bits of the asp_id, which is initialized
to a pseudo-random value upon
+* connect */
+ return ipa_rx_msg(asp, msg, asp->asp_id & 0xf);
}
/* netif code tells us we can read something from the socket */
@@ -996,6 +998,12 @@
if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) {
rc = ss7_asp_apply_peer_primary_address(asp);
rc = ss7_asp_apply_primary_address(asp);
+ } else {
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) {
+ /* we use the lower 4 bits of the asp_id feld as SLS;
let's initialize it here from a
+* pseudo-random value */
+ asp->asp_id = rand() & 0xf;
+ }
}
if (asp->lm && asp->lm->prim_cb) {
diff --git a/stp/stp_main.c b/stp/stp_main.c
index 01d1865..d630032 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -213,6 +213,8 @@
{
int rc;
+ srand(time(NULL));
+
tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp");
msgb_talloc_ctx_init(tall_stp_ctx, 0);
osmo_init_logging2(tall_stp_ctx, _info);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: for-1.8
Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7
Gerrit-Change-Number: 36884
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email )
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
..
ipa: Use pseudo-random number for SLS in IPA->M3UA direction
In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced
code that would make the LSB of the file descriptor be used as SLS
when passing packets from IPA in M3UA direction.
This did however not achieve sufficient entropy in real-world use cases.
In this change, we change over to allocating a pseudo-random SLS to each
IPA connection at the time it is established; We then assign that SLS
to each packet received on that IPA connection.
Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Related: SYS#6543
Closes: SYS#6802
---
M src/osmo_ss7_asp.c
M stp/stp_main.c
2 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/83/36883/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index e1c197c..b017510 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -906,7 +906,9 @@
}
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
- return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
+ /* we simply use the lower 4 bits of the asp_id, which is initialized
to a pseudo-random value upon
+* connect */
+ return ipa_rx_msg(asp, msg, asp->asp_id & 0xf);
}
/* netif code tells us we can read something from the socket */
@@ -996,6 +998,12 @@
if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) {
rc = ss7_asp_apply_peer_primary_address(asp);
rc = ss7_asp_apply_primary_address(asp);
+ } else {
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) {
+ /* we use the lower 4 bits of the asp_id feld as SLS;
let's initialize it here from a
+* pseudo-random value */
+ asp->asp_id = rand() & 0xf;
+ }
}
if (asp->lm && asp->lm->prim_cb) {
diff --git a/stp/stp_main.c b/stp/stp_main.c
index 01d1865..d630032 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -213,6 +213,8 @@
{
int rc;
+ srand(time(NULL));
+
tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp");
msgb_talloc_ctx_init(tall_stp_ctx, 0);
osmo_init_logging2(tall_stp_ctx, _info);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: for-1.8
Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Gerrit-Change-Number: 36883
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in simtrace2[master]: RFC: card emu config: add feature sim polarity
Attention is currently required from: Hoernchen, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email ) Change subject: RFC: card emu config: add feature sim polarity .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: looks good to me. Might be worth having #defines for the two bits like ``` #define CEMU_CONFIG_SIMPOL_VALID 0x02 #define CEMU_CONFIG_SIMPOL_PRES_H 0x01 ``` or the like -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I36a8acb74ad7616205af68b1626b45ab79d7cb02 Gerrit-Change-Number: 36859 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Attention: Hoernchen Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 21 May 2024 09:08:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Asterisk_Tests.default: Improve mtc logging
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: asterisk: Asterisk_Tests.default: Improve mtc logging .. asterisk: Asterisk_Tests.default: Improve mtc logging Change-Id: Id7ad0230b50d301e60f636a3b983a315112e4042 --- M asterisk/Asterisk_Tests.default 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default index ed4ec44..24c53e3 100644 --- a/asterisk/Asterisk_Tests.default +++ b/asterisk/Asterisk_Tests.default @@ -1,7 +1,6 @@ [LOGGING] FileMask := LOG_ALL | TTCN_MATCHING; - -mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; [TESTPORT_PARAMETERS] #*.*.DEBUG := "yes" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36869?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: Id7ad0230b50d301e60f636a3b983a315112e4042 Gerrit-Change-Number: 36869 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email )
Change subject: asterisk: Delay test start until FullyBooted event is received
in AMI
..
asterisk: Delay test start until FullyBooted event is received in AMI
Change-Id: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.ttcn
2 files changed, 50 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index c05403e..9fbe973 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -27,6 +27,7 @@
const charstring AMI_FIELD_ACTION := "Action";
const charstring AMI_FIELD_ACTION_ID := "ActionID";
+const charstring AMI_FIELD_EVENT := "Event";
const charstring AMI_FIELD_USERNAME := "Username";
const charstring AMI_FIELD_SECRET := "Secret";
const charstring AMI_FIELD_RESPONSE := "Response";
@@ -76,6 +77,8 @@
template (value) AMI_Field
ts_AMI_Field_ActionId(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_ACTION_ID, val);
template (value) AMI_Field
+ts_AMI_Field_Event(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_EVENT, val);
+template (value) AMI_Field
ts_AMI_Field_Username(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_USERNAME, val);
template (value) AMI_Field
ts_AMI_Field_Secret(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_SECRET, val);
@@ -88,6 +91,8 @@
template (present) AMI_Field
tr_AMI_Field_ActionId(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_ACTION_ID, val);
template (present) AMI_Field
+tr_AMI_Field_Event(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val);
+template (present) AMI_Field
tr_AMI_Field_Username(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val);
template (present) AMI_Field
tr_AMI_Field_Secret(template (present) charstring val := ?) :=
tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val);
@@ -173,6 +178,22 @@
tr_AMI_Field_ActionId(action_id)
);
+/*
+ * EVENTS
+ */
+template (present) AMI_Msg
+tr_AMI_Event(template (present) charstring ev_name := ?) := superset(
+ tr_AMI_Field_Event(ev_name)
+);
+
+/* Event: FullyBooted
+ * Privilege: system,all
+ * Status: Fully Booted
+ * Uptime: 4
+ * LastReload: 4 *
+ */
+template (present) AMI_Msg
+tr_AMI_Event_FullyBooted := tr_AMI_Event("FullyBooted");
/***
* Adapter:
@@ -420,6 +441,15 @@
}
+altstep as_ami_rx_ignore(AMI_Msg_PT pt)
+{
+ var AMI_Msg msg;
+ [] pt.receive(AMI_Msg:?) -> value msg {
+ log("Ignoring AMI message := ", msg);
+ repeat;
+ }
+}
+
private altstep as_ami_rx_fail(AMI_Msg_PT pt, template AMI_Msg exp_msg := *)
{
var AMI_Msg msg;
diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn
index 8a124c1..a71bcad 100644
--- a/asterisk/Asterisk_Tests.ttcn
+++ b/asterisk/Asterisk_Tests.ttcn
@@ -100,8 +100,18 @@
};
vc_AMI.start(f_AMI_Adapter_main(ami_pars));
-
f_ami_action_login(AMI_CLIENT, mp_ami_user, mp_ami_secret);
+
+ timer tReady;
+ tReady.start(10.0);
+ alt {
+ [] AMI_CLIENT.receive(tr_AMI_Event_FullyBooted);
+ [] as_ami_rx_ignore(AMI_CLIENT);
+ [] tReady.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("AMI FullyBooted timeout: "));
+ }
+ }
}
/* Local SIP UAs */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?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: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc
Gerrit-Change-Number: 36870
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. ttcn3-tcpdump-start.sh: Log command used to record packets Change-Id: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 --- M ttcn3-tcpdump-start.sh 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 8564cd5..8b75d0e 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -85,6 +85,7 @@ # Log stderr to CMD_OUTFILE and a dedicated error log file tee $CMD_OUTFILE < $FIFO > $CMD_OUTFILE_ERR & CMD_STR="$CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE 2>$FIFO &" +echo "$CMD_STR" eval $CMD_STR # $CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE & PID=$! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?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: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Compute nonce from rand and autn params
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: asterisk: Compute nonce from rand and autn params
..
asterisk: Compute nonce from rand and autn params
Change-Id: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58
---
M asterisk/IMS_ConnectionHandler.ttcn
M asterisk/gen_links.sh
M asterisk/regen_makefile.sh
3 files changed, 25 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/asterisk/IMS_ConnectionHandler.ttcn
b/asterisk/IMS_ConnectionHandler.ttcn
index dcf3646..d1e3185 100644
--- a/asterisk/IMS_ConnectionHandler.ttcn
+++ b/asterisk/IMS_ConnectionHandler.ttcn
@@ -10,6 +10,7 @@
*/
module IMS_ConnectionHandler {
+import from TCCEncoding_Functions all;
import from TCCOpenSecurity_Functions all;
import from General_Types all;
import from Osmocom_Types all;
@@ -65,7 +66,8 @@
charstring user,
charstring display_name,
charstring password,
- charstring nonce,
+ octetstring rand,
+ octetstring autn,
charstring ipsec_auth_key,
integer ipsec_local_spi_c,
integer ipsec_local_spi_s,
@@ -147,7 +149,8 @@
display_name := f_sip_str_quote(display_name),
password := password,
/* The Nonce field is the Base64 encoded version of the RAND value and
concatenated with the AUTN: */
- nonce := "FJh2MfZfjjeIoHmLbrzQjvbhmnzLAoAAoGsZyVRFFuU=",
+ rand := '14987631f65f8e3788a0798b6ebcd08e'O,
+ autn := 'f6e19a7ccb028000a06b19c9544516e5'O,
ipsec_auth_key := "0x5238297dfcca759bd05d48ff49bc63fa",
ipsec_local_spi_c := 4142,
ipsec_local_spi_s := 4143,
@@ -214,6 +217,13 @@
}
}
+private function f_nonce_from_rand_autn(octetstring rand, octetstring autn)
return charstring {
+ var octetstring concat := rand & autn;
+ var charstring nonce := enc_MIME_Base64(concat);
+ log("rand=", rand, " & autn=",autn, " => nonce=", nonce);
+ return nonce;
+}
+
/* HTTP Digest Authentication Using AKA (AKAv1-MD5): RFC 3310 */
function f_tr_Authorization_AKAv1MD5(WwwAuthenticate www_authenticate,
charstring username,
@@ -404,7 +414,7 @@
ts_Param("realm", f_sip_str_quote(g_pars.realm)),
ts_Param("qop", f_sip_str_quote("auth")),
ts_Param("algorithm", "AKAv1-MD5"),
- ts_Param("nonce", f_sip_str_quote(g_pars.nonce))
+ ts_Param("nonce",
f_sip_str_quote(f_nonce_from_rand_autn(g_pars.rand, g_pars.autn)))
/* "opaque not needed in IMS "*/
};
wwwAuthenticate := ts_WwwAuthenticate( {
ts_Challenge_digestCln(digestCln) } )
diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh
index 3c4495f..e42ffe3 100755
--- a/asterisk/gen_links.sh
+++ b/asterisk/gen_links.sh
@@ -7,7 +7,8 @@
DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn
TCCConversion.cc TCCInterface.cc TCCInterface_ip.h "
FILES+="TCCOpenSecurity_Functions.ttcn TCCOpenSecurity.cc
TCCOpenSecurity_Functions.hh "
-FILES+="TCCDateTime.cc TCCDateTime_Functions.ttcn"
+FILES+="TCCDateTime.cc TCCDateTime_Functions.ttcn "
+FILES+="TCCEncoding_Functions.ttcn TCCEncoding.cc " # Base64
gen_links $DIR $FILES
DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src
diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh
index 8f7eae9..f0c9bcb 100755
--- a/asterisk/regen_makefile.sh
+++ b/asterisk/regen_makefile.sh
@@ -14,6 +14,7 @@
SDP_EncDec.cc
SIPmsg_PT.cc
TCCConversion.cc
+ TCCEncoding.cc
TCCInterface.cc
TCCOpenSecurity.cc
TCCDateTime.cc
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36868?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: I2809eec496a1c2c2b5f6e3d5d3bb1c33a788bd58
Gerrit-Change-Number: 36868
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pc...
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir .. ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir dumpcap seems to be opening the pcap file it writes to *after* dropping privileges, which means even if running it as root, it will fail to create the pcap file inside a directory where that same user (even if root) doesn't have write+execute permissions. This is exactly what happens when one tries to run the ttcn3-tcmpdump-start.sh script inside docker with "--cap-add=NET_ADMIN --cap-add=SYS_RESOURCE" and root user, where it then tells dumpcap to write to a volume mounted inside docker which was created by the user outside user, hence with UID=1000 instead of UID=0 inside docker. Since tcpdump works fine in this setup, simply skip using dumpcap if it would fail to create the pcap file. Related: OS#6455 Change-Id: If8ea5bb62f4866042761d3e08fe83179bf10c75a --- M ttcn3-tcpdump-start.sh 1 file changed, 30 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 8b75d0e..4068b26 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -62,7 +62,12 @@ fi if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then - CMD="$DUMPCAP -q" + # dumpcap, *after dropping permissions*, needs to be able to write to the directory to create the pcap file: + if [ "$(stat -L -c "%u" "$TTCN3_PCAP_PATH")" = "$(id -u)" ] && [ "$(stat -L -c "%A" "$TTCN3_PCAP_PATH" | head -c 4)" = "drwx" ]; then + CMD="$DUMPCAP -q" + else + echo "NOTE: unable to use dumpcap due to missing permissions in $TTCN3_PCAP_PATH" + fi else echo "NOTE: unable to use dumpcap due to missing capabilities or suid bit" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?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: If8ea5bb62f4866042761d3e08fe83179bf10c75a Gerrit-Change-Number: 36867 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Delay test start until FullyBooted event is received in AMI
Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?usp=email ) Change subject: asterisk: Delay test start until FullyBooted event is received in AMI .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36870?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: I65f56bcee332f4ae9ffc71ad7119c378ca1649dc Gerrit-Change-Number: 36870 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:03:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pc...
Attention is currently required from: Hoernchen, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Avoid using dumpcap if it has no access to pcap parent dir .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36867?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: If8ea5bb62f4866042761d3e08fe83179bf10c75a Gerrit-Change-Number: 36867 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: Hoernchen Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:03:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log command used to record packets
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log command used to record packets .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36866?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: I8bebe53e630ba43e368700dc857b0e00d3cc7c56 Gerrit-Change-Number: 36866 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:02:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: BSC_Tests.cfg: remove commented out testcases
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?usp=email ) Change subject: bsc: BSC_Tests.cfg: remove commented out testcases .. bsc: BSC_Tests.cfg: remove commented out testcases Change-Id: Ibccc0d2072dc496f7f7017772eca8bed274ff1a5 --- M bsc/BSC_Tests.cfg 1 file changed, 9 insertions(+), 59 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 5ac91b6..34b6033 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -19,62 +19,3 @@ BSC_Tests_LCLS.control BSC_Tests_CBSP.control #BSC_Tests_OML.control -#BSC_Tests.TC_chan_act_noreply -#BSC_Tests.TC_chan_act_ack_noest -#BSC_Tests.TC_chan_act_ack_est_ind_noreply -#BSC_Tests.TC_chan_act_ack_est_ind_refused -#BSC_Tests.TC_chan_act_nack -#BSC_Tests.TC_chan_exhaustion -#BSC_Tests.TC_ctrl -#BSC_Tests.TC_chan_rel_rll_rel_ind -#BSC_Tests.TC_chan_rel_conn_fail -#BSC_Tests.TC_chan_rel_hard_clear -#BSC_Tests.TC_chan_rel_hard_rlsd -#BSC_Tests.TC_chan_rel_a_reset - -#BSC_Tests.TC_rll_est_ind_inact_lchan -#BSC_Tests.TC_rll_est_ind_inval_sapi1 -#BSC_Tests.TC_rll_est_ind_inval_sapi3 -#BSC_Tests.TC_rll_est_ind_inval_sacch - -#BSC_Tests.TC_outbound_connect -#BSC_Tests.TC_assignment_cic_only -#BSC_Tests.TC_assignment_csd -#BSC_Tests.TC_assignment_ctm -#BSC_Tests.TC_assignment_sign -#BSC_Tests.TC_assignment_fr_a5_0 -#BSC_Tests.TC_assignment_fr_a5_1_codec_missing -#BSC_Tests.TC_assignment_fr_a5_1 -#BSC_Tests.TC_assignment_fr_a5_3 -#BSC_Tests.TC_assignment_fr_a5_4 - -#BSC_Tests.TC_paging_imsi_nochan -#BSC_Tests.TC_paging_tmsi_nochan -#BSC_Tests.TC_paging_tmsi_any -#BSC_Tests.TC_paging_tmsi_sdcch -#BSC_Tests.TC_paging_tmsi_tch_f -#BSC_Tests.TC_paging_tmsi_tch_hf -#BSC_Tests.TC_paging_imsi_nochan_cgi -#BSC_Tests.TC_paging_imsi_nochan_lac_ci -#BSC_Tests.TC_paging_imsi_nochan_ci -#BSC_Tests.TC_paging_imsi_nochan_lai -#BSC_Tests.TC_paging_imsi_nochan_lac -#BSC_Tests.TC_paging_imsi_nochan_all -#BSC_Tests.TC_paging_imsi_nochan_plmn_lac_rnc -#BSC_Tests.TC_paging_imsi_nochan_rnc -#BSC_Tests.TC_paging_imsi_nochan_lac_rnc -#BSC_Tests.TC_paging_imsi_nochan_lacs -#BSC_Tests.TC_paging_imsi_nochan_lacs_empty -#BSC_Tests.TC_paging_imsi_a_reset -#BSC_Tests.TC_paging_imsi_load -#BSC_Tests.TC_paging_counter -#BSC_Tests.TC_paging_imsi_nochan_cgi_unknown_cid -#BSC_Tests.TC_rsl_drop_counter -#BSC_Tests.TC_classmark -#BSC_Tests.TC_unsol_ass_fail -#BSC_Tests.TC_unsol_ass_compl -#BSC_Tests.TC_unsol_ho_fail -#BSC_Tests.TC_err_82_short_msg -#BSC_Tests.TC_err_84_unknown_msg -#BSC_Tests.TC_ho_int -#BSC_Tests.TC_chopped_ipa_ping -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?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: Ibccc0d2072dc496f7f7017772eca8bed274ff1a5 Gerrit-Change-Number: 36877 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: bsc: execute ASCI tests, add them to expected-results.xml
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?usp=email ) Change subject: bsc: execute ASCI tests, add them to expected-results.xml .. bsc: execute ASCI tests, add them to expected-results.xml Change-Id: I78a3078df06d7aa77dda983a42ca342ef939c1b6 --- M bsc/BSC_Tests.cfg M bsc/expected-results.xml 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 34b6033..d8ed74a 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -18,4 +18,5 @@ BSC_Tests.control BSC_Tests_LCLS.control BSC_Tests_CBSP.control +BSC_Tests_ASCI.control #BSC_Tests_OML.control diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 2d69eee..f042a8c 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -317,4 +317,17 @@ + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?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: I78a3078df06d7aa77dda983a42ca342ef939c1b6 Gerrit-Change-Number: 36878 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: bsc: execute ASCI tests, add them to expected-results.xml
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?usp=email ) Change subject: bsc: execute ASCI tests, add them to expected-results.xml .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36878?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: I78a3078df06d7aa77dda983a42ca342ef939c1b6 Gerrit-Change-Number: 36878 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:02:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: BSC_Tests.cfg: remove commented out testcases
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?usp=email ) Change subject: bsc: BSC_Tests.cfg: remove commented out testcases .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36877?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: Ibccc0d2072dc496f7f7017772eca8bed274ff1a5 Gerrit-Change-Number: 36877 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:01:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36879?usp=email ) Change subject: trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36879?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I26205e8672cb2849ea79bd6206c1eff1172bd9d9 Gerrit-Change-Number: 36879 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:01:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email ) Change subject: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI .. ttcn3-bts-test: also execute tests from BTS_Tests_ASCI We do have 5 ASCI (VBS/VGCS) testcases in osmo-ttcn3-hacks.git, but we never executed them on Jenkins so far. Fix this. Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Related: osmo-ttcn3-hacks.git I3727c471663b731117a264f60d2f1ba5fd16928e --- M ttcn3-bts-test/generic/BTS_Tests.cfg 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg index cd1e739..a87c99f 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -27,3 +27,4 @@ BTS_Tests_SMSCB.control BTS_Tests_LAPDm.control BTS_Tests_VAMOS.control +BTS_Tests_ASCI.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Gerrit-Change-Number: 36872 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email ) Change subject: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI .. ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI We do have 13 ASCI (VBS/VGCS) testcases in osmo-ttcn3-hacks.git, but we never executed them on Jenkins so far. Fix this. Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 --- M ttcn3-bsc-test/BSC_Tests.cfg 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 80e06ee..2eefc85 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -73,3 +73,4 @@ BSC_Tests.control BSC_Tests_LCLS.control BSC_Tests_CBSP.control +BSC_Tests_ASCI.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 Gerrit-Change-Number: 36876 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email ) Change subject: ttcn3-bsc-test: also execute tests from BSC_Tests_ASCI .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36876?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I03f1ac2ed9ca59b90fead73fee3cf333b6146344 Gerrit-Change-Number: 36876 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:01:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email ) Change subject: ttcn3-bts-test: also execute tests from BTS_Tests_ASCI .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bcdccb6e2c48542d6447d7757fe1d56c1bf8406 Gerrit-Change-Number: 36872 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 09:01:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED
Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email ) Change subject: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5380035294d2fca481620638b59eae779670e9f8 Gerrit-Change-Number: 36862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 21 May 2024 09:00:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: SMS-over-GSUP: set log context in gsm411_gsup_rx()
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email ) Change subject: SMS-over-GSUP: set log context in gsm411_gsup_rx() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507 Gerrit-Change-Number: 36861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 08:37:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect all LAPDm testcases to pass
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?usp=email ) Change subject: bts: expected-results.xml: expect all LAPDm testcases to pass .. bts: expected-results.xml: expect all LAPDm testcases to pass Change-Id: I2e9dcf6d06cd5aa51294769ac492a968c4f86e7d Related: OS#5971 -- TC_sabm_ua_dcch_sapi0_nopayload Related: OS#5970 -- TC_sabm_retransmit_bts Related: OS#5969 -- TC_ns_seq_error Related: OS#5968 -- TC_nr_seq_error --- M bts/expected-results.xml 1 file changed, 17 insertions(+), 24 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 9157f37..0d6dab2 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -225,39 +225,19 @@ - -Initial SABM/UA must contain L3 payload but BTS accepts without - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_sabm_ua_dcch_sapi0_nopayload testcase - - + - -Incorrect number of SABM re-transmissions of observed: 7 - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_sabm_retransmit_bts testcase - - + - -Missing second REJ - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_ns_seq_error testcase - - - -Missing DISC from BTS - BTS_Tests_LAPDm.ttcn:MASKED BTS_Tests_LAPDm control part - BTS_Tests_LAPDm.ttcn:MASKED TC_nr_seq_error testcase - - + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?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: I2e9dcf6d06cd5aa51294769ac492a968c4f86e7d Gerrit-Change-Number: 36874 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: add missing testcases
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?usp=email ) Change subject: bts: expected-results.xml: add missing testcases .. bts: expected-results.xml: add missing testcases Change-Id: I10f6b3f2b201338b2839a6f16edd450e4968b0eb --- M bts/expected-results.xml 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 0d6dab2..c06f328 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -102,6 +102,7 @@ + @@ -261,4 +262,9 @@ + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?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: I10f6b3f2b201338b2839a6f16edd450e4968b0eb Gerrit-Change-Number: 36875 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: add missing testcases
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?usp=email ) Change subject: bts: expected-results.xml: add missing testcases .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36875?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: I10f6b3f2b201338b2839a6f16edd450e4968b0eb Gerrit-Change-Number: 36875 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 08:35:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?usp=email ) Change subject: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail .. bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail Change-Id: I02aa92f2ddb99b86f5c692319c57dd926c295da1 Related: OS#6167 --- M bts/expected-results.xml 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/expected-results.xml b/bts/expected-results.xml index a856fca..9157f37 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -182,7 +182,12 @@ - + +Rx unexpected RSL port message: MASKED + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_data_rtp_tchf144 testcase + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?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: I02aa92f2ddb99b86f5c692319c57dd926c295da1 Gerrit-Change-Number: 36873 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect all LAPDm testcases to pass
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?usp=email ) Change subject: bts: expected-results.xml: expect all LAPDm testcases to pass .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36874?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: I2e9dcf6d06cd5aa51294769ac492a968c4f86e7d Gerrit-Change-Number: 36874 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 08:35:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?usp=email ) Change subject: bts: expected-results.xml: expect TC_data_rtp_tchf144 to fail .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36873?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: I02aa92f2ddb99b86f5c692319c57dd926c295da1 Gerrit-Change-Number: 36873 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 21 May 2024 08:34:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement support to handle 2nd REGISTER through ipsec
Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email ) Change subject: asterisk: Implement support to handle 2nd REGISTER through ipsec .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?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: Ic042422788ee406f5b71ca3878bc5617e5455579 Gerrit-Change-Number: 36856 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 16 May 2024 22:15:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Fix missing ':' between URI scheme and host
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36855?usp=email ) Change subject: SIP_Templates: Fix missing ':' between URI scheme and host .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36855?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: I5369db54901d50cf08d7ffc3e0d1cf3f5091e77b Gerrit-Change-Number: 36855 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 16 May 2024 22:14:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log issue with packet dumper not properly sta...
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36853?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log issue with packet dumper not properly started .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36853?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: I50af5eb16a000c4f3585a3458f9130a349eff097 Gerrit-Change-Number: 36853 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 16 May 2024 22:14:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: asterisk/AMI_Functions: Add workaround for empty 'Hint: ' field
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36854?usp=email ) Change subject: asterisk/AMI_Functions: Add workaround for empty 'Hint: ' field .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36854?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: I50fb51fab3755e4d63f3a0bc06d90b42814231d2 Gerrit-Change-Number: 36854 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 16 May 2024 22:02:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: asterisk/expected-results.xml: Add missing TC_ims_registration
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36852?usp=email ) Change subject: asterisk/expected-results.xml: Add missing TC_ims_registration .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36852?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: Ie4f589a398f93b429a8b4a93da1b80784b4013ea Gerrit-Change-Number: 36852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 16 May 2024 22:02:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve tr/ts_provideEimPackageResult_ePR...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36850?usp=email )
Change subject: SGP32Definitions_Templates: improve
tr/ts_provideEimPackageResult_ePRAndNotif
..
SGP32Definitions_Templates: improve tr/ts_provideEimPackageResult_ePRAndNotif
The template tr_provideEimPackageResult_ePRAndNotif has a fixed eUICC package,
let's turn the contained eUICC package into a template parameter so that
we can define the eUICC package templates separately. To be complete, let's
also add a ts_provideEimPackageResult_ePRAndNotif
Related: SYS#6824
Change-Id: If04be6407eb41274b378571147ab469d449eac4a
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 171 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index 191d9e4..e87cb49 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -512,15 +512,169 @@
}
/* GSMA SGP.32, section 6.3.2.7 */
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_enablePsmo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := ?,
+ counterValue := ?,
+ transactionId := *,
+ seqNumber := ?,
+ euiccResult := {
+ {
+ enableResult := ?
+ }
+ }
+ },
+ euiccSignEPR := ?
+ }
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_enablePsmo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := "myEIM",
+ counterValue := 1,
+ transactionId := omit,
+ seqNumber := 123,
+ euiccResult := {
+ {
+ enableResult := 0
+ }
+ }
+ },
+ euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
+ }
+}
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_disablePsmo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := ?,
+ counterValue := ?,
+ transactionId := *,
+ seqNumber := ?,
+ euiccResult := {
+ {
+ disableResult := ?
+ }
+ }
+ },
+ euiccSignEPR := ?
+ }
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_disablePsmo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := "myEIM",
+ counterValue := 1,
+ transactionId := omit,
+ seqNumber := 123,
+ euiccResult := {
+ {
+ disableResult := 0
+ }
+ }
+ },
+ euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
+ }
+}
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_deletePsmo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := ?,
+ counterValue := ?,
+ transactionId := *,
+ seqNumber := ?,
+ euiccResult := {
+ {
+ deleteResult := ?
+ }
+ }
+ },
+ euiccSignEPR := ?
+ }
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_deletePsmo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := "myEIM",
+ counterValue := 1,
+ transactionId := omit,
+ seqNumber := 123,
+ euiccResult := {
+ {
+ deleteResult := 0
+ }
+ }
+ },
+ euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
+ }
+}
+templat
[S] Change in osmo-ttcn3-hacks[master]: IPA_Tests: fix matching of tr_provideEimPackageResult_ePRAndNotif
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36851?usp=email )
Change subject: IPA_Tests: fix matching of
tr_provideEimPackageResult_ePRAndNotif
..
IPA_Tests: fix matching of tr_provideEimPackageResult_ePRAndNotif
The template tr_provideEimPackageResult_ePRAndNotif got extended and
has now default parameters that break TC_proc_euicc_pkg_dwnld_exec_rollback,
so we must set euiccPackageResult to "?" to restore the original conditions
of the testcase.
Related: SYS#6563
Change-Id: I1e8c83a317619673cd091da585e44af1a6d8c866
---
M ipad/IPAd_Tests.ttcn
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ipad/IPAd_Tests.ttcn b/ipad/IPAd_Tests.ttcn
index 024c502..c5ee412 100644
--- a/ipad/IPAd_Tests.ttcn
+++ b/ipad/IPAd_Tests.ttcn
@@ -598,7 +598,7 @@
/* Step #10-14 */
esipa_res :=
valueof(ts_provideEimPackageResultResponse_eimAck(eimAcknowledgements :=
{1,2,3,4}));
esipa_req := f_esipa_transceive(esipa_res);
- if (not match(esipa_req, tr_provideEimPackageResult_ePRAndNotif)) {
+ if (not match(esipa_req,
tr_provideEimPackageResult_ePRAndNotif(euiccPackageResult := ?))) {
setverdict(fail, "unexpected message from IPAd");
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36851?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: I1e8c83a317619673cd091da585e44af1a6d8c866
Gerrit-Change-Number: 36851
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: split off profileInstallationResultData int...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36820?usp=email )
Change subject: RSPDefinitions_Templates: split off
profileInstallationResultData into templates
..
RSPDefinitions_Templates: split off profileInstallationResultData into templates
The field profileInstallationResultData in tr/ts_profileInstallationResult
is also present in SGP.32 messages, so lets split this field into a separate
template so that we can use it in the SGP32Definitions_Templates as
well.
Related: SYS#6824
Change-Id: Ie38443f86ed2d8d758f894ff4276ac4109cd2e6d
---
M library/euicc/RSPDefinitions_Templates.ttcn
1 file changed, 46 insertions(+), 28 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/library/euicc/RSPDefinitions_Templates.ttcn
b/library/euicc/RSPDefinitions_Templates.ttcn
index bae10fd..fc87ff6 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -210,43 +210,46 @@
}
/* GSMA SGP.22, section 2.5.6 */
+template (present) ProfileInstallationResultData
+tr_profileInstallationResultData := {
+ transactionId := ?,
+ notificationMetadata := {
+ seqNumber := ?,
+ profileManagementOperation := ?,
+ notificationAddress := ?,
+ iccid := *
+ },
+ smdpOid := ?,
+ finalResult := ?
+}
+template (value) ProfileInstallationResultData
+ts_profileInstallationResultData := {
+ transactionId := 'AABBCC'O,
+ notificationMetadata := {
+ seqNumber := 1234,
+ profileManagementOperation := '01'B, /* is this correct?
(notificationInstall) */
+ notificationAddress := "smdp.example.com",
+ iccid := omit
+ },
+ smdpOid := id_rsp, /* random OBJECT IDENTIFIER for testing */
+ finalResult := {
+ successResult := {
+ aid := '0102030405'O,
+ simaResponse :=
'4141414141414141414141414141414141414141414141414141'O
+ }
+ }
+}
template (present) ProfileInstallationResult
tr_profileInstallationResult := {
- profileInstallationResultData := {
- transactionId := ?,
- notificationMetadata := {
- seqNumber := ?,
- profileManagementOperation := ?,
- notificationAddress := ?,
- iccid := *
- },
- smdpOid := ?,
- finalResult := ?
- },
+ profileInstallationResultData := tr_profileInstallationResultData,
euiccSignPIR := ?
}
template (value) ProfileInstallationResult
ts_profileInstallationResult := {
- profileInstallationResultData := {
- transactionId := 'AABBCC'O,
- notificationMetadata := {
- seqNumber := 1234,
- profileManagementOperation := '01'B, /* is this
correct? (notificationInstall) */
- notificationAddress := "smdp.example.com",
- iccid := omit
- },
- smdpOid := id_rsp, /* random OBJECT IDENTIFIER for testing */
- finalResult := {
- successResult := {
- aid := '0102030405'O,
- simaResponse :=
'4141414141414141414141414141414141414141414141414141'O
- }
- }
- },
+ profileInstallationResultData := ts_profileInstallationResultData,
euiccSignPIR := '00112233445566778899AABBCCDDEEFF'O
}
-
/* GSMA SGP.22, section 5.6.1 (ES9+) */
template (present) RemoteProfileProvisioningRequest
tr_initiateAuthenticationRequest(template (present) octetstring euiccChallenge
:= ?,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36820?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: Ie38443f86ed2d8d758f894ff4276ac4109cd2e6d
Gerrit-Change-Number: 36820
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve tr/ts_getEimPackageResponse_euicc...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36849?usp=email )
Change subject: SGP32Definitions_Templates: improve
tr/ts_getEimPackageResponse_euiccPkgReq
..
SGP32Definitions_Templates: improve tr/ts_getEimPackageResponse_euiccPkgReq
The template ts_getEimPackageResponse_euiccPkgReq has a fixed eUICC package,
let's turn the contained eUICC package into a template parameter so that
we can define the eUICC package templates separately. To be complete, let's
also add a tr_getEimPackageResponse_euiccPkgReq
Related: SYS#6824
Change-Id: Ibcea9063f25cc8ba90b53c34218c766fa5cab895
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 126 insertions(+), 11 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index fa1f756..191d9e4 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -251,9 +251,118 @@
}
}
+/* GSMA SGP.32, section 2.11.1.1.3 */
+template (present) EuiccPackage
+tr_euiccPackage_enablePsmo := {
+ psmoList := {
+ {
+ enable := {
+ iccid := ?,
+ rollbackFlag := *
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_enablePsmo := {
+ psmoList := {
+ {
+ enable := {
+ iccid := '123456789ABCDEFF'O,
+ rollbackFlag := NULL
+ }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_disablePsmo := {
+ psmoList := {
+ {
+ disable := {
+ iccid := ?
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_disablePsmo := {
+ psmoList := {
+ {
+ disable := {
+ iccid := '123456789ABCDEFF'O
+ }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_deletePsmo := {
+ psmoList := {
+ {
+ delete := {
+ iccid := ?
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_deletePsmo := {
+ psmoList := {
+ {
+ delete := {
+ iccid := '123456789ABCDEFF'O
+ }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_disableAndDeletePsmo := {
+ psmoList := {
+ {
+ disable := {
+ iccid := ?
+ }
+ },
+ {
+ delete := {
+ iccid := ?
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_disableAndDeletePsmo := {
+ psmoList := {
+ {
+ disable := {
+ iccid := '123456789ABCDEFF'O
+ }
+ },
+ {
+ delete := {
+ iccid := '123456789ABCDEFF'O
+ }
+ }
+ }
+}
+
/* GSMA SGP.32, section 6.3.2.6 */
+template (present) EsipaMessageFromEimToIpa
+tr_getEimPackageResponse_euiccPkgReq(template (present) EuiccPackage
euiccPackage := tr_euiccPackage_enablePsmo) := {
+ getEimPackageResponse := {
+ euiccPackageRequest := {
+ euiccPackageSigned := {
+ eimId := ?,
+ eidValue := ?,
+ counterValue := ?,
+ transactionId := *,
+ euiccPackage := euiccPackage
+ },
+ eimSignature := ?
+ }
+ }
+}
template (value) EsipaMessageFromEimToIpa
-ts_getEimPackageResponse_euiccPkgReq := {
+ts_getEimPackageResponse_euiccPkgReq(template (value) EuiccPackage
euiccPackage := ts_euiccPackage_enablePsmo) := {
getEimPackageResponse := {
euiccPackageRequest := {
euiccPackageSigned := {
@@ -261,16 +370,7 @@
eidValue := '00112233445566778899AABBCCDDEEFF'O,
counterValue := 123,
transactionId := omit,
- euiccPackage
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add new template
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36821?usp=email )
Change subject: SGP32Definitions_Templates: add new template
..
SGP32Definitions_Templates: add new template
We do not have a template for the EsipaMessageFromIpaToEim message
that contains the HandleNotification field with the
profileInstallationResult, so lets add one.
Related: SYS#6824
Change-Id: Ic5d1b2ea1d3d7de20fbcb029b36e9f9daa27cce0
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 38 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index 0e5cf57..fa1f756 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -387,6 +387,30 @@
}
}
+/* GSMA SGP.32, section 6.3.2.4 */
+template (present) EsipaMessageFromIpaToEim
+tr_handleNotificationEsipa_prfleInstRslt := {
+ handleNotificationEsipa := {
+ pendingNotification := {
+ profileInstallationResult := {
+ profileInstallationResultData :=
tr_profileInstallationResultData,
+ euiccSignPIR := ?
+ }
+ }
+ }
+}
+template (value) EsipaMessageFromIpaToEim
+ts_handleNotificationEsipa_prfleInstRslt := {
+ handleNotificationEsipa := {
+ pendingNotification := {
+ profileInstallationResult := {
+ profileInstallationResultData :=
ts_profileInstallationResultData,
+ euiccSignPIR :=
'00112233445566778899AABBCCDDEEFF'O
+ }
+ }
+ }
+}
+
/* GSMA SGP.32, section 6.3.2.7 */
template (present) EsipaMessageFromIpaToEim
tr_provideEimPackageResult_ePRAndNotif := {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36821?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: Ic5d1b2ea1d3d7de20fbcb029b36e9f9daa27cce0
Gerrit-Change-Number: 36821
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: add default values to templates
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36817?usp=email )
Change subject: RSPDefinitions_Templates: add default values to templates
..
RSPDefinitions_Templates: add default values to templates
The templates ts_getBoundProfilePackageRequest and
ts_getBoundProfilePackageResponse have no default values for their
parameters.
Change-Id: I6b26f70962ad1258c7a43b22a6778883288d0876
Related: SYS#6824
---
M library/euicc/RSPDefinitions_Templates.ttcn
1 file changed, 18 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/library/euicc/RSPDefinitions_Templates.ttcn
b/library/euicc/RSPDefinitions_Templates.ttcn
index 7e0884f..41b228f 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -311,8 +311,8 @@
}
}
template (value) RemoteProfileProvisioningRequest
-ts_getBoundProfilePackageRequest(template (value) octetstring transactionId,
-template (value) PrepareDownloadResponse
prepareDownloadResponse) := {
+ts_getBoundProfilePackageRequest(template (value) octetstring transactionId :=
'AABBCC'O,
+template (value) PrepareDownloadResponse
prepareDownloadResponse := ts_prepareDownloadResponse) := {
getBoundProfilePackageRequest := {
transactionId := transactionId,
prepareDownloadResponse := prepareDownloadResponse
@@ -329,8 +329,8 @@
}
}
template (value) RemoteProfileProvisioningResponse
-ts_getBoundProfilePackageResponse(template (value) octetstring transactionId,
- template (value) BoundProfilePackage
boundProfilePackage) := {
+ts_getBoundProfilePackageResponse(template (value) octetstring transactionId
:= 'AABBCC'O,
+ template (value) BoundProfilePackage
boundProfilePackage := ts_boundProfilePackage) := {
getBoundProfilePackageResponse := {
getBoundProfilePackageOk := {
transactionId := transactionId,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36817?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: I6b26f70962ad1258c7a43b22a6778883288d0876
Gerrit-Change-Number: 36817
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: split off downloadResponseOk into templates
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36818?usp=email )
Change subject: RSPDefinitions_Templates: split off downloadResponseOk into
templates
..
RSPDefinitions_Templates: split off downloadResponseOk into templates
The field downloadResponseOk in tr/ts_prepareDownloadResponse is also
present in SGP.32 messages, so lets split this field into a separate
template so that we can use it in the SGP32Definitions_Templates as
well.
Change-Id: Id29e2aafee4ff37c25037c75f97f280784b57619
Related: SYS#6824
---
M library/euicc/RSPDefinitions_Templates.ttcn
1 file changed, 35 insertions(+), 16 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/euicc/RSPDefinitions_Templates.ttcn
b/library/euicc/RSPDefinitions_Templates.ttcn
index 41b228f..bae10fd 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -447,27 +447,31 @@
}
/* GSMA SGP.22, section 5.7.5 (ES10x) */
+template (present) PrepareDownloadResponseOk
+tr_prepareDownloadResponseOk := {
+ euiccSigned2 := {
+ transactionId := ?,
+ euiccOtpk := ?,
+ hashCc := *
+ },
+ euiccSignature2 := ?
+}
+template (value) PrepareDownloadResponseOk
+ts_prepareDownloadResponseOk := {
+ euiccSigned2 := {
+ transactionId := 'ABCDEF'O,
+ euiccOtpk := 'AABBCCDDEEFF'O,
+ hashCc := omit
+ },
+ euiccSignature2 := ''O
+}
template (present) PrepareDownloadResponse
tr_prepareDownloadResponse := {
- downloadResponseOk := {
- euiccSigned2 := {
- transactionId := ?,
- euiccOtpk := ?,
- hashCc := *
- },
- euiccSignature2 := ?
- }
+ downloadResponseOk := tr_prepareDownloadResponseOk
}
template (value) PrepareDownloadResponse
ts_prepareDownloadResponse := {
- downloadResponseOk := {
- euiccSigned2 := {
- transactionId := 'ABCDEF'O,
- euiccOtpk := 'AABBCCDDEEFF'O,
- hashCc := omit
- },
- euiccSignature2 := ''O
- }
+ downloadResponseOk := ts_prepareDownloadResponseOk
}
/* GSMA SGP.22, section 5.7.7 (ES10x) */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36818?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: Id29e2aafee4ff37c25037c75f97f280784b57619
Gerrit-Change-Number: 36818
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add new template
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36819?usp=email )
Change subject: SGP32Definitions_Templates: add new template
..
SGP32Definitions_Templates: add new template
We do not have a template for the GetBoundProfilePackageRequestEsipa,
so lets add one.
Change-Id: I90b699de01c0476262f0e25c196a147e0ccd44aa
Related: SYS#6824
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 33 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index 26ded29..0e5cf57 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -316,6 +316,26 @@
}
/* GSMA SGP.32, section 6.3.2.3 */
+template (present) EsipaMessageFromIpaToEim
+tr_getBoundProfilePackageRequestEsipa := {
+ getBoundProfilePackageRequestEsipa := {
+ transactionId := ?,
+ prepareDownloadResponse := {
+ downloadResponseOk := tr_prepareDownloadResponseOk
+ }
+ }
+}
+template (value) EsipaMessageFromIpaToEim
+ts_getBoundProfilePackageRequestEsipa := {
+ getBoundProfilePackageRequestEsipa := {
+ transactionId := 'ABCDEF'O,
+ prepareDownloadResponse := {
+ downloadResponseOk := ts_prepareDownloadResponseOk
+ }
+ }
+}
+
+/* GSMA SGP.32, section 6.3.2.3 */
template (present) EsipaMessageFromEimToIpa
tr_getBoundProfilePackageResponseEsipa := {
getBoundProfilePackageResponseEsipa := {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36819?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: I90b699de01c0476262f0e25c196a147e0ccd44aa
Gerrit-Change-Number: 36819
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: improve comments, add spec referenes
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36848?usp=email )
Change subject: IPAd_Tests: improve comments, add spec referenes
..
IPAd_Tests: improve comments, add spec referenes
Related: SYS#6563
Change-Id: I5e321b17d24df622c428193ae6ad6fc0dfc9a097
---
M ipad/IPAd_Tests.ttcn
1 file changed, 16 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/ipad/IPAd_Tests.ttcn b/ipad/IPAd_Tests.ttcn
index b3e1a99..024c502 100644
--- a/ipad/IPAd_Tests.ttcn
+++ b/ipad/IPAd_Tests.ttcn
@@ -419,7 +419,8 @@
/* * */
-/* A testcase to try out an the Common Mutual Authentication Procedure */
+/* A testcase to try out an indirect profile download,
+ * See also: GSMA SGP.32, section 3.2.3.2: Indirect Profile Download */
private function f_TC_proc_indirect_prfle_dwnld(charstring id) runs on
IPAd_ConnHdlr {
var EsipaMessageFromIpaToEim esipa_req;
var EsipaMessageFromEimToIpa esipa_res;
@@ -504,7 +505,8 @@
}
-/* A testcase to try out an the Generic eUICC Package Download and Execution
Procedure */
+/* A testcase to try out an the Generic eUICC Package Download and Execution
Procedure,
+ * See also: GSMA SGP.32, section 3.3.1: Generic eUICC Package Download and
Execution */
private function f_TC_proc_euicc_pkg_dwnld_exec(charstring id) runs on
IPAd_ConnHdlr {
var EsipaMessageFromIpaToEim esipa_req;
var EsipaMessageFromEimToIpa esipa_res;
@@ -558,7 +560,8 @@
}
-/* A testcase to try out an the Generic eUICC Package Download and Execution
Procedure, but this time we force a rollback meneuver */
+/* A testcase to try out an the Generic eUICC Package Download and Execution
Procedure,
+ * but this time we force a rollback meneuver */
private function f_TC_proc_euicc_pkg_dwnld_exec_rollback(charstring id) runs
on IPAd_ConnHdlr {
var EsipaMessageFromIpaToEim esipa_req;
var EsipaMessageFromEimToIpa esipa_res;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36848?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: I5e321b17d24df622c428193ae6ad6fc0dfc9a097
Gerrit-Change-Number: 36848
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: IPA_Tests: fix matching of tr_provideEimPackageResult_ePRAndNotif
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36851?usp=email ) Change subject: IPA_Tests: fix matching of tr_provideEimPackageResult_ePRAndNotif .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36851?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: I1e8c83a317619673cd091da585e44af1a6d8c866 Gerrit-Change-Number: 36851 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:02:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve tr/ts_provideEimPackageResult_ePR...
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36850?usp=email ) Change subject: SGP32Definitions_Templates: improve tr/ts_provideEimPackageResult_ePRAndNotif .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36850?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: If04be6407eb41274b378571147ab469d449eac4a Gerrit-Change-Number: 36850 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:01:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve tr/ts_getEimPackageResponse_euicc...
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36849?usp=email ) Change subject: SGP32Definitions_Templates: improve tr/ts_getEimPackageResponse_euiccPkgReq .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36849?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: Ibcea9063f25cc8ba90b53c34218c766fa5cab895 Gerrit-Change-Number: 36849 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:01:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add new template
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36821?usp=email ) Change subject: SGP32Definitions_Templates: add new template .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36821?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: Ic5d1b2ea1d3d7de20fbcb029b36e9f9daa27cce0 Gerrit-Change-Number: 36821 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:01:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add new template
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36819?usp=email ) Change subject: SGP32Definitions_Templates: add new template .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36819?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: I90b699de01c0476262f0e25c196a147e0ccd44aa Gerrit-Change-Number: 36819 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:01:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: split off profileInstallationResultData int...
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36820?usp=email ) Change subject: RSPDefinitions_Templates: split off profileInstallationResultData into templates .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36820?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: Ie38443f86ed2d8d758f894ff4276ac4109cd2e6d Gerrit-Change-Number: 36820 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:01:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: split off downloadResponseOk into templates
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36818?usp=email ) Change subject: RSPDefinitions_Templates: split off downloadResponseOk into templates .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36818?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: Id29e2aafee4ff37c25037c75f97f280784b57619 Gerrit-Change-Number: 36818 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:01:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: add default values to templates
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36817?usp=email ) Change subject: RSPDefinitions_Templates: add default values to templates .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36817?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: I6b26f70962ad1258c7a43b22a6778883288d0876 Gerrit-Change-Number: 36817 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:00:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: improve comments, add spec referenes
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36848?usp=email ) Change subject: IPAd_Tests: improve comments, add spec referenes .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36848?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: I5e321b17d24df622c428193ae6ad6fc0dfc9a097 Gerrit-Change-Number: 36848 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 16 May 2024 22:00:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in ...osmo-epdg[master]: docs: add basic manual of the osmo-epdg
laforge has submitted this change. (
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783?usp=email )
Change subject: docs: add basic manual of the osmo-epdg
..
docs: add basic manual of the osmo-epdg
Change-Id: I596b6a351b7356aefa7e69f95521bc4012b9264b
---
A docs/manuals/Makefile
A docs/manuals/chapters/osmo-epdg.adoc
A docs/manuals/chapters/overview.adoc
A docs/manuals/chapters/strongswan.adoc
A docs/manuals/osmo-epdg-erlang.dot
A docs/manuals/osmo-epdg-overview.dot
A docs/manuals/osmoepdg-usermanual-docinfo.xml
A docs/manuals/osmoepdg-usermanual.adoc
A docs/manuals/strongswan-ue-connection.msc
A docs/manuals/ue-connects.msc
A docs/manuals/ue-connects2.msc
11 files changed, 458 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/docs/manuals/Makefile b/docs/manuals/Makefile
new file mode 100644
index 000..36f64b5
--- /dev/null
+++ b/docs/manuals/Makefile
@@ -0,0 +1,13 @@
+# A simplistic Makefile to use without autoconf
+#
+# Install osmo-gsm-manuals or use `export
OSMO_GSM_MANUALS_DIR=/path/to/osmo-gsm-manuals`
+
+OSMO_GSM_MANUALS_DIR ?= /usr/share/osmo-gsm-manuals/
+srcdir ?= $(realpath .)
+
+ASCIIDOC = osmoepdg-usermanual.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.dot $(srcdir)/*.msc
+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
+
+OSMO_REPOSITORY = osmo-epdg
+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
diff --git a/docs/manuals/chapters/osmo-epdg.adoc
b/docs/manuals/chapters/osmo-epdg.adoc
new file mode 100644
index 000..9318fcd
--- /dev/null
+++ b/docs/manuals/chapters/osmo-epdg.adoc
@@ -0,0 +1,96 @@
+[[osmoepdg]]
+== osmo-epdg/erlang
+
+The core component of the osmo-epdg is the osmo-epdg/erlang daemon.
+It holds the state of the UE and communicates with the relevant core
components.
+
+[[fig-osmo-epdg-erlang]]
+.osmo-epdg/erlang structure
+[graphviz]
+
+include::{srcdir}/osmo-epdg-erlang.dot[]
+
+
+=== Debian packages
+
+For Debian based distributions, Osmocom provides package repositories:
+
+- https://osmocom.org/projects/cellular-infrastructure/wiki/Latest_Builds
+- https://osmocom.org/projects/cellular-infrastructure/wiki/Nightly_Builds
+
+The osmo-epdg package contains a systemd.service file and a default example
configuration.
+
+=== Configuration
+
+The osmo-epdg/erlang is configured via Erlang configuration
(https://www.erlang.org/doc/man/config.html).
+When using the osmo-epdg debian package, the default location for the
configuration is
+*/etc/osmocom/osmo-epdg.config*.
+
+= CEIA: Connection for strongSwan
+
+The CEIA is the internal protocol between strongSwan and osmo-epdg/erlang.
+See [CEIA]
+
+[format="csv",options="header"]
+|===
+key, default, description
+gsup_local_ip, 127.0.0.1, bind IP of the GSUP server (TCP). strongSwan
connects to this IP.
+gsup_local_port, 4222, bind TCP server port
+|===
+
+= SWx (diameter)
+
+SWx (<<3gpp-ts-29-273>>): Interface between AAA and HSS.
+The AAA will retrieve authentication, authorize the UE and
+update the location (AAA, PGW address) in the HSS.
+
+See Erlang diameter specific behaviour on
https://www.erlang.org/doc/man/diameter.html
+
+[format="csv",options="header"]
+|===
+key,default,description
+dia_swx_remote_ip, 127.0.0.1, Remote IP of the HSS
+dia_swx_remote_port, 3868, SCTP port of the HSS
+dia_swx_proto, sctp, Protocol. sctp or tcp
+dia_swx_connect_timer, 3, Watchdog Connect timer in ms. RFC
6733.dia_swx_watchdog_timer, 3, Watchdog TwInit. RFC 3539.
+dia_swx_watchdog_config, "[ok, suspect]", See
https://www.erlang.org/doc/man/diameter.html
+dia_swx_transmit_timer, 1, SWx Transmit Timeout (ms)
+dia_swx_vendor_id, 0, Diameter Vendor Id
+dia_swx_origin_host, epdg.localdomain, Diameter Origin Host
+dia_swx_origin_realm, localdomain, Diameter Origin Realm
+|===
+
+= S6b (diameter)
+
+S6b (<<3gpp-ts-29-273>>): Interface between AAA and PGW.
+Authorize the GTP session of the ePDG.
+
+See Erlang diameter specific behaviour on
https://www.erlang.org/doc/man/diameter.html
+
+[format="csv",options="header"]
+|===
+key,default,description
+dia_s6b_local_ip, 127.0.0.10, local bind IP
+dia_s6b_local_port, 3868, local bind Port
+dia_s6b_proto, sctp, Protocol. sctp or tcp
+dia_s6b_connect_timer, 3, Watchdog Connect timer in ms. RFC 6733.
+dia_s6b_watchdog_timer, 3, Watchdog TwInit. RFC 3539.
+dia_s6b_watchdog_config, "[ok, suspect]", See
https://www.erlang.org/doc/man/diameter.html
+dia_s6b_vendor_id, 0, Diameter Vendor Id
+dia_s6b_origin_host, aaa.localdomain, Diameter Origin Host
+dia_s6b_origin_realm, localdomain, Diameter Origin Realm
+|===
+
+= S2b (GTPv2)
+
+S2b (<<3gpp-ts-29-273>>): Interface between ePDG and PGW.
+GT
[S] Change in ...osmo-epdg[master]: docs: add acknowledgement to nlnet for funding this project
laforge has submitted this change. (
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36847?usp=email )
Change subject: docs: add acknowledgement to nlnet for funding this project
..
docs: add acknowledgement to nlnet for funding this project
Change-Id: Ic822a25bc680acf978e5f45be13e7a9f4d70f229
---
A docs/manuals/chapters/acknowledgement.adoc
M docs/manuals/osmoepdg-usermanual.adoc
2 files changed, 20 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/docs/manuals/chapters/acknowledgement.adoc
b/docs/manuals/chapters/acknowledgement.adoc
new file mode 100644
index 000..106b74e
--- /dev/null
+++ b/docs/manuals/chapters/acknowledgement.adoc
@@ -0,0 +1,9 @@
+[[acknowledgement]]
+== Acknowledgement
+
+=== NLNet User-Operated Internet Fund
+
+osmo-epdg was funded by NLNet https://nlnet.nl/project/Osmocom-ePDG/ under the
+User-Operated Internet Fund.
+
+Thank you for sponsoring this project.
diff --git a/docs/manuals/osmoepdg-usermanual.adoc
b/docs/manuals/osmoepdg-usermanual.adoc
index 16473bc..8252757 100644
--- a/docs/manuals/osmoepdg-usermanual.adoc
+++ b/docs/manuals/osmoepdg-usermanual.adoc
@@ -14,3 +14,5 @@
include::{srcdir}/chapters/osmo-epdg.adoc[]
include::{srcdir}/chapters/operating.adoc[]
+
+include::{srcdir}/chapters/acknowledgement.adoc[]
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36847?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Ic822a25bc680acf978e5f45be13e7a9f4d70f229
Gerrit-Change-Number: 36847
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in ...osmo-epdg[master]: docs: add chapter operating
laforge has submitted this change. (
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36822?usp=email )
Change subject: docs: add chapter operating
..
docs: add chapter operating
Change-Id: If4546fd98c470bcb29523bebae0ffa6bcf7f6cde
---
A docs/manuals/chapters/operating.adoc
M docs/manuals/osmoepdg-usermanual.adoc
2 files changed, 58 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/docs/manuals/chapters/operating.adoc
b/docs/manuals/chapters/operating.adoc
new file mode 100644
index 000..70e978e
--- /dev/null
+++ b/docs/manuals/chapters/operating.adoc
@@ -0,0 +1,47 @@
+[[operating]]
+== Operating osmo-epdg
+
+The osmo-epdg requires to run on Linux.
+osmo-epdg has been tested and developed with Debian 12.
+Linux kernel and/or erlang/OTP from Debian 11 are known to cause problems.
+
+=== Linux requirements
+
+The osmo-epdg is using the following Linux subsystems:
+
+* nftables (soft)
+* IP policy routing (soft)
+* ESP user-plane (soft)
+* GTP user-plane (hard)
+
+Soft dependencies can be changed by configuration.
+Hard dependencies are required and can't be changed without code changes.
+
+The user-plane is configured in the default configuration to use nftables and
+policy routing to ensure the traffic from UEs will only flow between the GTP
network
+interface and ESP encrypted tunnels.
+
+strongSwan will use the kernel ESP subsystem to encrypt, decrypt and route
traffic.
+strongSwan can be configured to replace the kernel ESP subsystem with a user
space
+imeplementation, which comes with a performance impact.
+
+osmo-epdg/erlang is using the GTP subsystem to de- and encapsulate. It only
supports using
+the kernel subsystem.
+
+=== EPC requirements
+
+The osmo-epdg was tested and developed against open5gs and requires version
2.7.1 or newer.
+
+ HSS
+
+When a UE connects it requests an APN via SWu. By default the UE will request
+the APN "ims". The subscriber entry must allow connections to the requested
APN to succeed.
+
+ PGW
+
+The osmo-epdg/erlang expects the PGW to support S2b and S6b.
+An UE will request attributes via IKEv2 which are translated into Additional
PCO (APCO) in GTP on the S2b
+reference point. The PGW should support Additional PCO via S2b.
+open5gs supports Additional PCO since 2.7.1.
+
+osmo-epdg only supports S2b over GTP.
diff --git a/docs/manuals/osmoepdg-usermanual.adoc
b/docs/manuals/osmoepdg-usermanual.adoc
index 05eb6b0..16473bc 100644
--- a/docs/manuals/osmoepdg-usermanual.adoc
+++ b/docs/manuals/osmoepdg-usermanual.adoc
@@ -12,3 +12,5 @@
include::{srcdir}/chapters/strongswan.adoc[]
include::{srcdir}/chapters/osmo-epdg.adoc[]
+
+include::{srcdir}/chapters/operating.adoc[]
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36822?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: If4546fd98c470bcb29523bebae0ffa6bcf7f6cde
Gerrit-Change-Number: 36822
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in ...osmo-epdg[master]: docs: add acknowledgement to nlnet for funding this project
Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36847?usp=email ) Change subject: docs: add acknowledgement to nlnet for funding this project .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36847?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ic822a25bc680acf978e5f45be13e7a9f4d70f229 Gerrit-Change-Number: 36847 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 16 May 2024 22:00:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: docs: add chapter operating
Attention is currently required from: lynxis lazus, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36822?usp=email ) Change subject: docs: add chapter operating .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36822?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If4546fd98c470bcb29523bebae0ffa6bcf7f6cde Gerrit-Change-Number: 36822 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 16 May 2024 22:00:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in ...osmo-epdg[master]: docs: add basic manual of the osmo-epdg
Attention is currently required from: lynxis lazus, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783?usp=email ) Change subject: docs: add basic manual of the osmo-epdg .. Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36783?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I596b6a351b7356aefa7e69f95521bc4012b9264b Gerrit-Change-Number: 36783 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: osmith Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 16 May 2024 22:00:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in pysim[master]: pySim/cat: Fix contruct for Address class/IE
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36839?usp=email )
Change subject: pySim/cat: Fix contruct for Address class/IE
..
pySim/cat: Fix contruct for Address class/IE
Something like "this._.total_len-1" only works during decode. Let's
use GreedyBytes instead, working for encode and decode.
Change-Id: Idf8326298cab7ebc68b09c7e829bfc2061222f51
---
M pySim/cat.py
A smpp_ota_apdu2.py
2 files changed, 116 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/36839/1
diff --git a/pySim/cat.py b/pySim/cat.py
index 1dff194..fdaf8f3 100644
--- a/pySim/cat.py
+++ b/pySim/cat.py
@@ -32,7 +32,7 @@
# TS 102 223 Section 8.1
class Address(COMPR_TLV_IE, tag=0x06):
_construct = Struct('ton_npi'/Int8ub,
-'call_number'/BcdAdapter(Bytes(this._.total_len-1)))
+'call_number'/BcdAdapter(GreedyBytes))
# TS 102 223 Section 8.2
class AlphaIdentifier(COMPR_TLV_IE, tag=0x05):
diff --git a/smpp_ota_apdu2.py b/smpp_ota_apdu2.py
new file mode 100755
index 000..60f7863
--- /dev/null
+++ b/smpp_ota_apdu2.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python3
+import logging
+import sys
+from pprint import pprint as pp
+
+from pySim.ota import OtaKeyset, OtaDialectSms
+from pySim.utils import b2h, h2b
+
+import smpplib.gsm
+import smpplib.client
+import smpplib.consts
+
+logger = logging.getLogger(__name__)
+
+# if you want to know what's happening
+logging.basicConfig(level='DEBUG')
+
+class Foo:
+def smpp_rx_handler(self, pdu):
+sys.stdout.write('delivered {}\n'.format(pdu.receipted_message_id))
+if pdu.short_message:
+dec = self.ota_dialect.decode_resp(self.ota_keyset, self.spi,
pdu.short_message)
+pp(dec)
+return None
+
+def __init__(self):
+# Two parts, UCS2, SMS with UDH
+#parts, encoding_flag, msg_type_flag = smpplib.gsm.make_parts(u'Привет
мир!\n'*10)
+
+client = smpplib.client.Client('localhost', 2775,
allow_unknown_opt_params=True)
+
+# Print when obtain message_id
+client.set_message_sent_handler(
+lambda pdu: sys.stdout.write('sent {} {}\n'.format(pdu.sequence,
pdu.message_id)))
+#client.set_message_received_handler(
+#lambda pdu: sys.stdout.write('delivered
{}\n'.format(pdu.receipted_message_id)))
+client.set_message_received_handler(self.smpp_rx_handler)
+
+client.connect()
+client.bind_transceiver(system_id='test', password='test')
+
+self.client = client
+
+if False:
+KIC1 = h2b('000102030405060708090a0b0c0d0e0f')
+KID1 = h2b('101112131415161718191a1b1c1d1e1f')
+self.ota_keyset = OtaKeyset(algo_crypt='aes_cbc', kic_idx=1,
kic=KIC1,
+algo_auth='aes_cmac', kid_idx=1,
kid=KID1)
+self.tar = h2b('01') # ISD-R according to Annex H of SGP.02
+#self.tar = h2b('02') # ECASD according to Annex H of SGP.02
+
+if True:
+KIC1 = h2b('4BE2D58A1FA7233DD723B3C70996E6E6')
+KID1 = h2b('4a664208eba091d32c4ecbc299da1f34')
+self.ota_keyset = OtaKeyset(algo_crypt='triple_des_cbc2',
kic_idx=1, kic=KIC1,
+algo_auth='triple_des_cbc2',
kid_idx=1, kid=KID1)
+#KIC3 = h2b('A4074D8E1FE69B484A7E62682ED09B51')
+#KID3 = h2b('41FF1033910112DB4EBEBB7807F939CD')
+#self.ota_keyset = OtaKeyset(algo_crypt='triple_des_cbc2',
kic_idx=3, kic=KIC3,
+#algo_auth='triple_des_cbc2',
kid_idx=3, kid=KID3)
+#self.tar = h2b('B00011') # USIM RFM
+self.tar = h2b('00') # RAM
+
+self.ota_dialect = OtaDialectSms()
+self.spi = {'counter':'no_counter', 'ciphering':True, 'rc_cc_ds':
'cc', 'por_in_submit':False,
+'por_shall_be_ciphered':True, 'por_rc_cc_ds': 'cc', 'por':
'por_required'}
+
+
+def tx_sms_tpdu(self, tpdu: bytes):
+self.client.send_message(
+source_addr_ton=smpplib.consts.SMPP_TON_INTL,
+#source_addr_npi=smpplib.consts.SMPP_NPI_ISDN,
+# Make sure it is a byte string, not unicode:
+source_addr='12',
+
+dest_addr_ton=smpplib.consts.SMPP_TON_INTL,
+#dest_addr_npi=smpplib.consts.SMPP_NPI_ISDN,
+# Make sure thease two params are byte strings, not unicode:
+destination_addr='23',
+short_message=tpdu,
+
+data_coding=smpplib.consts.SMPP_ENCODING_BINARY,
+esm_class=smpplib.consts.SMPP_GSMFEAT_UDHI,
+protocol_id=0x7f,
+#registered_delivery=True,
+)
+
+def tx_c_apdu(self, apdu: bytes):
+logger.info("C-APDU: %s" % b2h(apdu))
+# translate to Secured OTA
[S] Change in pysim[master]: sysmocom_sjs2: Make sure 'Const' is imported
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36838?usp=email ) Change subject: sysmocom_sjs2: Make sure 'Const' is imported .. sysmocom_sjs2: Make sure 'Const' is imported File "/crypt/space/home/laforge/projects/git/pysim/pySim/sysmocom_sja2.py", line 180, in __init__ self._construct = Struct(Const(b'\x82'), 'time_unit'/self.TimeUnit, 'value'/Int8ub, ^ NameError: name 'Const' is not defined Change-Id: If34a48e349680ef84e68a4a1a19dde536ecda0e6 --- M pySim/sysmocom_sja2.py 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/38/36838/1 diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index dd876aa..97de5a5 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -19,7 +19,7 @@ from struct import unpack from construct import FlagsEnum, Byte, Struct, Int8ub, Bytes, Mapping, Enum, Padding, BitsInteger -from construct import Bit, this, Int32ub, Int16ub, Nibble, BytesInteger, GreedyRange +from construct import Bit, this, Int32ub, Int16ub, Nibble, BytesInteger, GreedyRange, Const from construct import Optional as COptional from pySim.utils import * -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36838?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: If34a48e349680ef84e68a4a1a19dde536ecda0e6 Gerrit-Change-Number: 36838 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in pysim[master]: euicc: clarify which eUICCs are supported
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36837?usp=email ) Change subject: euicc: clarify which eUICCs are supported .. euicc: clarify which eUICCs are supported We currently do not support M2M eUICC Change-Id: I3deb9f181075411484158471012ed449c83028fa --- M pySim/euicc.py 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/37/36837/1 diff --git a/pySim/euicc.py b/pySim/euicc.py index c27c91f..acc4dda 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- """ -Various definitions related to GSMA eSIM / eUICC +Various definitions related to GSMA consumer + IoT eSIM / eUICC -Related Specs: GSMA SGP.22, GSMA SGP.02, etc. +Does *not* implement anything related to M2M eUICC + +Related Specs: GSMA SGP.21, SGP.22, SGP.31, SGP32 """ # Copyright (C) 2023 Harald Welte -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36837?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: I3deb9f181075411484158471012ed449c83028fa Gerrit-Change-Number: 36837 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[M] Change in osmo-pcu[master]: contrib/systemd: run as osmocom user
Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36828?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36828?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: I362a9e55309033c42b16f12321f8d1aa27da7b59 Gerrit-Change-Number: 36828 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 15 May 2024 15:53:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: contrib/systemd: run as osmocom user
Attention is currently required from: msuraev, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30133?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30133?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I37be0dd4df012047a495235195912bd06ad2423d Gerrit-Change-Number: 30133 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Wed, 15 May 2024 15:52:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/ttcn3: run ttcn3-msc-test earlier
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36834?usp=email ) Change subject: jobs/ttcn3: run ttcn3-msc-test earlier .. jobs/ttcn3: run ttcn3-msc-test earlier It seems like various tests are failing from time to time due to the builder having a too high load. As several ttcn3 testsuites run around 4 am already, move ttcn3-msc-test to 1 hour earlier where we don't have anything currently. Change-Id: I8eaf058f13f4175a458e9abe544bfb21ace481b7 --- M jobs/README.adoc M jobs/ttcn3-testsuites.yml 2 files changed, 17 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/README.adoc b/jobs/README.adoc index eb14152..d403bff 100644 --- a/jobs/README.adoc +++ b/jobs/README.adoc @@ -139,7 +139,7 @@ 02:XX registry-triggers 02:XX registry-rebuild-upload-fpga-build (weekly) - 04:00 - 18:00 Jobs that need binary packages + 03:00 - 18:00 Jobs that need binary packages ttcn3-testsuites 04:XX osmocom-release-manuals 05:XX osmocom-release-tarballs diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ac79f4d..f436e26 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -20,6 +20,8 @@ # timer: 10 per hour from 04:00 - 18:00, see jobs/README.adoc job-name: # debian nightly - order by time + - ttcn3-msc-test: + timer: H 03 * * * - nplab-m3ua-test: timer: H 04 * * * - nplab-sua-test: @@ -67,8 +69,6 @@ description: | Test open5gs-smfd + open5gs-upfd main. email: jenkins-notificati...@lists.osmocom.org acet...@gmail.com - - ttcn3-msc-test: - timer: H 04 * * * - ttcn3-pcu-test: timer: H 04 * * * - ttcn3-pcu-test-sns: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36834?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: I8eaf058f13f4175a458e9abe544bfb21ace481b7 Gerrit-Change-Number: 36834 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: jobs/ttcn3: run ttcn3-msc-test earlier
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36834?usp=email ) Change subject: jobs/ttcn3: run ttcn3-msc-test earlier .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36834?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: I8eaf058f13f4175a458e9abe544bfb21ace481b7 Gerrit-Change-Number: 36834 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 15 May 2024 15:52:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-remsim[master]: user_ifdhandler: Fix segfault on startup
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email )
Change subject: user_ifdhandler: Fix segfault on startup
..
user_ifdhandler: Fix segfault on startup
Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923
---
M src/client/user_ifdhandler.c
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c
index c6a9392..7435832 100644
--- a/src/client/user_ifdhandler.c
+++ b/src/client/user_ifdhandler.c
@@ -372,9 +372,9 @@
if (gethostname(hostname, sizeof(hostname)) < 0)
OSMO_STRLCPY_ARRAY(hostname, "unknown");
- osmo_select_init();
rc = osmo_ctx_init("client");
OSMO_ASSERT(rc == 0);
+ osmo_select_init();
ct = talloc_zero(OTC_GLOBAL, struct client_thread);
OSMO_ASSERT(ct);
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923
Gerrit-Change-Number: 36835
Gerrit-PatchSet: 3
Gerrit-Owner: Joey Berkovitz
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in osmo-remsim[master]: user_ifdhandler: Fix segfault on startup
Attention is currently required from: Joey Berkovitz. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email ) Change subject: user_ifdhandler: Fix segfault on startup .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 Gerrit-Change-Number: 36835 Gerrit-PatchSet: 3 Gerrit-Owner: Joey Berkovitz Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: Joey Berkovitz Gerrit-Comment-Date: Wed, 15 May 2024 15:51:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email )
Change subject: KPI: Add initial set of DTAP message type rate counters
..
KPI: Add initial set of DTAP message type rate counters
From an operational perspective, it may be interesting to know how many
LU/RAU/Attach attempts, rejects and accepts are happening in a given
hNodeB. Let's add some common infrastructure for DTAP related
statistics as well as some initial counters.
Related: SYS#6885
Depends: osmo-iuh.git Change-Id I7dea74102da8b610ff2a310c5814f5c89f08e7a6
Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032
---
M TODO-RELEASE
M include/osmocom/hnbgw/hnbgw.h
M include/osmocom/hnbgw/kpi.h
M src/osmo-hnbgw/Makefile.am
M src/osmo-hnbgw/context_map_rua.c
M src/osmo-hnbgw/hnbgw.c
A src/osmo-hnbgw/kpi_dtap.c
M src/osmo-hnbgw/kpi_ranap.c
8 files changed, 197 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/TODO-RELEASE b/TODO-RELEASE
index a80e188..b0ad6a0 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -11,3 +11,4 @@
MGWMGCP CRCX osmo-hnbgw used to CRCX in loopback mode, to trigger a
legacy IuUP hack. CRCX is no
longer in loopback mode now, so older osmo-mgw may fail
to respond to IuUP Initialization.
+osmo-iuh >1.5.1decoding of more RANAP procedures in ranap_common
required for DTAP rate_counters
diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h
index 8daf713..dc046a0 100644
--- a/include/osmocom/hnbgw/hnbgw.h
+++ b/include/osmocom/hnbgw/hnbgw.h
@@ -136,6 +136,18 @@
HNB_CTR_CS_PAGING_ATTEMPTED,
HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL,
+
+ HNB_CTR_DTAP_CS_LU_REQ,
+ HNB_CTR_DTAP_CS_LU_ACC,
+ HNB_CTR_DTAP_CS_LU_REJ,
+
+ HNB_CTR_DTAP_PS_ATT_REQ,
+ HNB_CTR_DTAP_PS_ATT_ACK,
+ HNB_CTR_DTAP_PS_ATT_REJ,
+
+ HNB_CTR_DTAP_PS_RAU_REQ,
+ HNB_CTR_DTAP_PS_RAU_ACK,
+ HNB_CTR_DTAP_PS_RAU_REJ,
};
enum hnb_stat {
diff --git a/include/osmocom/hnbgw/kpi.h b/include/osmocom/hnbgw/kpi.h
index 63f3477..2a13972 100644
--- a/include/osmocom/hnbgw/kpi.h
+++ b/include/osmocom/hnbgw/kpi.h
@@ -6,3 +6,6 @@
void kpi_ranap_process_ul(struct hnbgw_context_map *map, ranap_message *ranap);
void kpi_ranap_process_dl(struct hnbgw_context_map *map, ranap_message *ranap);
+
+void kpi_dtap_process_ul(struct hnbgw_context_map *map, const uint8_t *buf,
unsigned int len, uint8_t sapi);
+void kpi_dtap_process_dl(struct hnbgw_context_map *map, const uint8_t *buf,
unsigned int len, uint8_t sapi);
diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am
index 0727f30..9dffabf 100644
--- a/src/osmo-hnbgw/Makefile.am
+++ b/src/osmo-hnbgw/Makefile.am
@@ -44,6 +44,7 @@
cnlink.c \
ranap_rab_ass.c \
mgw_fsm.c \
+ kpi_dtap.c \
kpi_ranap.c \
tdefs.c \
$(NULL)
diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c
index f37ded8..d5b2cb7 100644
--- a/src/osmo-hnbgw/context_map_rua.c
+++ b/src/osmo-hnbgw/context_map_rua.c
@@ -220,10 +220,9 @@
switch (event) {
case MAP_RUA_EV_RX_CONNECT:
+ /* not needed for RAB assignment scanning, but for KPI scanning
*/
+ handle_rx_rua(fi, ranap_msg);
map_rua_fsm_state_chg(MAP_RUA_ST_CONNECTED);
- /* The Connect will never be a RAB Assignment response, so no
need for handle_rx_rua() (which decodes
-* the RANAP message to detect a RAB Assignment response). Just
forward to SCCP as is. */
- map_sccp_dispatch(map, MAP_SCCP_EV_TX_DATA_REQUEST, ranap_msg);
return;
case MAP_RUA_EV_RX_DISCONNECT:
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index fe29c29..24d11a5 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -464,6 +464,18 @@
[HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL] = {
"rab:cs:active_milliseconds:total", "Cumulative number of
milliseconds of CS RAB activity" },
+
+ [HNB_CTR_DTAP_CS_LU_REQ] = { "dtap:cs:location_update:req", "CS
Location Update Requests" },
+ [HNB_CTR_DTAP_CS_LU_ACC] = { "dtap:cs:location_update:accept", "CS
Location Update Accepts" },
+ [HNB_CTR_DTAP_CS_LU_REJ] = { "dtap:cs:location_update:reject", "CS
Location Update Rejects" },
+
+ [HNB_CTR_DTAP_PS_ATT_REQ] = { "dtap:ps:attach:req", "PS Attach
Requests" },
+ [HNB_CTR_DTAP_PS_ATT_ACK] = { "dtap:ps:attach:accept", "PS Attach
Accepts" },
+ [HNB_CTR_DTAP_PS_ATT_REJ] = { "dtap:ps:attach:reject",
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 May 2024 15:37:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures .. ranap_common: Implement support for missing procedures Both the RAN and the CN side of ranap_common were missing support for decoding requests and/or responses for a number of RANAP procedures. This patch adds all of them a of TS 25.413 Release 12 except those related to MBMS or SRVCC. Related: SYS#6885 Change-Id: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 --- M src/ranap_common_cn.c M src/ranap_common_ran.c 2 files changed, 284 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index 56ac4e8..72698a4 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -72,6 +72,20 @@ /* FIXME this is not a message received by CN (used by hnb-test) */ rc = ranap_decode_iu_releasecommandies(>msg.iu_ReleaseCommandIEs, >value); break; + case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION REQUIRED */ + rc = ranap_decode_relocationrequiredies(>msg.relocationRequiredIEs, >value); + break; + //case RANAP_ProcedureCode_id_RelocationDetect: /* TODO: no member in ranap_message */ + //case RANAP_ProcedureCode_id_RelocationComplete: /* TODO: no member in ranap_message */ + case RANAP_ProcedureCode_id_RelocationCancel: + rc = ranap_decode_relocationcancelies(>msg.relocationCancelIEs, >value); + break; + case RANAP_ProcedureCode_id_ForwardSRNS_Context: + rc = ranap_decode_forwardsrns_contexties(>msg.forwardSRNS_ContextIEs, >value); + break; + case RANAP_ProcedureCode_id_LocationReport: + rc = ranap_decode_locationreporties(>msg.locationReportIEs, >value); + break; default: LOGP(DRANAP, LOGL_INFO, "Received RANAP Procedure %s (CO, IM) from RNC. Decode not implemented\n", @@ -116,6 +130,20 @@ /* FIXME this is not a message received by CN (used by hnb-test) */ ranap_free_iu_releasecommandies(>msg.iu_ReleaseCommandIEs); break; + case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION REQUIRED */ + ranap_free_relocationrequiredies(>msg.relocationRequiredIEs); + break; + //case RANAP_ProcedureCode_id_RelocationDetect: /* TODO: no member in ranap_message */ + //case RANAP_ProcedureCode_id_RelocationComplete: /* TODO: no member in ranap_message */ + case RANAP_ProcedureCode_id_RelocationCancel: + ranap_free_relocationcancelies(>msg.relocationCancelIEs); + break; + case RANAP_ProcedureCode_id_ForwardSRNS_Context: + ranap_free_forwardsrns_contexties(>msg.forwardSRNS_ContextIEs); + break; + case RANAP_ProcedureCode_id_LocationReport: + ranap_free_locationreporties(>msg.locationReportIEs); + break; default: LOGP(DRANAP, LOGL_INFO, "Freeing RANAP Procedure %s (CO, IM) from RNC not implemented\n", @@ -139,13 +167,25 @@ /* RAB assignment response */ rc = ranap_decode_rab_assignmentresponseies(>msg.raB_AssignmentResponseIEs, >value); break; + case RANAP_ProcedureCode_id_Iu_Release: + /* Iu release Complete; confirmation of CN-initiated release */ + rc = ranap_decode_iu_releasecompleteies(>msg.iu_ReleaseCompleteIEs, >value); + break; + case RANAP_ProcedureCode_id_RelocationResourceAllocation: + rc = ranap_decode_relocationrequestacknowledgeies(>msg.relocationRequestAcknowledgeIEs, >value); + break; + case RANAP_ProcedureCode_id_SRNS_ContextTransfer: + rc = ranap_decode_srns_contextresponseies(>msg.srnS_ContextResponseIEs, >value); + break; case RANAP_ProcedureCode_id_SecurityModeControl: /* Security Mode Complete */ rc = ranap_decode_securitymodecompleteies(>msg.securityModeCompleteIEs, >value); break; - case RANAP_ProcedureCode_id_Iu_Release: - /* Iu release Complete; confirmation of CN-initiated release */ - rc = ranap_decode_iu_releasecompleteies(>msg.iu_ReleaseCompleteIEs, >value); + case RANAP_ProcedureCode_id_DataVolumeReport: + rc = ran
[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures
Attention is currently required from: daniel, neels, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Attention: neels Gerrit-Attention: tnt Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 15 May 2024 15:37:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures
Attention is currently required from: daniel, neels, pespin, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures .. Patch Set 2: (3 comments) Patchset: PS1: > I don't really understand what this is about TBH, just doing a quick read of > the code for "unexpecte […] thanks, it was a simple copy+paste mistake. File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/9f6380a6_a8ca699e PS1, Line 196: static int ran_ranap_rx_unsuccessful_msg_co(RANAP_SuccessfulOutcome_t *imsg, ranap_message *message) > ran_ranap_rx_unsuccessful_msg_co takes a RANAP_SuccessfulOutcome_t as param > and not some RANAP_Unsuc […] Done https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/80125f9e_14235a47 PS1, Line 247: rc = ran_ranap_rx_unsuccessful_msg_co(>choice.successfulOutcome, message); > Not pdu->choice. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: tnt Gerrit-Attention: neels Gerrit-Attention: tnt Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 15 May 2024 15:10:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt Gerrit-MessageType: comment
[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures
Attention is currently required from: daniel, laforge, neels, pespin. Hello Jenkins Builder, daniel, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: ranap_common: Implement support for missing procedures .. ranap_common: Implement support for missing procedures Both the RAN and the CN side of ranap_common were missing support for decoding requests and/or responses for a number of RANAP procedures. This patch adds all of them a of TS 25.413 Release 12 except those related to MBMS or SRVCC. Related: SYS#6885 Change-Id: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 --- M src/ranap_common_cn.c M src/ranap_common_ran.c 2 files changed, 284 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/87/36787/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: tnt Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates...
Attention is currently required from: dexter, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?usp=email ) Change subject: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates.ttcn .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?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: I4a5ededbd958c87537f84155092b6a6cd715865a Gerrit-Change-Number: 36832 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 15 May 2024 14:56:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates...
Attention is currently required from: dexter, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?usp=email ) Change subject: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates.ttcn .. Patch Set 1: (1 comment) Patchset: PS1: adding @pma...@sysmocom.de as I know he also has been using PIPEasp recently in his eIM/IPAd tests -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?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: I4a5ededbd958c87537f84155092b6a6cd715865a Gerrit-Change-Number: 36832 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 15 May 2024 14:55:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
