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

Merged revisions 311141 via svnmerge from

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

................
  r311141 | mnicholson | 2011-03-17 10:00:33 -0500 (Thu, 17 Mar 2011) | 11 lines
  
  Merged revisions 311140 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r311140 | mnicholson | 2011-03-17 09:58:52 -0500 (Thu, 17 Mar 2011) | 4 lines
    
    Don't write items to the manager socket twice.
    
    AST-2011-003
    
    (closes issue 0018987)
    Reported by: ks-steven
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2011-03-17 15:02:12 +00:00
parent 08828045b1
commit 581bfad2f3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/manager.c
View File

@@ -1837,6 +1837,9 @@ int ast_hook_send_action(struct manager_custom_hook *hook, const char *msg)
static int send_string(struct mansession *s, char *string) static int send_string(struct mansession *s, char *string)
{ {
int res; int res;
FILE *f = s->f ? s->f : s->session->f;
int fd = s->f ? s->fd : s->session->fd;
/* It's a result from one of the hook's action invocation */ /* It's a result from one of the hook's action invocation */
if (s->hook) { if (s->hook) {
/* /*
@@ -1845,9 +1848,9 @@ static int send_string(struct mansession *s, char *string)
*/ */
s->hook->helper(EVENT_FLAG_HOOKRESPONSE, "HookResponse", string); s->hook->helper(EVENT_FLAG_HOOKRESPONSE, "HookResponse", string);
return 0; return 0;
} else if (s->f && (res = ast_careful_fwrite(s->f, s->fd, string, strlen(string), s->session->writetimeout))) { }
s->write_error = 1;
} else if ((res = ast_careful_fwrite(s->session->f, s->session->fd, string, strlen(string), s->session->writetimeout))) { if ((res = ast_careful_fwrite(f, fd, string, strlen(string), s->session->writetimeout))) {
s->write_error = 1; s->write_error = 1;
} }