neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36633?usp=email )
Change subject: mgcp-client: always send 'm=audio' line ......................................................................
mgcp-client: always send 'm=audio' line
Re-add the m=audio line to SDP emitted from libosmo-mgcp-client, even if the audio port is not set yet
Patch a5acaa68db4cc26e342069ad2ef37c1b09e1efc2 introduced a presence flag for the RTP audio port number. This flag, when unset, also omitted the 'm=audio...' line completely, dropping the PT number definitions.
Correct:
m=audio 1234 RTP/AVP 96 <--- anounce 96 a=rtpmap:96 VND.3GPP.IUFP/16000 <--- further specify 96 a=fmtp:96 ... <--- further specify 96
When m=audio is missing, we only have orphaned rtpmap and fmtp entries. They are supposed to further specify the 96 listed in 'RTP/AVP 96', instead they are without context:
a=rtpmap:96 VND.3GPP.IUFP/16000 a=fmtp:96 ...
When the presence map indicates no port known, we still need to emit the list of PT numbers; so we're forced to send a port of 0:
m=audio 0 RTP/AVP 96 a=rtpmap:96 VND.3GPP.IUFP/16000 a=fmtp:96 ...
This is an important fix for osmo-hnbgw, which sends the first CRCX with an IUFP codec. osmo-mgw requires this to accept incoming IuUP Initializaition requests. When m=audio is missing, osmo-mgw does not parse the IUFP codec, and 3G voice fails completely. This mgcp-client patch will emit valid codec config also when port == 0, fixing osmo-hnbgw voice, because osmo-mgw will know about IUFP from the start.
Related: SYS#6907 Related: osmo-mgw a5acaa68db4cc26e342069ad2ef37c1b09e1efc2 Change-Id: Id95b629453aec999100b5af821c6a0b9562bb597 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 58 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/33/36633/1
diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 8b311d3..a9ad4c0 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1315,6 +1315,7 @@ int local_ip_family, audio_ip_family; const char *codec; unsigned int pt; + uint16_t audio_port;
#define MSGB_PRINTF_OR_RET(FMT, ARGS...) do { \ if (msgb_printf(msg, FMT, ##ARGS) != 0) { \ @@ -1366,17 +1367,19 @@ MSGB_PRINTF_OR_RET("t=0 0\r\n");
/* Add RTP address port and codecs */ - if (mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_PORT) { - if (mgcp_msg->audio_port == 0) { - LOGPMGW(mgcp, LOGL_ERROR, - "Invalid port number, can not generate MGCP message\n"); - return -EINVAL; - } - MSGB_PRINTF_OR_RET("m=audio %u RTP/AVP", mgcp_msg->audio_port); - for (i = 0; i < mgcp_msg->ptmap_len; i++) - MSGB_PRINTF_OR_RET(" %u", mgcp_msg->ptmap[i].pt); - MSGB_PRINTF_OR_RET("\r\n"); + audio_port = 0; + if ((mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_PORT)) { + audio_port = mgcp_msg->audio_port; + if (!audio_port) { + LOGPMGW(mgcp, LOGL_ERROR, + "Invalid port number, can not generate MGCP message\n"); + return -EINVAL; + } } + MSGB_PRINTF_OR_RET("m=audio %u RTP/AVP", audio_port); + for (i = 0; i < mgcp_msg->ptmap_len; i++) + MSGB_PRINTF_OR_RET(" %u", mgcp_msg->ptmap[i].pt); + MSGB_PRINTF_OR_RET("\r\n");
/* Add optional codec parameters (fmtp) */ if (mgcp_msg->param_present) {
-
neels