[S] Change in pysim[master]: pySim-trace: Support decoding of eUICC traces
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36777?usp=email ) Change subject: pySim-trace: Support decoding of eUICC traces .. pySim-trace: Support decoding of eUICC traces Let's register the ISD-R and ECASD applications so we avoid the warnings printed when processing an eUICC protocol trace: WARNING pySim.apdu.ts_102_221: SELECT UNKNOWN AID a005591010890100 Change-Id: I362a1a7f12d979ff0b7971d5300db9ed56bb1ee5 --- M pySim-trace.py M pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok 2 files changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-trace.py b/pySim-trace.py index 91f50a3..be1d40b 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -14,6 +14,7 @@ from pySim.ts_102_221 import CardProfileUICC from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +from pySim.euicc import CardApplicationISDR, CardApplicationECASD from pySim.transport import LinkBase from pySim.apdu_source.gsmtap import GsmtapApduSource @@ -78,6 +79,8 @@ profile = CardProfileUICC() profile.add_application(CardApplicationUSIM()) profile.add_application(CardApplicationISIM()) +profile.add_application(CardApplicationISDR()) +profile.add_application(CardApplicationECASD()) scc = SimCardCommands(transport=DummySimLink()) card = UiccCardBase(scc) self.rs = RuntimeState(card, profile) diff --git a/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok b/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok index 047f9de..b947983 100644 --- a/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok +++ b/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok @@ -3,6 +3,8 @@ Detected UICC Add-on "RUIM" Can't read AIDs from SIM -- 'list' object has no attribute 'lower' warning: EF.DIR seems to be empty! + ADF.ECASD: a005591010890200 + ADF.ISD-R: a005591010890100 ISIM: a000871004 USIM: a000871002 CardReset(3b9f96801f878031e073fe211b674a4c753034054ba9) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36777?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: I362a1a7f12d979ff0b7971d5300db9ed56bb1ee5 Gerrit-Change-Number: 36777 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in pysim[master]: pySim-trace: Support decoding of eUICC traces
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36777?usp=email ) Change subject: pySim-trace: Support decoding of eUICC traces .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36777?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: I362a1a7f12d979ff0b7971d5300db9ed56bb1ee5 Gerrit-Change-Number: 36777 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 10 May 2024 19:18:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing WwwAuthenticate to ts_SIP_msgh_std
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36781?usp=email )
Change subject: SIP_Templates: Allow passing WwwAuthenticate to ts_SIP_msgh_std
..
SIP_Templates: Allow passing WwwAuthenticate to ts_SIP_msgh_std
The field could already be passed to its tr_* counterpart, but not the
the ts_* one.
Change-Id: Ibc6cc5320f24ce82165c1b2140bad30cb356f8ae
---
M library/SIP_Templates.ttcn
1 file changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/81/36781/1
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index e22646c..2498f49 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -454,7 +454,8 @@
template (omit) ContentType content_type := omit,
template (omit)Authorization authorization := omit,
template (value) Method_List allow_methods :=
c_SIP_defaultMethods,
- template (omit) Expires expires := omit
+ template (omit) Expires expires := omit,
+ template (omit) WwwAuthenticate wwwAuthenticate := omit
) modifies ts_SIP_msgHeader_empty := {
allow := {
fieldName := ALLOW_E,
@@ -489,7 +490,8 @@
"osmo-ttcn3-hacks/0.23"
}
},
- via := via
+ via := via,
+ wwwAuthenticate := wwwAuthenticate
}
function tr_AllowMethods(template Method_List allow_methods) return template
Allow {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36781?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: Ibc6cc5320f24ce82165c1b2140bad30cb356f8ae
Gerrit-Change-Number: 36781
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing Require,Security-client,Supported fields...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36782?usp=email )
Change subject: SIP_Templates: Allow passing Require,Security-client,Supported
fields to REGISTER templates
..
SIP_Templates: Allow passing Require,Security-client,Supported fields to
REGISTER templates
These fields are used in IMS.
Change-Id: I20a0df5633db8c0e7732659c1316b85e63317afc
---
M library/SIP_Templates.ttcn
1 file changed, 84 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/82/36782/1
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 2498f49..7e33b3b 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -197,6 +197,28 @@
deltaSec := deltaSec
}
+
+// [20.32]
+template (value) Require ts_Require(template (value) OptionTag_List
optionsTags := {}) := {
+ fieldName := REQUIRE_E,
+ optionsTags := optionsTags
+}
+template (present) Require tr_Require(template (present) OptionTag_List
optionsTags := ?) := {
+ fieldName := REQUIRE_E,
+ optionsTags := optionsTags
+}
+
+// [20.37]
+template (value) Supported ts_Supported(template (value) OptionTag_List
optionsTags := {}) := {
+ fieldName := SUPPORTED_E,
+ optionsTags := optionsTags
+}
+template (present) Supported tr_Supported(template (present) OptionTag_List
optionsTags := ?) := {
+ fieldName := SUPPORTED_E,
+ optionsTags := optionsTags
+}
+
+
template (value) SipAddr ts_SipAddr(template (value) HostPort host_port,
template (omit) UserInfo user_info := omit,
template (omit) charstring displayName :=
omit,
@@ -442,6 +464,31 @@
challenge := challenge
}
+// RFC3329
+template (present) Security_client
+tr_Security_client(template (present) Security_mechanism_list
sec_mechanism_list := ?) := {
+ fieldName := SECURITY_CLIENT_E,
+ sec_mechanism_list := sec_mechanism_list
+}
+template (value) Security_client
+ts_Security_client(template (value) Security_mechanism_list
sec_mechanism_list) := {
+ fieldName := SECURITY_CLIENT_E,
+ sec_mechanism_list := sec_mechanism_list
+}
+
+template (present) Security_mechanism
+tr_Security_mechanism(template (present) charstring name := ?,
+ template SemicolonParam_List params := *) := {
+ mechanism_name := name,
+ mechanism_params := params
+}
+template (value) Security_mechanism
+ts_Security_mechanism(template (value) charstring name,
+ template (omit) SemicolonParam_List params := omit) := {
+ mechanism_name := name,
+ mechanism_params := params
+}
+
template (value) MessageHeader ts_SIP_msgHeader_empty := c_SIP_msgHeader_empty;
template (value) MessageHeader
ts_SIP_msgh_std(template (value) CallidString call_id,
@@ -455,6 +502,9 @@
template (omit)Authorization authorization := omit,
template (value) Method_List allow_methods :=
c_SIP_defaultMethods,
template (omit) Expires expires := omit,
+ template (omit) Require require := omit,
+ template (omit) Security_client security_client := omit,
+ template (omit) Supported supported := omit,
template (omit) WwwAuthenticate wwwAuthenticate := omit
) modifies ts_SIP_msgHeader_empty := {
allow := {
@@ -479,6 +529,9 @@
addressField := from_addr.addr,
fromParams := from_addr.params
},
+ require := require,
+ security_client := security_client,
+ supported := supported,
toField := {
fieldName := TO_E,
addressField := to_addr.addr,
@@ -520,6 +573,9 @@
template integer seq_nr := ?,
template Method_List allow_methods := *,
template Expires expires := *,
+ template Require require := *,
+ template Security_client security_client := *,
+ template Supported supported := *,
template WwwAuthenticate wwwAuthenticate := *
) modifies t_SIP_msgHeader_any := {
allow := tr_AllowMethods(allow_methods),
@@ -540,6 +596,9 @@
addressField := from_addr.addr,
fromParams := from_addr.params
},
+ require := require,
+ security_client := security_client,
+ supported := supported,
toField := {
fieldName := TO_E,
addressField := to_addr.addr,
@@ -561,13 +620,19 @@
template (omit) Contact contact,
template (omit) Expires expires,
template (omit) Authorization authorization := omit,
+ template (omit) Require require := omit,
+ template (omit) Security_client security_client :=
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow setting transport in Via templates
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36780?usp=email )
Change subject: SIP_Templates: Allow setting transport in Via templates
..
SIP_Templates: Allow setting transport in Via templates
This is needed when using IMS, since TCP is used.
Change-Id: Id45491615bcb5c074ef4fc298cbb24b2e034972d
---
M asterisk/SIP_ConnectionHandler.ttcn
M library/SIP_Templates.ttcn
2 files changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/80/36780/1
diff --git a/asterisk/SIP_ConnectionHandler.ttcn
b/asterisk/SIP_ConnectionHandler.ttcn
index 13b5f04..9c7cca5 100644
--- a/asterisk/SIP_ConnectionHandler.ttcn
+++ b/asterisk/SIP_ConnectionHandler.ttcn
@@ -178,6 +178,7 @@
{ id := "received", paramValue := g_pars.remote_sip_host }
}; */
return tr_Via_from(via_req.viaBody[0].sentBy,
+ via_req.viaBody[0].sentProtocol.transport,
via_resp_params);
}
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 3492dc4..e22646c 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -372,22 +372,24 @@
mediaType := "application/sdp"
};
-template (value) Via ts_Via_from(template (value) HostPort addr) := {
+template (value) Via ts_Via_from(template (value) HostPort addr,
+template (value) charstring transport :=
"UDP") := {
fieldName := VIA_E,
viaBody := {
{
- sentProtocol := { "SIP", "2.0", "UDP" },
+ sentProtocol := { "SIP", "2.0", transport },
sentBy := addr,
viaParams := omit
}
}
}
template (present) Via tr_Via_from(template (present) HostPort host_port := ?,
+ template (present) charstring transport := ?,
template SemicolonParam_List viaParams := *)
:= {
fieldName := VIA_E,
viaBody := {
{
- sentProtocol := { "SIP", "2.0", "UDP" },
+ sentProtocol := { "SIP", "2.0", ? },
sentBy := host_port,
viaParams := viaParams
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36780?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: Id45491615bcb5c074ef4fc298cbb24b2e034972d
Gerrit-Change-Number: 36780
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in pysim[master]: pySim-trace: Support decoding of eUICC traces
Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/36777?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pySim-trace: Support decoding of eUICC traces .. pySim-trace: Support decoding of eUICC traces Let's register the ISD-R and ECASD applications so we avoid the warnings printed when processing an eUICC protocol trace: WARNING pySim.apdu.ts_102_221: SELECT UNKNOWN AID a005591010890100 Change-Id: I362a1a7f12d979ff0b7971d5300db9ed56bb1ee5 --- M pySim-trace.py M pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok 2 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/36777/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36777?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: I362a1a7f12d979ff0b7971d5300db9ed56bb1ee5 Gerrit-Change-Number: 36777 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: pySim.global_platform: Fix key encryption with DEK
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36779?usp=email ) Change subject: pySim.global_platform: Fix key encryption with DEK .. pySim.global_platform: Fix key encryption with DEK When a SCP is active, the DEK is used to encrypt any key material that's installed using PUT KEY. The code prior to this patch fails to handle this case as it calls the encrypt_key() method on the wrong object. Change-Id: I6e10fb9c7881ba74ad2986c36bba95b336470838 --- M pySim/global_platform/__init__.py 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 9960560..5086721 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -550,7 +550,7 @@ kcv = b2h(kcv_bin) if self._cmd.lchan.scc.scp: # encrypte key data with DEK of current SCP -kcb = b2h(self._cmd.lchan.scc.scp.card_keys.encrypt_key(h2b(opts.key_data[i]))) +kcb = b2h(self._cmd.lchan.scc.scp.encrypt_key(h2b(opts.key_data[i]))) else: # (for example) during personalization, DEK might not be required) kcb = opts.key_data[i] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36779?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: I6e10fb9c7881ba74ad2986c36bba95b336470838 Gerrit-Change-Number: 36779 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in pysim[master]: euicc: Fix shell command for SGP.31 get_certs
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36778?usp=email ) Change subject: euicc: Fix shell command for SGP.31 get_certs .. euicc: Fix shell command for SGP.31 get_certs Change-Id: I2e59070992bb522d14a5e4956f0d8e738a785dd8 --- M pySim/euicc.py 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/euicc.py b/pySim/euicc.py index 8b8b973..c27c91f 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -279,7 +279,7 @@ _construct = GreedyBytes class EuiccCertificate(BER_TLV_IE, tag=0xa6): _construct = GreedyBytes -class GetCertsError(BER_TLV_IE, tag=0x80): +class GetCertsError(BER_TLV_IE, tag=0x81): _construct = Enum(Int8ub, invalidCiPKId=1, undefinedError=127) class GetCertsResp(BER_TLV_IE, tag=0xbf56, nested=[EumCertificate, EuiccCertificate, GetCertsError]): pass @@ -501,7 +501,7 @@ """Perform an ES10c GetCerts() function on an IoT eUICC.""" gc = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, GetCertsReq(), GetCertsResp) d = gc.to_dict() - self._cmd.poutput_json(flatten_dict_lists(d['get_certficiates_resp'])) +self._cmd.poutput_json(flatten_dict_lists(d['get_certs_resp'])) def do_get_eim_configuration_data(self, _opts): """Perform an ES10b GetEimConfigurationData function on an Iot eUICC.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36778?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: I2e59070992bb522d14a5e4956f0d8e738a785dd8 Gerrit-Change-Number: 36778 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in pysim[master]: filesystem: Enforce lower-case hex AID
laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/36776?usp=email )
Change subject: filesystem: Enforce lower-case hex AID
..
filesystem: Enforce lower-case hex AID
our utils.b2h() returns values in lower-case hex string notation,
so let's make sure the CardADF and CardApplication AID values are also
stored in lower case notation, othewise the matching baesd on AIDs
returned from the card will not work, specifically as we use uppercase
AIDs in pySim.euicc for CardApplicationECASD and CardApplicationISDR.
Rather than change those two instances, let's solve it in a generic way.
We already do the same for the CardFile.fid member.
Change-Id: Ie42392412d9eb817fbc563d9165faab198ffa7a9
---
M pySim/filesystem.py
1 file changed, 22 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index 4d5fde9..77482cc 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -512,7 +512,7 @@
super().__init__(**kwargs)
# reference to CardApplication may be set from CardApplication
constructor
self.application = None # type: Optional[CardApplication]
-self.aid = aid # Application Identifier
+self.aid = aid.lower() # Application Identifier
self.has_fs = has_fs # Flag to tell whether the ADF supports a
filesystem or not
mf = self.get_mf()
if mf:
@@ -1294,6 +1294,8 @@
adf : ADF name
sw : Dict of status word conversions
"""
+if aid:
+aid = aid.lower()
self.name = name
self.adf = adf
self.sw = sw or {}
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36776?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: Ie42392412d9eb817fbc563d9165faab198ffa7a9
Gerrit-Change-Number: 36776
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in pysim[master]: filesystem: Enforce lower-case hex AID
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36776?usp=email ) Change subject: filesystem: Enforce lower-case hex AID .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: trivial fix -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36776?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: Ie42392412d9eb817fbc563d9165faab198ffa7a9 Gerrit-Change-Number: 36776 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 10 May 2024 18:17:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim.global_platform: Fix key encryption with DEK
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36779?usp=email ) Change subject: pySim.global_platform: Fix key encryption with DEK .. Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: trivial fix -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36779?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: I6e10fb9c7881ba74ad2986c36bba95b336470838 Gerrit-Change-Number: 36779 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 10 May 2024 18:16:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: euicc: Fix shell command for SGP.31 get_certs
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36778?usp=email ) Change subject: euicc: Fix shell command for SGP.31 get_certs .. Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: trivial fix -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36778?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: I2e59070992bb522d14a5e4956f0d8e738a785dd8 Gerrit-Change-Number: 36778 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 10 May 2024 18:16:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: contrib/systemd: run as osmocom user
Attention is currently required from: fixeria, lynxis lazus, msuraev, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 8: (1 comment) Patchset: PS8: > -1: Please add a warning for the user, because you're changing something what > the user doesn't expec […] Debian changelog is generated automatically when we do a new release. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb83c231231b39dc6732c0f375aeb3b21f3938ef Gerrit-Change-Number: 30094 Gerrit-PatchSet: 8 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: lynxis lazus Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 10 May 2024 18:11:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim.global_platform: Fix key encryption with DEK
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36779?usp=email ) Change subject: pySim.global_platform: Fix key encryption with DEK .. pySim.global_platform: Fix key encryption with DEK When a SCP is active, the DEK is used to encrypt any key material that's installed using PUT KEY. The code prior to this patch fails to handle this case as it calls the encrypt_key() method on the wrong object. Change-Id: I6e10fb9c7881ba74ad2986c36bba95b336470838 --- M pySim/global_platform/__init__.py 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/79/36779/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 9960560..5086721 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -550,7 +550,7 @@ kcv = b2h(kcv_bin) if self._cmd.lchan.scc.scp: # encrypte key data with DEK of current SCP -kcb = b2h(self._cmd.lchan.scc.scp.card_keys.encrypt_key(h2b(opts.key_data[i]))) +kcb = b2h(self._cmd.lchan.scc.scp.encrypt_key(h2b(opts.key_data[i]))) else: # (for example) during personalization, DEK might not be required) kcb = opts.key_data[i] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36779?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: I6e10fb9c7881ba74ad2986c36bba95b336470838 Gerrit-Change-Number: 36779 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in pysim[master]: filesystem: Enforce lower-case hex AID
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36776?usp=email )
Change subject: filesystem: Enforce lower-case hex AID
..
filesystem: Enforce lower-case hex AID
our utils.b2h() returns values in lower-case hex string notation,
so let's make sure the CardADF and CardApplication AID values are also
stored in lower case notation, othewise the matching baesd on AIDs
returned from the card will not work, specifically as we use uppercase
AIDs in pySim.euicc for CardApplicationECASD and CardApplicationISDR.
Rather than change those two instances, let's solve it in a generic way.
We already do the same for the CardFile.fid member.
Change-Id: Ie42392412d9eb817fbc563d9165faab198ffa7a9
---
M pySim/filesystem.py
1 file changed, 22 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/76/36776/1
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index 4d5fde9..77482cc 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -512,7 +512,7 @@
super().__init__(**kwargs)
# reference to CardApplication may be set from CardApplication
constructor
self.application = None # type: Optional[CardApplication]
-self.aid = aid # Application Identifier
+self.aid = aid.lower() # Application Identifier
self.has_fs = has_fs # Flag to tell whether the ADF supports a
filesystem or not
mf = self.get_mf()
if mf:
@@ -1294,6 +1294,8 @@
adf : ADF name
sw : Dict of status word conversions
"""
+if aid:
+aid = aid.lower()
self.name = name
self.adf = adf
self.sw = sw or {}
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36776?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: Ie42392412d9eb817fbc563d9165faab198ffa7a9
Gerrit-Change-Number: 36776
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: euicc: Fix shell command for SGP.31 get_certs
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36778?usp=email ) Change subject: euicc: Fix shell command for SGP.31 get_certs .. euicc: Fix shell command for SGP.31 get_certs Change-Id: I2e59070992bb522d14a5e4956f0d8e738a785dd8 --- M pySim/euicc.py 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/78/36778/1 diff --git a/pySim/euicc.py b/pySim/euicc.py index 8b8b973..c27c91f 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -279,7 +279,7 @@ _construct = GreedyBytes class EuiccCertificate(BER_TLV_IE, tag=0xa6): _construct = GreedyBytes -class GetCertsError(BER_TLV_IE, tag=0x80): +class GetCertsError(BER_TLV_IE, tag=0x81): _construct = Enum(Int8ub, invalidCiPKId=1, undefinedError=127) class GetCertsResp(BER_TLV_IE, tag=0xbf56, nested=[EumCertificate, EuiccCertificate, GetCertsError]): pass @@ -501,7 +501,7 @@ """Perform an ES10c GetCerts() function on an IoT eUICC.""" gc = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, GetCertsReq(), GetCertsResp) d = gc.to_dict() - self._cmd.poutput_json(flatten_dict_lists(d['get_certficiates_resp'])) +self._cmd.poutput_json(flatten_dict_lists(d['get_certs_resp'])) def do_get_eim_configuration_data(self, _opts): """Perform an ES10b GetEimConfigurationData function on an Iot eUICC.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36778?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: I2e59070992bb522d14a5e4956f0d8e738a785dd8 Gerrit-Change-Number: 36778 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in pysim[master]: pySim-trace: Support decoding of eUICC traces
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36777?usp=email ) Change subject: pySim-trace: Support decoding of eUICC traces .. pySim-trace: Support decoding of eUICC traces Let's register the ISD-R and ECASD applications so we avoid the warnings printed when processing an eUICC protocol trace: WARNING pySim.apdu.ts_102_221: SELECT UNKNOWN AID a005591010890100 Change-Id: I362a1a7f12d979ff0b7971d5300db9ed56bb1ee5 --- M pySim-trace.py 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/36777/1 diff --git a/pySim-trace.py b/pySim-trace.py index 91f50a3..be1d40b 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -14,6 +14,7 @@ from pySim.ts_102_221 import CardProfileUICC from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +from pySim.euicc import CardApplicationISDR, CardApplicationECASD from pySim.transport import LinkBase from pySim.apdu_source.gsmtap import GsmtapApduSource @@ -78,6 +79,8 @@ profile = CardProfileUICC() profile.add_application(CardApplicationUSIM()) profile.add_application(CardApplicationISIM()) +profile.add_application(CardApplicationISDR()) +profile.add_application(CardApplicationECASD()) scc = SimCardCommands(transport=DummySimLink()) card = UiccCardBase(scc) self.rs = RuntimeState(card, profile) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36777?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: I362a1a7f12d979ff0b7971d5300db9ed56bb1ee5 Gerrit-Change-Number: 36777 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in pysim[master]: docs/shell: Add missing :ref: when referencing other command
Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/36224?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: docs/shell: Add missing :ref: when referencing other command .. docs/shell: Add missing :ref: when referencing other command Change-Id: I18f110e6313932d82b19ecaa7e07ef00c2339513 --- M docs/shell.rst 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/36224/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36224?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: I18f110e6313932d82b19ecaa7e07ef00c2339513 Gerrit-Change-Number: 36224 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[S] Change in osmo-mgw[master]: contrib/systemd: run as osmocom user
Attention is currently required from: fixeria, msuraev, osmith, pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 8: Code-Review-1 (2 comments) Patchset: PS8: -1: Please add a warning for the user, because you're changing something what the user doesn't expect. It would be great if you could add this to the Debian Changelog (not sure how we're generating it). File debian/postinst: https://gerrit.osmocom.org/c/osmo-mgw/+/30094/comment/51157e27_2f75374b PS8, Line 18: # Fix permissions of previous (root-owned) install (OS#4107) It would be great to show a warning or something, so the user know those file has been changed. Can't you detect if this is an upgrade and from which version you're upgrading from? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb83c231231b39dc6732c0f375aeb3b21f3938ef Gerrit-Change-Number: 30094 Gerrit-PatchSet: 8 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 10 May 2024 17:02:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: fixeria, neels. pespin 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 transactions .. Patch Set 2: -Code-Review (1 comment) Patchset: PS2: > While this approach may work in practice, I find it a bit inelegant. […] After reading Neel's comments I think he has a point there. IIUC the summary is that instead of blindly eg. 5 seconds upon every LU, we should instead trigger fetching if there's more SMS to send and then once done destroy it. I guess that's well under 5 seconds or alike in usual case? -- 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: 2 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: Fri, 10 May 2024 16:58:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels Gerrit-MessageType: comment
[S] Change in docker-playground[master]: asterisk: Enable capabilities required to set up ipsec
Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36775?usp=email ) Change subject: asterisk: Enable capabilities required to set up ipsec .. Patch Set 1: (1 comment) Patchset: PS1: I'm not sure why do we need cap_sys_resource, but log message (from @andr...@eversberg.eu?) seems to require it: res/res_pjsip_outbound_registration/volte.c 194-spi_alloc_failed: 195-ast_log(LOG_ERROR, "Failed to allocate SPI. " 196-"Please make sure that the user running asterisk has the rights to do so. " 197:"(E.g use \"setcap 'cap_net_admin,cap_sys_resource=ep' /usr/sbin/asterisk\")\n"); 198-return status; -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36775?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: I2dc040cf87169c9a59dc7e9f1af0e1c17bde6683 Gerrit-Change-Number: 36775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Fri, 10 May 2024 16:24:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in docker-playground[master]: asterisk: Enable capabilities required to set up ipsec
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36775?usp=email ) Change subject: asterisk: Enable capabilities required to set up ipsec .. asterisk: Enable capabilities required to set up ipsec Change-Id: I2dc040cf87169c9a59dc7e9f1af0e1c17bde6683 --- M asterisk-master/Dockerfile M ttcn3-asterisk-ims-ue-test/jenkins.sh 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/36775/1 diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile index 789aeb5..0281176 100644 --- a/asterisk-master/Dockerfile +++ b/asterisk-master/Dockerfile @@ -77,3 +77,6 @@ make install && \ make samples && \ ldconfig + +# Required to set up ipsec: +RUNsetcap 'cap_net_admin,cap_sys_resource=ep' /usr/sbin/asterisk diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh index 7e5361d..aa5749d 100755 --- a/ttcn3-asterisk-ims-ue-test/jenkins.sh +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -22,6 +22,8 @@ echo Starting container with Asterisk docker run --rm \ + --cap-add=NET_ADMIN \ + --cap-add=SYS_RESOURCE \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/asterisk:/data \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36775?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: I2dc040cf87169c9a59dc7e9f1af0e1c17bde6683 Gerrit-Change-Number: 36775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: fixeria. neels 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 transactions .. Patch Set 2: (1 comment) Patchset: PS2: > a -1 to mark that this may be a suboptimal approach .. […] s/make sure/making sure/ -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 10 May 2024 15:34:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: fixeria. neels 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 transactions .. Patch Set 2: Code-Review-1 (1 comment) Patchset: PS2: a -1 to mark that this may be a suboptimal approach .. so make sure that if you merge this, you're aware of the aspect and choose it consciously -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 10 May 2024 15:33:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: fixeria. neels 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 transactions .. Patch Set 2: (1 comment) Patchset: PS2: While this approach may work in practice, I find it a bit inelegant. Man criticism: - what guarantees that a pending SMS is sent within that 5 second wait time? - I'd also prefer if we don't generally delay all LU for 5 seconds, most most most of them without reason. It would make more sense to me to run a pending-SMS-round for the subscriber before put()ing the LU use count token. There should be some mechanism like this to trigger SMS sending immediately on Complete Layer 3 somewhere, at the very least for rx'ing a Paging Response. I can't seem to find it now, only looked briefly... I found sms_queue.c sms_send_next(), but that is not the right one AFAICT. Maybe you can find the right API trigger...? If an SMS is pending, by starting the SMS operation, a new use token will be taken for the conn, i.e. a new trans starts and picks up a use count on the conn. Then we can release the LU use count immediately; the SMS will continue and keep the conn open until the SMS done. If none was pending, releasing the LU token will immediately release without delay, as usual. That's what I'd favor =) IOW, when waiting for 5 seconds, is it *guaranteed* to run an sms queue in that time? how does the pending SMS get sent? So can we run that SMS triggering loop once before releasing the LU token (and hence have no need clean up a pending timer). I dimly remember that in ttcn3 tests, when a previous test has put an SMS in the queue for that IMSI, then subsequent tests get unexpected SMS signalling and the tests get messed up. I thought this also happens during LU, but maybe it was non-LU compl3 only...? I'm trying to say that, for this feature, we "just" want to make this "adverse effect" that we already have more aggressive / more consistent. Re Pau's remark, if you keep this patch with the timer delay instead of running the SMS queue like I am suggesting, some of msc_a_fsm_cleanup() or trans_free() should osmo_timer_del() the timer, to make very sure that the timer cb does not try to access a freed pointer. (A consideration: if we ever remove the SMS queue implementation from osmo-msc to a separate SMSC, there should be some async operation to ask for a pending SMS before releasing a conn. So, that would take out another use token for "query-pending-SMS" and release it when the SMSC has responded. Maybe I'm wrong because I'm not aware of how SMSC procedures work, just maybe something to keep in mind as a general direction towards a distant future, when implementing this.) -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 10 May 2024 15:30:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36727?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 10 May 2024 15:09:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36725 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 10 May 2024 15:09:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
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 transactions .. Patch Set 2: Code-Review+1 -- 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: 2 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: Fri, 10 May 2024 15:02:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo_dia2gsup[master]: debian/postinst: chmod +x
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email ) Change subject: debian/postinst: chmod +x .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I281d55eaa9e058018604544599e80e60fb0aca79 Gerrit-Change-Number: 36773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 10 May 2024 15:01:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: contrib/systemd: run as osmocom user
Attention is currently required from: fixeria, msuraev, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb83c231231b39dc6732c0f375aeb3b21f3938ef Gerrit-Change-Number: 30094 Gerrit-PatchSet: 8 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 10 May 2024 15:01:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: > see https://gerrit.osmocom. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36725 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 10 May 2024 15:01:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: contrib: remove rpm spec file
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36727?usp=email ) Change subject: contrib: remove rpm spec file .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: > The customer said that they only use osmo-pcap on centos 7 (SYS#6760), and > that they deploy all othe […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 10 May 2024 15:00:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter...
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36774?usp=email ) Change subject: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation .. ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation Change-Id: I8d89e1694347f93e84c692d23b375062e003878e --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index e8e5058..c9011d5 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -5,7 +5,6 @@ [LOGGING] [TESTPORT_PARAMETERS] -*.AMI.CTRL_HOSTNAME := "172.18.11.10" Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_local_address := "172.18.11.103" Asterisk_Tests_LOCAL_SIP_EMU.SIP.local_sip_port := "5061" Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_dest_address := "172.18.11.10" @@ -21,6 +20,7 @@ Asterisk_Tests.mp_remote_sip_host := "172.18.11.10" Asterisk_Tests.mp_local_sip_port := 5061 Asterisk_Tests.mp_remote_sip_port := 5094 +Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36774?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: I8d89e1694347f93e84c692d23b375062e003878e Gerrit-Change-Number: 36774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter...
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36774?usp=email ) Change subject: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36774?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: I8d89e1694347f93e84c692d23b375062e003878e Gerrit-Change-Number: 36774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 May 2024 14:30:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter...
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36774?usp=email ) Change subject: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation .. ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation Change-Id: I8d89e1694347f93e84c692d23b375062e003878e --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/74/36774/1 diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index e8e5058..c9011d5 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -5,7 +5,6 @@ [LOGGING] [TESTPORT_PARAMETERS] -*.AMI.CTRL_HOSTNAME := "172.18.11.10" Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_local_address := "172.18.11.103" Asterisk_Tests_LOCAL_SIP_EMU.SIP.local_sip_port := "5061" Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_dest_address := "172.18.11.10" @@ -21,6 +20,7 @@ Asterisk_Tests.mp_remote_sip_host := "172.18.11.10" Asterisk_Tests.mp_local_sip_port := 5061 Asterisk_Tests.mp_remote_sip_port := 5094 +Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36774?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: I8d89e1694347f93e84c692d23b375062e003878e Gerrit-Change-Number: 36774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email )
Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
..
asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
Change Telnet_PT to a regular TCP socket for the AMI interface.
I started using Telnet_PT port since initial use of the interface
was done through telnet, but it's not really a telnet interface and
stuff starts becoming difficult to maintain properly when events
(generated by Asterisk at any time) arrive.
The current TEXT decoder/encoder from Titan seems to be struggling in 2
scenarios, so for now we are adding some workarounds in
dec_AMI_Msg_ext() before calling it in order to be able to go forward
and avoid errors:
1- Fields of format "MyFieldName: \r\n" (empty value). I tried changing
the "value" field in record AMI_Field to "optional", but then apparently
the TEXT decoder fails to decode values consisting of several words.
Ideally, I'd expect the TEXT decoder to put an empty "" string in the
"value" field in that case if "optional" is not flagged in the record.
2- Fields of format "MyFieldName: foobar: hey there \r\n" containing a
": " token in the value. I'd expect TEXT decoder to put all subsequent
strings in the last field "value" if no more fields are described in the
record.
Change-Id: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.cfg
M asterisk/Asterisk_Tests.default
M asterisk/Asterisk_Tests.ttcn
4 files changed, 213 insertions(+), 37 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index 6e0b8d0..b70e0ee 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -15,10 +15,11 @@
module AMI_Functions {
import from Misc_Helpers all;
-import from TELNETasp_PortType all;
import from Osmocom_Types all;
-import from TCCConversion_Functions all;
+import from IPL4asp_Types all;
+import from IPL4asp_PortType all;
import from Socket_API_Definitions all;
+import from TCCConversion_Functions all;
modulepar {
float mp_ami_prompt_timeout := 10.0;
@@ -172,47 +173,167 @@
* Adapter:
***/
+type record AMI_Adapter_Parameters {
+ charstring remote_host,
+ IPL4asp_Types.PortNumberremote_port,
+ charstring local_host,
+ IPL4asp_Types.PortNumberlocal_port,
+ charstring welcome_str
+}
+
+const AMI_Adapter_Parameters c_default_AMI_Adapter_pars := {
+ remote_host := "127.0.0.1",
+ remote_port := 5038,
+ local_host := "0.0.0.0",
+ local_port := 0,
+ welcome_str := "Asterisk Call Manager/9.0.0\r\n"
+};
+
type port AMI_Msg_PT message {
inout AMI_Msg;
} with { extension "internal" };
type component AMI_Adapter_CT {
- port TELNETasp_PT AMI;
+ port IPL4asp_PT IPL4;
port AMI_Msg_PT CLIENT;
+ var AMI_Adapter_Parameters g_pars;
+
+ /* Connection identifier of the client itself */
+ var IPL4asp_Types.ConnectionId g_self_conn_id := -1;
}
-function f_AMI_Adapter_main() runs on AMI_Adapter_CT {
- var AMI_Msg msg;
+/* Function to use to connect as client to a remote IPA Server */
+private function f_AMI_Adapter_connect() runs on AMI_Adapter_CT {
+ var IPL4asp_Types.Result res;
+ map(self:IPL4, system:IPL4);
+ res := IPL4asp_PortType.f_IPL4_connect(IPL4, g_pars.remote_host,
g_pars.remote_port,
+ g_pars.local_host,
g_pars.local_port, 0, { tcp:={} });
+ if (not ispresent(res.connId)) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Could not connect AMI socket from ",
g_pars.local_host, " port ",
+ g_pars.local_port, " to ", g_pars.remote_host,
" port ", g_pars.remote_port,
+ "; check your configuration"));
+ }
+ g_self_conn_id := res.connId;
+ log("AMI connected, ConnId=", g_self_conn_id)
+}
+private function f_ASP_RecvFrom_msg_to_charstring(ASP_RecvFrom rx_rf) return
charstring {
+ return oct2char(rx_rf.msg);
+}
+
+/* Function to use to connect as client to a remote IPA Server */
+private function f_AMI_Adapter_wait_rx_welcome_str() runs on AMI_Adapter_CT {
+ var ASP_RecvFrom rx_rf;
+ var charstring rx_str;
+ timer Twelcome := 3.0;
+
+ Twelcome.start;
+ alt {
+ [] IPL4.receive(ASP_RecvFrom:?) -> value rx_rf {
+ rx_str := f_ASP_RecvFrom_msg_to_charstring(rx_rf);
+ if (g_pars.welcome_str != rx_str) {
+ Misc_Helpers.f_shutdown(__BFILE__,
__LINE__, fail,
+ log2
[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Handle SIP REGISTER from peer
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36757?usp=email )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: SIP_Emulation: Handle SIP REGISTER from peer
..
SIP_Emulation: Handle SIP REGISTER from peer
This is needed when emulating an IMS core.
Change-Id: I49dfe54434113eb8b75306a3a8ddda940fa14743
---
M library/SIP_Emulation.ttcn
1 file changed, 27 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/library/SIP_Emulation.ttcn b/library/SIP_Emulation.ttcn
index a5ebcfb..3de7169 100644
--- a/library/SIP_Emulation.ttcn
+++ b/library/SIP_Emulation.ttcn
@@ -249,6 +249,19 @@
var SipUrl sip_to;
alt {
+ /* SIP REGISTER was received on SIP socket/port */
+ [] SIP.receive(tr_SIP_REGISTER) -> value sip_req {
+ var CallidString call_id :=
sip_req.msgHeader.callId.callid;
+ if (f_call_id_known(call_id)) {
+ /* re-register? */
+ vc_conn := f_comp_by_call_id(call_id);
+ } else {
+ /* new REGISTER: check expect */
+ vc_conn := ops.create_cb.apply(sip_req, id);
+ f_call_table_add(vc_conn, call_id);
+ }
+ CLIENT.send(sip_req) to vc_conn;
+ }
/* SIP INVITE was received on SIP socket/port */
[] SIP.receive(tr_SIP_INVITE) -> value sip_req {
var CallidString call_id :=
sip_req.msgHeader.callId.callid;
@@ -355,8 +368,9 @@
var SipUrl sip_to;
var integer i;
- if (sip_req.requestLine.method != INVITE_E) {
- setverdict(fail, "SIP ExpectedCreateCallback needs INVITE");
+ if (sip_req.requestLine.method != INVITE_E and
+ sip_req.requestLine.method != REGISTER_E) {
+ setverdict(fail, "SIP ExpectedCreateCallback needs
REGISTER/INVITE");
mtc.stop
return ret;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36757?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: I49dfe54434113eb8b75306a3a8ddda940fa14743
Gerrit-Change-Number: 36757
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Use ActionID field in Action Login
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36763?usp=email )
Change subject: asterisk: Use ActionID field in Action Login
..
asterisk: Use ActionID field in Action Login
It's a good practice to tag Actions with an ActionID to do proper
matching of the response once it comes back. It also helps reading a
dump of the conversation if there were events in between.
Change-Id: Iec320762ff0cca86319f7374b53c642f08a6e6df
---
M asterisk/AMI_Functions.ttcn
1 file changed, 22 insertions(+), 3 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index 3044c17..1f3dc5e 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -115,16 +115,21 @@
* Secret:
*/
template (value) AMI_Msg
-ts_AMI_Action_Login(charstring username, charstring secret) := {
+ts_AMI_Action_Login(charstring username,
+ charstring secret,
+ template (value) charstring action_id := "0001") := {
ts_AMI_Field_Action("Login"),
+ ts_AMI_Field_ActionId(action_id),
ts_AMI_Field_Username(username),
ts_AMI_Field_Secret(secret)
};
template (present) AMI_Msg
tr_AMI_Action_Login(template(present) charstring username := ?,
- template(present) charstring secret := ?) := superset(
+ template(present) charstring secret := ?,
+ template (present) charstring action_id := ?) := superset(
tr_AMI_Field_Action("Login"),
+ tr_AMI_Field_ActionId(action_id),
tr_AMI_Field_Username(username),
tr_AMI_Field_Secret(secret)
);
@@ -468,7 +473,8 @@
}
function f_ami_action_login(AMI_Msg_PT pt, charstring username, charstring
secret) {
- f_ami_transceive_match_response_success(pt,
ts_AMI_Action_Login(username, secret));
+ var charstring reg_action_id := f_gen_action_id();
+ f_ami_transceive_match_response_success(pt,
ts_AMI_Action_Login(username, secret, reg_action_id));
}
function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36763?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: Iec320762ff0cca86319f7374b53c642f08a6e6df
Gerrit-Change-Number: 36763
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: AMI_Functions: Tx ActionID instead of ActionId
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36762?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: AMI_Functions: Tx ActionID instead of ActionId .. AMI_Functions: Tx ActionID instead of ActionId The AMI documentation webpage mentions "ActionId", but Asterisk is always returning "ActionID" in all response messages. Any of the 2 is parsed fine by Asterisk since the keys are case insensitive, but anyway let's use same case as what Asterisk is actually transmitting to make reading of output easier. Change-Id: I8097e461fd0cadfa780d52ab1666e41b9d2b8a0e --- M asterisk/AMI_Functions.ttcn 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index c1211a9..3044c17 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -26,7 +26,7 @@ } const charstring AMI_FIELD_ACTION := "Action"; -const charstring AMI_FIELD_ACTION_ID := "ActionId"; +const charstring AMI_FIELD_ACTION_ID := "ActionID"; const charstring AMI_FIELD_USERNAME := "Username"; const charstring AMI_FIELD_SECRET := "Secret"; const charstring AMI_FIELD_RESPONSE := "Response"; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36762?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: I8097e461fd0cadfa780d52ab1666e41b9d2b8a0e Gerrit-Change-Number: 36762 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: AMI_Function: Match field keys in case insensitive way
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36758?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: AMI_Function: Match field keys in case insensitive way .. AMI_Function: Match field keys in case insensitive way As per [1], "Keys are case insensitive". [1] https://docs.asterisk.org/Configuration/Interfaces/Asterisk-Manager-Interface-AMI/AMI-v2-Specification/ Change-Id: I9080f617c4e7272b9dd67d616069ac9350411f3c --- M asterisk/AMI_Functions.ttcn 1 file changed, 20 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index b70e0ee..c1211a9 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -84,22 +84,22 @@ ts_AMI_Field_Registration(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_REGISTRATION, val); template (present) AMI_Field -tr_AMI_Field_Action(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION, val); +tr_AMI_Field_Action(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_ACTION, val); template (present) AMI_Field -tr_AMI_Field_ActionId(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION_ID, val); +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_Username(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_USERNAME, val); +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(AMI_FIELD_SECRET, val); +tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val); template (present) AMI_Field -tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_RESPONSE, val); +tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, val); /* Extensions: */ template (present) AMI_Field -tr_AMI_Field_Registration(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_REGISTRATION, val); +tr_AMI_Field_Registration(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_REGISTRATION, val); template (present) AMI_Field -tr_AMI_Field_ResponseSuccess := tr_AMI_Field(AMI_FIELD_RESPONSE, "Success"); +tr_AMI_Field_ResponseSuccess := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, "Success"); /*** -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36758?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: I9080f617c4e7272b9dd67d616069ac9350411f3c Gerrit-Change-Number: 36758 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Use ActionID field in Action Login
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36763?usp=email ) Change subject: asterisk: Use ActionID field in Action Login .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36763?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: Iec320762ff0cca86319f7374b53c642f08a6e6df Gerrit-Change-Number: 36763 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 May 2024 14:25:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
Attention is currently required from: laforge, pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email )
Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
..
Patch Set 4: Code-Review+2
(1 comment)
File asterisk/AMI_Functions.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/8bd97d5e_48a81288
PS3, Line 260: /* TEXT Enc/dec is not happy with values containing "; ", get
rid of them:
: * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" */
: var integer pos := f_strstr(patched_txt, "AppData: ", 0);
: if (pos >= 0) {
: var integer pos_end := f_strstr(patched_txt, "\r\n",
pos) + lengthof("\r\n");
: var charstring to_remove := substr(patched_txt, pos,
pos_end - pos);
: patched_txt := f_str_replace(patched_txt, to_remove,
"");
: }
> Ack
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d
Gerrit-Change-Number: 36755
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Fri, 10 May 2024 14:24:17 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in docker-playground[master]: asterisk: manager.conf: Give more permissions to AMI user
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email ) Change subject: asterisk: manager.conf: Give more permissions to AMI user .. asterisk: manager.conf: Give more permissions to AMI user These are required to use eg. PJSIPRegister command, otherwise Asterisk answers with "Permission Denied". It also seems to help in getting more events from Asterisk. Change-Id: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b --- M ttcn3-asterisk-ims-ue-test/asterisk/manager.conf 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf b/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf index ea6d1ac..67f7b02 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf @@ -9,3 +9,5 @@ secret = 1234 ;deny=0.0.0.0/0.0.0.0 permit=172.18.11.103/255.255.0.0 +read = all,system,call,log,verbose,command,agent,user +write = all,system,call,log,verbose,command,agent,user -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36651?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: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b Gerrit-Change-Number: 36651 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: asterisk: manager.conf: Give more permissions to AMI user
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email ) Change subject: asterisk: manager.conf: Give more permissions to AMI user .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36651?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: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b Gerrit-Change-Number: 36651 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 May 2024 14:23:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
Attention is currently required from: laforge, osmith. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET .. asterisk: Implement AMI_Adapter using IPL4 instead of TELNET Change Telnet_PT to a regular TCP socket for the AMI interface. I started using Telnet_PT port since initial use of the interface was done through telnet, but it's not really a telnet interface and stuff starts becoming difficult to maintain properly when events (generated by Asterisk at any time) arrive. The current TEXT decoder/encoder from Titan seems to be struggling in 2 scenarios, so for now we are adding some workarounds in dec_AMI_Msg_ext() before calling it in order to be able to go forward and avoid errors: 1- Fields of format "MyFieldName: \r\n" (empty value). I tried changing the "value" field in record AMI_Field to "optional", but then apparently the TEXT decoder fails to decode values consisting of several words. Ideally, I'd expect the TEXT decoder to put an empty "" string in the "value" field in that case if "optional" is not flagged in the record. 2- Fields of format "MyFieldName: foobar: hey there \r\n" containing a ": " token in the value. I'd expect TEXT decoder to put all subsequent strings in the last field "value" if no more fields are described in the record. Change-Id: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.cfg M asterisk/Asterisk_Tests.default M asterisk/Asterisk_Tests.ttcn 4 files changed, 213 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/36755/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d Gerrit-Change-Number: 36755 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: AMI_Functions: Tx ActionID instead of ActionId
Attention is currently required from: pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36762?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: AMI_Functions: Tx ActionID instead of ActionId .. AMI_Functions: Tx ActionID instead of ActionId The AMI documentation webpage mentions "ActionId", but Asterisk is always returning "ActionID" in all response messages. Any of the 2 is parsed fine by Asterisk since the keys are case insensitive, but anyway let's use same case as what Asterisk is actually transmitting to make reading of output easier. Change-Id: I8097e461fd0cadfa780d52ab1666e41b9d2b8a0e --- M asterisk/AMI_Functions.ttcn 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/36762/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36762?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: I8097e461fd0cadfa780d52ab1666e41b9d2b8a0e Gerrit-Change-Number: 36762 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: AMI_Function: Match field keys in case insensitive way
Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36758?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: AMI_Function: Match field keys in case insensitive way .. AMI_Function: Match field keys in case insensitive way As per [1], "Keys are case insensitive". [1] https://docs.asterisk.org/Configuration/Interfaces/Asterisk-Manager-Interface-AMI/AMI-v2-Specification/ Change-Id: I9080f617c4e7272b9dd67d616069ac9350411f3c --- M asterisk/AMI_Functions.ttcn 1 file changed, 20 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/36758/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36758?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: I9080f617c4e7272b9dd67d616069ac9350411f3c Gerrit-Change-Number: 36758 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Handle SIP REGISTER from peer
Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36757?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: SIP_Emulation: Handle SIP REGISTER from peer .. SIP_Emulation: Handle SIP REGISTER from peer This is needed when emulating an IMS core. Change-Id: I49dfe54434113eb8b75306a3a8ddda940fa14743 --- M library/SIP_Emulation.ttcn 1 file changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/36757/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36757?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: I49dfe54434113eb8b75306a3a8ddda940fa14743 Gerrit-Change-Number: 36757 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
[S] Change in ...osmo_dia2gsup[master]: debian/postinst: chmod +x
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email )
Change subject: debian/postinst: chmod +x
..
debian/postinst: chmod +x
Fixes: 240b43f3 ("contrib/systemd: run as osmocom user")
Change-Id: I281d55eaa9e058018604544599e80e60fb0aca79
---
M debian/postinst
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup
refs/changes/73/36773/1
diff --git a/debian/postinst b/debian/postinst
old mode 100644
new mode 100755
--
To view, visit
https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: I281d55eaa9e058018604544599e80e60fb0aca79
Gerrit-Change-Number: 36773
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-mgw[master]: contrib/systemd: run as osmocom user
Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 8: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb83c231231b39dc6732c0f375aeb3b21f3938ef Gerrit-Change-Number: 30094 Gerrit-PatchSet: 8 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 10 May 2024 14:18:22 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: rsl: define RSL_IE_OSMO_RTP_EXTENSIONS
Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36705?usp=email ) Change subject: rsl: define RSL_IE_OSMO_RTP_EXTENSIONS .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36705?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ac692062e05f859ba56235375bdc10f212cb2c0 Gerrit-Change-Number: 36705 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Comment-Date: Fri, 10 May 2024 14:15:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: bts_features: add feature flags for TWTS001 and TWTS002
Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36704?usp=email ) Change subject: bts_features: add feature flags for TWTS001 and TWTS002 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36704?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2cd1d5fa37e9d10927ca5d6cad79ec538fd0a11 Gerrit-Change-Number: 36704 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Comment-Date: Fri, 10 May 2024 14:14:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: fixeria, laforge, neels. pespin 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 transactions .. Patch Set 2: Code-Review+1 (1 comment) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/eeaffeb4_15d29845 PS2, Line 192: osmo_timer_schedule(&msc_a->lu_delay_timer, Tval, 0); > > are you sure the object cannot be destroyed in any way while the timer is > > set? […] Yes that's for sure true during the usual operation. I'm just raising the point in case there's some other "tear down everything immediatelly" code path I'm not aware of. Not saying it's there, just pointing out in case there's something like that :) -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 10 May 2024 14:14:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: laforge, neels, pespin. fixeria 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 transactions .. Patch Set 2: (1 comment) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/fcd5a225_d2f2ed4f PS2, Line 192: osmo_timer_schedule(&msc_a->lu_delay_timer, Tval, 0); > are you sure the object cannot be destroyed in any way while the timer is set? When calling this function, it's assumed that at least one token (`MSC_A_USE_LOCATION_UPDATING` or `'lu'`) is still keeping the `msc_a` object alive. So I don't see how can this happen while the timer is being set. Am I missing something? -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 10 May 2024 14:06:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Handle SIP REGISTER from peer
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36757?usp=email ) Change subject: SIP_Emulation: Handle SIP REGISTER from peer .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36757?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: I49dfe54434113eb8b75306a3a8ddda940fa14743 Gerrit-Change-Number: 36757 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 May 2024 14:03:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: fixeria, laforge, neels. pespin 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 transactions .. Patch Set 2: (1 comment) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/9542b60e_8268fa81 PS2, Line 192: osmo_timer_schedule(&msc_a->lu_delay_timer, Tval, 0); > are you sure the object cannot be destroyed in any way while the timer is > set? […] Maybe to be on the safe side locate the use_count_free/release to talloc_free callback and make sure to deregister the timer. -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 10 May 2024 14:00:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email ) Change subject: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer .. Patch Set 1: Code-Review+1 (1 comment) File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772/comment/849afcc6_ab79e5e6 PS1, Line 3307: f_sleep(0.5); maybe add a comment here describing this is an explicit sleep to actually test the feature -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?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: I74fa174ea649adb2112c8e471c0e339a2197a08d Gerrit-Change-Number: 36772 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 10 May 2024 13:56:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo_dia2gsup[master]: contrib/systemd: run as osmocom user
osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email ) Change subject: contrib/systemd: run as osmocom user .. contrib/systemd: run as osmocom user Run the systemd service as osmocom user and group instead of root. Set the StateDirectory and WorkingDirectory like we have it in other Osmocom service files. Remove the ExecStartPre mkdir, as the directory now gets created by postinst. Related: OS#4107 Change-Id: I2c0c7f4b98300b3b0bb5b95013b51b6b60625b95 --- M contrib/systemd/osmo_dia2gsup.service A debian/postinst 2 files changed, 49 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/contrib/systemd/osmo_dia2gsup.service b/contrib/systemd/osmo_dia2gsup.service index 2ef737c..e3d092e 100644 --- a/contrib/systemd/osmo_dia2gsup.service +++ b/contrib/systemd/osmo_dia2gsup.service @@ -7,8 +7,11 @@ [Service] Type=simple Restart=always +StateDirectory=osmo_dia2gsup +WorkingDirectory=%S/osmo_dia2gsup +User=osmocom +Group=osmocom Environment="HOME=/var/lib/osmo_dia2gsup" -ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo_dia2gsup ExecStart=/usr/bin/osmo-dia2gsup foreground RestartSec=2 diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 000..f9f64c8 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,30 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo_dia2gsup.service + chmod 0660 /etc/osmocom/osmo_dia2gsup.service + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmo_dia2gsup + chown -R osmocom:osmocom /var/lib/osmo_dia2gsup + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I2c0c7f4b98300b3b0bb5b95013b51b6b60625b95 Gerrit-Change-Number: 36771 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
Attention is currently required from: osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email )
Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
..
Patch Set 3:
(1 comment)
File asterisk/AMI_Functions.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/87eed5be_b50f120a
PS3, Line 260: /* TEXT Enc/dec is not happy with values containing "; ", get
rid of them:
: * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" */
: var integer pos := f_strstr(patched_txt, "AppData: ", 0);
: if (pos >= 0) {
: var integer pos_end := f_strstr(patched_txt, "\r\n",
pos) + lengthof("\r\n");
: var charstring to_remove := substr(patched_txt, pos,
pos_end - pos);
: patched_txt := f_str_replace(patched_txt, to_remove,
"");
: }
> ah thanks for explaining! could you update the comment, mention ": " and that
> it just removes the wh […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d
Gerrit-Change-Number: 36755
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-CC: osmith
Gerrit-Attention: osmith
Gerrit-Comment-Date: Fri, 10 May 2024 13:52:20 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in ...osmo_dia2gsup[master]: contrib/systemd: run as osmocom user
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I2c0c7f4b98300b3b0bb5b95013b51b6b60625b95 Gerrit-Change-Number: 36771 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 10 May 2024 13:50:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: fixeria, laforge, neels. pespin 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 transactions .. Patch Set 2: (1 comment) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/1e95aa9b_3af239c9 PS2, Line 192: osmo_timer_schedule(&msc_a->lu_delay_timer, Tval, 0); are you sure the object cannot be destroyed in any way while the timer is set? Because if that happens, you'll be releasing a memory chunk which hwas a timer scheduled, which will end up in use-after-free. -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 10 May 2024 13:49:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in ...osmo_dia2gsup[master]: contrib/systemd: run as osmocom user
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email ) Change subject: contrib/systemd: run as osmocom user .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I2c0c7f4b98300b3b0bb5b95013b51b6b60625b95 Gerrit-Change-Number: 36771 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 10 May 2024 13:39:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU transactions
Attention is currently required from: laforge, neels, pespin. fixeria 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 transactions .. Set Ready For Review -- 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: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 10 May 2024 13:38:49 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in docker-playground[master]: asterisk: pjsip.conf: Mark templates accordingly
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email ) Change subject: asterisk: pjsip.conf: Mark templates accordingly .. asterisk: pjsip.conf: Mark templates accordingly Mark templates as such, in order to remove error messages during asterisk setup when trying to apply the templates (which lack fields such as "username", provided by config sections using the templates). Reference: https://docs.asterisk.org/Fundamentals/Asterisk-Configuration/Asterisk-Configuration-Files/Templates/Template-Syntax/ Change-Id: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 18 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index 39cf9bb..57cab41 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -7,8 +7,7 @@ ;external_media_address=[obfuscated] ;external_signaling_address=[obfuscated] - -[endpoint_phone_template] +[endpoint_phone_template](!) type=endpoint transport=transport-udp context=from-phone @@ -16,11 +15,11 @@ allow=alaw allow=ulaw -[auth_phone_template] +[auth_phone_template](!) type=auth auth_type=userpass -[aor_phone_template] +[aor_phone_template](!) type=aor max_contacts=1 remove_existing=yes -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36650?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: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 Gerrit-Change-Number: 36650 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: asterisk: pjsip.conf: Mark templates accordingly
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email ) Change subject: asterisk: pjsip.conf: Mark templates accordingly .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36650?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: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 Gerrit-Change-Number: 36650 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 10 May 2024 13:34:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email )
Change subject: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer
..
msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer
Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d
Related: osmo-msc.git Ic519cab55d65e47b2636124427dab1a1d80fab78
Related: SYS#6913
---
M msc/BSC_ConnectionHandler.ttcn
M msc/MSC_Tests.ttcn
M msc/expected-results.xml
3 files changed, 78 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/72/36772/1
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 658923e..056a3c0 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -833,7 +833,8 @@
}
}
-function f_perform_lu(template (omit) MobileIdentityLV use_mi := omit)
+function f_perform_lu(template (omit) MobileIdentityLV use_mi := omit,
+ boolean expect_clear := true)
runs on BSC_ConnHdlr {
var MobileIdentityLV mi;
if (istemplatekind(use_mi, "omit")) {
@@ -866,8 +867,11 @@
f_msc_lu_hlr();
f_mm_imei();
as_accept_reject_lu(g_pars.net.expect_attach_success);
- /* FIXME: there could be pending SMS or other common procedures by the
MSC, let's ignore them */
- f_expect_clear(verify_vlr_cell_id := g_pars.net.expect_attach_success);
+
+ /* there could be pending SMS or other common procedures by the MSC */
+ if (expect_clear) {
+ f_expect_clear(verify_vlr_cell_id :=
g_pars.net.expect_attach_success);
+ }
setverdict(pass);
}
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 09004e8..1f9bfc4 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -3279,6 +3279,64 @@
f_vty_config(MSCVTY, "msc", "sms-over-gsup");
vc_conn :=
f_start_handler_with_pars(refers(f_tc_gsup_mt_multi_part_sms), pars);
vc_conn.done;
+ Tf_vty_config(MSCVTY, "msc", "no sms-over-gsup");
+}
+
+/* Test X5 (LU delay) timer allowing to deliver MT SMS over the same
connection */
+friend function f_TC_gsup_mt_sms_lu_x5(charstring id, BSC_ConnHdlrPars pars)
+runs on BSC_ConnHdlr {
+ var SmsParameters spars := valueof(t_SmsPars);
+
+ f_init_handler(pars);
+
+ /* We need to inspect GSUP activity */
+ f_create_gsup_expect(hex2str(g_pars.imsi));
+
+ /* Perform location update */
+ f_perform_lu(expect_clear := false);
+
+ /* Register an 'expect' for given IMSI (+TMSI) */
+ f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);
+
+ var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES(
+ imsi := g_pars.imsi,
+ /* NOTE: MSC should assign RP-MR itself */
+ sm_rp_mr := ?
+ );
+
+ f_sleep(0.5);
+
+ /* Submit a MT SMS on GSUP */
+ f_gsup_forwardSM_req(spars);
+
+ /* Wait for MT SMS on DTAP */
+ f_mt_sms_expect(spars);
+
+ /* Send RP-ACK and expect MT-forwardSM-Res on GSUP */
+ f_mt_sms_send_rp_ack(spars);
+ alt {
+ [] GSUP.receive(mt_forwardSM_res) {
+ log("RX MT-forwardSM-Res (RP-ACK)");
+ setverdict(pass);
+ }
+ [] GSUP.receive {
+ setverdict(fail, "Rx unexpected GSUP message");
+ mtc.stop;
+ }
+ }
+
+ f_expect_clear();
+}
+testcase TC_gsup_mt_sms_lu_x5() runs on MTC_CT {
+ var BSC_ConnHdlrPars pars;
+ var BSC_ConnHdlr vc_conn;
+ f_init();
+ pars := f_init_pars(92);
+ f_vty_config(MSCVTY, "msc", "sms-over-gsup");
+ f_vty_config(MSCVTY, "msc", "timer geran x5 2");
+ vc_conn := f_start_handler_with_pars(refers(f_TC_gsup_mt_sms_lu_x5),
pars);
+ vc_conn.done;
+ f_vty_config(MSCVTY, "msc", "timer geran x5 0");
f_vty_config(MSCVTY, "msc", "no sms-over-gsup");
}
@@ -7434,6 +7492,7 @@
execute( TC_gsup_mt_sms_rp_mr() );
execute( TC_gsup_mo_mt_sms_rp_mr() );
execute( TC_gsup_mt_multi_part_sms() );
+ execute( TC_gsup_mt_sms_lu_x5() );
execute( TC_lu_and_mo_ussd_single_request() );
execute( TC_lu_and_mt_ussd_notification() );
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index aad96a7..d5a9462 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -80,6 +80,7 @@
+
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?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: I74fa174ea649adb2112c8e471c0e339a2197a08d
Gerrit-Change-Number: 36772
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in docker-playground[master]: asterisk: pjsip.conf: Mark templates accordingly
Attention is currently required from: dexter, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email ) Change subject: asterisk: pjsip.conf: Mark templates accordingly .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36650?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: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 Gerrit-Change-Number: 36650 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 10 May 2024 13:02:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: asterisk: manager.conf: Give more permissions to AMI user
Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email ) Change subject: asterisk: manager.conf: Give more permissions to AMI user .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36651?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: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b Gerrit-Change-Number: 36651 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 10 May 2024 13:01:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
Attention is currently required from: pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email )
Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
..
Patch Set 3:
(2 comments)
File asterisk/AMI_Functions.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/6e3011c2_87f02b3c
PS3, Line 260: /* TEXT Enc/dec is not happy with values containing "; ", get
rid of them:
: * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" */
: var integer pos := f_strstr(patched_txt, "AppData: ", 0);
: if (pos >= 0) {
: var integer pos_end := f_strstr(patched_txt, "\r\n",
pos) + lengthof("\r\n");
: var charstring to_remove := substr(patched_txt, pos,
pos_end - pos);
: patched_txt := f_str_replace(patched_txt, to_remove,
"");
: }
> It's removing the full line "AppData: 5,0502: Call pjsip endpoint from
> 0501\r\n", since we don't nee […]
ah thanks for explaining! could you update the comment, mention ": " and that
it just removes the whole line? that would make it much clearer
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/fec411c2_0fd17047
PS3, Line 480: log("AMI_Msg decoded: ", msg);
> That's more like a playground to test stuff interactively (recompile, test,
> etc. […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d
Gerrit-Change-Number: 36755
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-CC: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Fri, 10 May 2024 12:58:10 +
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]: asterisk: Introduce AMI_Adapter_CT
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?usp=email )
(
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: asterisk: Introduce AMI_Adapter_CT
..
asterisk: Introduce AMI_Adapter_CT
This allows to keep string handling totally internal to the AMI_Adapter
component, which also means now the CLIENT port acts asynchronously on
full AMI messages.
This allows for instance using activated altsteps to ignore events or
answer to them.
Change-Id: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.ttcn
2 files changed, 126 insertions(+), 48 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index 72420e1..6e0b8d0 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -167,6 +167,58 @@
tr_AMI_Field_ActionId(action_id)
);
+
+/***
+ * Adapter:
+ ***/
+
+type port AMI_Msg_PT message {
+ inout AMI_Msg;
+} with { extension "internal" };
+
+type component AMI_Adapter_CT {
+ port TELNETasp_PT AMI;
+ port AMI_Msg_PT CLIENT;
+}
+
+function f_AMI_Adapter_main() runs on AMI_Adapter_CT {
+ var AMI_Msg msg;
+
+ var charstring rx, buf := "";
+ var integer fd;
+
+ map(self:AMI, system:AMI);
+
+ while (true) {
+
+ alt {
+ [] AMI.receive(pattern "\n") {
+ buf := buf & "\n";
+ msg := dec_AMI_Msg(buf);
+ buf := "";
+ CLIENT.send(msg);
+ };
+ [] AMI.receive(charstring:?) -> value rx {
+ buf := buf & rx;
+ };
+ [] AMI.receive(integer:?) -> value fd {
+ if (fd == -1) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__,
fail,
+ "AMI Telnet Connection
Failure: " & int2str(fd));
+ } else {
+ /* telnet connection succeeded */
+ }
+ }
+ [] CLIENT.receive(AMI_Msg:?) -> value msg {
+ /* TODO: in the future, queue Action if there's already
one Action in transit, to fullfill AMI requirements. */
+ var charstring tx_txt := enc_AMI_Msg(msg);
+ AMI.send(tx_txt);
+ }
+ }
+ }
+}
+
+
/*
* Functions:
*/
@@ -223,62 +275,66 @@
return field.val;
}
-private function f_ami_wait_for_prompt_str(TELNETasp_PT pt, charstring
log_label := "(?)")
-return charstring {
- var charstring rx, buf := "";
- var integer fd;
+function f_ami_transceive_ret(AMI_Msg_PT pt, template (value) AMI_Msg tx_msg,
float rx_timeout := 10.0) return AMI_Msg {
+ var AMI_Msg rx_msg;
timer T;
- T.start(mp_ami_prompt_timeout);
+ T.start(rx_timeout);
+ pt.send(tx_msg);
alt {
- [] pt.receive(pattern "\n") { buf := buf & "\n" };
- [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat };
- [] pt.receive(integer:?) -> value fd {
- if (fd == -1) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
- "AMI Telnet Connection Failure:
" & log_label);
- } else {
- repeat; /* telnet connection succeeded */
- }
- }
+ [] pt.receive(AMI_Msg:?) -> value rx_msg;
[] T.timeout {
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
- "AMI Timeout for prompt: " & log_label);
- };
+ log2str("AMI Response timeout: ",
tx_msg));
+ }
}
T.stop;
- return buf;
+ return rx_msg;
+
}
-function f_ami_wait_for_prompt(TELNETasp_PT pt, charstring log_label := "(?)")
return AMI_Msg {
- var charstring buf := f_ami_wait_for_prompt_str(pt, log_label);
- var AMI_Msg msg := dec_AMI_Msg(buf);
- return msg;
-}
-
-/* send a AMI command and obtain response until prompt is received */
-private function f_ami_transceive_ret_str(TELNETasp_PT pt, charstring tx)
return charstring {
- pt.send(tx);
- return f_ami_wait_for_prompt_str(pt, tx);
-}
-
-function f_ami_transceive_ret(TELNETasp_PT pt, template (value) AMI_Msg
tx_msg) return AMI_Msg {
- var charstring tx_txt := enc_AMI_Msg(valueof(t
[S] Change in osmo-ttcn3-hacks[master]: Misc_Helpers.ttcn: Add some more string handling API helpers
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36754?usp=email )
Change subject: Misc_Helpers.ttcn: Add some more string handling API helpers
..
Misc_Helpers.ttcn: Add some more string handling API helpers
These are currently used by code in AMI_Functions doing some workaround
for TEXT decoder limitations.
They can be merged independently now since anyway they are totally
generic and may be useful for future users.
Change-Id: I3d6da125a10807b7a2f3ecad8145a046a322c7d6
---
M library/Misc_Helpers.ttcn
1 file changed, 40 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn
index 805254a..a742b0b 100644
--- a/library/Misc_Helpers.ttcn
+++ b/library/Misc_Helpers.ttcn
@@ -79,6 +79,31 @@
return count;
}
+/* Return true if str ends exactly with token: */
+function f_str_endswith(charstring str, charstring token) return boolean
+{
+ if (lengthof(str) < lengthof(token)) {
+ return false;
+ }
+ var charstring str_end := substr(str, lengthof(str) - lengthof(token),
lengthof(token));
+ return str_end == token;
+}
+
+/* Replace all matches of token "find" with "repl" in "str" */
+function f_str_replace(charstring str, charstring find, charstring repl)
return charstring
+{
+ var integer pos := f_strstr(str, find, 0);
+ if (pos < 0) {
+ return str;
+ }
+ var charstring prefix := substr(str, 0, pos);
+ var integer suffix_pos := pos + lengthof(find);
+ var charstring suffix := substr(str, suffix_pos, lengthof(str) -
suffix_pos);
+
+ var charstring new_str := prefix & repl & f_str_replace(suffix, find,
repl);
+ return new_str;
+}
+
type record of charstring ro_charstring;
function f_str_split(charstring str, charstring delim := "\n") return
ro_charstring
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36754?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: I3d6da125a10807b7a2f3ecad8145a046a322c7d6
Gerrit-Change-Number: 36754
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
Attention is currently required from: osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email )
Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
..
Patch Set 3:
(1 comment)
File asterisk/AMI_Functions.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/e98ef540_60d244c4
PS3, Line 480: log("AMI_Msg decoded: ", msg);
> add some sort of assert / check at the end, that the decode lead to the
> expected result?
That's more like a playground to test stuff interactively (recompile, test,
etc.) not something really being run during usual testsuite.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d
Gerrit-Change-Number: 36755
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-CC: osmith
Gerrit-Attention: osmith
Gerrit-Comment-Date: Fri, 10 May 2024 12:54:45 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
Attention is currently required from: osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email )
Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
..
Patch Set 3:
(1 comment)
File asterisk/AMI_Functions.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/a6484644_acca2ada
PS3, Line 260: /* TEXT Enc/dec is not happy with values containing "; ", get
rid of them:
: * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" */
: var integer pos := f_strstr(patched_txt, "AppData: ", 0);
: if (pos >= 0) {
: var integer pos_end := f_strstr(patched_txt, "\r\n",
pos) + lengthof("\r\n");
: var charstring to_remove := substr(patched_txt, pos,
pos_end - pos);
: patched_txt := f_str_replace(patched_txt, to_remove,
"");
: }
> I don't understand what this does. […]
It's removing the full line "AppData: 5,0502: Call pjsip endpoint from
0501\r\n", since we don't need it for now and just breaks the decoder (yes,
this all should be fixed better at a later point in in TITAN TEXT decoder).
1- Find pos of "AppData" substr start.
2- From there, find where the line finishes by finding "\r\n".
3- Create a substr of that line.
4- Use f_str_replace() to remove that line entirely.
EDIT: Ah! I see what you mean, I put a typo in the comment, I meant ": ".
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d
Gerrit-Change-Number: 36755
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-CC: osmith
Gerrit-Attention: osmith
Gerrit-Comment-Date: Fri, 10 May 2024 12:53:52 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: ttcn3: fix permissions before running make clean
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email ) Change subject: ttcn3: fix permissions before running make clean .. ttcn3: fix permissions before running make clean Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e --- M ttcn3/ttcn3.sh 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index d665e84..f3d3b7c 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -28,6 +28,8 @@ "$DIR_VAR_LOCAL" if [ -d "$DIR_OSMODEV/src/osmo-ttcn3-hacks" ]; then + sudo chown -R "$(id -u):$(id -g)" \ + "$DIR_OSMODEV/src/osmo-ttcn3-hacks" make -C "$DIR_OSMODEV/src/osmo-ttcn3-hacks" clean fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e Gerrit-Change-Number: 36764 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmo-dev[master]: ttcn3/ttcn3.sh: collect_logs: fix tester* paths
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/36769?usp=email )
Change subject: ttcn3/ttcn3.sh: collect_logs: fix tester* paths
..
ttcn3/ttcn3.sh: collect_logs: fix tester* paths
For ttcn3-bts-test and ttcn3-ggsn-test, the tester dir has the
configuration at the end (…-tester-all etc.). Support that in the
collect_logs function.
Change-Id: I2aaab0c37fffedaeb49a362f77d795f017e2a7da
---
M ttcn3/ttcn3.sh
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 7cdf4c1..26f76da 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -502,11 +502,8 @@
}
collect_logs() {
- # Merge and move logs
- cd /tmp/logs/*-tester
-
# Format logs
- for log in *.merged; do
+ for log in /tmp/logs/*-tester*/*.merged; do
ttcn3_logformat -o "${log}.log" "$log"
sudo rm "$log"
done
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36769?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I2aaab0c37fffedaeb49a362f77d795f017e2a7da
Gerrit-Change-Number: 36769
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-dev[master]: no_uring_tests.opts: new file
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36770?usp=email ) Change subject: no_uring_tests.opts: new file .. no_uring_tests.opts: new file Change-Id: Ia1be7b4b51a1b7d21cf7053be9994ec37d58c89a --- A no_uring_tests.opts 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/no_uring_tests.opts b/no_uring_tests.opts new file mode 100644 index 000..7d7a698 --- /dev/null +++ b/no_uring_tests.opts @@ -0,0 +1 @@ +libosmocore --disable-uring-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia1be7b4b51a1b7d21cf7053be9994ec37d58c89a Gerrit-Change-Number: 36770 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmo-dev[master]: ttcn3.sh: bts: fix missing trxcon dependency
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email )
Change subject: ttcn3.sh: bts: fix missing trxcon dependency
..
ttcn3.sh: bts: fix missing trxcon dependency
Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359
---
M all.deps
M gen_makefile.py
M ttcn3/ttcn3.sh
3 files changed, 23 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/all.deps b/all.deps
index 5a1191a..398ebec 100644
--- a/all.deps
+++ b/all.deps
@@ -48,4 +48,5 @@
# configure.ac not in topdir of repository
osmocom-bb_layer23 libosmocore
osmocom-bb_virtphy libosmocore
+osmocom-bb_trxcon libosmocore
simtrace2_host libosmocore
diff --git a/gen_makefile.py b/gen_makefile.py
index 3f6a994..9b896b2 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -188,6 +188,14 @@
touch $@
'''
+ if proj == "osmocom-bb_trxcon":
+return f'''
+.make.{proj}.clone: .make.osmocom-bb.clone
+ @echo -e "\\n\\n\\n= $@\\n"
+ test -L {src_proj} || ln -s osmocom-bb/src/host/trxcon {src_proj}
+ touch $@
+ '''
+
if proj == "simtrace2_host":
return f'''
.make.{proj}.clone: .make.simtrace2.clone
@@ -512,6 +520,9 @@
.PHONY: virtphy
virtphy: osmocom-bb_virtphy
+.PHONY: trxcon
+trxcon: osmocom-bb_trxcon
+
#
# Other convenience targets
#
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 780a4ba..a458f5b 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -195,7 +195,7 @@
# Osmocom
bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;;
- bts) echo "osmo-bsc osmo-bts-trx" ;;
+ bts) echo "osmo-bsc osmo-bts-trx trxcon" ;;
msc) echo "osmo-stp osmo-msc" ;;
pcu-sns) echo "osmo-pcu" ;;
pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;;
@@ -213,6 +213,7 @@
osmo-pcap-*) echo "osmo-pcap" ;;
osmo-stp) echo "libosmo-sccp" ;;
osmo-uecups-*) echo "osmo-uecups" ;;
+ trxcon) echo "osmocom-bb_trxcon" ;;
*) echo "$1" ;;
esac
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359
Gerrit-Change-Number: 36767
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-dev[master]: ttcn3.sh: add -c CONFIG argument
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email )
Change subject: ttcn3.sh: add -c CONFIG argument
..
ttcn3.sh: add -c CONFIG argument
Allow only running one of the ttcn3-bts-test configurations, instead of
running all of them.
Depends: docker-playground I1dce5e6aa4b5d67f9f8c96ced611ab2875c353c8
Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769
---
M ttcn3/ttcn3.sh
1 file changed, 23 insertions(+), 2 deletions(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index a458f5b..7cdf4c1 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -10,6 +10,7 @@
KERNEL_DIR=""
KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source"
ARG_TEST_NAME=""
+ARG_TEST_CONFIGS=""
DOCKER_IMG_TITAN="debian-bookworm-titan"
clean() {
@@ -43,11 +44,14 @@
}
parse_args() {
- while getopts 'ht:dkf' OPTION; do
+ while getopts 'ht:c:dkf' OPTION; do
case "$OPTION" in
t)
ARG_TEST_NAME="$OPTARG"
;;
+ c)
+ ARG_TEST_CONFIGS="$OPTARG"
+ ;;
d)
if [ -n "$KERNEL_TEST" ]; then
echo "ERROR: use either -d or -k"
@@ -81,12 +85,13 @@
;;
h|*)
local name="$(basename $0)"
- echo "usage: $name [-h] [-t TESTNAME] [-d|-k [-f]]
PROJECT"
+ echo "usage: $name [-h] [-t TESTNAME] [-c CONFIG]
[-d|-k [-f]] PROJECT"
echo " or: $name clean"
echo
echo "arguments:"
echo " -h show help"
echo " -t only run the test with this name"
+ echo " -c only run test configuration with this
name"
echo
echo "arguments for kernel tests:"
echo " -d run kernel tests with debian kernel"
@@ -106,6 +111,7 @@
echo " $name hss"
echo " $name mme"
echo " $name pgw"
+ echo " $name -t TC_est_dchan -c generic bts"
exit 1
;;
esac
@@ -482,8 +488,10 @@
if [ -n "$ARG_TEST_NAME" ]; then
DOCKER_ARGS="$DOCKER_ARGS -e TEST_NAME=$ARG_TEST_NAME"
fi
+
export DOCKER_ARGS
export NO_LIST_OSMO_PACKAGES=1
+ export TEST_CONFIGS="$ARG_TEST_CONFIGS"
./jenkins.sh
touch "$marker"
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769
Gerrit-Change-Number: 36768
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-dev[master]: ttcn3.sh: prepare_local_bin: always copy scripts
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email ) Change subject: ttcn3.sh: prepare_local_bin: always copy scripts .. ttcn3.sh: prepare_local_bin: always copy scripts Always copy ttcn3-docker-run.sh from docker-playground.git, so we don't use an outdated version if the file has changed. Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e --- M ttcn3/ttcn3.sh 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index f3d3b7c..780a4ba 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -297,9 +297,6 @@ esac script_path_localbin="$DIR_USR_LOCAL/bin/$name_install" - if [ -x "$script_path_localbin" ]; then - continue - fi install -v -Dm755 "$script" "$script_path_localbin" done -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e Gerrit-Change-Number: 36766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmo-dev[master]: src/grd: urlencode / in project names
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email )
Change subject: src/grd: urlencode / in project names
..
src/grd: urlencode / in project names
Fix that it didn't work with projects that contain a slash character,
such as erlang/osmo-epdg.
Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7
---
M src/grd
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/src/grd b/src/grd
index 0ca5df7..e149c6f 100755
--- a/src/grd
+++ b/src/grd
@@ -9,6 +9,7 @@
import os
import subprocess
import urllib.request
+import urllib.parse
def get_topdir():
@@ -37,7 +38,8 @@
def get_gerrit_details(host, project, patch_id, verbose):
-url = f"https://{host}/changes/{project}~{args.patch_id}/detail";
+project_q = urllib.parse.quote(project, "")
+url = f"https://{host}/changes/{project_q}~{args.patch_id}/detail";
print(f"Download {url}")
with urllib.request.urlopen(url) as response:
content = response.read().decode()
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7
Gerrit-Change-Number: 36765
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-dev[master]: no_uring_tests.opts: new file
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36770?usp=email ) Change subject: no_uring_tests.opts: new file .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia1be7b4b51a1b7d21cf7053be9994ec37d58c89a Gerrit-Change-Number: 36770 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 10 May 2024 12:04:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: ttcn3/ttcn3.sh: collect_logs: fix tester* paths
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36769?usp=email ) Change subject: ttcn3/ttcn3.sh: collect_logs: fix tester* paths .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36769?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I2aaab0c37fffedaeb49a362f77d795f017e2a7da Gerrit-Change-Number: 36769 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 10 May 2024 12:03:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: ttcn3.sh: add -c CONFIG argument
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email ) Change subject: ttcn3.sh: add -c CONFIG argument .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769 Gerrit-Change-Number: 36768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 10 May 2024 12:03:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: ttcn3.sh: bts: fix missing trxcon dependency
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email ) Change subject: ttcn3.sh: bts: fix missing trxcon dependency .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359 Gerrit-Change-Number: 36767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 10 May 2024 12:03:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: ttcn3.sh: prepare_local_bin: always copy scripts
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email ) Change subject: ttcn3.sh: prepare_local_bin: always copy scripts .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e Gerrit-Change-Number: 36766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 10 May 2024 12:03:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: src/grd: urlencode / in project names
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email ) Change subject: src/grd: urlencode / in project names .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7 Gerrit-Change-Number: 36765 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 10 May 2024 12:03:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: ttcn3: fix permissions before running make clean
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email ) Change subject: ttcn3: fix permissions before running make clean .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e Gerrit-Change-Number: 36764 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 10 May 2024 12:03:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: ttcn3: fix permissions before running make clean
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email ) Change subject: ttcn3: fix permissions before running make clean .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: as discussed with Neels, directly merging osmo-dev.git changes -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e Gerrit-Change-Number: 36764 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 10 May 2024 12:03:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-dev[master]: no_uring_tests.opts: new file
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36770?usp=email ) Change subject: no_uring_tests.opts: new file .. no_uring_tests.opts: new file Change-Id: Ia1be7b4b51a1b7d21cf7053be9994ec37d58c89a --- A no_uring_tests.opts 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/70/36770/1 diff --git a/no_uring_tests.opts b/no_uring_tests.opts new file mode 100644 index 000..7d7a698 --- /dev/null +++ b/no_uring_tests.opts @@ -0,0 +1 @@ +libosmocore --disable-uring-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia1be7b4b51a1b7d21cf7053be9994ec37d58c89a Gerrit-Change-Number: 36770 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-dev[master]: ttcn3/ttcn3.sh: collect_logs: fix tester* paths
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-dev/+/36769?usp=email )
Change subject: ttcn3/ttcn3.sh: collect_logs: fix tester* paths
..
ttcn3/ttcn3.sh: collect_logs: fix tester* paths
For ttcn3-bts-test and ttcn3-ggsn-test, the tester dir has the
configuration at the end (…-tester-all etc.). Support that in the
collect_logs function.
Change-Id: I2aaab0c37fffedaeb49a362f77d795f017e2a7da
---
M ttcn3/ttcn3.sh
1 file changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/69/36769/1
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 7cdf4c1..26f76da 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -502,11 +502,8 @@
}
collect_logs() {
- # Merge and move logs
- cd /tmp/logs/*-tester
-
# Format logs
- for log in *.merged; do
+ for log in /tmp/logs/*-tester*/*.merged; do
ttcn3_logformat -o "${log}.log" "$log"
sudo rm "$log"
done
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36769?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I2aaab0c37fffedaeb49a362f77d795f017e2a7da
Gerrit-Change-Number: 36769
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-dev[master]: ttcn3.sh: add -c CONFIG argument
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email )
Change subject: ttcn3.sh: add -c CONFIG argument
..
ttcn3.sh: add -c CONFIG argument
Allow only running one of the ttcn3-bts-test configurations, instead of
running all of them.
Depends: docker-playground I1dce5e6aa4b5d67f9f8c96ced611ab2875c353c8
Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769
---
M ttcn3/ttcn3.sh
1 file changed, 23 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/68/36768/1
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index a458f5b..7cdf4c1 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -10,6 +10,7 @@
KERNEL_DIR=""
KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source"
ARG_TEST_NAME=""
+ARG_TEST_CONFIGS=""
DOCKER_IMG_TITAN="debian-bookworm-titan"
clean() {
@@ -43,11 +44,14 @@
}
parse_args() {
- while getopts 'ht:dkf' OPTION; do
+ while getopts 'ht:c:dkf' OPTION; do
case "$OPTION" in
t)
ARG_TEST_NAME="$OPTARG"
;;
+ c)
+ ARG_TEST_CONFIGS="$OPTARG"
+ ;;
d)
if [ -n "$KERNEL_TEST" ]; then
echo "ERROR: use either -d or -k"
@@ -81,12 +85,13 @@
;;
h|*)
local name="$(basename $0)"
- echo "usage: $name [-h] [-t TESTNAME] [-d|-k [-f]]
PROJECT"
+ echo "usage: $name [-h] [-t TESTNAME] [-c CONFIG]
[-d|-k [-f]] PROJECT"
echo " or: $name clean"
echo
echo "arguments:"
echo " -h show help"
echo " -t only run the test with this name"
+ echo " -c only run test configuration with this
name"
echo
echo "arguments for kernel tests:"
echo " -d run kernel tests with debian kernel"
@@ -106,6 +111,7 @@
echo " $name hss"
echo " $name mme"
echo " $name pgw"
+ echo " $name -t TC_est_dchan -c generic bts"
exit 1
;;
esac
@@ -482,8 +488,10 @@
if [ -n "$ARG_TEST_NAME" ]; then
DOCKER_ARGS="$DOCKER_ARGS -e TEST_NAME=$ARG_TEST_NAME"
fi
+
export DOCKER_ARGS
export NO_LIST_OSMO_PACKAGES=1
+ export TEST_CONFIGS="$ARG_TEST_CONFIGS"
./jenkins.sh
touch "$marker"
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769
Gerrit-Change-Number: 36768
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-dev[master]: ttcn3.sh: bts: fix missing trxcon dependency
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email )
Change subject: ttcn3.sh: bts: fix missing trxcon dependency
..
ttcn3.sh: bts: fix missing trxcon dependency
Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359
---
M all.deps
M gen_makefile.py
M ttcn3/ttcn3.sh
3 files changed, 23 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/67/36767/1
diff --git a/all.deps b/all.deps
index 5a1191a..398ebec 100644
--- a/all.deps
+++ b/all.deps
@@ -48,4 +48,5 @@
# configure.ac not in topdir of repository
osmocom-bb_layer23 libosmocore
osmocom-bb_virtphy libosmocore
+osmocom-bb_trxcon libosmocore
simtrace2_host libosmocore
diff --git a/gen_makefile.py b/gen_makefile.py
index 3f6a994..9b896b2 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -188,6 +188,14 @@
touch $@
'''
+ if proj == "osmocom-bb_trxcon":
+return f'''
+.make.{proj}.clone: .make.osmocom-bb.clone
+ @echo -e "\\n\\n\\n= $@\\n"
+ test -L {src_proj} || ln -s osmocom-bb/src/host/trxcon {src_proj}
+ touch $@
+ '''
+
if proj == "simtrace2_host":
return f'''
.make.{proj}.clone: .make.simtrace2.clone
@@ -512,6 +520,9 @@
.PHONY: virtphy
virtphy: osmocom-bb_virtphy
+.PHONY: trxcon
+trxcon: osmocom-bb_trxcon
+
#
# Other convenience targets
#
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 780a4ba..a458f5b 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -195,7 +195,7 @@
# Osmocom
bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;;
- bts) echo "osmo-bsc osmo-bts-trx" ;;
+ bts) echo "osmo-bsc osmo-bts-trx trxcon" ;;
msc) echo "osmo-stp osmo-msc" ;;
pcu-sns) echo "osmo-pcu" ;;
pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;;
@@ -213,6 +213,7 @@
osmo-pcap-*) echo "osmo-pcap" ;;
osmo-stp) echo "libosmo-sccp" ;;
osmo-uecups-*) echo "osmo-uecups" ;;
+ trxcon) echo "osmocom-bb_trxcon" ;;
*) echo "$1" ;;
esac
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359
Gerrit-Change-Number: 36767
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-dev[master]: ttcn3.sh: prepare_local_bin: always copy scripts
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email ) Change subject: ttcn3.sh: prepare_local_bin: always copy scripts .. ttcn3.sh: prepare_local_bin: always copy scripts Always copy ttcn3-docker-run.sh from docker-playground.git, so we don't use an outdated version if the file has changed. Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e --- M ttcn3/ttcn3.sh 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/66/36766/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index f3d3b7c..780a4ba 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -297,9 +297,6 @@ esac script_path_localbin="$DIR_USR_LOCAL/bin/$name_install" - if [ -x "$script_path_localbin" ]; then - continue - fi install -v -Dm755 "$script" "$script_path_localbin" done -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e Gerrit-Change-Number: 36766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-dev[master]: ttcn3: fix permissions before running make clean
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email ) Change subject: ttcn3: fix permissions before running make clean .. ttcn3: fix permissions before running make clean Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e --- M ttcn3/ttcn3.sh 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/64/36764/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index d665e84..f3d3b7c 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -28,6 +28,8 @@ "$DIR_VAR_LOCAL" if [ -d "$DIR_OSMODEV/src/osmo-ttcn3-hacks" ]; then + sudo chown -R "$(id -u):$(id -g)" \ + "$DIR_OSMODEV/src/osmo-ttcn3-hacks" make -C "$DIR_OSMODEV/src/osmo-ttcn3-hacks" clean fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e Gerrit-Change-Number: 36764 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-dev[master]: src/grd: urlencode / in project names
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email )
Change subject: src/grd: urlencode / in project names
..
src/grd: urlencode / in project names
Fix that it didn't work with projects that contain a slash character,
such as erlang/osmo-epdg.
Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7
---
M src/grd
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/65/36765/1
diff --git a/src/grd b/src/grd
index 0ca5df7..e149c6f 100755
--- a/src/grd
+++ b/src/grd
@@ -9,6 +9,7 @@
import os
import subprocess
import urllib.request
+import urllib.parse
def get_topdir():
@@ -37,7 +38,8 @@
def get_gerrit_details(host, project, patch_id, verbose):
-url = f"https://{host}/changes/{project}~{args.patch_id}/detail";
+project_q = urllib.parse.quote(project, "")
+url = f"https://{host}/changes/{project_q}~{args.patch_id}/detail";
print(f"Download {url}")
with urllib.request.urlopen(url) as response:
content = response.read().decode()
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7
Gerrit-Change-Number: 36765
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-bts[master]: tests/osmo-bts.vty: aligh with recent libosmovty changes
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36761?usp=email ) Change subject: tests/osmo-bts.vty: aligh with recent libosmovty changes .. Patch Set 1: (1 comment) Patchset: PS1: > > What if I build an old osmo-bts with new libosmocore? […] ah yes, it's just the VTY tests. But still it should be possible to solve this in the vty test runner by making it understand [based on the text structure] what is a list of commands and then accepting any number of spaces after the command word. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36761?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: I80f896e45a88550909c5767169286fc321a36e56 Gerrit-Change-Number: 36761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 10 May 2024 11:42:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: tests/osmo-bts.vty: aligh with recent libosmovty changes
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36761?usp=email ) Change subject: tests/osmo-bts.vty: aligh with recent libosmovty changes .. tests/osmo-bts.vty: aligh with recent libosmovty changes A new command was recently added to libosmovty: show fsm-state-graph NAME This is now the longest command, affecting spacing in the output of 'show ?' command. Align spacing to make the test pass again. Change-Id: I80f896e45a88550909c5767169286fc321a36e56 Related: libosmocore.git I09ee0a8c3fc4b1aa991ab5c93c0b654fccd7ea4c --- M tests/osmo-bts.vty 1 file changed, 33 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/tests/osmo-bts.vty b/tests/osmo-bts.vty index 97629d0..a51ad63 100644 --- a/tests/osmo-bts.vty +++ b/tests/osmo-bts.vty @@ -19,14 +19,14 @@ OsmoBTS> show ? ... - bts Display information about a BTS - trx Display information about a TRX - timeslotDisplay information about a TS - lchan Display information about a logical channel - timer Show timers - e1_driver Display information about available E1 drivers - e1_line Display information about a E1 line - e1_timeslot Display information about a E1 timeslot + bts Display information about a BTS + trx Display information about a TRX + timeslot Display information about a TS + lchanDisplay information about a logical channel + timerShow timers + e1_driverDisplay information about available E1 drivers + e1_line Display information about a E1 line + e1_timeslot Display information about a E1 timeslot ... OsmoBTS> show bts ? [<0-255>] BTS Number @@ -120,14 +120,14 @@ OsmoBTS# show ? ... - bts Display information about a BTS - trx Display information about a TRX - timeslotDisplay information about a TS - lchan Display information about a logical channel - timer Show timers - e1_driver Display information about available E1 drivers - e1_line Display information about a E1 line - e1_timeslot Display information about a E1 timeslot + bts Display information about a BTS + trx Display information about a TRX + timeslot Display information about a TS + lchanDisplay information about a logical channel + timerShow timers + e1_driverDisplay information about available E1 drivers + e1_line Display information about a E1 line + e1_timeslot Display information about a E1 timeslot ... OsmoBTS# show bts ? [<0-255>] BTS Number -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36761?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: I80f896e45a88550909c5767169286fc321a36e56 Gerrit-Change-Number: 36761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged
[S] Change in osmo-bts[master]: tests/osmo-bts.vty: aligh with recent libosmovty changes
Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36761?usp=email ) Change subject: tests/osmo-bts.vty: aligh with recent libosmovty changes .. Patch Set 1: (1 comment) Patchset: PS1: > What if I build an old osmo-bts with new libosmocore? It would build just fine and pass the unit tests, but not the vty transcript test. I am not really sure if we can fix this in the python script, or more precisely **how**. It's simply executing commands and matching the program output against the expected output. We cannot just change the script to ignore spacing, as that would break other stuff. Maybe @nhofm...@sysmocom.de has an idea? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36761?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: I80f896e45a88550909c5767169286fc321a36e56 Gerrit-Change-Number: 36761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 10 May 2024 10:23:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Use ActionID field in Action Login
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36763?usp=email ) Change subject: asterisk: Use ActionID field in Action Login .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36763?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: Iec320762ff0cca86319f7374b53c642f08a6e6df Gerrit-Change-Number: 36763 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 10 May 2024 08:37:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: AMI_Functions: Tx ActionID instead of ActionId
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36762?usp=email ) Change subject: AMI_Functions: Tx ActionID instead of ActionId .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36762?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: I8097e461fd0cadfa780d52ab1666e41b9d2b8a0e Gerrit-Change-Number: 36762 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 10 May 2024 08:36:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
