diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-12-10 13:16:19 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-12-10 13:16:19 +0000 |
| commit | 0cba439c4d55ac94059393388da7b3ddbf206e01 (patch) | |
| tree | e9ba52f9b952d956f8c697dd1ba2fbe5ac2dcc5b /res | |
| parent | 8fe45f0f0aec2b8f422e992336f23fa5fbe4adbe (diff) | |
PJSIP: Fix assert on initial mass qualify
This fixes the MWI test regressions caused by r429127 and ensures that
contacts have non-zero qualify_frequency before attempting scheduling.
........
Merged revisions 429245 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 429246 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429247 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip/pjsip_options.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c index ac8302fae..f64c83f38 100644 --- a/res/res_pjsip/pjsip_options.c +++ b/res/res_pjsip/pjsip_options.c @@ -960,7 +960,9 @@ static int qualify_and_schedule_cb(void *obj, void *arg, int flags) initial_interval = contact->qualify_frequency * 1000; initial_interval = (int)(initial_interval * ast_random_double()); - schedule_qualify(contact, initial_interval); + if (contact->qualify_frequency) { + schedule_qualify(contact, initial_interval); + } return 0; } |