- gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: smdpp: update certs, prune old certs

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40465?usp=email ) Change subject: smdpp: update certs, prune old certs ...................................................................... smdpp: update certs, prune old certs Grabbed from SGP.26_v1.5_Certificates_18_07_2024.zip Change-Id: I25442d6f55a385019bba1e47ad3d795120f850ad --- D smdpp-data/certs/DPauth/data_sig.der M smdpp-data/certs/DPtls/CERT_S_SM_DP2_TLS.der M smdpp-data/certs/DPtls/CERT_S_SM_DP4_TLS.der M smdpp-data/certs/DPtls/CERT_S_SM_DP8_TLS.der M smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_BRP.der M smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.der M smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.pem D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP2_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP4_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP8_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_BRP.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_NIST.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP2_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP4_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP8_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_BRP.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_NIST.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP2_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP4_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP8_TLS.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_BRP.der D smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_NIST.der 22 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/65/40465/1 diff --git a/smdpp-data/certs/DPauth/data_sig.der b/smdpp-data/certs/DPauth/data_sig.der deleted file mode 100644 index 7f44ce2..0000000 --- a/smdpp-data/certs/DPauth/data_sig.der +++ /dev/null @@ -1 +0,0 @@ -0D AL¶þV¿eRÌÍìAHÊt£×ôÍºnìE<Nåû R¤~&Àk\þ~ ÉRlÜÛ°¥7ì¶NmWø \ No newline at end of file diff --git a/smdpp-data/certs/DPtls/CERT_S_SM_DP2_TLS.der b/smdpp-data/certs/DPtls/CERT_S_SM_DP2_TLS.der index be20b34..79ef55d 100644 --- a/smdpp-data/certs/DPtls/CERT_S_SM_DP2_TLS.der +++ b/smdpp-data/certs/DPtls/CERT_S_SM_DP2_TLS.der Binary files differ diff --git a/smdpp-data/certs/DPtls/CERT_S_SM_DP4_TLS.der b/smdpp-data/certs/DPtls/CERT_S_SM_DP4_TLS.der index 07b4c85..eb1d606 100644 --- a/smdpp-data/certs/DPtls/CERT_S_SM_DP4_TLS.der +++ b/smdpp-data/certs/DPtls/CERT_S_SM_DP4_TLS.der Binary files differ diff --git a/smdpp-data/certs/DPtls/CERT_S_SM_DP8_TLS.der b/smdpp-data/certs/DPtls/CERT_S_SM_DP8_TLS.der index 3b45b14..dec58b9 100644 --- a/smdpp-data/certs/DPtls/CERT_S_SM_DP8_TLS.der +++ b/smdpp-data/certs/DPtls/CERT_S_SM_DP8_TLS.der Binary files differ diff --git a/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_BRP.der b/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_BRP.der index dc730f0..48f8422 100644 --- a/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_BRP.der +++ b/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_BRP.der Binary files differ diff --git a/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.der b/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.der index 0cb9ba7..b819e77 100644 --- a/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.der +++ b/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.der Binary files differ diff --git a/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.pem b/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.pem index 4525642..c94d612 100644 --- a/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.pem +++ b/smdpp-data/certs/DPtls/CERT_S_SM_DP_TLS_NIST.pem @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- -MIICgjCCAiigAwIBAgIBCjAKBggqhkjOPQQDAjBEMRAwDgYDVQQDDAdUZXN0IENJ +MIICgzCCAiigAwIBAgIBCTAKBggqhkjOPQQDAjBEMRAwDgYDVQQDDAdUZXN0IENJ MREwDwYDVQQLDAhURVNUQ0VSVDEQMA4GA1UECgwHUlNQVEVTVDELMAkGA1UEBhMC -SVQwHhcNMjUwNDIzMTUyMzA1WhcNMzUwNDIxMTUyMzA1WjAzMQ0wCwYDVQQKDARB +SVQwHhcNMjQwNzA5MTUyODMzWhcNMjUwODExMTUyODMzWjAzMQ0wCwYDVQQKDARB Q01FMSIwIAYDVQQDDBl0ZXN0c21kcHBsdXMxLmV4YW1wbGUuY29tMFkwEwYHKoZI zj0CAQYIKoZIzj0DAQcDQgAEKCQwdc6O/R+uZ2g5QH2ybkzLQ3CUYhybOWEz8bJL tQG4/k6yTT4NOS8lP28blGJws8opLjTbb3qHs6X2rJRfCKOCARowggEWMA4GA1Ud @@ -10,7 +10,7 @@ qTAfBgNVHSMEGDAWgBT1QXK9+YqV1ly+uIo4ocEdgAqFwzApBgNVHREEIjAgghl0 ZXN0c21kcHBsdXMxLmV4YW1wbGUuY29tiAOINwowYQYDVR0fBFowWDAqoCigJoYk aHR0cDovL2NpLnRlc3QuZXhhbXBsZS5jb20vQ1JMLUEuY3JsMCqgKKAmhiRodHRw -Oi8vY2kudGVzdC5leGFtcGxlLmNvbS9DUkwtQi5jcmwwCgYIKoZIzj0EAwIDSAAw -RQIgYakBZP6y9/2iu9aZkgb89SQgfRb0TKVMGElWgtyoX2gCIQCT8o/TkAxhWCTY -yaBDMi1L9Ub+93ef5s+S+eHLmwuudA== +Oi8vY2kudGVzdC5leGFtcGxlLmNvbS9DUkwtQi5jcmwwCgYIKoZIzj0EAwIDSQAw +RgIhAL1qQ/cnrCZC7UnnLJ8WeK+0aWUJFWh1cOlBEzw0NlTVAiEA25Vf4WHzwmJi +zkARzxJ1qB0qfBofuJrtfPM4gNJ4Quw= -----END CERTIFICATE----- diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP2_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP2_TLS.der deleted file mode 100644 index 4f91532..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP2_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP4_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP4_TLS.der deleted file mode 100644 index 70820fa..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP4_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP8_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP8_TLS.der deleted file mode 100644 index 33cc6fb..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP8_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_BRP.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_BRP.der deleted file mode 100644 index 5d0ae30..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_BRP.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_NIST.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_NIST.der deleted file mode 100644 index 38927b1..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2021/CERT_S_SM_DP_TLS_NIST.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP2_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP2_TLS.der deleted file mode 100644 index 32909ce..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP2_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP4_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP4_TLS.der deleted file mode 100644 index ea11075..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP4_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP8_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP8_TLS.der deleted file mode 100644 index 93a0cc0..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP8_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_BRP.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_BRP.der deleted file mode 100644 index 3d00317..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_BRP.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_NIST.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_NIST.der deleted file mode 100644 index 179c37b..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2022/CERT_S_SM_DP_TLS_NIST.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP2_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP2_TLS.der deleted file mode 100644 index da5516c..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP2_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP4_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP4_TLS.der deleted file mode 100644 index b1c222c..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP4_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP8_TLS.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP8_TLS.der deleted file mode 100644 index 638e4a1..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP8_TLS.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_BRP.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_BRP.der deleted file mode 100644 index 6746cbb..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_BRP.der +++ /dev/null Binary files differ diff --git a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_NIST.der b/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_NIST.der deleted file mode 100644 index 6977bd3..0000000 --- a/smdpp-data/certs/DPtls/Old_TLS_Validity/Expired 2023/CERT_S_SM_DP_TLS_NIST.der +++ /dev/null Binary files differ -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40465?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I25442d6f55a385019bba1e47ad3d795120f850ad Gerrit-Change-Number: 40465 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 week, 4 days

1
0
0 0

[XS] Change in pysim[master]: fix up missing requirements

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40463?usp=email ) Change subject: fix up missing requirements ...................................................................... fix up missing requirements No idea why the list was incomplete? How do people run this? Change-Id: If69b2bd5f8bc604443108c942c17eba9c22f4053 --- M requirements.txt M setup.py 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/40463/1 diff --git a/requirements.txt b/requirements.txt index 9749d7f..6491f2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,3 +15,7 @@ packaging git+https://github.com/hologram-io/smpp.pdu smpp.twisted3 @ git+https://github.com/jookies/smpp.twisted +klein +service-identity +pyopenssl +requests \ No newline at end of file diff --git a/setup.py b/setup.py index b33fb67..8965a70 100644 --- a/setup.py +++ b/setup.py @@ -34,6 +34,10 @@ "smpp.pdu @ git+https://github.com/hologram-io/smpp.pdu", "asn1tools", "smpp.twisted3 @ git+https://github.com/jookies/smpp.twisted", + "klein", + "service-identity", + "pyopenssl", + "requests", ], scripts=[ 'pySim-prog.py', -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40463?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If69b2bd5f8bc604443108c942c17eba9c22f4053 Gerrit-Change-Number: 40463 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 week, 4 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Implement ASP Hearbeat procedure

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email ) Change subject: ipa: Implement ASP Hearbeat procedure ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: Marking as WIP until I do more testing. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d Gerrit-Change-Number: 40460 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 13 Jun 2025 19:04:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 week, 4 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Implement ASP Hearbeat procedure

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email to look at the new patch set (#3). Change subject: ipa: Implement ASP Hearbeat procedure ...................................................................... ipa: Implement ASP Hearbeat procedure This implements M3UA/SUA Heartbeat Procedure using own IPA PING & PONG messages. Related: OS#4072 Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d --- M src/ipa.c M src/xua_asp_fsm.c M src/xua_internal.h 3 files changed, 98 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/60/40460/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d Gerrit-Change-Number: 40460 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 week, 4 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Expect and answer M3UA BEAT from IUT

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40462?usp=email ) Change subject: stp: Expect and answer M3UA BEAT from IUT ...................................................................... stp: Expect and answer M3UA BEAT from IUT Change-Id: Idb70acde0683bc053db20781ce4926fbc318f51f --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/40462/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 2f452de..c8037aa 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -140,6 +140,15 @@ } } +private altstep as_m3ua_beat_answer(integer idx, template M3UA_Heartbeat_Data hbd := *) runs on RAW_M3UA_CT { + var M3UA_RecvFrom rx; + [] M3UA[idx].receive(t_M3UA_RecvFrom(tr_M3UA_BEAT(hbd))) -> value rx { + log("[", idx, "] Answering M3UA BEAT ", rx); + f_M3UA_send(idx, ts_M3UA_BEAT_ACK(rx.msg.m3UA_BEAT.messageParameters.heartbeat_Data)); + repeat; + } +} + friend function f_M3UA_send(integer idx, template (present) PDU_M3UA msg, integer stream := 0) runs on RAW_M3UA_CT { if (g_m3ua_configs[idx].use_tcp) { @@ -154,6 +163,7 @@ timer T := 5.0; T.start; alt { + [] as_m3ua_beat_answer(idx); [] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) { setverdict(pass); } @@ -315,6 +325,7 @@ } friend function f_init_m3ua(boolean ignore_ssnm := true, + boolean answer_beat := true, template (omit) M3uaConfigs m3ua_configs := omit) runs on RAW_M3UA_CT { @@ -332,6 +343,9 @@ if (not g_m3ua_configs[i].is_server) { map(self:M3UA[i], system:M3UA_CODEC_PT); } + if (answer_beat) { + activate(as_m3ua_beat_answer(i)); + } } activate(as_m3ua_sctp()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idb70acde0683bc053db20781ce4926fbc318f51f Gerrit-Change-Number: 40462 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 week, 4 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: m3ua/sua: Implement ASP Hearbeat procedure

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40461?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: m3ua/sua: Implement ASP Hearbeat procedure ...................................................................... m3ua/sua: Implement ASP Hearbeat procedure This implements M3UA/SUA Heartbeat Procedure. Change-Id: Ie4d90447ef8f1b1174085aad55114ab6460ca559 --- M src/xua_asp_fsm.c 1 file changed, 81 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/61/40461/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40461?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie4d90447ef8f1b1174085aad55114ab6460ca559 Gerrit-Change-Number: 40461 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 week, 4 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Implement ASP Hearbeat procedure

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?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: ipa: Implement ASP Hearbeat procedure ...................................................................... ipa: Implement ASP Hearbeat procedure This implements M3UA/SUA Heartbeat Procedure using own IPA PING & PONG messages. Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d --- M src/ipa.c M src/xua_asp_fsm.c M src/xua_internal.h 3 files changed, 98 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/60/40460/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d Gerrit-Change-Number: 40460 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 week, 4 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: m3ua/sua: Implement ASP Hearbeat procedure

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40461?usp=email ) Change subject: m3ua/sua: Implement ASP Hearbeat procedure ...................................................................... m3ua/sua: Implement ASP Hearbeat procedure This implements M3UA/SUA Heartbeat Procedure. Change-Id: Ie4d90447ef8f1b1174085aad55114ab6460ca559 --- M src/xua_asp_fsm.c 1 file changed, 81 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/61/40461/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 7c0c105..a12e684 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -89,6 +89,12 @@ struct osmo_timer_list timer; int out_event; } t_ack; + + /* Timer for tracking HEARBEAT without HEARBEAT ACK */ + struct { + struct osmo_timer_list timer; + uint32_t unacked_beats; + } t_beat; }; struct osmo_xlm_prim *xua_xlm_prim_alloc(enum osmo_xlm_prim_type prim_type, @@ -388,6 +394,61 @@ } } +static void xua_t_beat_stop(struct osmo_fsm_inst *fi) +{ + struct xua_asp_fsm_priv *xafp = fi->priv; + osmo_timer_del(&xafp->t_beat.timer); + xafp->t_beat.unacked_beats = 0; +} + +static void xua_t_beat_send(struct osmo_fsm_inst *fi) +{ + struct xua_asp_fsm_priv *xafp = fi->priv; + uint32_t timeout_sec; + + timeout_sec = osmo_tdef_get(xafp->asp->cfg.T_defs_xua, SS7_ASP_XUA_T_BEAT, OSMO_TDEF_S, -1); + + /* T(beat) disabled */ + if (timeout_sec == 0) { + xua_t_beat_stop(fi); + return; + } + + /* Avoid increasing in case some extra gratuitous PING is transmitted: */ + if (!osmo_timer_pending(&xafp->t_beat.timer)) + xafp->t_beat.unacked_beats++; + + /* (re-)arm T(beat): */ + osmo_timer_schedule(&xafp->t_beat.timer, timeout_sec, 0); + + /* Send HEARTBEAT: */ + peer_send(fi, XUA_ASP_E_ASPSM_BEAT, NULL); + +} + +static void xua_t_beat_cb(void *_fi) +{ + struct osmo_fsm_inst *fi = _fi; + struct xua_asp_fsm_priv *xafp = fi->priv; + + LOGPFSML(fi, LOGL_NOTICE, "Peer didn't respond to PING? with PONG!\n"); + + if (xafp->t_beat.unacked_beats < 2) { + xua_t_beat_send(fi); + return; + } + + /* RFC4666 4.3.4.6: If no Heartbeat Ack message (or any other M3UA + * message) is received from the M3UA peer within 2*T(beat), the remote + * M3UA peer is considered unavailable. Transmission of Heartbeat + * messages is stopped, and the signalling process SHOULD attempt to + * re-establish communication if it is configured as the client for the + * disconnected M3UA peer. + */ + ss7_asp_disconnect_stream(xafp->asp); + +} + #define ENSURE_ASP_OR_IPSP(fi, event) \ do { \ struct xua_asp_fsm_priv *_xafp = fi->priv; \ @@ -423,6 +484,7 @@ { struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; + xua_t_beat_stop(fi); dispatch_to_all_as(fi, XUA_ASPAS_ASP_DOWN_IND, asp); } @@ -489,6 +551,13 @@ { struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; + bool went_up = (prev_state == XUA_ASP_S_DOWN); + + if (went_up) { + /* Now we are done with IPA handshake, Start Hearbeat Procedure, T(beat): */ + xua_t_beat_send(fi); + } + /* RFC4666 4.3.4.5: "When an ASP moves from ASP-DOWN to ASP-INACTIVE within a * particular AS, a Notify message SHOULD be sent, by the ASP-UP receptor, * after sending the ASP-UP-ACK, in order to inform the ASP of the current AS @@ -498,7 +567,7 @@ struct xua_as_event_asp_inactive_ind_pars pars = { .asp = asp, .asp_requires_notify = (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) && - (prev_state == XUA_ASP_S_DOWN), + went_up, }; dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); } @@ -620,6 +689,13 @@ { struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; + bool went_up = (prev_state == XUA_ASP_S_DOWN); + + if (went_up) { + /* Now we are done with IPA handshake, Start Hearbeat Procedure, T(beat): */ + xua_t_beat_send(fi); + } + dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND, asp); } @@ -717,7 +793,7 @@ peer_send(fi, XUA_ASP_E_ASPSM_BEAT_ACK, xua); break; case XUA_ASP_E_ASPSM_BEAT_ACK: - /* FIXME: stop timer, if any */ + xafp->t_beat.unacked_beats = 0; break; case XUA_ASP_E_AS_ASSIGNED: /* Ignore, only used in IPA asps so far. */ @@ -742,6 +818,7 @@ return; osmo_timer_del(&xafp->t_ack.timer); + xua_t_beat_stop(fi); if (xafp->asp) xafp->asp->fi = NULL; @@ -839,6 +916,8 @@ xafp->role = role; xafp->asp = asp; + osmo_timer_setup(&xafp->t_beat.timer, xua_t_beat_cb, fi); + fi->priv = xafp; /* Attach FSM to ASP: */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40461?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie4d90447ef8f1b1174085aad55114ab6460ca559 Gerrit-Change-Number: 40461 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 week, 4 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Implement ASP Hearbeat procedure

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email ) Change subject: ipa: Implement ASP Hearbeat procedure ...................................................................... ipa: Implement ASP Hearbeat procedure This implements M3UA/SUA Heartbeat Procedure using own IPA PING & PONG messages. Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d --- M src/ipa.c M src/xua_asp_fsm.c M src/xua_internal.h 3 files changed, 98 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/60/40460/1 diff --git a/src/ipa.c b/src/ipa.c index c04b476..58646fa 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -52,6 +52,20 @@ #include "ss7_internal.h" #include "xua_asp_fsm.h" +/* generate a msgb containing an IPA CCM PING message */ +struct msgb *ipa_gen_ping(void) +{ + /* sufficient headroom for osmo_ipa_msg_push_header() */ + struct msgb *msg = ipa_msg_alloc(16); + if (!msg) + return NULL; + + msgb_put_u8(msg, IPAC_MSGT_PING); + ipa_prepend_header(msg, IPAC_PROTO_IPACCESS); + + return msg; +} + struct msgb *ipa_to_msg(struct xua_msg *xua) { struct xua_msg_part *data_ie; diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 1d6b078..7c0c105 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -879,8 +879,11 @@ /* Structure holding parsed data of the IPA CCM ID exchange */ struct ipaccess_unit *ipa_unit; - /* Timer for tracking if no PONG is received in response to PING */ - struct osmo_timer_list pong_timer; + /* Timer for tracking PING without PONG response */ + struct { + struct osmo_timer_list timer; + uint32_t unacked_beats; + } t_beat; /* Did we receive IPA ID ACK before IPA ID RESP ? */ bool ipa_id_ack_rcvd; }; @@ -907,11 +910,76 @@ return fd; } +static void ipa_t_beat_stop(struct osmo_fsm_inst *fi) +{ + struct ipa_asp_fsm_priv *iafp = fi->priv; + osmo_timer_del(&iafp->t_beat.timer); + iafp->t_beat.unacked_beats = 0; +} + +static void ipa_t_beat_send(struct osmo_fsm_inst *fi) +{ + struct ipa_asp_fsm_priv *iafp = fi->priv; + struct msgb *msg; + uint32_t timeout_sec; + + timeout_sec = osmo_tdef_get(iafp->asp->cfg.T_defs_xua, SS7_ASP_XUA_T_BEAT, OSMO_TDEF_S, -1); + + /* T(beat) disabled */ + if (timeout_sec == 0) { + ipa_t_beat_stop(fi); + return; + } + + /* Avoid increasing in case some extra gratuitous PING is transmitted: */ + if (!osmo_timer_pending(&iafp->t_beat.timer)) + iafp->t_beat.unacked_beats++; + + /* (re-)arm T(beat): */ + osmo_timer_schedule(&iafp->t_beat.timer, timeout_sec, 0); + + /* Send PING: */ + if ((msg = ipa_gen_ping())) + osmo_ss7_asp_send(iafp->asp, msg); + /* we don't own msg anymore in any case here */ +} + +static void ipa_t_beat_cb(void *_fi) +{ + struct osmo_fsm_inst *fi = _fi; + struct ipa_asp_fsm_priv *iafp = fi->priv; + + LOGPFSML(fi, LOGL_NOTICE, "Peer didn't respond to PING? with PONG!\n"); + + if (iafp->t_beat.unacked_beats < 2) { + ipa_t_beat_send(fi); + return; + } + + /* RFC4666 4.3.4.6: If no Heartbeat Ack message (or any other M3UA + * message) is received from the M3UA peer within 2*T(beat), the remote + * M3UA peer is considered unavailable. Transmission of Heartbeat + * messages is stopped, and the signalling process SHOULD attempt to + * re-establish communication if it is configured as the client for the + * disconnected M3UA peer. + */ + ss7_asp_disconnect_stream(iafp->asp); + +} + /*************** ** FSM states ** ***************/ /* Server + Client: Initial State, wait for M-ASP-UP.req */ +static void ipa_asp_fsm_down_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct xua_asp_fsm_priv *xafp = fi->priv; + struct osmo_ss7_asp *asp = xafp->asp; + ipa_t_beat_stop(fi); + dispatch_to_all_as(fi, XUA_ASPAS_ASP_DOWN_IND, asp); +} + static void ipa_asp_fsm_down(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct ipa_asp_fsm_priv *iafp = fi->priv; @@ -1079,6 +1147,10 @@ .asp = asp, .asp_requires_notify = false, }; + + /* Now we are done with IPA handshake, Start Hearbeat Procedure, T(beat): */ + ipa_t_beat_send(fi); + dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND, asp); } @@ -1163,8 +1235,7 @@ ipaccess_send_pong(fd); break; case XUA_ASP_E_ASPSM_BEAT_ACK: - /* stop timer, if any */ - osmo_timer_del(&iafp->pong_timer); + iafp->t_beat.unacked_beats = 0; break; case XUA_ASP_E_AS_ASSIGNED: as = data; @@ -1183,16 +1254,6 @@ } } -static void ipa_pong_timer_cb(void *_fi) -{ - struct osmo_fsm_inst *fi = _fi; - struct ipa_asp_fsm_priv *iafp = fi->priv; - - LOGPFSML(fi, LOGL_NOTICE, "Peer didn't respond to PING? with PONG!\n"); - /* kill ASP and (wait for) re-connect */ - osmo_ss7_asp_disconnect(iafp->asp); -} - static int ipa_asp_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct ipa_asp_fsm_priv *iafp = fi->priv; @@ -1207,7 +1268,12 @@ { struct ipa_asp_fsm_priv *iafp = fi->priv; - if (iafp && iafp->asp) + if (!iafp) + return; + + ipa_t_beat_stop(fi); + + if (iafp->asp) iafp->asp->fi = NULL; } @@ -1219,7 +1285,7 @@ S(IPA_ASP_S_WAIT_ID_RESP), .name = "ASP_DOWN", .action = ipa_asp_fsm_down, - .onenter = xua_asp_fsm_down_onenter, + .onenter = ipa_asp_fsm_down_onenter, }, /* Server Side */ [IPA_ASP_S_WAIT_ID_RESP] = { @@ -1340,8 +1406,7 @@ iafp->asp = asp; iafp->ipa_unit = talloc_zero(iafp, struct ipaccess_unit); iafp->ipa_unit->unit_name = talloc_strdup(iafp->ipa_unit, unit_name); - iafp->pong_timer.cb = ipa_pong_timer_cb; - iafp->pong_timer.data = fi; + osmo_timer_setup(&iafp->t_beat.timer, ipa_t_beat_cb, fi); fi->priv = iafp; diff --git a/src/xua_internal.h b/src/xua_internal.h index 60d751c..576708f 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -116,6 +116,7 @@ int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, const struct xua_msg_part *rctx_ie); +struct msgb *ipa_gen_ping(void); struct msgb *ipa_to_msg(struct xua_msg *xua); int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d Gerrit-Change-Number: 40460 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 week, 4 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Introduce VTY configurations 'timer xua (ack|beat)'

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40459?usp=email ) Change subject: asp: Introduce VTY configurations 'timer xua (ack|beat)' ...................................................................... asp: Introduce VTY configurations 'timer xua (ack|beat)' T(beat) is not yet implemented in this commit, will be done in a future step. Related: OS#4072 Change-Id: Id83446a1846847e68745b29c8dd4388aedcc0660 --- M src/sccp_vty.c M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/xua_asp_fsm.c M src/xua_internal.h M tests/vty/osmo_stp_test.vty 7 files changed, 132 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/59/40459/1 diff --git a/src/sccp_vty.c b/src/sccp_vty.c index 49f3577..d809c1f 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -42,6 +42,7 @@ #include "xua_internal.h" #include "sccp_internal.h" #include "ss7_instance.h" +#include "ss7_vty.h" static void show_user(struct vty *vty, struct osmo_sccp_user *user) { diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 61e5415..71e5627 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -113,6 +113,29 @@ } /*********************************************************************** + * Timer Handling + ***********************************************************************/ + +const struct osmo_tdef ss7_asp_xua_timer_defaults[SS7_ASP_XUA_TIMERS_LEN] = { + { .T = SS7_ASP_XUA_T_ACK, .default_val = SS7_ASP_XUA_DEFAULT_T_ACK_SEC, .unit = OSMO_TDEF_S, + .desc = "Resend ASP Up/Down/Active/Inactive after timeout waiting for ASP Up/Down/Active/Inactive ACK (ASP role)(s)" }, + { .T = SS7_ASP_XUA_T_BEAT, .default_val = SS7_ASP_XUA_DEFAULT_T_BEAT_SEC, .unit = OSMO_TDEF_S, + .desc = "Heartbeat Timer (0 = disabled) (s)" }, + {} +}; + +/* Appendix C.4 of ITU-T Q.714 */ +const struct value_string ss7_asp_xua_timer_names[] = { + { SS7_ASP_XUA_T_ACK, "ack" }, + { SS7_ASP_XUA_T_BEAT, "beat" }, + {} +}; + +osmo_static_assert(ARRAY_SIZE(ss7_asp_xua_timer_defaults) == (SS7_ASP_XUA_TIMERS_LEN) && + ARRAY_SIZE(ss7_asp_xua_timer_names) == (SS7_ASP_XUA_TIMERS_LEN), + assert_ss7_asp_xua_timer_count); + +/*********************************************************************** * SS7 Application Server Process ***********************************************************************/ @@ -570,6 +593,9 @@ asp->cfg.proto = proto; asp->cfg.name = talloc_strdup(asp, name); + asp->cfg.T_defs_xua = talloc_memdup(asp, ss7_asp_xua_timer_defaults, + sizeof(ss7_asp_xua_timer_defaults)); + osmo_tdefs_reset(asp->cfg.T_defs_xua); asp->cfg.T_defs_lm = talloc_memdup(asp, ss7_asp_lm_timer_defaults, sizeof(ss7_asp_lm_timer_defaults)); osmo_tdefs_reset(asp->cfg.T_defs_lm); diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 2e25f97..889b5c9 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -19,6 +19,20 @@ struct osmo_ss7_instance; struct osmo_xua_layer_manager; +enum ss7_asp_xua_timer { + /* 0 kept unused on purpose since it's handled specially by osmo_fsm */ + SS7_ASP_XUA_T_ACK = 1, /* RFC3868 & RFC4666 timer T(ack) */ + SS7_ASP_XUA_T_BEAT, /* RFC3868 & RFC4666 timer T(beat) */ + /* This must remain the last item: */ + SS7_ASP_XUA_TIMERS_LEN +}; +extern const struct value_string ss7_asp_xua_timer_names[]; +extern const struct osmo_tdef ss7_asp_xua_timer_defaults[SS7_ASP_XUA_TIMERS_LEN]; +/* According to SUA RFC3868 Section 8, M3UA RFC4666 Section 4.3.4.1 */ +#define SS7_ASP_XUA_DEFAULT_T_ACK_SEC 2 +/* According to SUA RFC3868 Section 8 */ +#define SS7_ASP_XUA_DEFAULT_T_BEAT_SEC 30 + enum ss7_asp_ctr { SS7_ASP_CTR_PKT_RX_TOTAL, SS7_ASP_CTR_PKT_RX_UNKNOWN, @@ -100,6 +114,9 @@ uint32_t quirks; /* T_defs used by the default_lm: */ + struct osmo_tdef *T_defs_xua; + + /* T_defs used by the default_lm: */ struct osmo_tdef *T_defs_lm; struct { diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 2934ea3..3e22465 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -519,9 +519,65 @@ return CMD_SUCCESS; } +/* timer xua <name> <1-999999> + * (cmdstr and doc are dynamically generated from ss7_asp_xua_timer_names.) */ +DEFUN_ATTR(asp_timer_xua, asp_timer_xua_cmd, + NULL, NULL, CMD_ATTR_IMMEDIATE) +{ + struct osmo_ss7_asp *asp = vty->index; + enum ss7_asp_xua_timer timer = get_string_value(ss7_asp_xua_timer_names, argv[0]); + + if (timer <= 0 || timer >= SS7_ASP_XUA_TIMERS_LEN) { + vty_out(vty, "%% Invalid timer: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_tdef_set(asp->cfg.T_defs_xua, timer, atoi(argv[1]), OSMO_TDEF_S); + return CMD_SUCCESS; +} + +static void gen_asp_timer_xua_cmd_strs(struct cmd_element *cmd) +{ + int i; + char *cmd_str = NULL; + char *doc_str = NULL; + + OSMO_ASSERT(cmd->string == NULL); + OSMO_ASSERT(cmd->doc == NULL); + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "timer xua ("); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, + "Configure ASP default timer values\n" + "Configure ASP default xua timer values\n"); + + for (i = 0; ss7_asp_xua_timer_names[i].str; i++) { + const struct osmo_tdef *def; + enum ss7_asp_xua_timer timer; + + timer = ss7_asp_xua_timer_names[i].value; + def = osmo_tdef_get_entry((struct osmo_tdef *)&ss7_asp_xua_timer_defaults, timer); + OSMO_ASSERT(def); + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "%s%s", + i ? "|" : "", + ss7_asp_xua_timer_names[i].str); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, "%s (default: %lu)\n", + def->desc, + def->default_val); + } + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, ") <1-999999>"); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, + "Timer value, in seconds\n"); + + cmd->string = cmd_str; + cmd->doc = doc_str; +} + + /* timer lm <name> <1-999999> * (cmdstr and doc are dynamically generated from ss7_asp_lm_timer_names.) */ -DEFUN_ATTR(asp_timer, asp_timer_cmd, +DEFUN_ATTR(asp_timer_lm, asp_timer_lm_cmd, NULL, NULL, CMD_ATTR_IMMEDIATE) { struct osmo_ss7_asp *asp = vty->index; @@ -536,7 +592,7 @@ return CMD_SUCCESS; } -static void gen_asp_timer_cmd_strs(struct cmd_element *cmd) +static void gen_asp_timer_lm_cmd_strs(struct cmd_element *cmd) { int i; char *cmd_str = NULL; @@ -574,7 +630,23 @@ cmd->doc = doc_str; } -static void write_asp_timers(struct vty *vty, const char *indent, +static void write_asp_timers_xua(struct vty *vty, const char *indent, + struct osmo_ss7_asp *asp) +{ + int i; + + for (i = 0; ss7_asp_xua_timer_names[i].str; i++) { + const struct osmo_tdef *tdef = osmo_tdef_get_entry(asp->cfg.T_defs_xua, ss7_asp_xua_timer_names[i].value); + if (!tdef) + continue; + if (tdef->val == tdef->default_val) + continue; + vty_out(vty, "%stimer xua %s %lu%s", indent, ss7_asp_xua_timer_names[i].str, + tdef->val, VTY_NEWLINE); + } +} + +static void write_asp_timers_lm(struct vty *vty, const char *indent, struct osmo_ss7_asp *asp) { int i; @@ -1074,7 +1146,8 @@ continue; vty_out(vty, " quirk %s%s", get_value_string(asp_quirk_names, (1 << i)), VTY_NEWLINE); } - write_asp_timers(vty, " ", asp); + write_asp_timers_xua(vty, " ", asp); + write_asp_timers_lm(vty, " ", asp); switch (asp->cfg.adm_state) { case OSMO_SS7_ASP_ADM_S_SHUTDOWN: @@ -1155,8 +1228,10 @@ install_lib_element(L_CS7_ASP_NODE, &asp_no_sctp_param_init_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_quirk_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_quirk_cmd); - gen_asp_timer_cmd_strs(&asp_timer_cmd); - install_lib_element(L_CS7_ASP_NODE, &asp_timer_cmd); + gen_asp_timer_xua_cmd_strs(&asp_timer_xua_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_timer_xua_cmd); + gen_asp_timer_lm_cmd_strs(&asp_timer_lm_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_timer_lm_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_block_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_shutdown_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_shutdown_cmd); diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index f7117d3..1d6b078 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -44,9 +44,6 @@ * * */ -/* According to SUA RFC3868 Section 8, M3UA RFC4666 Section 4.3.4.1 */ -#define XUA_T_ACK_SEC 2 - static const struct value_string xua_asp_event_names[] = { { XUA_ASP_E_M_ASP_UP_REQ, "M-ASP_UP.req" }, { XUA_ASP_E_M_ASP_ACTIVE_REQ, "M-ASP_ACTIVE.req" }, @@ -317,6 +314,7 @@ { struct osmo_fsm_inst *fi = data; struct xua_asp_fsm_priv *xafp = fi->priv; + uint32_t timeout_sec; LOGPFSML(fi, LOGL_INFO, "T(ack) callback: re-transmitting event %s\n", osmo_fsm_event_name(fi->fsm, xafp->t_ack.out_event)); @@ -325,13 +323,15 @@ peer_send(fi, xafp->t_ack.out_event, NULL); /* Re-start the timer */ - osmo_timer_schedule(&xafp->t_ack.timer, XUA_T_ACK_SEC, 0); + timeout_sec = osmo_tdef_get(xafp->asp->cfg.T_defs_xua, SS7_ASP_XUA_T_ACK, OSMO_TDEF_S, -1); + osmo_timer_schedule(&xafp->t_ack.timer, timeout_sec, 0); } static int peer_send_and_start_t_ack(struct osmo_fsm_inst *fi, int out_event) { struct xua_asp_fsm_priv *xafp = fi->priv; + uint32_t timeout_sec; int rc; rc = peer_send(fi, out_event, NULL); @@ -342,7 +342,8 @@ xafp->t_ack.timer.cb = xua_t_ack_cb, xafp->t_ack.timer.data = fi; - osmo_timer_schedule(&xafp->t_ack.timer, XUA_T_ACK_SEC, 0); + timeout_sec = osmo_tdef_get(xafp->asp->cfg.T_defs_xua, SS7_ASP_XUA_T_ACK, OSMO_TDEF_S, -1); + osmo_timer_schedule(&xafp->t_ack.timer, timeout_sec, 0); return rc; } diff --git a/src/xua_internal.h b/src/xua_internal.h index 4d99231..60d751c 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -111,10 +111,6 @@ extern const struct value_string m3ua_rkm_reg_status_vals[]; extern const struct value_string m3ua_rkm_dereg_status_vals[]; -#define CS7_STR "ITU-T Signaling System 7\n" -#define PC_STR "Point Code\n" -#define INST_STR "An instance of the SS7 stack\n" - int xua_as_transmit_msg(struct osmo_ss7_as *as, struct xua_msg *xua); int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index c22eea9..be2beb5 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -285,6 +285,7 @@ no sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) quirk (no_notify|daud_in_asp|snm_inactive) no quirk (no_notify|daud_in_asp|snm_inactive) + timer xua (ack|beat) <1-999999> timer lm (wait_asp_up|wait_notify|wait_notify_rkm|wait_rk_reg_resp) <1-999999> block shutdown -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40459?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id83446a1846847e68745b29c8dd4388aedcc0660 Gerrit-Change-Number: 40459 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 week, 4 days

1
0
0 0