aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2014-06-12 12:42:38 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-06-15 19:15:32 +0200
commitcb04ca2fc3dba66fc5d2e8daef53a7078051c94c (patch)
tree92b4a5d73e0ca453b0b621f334f6ff1a98209e77 /openbsc
parentbebf92d7f0744862a4dd223b053c6f125349e657 (diff)
mgcp: Fix SDP formatting of fmtp_extra (Coverity)
Currently when ftmp_extra is set, a doubled a=rtpmap line is emitted instead of the fmtp_extra info. This patch fixes replaces the formerly copied and pasted but not modified snprintf parameters by the correct ones. Fixes: Coverity CID 1220873 Sponsored-by: On-Waves ehf
Diffstat (limited to 'openbsc')
-rw-r--r--openbsc/src/libmgcp/mgcp_protocol.c3
-rw-r--r--openbsc/tests/mgcp/mgcp_test.ok24
2 files changed, 1 insertions, 26 deletions
diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c
index f0457d1aa..6e489498c 100644
--- a/openbsc/src/libmgcp/mgcp_protocol.c
+++ b/openbsc/src/libmgcp/mgcp_protocol.c
@@ -287,8 +287,7 @@ static int write_response_sdp(struct mgcp_endpoint *endp,
if (fmtp_extra) {
nchars = snprintf(sdp_record + len, size - len,
- "a=rtpmap:%d %s\r\n",
- payload_type, audio_name);
+ "%s\r\n", fmtp_extra);
if (nchars < 0 || nchars >= size - len)
goto buffer_too_small;
diff --git a/openbsc/tests/mgcp/mgcp_test.ok b/openbsc/tests/mgcp/mgcp_test.ok
index 6c5a6bc10..033f783f3 100644
--- a/openbsc/tests/mgcp/mgcp_test.ok
+++ b/openbsc/tests/mgcp/mgcp_test.ok
@@ -75,35 +75,11 @@ Detected packet duration: 20
Requested packetization period not set
Connection mode: 0: NONE
Testing CRCX
-CRCX failed '200 2 OK
-I: 3
-
-v=0
-o=- 3 23 IN IP4 0.0.0.0
-c=IN IP4 0.0.0.0
-t=0 0
-m=audio 0 RTP/AVP 126
-a=rtpmap:126 AMR/8000
-a=rtpmap:126 AMR/8000
-a=ptime:20
-'
Dummy packets: 1
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 1: RECV
Testing MDCX3
-MDCX3 failed '200 18983215 OK
-I: 3
-
-v=0
-o=- 3 23 IN IP4 0.0.0.0
-c=IN IP4 0.0.0.0
-t=0 0
-m=audio 0 RTP/AVP 126
-a=rtpmap:126 AMR/8000
-a=rtpmap:126 AMR/8000
-a=ptime:20
-'
Dummy packets: 1
Packet duration not set
Requested packetization period not set