master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
mom040267 2014-12-21 10:48:53 +00:00
parent ae71f2b7fd
commit 626a6b69d7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/relay/dbdrivers/dbd_sqlite.c
View File

@ -77,7 +77,7 @@ static void sqlite_lock(int write)
}
}
void sqlite_unlock(int write)
static void sqlite_unlock(int write)
{
pthread_mutex_lock(&rc_mutex);
if (write) {

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

@ -2334,14 +2334,14 @@ static int pem_password_func(char *buf, int size, int rwflag, void *password)
#if ALPN_SUPPORTED
static int ServerALPNCallback(SSL *s,
static int ServerALPNCallback(SSL *ssl,
const unsigned char **out,
unsigned char *outlen,
const unsigned char *in,
unsigned int inlen,
void *arg) {
UNUSED_ARG(s);
UNUSED_ARG(ssl);
UNUSED_ARG(arg);
unsigned char sa_len = (unsigned char)strlen(STUN_ALPN);
@ -2358,21 +2358,26 @@ static int ServerALPNCallback(SSL *s,
if((!turn_params.no_stun) && (current_len == sa_len) && (memcmp(ptr+1,STUN_ALPN,sa_len)==0)) {
*out = ptr+1;
*outlen = sa_len;
SSL_set_app_data(ssl,STUN_ALPN);
return SSL_TLSEXT_ERR_OK;
}
if((!turn_params.stun_only) && (current_len == ta_len) && (memcmp(ptr+1,TURN_ALPN,ta_len)==0)) {
*out = ptr+1;
*outlen = ta_len;
SSL_set_app_data(ssl,TURN_ALPN);
return SSL_TLSEXT_ERR_OK;
}
if((current_len == ha_len) && (memcmp(ptr+1,HTTP_ALPN,ha_len)==0)) {
*out = ptr+1;
*outlen = ta_len;
SSL_set_app_data(ssl,HTTP_ALPN);
found_http = 1;
}
ptr += 1 + current_len;
}
if(found_http)
return SSL_TLSEXT_ERR_NOACK;
return SSL_TLSEXT_ERR_OK;
return SSL_TLSEXT_ERR_NOACK; //???
}