From 9483dec4decab416506636b17dcddbd8d8662a52 Mon Sep 17 00:00:00 2001 From: mom040267 Date: Fri, 10 Apr 2015 07:07:18 +0000 Subject: [PATCH] turn-bis new release adjustments (dual allocation) --- ChangeLog | 5 +++-- rpm/build.settings.sh | 2 +- rpm/turnserver.spec | 6 +++--- src/apps/uclient/startuclient.c | 2 +- src/apps/uclient/uclient.c | 2 +- src/ns_turn_defs.h | 2 +- src/server/ns_turn_server.c | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2d0b15..ab0b777 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ -4/6/2015 Oleg Moskalenko -Version 4.4.4.3 'Ardee West': +4/9/2015 Oleg Moskalenko +Version 4.4.5.1 'Ardee West': + - dual allocation adjusted according to the new TURN-bis draft; - C++ fixes; - cosmetic fixes; diff --git a/rpm/build.settings.sh b/rpm/build.settings.sh index 5259873..832b8e4 100755 --- a/rpm/build.settings.sh +++ b/rpm/build.settings.sh @@ -2,7 +2,7 @@ # Common settings script. -TURNVERSION=4.4.4.3 +TURNVERSION=4.4.5.1 BUILDDIR=~/rpmbuild ARCH=`uname -p` TURNSERVER_SVN_URL=http://coturn.googlecode.com/svn diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec index dc50743..c71d7cc 100644 --- a/rpm/turnserver.spec +++ b/rpm/turnserver.spec @@ -1,5 +1,5 @@ Name: turnserver -Version: 4.4.4.3 +Version: 4.4.5.1 Release: 0%{dist} Summary: Coturn TURN Server @@ -289,8 +289,8 @@ fi %{_includedir}/turn/client/TurnMsgLib.h %changelog -* Mon Apr 06 2015 Oleg Moskalenko - - Sync to 4.4.4.3 +* Thu Apr 09 2015 Oleg Moskalenko + - Sync to 4.4.5.1 * Tue Mar 31 2015 Oleg Moskalenko - Sync to 4.4.4.2 * Sun Mar 15 2015 Oleg Moskalenko diff --git a/src/apps/uclient/startuclient.c b/src/apps/uclient/startuclient.c index 6fdd6d7..60bdaa2 100644 --- a/src/apps/uclient/startuclient.c +++ b/src/apps/uclient/startuclient.c @@ -668,7 +668,7 @@ static int clnet_allocate(int verbose, field[1]=0; field[2]=0; field[3]=0; - stun_attr_add(&request_message, STUN_ATTRIBUTE_ADDITIONAL_ADDRESS_FAMILY, (const char*) field, 4); + stun_attr_add(&request_message, STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY, (const char*) field, 4); } } diff --git a/src/apps/uclient/uclient.c b/src/apps/uclient/uclient.c index 6c7ea41..e55a6b3 100644 --- a/src/apps/uclient/uclient.c +++ b/src/apps/uclient/uclient.c @@ -1247,7 +1247,7 @@ static int refresh_channel(app_ur_session* elem, u16bits method, uint32_t lt) field[1]=0; field[2]=0; field[3]=0; - stun_attr_add(&message, STUN_ATTRIBUTE_ADDITIONAL_ADDRESS_FAMILY, (const char*) field, 4); + stun_attr_add(&message, STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY, (const char*) field, 4); } } diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h index 4f066ea..4222ede 100644 --- a/src/ns_turn_defs.h +++ b/src/ns_turn_defs.h @@ -31,7 +31,7 @@ #ifndef __IOADEFS__ #define __IOADEFS__ -#define TURN_SERVER_VERSION "4.4.4.3" +#define TURN_SERVER_VERSION "4.4.5.1" #define TURN_SERVER_VERSION_NAME "Ardee West" #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'" diff --git a/src/server/ns_turn_server.c b/src/server/ns_turn_server.c index 68dc4ce..184b886 100644 --- a/src/server/ns_turn_server.c +++ b/src/server/ns_turn_server.c @@ -1519,8 +1519,8 @@ static int handle_turn_refresh(turn_turnserver *server, } } break; - case STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY: /* <<== ??? */ - case STUN_ATTRIBUTE_ADDITIONAL_ADDRESS_FAMILY: { + case STUN_ATTRIBUTE_ADDITIONAL_ADDRESS_FAMILY: /* deprecated, for backward compatibility with older versions of TURN-bis */ + case STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY: { int af_req = stun_get_requested_address_family(sar); { int is_err = 0;