diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 14:58:44 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 14:58:44 +0000 |
| commit | 58d5cdaf491a9f0211dee883a4b58546e8a5f08b (patch) | |
| tree | 46c8d8428a78d19d61cce44b688ac913e44162b7 | |
| parent | e7f36277e41aa1d5cc9ea6bace18b1bfff3ff520 (diff) | |
Merged revisions 227238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r227238 | dvossel | 2009-11-03 11:12:52 -0600 (Tue, 03 Nov 2009) | 5 lines
user.conf entries in SIP were not having their peer type set.
(closes issue #16120)
Reported by: jsmith
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@228267 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 270aa98d1..89699d4ea 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23786,6 +23786,8 @@ static int reload_config(enum channelreloadreason reason) if (ast_true(hassip) || (!hassip && genhassip)) { peer = build_peer(cat, gen, ast_variable_browse(ucfg, cat), 0, 0); if (peer) { + /* user.conf entries are always of type friend */ + peer->type = SIP_TYPE_USER | SIP_TYPE_PEER; ao2_t_link(peers, peer, "link peer into peer table"); if ((peer->type & SIP_TYPE_PEER) && peer->addr.sin_addr.s_addr) { ao2_t_link(peers_by_ip, peer, "link peer into peers_by_ip table"); |