diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-13 17:34:11 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-13 17:34:11 +0000 |
| commit | 5c4ebc1e876eb33ead39a245c1840919064463b4 (patch) | |
| tree | 62cca03817e9695d34db3370f2f81e84bd4c60b2 /channels | |
| parent | c1f7d4aa3921da67db85e5911ae94204bd36dd10 (diff) | |
If we set a value for qualify, we should actually pay attention to it, instead of overriding the value
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@89246 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8b9f96f74..1a0d34f5a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15596,7 +15596,7 @@ static int sip_poke_peer(struct sip_peer *peer) else { if (peer->pokeexpire > -1) ast_sched_del(sched, peer->pokeexpire); - peer->pokeexpire = ast_sched_add(sched, DEFAULT_MAXMS * 2, sip_poke_noanswer, peer); + peer->pokeexpire = ast_sched_add(sched, peer->maxms * 2, sip_poke_noanswer, peer); } return 0; @@ -16502,7 +16502,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str if (!strcasecmp(v->value, "no")) { peer->maxms = 0; } else if (!strcasecmp(v->value, "yes")) { - peer->maxms = DEFAULT_MAXMS; + peer->maxms = default_qualify ? default_qualify : DEFAULT_MAXMS; } else if (sscanf(v->value, "%d", &peer->maxms) != 1) { 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; |