From de84442ade8faabcc4d6eae12d499319d77acfb7 Mon Sep 17 00:00:00 2001 From: Oleg Moskalenko Date: Thu, 27 Aug 2015 00:55:40 -0700 Subject: [PATCH] conflict resolution for STUN attributes (temporary solution) --- ChangeLog | 4 ++++ rpm/build.settings.sh | 2 +- rpm/turnserver.spec | 4 +++- src/client/ns_turn_msg_defs_experimental.h | 2 +- src/ns_turn_defs.h | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 819173ef..8f52ba61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +8/26/2015 Oleg Moskalenko +Version 4.4.5.5 'Ardee West': + - STUN attributes conflict resolution. + 7/18/2015 Oleg Moskalenko Version 4.4.5.4 'Ardee West': - moved to github. diff --git a/rpm/build.settings.sh b/rpm/build.settings.sh index 1e9afd3d..89548d36 100755 --- a/rpm/build.settings.sh +++ b/rpm/build.settings.sh @@ -2,7 +2,7 @@ # Common settings script. -TURNVERSION=4.4.5.4 +TURNVERSION=4.4.5.5 BUILDDIR=~/rpmbuild ARCH=`uname -p` TURNSERVER_GIT_URL=https://github.com/coturn/coturn.git diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec index 79d05108..d29767c9 100644 --- a/rpm/turnserver.spec +++ b/rpm/turnserver.spec @@ -1,5 +1,5 @@ Name: turnserver -Version: 4.4.5.4 +Version: 4.4.5.5 Release: 0%{dist} Summary: Coturn TURN Server @@ -289,6 +289,8 @@ fi %{_includedir}/turn/client/TurnMsgLib.h %changelog +* Wed Aug 26 2015 Oleg Moskalenko + - Sync to 4.4.5.5 * Sat Jul 18 2015 Oleg Moskalenko - Sync to 4.4.5.4 * Sat Jun 20 2015 Oleg Moskalenko diff --git a/src/client/ns_turn_msg_defs_experimental.h b/src/client/ns_turn_msg_defs_experimental.h index 44bfcc7d..4eed2dcc 100644 --- a/src/client/ns_turn_msg_defs_experimental.h +++ b/src/client/ns_turn_msg_defs_experimental.h @@ -40,7 +40,7 @@ /* Mobility ==>> */ /* conflicts with third-party authorization ! 0x802E is used for third-party authorization now */ -#define STUN_ATTRIBUTE_MOBILITY_TICKET (0x8888) +#define STUN_ATTRIBUTE_MOBILITY_TICKET (0x8040) #define STUN_ATTRIBUTE_MOBILITY_EVENT (0x802) #define STUN_ATTRIBUTE_MOBILITY_SUPPORT (0x8000) /* <<== Mobility */ diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h index c3815de1..b717591b 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.5.4" +#define TURN_SERVER_VERSION "4.4.5.5" #define TURN_SERVER_VERSION_NAME "Ardee West" #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"