kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't build manager event output until it is needed

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-10-03 19:40:03 +00:00
parent 9835bc4330
commit d167235344
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
manager.c
View File

@@ -1474,18 +1474,11 @@ int manager_event(int category, char *event, char *fmt, ...)
{ {
struct mansession *s; struct mansession *s;
char auth[80]; char auth[80];
char tmp[4096]; char tmp[4096] = "";
char *tmp_next = tmp; char *tmp_next = tmp;
size_t tmp_left = sizeof(tmp) - 2; size_t tmp_left = sizeof(tmp) - 2;
va_list ap; va_list ap;
ast_build_string(&tmp_next, &tmp_left, "Event: %s\r\nPrivilege: %s\r\n",
event, authority_to_str(category, auth, sizeof(auth)));
va_start(ap, fmt);
ast_build_string_va(&tmp_next, &tmp_left, fmt, ap);
va_end(ap);
strcat(tmp, "\r\n");
ast_mutex_lock(&sessionlock); ast_mutex_lock(&sessionlock);
for (s = sessions; s; s = s->next) { for (s = sessions; s; s = s->next) {
if ((s->readperm & category) != category) if ((s->readperm & category) != category)
@@ -1494,10 +1487,21 @@ int manager_event(int category, char *event, char *fmt, ...)
if ((s->send_events & category) != category) if ((s->send_events & category) != category)
continue; continue;
if (ast_strlen_zero(tmp)) {
ast_build_string(&tmp_next, &tmp_left, "Event: %s\r\nPrivilege: %s\r\n",
event, authority_to_str(category, auth, sizeof(auth)));
va_start(ap, fmt);
ast_build_string_va(&tmp_next, &tmp_left, fmt, ap);
va_end(ap);
*tmp_next++ = '\r';
*tmp_next++ = '\n';
*tmp_next = '\0';
}
ast_mutex_lock(&s->__lock); ast_mutex_lock(&s->__lock);
if (s->busy) { if (s->busy) {
append_event(s, tmp); append_event(s, tmp);
} else if (ast_carefulwrite(s->fd, tmp, sizeof(tmp) - tmp_left + 1, 100) < 0) { } else if (ast_carefulwrite(s->fd, tmp, tmp_next - tmp, 100) < 0) {
ast_log(LOG_WARNING, "Disconnecting slow (or gone) manager session!\n"); ast_log(LOG_WARNING, "Disconnecting slow (or gone) manager session!\n");
s->dead = 1; s->dead = 1;
pthread_kill(s->t, SIGURG); pthread_kill(s->t, SIGURG);