From 0bc611f5556f9ce529d3c1c4bdbaf340b6daf02d Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 30 Jul 2007 19:13:31 +0000 Subject: [PATCH] (closes issue #10279) Reported by: seanbright Patches: res_agi.carefulwrite.1.4.07252007.patch uploaded by seanbright (license 71) res_agi.carefulwrite.trunk.07252007.patch uploaded by seanbright (license 71) Allow the "agi_network: yes" line to be printed out in the AGI debug output. Also, allow partial writes to be handled when writing out this line just like it is for all of the others. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@77788 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_agi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/res/res_agi.c b/res/res_agi.c index 208ddb268f..e1c96b04b0 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -115,7 +115,7 @@ enum agi_result { AGI_RESULT_HANGUP }; -static void agi_debug_cli(int fd, char *fmt, ...) +static int agi_debug_cli(int fd, char *fmt, ...) { char *stuff; int res = 0; @@ -129,9 +129,11 @@ static void agi_debug_cli(int fd, char *fmt, ...) } else { if (agidebug) ast_verbose("AGI Tx >> %s", stuff); /* \n provided by caller */ - ast_carefulwrite(fd, stuff, strlen(stuff), 100); + res = ast_carefulwrite(fd, stuff, strlen(stuff), 100); free(stuff); } + + return res; } /* launch_netscript: The fastagi handler. @@ -210,8 +212,8 @@ static enum agi_result launch_netscript(char *agiurl, char *argv[], int *fds, in return AGI_RESULT_FAILURE; } } - /* XXX in theory should check for partial writes... */ - while (write(s, "agi_network: yes\n", strlen("agi_network: yes\n")) < 0) { + + if (fdprintf(s, "agi_network: yes\n") < 0) { if (errno != EINTR) { ast_log(LOG_WARNING, "Connect to '%s' failed: %s\n", agiurl, strerror(errno)); close(s);