kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-23 08:49:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 223205 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r223205 | dvossel | 2009-10-09 12:52:35 -0500 (Fri, 09 Oct 2009) | 10 lines
  
  fixes sip registration using authuser in user.conf
  
  (closes issue #14954)
  Reported by: tornblad
  Tested by: mmichelson, tornblad, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@223206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-10-09 17:53:37 +00:00
parent 7e16ec6225
commit fc27da108d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+11 -3
View File
@@ -25561,6 +25561,7 @@ static int reload_config(enum channelreloadreason reason)
const char *username = ast_variable_retrieve(ucfg, cat, "username");
const char *secret = ast_variable_retrieve(ucfg, cat, "secret");
const char *contact = ast_variable_retrieve(ucfg, cat, "contact");
const char *authuser = ast_variable_retrieve(ucfg, cat, "authuser");
if (!host)
host = ast_variable_retrieve(ucfg, "general", "host");
if (!username)
@@ -25570,10 +25571,17 @@ static int reload_config(enum channelreloadreason reason)
if (!contact)
contact = "s";
if (!ast_strlen_zero(username) && !ast_strlen_zero(host)) {
if (!ast_strlen_zero(secret))
snprintf(tmp, sizeof(tmp), "%s:%s@%s/%s", username, secret, host, contact);
else
if (!ast_strlen_zero(secret)) {
if (!ast_strlen_zero(authuser)) {
snprintf(tmp, sizeof(tmp), "%s:%s:%s@%s/%s", username, secret, authuser, host, contact);
} else {
snprintf(tmp, sizeof(tmp), "%s:%s@%s/%s", username, secret, host, contact);
}
} else if (!ast_strlen_zero(authuser)) {
snprintf(tmp, sizeof(tmp), "%s::%s@%s/%s", username, authuser, host, contact);
} else {
snprintf(tmp, sizeof(tmp), "%s@%s/%s", username, host, contact);
}
if (sip_register(tmp, 0) == 0)
registry_count++;
}