diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 230f9c830..3dad454d5 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1363,6 +1363,11 @@ static void __quit_handler(int num) * is going to exit */ } +static void __remote_quit_handler(int num) +{ + sig_flags.need_quit = 1; +} + static const char *fix_header(char *outbuf, int maxout, const char *s, char *cmp) { const char *c; @@ -2306,6 +2311,11 @@ static void ast_remotecontrol(char *data) char *ebuf; int num = 0; + memset(&sig_flags, 0, sizeof(sig_flags)); + signal(SIGINT, __remote_quit_handler); + signal(SIGTERM, __remote_quit_handler); + signal(SIGHUP, __remote_quit_handler); + if (read(ast_consock, buf, sizeof(buf)) < 0) { ast_log(LOG_ERROR, "read() failed: %s\n", strerror(errno)); return; @@ -2313,6 +2323,9 @@ static void ast_remotecontrol(char *data) if (data) { if (write(ast_consock, data, strlen(data) + 1) < 0) { ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno)); + if (sig_flags.need_quit == 1) { + return; + } } } stringp = buf; @@ -2358,6 +2371,10 @@ static void ast_remotecontrol(char *data) char buf[512] = "", *curline = buf, *nextline; int not_written = 1; + if (sig_flags.need_quit == 1) { + break; + } + if (read(ast_consock, buf, sizeof(buf) - 1) <= 0) { break; } @@ -2389,6 +2406,10 @@ static void ast_remotecontrol(char *data) for (;;) { ebuf = (char *)el_gets(el, &num); + if (sig_flags.need_quit == 1) { + break; + } + if (!ebuf && write(1, "", 1) < 0) break; |