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

Merged revisions 169364 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r169364 | tilghman | 2009-01-19 13:49:25 -0600 (Mon, 19 Jan 2009) | 4 lines
  
  Truncate userevents at the end of a line, when the command exceeds the buffer.
  (closes issue #14278)
   Reported by: fnordian
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@169365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-01-19 20:05:52 +00:00
parent ffb3f301af
commit 071301029c
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/app_userevent.c
View File

@@ -58,15 +58,22 @@ static char *app = "UserEvent";
static int userevent_exec(struct ast_channel *chan, void *data)
{
char *parse, buf[2048] = "";
int x, buflen = 0;
char *parse;
int x;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(eventname);
AST_APP_ARG(extra)[100];
);
struct ast_str *body = ast_str_create(16);
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "UserEvent requires an argument (eventname,optional event body)\n");
ast_free(body);
return -1;
}
if (!body) {
ast_log(LOG_WARNING, "Unable to allocate buffer\n");
return -1;
}
@@ -75,13 +82,11 @@ static int userevent_exec(struct ast_channel *chan, void *data)
AST_STANDARD_APP_ARGS(args, parse);
for (x = 0; x < args.argc - 1; x++) {
ast_copy_string(buf + buflen, args.extra[x], sizeof(buf) - buflen - 2);
buflen += strlen(args.extra[x]);
ast_copy_string(buf + buflen, "\r\n", 3);
buflen += 2;
ast_str_append(&body, 0, "%s\r\n", args.extra[x]);
}
manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", args.eventname, buf);
manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", args.eventname, ast_str_buffer(body));
ast_free(body);
return 0;
}

13
main/manager.c
View File

@@ -910,6 +910,8 @@ static int send_string(struct mansession *s, char *string)
* initialize the thread local storage key.
*/
AST_THREADSTORAGE(astman_append_buf);
AST_THREADSTORAGE(userevent_buf);
/*! \brief initial allocated size for the astman_append_buf */
#define ASTMAN_APPEND_BUF_INITSIZE 256
@@ -2599,18 +2601,15 @@ static char mandescr_userevent[] =
static int action_userevent(struct mansession *s, const struct message *m)
{
const char *event = astman_get_header(m, "UserEvent");
char body[2048] = "";
int x, bodylen = 0;
struct ast_str *body = ast_str_thread_get(&userevent_buf, 16);
int x;
for (x = 0; x < m->hdrcount; x++) {
if (strncasecmp("UserEvent:", m->headers[x], strlen("UserEvent:"))) {
ast_copy_string(body + bodylen, m->headers[x], sizeof(body) - bodylen - 3);
bodylen += strlen(m->headers[x]);
ast_copy_string(body + bodylen, "\r\n", 3);
bodylen += 2;
ast_str_append(&body, 0, "%s\r\n", m->headers[x]);
}
}
manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", event, body);
manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", event, ast_str_buffer(body));
return 0;
}