kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve a load-time problem avoiding a call to console_do_answer.

Browse Source 
On passing, fix dialling from the keypad.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2008-01-07 11:22:01 +00:00
parent 4f0cb30f4a
commit eb86067cba
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/console_gui.c
View File

@@ -251,6 +251,12 @@ static void append_char(char *str, int *str_pos, const char c)
*str_pos = i;
}
static void append_string(char *str, int *str_pos, const char *s)
{
while (*s)
append_char(str, str_pos, *s++);
}
/* accumulate digits, possibly call dial if in connected mode */
static void keypad_digit(struct video_desc *env, int digit)
{
@@ -316,12 +322,12 @@ static void keypad_pick_up(struct video_desc *env)
ast_log(LOG_WARNING, "keypad_pick_up called\n");
if (env->owner) { /* someone is calling us, just answer */
console_do_answer(-1);
ast_cli_command(gui->outfd, "console answer");
} else if (gui->inbuf_pos) { /* we have someone to call */
ast_cli_command(gui->outfd, gui->inbuf);
}
append_char(gui->inbuf, &gui->inbuf_pos, '\0'); /* clear buffer */
append_string(gui->inbuf, &gui->inbuf_pos, "console dial ");
}
#if 0 /* still unused */
@@ -626,6 +632,7 @@ static struct gui_info *gui_init(const char *keypad_file)
/* initialize keyboard buffer */
append_char(gui->inbuf, &gui->inbuf_pos, '\0');
append_string(gui->inbuf, &gui->inbuf_pos, "console dial ");
append_char(gui->msgbuf, &gui->msgbuf_pos, '\0');
keypad_setup(gui, keypad_file);