conflict resolution for STUN attributes (temporary solution)

ChangeLog

@@ -1,3 +1,7 @@
+8/26/2015 Oleg Moskalenko <mom040267@gmail.com>
+Version 4.4.5.5 'Ardee West':
+	- STUN attributes conflict resolution.
+	
 7/18/2015 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.4.5.4 'Ardee West':
 	- moved to github.

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

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 <mom040267@gmail.com>
+  - Sync to 4.4.5.5
 * Sat Jul 18 2015 Oleg Moskalenko <mom040267@gmail.com>
   - Sync to 4.4.5.4
 * Sat Jun 20 2015 Oleg Moskalenko <mom040267@gmail.com>

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 */

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 "'"