ast_mutex_lock(&sip->lock);
}
if (sip->owner) {
- ast_log(LOG_NOTICE,
- "Disconnecting call '%s' for lack of RTP activity in %ld seconds\n",
- sip->owner->name,
- (long) (t - sip->lastrtprx));
- /* Issue a softhangup */
- ast_softhangup_nolock(sip->owner, AST_SOFTHANGUP_DEV);
+ if (!(ast_rtp_get_bridged(sip->rtp))) {
+ ast_log(LOG_NOTICE,
+ "Disconnecting call '%s' for lack of RTP activity in %ld seconds\n",
+ sip->owner->name,
+ (long) (t - sip->lastrtprx));
+ /* Issue a softhangup */
+ ast_softhangup_nolock(sip->owner, AST_SOFTHANGUP_DEV);
+ } else
+ ast_log(LOG_NOTICE, "'%s' will not be disconnected in %ld seconds because it is directly bridged to another RTP stream\n", sip->owner->name, (long) (t - sip->lastrtprx));
ast_channel_unlock(sip->owner);
/* forget the timeouts for this call, since a hangup
has already been requested and we don't want to
}
/* If we are P2P bridged to another RTP stream, send it directly over */
- if (rtp->bridged && !bridge_p2p_rtcp_write(rtp, rtcpheader, res))
+ if (ast_rtp_get_bridged(rtp) && !bridge_p2p_rtcp_write(rtp, rtcpheader, res))
return &ast_null_frame;
if (option_debug)
/*! \brief Perform a Packet2Packet RTCP write */
static int bridge_p2p_rtcp_write(struct ast_rtp *rtp, unsigned int *rtcpheader, int len)
{
- struct ast_rtp *bridged = rtp->bridged;
+ struct ast_rtp *bridged = ast_rtp_get_bridged(rtp);
int res = 0;
/* If RTCP is not present on the bridged RTP session, then ignore this */
/*! \brief Perform a Packet2Packet RTP write */
static int bridge_p2p_rtp_write(struct ast_rtp *rtp, unsigned int *rtpheader, int len, int hdrlen)
{
- struct ast_rtp *bridged = rtp->bridged;
+ struct ast_rtp *bridged = ast_rtp_get_bridged(rtp);
int res = 0, payload = 0, bridged_payload = 0, version, padding, mark, ext;
struct rtpPayloadType rtpPT;
unsigned int seqno;
}
/* If we are bridged to another RTP stream, send direct */
- if (rtp->bridged && !bridge_p2p_rtp_write(rtp, rtpheader, res, hdrlen))
+ if (ast_rtp_get_bridged(rtp) && !bridge_p2p_rtp_write(rtp, rtpheader, res, hdrlen))
return &ast_null_frame;
if (version != 2)
*us = rtp->us;
}
+struct ast_rtp *ast_rtp_get_bridged(struct ast_rtp *rtp)
+{
+ return rtp->bridged;
+}
+
void ast_rtp_stop(struct ast_rtp *rtp)
{
if (rtp->rtcp && rtp->rtcp->schedid > 0) {