laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/44001?usp=email ) Change subject: mgw: add "X-Side: CN" / "X-Side: RAN" to emitted CRCX ...................................................................... mgw: add "X-Side: CN" / "X-Side: RAN" to emitted CRCX For every call leg handled by OsmoMSC, 2 CRCX commands get sent to the MSC-associated MGW: one for CN side and one for RAN side. Using newly added support in libosmo-mgcp-client, add non-standard X-Side extension parameter to mark which side is which - if enabled via 'mgw indicate-side' setting in vty. This indication of RAN vs CN side in CRCX becomes mandatory when OsmoMSC is used with Themyscira Wireless transcoder MGW instead of OsmoMGW (next patch in the series), but even when regular OsmoMGW is used, the non-standard X-Side extension parameter is harmless (ignored by OsmoMGW) while aiding debugging via packet capture, making it clearly visible in pcap which CRCX and which resulting ConnectionId corresponds to which side of the MSC. Depends: I713147d6567fb30de09b2272478d717093d6170e (osmo-mgw.git) Change-Id: Ie26ece9035ee579f2af84a13d71a553f98817592 --- M TODO-RELEASE M include/osmocom/msc/gsm_data.h M include/osmocom/msc/rtp_stream.h M src/libmsc/call_leg.c M src/libmsc/msc_vty.c M src/libmsc/rtp_stream.c M tests/test_nodes.vty 7 files changed, 54 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/TODO-RELEASE b/TODO-RELEASE index 5e970b9..0a167bd 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmo-sigtran >2.3.0 OSMO_SCCP_REL_REASON_NSU_* libosmo-sigtran >2.3.0 OSMO_SCCP_RETURN_REASON_*, osmo_sccp_return_reason_name() +libosmo-mgcp-client >1.16.0 x_side[] in struct mgcp_conn_peer diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 80a7854..f1537ff 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -283,6 +283,10 @@ */ uint8_t tw_rtp_formats; + /* Should we send X-Side extension parameter line to our attached MGW, + * telling it which CRCX is for CN vs RAN? */ + bool mgw_indicate_side; + /* Whether to use call waiting on the network */ bool call_waiting; diff --git a/include/osmocom/msc/rtp_stream.h b/include/osmocom/msc/rtp_stream.h index 5bc0144..6d46e65 100644 --- a/include/osmocom/msc/rtp_stream.h +++ b/include/osmocom/msc/rtp_stream.h @@ -61,6 +61,8 @@ #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), +void rtp_stream_init(struct gsm_network *net); + 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); diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c index 59f2f63..7402c5a 100644 --- a/src/libmsc/call_leg.c +++ b/src/libmsc/call_leg.c @@ -58,6 +58,7 @@ { gsmnet = net; OSMO_ASSERT( osmo_fsm_register(&call_leg_fsm) == 0 ); + rtp_stream_init(net); } /* Allocate a call leg FSM instance as child of an arbitrary other FSM instance. diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index a5de12f..895bd7e 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -724,6 +724,26 @@ return CMD_SUCCESS; } +#define MGW_STR MGCP_CLIENT_MGW_STR + +DEFUN(cfg_msc_mgw_side, + cfg_msc_mgw_side_cmd, + "mgw indicate-side", + MGW_STR "Send X-Side extension parameter with CRCX commands\n") +{ + gsmnet->mgw_indicate_side = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_msc_no_mgw_side, + cfg_msc_no_mgw_side_cmd, + "no mgw indicate-side", + NO_STR MGW_STR "Send X-Side extension parameter with CRCX commands\n") +{ + gsmnet->mgw_indicate_side = false; + return CMD_SUCCESS; +} + #define NRI_STR "Mapping of Network Resource Indicators to this MSC, for MSC pooling\n" DEFUN(cfg_msc_nri_bitlen, cfg_msc_nri_bitlen_cmd, "nri bitlen <0-15>", @@ -863,6 +883,9 @@ vty_out(vty, "%s", VTY_NEWLINE); } + if (gsmnet->mgw_indicate_side) + vty_out(vty, " mgw indicate-side%s", VTY_NEWLINE); + mgcp_client_config_write(vty, " "); neighbor_ident_vty_write(vty); @@ -2163,6 +2186,8 @@ install_element(MSC_NODE, &cfg_msc_osmux_cmd); install_element(MSC_NODE, &cfg_msc_twformat_cmd); install_element(MSC_NODE, &cfg_msc_no_twformat_cmd); + install_element(MSC_NODE, &cfg_msc_mgw_side_cmd); + install_element(MSC_NODE, &cfg_msc_no_mgw_side_cmd); install_element(MSC_NODE, &cfg_msc_handover_number_range_cmd); install_element(MSC_NODE, &cfg_msc_nri_bitlen_cmd); install_element(MSC_NODE, &cfg_msc_nri_add_cmd); diff --git a/src/libmsc/rtp_stream.c b/src/libmsc/rtp_stream.c index 14014c0..06a9b2f 100644 --- a/src/libmsc/rtp_stream.c +++ b/src/libmsc/rtp_stream.c @@ -33,6 +33,8 @@ #define LOG_RTPS(rtps, level, fmt, args...) \ LOGPFSML(rtps->fi, level, fmt, ##args) +static struct gsm_network *gsmnet = NULL; + enum rtp_stream_event { RTP_STREAM_EV_CRCX_OK, RTP_STREAM_EV_CRCX_FAIL, @@ -56,8 +58,9 @@ #define rtp_stream_state_chg(rtps, state) \ osmo_tdef_fsm_inst_state_chg((rtps)->fi, state, rtp_stream_fsm_timeouts, g_mgw_tdefs, 5) -static __attribute__((constructor)) void rtp_stream_init() +void rtp_stream_init(struct gsm_network *net) { + gsmnet = net; OSMO_ASSERT(osmo_fsm_register(&rtp_stream_fsm) == 0); } @@ -315,6 +318,21 @@ .x_osmo_osmux_cid = rtps->remote_osmux_cid, }; + if (verb == MGCP_VERB_CRCX && gsmnet->mgw_indicate_side) { + const char *side_name; + switch (rtps->dir) { + case RTP_TO_CN: + side_name = "CN"; + break; + case RTP_TO_RAN: + side_name = "RAN"; + break; + default: + OSMO_ASSERT(0); + } + OSMO_STRLCPY_ARRAY(verb_info.x_side, side_name); + } + verb_info.conn_mode = rtps->crcx_conn_mode; if (rtps->codecs_known) { diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 7ce141a..109ec9d 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -69,6 +69,8 @@ osmux (on|off|only) tw-rtp-formats (fr|hr|amr|csd) [(fr|hr|amr|csd)] [(fr|hr|amr|csd)] [(fr|hr|amr|csd)] no tw-rtp-formats + mgw indicate-side + no mgw indicate-side handover-number range MSISDN_FIRST MSISDN_LAST nri bitlen <0-15> nri add <0-32767> [<0-32767>] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/44001?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie26ece9035ee579f2af84a13d71a553f98817592 Gerrit-Change-Number: 44001 Gerrit-PatchSet: 4 Gerrit-Owner: falconia <falcon@freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de>