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

Fixes for socket connection failures

This commit is contained in:
BSingh 2023-05-15 12:52:43 -07:00
parent 9b15516f23
commit 2a419ecda0
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mod/event_handlers/mod_erlang_event/ei_helpers.c
View File

@ -65,8 +65,6 @@ void ei_link(listener_t *listener, erlang_pid * from, erlang_pid * to)
char *s; char *s;
int index = 0; int index = 0;
int status = SWITCH_STATUS_SUCCESS; int status = SWITCH_STATUS_SUCCESS;
switch_socket_t *sock = NULL;
switch_os_sock_put(&sock, &listener->sockdes, listener->pool);
index = 5; /* max sizes: */ index = 5; /* max sizes: */
ei_encode_version(msgbuf, &index); /* 1 */ ei_encode_version(msgbuf, &index); /* 1 */
@ -81,12 +79,9 @@ void ei_link(listener_t *listener, erlang_pid * from, erlang_pid * to)
put8(s, ERL_PASS_THROUGH); /* 1 */ put8(s, ERL_PASS_THROUGH); /* 1 */
/* sum: 542 */ /* sum: 542 */
switch_mutex_lock(listener->sock_mutex); if (write(listener->sockdes, msgbuf, index) == -1) {
status = switch_socket_send(sock, msgbuf, (switch_size_t *) &index); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to link to process on %s, status:%d\n", listener->peer_nodename, status);
if (status != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to link to process on %s\n", listener->peer_nodename);
} }
switch_mutex_unlock(listener->sock_mutex);
} }
void ei_encode_switch_event_headers(ei_x_buff * ebuf, switch_event_t *event) void ei_encode_switch_event_headers(ei_x_buff * ebuf, switch_event_t *event)

6
src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
View File

@ -973,7 +973,7 @@ static void listener_main_loop(listener_t *listener)
int status = 1; int status = 1;
int msgs_sent = 0; /* how many messages we sent in a loop */ int msgs_sent = 0; /* how many messages we sent in a loop */
while ((status >= 0 || erl_errno == ETIMEDOUT || erl_errno == EAGAIN) && !prefs.done) { while ((status >= 0 || erl_errno == ETIMEDOUT || erl_errno == EAGAIN || erl_errno == 0) && !prefs.done) {
erlang_msg msg; erlang_msg msg;
ei_x_buff buf; ei_x_buff buf;
ei_x_buff rbuf; ei_x_buff rbuf;
@ -1937,6 +1937,10 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_erlang_event_load)
switch_application_interface_t *app_interface; switch_application_interface_t *app_interface;
switch_api_interface_t *api_interface; switch_api_interface_t *api_interface;
#if (ERLANG_MAJOR == 10 && ERLANG_MINOR >= 3) || ERLANG_MAJOR >= 11
ei_init();
#endif
module_pool = pool; module_pool = pool;
memset(&prefs, 0, sizeof(prefs)); memset(&prefs, 0, sizeof(prefs));