kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-24 21:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge the changes from my ast_cli_tls branch ...

Browse Source 
Instead of having a static buffer size of 16k, start out with 256 bytes and
increase the size of the buffer as needed.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38223 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-07-26 07:48:48 +00:00
parent d86d8ebdff
commit d3a4d776df
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cli.c
View File

@@ -54,8 +54,8 @@ extern unsigned long global_fin, global_fout;
static pthread_key_t ast_cli_buf_key;
static pthread_once_t ast_cli_buf_once = PTHREAD_ONCE_INIT;
/*! \brief Maximum length of resulting strings in ast_cli() */
#define AST_CLI_MAXSTRLEN 16384
/*! \brief Initial buffer size for resulting strings in ast_cli() */
#define AST_CLI_MAXSTRLEN 256
static void ast_cli_buf_key_create(void)
{
@@ -64,23 +64,36 @@ static void ast_cli_buf_key_create(void)
void ast_cli(int fd, char *fmt, ...)
{
char *buf;
struct {
size_t len;
char str[0];
} *buf;
int res;
va_list ap;
pthread_once(&ast_cli_buf_once, ast_cli_buf_key_create);
if (!(buf = pthread_getspecific(ast_cli_buf_key))) {
if (!(buf = ast_malloc(AST_CLI_MAXSTRLEN)))
if (!(buf = ast_malloc(AST_CLI_MAXSTRLEN + sizeof(*buf))))
return;
buf->len = AST_CLI_MAXSTRLEN;
pthread_setspecific(ast_cli_buf_key, buf);
}
va_start(ap, fmt);
res = vsnprintf(buf, AST_CLI_MAXSTRLEN, fmt, ap);
res = vsnprintf(buf->str, buf->len, fmt, ap);
while (res >= buf->len) {
if (!(buf = ast_realloc(buf, (buf->len * 2) + sizeof(*buf)))) {
va_end(ap);
return;
}
buf->len *= 2;
pthread_setspecific(ast_cli_buf_key, buf);
res = vsnprintf(buf->str, buf->len, fmt, ap);
}
va_end(ap);
if (res > 0)
ast_carefulwrite(fd, buf, strlen(buf), 100);
ast_carefulwrite(fd, buf->str, strlen(buf->str), 100);
}
static AST_LIST_HEAD_STATIC(helpers, ast_cli_entry);