[M] Change in osmo-msc[master]: add configurable DTMF support via RTP or SIP
lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/44024?usp=email ) Change subject: add configurable DTMF support via RTP or SIP ...................................................................... add configurable DTMF support via RTP or SIP Add VTY option 'dtmf (rtp|sip)' under the 'msc' node to select the DTMF transport method. Default is 'sip', which forwards DTMF via MNCC to the external handler (e.g., osmo-sip-connector for SIP INFO). When set to 'rtp', the CC layer sends MGCP RQNT to the MGW to inject RFC 4733 telephone-event packets into the CN-side RTP stream, and includes telephone-event in the SDP codec negotiation. Add telephone-event/8000 to codec_mapping for SDP/MGCP interworking. Update test expected output for the default SIP mode. Change-Id: Icd33a0b412f39a56046e57038551332776be2ba1 --- M include/osmocom/msc/gsm_data.h M src/libmsc/codec_mapping.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/transaction_cc.c 5 files changed, 87 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/24/44024/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 80a7854..0ede628 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -145,6 +145,11 @@ int dst; /* daylight savings */ }; +enum dtmf_mode { + DTMF_MODE_SIP = 0, /* forward via MNCC to SIP connector (default) */ + DTMF_MODE_RTP, /* RFC 4733 telephone-event via MGCP RQNT */ +}; + struct gsm_network { /* TODO MSCSPLIT the gsm_network struct is basically a kitchen sink for * global settings and variables, "madly" mixing BSC and MSC stuff. Split @@ -283,6 +288,9 @@ */ uint8_t tw_rtp_formats; + /* DTMF transport method */ + enum dtmf_mode dtmf_mode; + /* Whether to use call waiting on the network */ bool call_waiting; diff --git a/src/libmsc/codec_mapping.c b/src/libmsc/codec_mapping.c index f3a707b..7c25645 100644 --- a/src/libmsc/codec_mapping.c +++ b/src/libmsc/codec_mapping.c @@ -218,6 +218,15 @@ }, .mgcp = CODEC_CLEARMODE, }, + { + .sdp = { + .payload_type = 101, + .subtype_name = "telephone-event", + .rate = 8000, + .fmtp = "0-15", + }, + .mgcp = CODEC_TELEPHONE_EVT_8000, + }, }; #define foreach_codec_mapping(CODEC_MAPPING) \ diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 11bebb0..41e33d1 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1804,12 +1804,38 @@ return trans_tx_gsm48(trans, msg); } +/* Send MGCP RQNT to MGW to inject/stop DTMF telephone-event on CN-side RTP. + * signal: e.g. "D/5" to start, or NULL to stop. */ +static void dtmf_send_mgcp_rqnt(struct gsm_trans *trans, const char *signal) +{ + struct msc_a *msc_a = trans->msc_a; + struct call_leg *cl; + const char *conn_id, *ep_name; + struct mgcp_client *mgcp; + + if (!msc_a || !msc_a->cc.call_leg) + return; + + cl = msc_a->cc.call_leg; + if (!cl->rtp[RTP_TO_CN] || !cl->rtp[RTP_TO_CN]->ci) + return; + + conn_id = osmo_mgcpc_ep_ci_id(cl->rtp[RTP_TO_CN]->ci); + ep_name = osmo_mgcpc_ep_name(cl->mgw_endpoint); + mgcp = osmo_mgcpc_ep_client(cl->mgw_endpoint); + if (!conn_id || !ep_name || !mgcp) + return; + + mgcp_client_tx_rqnt(mgcp, ep_name, conn_id, signal); +} + static int gsm48_cc_rx_start_dtmf(struct gsm_trans *trans, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); unsigned int payload_len = msgb_l3len(msg) - sizeof(*gh); struct tlv_parsed tp; struct gsm_mncc dtmf; + char signal[8]; memset(&dtmf, 0, sizeof(struct gsm_mncc)); dtmf.callref = trans->callref; @@ -1821,6 +1847,19 @@ TLVP_VAL(&tp, GSM48_IE_KPD_FACILITY)-1); } + if (trans->net->dtmf_mode == DTMF_MODE_RTP) { + /* RTP mode: inject telephone-event via MGW */ + if (dtmf.fields & MNCC_F_KEYPAD) { + snprintf(signal, sizeof(signal), "D/%c", + (char)dtmf.keypad); + dtmf_send_mgcp_rqnt(trans, signal); + } + /* ACK to MS immediately */ + dtmf.msg_type = MNCC_START_DTMF_RSP; + return mncc_tx_to_cc(trans->net, &dtmf); + } + + /* SIP mode: forward to MNCC handler, let it ACK/REJ */ return mncc_recvmsg(trans->net, trans, MNCC_START_DTMF_IND, &dtmf); } @@ -1873,6 +1912,14 @@ memset(&dtmf, 0, sizeof(struct gsm_mncc)); dtmf.callref = trans->callref; + if (trans->net->dtmf_mode == DTMF_MODE_RTP) { + /* RTP mode: stop telephone-event via MGW */ + dtmf_send_mgcp_rqnt(trans, NULL); + dtmf.msg_type = MNCC_STOP_DTMF_RSP; + return mncc_tx_to_cc(trans->net, &dtmf); + } + + /* SIP mode: forward to MNCC handler */ return mncc_recvmsg(trans->net, trans, MNCC_STOP_DTMF_IND, &dtmf); } diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index a5de12f..c4f0f2c 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -687,6 +687,19 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_dtmf, cfg_msc_dtmf_cmd, + "dtmf (rtp|sip)", + "DTMF transport method\n" + "DTMF via RTP telephone-event (RFC 4733)\n" + "DTMF via MNCC/SIP signaling\n") +{ + if (strcmp(argv[0], "rtp") == 0) + gsmnet->dtmf_mode = DTMF_MODE_RTP; + else if (strcmp(argv[0], "sip") == 0) + gsmnet->dtmf_mode = DTMF_MODE_SIP; + return CMD_SUCCESS; +} + #define TWFORMAT_STR "Use ThemWi RTP formats\n" #define TWCODEC_MULT "(fr|hr|amr|csd)" #define TWCODEC_OPT " [" TWCODEC_MULT "]" @@ -845,6 +858,9 @@ gsmnet->handover_number.range_start, gsmnet->handover_number.range_end, VTY_NEWLINE); + if (gsmnet->dtmf_mode != DTMF_MODE_SIP) + vty_out(vty, " dtmf rtp%s", VTY_NEWLINE); + if (gsmnet->use_osmux != OSMUX_USAGE_OFF) { vty_out(vty, " osmux %s%s", gsmnet->use_osmux == OSMUX_USAGE_ON ? "on" : "only", VTY_NEWLINE); @@ -2160,6 +2176,7 @@ install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd); install_element(MSC_NODE, &cfg_msc_sms_over_gsup_cmd); install_element(MSC_NODE, &cfg_msc_no_sms_over_gsup_cmd); + install_element(MSC_NODE, &cfg_msc_dtmf_cmd); 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); diff --git a/src/libmsc/transaction_cc.c b/src/libmsc/transaction_cc.c index 2a540bf..44252c2 100644 --- a/src/libmsc/transaction_cc.c +++ b/src/libmsc/transaction_cc.c @@ -25,6 +25,7 @@ #include <osmocom/msc/transaction_cc.h> #include <osmocom/msc/codec_filter.h> #include <osmocom/msc/csd_filter.h> +#include <osmocom/msc/sdp_msg.h> void trans_cc_filter_init(struct gsm_trans *trans) { @@ -51,6 +52,11 @@ switch (trans->bearer_cap.transfer) { case GSM48_BCAP_ITCAP_SPEECH: codec_filter_run(&trans->cc.codecs, &trans->cc.local, &trans->cc.remote); + /* Offer telephone-event for DTMF when using RTP mode */ + if (trans->net->dtmf_mode == DTMF_MODE_RTP) + sdp_audio_codecs_add(&trans->cc.local.audio_codecs, + 101, "telephone-event", 8000, + "0-15"); LOG_TRANS_CAT_SRC(trans, DCC, LOGL_DEBUG, file, line, "codecs: %s\n", codec_filter_to_str(&trans->cc.codecs, &trans->cc.local, &trans->cc.remote)); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/44024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd33a0b412f39a56046e57038551332776be2ba1 Gerrit-Change-Number: 44024 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis@fe80.eu>
participants (1)
-
lynxis lazus