diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 17:14:55 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 17:14:55 +0000 |
| commit | 6236a0ec711e7b4f1d2d81dc9a891451370f1fed (patch) | |
| tree | 63e9f2399521c0ddf0b3c4fe36a47f543782f4d9 /channels | |
| parent | 559de6daa87d7b4607c524f8ee4d70eb2971cf45 (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.2@227239 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 5b4c10612..f60e8ba3a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -24711,6 +24711,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"); |