From fcdc8c20f4feff29f01db3fbfa8b8b083330ab7c Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 2 Jun 2009 13:50:21 +0000 Subject: [PATCH] Merged revisions 198791 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r198791 | file | 2009-06-02 10:48:06 -0300 (Tue, 02 Jun 2009) | 5 lines Correct documentation for the register line, specifically where the domain should be specified. (closes issue #14367) Reported by: Nick_Lewis ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@198793 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- configs/sip.conf.sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7e7e9d8390..3ba459e0eb 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6605,7 +6605,7 @@ static int sip_register(const char *value, int lineno) if (hostname) *hostname++ = '\0'; if (ast_strlen_zero(username) || ast_strlen_zero(hostname)) { - ast_log(LOG_WARNING, "Format for registration is [transport://]user[:secret[:authuser]]@domain[:port][/extension][~expiry] at line %d\n", lineno); + ast_log(LOG_WARNING, "Format for registration is [transport://]user[@domain][:secret[:authuser]]@host[:port][/extension][~expiry] at line %d\n", lineno); return -1; } /* split user[:secret[:authuser]] */ diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index ec3fafa6de..20828f920b 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -431,7 +431,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;----------------------------------------- OUTBOUND SIP REGISTRATIONS ------------------------ ; Asterisk can register as a SIP user agent to a SIP proxy (provider) ; Format for the register statement is: -; register => [transport://]user[:secret[:authuser]]@domain[:port][/extension][~expiry] +; register => [transport://]user[@domain][:secret[:authuser]]@host[:port][/extension][~expiry] ; ; ; -- 2.47.2