kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix event_socket bugs 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2430 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-08-29 20:27:43 +00:00
parent 55ad44edf9
commit 884cfc4465
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_utils.h
View File

@ -61,7 +61,7 @@ BEGIN_EXTERN_C
!strcasecmp(expr, "true") ||\ !strcasecmp(expr, "true") ||\
atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE
#define SWITCH_STATUS_IS_BREAK(x) (x || x == SWITCH_STATUS_BREAK || x == 730035 || x == 35) #define SWITCH_STATUS_IS_BREAK(x) (x == SWITCH_STATUS_BREAK || x == 730035 || x == 35)
/*! /*!
\brief Return a printable name of a switch_priority_t \brief Return a printable name of a switch_priority_t

21
src/mod/event_handlers/mod_event_socket/mod_event_socket.c
View File

@ -31,7 +31,6 @@
*/ */
#include <switch.h> #include <switch.h>
#define CMD_BUFLEN 1024 * 1000 #define CMD_BUFLEN 1024 * 1000
#define IS_BREAK(x) ((int)x || SWITCH_STATUS_BREAK || (int)x == 730035 || (int)x == 35)
static const char modname[] = "mod_event_socket"; static const char modname[] = "mod_event_socket";
static char *MARKER = "1"; static char *MARKER = "1";
@ -68,6 +67,7 @@ typedef struct listener listener_t;
static struct { static struct {
switch_socket_t *sock; switch_socket_t *sock;
switch_mutex_t *mutex; switch_mutex_t *mutex;
switch_mutex_t *sock_mutex;
listener_t *listeners; listener_t *listeners;
uint8_t ready; uint8_t ready;
} listen_list; } listen_list;
@ -152,25 +152,28 @@ static switch_loadable_module_interface_t event_socket_module_interface = {
static void close_socket(switch_socket_t **sock) { static void close_socket(switch_socket_t **sock) {
switch_mutex_lock(listen_list.sock_mutex);
if (*sock) { if (*sock) {
apr_socket_shutdown(*sock, APR_SHUTDOWN_READWRITE); apr_socket_shutdown(*sock, APR_SHUTDOWN_READWRITE);
switch_socket_close(*sock); switch_socket_close(*sock);
*sock = NULL; *sock = NULL;
} }
switch_mutex_unlock(listen_list.sock_mutex);
} }
SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void)
{ {
listener_t *l; listener_t *l;
close_socket(&listen_list.sock);
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(listen_list.mutex);
for (l = listen_list.listeners; l; l = l->next) { for (l = listen_list.listeners; l; l = l->next) {
close_socket(&l->sock); close_socket(&l->sock);
} }
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(listen_list.mutex);
close_socket(&listen_list.sock);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -646,7 +649,7 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
} }
/* Create a thread for the conference and launch it */ /* Create a thread for the socket and launch it */
static void launch_listener_thread(listener_t *listener) static void launch_listener_thread(listener_t *listener)
{ {
switch_thread_t *thread; switch_thread_t *thread;
@ -718,7 +721,8 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
} }
switch_mutex_init(&listen_list.mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&listen_list.mutex, SWITCH_MUTEX_NESTED, pool);
switch_mutex_init(&listen_list.sock_mutex, SWITCH_MUTEX_NESTED, pool);
for(;;) { for(;;) {
rv = switch_sockaddr_info_get(&sa, prefs.ip, APR_INET, prefs.port, 0, pool); rv = switch_sockaddr_info_get(&sa, prefs.ip, APR_INET, prefs.port, 0, pool);
@ -767,11 +771,12 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
listener->sock = inbound_socket; listener->sock = inbound_socket;
listener->pool = listener_pool; listener->pool = listener_pool;
listener_pool = NULL;
listener->format = EVENT_FORMAT_PLAIN; listener->format = EVENT_FORMAT_PLAIN;
switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener_pool); switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool);
switch_core_hash_init(&listener->event_hash, listener_pool); switch_core_hash_init(&listener->event_hash, listener->pool);
launch_listener_thread(listener); launch_listener_thread(listener);
} }
close_socket(&listen_list.sock); close_socket(&listen_list.sock);