Переглянути джерело

Imported Upstream version 4.4.2.2

Oleg Moskalenko 10 роки тому
батько
коміт
cd2c487073

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2/18/2015 Oleg Moskalenko <[email protected]>
+Version 4.4.2.2 'Ardee West':
+	- admin_user table schema fixed;
+	- REST API docs fixed;
+	- Amazon AWS uses syslog;
+	
 2/3/2015 Oleg Moskalenko <[email protected]>
 Version 4.4.2.1 'Ardee West':
 	- (HMAC-)SHA-512 and -384 algorithms added;

+ 6 - 1
INSTALL

@@ -856,7 +856,12 @@ connection string format.
 
 Below are the steps to setup the PostgreSQL database server from scratch:
 
-1) Install PostgreSQL server.
+1) Install PostgreSQL server. After the installation, do not forget to
+initialize the postgres root database directory:
+
+	$ sudo bash
+	$ su -l pgsql
+	$ initdb -D /usr/local/pgsql/data
 
 2) Find and edit Postgres' pg_hba.conf file to set the access options 
 (see docs). On different systems, it may be located in different places.

+ 1 - 1
README.turnserver

@@ -174,7 +174,7 @@ Flags:
 			This option uses timestamp as part of combined username:
 			usercombo -> "timestamp:username",
 			turn user -> usercombo,
-			turn password -> base64(hmac(secret key, usercombo)).
+			turn password -> base64(hmac(input_buffer = usercombo, key = shared-secret)).
 			This allows TURN credentials to be accounted for a specific user id.
 			If you don't have a suitable id, the timestamp alone can be used.
 			This option is just turns on secret-based authentication.

+ 4 - 0
TODO

@@ -59,6 +59,10 @@
 
 2) Redirect draft.
 
+3) STUN-Bis: 
+	a. SCTP
+	b. New integrity attribute, algorithms
+
 ==================================================================
 
 ###   VII. MISC FEATURES   ###

+ 1 - 1
man/man1/turnadmin.1

@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH TURN 1 "06 February 2015" "" ""
+.TH TURN 1 "18 February 2015" "" ""
 .SH GENERAL INFORMATION
 
 \fIturnadmin\fP is a TURN administration tool. This tool can be used to manage 

+ 2 - 2
man/man1/turnserver.1

@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH TURN 1 "06 February 2015" "" ""
+.TH TURN 1 "18 February 2015" "" ""
 .SH GENERAL INFORMATION
 
 The \fBTURN Server\fP project contains the source code of a TURN server and TURN client 
@@ -256,7 +256,7 @@ the TURN REST API section below.
 This option uses timestamp as part of combined username:
 usercombo \-> "timestamp:username",
 turn user \-> usercombo,
-turn password \-> \fBbase64\fP(hmac(secret key, usercombo)).
+turn password \-> \fBbase64\fP(hmac(input_buffer = usercombo, key = shared\-secret)).
 This allows TURN credentials to be accounted for a specific user id.
 If you don't have a suitable id, the timestamp alone can be used.
 This option is just turns on secret\-based authentication.

+ 1 - 1
man/man1/turnutils.1

@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH TURN 1 "06 February 2015" "" ""
+.TH TURN 1 "18 February 2015" "" ""
 .SH GENERAL INFORMATION
 
 A set of turnutils_* programs provides some utility functionality to be used

+ 1 - 1
rpm/build.settings.sh

@@ -2,7 +2,7 @@
 
 # Common settings script.
 
-TURNVERSION=4.4.2.1
+TURNVERSION=4.4.2.2
 BUILDDIR=~/rpmbuild
 ARCH=`uname -p`
 TURNSERVER_SVN_URL=http://coturn.googlecode.com/svn

+ 3 - 1
rpm/turnserver.spec

@@ -1,5 +1,5 @@
 Name:		turnserver
-Version:	4.4.2.1
+Version:	4.4.2.2
 Release:	0%{dist}
 Summary:	Coturn TURN Server
 
@@ -288,6 +288,8 @@ fi
 %{_includedir}/turn/client/TurnMsgLib.h
 
 %changelog
+* Wed Feb 18 2015 Oleg Moskalenko <[email protected]>
+  - Sync to 4.4.2.2
 * Tue Feb 3 2015 Oleg Moskalenko <[email protected]>
   - Sync to 4.4.2.1
 * Sun Feb 1 2015 Oleg Moskalenko <[email protected]>

+ 1 - 1
src/apps/relay/dbdrivers/dbd_sqlite.c

@@ -155,7 +155,7 @@ static void init_sqlite_database(sqlite3 *sqliteconnection) {
 		"CREATE TABLE turn_origin_to_realm (origin varchar(127),realm varchar(127),primary key (origin))",
 		"CREATE TABLE turn_realm_option (realm varchar(127) default '',	opt varchar(32),	value varchar(128),	primary key (realm,opt))",
 		"CREATE TABLE oauth_key (kid varchar(128),ikm_key varchar(256) default '',timestamp bigint default 0,lifetime integer default 0,hkdf_hash_func varchar(64) default '',as_rs_alg varchar(64) default '',as_rs_key varchar(256) default '',auth_alg varchar(64) default '',auth_key varchar(256) default '',primary key (kid))",
-		"CREATE TABLE admin_user (uname varchar(32), realm varchar(127), password varchar(127), primary key (uname))",
+		"CREATE TABLE admin_user (name varchar(32), realm varchar(127), password varchar(127), primary key (name))",
 		NULL
 	};
 

+ 1 - 1
src/ns_turn_defs.h

@@ -31,7 +31,7 @@
 #ifndef __IOADEFS__
 #define __IOADEFS__
 
-#define TURN_SERVER_VERSION "4.4.2.1"
+#define TURN_SERVER_VERSION "4.4.2.2"
 #define TURN_SERVER_VERSION_NAME "Ardee West"
 #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"