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

[L] Change in osmo-msc[master]: ASCI: Add VTY to configure GCR (Group Call Register)
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33512 ) Change subject: ASCI: Add VTY to configure GCR (Group Call Register) ...................................................................... Patch Set 14: (1 comment) File src/libmsc/asci_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/33512/comment/32be0096_c79cfb71 PS10, Line 229: "unmute-talker", "Unmute talker's downlink") > same here Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5bd034a62fc8b483f550d29103c2f7587198f590 Gerrit-Change-Number: 33512 Gerrit-PatchSet: 14 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sun, 09 Jul 2023 07:51:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[L] Change in osmo-msc[master]: ASCI: Add VTY to configure GCR (Group Call Register)
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33512 ) Change subject: ASCI: Add VTY to configure GCR (Group Call Register) ...................................................................... Patch Set 14: Code-Review+1 (2 comments) File src/libmsc/asci_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/33512/comment/8cd30416_22335d43 PS10, Line 219: "mute-talker", "Mute talker's downlink") > It should not be only for me testing the code, but also the users to test their handsets. […] Done https://gerrit.osmocom.org/c/osmo-msc/+/33512/comment/50e3a041_fdbd9cb0 PS10, Line 340: if (gcr->mute_talker) : vty_out(vty, " mute-talker%s", VTY_NEWLINE); : else : vty_out(vty, " unmute-talker%s", VTY_NEWLINE); > here it looks like the mute/unmute really is a configurable property. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5bd034a62fc8b483f550d29103c2f7587198f590 Gerrit-Change-Number: 33512 Gerrit-PatchSet: 14 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sun, 09 Jul 2023 07:51:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: ASCI: Add function to receive VGCS/VBS messages from BSS
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33504 ) Change subject: ASCI: Add function to receive VGCS/VBS messages from BSS ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4a2f19ba75140a6f2de02b709597239c01f02a2 Gerrit-Change-Number: 33504 Gerrit-PatchSet: 12 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sun, 09 Jul 2023 07:50:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-msc[master]: ASCI: Add decoder for VGCS/VBS messages to msc_a.c
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33506 ) Change subject: ASCI: Add decoder for VGCS/VBS messages to msc_a.c ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ief6259ba3914eeaceb063b562a0bcbc48349ce60 Gerrit-Change-Number: 33506 Gerrit-PatchSet: 12 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sun, 09 Jul 2023 07:49:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XL] Change in osmo-msc[master]: ASCI: Add call control for VGCS/VBS
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33511 ) Change subject: ASCI: Add call control for VGCS/VBS ...................................................................... Patch Set 12: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9947403fde8212b66758104443c60aaacc8b1e7b Gerrit-Change-Number: 33511 Gerrit-PatchSet: 12 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 07:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XL] Change in osmo-msc[master]: ASCI: Add call control for VGCS/VBS
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33511 ) Change subject: ASCI: Add call control for VGCS/VBS ...................................................................... Patch Set 12: (5 comments) File src/libmsc/msc_vgcs.c: https://gerrit.osmocom.org/c/osmo-msc/+/33511/comment/086378ee_878bd8bb PS12, Line 224: static uint8_t _rx_callref(uint8_t *ie, unsigned int remaining_len, uint32_t *callref, bool *with_prio, uint8_t *prio) so the function returns uint8_t, but you are using "return _msg_too_short()", which might retunr -EINVAL. That won't work. You need to make _rx_callref return an int type ,and make sure at all callers to check for negative return values https://gerrit.osmocom.org/c/osmo-msc/+/33511/comment/81c2337f_968fd380 PS12, Line 364: _rx_callref return value could be negative https://gerrit.osmocom.org/c/osmo-msc/+/33511/comment/869b8cbc_c61f8e81 PS12, Line 398: ie = (da << 3) | (ua << 2) | (comm << 1) | oi; : msgb_put_u8(msg, ie); depending on your taste, this could of course be wrapped in one line like msgb_put_u8(msg, (da << 3) | (ua << 2) | (comm << 1) | oi); My earlier comment "use a stack variable" was assuming there might be multiple steps to put together the uint8_t value, which might be more convoluted than or-ing a few values. I still like the current code as it is explicit, but just clarifying my earlier comment. https://gerrit.osmocom.org/c/osmo-msc/+/33511/comment/02f7a0b4_b408e1b2 PS12, Line 423: _rx_callref negative return value https://gerrit.osmocom.org/c/osmo-msc/+/33511/comment/425184ce_263b10f6 PS12, Line 536: ie_len = _rx_callref(ie, remaining_len, callref, with_prio, prio); negative return value -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9947403fde8212b66758104443c60aaacc8b1e7b Gerrit-Change-Number: 33511 Gerrit-PatchSet: 12 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 07:49:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in osmo-msc[master]: ASCI: Add functions to transcode VGCS/VBS messages on A-interface
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33505 ) Change subject: ASCI: Add functions to transcode VGCS/VBS messages on A-interface ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6b1f088201e7ef4a58762937855a1d358973882c Gerrit-Change-Number: 33505 Gerrit-PatchSet: 10 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 07:43:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-msc[master]: ASCI: Add simple implementation of Group Call Register
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33510 ) Change subject: ASCI: Add simple implementation of Group Call Register ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia74a4a865f943c5fb388cd28f9406005c92e663e Gerrit-Change-Number: 33510 Gerrit-PatchSet: 10 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sun, 09 Jul 2023 07:42:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: ASCI: Allow usage of rtp_stream with other FSM
by laforge 09 Jul '23

09 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33500 ) Change subject: ASCI: Allow usage of rtp_stream with other FSM ...................................................................... ASCI: Allow usage of rtp_stream with other FSM Allow the caller of rtp_stream_alloc() to define what events will be dispatched to the parent FSM. This allows other state machines to use rtp_stream. It is required for using RTP stream process with VGCS FSM. Drop the unused parent_call_leg member. Change-Id: I0991927b6d00da08dfd455980645e68281a73a9e Related: OS#4854 --- M include/osmocom/msc/rtp_stream.h M src/libmsc/call_leg.c M src/libmsc/rtp_stream.c 3 files changed, 31 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/rtp_stream.h b/include/osmocom/msc/rtp_stream.h index c42657a..5bc0144 100644 --- a/include/osmocom/msc/rtp_stream.h +++ b/include/osmocom/msc/rtp_stream.h @@ -26,7 +26,8 @@ /* A single bidirectional RTP hop between remote and MGW's local RTP port. */ struct rtp_stream { struct osmo_fsm_inst *fi; - struct call_leg *parent_call_leg; + uint32_t event_avail; + uint32_t event_estab; enum rtp_direction dir; uint32_t call_id; @@ -60,8 +61,9 @@ #define RTP_STREAM_FMT "local=" RTP_IP_PORT_FMT ",remote=" RTP_IP_PORT_FMT #define RTP_STREAM_ARGS(RS) RTP_IP_PORT_ARGS(&(RS)->local), RTP_IP_PORT_ARGS(&(RS)->remote), -struct rtp_stream *rtp_stream_alloc(struct call_leg *parent_call_leg, enum rtp_direction dir, - uint32_t call_id, struct gsm_trans *for_trans); +struct rtp_stream *rtp_stream_alloc(struct osmo_fsm_inst *parent_fi, uint32_t event_gone, uint32_t event_avail, + uint32_t event_estab, enum rtp_direction dir, uint32_t call_id, + struct gsm_trans *for_trans); int rtp_stream_ensure_ci(struct rtp_stream *rtps, struct osmo_mgcpc_ep *at_endpoint); int rtp_stream_do_mdcx(struct rtp_stream *rtps); diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c index b078c77..d0dc642 100644 --- a/src/libmsc/call_leg.c +++ b/src/libmsc/call_leg.c @@ -303,7 +303,8 @@ return -EIO; } - cl->rtp[dir] = rtp_stream_alloc(cl, dir, call_id, for_trans); + cl->rtp[dir] = rtp_stream_alloc(cl->fi, CALL_LEG_EV_RTP_STREAM_GONE, CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE, + CALL_LEG_EV_RTP_STREAM_ESTABLISHED, dir, call_id, for_trans); OSMO_ASSERT(cl->rtp[dir]); return 0; } diff --git a/src/libmsc/rtp_stream.c b/src/libmsc/rtp_stream.c index dcb4ef0..1f885c5 100644 --- a/src/libmsc/rtp_stream.c +++ b/src/libmsc/rtp_stream.c @@ -110,13 +110,14 @@ /* Allocate RTP stream under a call leg. This is one RTP connection from some remote entity with address and port to a * local RTP address and port. call_id is stored for sending in MGCP transactions and as logging context. for_trans is * optional, merely stored for reference by callers, and appears as log context if not NULL. */ -struct rtp_stream *rtp_stream_alloc(struct call_leg *parent_call_leg, enum rtp_direction dir, - uint32_t call_id, struct gsm_trans *for_trans) +struct rtp_stream *rtp_stream_alloc(struct osmo_fsm_inst *parent_fi, uint32_t event_gone, uint32_t event_avail, + uint32_t event_estab, enum rtp_direction dir, uint32_t call_id, + struct gsm_trans *for_trans) { struct osmo_fsm_inst *fi; struct rtp_stream *rtps; - fi = osmo_fsm_inst_alloc_child(&rtp_stream_fsm, parent_call_leg->fi, CALL_LEG_EV_RTP_STREAM_GONE); + fi = osmo_fsm_inst_alloc_child(&rtp_stream_fsm, parent_fi, event_gone); OSMO_ASSERT(fi); rtps = talloc(fi, struct rtp_stream); @@ -124,7 +125,8 @@ fi->priv = rtps; *rtps = (struct rtp_stream){ .fi = fi, - .parent_call_leg = parent_call_leg, + .event_avail = event_avail, + .event_estab = event_estab, .call_id = call_id, .for_trans = for_trans, .dir = dir, @@ -172,7 +174,7 @@ if (crcx_info->x_osmo_osmux_use) rtps->local_osmux_cid = crcx_info->x_osmo_osmux_cid; rtp_stream_update_id(rtps); - osmo_fsm_inst_dispatch(fi->proc.parent, CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE, rtps); + osmo_fsm_inst_dispatch(fi->proc.parent, rtps->event_avail, rtps); check_established(rtps); if ((!rtps->remote_sent_to_mgw || !rtps->codecs_sent_to_mgw || !rtps->mode_sent_to_mgw) @@ -212,7 +214,7 @@ void rtp_stream_fsm_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct rtp_stream *rtps = fi->priv; - osmo_fsm_inst_dispatch(fi->proc.parent, CALL_LEG_EV_RTP_STREAM_ESTABLISHED, rtps); + osmo_fsm_inst_dispatch(fi->proc.parent, rtps->event_estab, rtps); } static int rtp_stream_fsm_timer_cb(struct osmo_fsm_inst *fi) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0991927b6d00da08dfd455980645e68281a73a9e Gerrit-Change-Number: 33500 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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

1 0

[S] Change in osmo-msc[master]: ASCI: Add transaction type to trans_find_by_callref()
by laforge 09 Jul '23

09 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33502 ) Change subject: ASCI: Add transaction type to trans_find_by_callref() ...................................................................... ASCI: Add transaction type to trans_find_by_callref() A transaction can be identified by the callref and the type. Because transactions with different types may share the same callref value, it is required to include the type in the trans_find_by_callref() parameters. E.g. a voice group call may have the same callref as a voice broadcast call, but they are different calls. They also may not be confused with other transaction types having eventually equal callref value, like GSM 04.08 calls, SMS or supplementary services transactions. By adding the transaction type to trans_find_by_callref(), we essentially now use the (type, callref) tuple as unique ID for transactions, instead of just callref. Change-Id: Ic0b82033a1aa3c3508ad610c690a5f29073006c1 Related: OS#4854, OS#3294 --- M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_09_11.c M src/libmsc/transaction.c 4 files changed, 36 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 63070f7..bc6c316 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -156,7 +156,7 @@ struct gsm_trans *trans_find_by_type(const struct msc_a *msc_a, enum trans_type type); struct gsm_trans *trans_find_by_id(const struct msc_a *msc_a, enum trans_type type, uint8_t trans_id); -struct gsm_trans *trans_find_by_callref(const struct gsm_network *net, +struct gsm_trans *trans_find_by_callref(const struct gsm_network *net, enum trans_type type, uint32_t callref); struct gsm_trans *trans_find_by_sm_rp_mr(const struct gsm_network *net, const struct vlr_subscr *vsub, diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 0195b0b..4162944 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -414,8 +414,8 @@ /* bridge channels of two transactions */ static int tch_bridge(struct gsm_network *net, const struct gsm_mncc_bridge *bridge) { - struct gsm_trans *trans1 = trans_find_by_callref(net, bridge->callref[0]); - struct gsm_trans *trans2 = trans_find_by_callref(net, bridge->callref[1]); + struct gsm_trans *trans1 = trans_find_by_callref(net, TRANS_CC, bridge->callref[0]); + struct gsm_trans *trans2 = trans_find_by_callref(net, TRANS_CC, bridge->callref[1]); struct call_leg *cl1; struct call_leg *cl2; @@ -537,8 +537,8 @@ static inline void disconnect_bridge(struct gsm_network *net, const struct gsm_mncc_bridge *bridge, int err) { - struct gsm_trans *trans0 = trans_find_by_callref(net, bridge->callref[0]); - struct gsm_trans *trans1 = trans_find_by_callref(net, bridge->callref[1]); + struct gsm_trans *trans0 = trans_find_by_callref(net, TRANS_CC, bridge->callref[0]); + struct gsm_trans *trans1 = trans_find_by_callref(net, TRANS_CC, bridge->callref[1]); struct gsm_mncc mx_rel; if (!trans0 || !trans1) return; @@ -1995,7 +1995,7 @@ struct gsm_trans *trans; /* Find callref */ - trans = trans_find_by_callref(net, rtp->callref); + trans = trans_find_by_callref(net, TRANS_CC, rtp->callref); if (!trans) { LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, "RTP create for non-existing trans\n"); mncc_recv_rtp_err(net, trans, rtp->callref, MNCC_RTP_CREATE); @@ -2120,7 +2120,7 @@ struct rtp_stream *rtps; /* Find callref */ - trans = trans_find_by_callref(net, rtp->callref); + trans = trans_find_by_callref(net, TRANS_CC, rtp->callref); if (!trans) { LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, "RTP connect for non-existing trans\n"); mncc_recv_rtp_err(net, trans, rtp->callref, MNCC_RTP_CONNECT); @@ -2257,7 +2257,7 @@ data = &msg->signal; /* Find callref */ - trans = trans_find_by_callref(net, data->callref); + trans = trans_find_by_callref(net, TRANS_CC, data->callref); /* Callref unknown */ if (!trans) { diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index d94be48..e293890 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -441,7 +441,7 @@ log_set_context(LOG_CTX_VLR_SUBSCR, vsub); /* Attempt to find DTAP-transaction */ - trans = trans_find_by_callref(net, gsup_msg->session_id); + trans = trans_find_by_callref(net, TRANS_USSD, gsup_msg->session_id); /* Handle errors */ if (OSMO_GSUP_IS_MSGT_ERROR(gsup_msg->message_type)) { diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 190da29..21f0b8b 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -73,16 +73,17 @@ /*! Find a transaction by call reference * \param[in] net Network in which we should search + * \param[in] type Transaction type (e.g. TRANS_CC) * \param[in] callref Call Reference of transaction * \returns Matching transaction, if any */ -struct gsm_trans *trans_find_by_callref(const struct gsm_network *net, +struct gsm_trans *trans_find_by_callref(const struct gsm_network *net, enum trans_type type, uint32_t callref) { struct gsm_trans *trans; llist_for_each_entry(trans, &net->trans_list, entry) { - if (trans->callref == callref) + if (trans->callref == callref && trans->type == type) return trans; } return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic0b82033a1aa3c3508ad610c690a5f29073006c1 Gerrit-Change-Number: 33502 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0