mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-10-31 23:11:28 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup openssl initialization (#1012)

Browse Source 
Rewriting openssl initialization code (threading support to make it
cleaner

- Regroup functions so that there is one ifdef (for old code and new
code)
- Modern openssl (>1.0.2) does not need any synchornization routines so
they are empty
- Old openssl (<=1.0.2) now require `OPENSSL_THREADS` which allows
running multiple threads in turnserver. Not having turnserver
multi-threaded is a huge waste. `OPENSSL_THREADS` is now a requirement.


Test Plan:
- CI builds pass for openssl versions 1.0.2, 1.1.1, 3.0, including tests
This commit is contained in:
Pavel Punsky 2022-10-24 13:06:35 -07:00 committed by GitHub
parent dda0c99759
commit d72a2a8920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1345,7 +1345,6 @@ static void set_option(int c, char *value)
STRCPY(turn_params.relay_ifname, value); STRCPY(turn_params.relay_ifname, value);
break; break;
case 'm': case 'm':
#if defined(OPENSSL_THREADS)
if(atoi(value)>MAX_NUMBER_OF_GENERAL_RELAY_SERVERS) { if(atoi(value)>MAX_NUMBER_OF_GENERAL_RELAY_SERVERS) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "WARNING: max number of relay threads is 128.\n"); TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "WARNING: max number of relay threads is 128.\n");
turn_params.general_relay_servers_number = MAX_NUMBER_OF_GENERAL_RELAY_SERVERS; turn_params.general_relay_servers_number = MAX_NUMBER_OF_GENERAL_RELAY_SERVERS;
@ -1354,9 +1353,6 @@ static void set_option(int c, char *value)
} else { } else {
turn_params.general_relay_servers_number = atoi(value); turn_params.general_relay_servers_number = atoi(value);
} }
#else
TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "WARNING: OpenSSL version is too old OR does not support threading,\n I am using single thread for relaying.\n");
#endif
break; break;
case 'd': case 'd':
STRCPY(turn_params.listener_ifname, value); STRCPY(turn_params.listener_ifname, value);
@ -2645,9 +2641,8 @@ int main(int argc, char **argv)
////////// OpenSSL locking //////////////////////////////////////// ////////// OpenSSL locking ////////////////////////////////////////
#if defined(OPENSSL_THREADS) #if defined(OPENSSL_THREADS)
#if OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_1_1_0
static char some_buffer[65536];
//array larger than anything that OpenSSL may need: //array larger than anything that OpenSSL may need:
static pthread_mutex_t mutex_buf[256]; static pthread_mutex_t mutex_buf[256];
@ -2665,76 +2660,52 @@ void coturn_locking_function(int mode, int n, const char *file, int line) {
} }
} }
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
void coturn_id_function(CRYPTO_THREADID *ctid); void coturn_id_function(CRYPTO_THREADID *ctid);
void coturn_id_function(CRYPTO_THREADID *ctid) void coturn_id_function(CRYPTO_THREADID *ctid)
{ {
UNUSED_ARG(ctid); UNUSED_ARG(ctid);
CRYPTO_THREADID_set_numeric(ctid, (unsigned long)pthread_self()); CRYPTO_THREADID_set_numeric(ctid, (unsigned long)pthread_self());
} }
#else
unsigned long coturn_id_function(void);
unsigned long coturn_id_function(void)
{
return (unsigned long)pthread_self();
}
#endif
#endif
static int THREAD_setup(void) { static int THREAD_setup(void) {
int i;
#if defined(OPENSSL_THREADS)
int i;
some_buffer[0] = 0;
for (i = 0; i < CRYPTO_num_locks(); i++) { for (i = 0; i < CRYPTO_num_locks(); i++) {
pthread_mutex_init(&(mutex_buf[i]), NULL); pthread_mutex_init(&(mutex_buf[i]), NULL);
} }
mutex_buf_initialized = 1; mutex_buf_initialized = 1;
#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER <= OPENSSL_VERSION_1_1_1
CRYPTO_THREADID_set_callback(coturn_id_function); CRYPTO_THREADID_set_callback(coturn_id_function);
#else
CRYPTO_set_id_callback(coturn_id_function);
#endif
CRYPTO_set_locking_callback(coturn_locking_function); CRYPTO_set_locking_callback(coturn_locking_function);
#endif
return 1; return 1;
} }
int THREAD_cleanup(void); int THREAD_cleanup(void);
int THREAD_cleanup(void) { int THREAD_cleanup(void) {
int i;
#if defined(OPENSSL_THREADS) if (!mutex_buf_initialized)
return 0;
int i; CRYPTO_THREADID_set_callback(NULL);
CRYPTO_set_locking_callback(NULL);
if (!mutex_buf_initialized) for (i = 0; i < CRYPTO_num_locks(); i++) {
return 0; pthread_mutex_destroy(&(mutex_buf[i]));
}
#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER <= OPENSSL_VERSION_1_1_1
CRYPTO_THREADID_set_callback(NULL);
#else
CRYPTO_set_id_callback(NULL);
#endif
CRYPTO_set_locking_callback(NULL);
for (i = 0; i < CRYPTO_num_locks(); i++) {
pthread_mutex_destroy(&(mutex_buf[i]));
}
mutex_buf_initialized = 0;
#endif
mutex_buf_initialized = 0;
return 1; return 1;
} }
#else
static int THREAD_setup(void) {
return 1;
}
int THREAD_cleanup(void);
int THREAD_cleanup(void){
return 1;
}
#endif /* OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_1_1_0 */
#endif /* defined(OPENSSL_THREADS) */
static void adjust_key_file_name(char *fn, const char* file_title, int critical) static void adjust_key_file_name(char *fn, const char* file_title, int critical)
{ {