April 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_csd: test more transp data rates

by osmith

Attention is currently required from: osmith, fixeria. Hello Jenkins Builder, laforge, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365 to look at the new patch set (#3). Change subject: bsc: TC_assignment_csd: test more transp data rates ...................................................................... bsc: TC_assignment_csd: test more transp data rates Related: OS#4393 Change-Id: I9a5f0e630fefcafb1b26eabba73de7e76d9e7e5d --- M bsc/BSC_Tests.ttcn 1 file changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/32365/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365 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: I9a5f0e630fefcafb1b26eabba73de7e76d9e7e5d Gerrit-Change-Number: 32365 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: CSD: support non-transparent data rates

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/32369 to look at the new patch set (#2). Change subject: CSD: support non-transparent data rates ...................................................................... CSD: support non-transparent data rates Implement gsm0808_data_rate_non_transp_to_gsm0408. Related: OS#4393 Change-Id: Ib5f4bdf17a9833f65a0b623a033da838a2594d68 --- M src/osmo-bsc/data_rate_pref.c 1 file changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/32369/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5f4bdf17a9833f65a0b623a033da838a2594d68 Gerrit-Change-Number: 32369 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_rsl: fix encoding RSL_IE_IPAC_RTP_CSD_FORMAT

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32366 ) Change subject: abis_rsl: fix encoding RSL_IE_IPAC_RTP_CSD_FORMAT ...................................................................... abis_rsl: fix encoding RSL_IE_IPAC_RTP_CSD_FORMAT The A-bis/IP RTP CSD Format IR Values need to be shifted by 4 bits instead of 5. See OsmoBTS Abis Protocol Specification § 5.8.14 RSL_IE_IPAC_RTP_CSD_FORMAT. Related: https://ftp.osmocom.org/docs/osmo-bts/master/osmobts-abis.pdf Related: OS#4393 Change-Id: I9ce0b2d9b77eef61a6d4dce417efe4e853217dc5 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 22 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index dfe7da9..6370942 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2590,18 +2590,18 @@ switch (ch_mode_rate->data_rate.t) { case RSL_CMOD_CSD_T_32k0: case RSL_CMOD_CSD_T_29k0: - ret |= RSL_IPAC_RTP_CSD_IR_32k << 5; + ret |= RSL_IPAC_RTP_CSD_IR_32k << 4; break; case RSL_CMOD_CSD_T_14k4: case RSL_CMOD_CSD_T_9k6: - ret |= RSL_IPAC_RTP_CSD_IR_16k << 5; + ret |= RSL_IPAC_RTP_CSD_IR_16k << 4; break; case RSL_CMOD_CSD_T_4k8: case RSL_CMOD_CSD_T_2k4: case RSL_CMOD_CSD_T_1k2: case RSL_CMOD_CSD_T_600: case RSL_CMOD_CSD_T_1200_75: - ret |= RSL_IPAC_RTP_CSD_IR_8k << 5; + ret |= RSL_IPAC_RTP_CSD_IR_8k << 4; break; default: return -EINVAL; @@ -2622,19 +2622,19 @@ case RSL_CMOD_CSD_NTA_14k5_43k5: case RSL_CMOD_CSD_NTA_29k0_43k5: case RSL_CMOD_CSD_NT_43k5: - ret |= RSL_IPAC_RTP_CSD_IR_64k << 5; + ret |= RSL_IPAC_RTP_CSD_IR_64k << 4; break; case RSL_CMOD_CSD_NTA_29k0_14k5: case RSL_CMOD_CSD_NTA_14k5_29k0: case RSL_CMOD_CSD_NT_28k8: - ret |= RSL_IPAC_RTP_CSD_IR_32k << 5; + ret |= RSL_IPAC_RTP_CSD_IR_32k << 4; break; case RSL_CMOD_CSD_NT_14k5: case RSL_CMOD_CSD_NT_12k0: - ret |= RSL_IPAC_RTP_CSD_IR_16k << 5; + ret |= RSL_IPAC_RTP_CSD_IR_16k << 4; break; case RSL_CMOD_CSD_NT_6k0: - ret |= RSL_IPAC_RTP_CSD_IR_8k << 5; + ret |= RSL_IPAC_RTP_CSD_IR_8k << 4; break; default: return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9ce0b2d9b77eef61a6d4dce417efe4e853217dc5 Gerrit-Change-Number: 32366 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: improve TC_assignment_csd

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32343 ) Change subject: bsc: improve TC_assignment_csd ...................................................................... bsc: improve TC_assignment_csd Verify that CSD ipaccess CRCX/MDCX has the CSD RTP payload type, and that the RSL_IE_IPAC_RTP_CSD_FMT IE is set with RSL_IPA_RTP_CSD_TRAU_BTS. Related: OS#4393 Change-Id: Id0e0c5631d7a36635e1ef49cf5bf554f0336556b --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M library/MGCP_Types.ttcn M library/RSL_Types.ttcn 4 files changed, 67 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f40b19e..aa627b7 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1852,6 +1852,7 @@ private function f_tc_assignment_csd(charstring id) runs on MSC_ConnHdlr { var template PDU_BSSAP exp_compl := f_gen_exp_compl(); var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var SDP_FIELD_PayloadType pt_csd := PT_CSD; ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecCSData})); @@ -1859,6 +1860,11 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := GSM0808_DATA_RATE_TRANSP_4k8; f_establish_fully(ass_cmd, exp_compl); + + if (g_media.bts.rtp_pt != enum2int(pt_csd)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("unexpected RTP payload type: ", g_media.bts.rtp_pt)); + } + f_perform_clear(); } testcase TC_assignment_csd() runs on test_CT { diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index b3e6af6..fa7cd84 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -198,6 +198,28 @@ return -1; } +/* Verify that CSD CRCX/MDCX has the RSL_IE_IPAC_RTP_CSD_FMT IE, and that + * inside it the D value is set to RSL_IPA_RTP_CSD_TRAU_BTS. */ +private function f_ipacc_crcx_mdcx_check_rtp_pt_csd(RSL_Message rsl) runs on MSC_ConnHdlr { + var SDP_FIELD_PayloadType pt_csd := PT_CSD; + var RSL_IE_Body ie; + + if (g_media.bts.rtp_pt != enum2int(pt_csd)) { + return; + } + + if (f_rsl_find_ie(rsl, RSL_IE_IPAC_RTP_CSD_FMT, ie)) { + if (ie.ipa_rtp_csd_fmt.d != RSL_IPA_RTP_CSD_TRAU_BTS) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx unexpected IPAC CRCX for CSD with RTP_CSD_FMT IE"); + } + return; + } + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx unexpected IPAC CRCX for CSD without RTP_CSD_FMT IE"); +} + /* altstep for handling of IPACC media related commands. Activated by as_Media() to test * RSL level media handling */ altstep as_Media_ipacc(RSL_DCHAN_PT rsl_pt := RSL, RSL_DCHAN_PT rsl_pt_ho_target := RSL1) runs on MSC_ConnHdlr { @@ -224,6 +246,7 @@ g_media.bts.local_osmux_cid := omit; g_media.bts.remote_osmux_cid := omit; } + f_ipacc_crcx_mdcx_check_rtp_pt_csd(rsl); rsl_pt.send(ts_RSL_IPA_CRCX_ACK(g_chan_nr, g_media.bts.conn_id, f_inet_addr(g_media.bts.bts.host), g_media.bts.bts.port_nr, @@ -262,6 +285,7 @@ g_media.bts.local_osmux_cid := omit; g_media.bts.remote_osmux_cid := omit; } + f_ipacc_crcx_mdcx_check_rtp_pt_csd(rsl); rsl_pt.send(ts_RSL_IPA_MDCX_ACK(g_chan_nr, g_media.bts.conn_id, f_inet_addr(g_media.bts.peer.host), g_media.bts.peer.port_nr, diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn index 01d4d3a..da1b7f6 100644 --- a/library/MGCP_Types.ttcn +++ b/library/MGCP_Types.ttcn @@ -128,7 +128,8 @@ PT_GSMEFR(110), PT_GSMHR(111), PT_AMR(112), - PT_AMRWB(113) + PT_AMRWB(113), + PT_CSD(120) } } with { encode "TEXT" } diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index fff87f2..0f03c87 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -945,6 +945,25 @@ RSL_IPA_Codec codec } + type enumerated RSL_IPA_RTP_CSD_FMT_D { + RSL_IPA_RTP_CSD_EXT_TRAU ('0000'B), + RSL_IPA_RTP_CSD_NON_TRAU ('0001'B), + RSL_IPA_RTP_CSD_TRAU_BTS ('0010'B), + RSL_IPA_RTP_CSD_IWF_FREE ('0011'B) + } with { variant "FIELDLENGTH(4)" } + + type enumerated RSL_IPA_RTP_CSD_FMT_IR { + RSL_IPA_RTP_CSD_8k ('0000'B), + RSL_IPA_RTP_CSD_16k ('0001'B), + RSL_IPA_RTP_CSD_32k ('0010'B), + RSL_IPA_RTP_CSD_64 ('0011'B) + } with { variant "FIELDLENGTH(4)" } + + type record RSL_IE_IPA_RTP_CSD_FMT { + RSL_IPA_RTP_CSD_FMT_IR ir, + RSL_IPA_RTP_CSD_FMT_D d + } + /* 9.3.20 */ type enumerated RSL_IE_ReleaseMode { RSL_REL_MODE_NORMAL ('00'B), @@ -1076,6 +1095,7 @@ uint8_t ipa_rtp_pt2, RSL_IE_IPA_ConnectionStats ipa_stats, RSL_IE_IPA_SpeechMode ipa_speech_mode, + RSL_IE_IPA_RTP_CSD_FMT ipa_rtp_csd_fmt, RSL_IE_OSMO_TrainingSequence osmo_training_sequence, RSL_IE_OSMO_RepAcchCap rep_acch_cap, @@ -1142,6 +1162,7 @@ ipa_rtp_pt2, iei = RSL_IE_IPAC_RTP_PAYLOAD2; ipa_stats, iei = RSL_IE_IPAC_CONN_STAT; ipa_speech_mode, iei = RSL_IE_IPAC_SPEECH_MODE; + ipa_rtp_csd_fmt, iei = RSL_IE_IPAC_RTP_CSD_FMT; osmo_training_sequence, iei = RSL_IE_OSMO_TRAINING_SEQUENCE; rep_acch_cap, iei = RSL_IE_OSMO_REP_ACCH_CAP; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32343 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: Id0e0c5631d7a36635e1ef49cf5bf554f0336556b Gerrit-Change-Number: 32343 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: improve TC_assignment_csd

by osmith

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32343 ) Change subject: bsc: improve TC_assignment_csd ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File bsc/MSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32343/comment/9ddddef0_6bac… PS1, Line 212: if (ie.ipa > the more ttcn3-native way would probably to match against a template and simply leave it to the auto […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32343 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: Id0e0c5631d7a36635e1ef49cf5bf554f0336556b Gerrit-Change-Number: 32343 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Apr 2023 08:43:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-mgw[master]: Cosmetic: mgcp_client: fix typo

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32356 ) Change subject: Cosmetic: mgcp_client: fix typo ...................................................................... Cosmetic: mgcp_client: fix typo Change-Id: I8e44b4bb853ebac881cb51b9546505874cf8fa45 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 3df9ccf..3208192 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1373,7 +1373,7 @@ MSGB_PRINTF_OR_RET("I: %s\r\n", mgcp_msg->conn_id); } - /* Using SDP makes sense when a valid IP/Port combination is specifiec, + /* Using SDP makes sense when a valid IP/Port combination is specified, * if we do not know this information yet, we fall back to LCO */ if (mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_IP && mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_PORT) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8e44b4bb853ebac881cb51b9546505874cf8fa45 Gerrit-Change-Number: 32356 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmo-sccp[master]: cosmetic: Fix log message in routing table add error case

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32328 ) Change subject: cosmetic: Fix log message in routing table add error case ...................................................................... cosmetic: Fix log message in routing table add error case * crate -> create (typo) * linkset -> AS (we're adding a route for an AS here, not a linkset) Change-Id: I901aa68f64de3bee1766c356a1403b6ca57d5237 --- M src/osmo_ss7_vty.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 7dffe02..0d15c52 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1085,7 +1085,7 @@ /* automatically add new route (see also comment above) */ if (cs7_role == CS7_ROLE_ASP) { if (!osmo_ss7_route_create(as->inst->rtable_system, rkey->pc, 0xffffff, as->cfg.name)) { - vty_out(vty, "Cannot crate route (pc=%s, linkset=%s) to linkset %s", dpc, as->cfg.name, VTY_NEWLINE); + vty_out(vty, "Cannot create route (pc=%s, linkset=%s) to AS %s", dpc, as->cfg.name, VTY_NEWLINE); return CMD_WARNING; } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I901aa68f64de3bee1766c356a1403b6ca57d5237 Gerrit-Change-Number: 32328 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmo-sccp[master]: ASPAC/ASPIA: Don't add routing context IE in ASP-role if routing cont...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32329 ) Change subject: ASPAC/ASPIA: Don't add routing context IE in ASP-role if routing context 0 ...................................................................... ASPAC/ASPIA: Don't add routing context IE in ASP-role if routing context 0 If there is only one routing key (and hence routing context, and hence AS) within one ASP, *and* the routing context is configured as 0 (zero), we should not include the routing context IE. This is the way how libosmo-sigtran has always been special-casing routing context 0 meaning "routing context is not used". However, that was only working in SG role (typical STP use case). When operating in ASP role, the special-case handling was missing, causing a routing context IE containing zero to be included in the related transmitted M3UA ASPAC and ASPIA messages. Change-Id: I5ce89b393a3b950ab7fd1eace9038718c9efcc51 Closes: OS#6003 --- M src/xua_asp_fsm.c 1 file changed, 28 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index a93dbd2..0080497 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -181,8 +181,15 @@ } } /* add xUA IE with routing contests to the message (if any) */ - if (i) + if (i) { + /* bail out (and not add the IE) if there's only one routing context (and hence + * only one AS) within this ASP, and that routing context is zero, meaning no routing + * context IE shall be used */ + if (i == 1 && rctx[0] == 0) + return 0; + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, i*sizeof(uint32_t), (uint8_t *)rctx); + } /* return count of routing contexts added */ return i; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I5ce89b393a3b950ab7fd1eace9038718c9efcc51 Gerrit-Change-Number: 32329 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmo-sccp[master]: cosmetic: Fix log message in routing table add error case

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/32328 ) Change subject: cosmetic: Fix log message in routing table add error case ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I901aa68f64de3bee1766c356a1403b6ca57d5237 Gerrit-Change-Number: 32328 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Apr 2023 04:52:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Discard any ASP-UP retransmissions

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32326 ) Change subject: stp: Discard any ASP-UP retransmissions ...................................................................... stp: Discard any ASP-UP retransmissions In some cases, there's some time between accepting the SCTP connection and the execution of f_M3UA_CLNT_asp_up(). This may cause the client sending re-transmitted ASP-UP messages. Let's simply flush and ignore those, rather than failing the test case. Change-Id: Iea39e9543535977a3004b150e222ce8c7f4d821a --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 33 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved neels: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 08fc9c9..41b2e2c 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -148,6 +148,22 @@ } } +/* flush any number of queued messages matching 'msg' */ +friend function f_M3UA_flush(integer idx, template (present) PDU_M3UA msg) runs on RAW_M3UA_CT { + var M3UA_RecvFrom rx; + timer T := 0.01; + T.start; + alt { + /* this should normally be possible with something like M3UA[idx].check(receive(...)) but somehow + * TITAN complains about the 'check' token, so it looks that feature of TTCN3 is not supported? */ + [] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) { + repeat; + } + [] T.timeout { + } + } +} + private template (value) Socket ts_Socket(HostName hostName, PortNumber portNumber) := { hostName := hostName, portNumber := portNumber @@ -672,6 +688,9 @@ /* expect/perform an inbound ASP-UP procedure */ friend function f_M3UA_CLNT_asp_up(integer idx, template OCT4 aspid := omit) runs on RAW_M3UA_CT { f_M3UA_exp(idx, tr_M3UA_ASPUP(aspid)); + /* there might have been multiple re-transmissions that have queued up in the ATS between + * the SCTP connection establishment and this function execution, so let's flush those copies. */ + f_M3UA_flush(idx, tr_M3UA_ASPUP(aspid)); f_M3UA_send(idx, ts_M3UA_ASPUP_ACK); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32326 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: Iea39e9543535977a3004b150e222ce8c7f4d821a Gerrit-Change-Number: 32326 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023