kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-02 04:53:32 -07:00
Code Issues Packages Projects Releases Wiki Activity

app_dial: Include channel name in warnings during wait_for_answer.

Browse Source 
Include the channel name in warnings during wait_for_answer to make
them more useful and allow problematic channels to be easily identified.

Resolves: #1802
This commit is contained in:
Naveen Albert
2026-02-28 18:12:08 -05:00
parent 98a8a1298c
commit d0bf950a4f
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/app_dial.c
+7 -13
View File
@@ -1807,7 +1807,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
}
break;
default:
ast_debug(1, "Dunno what to do with control type %d\n", f->subclass.integer);
ast_debug(1, "Dunno what to do with control type %d on %s\n", f->subclass.integer, ast_channel_name(in));
break;
}
break;
@@ -1824,14 +1824,14 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
/* Fall through */
case AST_FRAME_TEXT:
if (single && ast_write(in, f)) {
ast_log(LOG_WARNING, "Unable to write frametype: %u\n",
f->frametype);
ast_log(LOG_WARNING, "Unable to write frametype %u on %s\n",
f->frametype, ast_channel_name(in));
}
break;
case AST_FRAME_HTML:
if (single && !ast_test_flag64(outgoing, DIAL_NOFORWARDHTML)
&& ast_channel_sendhtml(in, f->subclass.integer, f->data.ptr, f->datalen) == -1) {
ast_log(LOG_WARNING, "Unable to send URL\n");
ast_log(LOG_WARNING, "Unable to send URL on %s\n", ast_channel_name(in));
}
break;
default:
@@ -1841,12 +1841,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
} /* end for */
if (winner == in) {
struct ast_frame *f = ast_read(in);
#if 0
if (f && (f->frametype != AST_FRAME_VOICE))
printf("Frame type: %d, %d\n", f->frametype, f->subclass);
else if (!f || (f->frametype != AST_FRAME_VOICE))
printf("Hangup received on %s\n", in->name);
#endif
if (!f || ((f->frametype == AST_FRAME_CONTROL) && (f->subclass.integer == AST_CONTROL_HANGUP))) {
/* Got hung up */
*to_answer = -1;
@@ -1917,7 +1911,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
/* Forward HTML stuff */
if (!ast_test_flag64(o, DIAL_NOFORWARDHTML)
&& ast_channel_sendhtml(o->chan, f->subclass.integer, f->data.ptr, f->datalen) == -1) {
ast_log(LOG_WARNING, "Unable to send URL\n");
ast_log(LOG_WARNING, "Unable to send URL on %s\n", ast_channel_name(o->chan));
}
break;
case AST_FRAME_VIDEO:
@@ -1936,8 +1930,8 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
case AST_FRAME_DTMF_BEGIN:
case AST_FRAME_DTMF_END:
if (ast_write(o->chan, f)) {
ast_log(LOG_WARNING, "Unable to forward frametype: %u\n",
f->frametype);
ast_log(LOG_WARNING, "Unable to forward frametype %u on %s\n",
f->frametype, ast_channel_name(o->chan));
}
break;
case AST_FRAME_CONTROL: