March 2025 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-pcu[master]: tests/alloc: alloc_tbfs(): fix always true condition
by fixeria 05 Mar '25

05 Mar '25

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39698?usp=email ) Change subject: tests/alloc: alloc_tbfs(): fix always true condition ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Looks like something needs fixing in this patch. Would you like to take a look? I saw a warning while compiling with clang, saying that the assert condition is always true because `uint8_t` cannot be `-1`: ``` // note that trx_no here is implicitly casted to an int here OSMO_ASSERT(trx_no != -1 || bts_all_pdch_allocated(bts)); ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia345938512a2f4f92523596beb19d7c127a8a601 Gerrit-Change-Number: 39698 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Mar 2025 18:36:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcu[master]: tests: fix warnings about struct initialization
by fixeria 05 Mar '25

05 Mar '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39697?usp=email ) Change subject: tests: fix warnings about struct initialization ...................................................................... tests: fix warnings about struct initialization Assigning { 0 } to a structure is valid in C, but not in C++. Change-Id: Iaf271cd52522ea8411567bf3194b903fe2746d5c --- M tests/llc/LlcTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 3 files changed, 18 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index f5bc54a..9ed6f21 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -109,7 +109,7 @@ static void test_llc_queue() { gprs_llc_queue *queue = prepare_queue(); - struct timespec expire_time = {0}; + struct timespec expire_time = { }; printf("=== start %s ===\n", __func__); @@ -147,8 +147,8 @@ static void test_llc_meta() { gprs_llc_queue *queue = prepare_queue(); - MetaInfo info1 = {0}; - MetaInfo info2 = {0}; + MetaInfo info1 = { }; + MetaInfo info2 = { }; printf("=== start %s ===\n", __func__); @@ -188,8 +188,8 @@ static void test_llc_meta_pdu_life_expire() { gprs_llc_queue *queue = prepare_queue(); - MetaInfo info1 = {0}; - MetaInfo info2 = {0}; + MetaInfo info1 = { }; + MetaInfo info2 = { }; printf("=== start %s ===\n", __func__); @@ -242,7 +242,7 @@ gprs_codel_set_maxpacket(&queue->pq[i].codel_state, 8); } - MetaInfo info1 = {0}; + MetaInfo info1 = { }; printf("=== start %s ===\n", __func__); @@ -298,7 +298,7 @@ gprs_llc_queue *queue1 = prepare_queue(); struct GprsMs *ms = ms_alloc(queue1->ms->bts, NULL); gprs_llc_queue *queue2 = ms_llc_queue(ms); - struct timespec expire_time = {0}; + struct timespec expire_time = { }; printf("=== start %s ===\n", __func__); @@ -344,7 +344,7 @@ int main(int argc, char **argv) { - struct vty_app_info pcu_vty_info = {0}; + struct vty_app_info pcu_vty_info = { }; tall_pcu_ctx = talloc_named_const(NULL, 1, "LlcTest context"); if (!tall_pcu_ctx) diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 643551b..798afad 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -723,7 +723,7 @@ static void send_control_ack(gprs_rlcmac_tbf *tbf) { - RlcMacUplink_t ulreq = {0}; + RlcMacUplink_t ulreq = { }; ulreq.u.MESSAGE_TYPE = MT_PACKET_CONTROL_ACK; Packet_Control_Acknowledgement_t *ctrl_ack = @@ -749,7 +749,7 @@ uint32_t sba_fn = *fn + 52; int tfi = 0; gprs_rlcmac_ul_tbf *ul_tbf; - RlcMacUplink_t ulreq = {0}; + RlcMacUplink_t ulreq = { }; struct gprs_rlc_ul_header_egprs_3 *egprs3 = NULL; /* needed to set last_rts_fn in the PDCH object */ @@ -892,7 +892,7 @@ uint32_t sba_fn = *fn + 52; int tfi = 0, i = 0; gprs_rlcmac_ul_tbf *ul_tbf; - RlcMacUplink_t ulreq = {0}; + RlcMacUplink_t ulreq = { }; struct gprs_rlc_ul_header_egprs_3 *egprs3 = NULL; /* needed to set last_rts_fn in the PDCH object */ @@ -1323,7 +1323,7 @@ uint32_t sba_fn = *fn + 52; int tfi = 0; gprs_rlcmac_ul_tbf *ul_tbf; - RlcMacUplink_t ulreq = {0}; + RlcMacUplink_t ulreq = { }; /* needed to set last_rts_fn in the PDCH object */ request_dl_rlc_block(bts, pdch, fn); @@ -1626,7 +1626,7 @@ uint32_t sba_fn = *fn + 52; int tfi = 0; gprs_rlcmac_ul_tbf *ul_tbf; - RlcMacUplink_t ulreq = {0}; + RlcMacUplink_t ulreq = { }; /* needed to set last_rts_fn in the PDCH object */ request_dl_rlc_block(bts, pdch, fn); @@ -2184,7 +2184,7 @@ gprs_rlcmac_dl_tbf *dl_tbf1, *dl_tbf2; GprsMs *ms1, *ms2; unsigned i; - RlcMacUplink_t ulreq = {0}; + RlcMacUplink_t ulreq = { }; fprintf(stderr, "=== start %s ===\n", __func__); @@ -2574,7 +2574,7 @@ uint32_t sba_fn = *fn + 52; int tfi = 0; gprs_rlcmac_ul_tbf *ul_tbf; - RlcMacUplink_t ulreq = {0}; + RlcMacUplink_t ulreq = { }; struct gprs_rlc_ul_header_egprs_3 *egprs3 = NULL; Packet_Resource_Request_t *presreq = NULL; MS_Radio_Access_capability_t *pmsradiocap = NULL; @@ -3406,7 +3406,7 @@ uint16_t qta = 31; int ts_no = 7; uint8_t trx_no = 0; - RlcMacUplink_t ulreq = {0}; + RlcMacUplink_t ulreq = { }; Packet_Resource_Request_t *presreq = NULL; uint8_t ms_class = 11; uint8_t egprs_ms_class = 11; @@ -3500,7 +3500,7 @@ int main(int argc, char **argv) { - struct vty_app_info pcu_vty_info = {0}; + struct vty_app_info pcu_vty_info = { }; tall_pcu_ctx = talloc_named_const(NULL, 1, "moiji-mobile TbfTest context"); if (!tall_pcu_ctx) diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index fdfbe40..e4a8eff 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -99,7 +99,7 @@ static void test_rlc() { { - struct gprs_rlc_data rlc = { 0, }; + struct gprs_rlc_data rlc = { }; memset(rlc.block, 0x23, RLC_MAX_LEN); uint8_t *p = prepare(&rlc, 20); OSMO_ASSERT(p == rlc.block); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaf271cd52522ea8411567bf3194b903fe2746d5c Gerrit-Change-Number: 39697 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcu[master]: rlc_window_dl: remove unused variable
by fixeria 05 Mar '25

05 Mar '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39695?usp=email ) Change subject: rlc_window_dl: remove unused variable ...................................................................... rlc_window_dl: remove unused variable Change-Id: Id2a89baafa743af4fc44994287cfceca7bb66329 --- M src/rlc_window_dl.cpp 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/rlc_window_dl.cpp b/src/rlc_window_dl.cpp index 41f9887..304bc6b 100644 --- a/src/rlc_window_dl.cpp +++ b/src/rlc_window_dl.cpp @@ -139,11 +139,10 @@ int gprs_rlc_dl_window::move_window() { - int i; uint16_t bsn; int moved = 0; - for (i = 0, bsn = v_a(); bsn != v_s(); i++, bsn = mod_sns(bsn + 1)) { + for (bsn = v_a(); bsn != v_s(); bsn = mod_sns(bsn + 1)) { if (m_v_b.is_acked(bsn)) { m_v_b.mark_invalid(bsn); moved += 1; @@ -179,4 +178,4 @@ } } show_v_b[i] = '\0'; -} \ No newline at end of file +} -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39695?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id2a89baafa743af4fc44994287cfceca7bb66329 Gerrit-Change-Number: 39695 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcu[master]: egprs_rlc_compression: comment out unused arrays
by fixeria 05 Mar '25

05 Mar '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39694?usp=email ) Change subject: egprs_rlc_compression: comment out unused arrays ...................................................................... egprs_rlc_compression: comment out unused arrays Change-Id: Iecac051021892a6c6f91f6187fd087ac5f1f5bbb --- M src/egprs_rlc_compression.cpp 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/egprs_rlc_compression.cpp b/src/egprs_rlc_compression.cpp index fae529c..b1c930b 100644 --- a/src/egprs_rlc_compression.cpp +++ b/src/egprs_rlc_compression.cpp @@ -228,11 +228,13 @@ {8, 6, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8} }; +#if 0 static const unsigned t4_min_term_length[] = {2, 4}; static const unsigned t4_min_make_up_length[] = {10, 5}; static const unsigned t4_max_term_length[] = {12, 8}; static const unsigned t4_max_make_up_length[] = {13, 9}; +#endif static const unsigned t4_make_up_length[2][15] = { {10, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13}, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39694?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iecac051021892a6c6f91f6187fd087ac5f1f5bbb Gerrit-Change-Number: 39694 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcu[master]: encoding: comment out unused functions
by fixeria 05 Mar '25

05 Mar '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39696?usp=email ) Change subject: encoding: comment out unused functions ...................................................................... encoding: comment out unused functions Change-Id: I5e74e1d5294aa728f455fdf092e6fcbec2c1bd92 --- M src/encoding.cpp 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index 5695666..75b9a30 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -127,6 +127,7 @@ return 0; } +#if 0 static inline bool write_tai(bitvec *dest, unsigned& wp, int8_t tai) { if (tai < 0) { /* No TIMING_ADVANCE_INDEX: */ @@ -149,6 +150,7 @@ bitvec_write_field(dest, &wp, ta, 6); } } +#endif /* 3GPP TS 44.060 Table 12.5.2.1 */ static inline uint16_t enc_ws(uint16_t ws) @@ -156,6 +158,7 @@ return (ws - 64) / 32; } +#if 0 static inline void write_ws(bitvec *dest, unsigned int *write_index, uint16_t ws) { dest->cur_bit = *write_index; @@ -178,6 +181,7 @@ if (write_tai(dest, wp, tai)) /* TIMING_ADVANCE_TIMESLOT_NUMBER: */ bitvec_write_field(dest, &wp, ts, 3); } +#endif static int write_ia_rest_downlink(const gprs_rlcmac_dl_tbf *tbf, bitvec * dest, bool polling, bool ta_valid, uint16_t rfn, uint8_t alpha, uint8_t gamma, int8_t ta_idx) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39696?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5e74e1d5294aa728f455fdf092e6fcbec2c1bd92 Gerrit-Change-Number: 39696 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-sgsn[master]: Use osmo_select_main_ctx because vlr needs it
by pespin 05 Mar '25

05 Mar '25

Attention is currently required from: daniel, lynxis lazus. pespin has posted comments on this change by daniel. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39703?usp=email ) Change subject: Use osmo_select_main_ctx because vlr needs it ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4b26b73af706ce790181085880c6866e7f7e8c65 Gerrit-Change-Number: 39703 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 05 Mar 2025 18:19:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-sgsn[master]: sgsn_libgtp: Update struct pdp_t with RAT type when receiving an SGSN...
by pespin 05 Mar '25

05 Mar '25

Attention is currently required from: daniel, lynxis lazus. pespin has posted comments on this change by daniel. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39704?usp=email ) Change subject: sgsn_libgtp: Update struct pdp_t with RAT type when receiving an SGSN ctx ...................................................................... Patch Set 1: (1 comment) File src/sgsn/sgsn_libgtp.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/39704/comment/1fe73a88_2ef26a8e?us… : PS1, Line 231: lib_pdp->rattype.v[0] = 2; a comment regarding what 1 and 2 mean here would be welcome, or even using some enum or define... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39704?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I998ba8cbd586bc19894e157bfa281963bf27de6e Gerrit-Change-Number: 39704 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 05 Mar 2025 18:19:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in osmo-sgsn[master]: Use osmo_select_main_ctx because vlr needs it
by daniel 05 Mar '25

05 Mar '25

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39703?usp=email ) Change subject: Use osmo_select_main_ctx because vlr needs it ...................................................................... Use osmo_select_main_ctx because vlr needs it Change-Id: I4b26b73af706ce790181085880c6866e7f7e8c65 --- M src/sgsn/sgsn_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/03/39703/1 diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index ca4e925..1175202 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -511,7 +511,7 @@ } while (1) { - rc = osmo_select_main(0); + rc = osmo_select_main_ctx(0); if (rc < 0) exit(3); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4b26b73af706ce790181085880c6866e7f7e8c65 Gerrit-Change-Number: 39703 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-sgsn[master]: sgsn_libgtp: Update struct pdp_t with RAT type when receiving an SGSN...
by daniel 05 Mar '25

05 Mar '25

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39704?usp=email ) Change subject: sgsn_libgtp: Update struct pdp_t with RAT type when receiving an SGSN ctx ...................................................................... sgsn_libgtp: Update struct pdp_t with RAT type when receiving an SGSN ctx Change-Id: I998ba8cbd586bc19894e157bfa281963bf27de6e --- M src/sgsn/sgsn_libgtp.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/04/39704/1 diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 182e898..fb52cac 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -222,7 +222,14 @@ memcpy(lib_pdp->gsnlu.v, &sgsn->cfg.gtp_listenaddr.sin_addr, sizeof(sgsn->cfg.gtp_listenaddr.sin_addr)); - + /* Encode RAT Type according to TS 29.060 7.7.50 + Update pdp_t with ran type of mm ctx */ + lib_pdp->rattype.l = 1; + if (pctx->mm->ran_type == MM_CTX_T_UTRAN_Iu) + lib_pdp->rattype.v[0] = 1; + else + lib_pdp->rattype.v[0] = 2; + lib_pdp->rattype_given = 1; pctx->state = PDP_STATE_NEED_UPDATE_GSN; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39704?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I998ba8cbd586bc19894e157bfa281963bf27de6e Gerrit-Change-Number: 39704 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: xua_asp_fsm: Avoid sending NOTIFY in ASP role
by pespin 05 Mar '25

05 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39702?usp=email ) Change subject: xua_asp_fsm: Avoid sending NOTIFY in ASP role ...................................................................... xua_asp_fsm: Avoid sending NOTIFY in ASP role Fixes: f2e324e2f82efc93fd2a1124fa216d680659ed40 Change-Id: I48848a69cabbd1c7279344dc8b2b7e2927894d26 --- M src/xua_asp_fsm.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified daniel: 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 9ad9dce..ec149d1 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -481,14 +481,17 @@ static void xua_asp_fsm_inactive_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; /* 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 * state." + * NOTIFY is only transmitted by roles SG and IPSP. */ struct xua_as_event_asp_inactive_ind_pars pars = { - .asp = xafp->asp, - .asp_requires_notify = (prev_state == XUA_ASP_S_DOWN), + .asp = asp, + .asp_requires_notify = (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) && + (prev_state == XUA_ASP_S_DOWN), }; dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I48848a69cabbd1c7279344dc8b2b7e2927894d26 Gerrit-Change-Number: 39702 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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>

1 0