diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-30 19:23:59 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-30 19:23:59 +0000 |
| commit | 885085e4d2ad889c6fbcec734edf42b80d483a48 (patch) | |
| tree | ff94e31d4c662ccbc5e3f91b8c50f92bd8627f5a /main | |
| parent | 5b3b15328fc32e1708c2ac731c59e9b59ec13b3a (diff) | |
Merged revisions 44090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44090 | pcadach | 2006-10-01 01:20:38 +0600 (Вск, 01 Окт 2006) | 1 line
Allow one-way RTP streams (device->Asterisk)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44091 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/main/rtp.c b/main/rtp.c index 153426827..c93887581 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1137,9 +1137,11 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) return &ast_null_frame; } +#if 0 /* Allow to receive RTP stream with closed transmission path */ /* If we don't have the other side's address, then ignore this */ if (!rtp->them.sin_addr.s_addr || !rtp->them.sin_port) return &ast_null_frame; +#endif /* Send to whoever send to us if NAT is turned on */ if (rtp->nat) { @@ -1205,7 +1207,8 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) rtp->seedrxseqno = seqno; } - if (rtp->rtcp && rtp->rtcp->schedid < 1) { + /* Do not schedule RR if RTCP isn't run */ + if (rtp->rtcp && rtp->rtcp->them.sin_addr.s_addr && rtp->rtcp->schedid < 1) { /* Schedule transmission of Receiver Report */ rtp->rtcp->schedid = ast_sched_add(rtp->sched, ast_rtcp_calc_interval(rtp), ast_rtcp_write, rtp); } @@ -2208,11 +2211,12 @@ static int ast_rtcp_write_sr(void *data) struct timeval dlsr; char bdata[512]; - if (!rtp || !rtp->rtcp || (&rtp->rtcp->them.sin_addr == 0)) + /* Commented condition is always not NULL if rtp->rtcp is not NULL */ + if (!rtp || !rtp->rtcp/* || (&rtp->rtcp->them.sin_addr == 0)*/) return 0; if (!rtp->rtcp->them.sin_addr.s_addr) { /* This'll stop rtcp for this rtp session */ - ast_verbose("RTCP SR transmission error, rtcp halted %s\n",strerror(errno)); + ast_verbose("RTCP SR transmission error, rtcp halted\n"); if (rtp->rtcp->schedid > 0) ast_sched_del(rtp->sched, rtp->rtcp->schedid); rtp->rtcp->schedid = -1; |