diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-09-10 21:00:22 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-09-10 21:00:22 +0000 |
| commit | e65dea461606aa8418e0d90b9faceb4f1b70d8f1 (patch) | |
| tree | 617c8d02236b1eddc749da70feef13f362c40872 /channels | |
| parent | d96b832787e621d5654a21704a7bb03b17775dbf (diff) | |
Ensure iax2 debug output is displayed when expected
When IAX2 debug was changed from iax_showframe to iax_outputframe,
some instances were missed (or added afterward). This was causing
debug output to not be displayed when expected.
(closes issue ASTERISK-20338)
Reported-by: John Covert
Patch-by: John Covert
........
Merged revisions 372804 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 372805 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 372806 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1b71aa131..630918480 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3396,12 +3396,10 @@ static int send_packet(struct iax_frame *f) ast_debug(3, "Sending %d on %d/%d to %s:%d\n", f->ts, callno, iaxs[callno]->peercallno, ast_inet_ntoa(iaxs[callno]->addr.sin_addr), ntohs(iaxs[callno]->addr.sin_port)); if (f->transfer) { - if (iaxdebug) - iax_showframe(f, NULL, 0, &iaxs[callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr)); + iax_outputframe(f, NULL, 0, &iaxs[callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr)); res = sendto(iaxs[callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[callno]->transfer, sizeof(iaxs[callno]->transfer)); } else { - if (iaxdebug) - iax_showframe(f, NULL, 0, &iaxs[callno]->addr, f->datalen - sizeof(struct ast_iax2_full_hdr)); + iax_outputframe(f, NULL, 0, &iaxs[callno]->addr, f->datalen - sizeof(struct ast_iax2_full_hdr)); res = sendto(iaxs[callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[callno]->addr, sizeof(iaxs[callno]->addr)); } if (res < 0) { @@ -4798,9 +4796,7 @@ static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, data.f.type = AST_FRAME_IAX; data.f.csub = compress_subclass(command); - if (iaxdebug) { - iax_outputframe(NULL, &data.f, 0, sin, size - sizeof(struct ast_iax2_full_hdr)); - } + iax_outputframe(NULL, &data.f, 0, sin, size - sizeof(struct ast_iax2_full_hdr)); return sendto(sockfd, &data, size, 0, (struct sockaddr *)sin, sizeof(*sin)); } |