summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2014-01-16 16:50:39 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-01-20 08:27:03 +0100
commit8857c90e3609c88a3d384e64633258d4d7463f93 (patch)
tree42f79b32663fa5b0d72e82bf025b91dabb89a1f4
parent94bc1e0b5e667ab624e1297ccf5343966ed25f64 (diff)
mgcp: Disable output enabled on initialisation
Currently RTP output_enabled is set to 1 on initialisation, which does not semantically match the initial value of conn_mode (MGCP_CONN_NONE). This patch changes this initial value to 0. Sponsored-by: On-Waves ehf
-rw-r--r--openbsc/src/libmgcp/mgcp_protocol.c2
-rw-r--r--openbsc/tests/mgcp/mgcp_test.ok4
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c
index 9996ba7f6..9055bdbb1 100644
--- a/openbsc/src/libmgcp/mgcp_protocol.c
+++ b/openbsc/src/libmgcp/mgcp_protocol.c
@@ -1258,7 +1258,7 @@ static void mgcp_rtp_end_reset(struct mgcp_rtp_end *end)
end->frames_per_packet = 0; /* unknown */
end->packet_duration_ms = DEFAULT_RTP_AUDIO_PACKET_DURATION_MS;
end->rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE;
- end->output_enabled = 1;
+ end->output_enabled = 0;
}
static void mgcp_rtp_end_init(struct mgcp_rtp_end *end)
diff --git a/openbsc/tests/mgcp/mgcp_test.ok b/openbsc/tests/mgcp/mgcp_test.ok
index 7e8aa5c3b..3b645e6ac 100644
--- a/openbsc/tests/mgcp/mgcp_test.ok
+++ b/openbsc/tests/mgcp/mgcp_test.ok
@@ -51,7 +51,7 @@ Connection mode: 2, BTS output disabled, NET output enabled
Testing DLCX
Detected packet duration: 20
Requested packetization period not set
-Connection mode: 0, BTS output enabled, NET output enabled
+Connection mode: 0, BTS output disabled, NET output disabled
Testing CRCX_ZYN
Dummy packets: 1
Packet duration not set
@@ -67,7 +67,7 @@ Testing RQNT2
Testing DLCX
Detected packet duration: 20
Requested packetization period not set
-Connection mode: 0, BTS output enabled, NET output enabled
+Connection mode: 0, BTS output disabled, NET output disabled
Testing CRCX
Re-transmitting CRCX
Testing RQNT1