From: David Vossel <dvossel@digium.com>
Date: Fri, 6 Nov 2009 14:58:44 +0000 (+0000)
Subject: Merged revisions 227238 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=919783597e4f3f85465483f9a0637a196485aadb;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@228267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 270aa98d1e..89699d4ead 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");