aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--channels/chan_dahdi.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index f9e3134d3..116270816 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7341,9 +7341,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;
@@ -7610,7 +7615,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;
@@ -7888,7 +7899,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;