Skip to content

Commit

Permalink
outbound: use core/rthreads.h
Browse files Browse the repository at this point in the history
  • Loading branch information
space88man committed Jan 31, 2024
1 parent 8a1c383 commit 94f6df5
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions src/modules/outbound/outbound_mod.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
#include "../../core/parser/parse_uri.h"
#include "../../core/parser/parse_supported.h"

#define KSR_RTHREAD_SKIP_P
#define KSR_RTHREAD_NEED_V
#include "../../core/rthreads.h"

#include "api.h"
#include "config.h"

Expand Down Expand Up @@ -75,26 +79,25 @@ struct module_exports exports = {
destroy /* destroy function */
};

static void *mod_init_openssl(void *arg) {
if(flow_token_secret.s) {
assert(ob_key.len == SHA_DIGEST_LENGTH);
LM_DBG("flow_token_secret mod param set. use persistent ob_key");
static void mod_init_openssl(void)
{
if(flow_token_secret.s) {
assert(ob_key.len == SHA_DIGEST_LENGTH);
LM_DBG("flow_token_secret mod param set. use persistent ob_key");
#if OPENSSL_VERSION_NUMBER < 0x030000000L
SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len,
(unsigned char *)ob_key.s);
SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len,
(unsigned char *)ob_key.s);
#else
EVP_Q_digest(NULL, "SHA1", NULL, flow_token_secret.s,
flow_token_secret.len, (unsigned char *)ob_key.s, NULL);
EVP_Q_digest(NULL, "SHA1", NULL, flow_token_secret.s,
flow_token_secret.len, (unsigned char *)ob_key.s, NULL);
#endif
} else {
if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) {
LM_ERR("unable to get %d cryptographically strong pseudo-"
"random bytes\n",
ob_key.len);
}
}

return NULL;
} else {
if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) {
LM_ERR("unable to get %d cryptographically strong pseudo-"
"random bytes\n",
ob_key.len);
}
}
}

static int mod_init(void)
Expand All @@ -116,12 +119,9 @@ static int mod_init(void)
ob_key.len = OB_KEY_LEN;

#if OPENSSL_VERSION_NUMBER < 0x010101000L
mod_init_openssl(NULL);
mod_init_openssl(NULL);
#else
pthread_t tid;
void *retval;
pthread_create(&tid, NULL, mod_init_openssl, NULL);
pthread_join(tid, &retval);
run_threadV(mod_init_openssl);
#endif

if(cfg_declare("outbound", outbound_cfg_def, &default_outbound_cfg,
Expand Down

0 comments on commit 94f6df5

Please sign in to comment.