summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2013-08-20 15:39:38 +0000
committerMark Michelson <mmichelson@digium.com>2013-08-20 15:39:38 +0000
commit86741bdf465449a40bf329638fdb3374d7023a7c (patch)
treeb559c7761c7c00dcdf2156321db8efab3158d306 /res
parent63134ea01139b706d1b8e4accf7fecb4b9399f0a (diff)
Clarify documentation for the "identify_by" option for SIP endpoints.
This also removes documentation for the options that no longer exist. (closes issue ASTERISK-22306) reported by Rusty Newton git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397111 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_pjsip.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 687985857..d2ce7f285 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -220,13 +220,18 @@
<configOption name="identify_by" default="username,location">
<synopsis>Way(s) for Endpoint to be identified</synopsis>
<description><para>
- There are currently two methods to identify an endpoint. By default
- both are used to identify an endpoint.
+ An endpoint can be identified in multiple ways. Currently, the only supported
+ option is <literal>username</literal>, which matches the endpoint based on the
+ username in the From header.
</para>
+ <note><para>Endpoints can also be identified by IP address; however, that method
+ of identification is not handled by this configuration option. See the documentation
+ for the <literal>identify</literal> configuration section for more details on that
+ method of endpoint identification. If this option is set to <literal>username</literal>
+ and an <literal>identify</literal> configuration section exists for the endpoint, then
+ the endpoint can be identified in multiple ways.</para></note>
<enumlist>
<enum name="username" />
- <enum name="location" />
- <enum name="username,location" />
</enumlist>
</description>
</configOption>