kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 232587 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r232587 | diruggles | 2009-12-02 17:17:22 -0500 (Wed, 02 Dec 2009) | 12 lines
  
  Prevent double closing of FDs by EIVR
  
  This caused a problem when asterisk was under heavy load and running both AGI and EIVR applications.
  EIVR would close an FD at which point it would be considered freed and be used by a new AGI instance
  the second close would then close the FD now in use by AGI.
  
  (closes issue #16305)
  Reported by: diLLec
  Tested by: thedavidfactor, diLLec
  
  Review: https://reviewboard.asterisk.org/r/436/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@232812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Ruggles
2009-12-03 15:03:20 +00:00
parent aa73b84593
commit 570306ae70
1 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
apps/app_externalivr.c
View File

@@ -107,7 +107,7 @@ struct gen_state {
}; };
static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
int eivr_events_fd, int eivr_commands_fd, int eivr_errors_fd, int *eivr_events_fd, int *eivr_commands_fd, int *eivr_errors_fd,
const struct ast_str *args, const struct ast_flags flags); const struct ast_str *args, const struct ast_flags flags);
int eivr_connect_socket(struct ast_channel *chan, const char *host, int port); int eivr_connect_socket(struct ast_channel *chan, const char *host, int port);
@@ -316,9 +316,9 @@ static int app_exec(struct ast_channel *chan, void *data)
struct ast_flags flags = { 0, }; struct ast_flags flags = { 0, };
char *opts[0]; char *opts[0];
struct playlist_entry *entry; struct playlist_entry *entry;
int child_stdin[2] = { 0, 0 }; int child_stdin[2] = { -1, -1 };
int child_stdout[2] = { 0, 0 }; int child_stdout[2] = { -1, -1 };
int child_stderr[2] = { 0, 0 }; int child_stderr[2] = { -1, -1 };
int res = -1; int res = -1;
int pid; int pid;
@@ -441,10 +441,9 @@ static int app_exec(struct ast_channel *chan, void *data)
if (!(ser = ast_tcptls_client_create(&ivr_desc)) || !(ser = ast_tcptls_client_start(ser))) { if (!(ser = ast_tcptls_client_create(&ivr_desc)) || !(ser = ast_tcptls_client_start(ser))) {
goto exit; goto exit;
} }
res = eivr_comm(chan, u, ser->fd, ser->fd, -1, pipe_delim_args, flags); res = eivr_comm(chan, u, &ser->fd, &ser->fd, NULL, pipe_delim_args, flags);
} else { } else {
if (pipe(child_stdin)) { if (pipe(child_stdin)) {
ast_chan_log(LOG_WARNING, chan, "Could not create pipe for child input: %s\n", strerror(errno)); ast_chan_log(LOG_WARNING, chan, "Could not create pipe for child input: %s\n", strerror(errno));
goto exit; goto exit;
@@ -479,47 +478,48 @@ static int app_exec(struct ast_channel *chan, void *data)
} else { } else {
/* parent process */ /* parent process */
close(child_stdin[0]); close(child_stdin[0]);
child_stdin[0] = 0; child_stdin[0] = -1;
close(child_stdout[1]); close(child_stdout[1]);
child_stdout[1] = 0; child_stdout[1] = -1;
close(child_stderr[1]); close(child_stderr[1]);
child_stderr[1] = 0; child_stderr[1] = -1;
res = eivr_comm(chan, u, child_stdin[1], child_stdout[0], child_stderr[0], pipe_delim_args, flags); res = eivr_comm(chan, u, &child_stdin[1], &child_stdout[0], &child_stderr[0], pipe_delim_args, flags);
} }
} }
exit: exit:
if (u->gen_active) if (u->gen_active) {
ast_deactivate_generator(chan); ast_deactivate_generator(chan);
}
if (child_stdin[0]) if (child_stdin[0] > -1) {
close(child_stdin[0]); close(child_stdin[0]);
}
if (child_stdin[1]) if (child_stdin[1] > -1) {
close(child_stdin[1]); close(child_stdin[1]);
}
if (child_stdout[0]) if (child_stdout[0] > -1) {
close(child_stdout[0]); close(child_stdout[0]);
}
if (child_stdout[1]) if (child_stdout[1] > -1) {
close(child_stdout[1]); close(child_stdout[1]);
}
if (child_stderr[0]) if (child_stderr[0] > -1) {
close(child_stderr[0]); close(child_stderr[0]);
}
if (child_stderr[1]) if (child_stderr[1] > -1) {
close(child_stderr[1]); close(child_stderr[1]);
}
if (ser) { if (ser) {
ao2_ref(ser, -1); ao2_ref(ser, -1);
} }
while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) {
ast_free(entry); ast_free(entry);
}
return res; return res;
} }
static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
int eivr_events_fd, int eivr_commands_fd, int eivr_errors_fd, int *eivr_events_fd, int *eivr_commands_fd, int *eivr_errors_fd,
const struct ast_str *args, const struct ast_flags flags) const struct ast_str *args, const struct ast_flags flags)
{ {
struct playlist_entry *entry; struct playlist_entry *entry;
@@ -527,7 +527,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
int ms; int ms;
int exception; int exception;
int ready_fd; int ready_fd;
int waitfds[2] = { eivr_commands_fd, eivr_errors_fd }; int waitfds[2] = { *eivr_commands_fd, (eivr_errors_fd) ? *eivr_errors_fd : -1 };
struct ast_channel *rchan; struct ast_channel *rchan;
char *command; char *command;
int res = -1; int res = -1;
@@ -538,16 +538,16 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
FILE *eivr_errors = NULL; FILE *eivr_errors = NULL;
FILE *eivr_events = NULL; FILE *eivr_events = NULL;
if (!(eivr_events = fdopen(eivr_events_fd, "w"))) { if (!(eivr_events = fdopen(*eivr_events_fd, "w"))) {
ast_chan_log(LOG_WARNING, chan, "Could not open stream to send events\n"); ast_chan_log(LOG_WARNING, chan, "Could not open stream to send events\n");
goto exit; goto exit;
} }
if (!(eivr_commands = fdopen(eivr_commands_fd, "r"))) { if (!(eivr_commands = fdopen(*eivr_commands_fd, "r"))) {
ast_chan_log(LOG_WARNING, chan, "Could not open stream to receive commands\n"); ast_chan_log(LOG_WARNING, chan, "Could not open stream to receive commands\n");
goto exit; goto exit;
} }
if (eivr_errors_fd > -1) { /* if opening a socket connection, error stream will not be used */ if (eivr_errors_fd) { /* if opening a socket connection, error stream will not be used */
if (!(eivr_errors = fdopen(eivr_errors_fd, "r"))) { if (!(eivr_errors = fdopen(*eivr_errors_fd, "r"))) {
ast_chan_log(LOG_WARNING, chan, "Could not open stream to receive errors\n"); ast_chan_log(LOG_WARNING, chan, "Could not open stream to receive errors\n");
goto exit; goto exit;
} }
@@ -587,7 +587,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
errno = 0; errno = 0;
exception = 0; exception = 0;
rchan = ast_waitfor_nandfds(&chan, 1, waitfds, (eivr_errors_fd < 0) ? 1 : 2, &exception, &ready_fd, &ms); rchan = ast_waitfor_nandfds(&chan, 1, waitfds, (eivr_errors_fd) ? 2 : 1, &exception, &ready_fd, &ms);
if (chan->_state == AST_STATE_UP && !AST_LIST_EMPTY(&u->finishlist)) { if (chan->_state == AST_STATE_UP && !AST_LIST_EMPTY(&u->finishlist)) {
AST_LIST_LOCK(&u->finishlist); AST_LIST_LOCK(&u->finishlist);
@@ -632,10 +632,10 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
break; break;
} }
ast_frfree(f); ast_frfree(f);
} else if (ready_fd == eivr_commands_fd) { } else if (ready_fd == *eivr_commands_fd) {
char input[1024]; char input[1024];
if (exception || (dup2(eivr_commands_fd, test_available_fd) == -1) || feof(eivr_commands)) { if (exception || (dup2(*eivr_commands_fd, test_available_fd) == -1) || feof(eivr_commands)) {
ast_chan_log(LOG_WARNING, chan, "Child process went away\n"); ast_chan_log(LOG_WARNING, chan, "Child process went away\n");
res = -1; res = -1;
break; break;
@@ -754,7 +754,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
else else
ast_chan_log(LOG_WARNING, chan, "Unknown option requested '%s'\n", &input[2]); ast_chan_log(LOG_WARNING, chan, "Unknown option requested '%s'\n", &input[2]);
} }
} else if (eivr_errors_fd && ready_fd == eivr_errors_fd) { } else if (eivr_errors_fd && (ready_fd == *eivr_errors_fd)) {
char input[1024]; char input[1024];
if (exception || feof(eivr_errors)) { if (exception || feof(eivr_errors)) {
@@ -774,25 +774,24 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
break; break;
} }
} }
exit:
exit:
if (test_available_fd > -1) { if (test_available_fd > -1) {
close(test_available_fd); close(test_available_fd);
} }
if (eivr_events) {
if (eivr_events)
fclose(eivr_events); fclose(eivr_events);
*eivr_events_fd = -1;
if (eivr_commands) }
if (eivr_commands) {
fclose(eivr_commands); fclose(eivr_commands);
*eivr_commands_fd = -1;
if (eivr_errors) }
if (eivr_errors) {
fclose(eivr_errors); fclose(eivr_errors);
*eivr_errors_fd = -1;
}
return res; return res;
} }
static int unload_module(void) static int unload_module(void)