summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorKevin Harwell <kharwell@digium.com>2015-03-09 16:13:40 +0000
committerKevin Harwell <kharwell@digium.com>2015-03-09 16:13:40 +0000
commit1ce529d30e900054b9d2417380945d451012313f (patch)
treed22e4bf5bd4562cb21237677e86ee2b8744b307c /configs
parenta5f80f17813241cdfe32947722f9845bc32bcd87 (diff)
res_pjsip: allow configuration of endpoint identifier query order
It's possible to have a scenario that will create a conflict between endpoint identifiers. For instance an incoming call could be identified by two different endpoint identifiers and the one chosen depended upon which identifier module loaded first. This of course causes problems when, for example, the incoming call is expected to be identified by username, but instead is identified by ip. This patch adds a new 'global' option to res_pjsip called 'endpoint_identifier_order'. It is a comma separated list of endpoint identifier names that specifies the order by which identifiers are processed and checked. ASTERISK-24840 #close Reported by: Mark Michelson Review: https://reviewboard.asterisk.org/r/4455/ ........ Merged revisions 432638 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
-rw-r--r--configs/samples/pjsip.conf.sample4
1 files changed, 4 insertions, 0 deletions
diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample
index 782fbab36..ba8bf751b 100644
--- a/configs/samples/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -863,6 +863,10 @@
;keep_alive_interval=20 ; The interval (in seconds) at which to send keepalive
; messages on all active connection-oriented transports
; (default: "0")
+;endpoint_identifier_order=ip,username,anonymous
+ ; The order by which endpoint identifiers are given priority.
+ ; Identifier names are derived from res_pjsip_endpoint_identifier_*
+ ; modules. (default: ip,username,anonymous)
; MODULE PROVIDING BELOW SECTION(S): res_pjsip_acl