mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-10-26 20:41:07 +01:00
Code Issues Projects Releases Wiki Activity

auth server code cleaning

Browse Source
This commit is contained in:
mom040267 2014-12-20 22:21:00 +00:00
parent 6b291a8238
commit 87cd2366c7
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apps/relay/dbdrivers/dbd_redis.c
View File

@ -161,6 +161,7 @@ static Ryconninfo *RyconninfoParse(const char *userdb, char **errmsg) {
}
redis_context_handle get_redis_async_connection(struct event_base *base, const char* connection_string, int delete_keys) {
redis_context_handle ret = NULL;
char *errmsg = NULL;

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

@ -110,7 +110,6 @@ NEV_UNKNOWN,
LOW_DEFAULT_PORTS_BOUNDARY,HIGH_DEFAULT_PORTS_BOUNDARY,0,0,0,"",
0,NULL,0,NULL,DEFAULT_GENERAL_RELAY_SERVERS_NUMBER,0,
////////////// Auth server /////////////////////////////////////
{NULL,NULL,NULL,0,NULL},
"","",0,
/////////////// AUX SERVERS ////////////////
{NULL,0,{0,NULL}},0,
@ -1884,8 +1883,6 @@ int main(int argc, char **argv)
STRCPY(turn_params.default_users_db.persistent_users_db.userdb,DEFAULT_USERDB_FILE);
#endif
update_white_and_black_lists();
argc -= optind;
argv += optind;

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

@ -160,16 +160,6 @@ enum _NET_ENG_VERSION {
typedef enum _NET_ENG_VERSION NET_ENG_VERSION;
////////////// Auth Server Types ////////////////
struct auth_server {
struct event_base* event_base;
struct bufferevent *in_buf;
struct bufferevent *out_buf;
pthread_t thr;
redis_context_handle rch;
};
/////////// PARAMS //////////////////////////////////
typedef struct _turn_params_ {
@ -275,7 +265,6 @@ typedef struct _turn_params_ {
////////////// Auth server ////////////////
struct auth_server authserver;
char oauth_server_name[1025];
char domain[1025];
int oauth;

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

@ -37,6 +37,18 @@ static unsigned int barrier_count = 0;
static pthread_barrier_t barrier;
#endif
////////////// Auth Server ////////////////
struct auth_server {
struct event_base* event_base;
struct bufferevent *in_buf;
struct bufferevent *out_buf;
pthread_t thr;
redis_context_handle rch;
};
static struct auth_server authserver = {NULL,NULL,NULL,0,NULL};
//////////////////////////////////////////////
#define get_real_general_relay_servers_number() (turn_params.general_relay_servers_number > 1 ? turn_params.general_relay_servers_number : 1)
@ -356,7 +368,7 @@ static int handle_relay_message(relay_server_handle rs, struct message_to_relay
void send_auth_message_to_auth_server(struct auth_message *am)
{
struct evbuffer *output = bufferevent_get_output(turn_params.authserver.out_buf);
struct evbuffer *output = bufferevent_get_output(authserver.out_buf);
if(evbuffer_add(output,am,sizeof(struct auth_message))<0) {
fprintf(stderr,"%s: Weird buffer error\n",__FUNCTION__);
}
@ -1689,33 +1701,34 @@ static void* run_auth_server_thread(void *arg)
{
ignore_sigpipe();
ns_bzero(&turn_params.authserver,sizeof(struct auth_server));
struct auth_server *as = (struct auth_server*)arg;
turn_params.authserver.event_base = turn_event_base_new();
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,"IO method (auth thread): %s\n",event_base_get_method(turn_params.authserver.event_base));
ns_bzero(as,sizeof(struct auth_server));
as->event_base = turn_event_base_new();
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,"IO method (auth thread): %s\n",event_base_get_method(as->event_base));
struct bufferevent *pair[2];
bufferevent_pair_new(turn_params.authserver.event_base, TURN_BUFFEREVENTS_OPTIONS, pair);
turn_params.authserver.in_buf = pair[0];
turn_params.authserver.out_buf = pair[1];
bufferevent_setcb(turn_params.authserver.in_buf, auth_server_receive_message, NULL, NULL, &turn_params.authserver);
bufferevent_enable(turn_params.authserver.in_buf, EV_READ);
bufferevent_pair_new(as->event_base, TURN_BUFFEREVENTS_OPTIONS, pair);
as->in_buf = pair[0];
as->out_buf = pair[1];
bufferevent_setcb(as->in_buf, auth_server_receive_message, NULL, NULL, as);
bufferevent_enable(as->in_buf, EV_READ);
#if !defined(TURN_NO_HIREDIS)
turn_params.authserver.rch = get_redis_async_connection(turn_params.authserver.event_base, turn_params.redis_statsdb, 1);
as->rch = get_redis_async_connection(as->event_base, turn_params.redis_statsdb, 1);
#endif
struct auth_server *authserver = &turn_params.authserver;
struct event_base *eb = authserver->event_base;
struct event_base *eb = as->event_base;
barrier_wait();
while(run_auth_server_flag) {
reread_realms();
run_events(eb,NULL);
update_white_and_black_lists();
auth_ping(authserver->rch);
auth_ping(as->rch);
run_events(eb,NULL);
#if defined(DB_TEST)
run_db_test();
#endif
@ -1724,13 +1737,13 @@ static void* run_auth_server_thread(void *arg)
return arg;
}
static void setup_auth_server(void)
static void setup_auth_server(struct auth_server *as)
{
if(pthread_create(&(turn_params.authserver.thr), NULL, run_auth_server_thread, NULL)<0) {
if(pthread_create(&(as->thr), NULL, run_auth_server_thread, as)<0) {
perror("Cannot create auth thread\n");
exit(-1);
}
pthread_detach(turn_params.authserver.thr);
pthread_detach(as->thr);
}
static void* run_cli_server_thread(void *arg)
@ -1815,7 +1828,7 @@ void setup_server(void)
}
}
setup_auth_server();
setup_auth_server(&authserver);
if(use_cli)
setup_cli_server();