aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-28 13:18:54 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-28 13:18:54 +0000
commit9c0796f313e10de28b650ccbcb5d03fe07111906 (patch)
tree02ba53869d9f4271f927695c17d6f4cee4350248 /configs
parentd7e5a787b00fc69c92b2e3da79d20563e3f8e740 (diff)
Merged revisions 171838 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r171838 | oej | 2009-01-28 14:11:44 +0100 (Ons, 28 Jan 2009) | 10 lines Merged revisions 171837 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171837 | oej | 2009-01-28 14:07:27 +0100 (Ons, 28 Jan 2009) | 2 lines Add a better explanation of the difference between the device namespace and the dialplan for newbies. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@171846 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/sip.conf.sample19
1 files changed, 19 insertions, 0 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 5fd2657ba..bde424ba9 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -51,6 +51,25 @@
; module reload chan_sip.so Reload configuration file
; Active SIP peers will not be reconfigured
;
+;------- Naming devices ------------------------------------------------------
+;
+; When naming devices, make sure you understand how Asterisk matches calls
+; that come in.
+; 1. Asterisk checks the SIP From: address username and matches against
+; names of devices with type=user
+; The name is the text between square brackets [name]
+; 2. Asterisk checks the IP address (and port number) that the INVITE
+; was sent from and matches against any devices with type=peer
+;
+; Don't mix extensions with the names of the devices. Devices need a unique
+; name. The device name is *not* used as phone numbers. Phone numbers are
+; anything you declare as an extension in the dialplan (extensions.conf).
+;
+; Note: The parameter "username" is not the username and in most cases is
+; not needed at all. Check below. In later releases, it's renamed
+; to "defaultuser" which is a better name, since it is used in
+; combination with the "defaultip" setting.
+;-----------------------------------------------------------------------------
; ** Deprecated configuration options **
; The "call-limit" configuation option is deprecated. It still works in