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

Add header string to libpri debug output.

Browse Source 
Add header string to libpri debug output so the libpri output can be
found/extracted easier from huge debug trace files.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-06-17 18:23:19 +00:00
parent cfec9cdf0d
commit f2dd8858ee
1 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_dahdi.c
+41 -24
View File
@@ -13826,17 +13826,22 @@ static void *mfcr2_monitor(void *data)
#endif
static void dahdi_pri_message(struct pri *pri, char *s)
{
int x, y;
int dchan = -1, span = -1, dchancount = 0;
int x;
int y;
int dchan = -1;
int span = -1;
int dchancount = 0;
if (pri) {
for (x = 0; x < NUM_SPANS; x++) {
for (y = 0; y < SIG_PRI_NUM_DCHANS; y++) {
if (pris[x].pri.dchans[y])
if (pris[x].pri.dchans[y]) {
dchancount++;
}
if (pris[x].pri.dchans[y] == pri)
if (pris[x].pri.dchans[y] == pri) {
dchan = y;
}
}
if (dchan >= 0) {
span = x;
@@ -13844,14 +13849,18 @@ static void dahdi_pri_message(struct pri *pri, char *s)
}
dchancount = 0;
}
if (dchancount > 1 && (span > -1))
ast_verbose("[Span %d D-Channel %d]%s", span, dchan, s);
else if (span > -1)
ast_verbose("%d %s", span+1, s);
else
ast_verbose("%s", s);
} else
ast_verbose("%s", s);
if (-1 < span) {
if (1 < dchancount) {
ast_verbose("[PRI Span: %d D-Channel: %d] %s", span + 1, dchan, s);
} else {
ast_verbose("PRI Span: %d %s", span + 1, s);
}
} else {
ast_verbose("PRI Span: ? %s", s);
}
} else {
ast_verbose("PRI Span: ? %s", s);
}
ast_mutex_lock(&pridebugfdlock);
@@ -13868,18 +13877,22 @@ static void dahdi_pri_message(struct pri *pri, char *s)
#if defined(HAVE_PRI)
static void dahdi_pri_error(struct pri *pri, char *s)
{
int x, y;
int dchan = -1, span = -1;
int x;
int y;
int dchan = -1;
int span = -1;
int dchancount = 0;
if (pri) {
for (x = 0; x < NUM_SPANS; x++) {
for (y = 0; y < SIG_PRI_NUM_DCHANS; y++) {
if (pris[x].pri.dchans[y])
if (pris[x].pri.dchans[y]) {
dchancount++;
}
if (pris[x].pri.dchans[y] == pri)
if (pris[x].pri.dchans[y] == pri) {
dchan = y;
}
}
if (dchan >= 0) {
span = x;
@@ -13887,14 +13900,18 @@ static void dahdi_pri_error(struct pri *pri, char *s)
}
dchancount = 0;
}
if ((dchancount > 1) && (span > -1))
ast_log(LOG_ERROR, "[Span %d D-Channel %d] PRI: %s", span, dchan, s);
else if (span > -1)
ast_log(LOG_ERROR, "%d %s", span+1, s);
else
ast_log(LOG_ERROR, "%s", s);
} else
ast_log(LOG_ERROR, "%s", s);
if (-1 < span) {
if (1 < dchancount) {
ast_log(LOG_ERROR, "[PRI Span: %d D-Channel: %d] %s", span + 1, dchan, s);
} else {
ast_log(LOG_ERROR, "PRI Span: %d %s", span + 1, s);
}
} else {
ast_log(LOG_ERROR, "PRI Span: ? %s", s);
}
} else {
ast_log(LOG_ERROR, "PRI Span: ? %s", s);
}
ast_mutex_lock(&pridebugfdlock);