- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: smdpp: less verbose by default

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40468?usp=email ) Change subject: smdpp: less verbose by default ...................................................................... smdpp: less verbose by default Those data blobs are huge. Change-Id: I04a72b8f52417862d4dcba1f0743700dd942ef49 --- M osmo-smdpp.py M pySim/esim/bsp.py M pySim/esim/es8p.py 3 files changed, 51 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/68/40468/1 diff --git a/osmo-smdpp.py b/osmo-smdpp.py index 92bbb42..b8b6303 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -47,6 +47,9 @@ from pySim.esim.x509_cert import oid, cert_policy_has_oid, cert_get_auth_key_id from pySim.esim.x509_cert import CertAndPrivkey, CertificateSet, cert_get_subject_key_id, VerifyError +import logging +logger = logging.getLogger(__name__) + # HACK: make this configurable DATA_DIR = './smdpp-data' HOSTNAME = 'testsmdpplus1.example.com' # must match certificates! @@ -356,7 +359,7 @@ validate_request_headers(request) content = json.loads(request.content.read()) - print("Rx JSON: %s" % json.dumps(content)) + logger.debug("Rx JSON: %s" % json.dumps(content)) set_headers(request) output = func(self, request, content) @@ -364,7 +367,7 @@ return '' build_resp_header(output) - print("Tx JSON: %s" % json.dumps(output)) + logger.debug("Tx JSON: %s" % json.dumps(output)) return json.dumps(output) return _api_wrapper @@ -383,7 +386,7 @@ euiccInfo1_bin = b64decode(content['euiccInfo1']) euiccInfo1 = rsp.asn1.decode('EUICCInfo1', euiccInfo1_bin) - print("Rx euiccInfo1: %s" % euiccInfo1) + logger.debug("Rx euiccInfo1: %s" % euiccInfo1) #euiccInfo1['svn'] # TODO: If euiccCiPKIdListForSigningV3 is present ... @@ -458,7 +461,7 @@ authenticateServerResp_bin = b64decode(content['authenticateServerResponse']) authenticateServerResp = rsp.asn1.decode('AuthenticateServerResponse', authenticateServerResp_bin) - print("Rx %s: %s" % authenticateServerResp) + logger.debug("Rx %s: %s" % authenticateServerResp) if authenticateServerResp[0] == 'authenticateResponseError': r_err = authenticateServerResp[1] #r_err['transactionId'] @@ -589,7 +592,7 @@ prepDownloadResp_bin = b64decode(content['prepareDownloadResponse']) prepDownloadResp = rsp.asn1.decode('PrepareDownloadResponse', prepDownloadResp_bin) - print("Rx %s: %s" % prepDownloadResp) + logger.debug("Rx %s: %s" % prepDownloadResp) if prepDownloadResp[0] == 'downloadResponseError': r_err = prepDownloadResp[1] @@ -611,7 +614,7 @@ # store otPK.EUICC.ECKA in session state ss.euicc_otpk = euiccSigned2['euiccOtpk'] - print("euiccOtpk: %s" % (b2h(ss.euicc_otpk))) + logger.debug("euiccOtpk: %s" % (b2h(ss.euicc_otpk))) # Generate a one-time ECKA key pair (ot{PK,SK}.DP.ECKA) using the curve indicated by the Key Parameter # Reference value of CERT.DPpb.ECDDSA @@ -619,8 +622,8 @@ ss.smdp_ot = ec.generate_private_key(self.dp_pb.get_curve()) # extract the public key in (hopefully) the right format for the ES8+ interface ss.smdp_otpk = ss.smdp_ot.public_key().public_bytes(Encoding.X962, PublicFormat.UncompressedPoint) - print("smdpOtpk: %s" % b2h(ss.smdp_otpk)) - print("smdpOtsk: %s" % b2h(ss.smdp_ot.private_bytes(Encoding.DER, PrivateFormat.PKCS8, NoEncryption()))) + logger.debug("smdpOtpk: %s" % b2h(ss.smdp_otpk)) + logger.debug("smdpOtsk: %s" % b2h(ss.smdp_ot.private_bytes(Encoding.DER, PrivateFormat.PKCS8, NoEncryption()))) ss.host_id = b'mahlzeit' @@ -661,7 +664,7 @@ request.setResponseCode(204) pendingNotification_bin = b64decode(content['pendingNotification']) pendingNotification = rsp.asn1.decode('PendingNotification', pendingNotification_bin) - print("Rx %s: %s" % pendingNotification) + logger.debug("Rx %s: %s" % pendingNotification) if pendingNotification[0] == 'profileInstallationResult': profileInstallRes = pendingNotification[1] pird = profileInstallRes['profileInstallationResultData'] @@ -714,7 +717,7 @@ @rsp_api_wrapper def cancelSession(self, request: IRequest, content: dict) -> dict: """See ES9+ CancelSession in SGP.22 Section 5.6.5""" - print("Rx JSON: %s" % content) + logger.debug("Rx JSON: %s" % content) transactionId = content['transactionId'] # Verify that the received transactionId is known and relates to an ongoing RSP session @@ -724,7 +727,7 @@ cancelSessionResponse_bin = b64decode(content['cancelSessionResponse']) cancelSessionResponse = rsp.asn1.decode('CancelSessionResponse', cancelSessionResponse_bin) - print("Rx %s: %s" % cancelSessionResponse) + logger.debug("Rx %s: %s" % cancelSessionResponse) if cancelSessionResponse[0] == 'cancelSessionResponseError': # FIXME: print some error @@ -760,8 +763,11 @@ parser.add_argument("-p", "--port", help="TCP port to bind HTTP to", default=8000) parser.add_argument("-c", "--certpath", help=f"cert subdir relative to {DATA_DIR}", default="certs") parser.add_argument("-s", "--nossl", help="do NOT use ssl", action='store_true', default=False) + parser.add_argument("-v", "--verbose", help="dump more raw info", action='store_true', default=False) args = parser.parse_args() + logging.basicConfig(level=logging.DEBUG if args.verbose else logging.WARNING) + common_cert_path = os.path.join(DATA_DIR, args.certpath) hs = SmDppHttpServer(server_hostname=HOSTNAME, ci_certs_path=os.path.join(common_cert_path, 'CertificateIssuer'), common_cert_path=common_cert_path, use_brainpool=False) if(args.nossl): diff --git a/pySim/esim/bsp.py b/pySim/esim/bsp.py index fb4c0b3..6935802 100644 --- a/pySim/esim/bsp.py +++ b/pySim/esim/bsp.py @@ -149,8 +149,18 @@ temp_data = self.mac_chain + tag_and_length + data old_mcv = self.mac_chain c_mac = self._auth(temp_data) + + # DEBUG: Show MAC computation details + logger.debug(f"MAC_DEBUG: tag=0x{tag:02x}, lcc={lcc}") + logger.debug(f"MAC_DEBUG: tag_and_length: {tag_and_length.hex()}") + logger.debug(f"MAC_DEBUG: mac_chain[:20]: {old_mcv[:20].hex()}") + logger.debug(f"MAC_DEBUG: temp_data[:20]: {temp_data[:20].hex()}") + logger.debug(f"MAC_DEBUG: c_mac: {c_mac.hex()}") + # The output data is computed by concatenating the following data: the tag, the final length, the result of step 2 and the C-MAC value. ret = tag_and_length + data + c_mac + logger.debug(f"MAC_DEBUG: final_output[:20]: {ret[:20].hex()}") + logger.debug("auth(tag=0x%x, mcv=%s, s_mac=%s, plaintext=%s, temp=%s) -> %s", tag, b2h(old_mcv), b2h(self.s_mac), b2h(data), b2h(temp_data), b2h(ret)) return ret @@ -204,6 +214,11 @@ s_enc = out[l:2*l] s_mac = out[l*2:3*l] + logger.debug(f"BSP_KDF_DEBUG: kdf_out = {b2h(out)}") + logger.debug(f"BSP_KDF_DEBUG: initial_mcv = {b2h(initial_mac_chaining_value)}") + logger.debug(f"BSP_KDF_DEBUG: s_enc = {b2h(s_enc)}") + logger.debug(f"BSP_KDF_DEBUG: s_mac = {b2h(s_mac)}") + return s_enc, s_mac, initial_mac_chaining_value @@ -231,9 +246,21 @@ """Encrypt + MAC a single plaintext TLV. Returns the protected ciphertext.""" assert tag <= 255 assert len(plaintext) <= self.max_payload_size + + # DEBUG: Show what we're processing + logger.debug(f"BSP_DEBUG: encrypt_and_mac_one(tag=0x{tag:02x}, plaintext_len={len(plaintext)})") + logger.debug(f"BSP_DEBUG: plaintext[:20]: {plaintext[:20].hex()}") + logger.debug(f"BSP_DEBUG: s_enc[:20]: {self.c_algo.s_enc[:20].hex()}") + logger.debug(f"BSP_DEBUG: s_mac[:20]: {self.m_algo.s_mac[:20].hex()}") + logger.debug("encrypt_and_mac_one(tag=0x%x, plaintext=%s)", tag, b2h(plaintext)) ciphered = self.c_algo.encrypt(plaintext) + logger.debug(f"BSP_DEBUG: ciphered[:20]: {ciphered[:20].hex()}") + maced = self.m_algo.auth(tag, ciphered) + logger.debug(f"BSP_DEBUG: final_result[:20]: {maced[:20].hex()}") + logger.debug(f"BSP_DEBUG: final_result_len: {len(maced)}") + return maced def encrypt_and_mac(self, tag: int, plaintext:bytes) -> List[bytes]: diff --git a/pySim/esim/es8p.py b/pySim/esim/es8p.py index 8bd7e14..4c854f1 100644 --- a/pySim/esim/es8p.py +++ b/pySim/esim/es8p.py @@ -25,6 +25,9 @@ from pySim.esim.bsp import BspInstance from pySim.esim import PMO +import logging +logger = logging.getLogger(__name__) + # Given that GSMA RSP uses ASN.1 in a very weird way, we actually cannot encode the full data type before # signing, but we have to build parts of it separately first, then sign that, so we can put the signature # into the same sequence as the signed data. We use the existing pySim TLV code for this. @@ -196,8 +199,12 @@ # 'initialiseSecureChannelRequest' bpp_seq = rsp.asn1.encode('InitialiseSecureChannelRequest', iscr) # firstSequenceOf87 + logger.debug(f"BPP_ENCODE_DEBUG: Encrypting ConfigureISDP with BSP keys") + logger.debug(f"BPP_ENCODE_DEBUG: BSP S-ENC: {bsp.c_algo.s_enc.hex()}") + logger.debug(f"BPP_ENCODE_DEBUG: BSP S-MAC: {bsp.m_algo.s_mac.hex()}") bpp_seq += encode_seq(0xa0, bsp.encrypt_and_mac(0x87, conf_idsp_bin)) # sequenceOF88 + logger.debug(f"BPP_ENCODE_DEBUG: MAC-only StoreMetadata with BSP keys") bpp_seq += encode_seq(0xa1, bsp.mac_only(0x88, smr_bin)) if self.ppp: # we have to use session keys -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40468?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: I04a72b8f52417862d4dcba1f0743700dd942ef49 Gerrit-Change-Number: 40468 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 week, 4 days

1
0
0 0

[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