funds/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-05-14 09:36:49 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

DTLS v1.2 supported.

Browse Source
This commit is contained in:
mom040267 2014-12-09 09:29:27 +00:00
parent b1aaef347a
commit 786105a9b4
15 changed files with 131 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
12/09/2014 Oleg Moskalenko <mom040267@gmail.com>
Version 4.3.2.1 'Tolomei':
- DTLS v1.2 supported (for OpenSSL 1.0.2+);
11/29/2014 Oleg Moskalenko <mom040267@gmail.com>
Version 4.3.1.3 'Tolomei':
- Reliability fixes (Issue 141 from rfc5766-turn-server).

2
STATUS
View File

@ -108,6 +108,8 @@ compatibility.
46) Third-party security mechanism (through oAuth) implemented.
47) SQLite support added as default database.
48) DTLS1.2 supported.
Things to be implemented in future (the development roadmap)
are described in the TODO file.

2
TODO
View File

@ -61,8 +61,6 @@
3) Redirect draft.
4) DTLS 1.2 (when available).
==================================================================
### VII. MISC FEATURES ###

2
rpm/build.settings.sh
View File

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

4
rpm/turnserver.spec
View File

@ -1,5 +1,5 @@
Name: turnserver
Version: 4.3.1.3
Version: 4.3.2.1
Release: 0%{dist}
Summary: Coturn TURN Server
@ -294,6 +294,8 @@ fi
%{_includedir}/turn/client/TurnMsgLib.h
%changelog
* Tue Dec 09 2014 Oleg Moskalenko <mom040267@gmail.com>
- Sync to 4.3.2.1
* Sat Nov 29 2014 Oleg Moskalenko <mom040267@gmail.com>
- Sync to 4.3.1.3
* Mon Nov 23 2014 Oleg Moskalenko <mom040267@gmail.com>

8
src/apps/common/apputils.c
View File

@ -864,6 +864,14 @@ static const char* turn_get_method(const SSL_METHOD *method, const char* mdefaul
return "DTLSv1.0";
} else if(method == DTLSv1_client_method()) {
return "DTLSv1.0";
#if defined(SSL_OP_NO_DTLSv1_2)
} else if(method == DTLSv1_2_server_method()) {
return "DTLSv1.2";
} else if(method == DTLSv1_2_client_method()) {
return "DTLSv1.2";
#endif
#endif
} else {
if(mdefault)

67
src/apps/relay/dtls_listener.c
View File

@ -59,6 +59,9 @@ struct dtls_listener_relay_server_info {
turn_turnserver *ts;
int verbose;
SSL_CTX *dtls_ctx;
#if defined(SSL_OP_NO_DTLSv1_2)
SSL_CTX *dtls_ctx_v1_2;
#endif
struct event *udp_listen_ev;
ioa_socket_handle udp_listen_s;
ur_addr_map *children_ss; /* map of socket children on remote addr */
@ -79,27 +82,28 @@ int is_dtls_handshake_message(const unsigned char* buf, int len);
int is_dtls_data_message(const unsigned char* buf, int len);
int is_dtls_alert_message(const unsigned char* buf, int len);
int is_dtls_cipher_change_message(const unsigned char* buf, int len);
int get_dtls_version(const unsigned char* buf, int len);
int is_dtls_message(const unsigned char* buf, int len);
int is_dtls_handshake_message(const unsigned char* buf, int len) {
return (buf && len>3 && buf[0]==0x16 && buf[1]==0xfe && buf[2]==0xff);
return (buf && len>3 && buf[0]==0x16 && buf[1]==0xfe && ((buf[2]==0xff)||(buf[2]==0xfd)));
}
int is_dtls_data_message(const unsigned char* buf, int len) {
return (buf && len>3 && buf[0]==0x17 && buf[1]==0xfe && buf[2]==0xff);
return (buf && len>3 && buf[0]==0x17 && buf[1]==0xfe && ((buf[2]==0xff)||(buf[2]==0xfd)));
}
int is_dtls_alert_message(const unsigned char* buf, int len) {
return (buf && len>3 && buf[0]==0x15 && buf[1]==0xfe && buf[2]==0xff);
return (buf && len>3 && buf[0]==0x15 && buf[1]==0xfe && ((buf[2]==0xff)||(buf[2]==0xfd)));
}
int is_dtls_cipher_change_message(const unsigned char* buf, int len) {
return (buf && len>3 && buf[0]==0x14 && buf[1]==0xfe && buf[2]==0xff);
return (buf && len>3 && buf[0]==0x14 && buf[1]==0xfe && ((buf[2]==0xff)||(buf[2]==0xfd)));
}
int is_dtls_message(const unsigned char* buf, int len) {
if(buf && (len>3) && (buf[1])==0xfe && (buf[2]==0xff)) {
if(buf && (len>3) && (buf[1])==0xfe && ((buf[2]==0xff)||(buf[2]==0xfd))) {
switch (buf[0]) {
case 0x14:
case 0x15:
@ -113,6 +117,13 @@ int is_dtls_message(const unsigned char* buf, int len) {
return 0;
}
/* 0 - 1.0, 1 - 1.2 */
int get_dtls_version(const unsigned char* buf, int len) {
if(buf && (len>3) && (buf[2] == 0xfd))
return 1;
return 0;
}
///////////// utils /////////////////////
#if !defined(TURN_NO_DTLS)
@ -266,7 +277,18 @@ static ioa_socket_handle dtls_server_input_handler(dtls_listener_relay_server_ty
timeout.tv_usec = 0;
BIO_ctrl(wbio, BIO_CTRL_DGRAM_SET_RECV_TIMEOUT, 0, &timeout);
connecting_ssl = SSL_NEW(server->dtls_ctx);
#if defined(SSL_OP_NO_DTLSv1_2)
if(get_dtls_version(ioa_network_buffer_data(nbh),
(int)ioa_network_buffer_get_size(nbh)) == 1) {
connecting_ssl = SSL_NEW(server->dtls_ctx_v1_2);
} else {
connecting_ssl = SSL_NEW(server->dtls_ctx);
}
#else
{
connecting_ssl = SSL_NEW(server->dtls_ctx);
}
#endif
SSL_set_accept_state(connecting_ssl);
@ -536,7 +558,18 @@ static int create_new_connected_udp_socket(
timeout.tv_usec = 0;
BIO_ctrl(wbio, BIO_CTRL_DGRAM_SET_RECV_TIMEOUT, 0, &timeout);
connecting_ssl = SSL_NEW(server->dtls_ctx);
#if defined(SSL_OP_NO_DTLSv1_2)
if(get_dtls_version(ioa_network_buffer_data(server->sm.m.sm.nd.nbh),
(int)ioa_network_buffer_get_size(server->sm.m.sm.nd.nbh)) == 1) {
connecting_ssl = SSL_NEW(server->dtls_ctx_v1_2);
} else {
connecting_ssl = SSL_NEW(server->dtls_ctx);
}
#else
{
connecting_ssl = SSL_NEW(server->dtls_ctx);
}
#endif
SSL_set_accept_state(connecting_ssl);
@ -865,6 +898,9 @@ static int init_server(dtls_listener_relay_server_type* server,
if(!server) return -1;
server->dtls_ctx = e->dtls_ctx;
#if defined(SSL_OP_NO_DTLSv1_2)
server->dtls_ctx_v1_2 = e->dtls_ctx_v1_2;
#endif
server->ts = ts;
server->connect_cb = send_socket;
@ -896,6 +932,23 @@ static int init_server(dtls_listener_relay_server_type* server,
#endif
}
#if defined(SSL_OP_NO_DTLSv1_2)
if(server->dtls_ctx_v1_2) {
#if defined(REQUEST_CLIENT_CERT)
/* If client has to authenticate, then */
SSL_CTX_set_verify(server->dtls_ctx_v1_2, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, dtls_verify_callback);
#endif
SSL_CTX_set_read_ahead(server->dtls_ctx_v1_2, 1);
#if !defined(TURN_NO_DTLS)
SSL_CTX_set_cookie_generate_cb(server->dtls_ctx_v1_2, generate_cookie);
SSL_CTX_set_cookie_verify_cb(server->dtls_ctx_v1_2, verify_cookie);
#endif
}
#endif
return create_server_socket(server, report_creation);
}

14
src/apps/relay/mainrelay.c
View File

@ -65,17 +65,17 @@ static int anon_credentials = 0;
#define DEFAULT_GENERAL_RELAY_SERVERS_NUMBER (1)
turn_params_t turn_params = {
NULL, NULL,
#if defined(SSL_TXT_TLSV1_1)
NULL,
#if defined(SSL_TXT_TLSV1_2)
NULL,
#endif
#endif
NULL,
#if defined(SSL_OP_NO_DTLSv1_2)
NULL,
#endif
DH_1066, "", DEFAULT_EC_CURVE_NAME, "",
"turn_server_cert.pem","turn_server_pkey.pem", "", "",
@ -2546,7 +2546,15 @@ static void openssl_setup(void)
turn_params.dtls_ctx = SSL_CTX_new(DTLSv1_server_method());
set_ctx(turn_params.dtls_ctx,"DTLS");
SSL_CTX_set_read_ahead(turn_params.dtls_ctx, 1);
#if defined(SSL_OP_NO_DTLSv1_2)
turn_params.dtls_ctx_v1_2 = SSL_CTX_new(DTLSv1_2_server_method());
set_ctx(turn_params.dtls_ctx_v1_2,"DTLS1,2");
SSL_CTX_set_read_ahead(turn_params.dtls_ctx_v1_2, 1);
#endif
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "DTLS cipher suite: %s\n",turn_params.cipher_list);
#endif
}
}

3
src/apps/relay/mainrelay.h
View File

@ -188,6 +188,9 @@ typedef struct _turn_params_ {
#endif
SSL_CTX *dtls_ctx;
#if defined(SSL_OP_NO_DTLSv1_2)
SSL_CTX *dtls_ctx_v1_2;
#endif
DH_KEY_SIZE dh_key_size;

18
src/apps/relay/netengine.c
View File

@ -947,7 +947,11 @@ static ioa_engine_handle create_new_listener_engine(void)
turn_params.tls_ctx_v1_2,
#endif
#endif
turn_params.dtls_ctx);
turn_params.dtls_ctx
#if defined(SSL_OP_NO_DTLSv1_2)
,turn_params.dtls_ctx_v1_2
#endif
);
ioa_engine_set_rtcp_map(e, turn_params.listener.rtcpmap);
return e;
}
@ -997,7 +1001,11 @@ static void setup_listener(void)
turn_params.tls_ctx_v1_2,
#endif
#endif
turn_params.dtls_ctx);
turn_params.dtls_ctx
#if defined(SSL_OP_NO_DTLSv1_2)
,turn_params.dtls_ctx_v1_2
#endif
);
turn_params.listener.rtcpmap = rtcp_map_create(turn_params.listener.ioa_eng);
@ -1565,7 +1573,11 @@ static void setup_relay_server(struct relay_server *rs, ioa_engine_handle e, int
turn_params.tls_ctx_v1_2,
#endif
#endif
turn_params.dtls_ctx);
turn_params.dtls_ctx
#if defined(SSL_OP_NO_DTLSv1_2)
,turn_params.dtls_ctx_v1_2
#endif
);
ioa_engine_set_rtcp_map(rs->ioa_eng, turn_params.listener.rtcpmap);
}

9
src/apps/relay/ns_ioalib_engine_impl.c
View File

@ -440,7 +440,11 @@ void set_ssl_ctx(ioa_engine_handle e,
SSL_CTX *tls_ctx_v1_2,
#endif
#endif
SSL_CTX *dtls_ctx)
SSL_CTX *dtls_ctx
#if defined(SSL_OP_NO_DTLSv1_2)
,SSL_CTX *dtls_ctx_v1_2
#endif
)
{
e->tls_ctx_ssl23 = tls_ctx_ssl23;
e->tls_ctx_v1_0 = tls_ctx_v1_0;
@ -451,6 +455,9 @@ void set_ssl_ctx(ioa_engine_handle e,
#endif
#endif
e->dtls_ctx = dtls_ctx;
#if defined(SSL_OP_NO_DTLSv1_2)
e->dtls_ctx_v1_2 = dtls_ctx_v1_2;
#endif
}
void ioa_engine_set_rtcp_map(ioa_engine_handle e, rtcp_map *rtcpmap)

9
src/apps/relay/ns_ioalib_impl.h
View File

@ -150,6 +150,9 @@ struct _ioa_engine
#endif
#endif
SSL_CTX *dtls_ctx;
#if defined(SSL_OP_NO_DTLSv1_2)
SSL_CTX *dtls_ctx_v1_2;
#endif
turn_time_t jiffie; /* bandwidth check interval */
ioa_timer_handle timer_ev;
s08bits cmsg[TURN_CMSG_SZ+1];
@ -258,7 +261,11 @@ void set_ssl_ctx(ioa_engine_handle e,
SSL_CTX *tls_ctx_v1_2,
#endif
#endif
SSL_CTX *dtls_ctx);
SSL_CTX *dtls_ctx
#if defined(SSL_OP_NO_DTLSv1_2)
,SSL_CTX *dtls_ctx_v1_2
#endif
);
void ioa_engine_set_rtcp_map(ioa_engine_handle e, rtcp_map *rtcpmap);

5
src/apps/uclient/mainuclient.c
View File

@ -538,6 +538,11 @@ int main(int argc, char **argv)
root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(DTLSv1_client_method());
SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite);
root_tls_ctx_num++;
#if defined(SSL_OP_NO_DTLSv1_2)
root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(DTLSv1_2_client_method());
SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite);
root_tls_ctx_num++;
#endif
#endif
}

2
src/apps/uclient/startuclient.c
View File

@ -79,7 +79,9 @@ static int get_allocate_address_family(ioa_addr *relay_addr) {
static SSL* tls_connect(ioa_socket_raw fd, ioa_addr *remote_addr, int *try_again, int connect_cycle)
{
int ctxtype = (int)(((unsigned long)random())%root_tls_ctx_num);
SSL *ssl;
ssl = SSL_NEW(root_tls_ctx[ctxtype]);

2
src/ns_turn_defs.h
View File

@ -31,7 +31,7 @@
#ifndef __IOADEFS__
#define __IOADEFS__
#define TURN_SERVER_VERSION "4.3.1.3"
#define TURN_SERVER_VERSION "4.3.2.1"
#define TURN_SERVER_VERSION_NAME "Tolomei"
#define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"