diff options
author | zuul <zuul@gerrit.asterisk.org> | 2016-08-16 08:23:48 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-16 08:23:48 -0500 |
commit | 643aac69a7bef3d3de89760ef1121e6b23b46e12 (patch) | |
tree | 74c8cd4a5e6b1d61968dd7dc6e17dd60f26eaf69 /channels | |
parent | 050b90769a2a2d0293f7c31d1c53f6f4a73c448c (diff) | |
parent | 93332cb1d0eea18021ea6538237297e627d6e2fc (diff) |
Merge "chan_sip: Fix lastrtprx always updated" into 13
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4be53c218..9cc6252fd 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8590,7 +8590,9 @@ static struct ast_frame *sip_read(struct ast_channel *ast) sip_pvt_lock(p); fr = sip_rtp_read(ast, p, &faxdetected); - p->lastrtprx = time(NULL); + if (fr && fr->frametype != AST_FRAME_NULL) { + p->lastrtprx = time(NULL); + } /* If we detect a CNG tone and fax detection is enabled then send us off to the fax extension */ if (faxdetected && ast_test_flag(&p->flags[1], SIP_PAGE2_FAX_DETECT_CNG)) { |