turn-bis new release adjustments (dual allocation)

ChangeLog

@@ -1,5 +1,6 @@
-4/6/2015 Oleg Moskalenko <mom040267@gmail.com>
-Version 4.4.4.3 'Ardee West':
+4/9/2015 Oleg Moskalenko <mom040267@gmail.com>
+Version 4.4.5.1 'Ardee West':
+	- dual allocation adjusted according to the new TURN-bis draft;
 	- C++ fixes;
 	- cosmetic fixes;
 

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

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 <mom040267@gmail.com>
-  - Sync to 4.4.4.3
+* Thu Apr 09 2015 Oleg Moskalenko <mom040267@gmail.com>
+  - Sync to 4.4.5.1
 * Tue Mar 31 2015 Oleg Moskalenko <mom040267@gmail.com>
   - Sync to 4.4.4.2
 * Sun Mar 15 2015 Oleg Moskalenko <mom040267@gmail.com>

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);
 				}
 			}
 

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);
 			}
 		}
 

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

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;