diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-18 20:25:32 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-18 20:25:32 +0000 |
| commit | c147f3272d4bc200c8ba3c91489066efe25e071c (patch) | |
| tree | 57d01d6c15ae8690c3396368f4716368d16a1b32 /channels | |
| parent | 6da5d5ff8054fd1d8eef831f514b5b7d1763d5ed (diff) | |
Merged revisions 319552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r319552 | twilson | 2011-05-18 13:22:36 -0700 (Wed, 18 May 2011) | 11 lines
Unbreak the storing of registrations for restart
The fix for issue 18882 broke retrieving non-realtime peers from the ast_db
on restart/reload. This patch tries to unbreak things while leaving the intent
of the original fix intact.
(closes issue #19318)
Reported by: remiq
Patches:
diff.txt uploaded by twilson (license 396)
Tested by: lmadsen, remiq
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@319564 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0aa13505a..c81ec6f86 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -27089,7 +27089,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str sip_cfg.allowsubscribe = TRUE; /* No global ban any more */ } /* If read-only RT backend, then refresh from local DB cache */ - if (peer->host_dynamic && !sip_cfg.peer_rtupdate) { + if (peer->host_dynamic && (!peer->is_realtime || !sip_cfg.peer_rtupdate)) { reg_source_db(peer); } |