WolfSSL
/
wolfssl-examples
mirror of https://github.com/wolfSSL/wolfssl-examples.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dtls threaded examples: don't do double free.

pull/419/head
jordan 2024-01-17 00:32:14 -06:00
parent cea1d0815e
commit 2fa54af672
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dtls/server-dtls-threaded.c
View File

@ -63,6 +63,8 @@ static int new_udp_listen_socket(void);
static void safer_shutdown(thread_args_t * args);
static void * server_work(void * thread_args);
static void sig_handler(const int sig);
static void cleanup_threadpool(pthread_t * threads, thread_args_t * args,
int n_threads);
int
main(int argc,
@ -224,25 +226,19 @@ main(int argc,
}
}
#ifdef USE_NONBLOCK_JOIN
for (size_t i = 0; i < n_threads; ++i) {
if (threads[i]) {
pthread_tryjoin_np(threads[i], NULL);
printf("info: joined thread: %ld\n", threads[i]);
threads[i] = 0;
}
}
#else
for (size_t i = 0; i < n_threads; ++i) {
if (threads[i] && args[i].done == 1) {
pthread_join(threads[i], NULL);
printf("info: joined thread: %ld\n", threads[i]);
threads[i] = 0;
}
}
#endif
cleanup_threadpool(threads, args, n_threads);
}
/* Do a final blocking join. */
for (size_t i = 0; i < n_threads; ++i) {
if (threads[i]) {
pthread_join(threads[i], NULL);
printf("info: joined thread: %ld\n", threads[i]);
threads[i] = 0;
}
}
/* All threads exited. Do a final cleanup pass just in case. */
for (size_t i = 0; i < n_threads; ++i) {
safer_shutdown(&args[i]);
}
@ -398,3 +394,29 @@ sig_handler(const int sig)
stop_server = 1;
return;
}
static void
cleanup_threadpool(pthread_t * threads,
thread_args_t * args,
int n_threads)
{
#ifdef USE_NONBLOCK_JOIN
for (size_t i = 0; i < n_threads; ++i) {
if (threads[i]) {
pthread_tryjoin_np(threads[i], NULL);
printf("info: joined thread: %ld\n", threads[i]);
threads[i] = 0;
}
}
#else
for (size_t i = 0; i < n_threads; ++i) {
if (threads[i] && args[i].done == 1) {
pthread_join(threads[i], NULL);
printf("info: joined thread: %ld\n", threads[i]);
threads[i] = 0;
}
}
#endif
return;
}