aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-27 21:53:07 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-27 21:53:07 +0000
commit6d44533c78b139bea2377656a2f0397d77afecc9 (patch)
tree38455e3d5fa4450889e72d4c53cf86c7ae30f048
parent14b1d823ba4b4d21d0a6425838e9d56359a43ca8 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@259531 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_dahdi.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 841aa405b..28bdebe28 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -6683,9 +6683,14 @@ static void *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;
@@ -6906,7 +6911,13 @@ static void *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;