kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 259531 via svnmerge from

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

........
  r259531 | rmudgett | 2010-04-27 16:53:07 -0500 (Tue, 27 Apr 2010) | 11 lines
  
  DAHDI "WARNING" message is confusing and vague
  
  "WARNING[28406]: chan_dahdi.c:6873 ss_thread: CallerID feed failed: Success"
  
  Changed the warning to "Failed to decode CallerID on channel 'name'".  The
  message before it is likely more specific about why the CallerID decode
  failed.
  
  SWP-501
  AST-283
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@259538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2010-04-27 22:18:09 +00:00
parent 5fd23b2ed4
commit 4e3269c60d
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
channels/chan_dahdi.c
View File

@@ -1685,9 +1685,12 @@ static int my_get_callerid(void *pvt, char *namebuf, char *numbuf, enum analog_e
} else {
res = callerid_feed(p->cs, buf, res, AST_LAW(p));
}
if (res < 0) {
ast_log(LOG_WARNING, "CallerID feed failed: %s\n", strerror(errno));
/*
* The previous diagnostic message output likely
* explains why it failed.
*/
ast_log(LOG_WARNING, "Failed to decode CallerID\n");
return -1;
}
@@ -9789,9 +9792,14 @@ static void *analog_ss_thread(void *data)
} else {
res = callerid_feed(cs, buf, res, AST_LAW(p));
}
if (res < 0) {
ast_log(LOG_WARNING, "CallerID feed failed on channel '%s'\n", chan->name);
/*
* The previous diagnostic message output likely
* explains why it failed.
*/
ast_log(LOG_WARNING,
"Failed to decode CallerID on channel '%s'\n",
chan->name);
break;
} else if (res)
break;
@@ -10056,7 +10064,13 @@ static void *analog_ss_thread(void *data)
samples += res;
res = callerid_feed(cs, buf, res, AST_LAW(p));
if (res < 0) {
ast_log(LOG_WARNING, "CallerID feed failed: %s\n", strerror(errno));
/*
* The previous diagnostic message output likely
* explains why it failed.
*/
ast_log(LOG_WARNING,
"Failed to decode CallerID on channel '%s'\n",
chan->name);
break;
} else if (res)
break;
@@ -10321,7 +10335,11 @@ static void *mwi_thread(void *data)
samples += res;
if (!spill_done) {
if ((spill_result = callerid_feed(cs, mtd->buf, res, AST_LAW(mtd->pvt))) < 0) {
ast_log(LOG_WARNING, "CallerID feed failed: %s\n", strerror(errno));
/*
* The previous diagnostic message output likely
* explains why it failed.
*/
ast_log(LOG_WARNING, "Failed to decode CallerID\n");
break;
} else if (spill_result) {
spill_done = 1;