- gerrit-log - lists.osmocom.org

[M] Change in osmocom-bb[master]: layer23/ccch_scan: use osmo_mobile_identity API
by laforge 09 Jan '24

09 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33317?usp=email ) Change subject: layer23/ccch_scan: use osmo_mobile_identity API ...................................................................... layer23/ccch_scan: use osmo_mobile_identity API * Migrate from deprecated gsm48_mi_to_string() API. * Take a chance to unfify printing of mobile identity. * Use osmo_load32be() for printing TMSI - this is what the osmo_mobile_identity API does internally. Change-Id: Ida67adaa61689c55505a89e1a1bebde041c91139 Depends: libosmocore.git If4f7be606e54cfa1c59084cf169785b1cbda5cf5 --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 49 insertions(+), 48 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 7cbe267..d2b6c24 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -236,24 +236,6 @@ } } -static char *mi_type_to_string(int type) -{ - switch (type) { - case GSM_MI_TYPE_NONE: - return "none"; - case GSM_MI_TYPE_IMSI: - return "imsi"; - case GSM_MI_TYPE_IMEI: - return "imei"; - case GSM_MI_TYPE_IMEISV: - return "imeisv"; - case GSM_MI_TYPE_TMSI: - return "tmsi"; - default: - return "invalid"; - } -} - /** * This can contain two MIs. The size checking is a bit of a mess. */ @@ -261,6 +243,7 @@ { struct gsm48_paging1 *pag; int len1, len2, mi_type, tag; + struct osmo_mobile_identity mi; char mi_string[GSM48_MI_SIZE]; /* is there enough room for the header + LV? */ @@ -279,11 +262,11 @@ } if (mi_type != GSM_MI_TYPE_NONE) { - gsm48_mi_to_string(mi_string, sizeof(mi_string), &pag->data[1], len1); - LOGP(DRR, LOGL_NOTICE, "Paging1: %s chan %s to %s M(%s) \n", + osmo_mobile_identity_decode(&mi, &pag->data[1], len1, false); + osmo_mobile_identity_to_str_buf(mi_string, sizeof(mi_string), &mi); + LOGP(DRR, LOGL_NOTICE, "Paging1: %s chan %s to M(%s)\n", pag_print_mode(pag->pag_mode), chan_need(pag->cneed1), - mi_type_to_string(mi_type), mi_string); } @@ -300,11 +283,11 @@ return -1; } - gsm48_mi_to_string(mi_string, sizeof(mi_string), &pag->data[2 + len1 + 2], len2); - LOGP(DRR, LOGL_NOTICE, "Paging2: %s chan %s to %s M(%s) \n", + osmo_mobile_identity_decode(&mi, &pag->data[2 + len1 + 2], len2, false); + osmo_mobile_identity_to_str_buf(mi_string, sizeof(mi_string), &mi); + LOGP(DRR, LOGL_NOTICE, "Paging2: %s chan %s to M(%s)\n", pag_print_mode(pag->pag_mode), chan_need(pag->cneed2), - mi_type_to_string(mi_type), mi_string); } return 0; @@ -313,8 +296,9 @@ static int gsm48_rx_paging_p2(struct msgb *msg, struct osmocom_ms *ms) { struct gsm48_paging2 *pag; - int tag, len, mi_type; + struct osmo_mobile_identity mi; char mi_string[GSM48_MI_SIZE]; + int tag, len; if (msgb_l3len(msg) < sizeof(*pag)) { LOGP(DRR, LOGL_ERROR, "Paging2 message is too small.\n"); @@ -322,12 +306,14 @@ } pag = msgb_l3(msg); - LOGP(DRR, LOGL_NOTICE, "Paging1: %s chan %s to TMSI M(0x%x) \n", - pag_print_mode(pag->pag_mode), - chan_need(pag->cneed1), pag->tmsi1); - LOGP(DRR, LOGL_NOTICE, "Paging2: %s chan %s to TMSI M(0x%x) \n", - pag_print_mode(pag->pag_mode), - chan_need(pag->cneed2), pag->tmsi2); + LOGP(DRR, LOGL_NOTICE, "Paging1: %s chan %s to M(TMSI-0x%08x)\n", + pag_print_mode(pag->pag_mode), + chan_need(pag->cneed1), + osmo_load32be(&pag->tmsi1)); + LOGP(DRR, LOGL_NOTICE, "Paging2: %s chan %s to M(TMSI-0x%08x)\n", + pag_print_mode(pag->pag_mode), + chan_need(pag->cneed2), + osmo_load32be(&pag->tmsi2)); /* no optional element */ if (msgb_l3len(msg) < sizeof(*pag) + 3) @@ -335,7 +321,6 @@ tag = pag->data[0]; len = pag->data[1]; - mi_type = pag->data[2] & GSM_MI_TYPE_MASK; if (tag != GSM48_IE_MOBILE_ID) return 0; @@ -345,11 +330,10 @@ return -1; } - gsm48_mi_to_string(mi_string, sizeof(mi_string), &pag->data[2], len); - LOGP(DRR, LOGL_NOTICE, "Paging3: %s chan %s to %s M(%s) \n", + osmo_mobile_identity_decode(&mi, &pag->data[2], len, false); + osmo_mobile_identity_to_str_buf(mi_string, sizeof(mi_string), &mi); + LOGP(DRR, LOGL_NOTICE, "Paging3: %s chan n/a to M(%s)\n", pag_print_mode(pag->pag_mode), - "n/a ", - mi_type_to_string(mi_type), mi_string); return 0; @@ -365,18 +349,20 @@ } pag = msgb_l3(msg); - LOGP(DRR, LOGL_NOTICE, "Paging1: %s chan %s to TMSI M(0x%x) \n", - pag_print_mode(pag->pag_mode), - chan_need(pag->cneed1), pag->tmsi1); - LOGP(DRR, LOGL_NOTICE, "Paging2: %s chan %s to TMSI M(0x%x) \n", - pag_print_mode(pag->pag_mode), - chan_need(pag->cneed2), pag->tmsi2); - LOGP(DRR, LOGL_NOTICE, "Paging3: %s chan %s to TMSI M(0x%x) \n", - pag_print_mode(pag->pag_mode), - "n/a ", pag->tmsi3); - LOGP(DRR, LOGL_NOTICE, "Paging4: %s chan %s to TMSI M(0x%x) \n", - pag_print_mode(pag->pag_mode), - "n/a ", pag->tmsi4); + LOGP(DRR, LOGL_NOTICE, "Paging1: %s chan %s to M(TMSI-0x%08x)\n", + pag_print_mode(pag->pag_mode), + chan_need(pag->cneed1), + osmo_load32be(&pag->tmsi1)); + LOGP(DRR, LOGL_NOTICE, "Paging2: %s chan %s to M(TMSI-0x%08x)\n", + pag_print_mode(pag->pag_mode), + chan_need(pag->cneed2), + osmo_load32be(&pag->tmsi2)); + LOGP(DRR, LOGL_NOTICE, "Paging3: %s chan n/a to M(TMSI-0x%08x)\n", + pag_print_mode(pag->pag_mode), + osmo_load32be(&pag->tmsi3)); + LOGP(DRR, LOGL_NOTICE, "Paging4: %s chan n/a to M(TMSI-0x%08x)\n", + pag_print_mode(pag->pag_mode), + osmo_load32be(&pag->tmsi4)); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33317?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ida67adaa61689c55505a89e1a1bebde041c91139 Gerrit-Change-Number: 33317 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: mobile: fix segfault on empty TRAFFIC.ind
by laforge 09 Jan '24

09 Jan '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35507?usp=email ) Change subject: mobile: fix segfault on empty TRAFFIC.ind ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: wouldn't we have to inject a silence frame, or a duplicate of the previous, or something? Otherweise now the clocks will drift due to a frame being received, but we drop it here, resulting in an underrun of the audio codec (for example if it's playing back through a soundcard that needs N samples per second). -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35507?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ice11b72ddfd51fbfb17a4c609c664b86a8f69591 Gerrit-Change-Number: 35507 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Jan 2024 13:06:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: layer23/ccch_scan: use osmo_mobile_identity API
by laforge 09 Jan '24

09 Jan '24

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33317?usp=email ) Change subject: layer23/ccch_scan: use osmo_mobile_identity API ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33317?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ida67adaa61689c55505a89e1a1bebde041c91139 Gerrit-Change-Number: 33317 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Jan 2024 13:04:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: layer23/mobile: use osmo_mobile_identity API
by laforge 09 Jan '24

09 Jan '24

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33318?usp=email ) Change subject: layer23/mobile: use osmo_mobile_identity API ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib0d7f76cd635e8d1092ffc1d07ecb29ec0435dda Gerrit-Change-Number: 33318 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Jan 2024 13:04:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-msc-test: set 'hlr' / 'ipa-name' explicitly
by fixeria 09 Jan '24

09 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35520?usp=email ) Change subject: ttcn3-msc-test: set 'hlr' / 'ipa-name' explicitly ...................................................................... ttcn3-msc-test: set 'hlr' / 'ipa-name' explicitly Old osmo-msc versions do not include the Source Name IE in SMS related GSUP messages, unless it's set explicitly in the config file ('hlr' / 'ipa-name'). Recent osmo-msc versions (see the related osmo-msc patch) do include this IE even if it's not set explicitly ('unnamed-MSC'). Because of this, some testcases in ttcn3-msc-test are currently failing for osmo-msc master, but still passing for the -latest. Let's set the 'ipa-name' explicitly in osmo-msc.cfg, so that we can expect both -master and -latest to include the Source Name IE. Change-Id: I7757aae1d01b679f530b5c0a6c95b224cb9f204f Related: osmo-ttcn3-hacks.git Ic24d3082fe3dce08e43e8f3ecb6d6132503c55c6 Related: osmo-msc.git I7bacd001b81326c32bc262c7d0c0491ded822fa8 Related: OS#6135 --- M ttcn3-msc-test/osmo-msc.cfg 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/20/35520/1 diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index dabf142..b7b39f9 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -95,3 +95,4 @@ hlr remote-ip 172.18.20.103 remote-port 4222 + ipa-name test-MSC -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35520?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: I7757aae1d01b679f530b5c0a6c95b224cb9f204f Gerrit-Change-Number: 35520 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: add Source Name IE to receive templates for SMS
by fixeria 09 Jan '24

09 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35519?usp=email ) Change subject: library/GSUP_Types: add Source Name IE to receive templates for SMS ...................................................................... library/GSUP_Types: add Source Name IE to receive templates for SMS Old osmo-msc versions do not include the Source Name IE in SMS related GSUP messages, unless it's set explicitly in the config file ('hlr' / 'ipa-name'). Recent osmo-msc versions (see the related osmo-msc patch) do include this IE even if it's not set explicitly ('unnamed-MSC'). Because of this, some testcases in ttcn3-msc-test are currently failing for osmo-msc master, but still passing for the -latest. Let's set the 'ipa-name' explicitly in osmo-msc.cfg, and expect the Source Name IE to be present in SMS related receive templates. Change-Id: Ic24d3082fe3dce08e43e8f3ecb6d6132503c55c6 Related: docker-playground.git I7757aae1d01b679f530b5c0a6c95b224cb9f204f Related: osmo-msc.git I7bacd001b81326c32bc262c7d0c0491ded822fa8 Related: OS#6135 --- M library/GSUP_Types.ttcn M msc/osmo-msc.cfg 2 files changed, 42 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/35519/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 323776f..b3154ac 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -1634,7 +1634,8 @@ tr_GSUP_IE_SM_RP_DA(sm_rp_da), tr_GSUP_IE_SM_RP_OA(sm_rp_oa), tr_GSUP_IE_SM_RP_UI(sm_rp_ui), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1657,7 +1658,8 @@ { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1684,7 +1686,8 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), tr_GSUP_IE_SM_RP_CAUSE(sm_rp_cause), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1733,7 +1736,8 @@ tr_GSUP_IE_SM_RP_OA(sm_rp_oa), tr_GSUP_IE_SM_RP_UI(sm_rp_ui), tr_GSUP_IE_SM_RP_MMS(sm_rp_mms), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1756,7 +1760,8 @@ { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1783,7 +1788,8 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), tr_GSUP_IE_SM_RP_CAUSE(sm_rp_cause), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1810,7 +1816,8 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), tr_GSUP_IE_SM_ALERT_RSN(sm_alert_rsn), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1833,7 +1840,8 @@ { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1860,7 +1868,8 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), tr_GSUP_IE_SM_RP_CAUSE(sm_rp_cause), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index a266ed4..d05e400 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -76,3 +76,4 @@ hlr remote-ip 127.0.0.1 #remote-port 4222 + ipa-name test-MSC -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35519?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: Ic24d3082fe3dce08e43e8f3ecb6d6132503c55c6 Gerrit-Change-Number: 35519 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: MSC_Tests: indicate the failure reason in setverdict()
by fixeria 09 Jan '24

09 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35517?usp=email ) Change subject: MSC_Tests: indicate the failure reason in setverdict() ...................................................................... MSC_Tests: indicate the failure reason in setverdict() ... so that there is no need to check logs to see why a test failed. Change-Id: I159bc54f6f4561d42aeabe825e16fa77e60c2dae --- M msc/MSC_Tests.ttcn 1 file changed, 26 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/35517/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 6f23e5f..1f8d8d4 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2789,8 +2789,7 @@ setverdict(pass); } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } @@ -2845,8 +2844,7 @@ setverdict(pass); } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } @@ -2933,8 +2931,7 @@ setverdict(pass); } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } @@ -2996,8 +2993,7 @@ mtc.stop; } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } @@ -3057,24 +3053,20 @@ /* Both transaction IDs shall be different */ if (spars1.tid == spars2.tid) { - log("Both DTAP transaction IDs shall be different"); - setverdict(fail); + setverdict(fail, "Both DTAP transaction IDs shall be different"); } /* Both SM-RP-MR values shall be different */ if (spars1.rp.msg_ref == spars2.rp.msg_ref) { - log("Both SM-RP-MR values shall be different"); - setverdict(fail); + setverdict(fail, "Both SM-RP-MR values shall be different"); } /* Both SM-RP-MR values shall be assigned */ if (spars1.rp.msg_ref == 'FF'O) { - log("Unassigned SM-RP-MR value for the 1st SMS"); - setverdict(fail); + setverdict(fail, "Unassigned SM-RP-MR value for the 1st SMS"); } if (spars2.rp.msg_ref == 'FF'O) { - log("Unassigned SM-RP-MR value for the 2nd SMS"); - setverdict(fail); + setverdict(fail, "Unassigned SM-RP-MR value for the 2nd SMS"); } /* Send the 1st RP-ACK and expect MT-forwardSM-Res on GSUP */ @@ -3088,8 +3080,7 @@ setverdict(pass); } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } @@ -3105,8 +3096,7 @@ setverdict(pass); } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } @@ -3161,8 +3151,7 @@ setverdict(pass); } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } @@ -3178,14 +3167,12 @@ /* Both SM-RP-MR values shall be different */ if (spars_mo.rp.msg_ref == spars_mt.rp.msg_ref) { - log("Both SM-RP-MR values shall be different"); - setverdict(fail); + setverdict(fail, "Both SM-RP-MR values shall be different"); } /* SM-RP-MR value for MT SMS shall be assigned */ if (spars_mt.rp.msg_ref == 'FF'O) { - log("Unassigned SM-RP-MR value for the MT SMS"); - setverdict(fail); + setverdict(fail, "Unassigned SM-RP-MR value for the MT SMS"); } /* Trigger RP-ACK for MO SMMA by sending MO-forwardSM-Res */ @@ -3206,8 +3193,7 @@ setverdict(pass); } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } @@ -3270,8 +3256,7 @@ setverdict(pass); } [] GSUP.receive { - log("RX unexpected GSUP message"); - setverdict(fail); + setverdict(fail, "Rx unexpected GSUP message"); mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35517?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: I159bc54f6f4561d42aeabe825e16fa77e60c2dae Gerrit-Change-Number: 35517 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: set Message Class IE in send templates for SMS
by fixeria 09 Jan '24

09 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35518?usp=email ) Change subject: library/GSUP_Types: set Message Class IE in send templates for SMS ...................................................................... library/GSUP_Types: set Message Class IE in send templates for SMS We do expect it in receive templates for SMS, so let's also indluce it in the send templates. Change-Id: I6468d8606eb85c811d86e4a1407ee60c8a36fbea Related: OS#6135 --- M library/GSUP_Types.ttcn 1 file changed, 31 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/35518/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index c3563bc..323776f 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -1616,7 +1616,8 @@ valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)), valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)), - valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) + valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MO_FORWARD_SM_REQ( @@ -1644,7 +1645,8 @@ OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)), - valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)) + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MO_FORWARD_SM_RES( @@ -1668,7 +1670,8 @@ { valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), - valueof(ts_GSUP_IE_SM_RP_CAUSE(sm_rp_cause)) + valueof(ts_GSUP_IE_SM_RP_CAUSE(sm_rp_cause)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MO_FORWARD_SM_ERR( @@ -1705,7 +1708,8 @@ valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)), valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)), valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)), - valueof(ts_GSUP_IE_SM_RP_MMS(sm_rp_mms)) + valueof(ts_GSUP_IE_SM_RP_MMS(sm_rp_mms)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MT_FORWARD_SM_REQ( @@ -1740,7 +1744,8 @@ OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)), - valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)) + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MT_FORWARD_SM_RES( @@ -1764,7 +1769,8 @@ { valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), - valueof(ts_GSUP_IE_SM_RP_CAUSE(sm_rp_cause)) + valueof(ts_GSUP_IE_SM_RP_CAUSE(sm_rp_cause)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MT_FORWARD_SM_ERR( @@ -1790,7 +1796,8 @@ { valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), - valueof(ts_GSUP_IE_SM_ALERT_RSN(sm_alert_rsn)) + valueof(ts_GSUP_IE_SM_ALERT_RSN(sm_alert_rsn)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MO_READY_FOR_SM_REQ( @@ -1814,7 +1821,8 @@ OSMO_GSUP_MSGT_READY_FOR_SM_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)), - valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)) + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MO_READY_FOR_SM_RES( @@ -1838,7 +1846,8 @@ { valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), - valueof(ts_GSUP_IE_SM_RP_CAUSE(sm_rp_cause)) + valueof(ts_GSUP_IE_SM_RP_CAUSE(sm_rp_cause)), + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); template GSUP_PDU tr_GSUP_MO_READY_FOR_SM_ERR( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35518?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: I6468d8606eb85c811d86e4a1407ee60c8a36fbea Gerrit-Change-Number: 35518 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Fix tEID field optional tr_PDU_GTP2C_msgtypes()
by pespin 09 Jan '24

09 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35514?usp=email ) Change subject: GTPv2_Templates: Fix tEID field optional tr_PDU_GTP2C_msgtypes() ...................................................................... GTPv2_Templates: Fix tEID field optional tr_PDU_GTP2C_msgtypes() The TEID field is optional, based on t_Bit. Hence, we also want to match by type if there's no TEID. Change-Id: I65044b8758046704e22f9057f34ce5fdbb7aabfe --- M library/GTPv2_Templates.ttcn 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/35514/1 diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index 5dea7e9..afe0138 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -106,7 +106,7 @@ version := '010'B, messageType := types, lengthf := ?, - tEID := ?, + tEID := *, sequenceNumber := ?, spare3 := '00'O, gtpcv2_pdu := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35514?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: I65044b8758046704e22f9057f34ce5fdbb7aabfe Gerrit-Change-Number: 35514 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: routing improvements: Prioritize response, fallback ...
by pespin 09 Jan '24

09 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35515?usp=email ) Change subject: GTPv2_Emulation: routing improvements: Prioritize response, fallback to TEID ...................................................................... GTPv2_Emulation: routing improvements: Prioritize response, fallback to TEID First try forwarding to component transmitting the originating request, since this is the most fine-grained match. Finally, if no specific match was found and if messages belongs to TEID0, send it over that port as a fallback. Fixes: 1d2cc67036e95a0c3ee3ac7738d7e15d5f76b8a2 Change-Id: Ie96d65085fb352489150183415dbd6cc8237a47c --- M library/GTPv2_Emulation.ttcn 1 file changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/35515/1 diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index eb2b977..240cce4 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -560,7 +560,12 @@ /* route inbound GTP2-C based on TEID, SEQ or IMSI */ [] GTP2C.receive(Gtp2cUnitdata:?) -> value g2c_ud { var template hexstring imsi_t := f_gtp2c_extract_imsi(g2c_ud.gtpc); - if (isvalue(imsi_t) and f_imsi_known(valueof(imsi_t))) { + /* if this is a response, route by SEQ: */ + if (match(g2c_ud.gtpc, tr_PDU_GTP2C_msgtypes(gtp2_responses)) + and f_seq_known(g2c_ud.gtpc.sequenceNumber)) { + vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber); + CLIENT.send(g2c_ud.gtpc) to vc_conn; + }else if (isvalue(imsi_t) and f_imsi_known(valueof(imsi_t))) { vc_conn := f_comp_by_imsi(valueof(imsi_t)); CLIENT.send(g2c_ud.gtpc) to vc_conn; } else if ((ispresent(g2c_ud.gtpc.tEID) and g2c_ud.gtpc.tEID != '00000000'O) @@ -571,13 +576,11 @@ and f_teid_known('00000000'O)) { vc_conn := f_comp_by_teid(g2c_ud.gtpc.tEID); CLIENT.send(g2c_ud.gtpc) to vc_conn; - /* if this is a response, route by SEQ: */ - } else if (match(g2c_ud.gtpc, tr_PDU_GTP2C_msgtypes(gtp2_responses)) - and f_seq_known(g2c_ud.gtpc.sequenceNumber)) { - vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber); - CLIENT.send(g2c_ud.gtpc) to vc_conn; } else { SendToUdMsgTable(g2c_ud); + if (not ispresent(g2c_ud.gtpc.tEID) or g2c_ud.gtpc.tEID == '00000000'O) { + TEID0.send(g2c_ud.gtpc); + } } /* remove sequence number if response was received */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35515?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: Ie96d65085fb352489150183415dbd6cc8237a47c Gerrit-Change-Number: 35515 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log