Commit bd83c83b authored by Sandrine Avakian's avatar Sandrine Avakian

Merge branch '2.14.x'

# Conflicts:
#	src/voip/ice.c
#	src/voip/stun.c
#	tester/CMakeLists.txt
parents ead18586 c8f02b32
......@@ -21,14 +21,14 @@
############################################################################
cmake_minimum_required(VERSION 3.0)
project(mediastreamer2 VERSION 2.13.0 LANGUAGES C CXX)
project(mediastreamer2 VERSION 2.14.0 LANGUAGES C CXX)
set(MEDIASTREAMER_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
set(MEDIASTREAMER_MINOR_VERSION ${PROJECT_VERSION_MINOR})
set(MEDIASTREAMER_MICRO_VERSION ${PROJECT_VERSION_PATCH})
set(MEDIASTREAMER_VERSION ${PROJECT_VERSION})
set(MEDIASTREAMER_SO_VERSION "8") # incremented on June, the 2nd 2016. DO NOT INCREMENT BEFORE MEDIASTREAMER 2.14
set(MEDIASTREAMER_SO_VERSION "9") # incremented on July, the 8th 2016. DO NOT INCREMENT BEFORE MEDIASTREAMER 2.14
string(REGEX MATCH "^(arm*|aarch64)" FIXED_POINT_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
if(FIXED_POINT_PROCESSOR)
......
mediastreamer2-2.14.0: July 8th, 2016
* bug fixes
mediastreamer2-2.13.0: June 2nd, 2016
* Add support of H264 hardware codec on Apple's platforms
* MSFactory usage : using one MSfactory per LinphoneCore instance,
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([mediastreamer],[2.13.0])
AC_INIT([mediastreamer],[2.14.0])
AC_MSG_NOTICE([$PACKAGE_NAME-$PACKAGE_VERSION A mediastreaming library for telephony application.])
AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)])
......
mediastreamer2 (2.14.0) unstable; urgency=low
* bug fixes
-- Belledonne Communications <info@belledonne-communications.com> Thu, 17 August 2016 16:50:07 +0200
mediastreamer2 (2.13.0) unstable; urgency=low
* Add support of H264 hardware codec on Apple's platforms
* MSFactory usage : using one MSfactory per LinphoneCore instance,
......
This diff is collapsed.
......@@ -1466,6 +1466,7 @@ static int ms_turn_rtp_endpoint_recvfrom(RtpTransport *rtptp, mblk_t *msg, int f
struct sockaddr *relay_sa = (struct sockaddr *)&relay_ss;
socklen_t relay_sa_len = sizeof(relay_ss);
memset(relay_sa, 0, relay_sa_len);
memset(&relay_ss, 0, relay_sa_len);
/* Copy the data of the TURN data indication in the mblk_t so that it contains the unpacked data */
msgsize = ms_stun_message_get_data_length(stun_msg);
memcpy(msg->b_rptr, ms_stun_message_get_data(stun_msg), msgsize);
......@@ -1503,6 +1504,7 @@ static bool_t ms_turn_rtp_endpoint_send_via_turn_server(MSTurnContext *context,
socklen_t relay_sa_len = sizeof(relay_ss);
memset(relay_sa, 0, relay_sa_len);
memset(&relay_ss, 0, relay_sa_len);
ms_stun_address_to_sockaddr(&context->relay_addr, relay_sa, &relay_sa_len);
if (relay_sa->sa_family != from->sa_family) return FALSE;
if (relay_sa->sa_family == AF_INET) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment