diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a21eea31ca..5444a08673 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -805,7 +805,8 @@ static struct sip_pvt { int jointcapability; /*!< Supported capability at both ends (codecs ) */ int peercapability; /*!< Supported peer capability */ int prefcodec; /*!< Preferred codec (outbound only) */ - int noncodeccapability; + int noncodeccapability; /*!< DTMF RFC2833 telephony-event */ + int redircodecs; /*!< Redirect codecs */ int maxcallbitrate; /*!< Maximum Call Bitrate for Video Calls */ int callingpres; /*!< Calling presentation */ int authtries; /*!< Times we've tried to authenticate */ @@ -817,7 +818,6 @@ static struct sip_pvt { struct sockaddr_in sa; /*!< Our peer */ struct sockaddr_in redirip; /*!< Where our RTP should be going if not to us */ struct sockaddr_in vredirip; /*!< Where our Video RTP should be going if not to us */ - int redircodecs; /*!< Redirect codecs */ struct sockaddr_in recv; /*!< Received as */ struct in_addr ourip; /*!< Our IP */ struct ast_channel *owner; /*!< Who owns us */ diff --git a/rtp.c b/rtp.c index 051281783c..68ccbb6baa 100644 --- a/rtp.c +++ b/rtp.c @@ -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 packet to %s:%d (type %d, seq %u, ts %u, len %u)\n", + ast_verbose("Sent RTP DTMF 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), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen); } @@ -1719,8 +1719,8 @@ 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_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr), ntohs(rtp->them.sin_port), codec, rtp->seqno, rtp->lastts,res - hdrlen); + 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); } rtp->seqno++;