aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-04 18:55:16 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-04 18:55:16 +0000
commitd2376afbdfe4bdcbed07fb9399860b3dc7ce6f4a (patch)
tree84d1f056ca70340a90e2de2ced40ec59fbd2da4c
parentad3389024778531d78e3db569d3e798e860d20e2 (diff)
- 5 is the highest used debug level, so let's stay there
- Change formatting of RTP debug to align better git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32088 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channel.c2
-rw-r--r--rtp.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/channel.c b/channel.c
index f5e9a89d7..e8f309eb1 100644
--- a/channel.c
+++ b/channel.c
@@ -2097,7 +2097,7 @@ done:
int ast_internal_timing_enabled(struct ast_channel *chan)
{
int ret = ast_opt_internal_timing && chan->timingfd > -1;
- if (option_debug > 20)
+ if (option_debug > 4)
ast_log(LOG_DEBUG, "Internal timing is %s (option_internal_timing=%d chan->timingfd=%d)\n", ret? "enabled": "disabled", ast_opt_internal_timing, chan->timingfd);
return ret;
}
diff --git a/rtp.c b/rtp.c
index 68ccbb6ba..5e687139e 100644
--- a/rtp.c
+++ b/rtp.c
@@ -786,8 +786,8 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
}
if(rtp_debug_test_addr(&sin))
- ast_verbose("Got RTP packet from %s:%d (type %d, seq %d, ts %d, len %d)\n"
- , ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp,res - hdrlen);
+ ast_verbose("Got RTP packet from %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+ ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp,res - hdrlen);
rtpPT = ast_rtp_lookup_pt(rtp, payloadtype);
if (!rtpPT.isAstFormat) {
@@ -1573,7 +1573,7 @@ int ast_rtp_senddigit(struct ast_rtp *rtp, char digit)
ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr),
ntohs(rtp->them.sin_port), strerror(errno));
if (rtp_debug_test_addr(&rtp->them))
- ast_verbose("Sent RTP DTMF packet to %s:%d (type %d, seq %u, ts %u, len %u)\n",
+ ast_verbose("Sent RTP DTMF packet to %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr),
ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
}
@@ -1719,7 +1719,7 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
}
if(rtp_debug_test_addr(&rtp->them))
- ast_verbose("Sent RTP packet to %s:%d (type %d, seq %u, ts %u, len %u)\n",
+ ast_verbose("Sent RTP packet to %s:%d (type %d, seq %u, ts %u, len %u)\n",
ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr), ntohs(rtp->them.sin_port), codec, rtp->seqno, rtp->lastts,res - hdrlen);
}