Merged revisions 153114 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 31 Oct 2008 16:35:21 +0000 (16:35 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 31 Oct 2008 16:35:21 +0000 (16:35 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@153122 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 12b6d25..f5d8180 100644 (file)
@@ -21929,6 +21929,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)