diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-31 16:36:20 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-31 16:36:20 +0000 |
| commit | 54efadabddf9a8a599d5ff9bd7056454f06b0df2 (patch) | |
| tree | 9433e621f9b890647b6e6097b3dc0c0c6920499f /channels | |
| parent | 941773bc2b96f044af0ad845beb8d22d7a8a0bc1 (diff) | |
Merged revisions 153122 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r153122 | tilghman | 2008-10-31 11:35:21 -0500 (Fri, 31 Oct 2008) | 10 lines
Merged revisions 153114 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r153114 | tilghman | 2008-10-31 11:30:32 -0500 (Fri, 31 Oct 2008) | 3 lines
Turn off qualify on uncached realtime peers.
(Closes issue #13383)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@153123 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index cf20aeb11..10992bba5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21221,6 +21221,14 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str ast_log(LOG_WARNING, "Qualification of peer '%s' should be 'yes', 'no', or a number of milliseconds at line %d of sip.conf\n", peer->name, v->lineno); peer->maxms = 0; } + if (realtime && !ast_test_flag(&global_flags[1], SIP_PAGE2_RTCACHEFRIENDS) && peer->maxms > 0) { + /* This would otherwise cause a network storm, where the + * qualify response refreshes the peer from the database, + * which in turn causes another qualify to be sent, ad + * infinitum. */ + ast_log(LOG_WARNING, "Qualify is incompatible with dynamic uncached realtime. Please either turn rtcachefriends on or turn qualify off on peer '%s'\n", peer->name); + peer->maxms = 0; + } } else if (!strcasecmp(v->name, "qualifyfreq")) { int i; if (sscanf(v->value, "%d", &i) == 1) |