diff --git a/ChangeLog b/ChangeLog index 86ad9dad..6c7d863a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +10/13/2014 Oleg Moskalenko +Version 4.2.1.3 'Monza': + - Code cleaning. + 10/05/2014 Oleg Moskalenko Version 4.2.1.2 'Monza': - oAuth security experimental implementation; diff --git a/rpm/build.settings.sh b/rpm/build.settings.sh index 84d5ac35..1d327744 100755 --- a/rpm/build.settings.sh +++ b/rpm/build.settings.sh @@ -2,7 +2,7 @@ # Common settings script. -TURNVERSION=4.2.1.2 +TURNVERSION=4.2.1.3 BUILDDIR=~/rpmbuild ARCH=`uname -p` TURNSERVER_SVN_URL=http://coturn.googlecode.com/svn diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec index a014ae7e..f32362b3 100644 --- a/rpm/turnserver.spec +++ b/rpm/turnserver.spec @@ -1,5 +1,5 @@ Name: turnserver -Version: 4.2.1.2 +Version: 4.2.1.3 Release: 0%{dist} Summary: Coturn TURN Server @@ -294,6 +294,8 @@ fi %{_includedir}/turn/client/TurnMsgLib.h %changelog +* Mon Oct 13 2014 Oleg Moskalenko + - Sync to 4.2.1.3 * Sun Oct 05 2014 Oleg Moskalenko - Sync to 4.2.1.2 * Thu Aug 14 2014 Oleg Moskalenko diff --git a/src/apps/common/ns_turn_utils.c b/src/apps/common/ns_turn_utils.c index 4406d007..ae96519f 100644 --- a/src/apps/common/ns_turn_utils.c +++ b/src/apps/common/ns_turn_utils.c @@ -664,15 +664,13 @@ int get_canonic_origin(const char* o, char *co, int sz) #include #include -using namespace std; - static volatile int tmm_init = 0; static pthread_mutex_t tm; typedef void* ptrtype; -typedef set ptrs_t; -typedef map str_to_ptrs_t; -typedef map ptr_to_str_t; +typedef std::set ptrs_t; +typedef std::map str_to_ptrs_t; +typedef std::map ptr_to_str_t; static str_to_ptrs_t str_to_ptrs; static ptr_to_str_t ptr_to_str; @@ -692,7 +690,7 @@ static void add_tm_ptr(void *ptr, const char *id) { if(!ptr) return; - string sid(id); + std::string sid(id); str_to_ptrs_t::iterator iter; @@ -701,7 +699,7 @@ static void add_tm_ptr(void *ptr, const char *id) { iter = str_to_ptrs.find(sid); if(iter == str_to_ptrs.end()) { - set sp; + std::set sp; sp.insert(ptr); str_to_ptrs[sid]=sp; } else { @@ -730,7 +728,7 @@ static void del_tm_ptr(void *ptr, const char *id) { } else { - string sid = pts_iter->second; + std::string sid = pts_iter->second; ptr_to_str.erase(pts_iter); str_to_ptrs_t::iterator iter = str_to_ptrs.find(sid); diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h index ef53e765..037b74f4 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.2.1.2" +#define TURN_SERVER_VERSION "4.2.1.3" #define TURN_SERVER_VERSION_NAME "Monza" #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"