aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-10 14:07:13 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-10 14:07:13 +0000
commitd19f35ad0a01907a33c80941261ca3d2e73808e2 (patch)
tree5298cc2f05697fc03cb6d6ed6000bd1d6e007513
parentce58d91e6e89892b98f48481df661b3d7a2c29d0 (diff)
Only spit out an inringing warning message when it is applicable. Since call limits are already toast in realtime let's not scare the user if they are using it. (issue #10166 reported by bcnit)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@74262 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ccc77314e..f0a0c047c 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3095,7 +3095,7 @@ static int update_call_counter(struct sip_pvt *fup, int event)
if (ast_test_flag(&fup->flags[1], SIP_PAGE2_INC_RINGING)) {
if (*inringing > 0)
(*inringing)--;
- else
+ else if (!ast_test_flag(&fup->flags[0], SIP_REALTIME) || ast_test_flag(&fup->flags[1], SIP_PAGE2_RTCACHEFRIENDS))
ast_log(LOG_WARNING, "Inringing for peer '%s' < 0?\n", fup->peername);
ast_clear_flag(&fup->flags[1], SIP_PAGE2_INC_RINGING);
}
@@ -3138,7 +3138,7 @@ static int update_call_counter(struct sip_pvt *fup, int event)
if (ast_test_flag(&fup->flags[1], SIP_PAGE2_INC_RINGING)) {
if (*inringing > 0)
(*inringing)--;
- else
+ else if (!ast_test_flag(&fup->flags[0], SIP_REALTIME) || ast_test_flag(&fup->flags[1], SIP_PAGE2_RTCACHEFRIENDS))
ast_log(LOG_WARNING, "Inringing for peer '%s' < 0?\n", p->name);
ast_clear_flag(&fup->flags[1], SIP_PAGE2_INC_RINGING);
}