diff --git a/ChangeLog b/ChangeLog index d6988ed9..b188b0dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +9/29/2015 Oleg Moskalenko +Version 4.5.0.2 'dan Eider': + - DTLS segmentation fault fixed; + 9/13/2015 Oleg Moskalenko Version 4.5.0.1 'dan Eider': - multiple realms based on oAuth (third-party authorization); diff --git a/rpm/build.settings.sh b/rpm/build.settings.sh index 58fdcb19..dea4584e 100755 --- a/rpm/build.settings.sh +++ b/rpm/build.settings.sh @@ -2,7 +2,7 @@ # Common settings script. -TURNVERSION=4.5.0.1 +TURNVERSION=4.5.0.2 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 82fd70bd..d1007bb7 100644 --- a/rpm/turnserver.spec +++ b/rpm/turnserver.spec @@ -1,5 +1,5 @@ Name: turnserver -Version: 4.5.0.1 +Version: 4.5.0.2 Release: 0%{dist} Summary: Coturn TURN Server @@ -289,6 +289,8 @@ fi %{_includedir}/turn/client/TurnMsgLib.h %changelog +* Tue Sep 29 2015 Oleg Moskalenko + - Sync to 4.5.0.2 * Sun Sep 13 2015 Oleg Moskalenko - Sync to 4.5.0.1 * Sat Jul 18 2015 Oleg Moskalenko diff --git a/src/apps/common/apputils.h b/src/apps/common/apputils.h index a0f0ac5c..11a6e5d8 100644 --- a/src/apps/common/apputils.h +++ b/src/apps/common/apputils.h @@ -58,10 +58,6 @@ extern int IS_TURN_SERVER; #define OPENSSL_FIRST_ALPN_VERSION (0x10002003L) -#define STUN_ALPN "stun.nat-discovery" -#define TURN_ALPN "stun.turn" -#define HTTP_ALPN "http/1.1" - #if OPENSSL_VERSION_NUMBER >= OPENSSL_FIRST_ALPN_VERSION #define ALPN_SUPPORTED 1 #else diff --git a/src/apps/relay/dtls_listener.c b/src/apps/relay/dtls_listener.c index 80aeb82d..56e153bf 100644 --- a/src/apps/relay/dtls_listener.c +++ b/src/apps/relay/dtls_listener.c @@ -367,7 +367,7 @@ static int handle_udp_packet(dtls_listener_relay_server_type *server, } } - if(ioa_socket_check_bandwidth(s,sm->m.sm.nd.nbh,1)) { + if(s && ioa_socket_check_bandwidth(s,sm->m.sm.nd.nbh,1)) { s->e = ioa_eng; if (s && s->read_cb && sm->m.sm.nd.nbh) { s->read_cb(s, IOA_EV_READ, &(sm->m.sm.nd), s->read_ctx, 1); diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 75c587b2..67cc9dc3 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -35,6 +35,16 @@ static int use_lt_credentials = 0; static int anon_credentials = 0; +////// ALPN ////////// + +#if ALPN_SUPPORTED + +char STUN_ALPN[128] = "stun.nat-discovery"; +char TURN_ALPN[128] = "stun.turn"; +char HTTP_ALPN[128] = "http/1.1"; + +#endif + ////// TURNDB ////////////// #if defined(TURNDB) diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h index 9ac9b698..3f1ad149 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.5.0.1" +#define TURN_SERVER_VERSION "4.5.0.2" #define TURN_SERVER_VERSION_NAME "dan Eider" #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"