summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2017-10-11 06:42:29 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-10-11 06:42:29 -0500
commitdefa7084c7de9de36f4b01596a474cce08e1d78e (patch)
tree5aa6c92b2863d8863cb141bd268431ae349a6c74 /configs
parent7155055b9fda5128d1d7b3b2e163e808873f3800 (diff)
parent6014a8743d40fc6625b22d81d4ae3fd0c4e75e19 (diff)
Merge "res_pjsip_registrar.c: Update remove_existing AOR contact handling." into 15
Diffstat (limited to 'configs')
-rw-r--r--configs/samples/pjsip.conf.sample10
1 files changed, 8 insertions, 2 deletions
diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample
index 9a2592bed..c535aaf04 100644
--- a/configs/samples/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -918,7 +918,13 @@
;max_contacts=0 ; Maximum number of contacts that can bind to an AoR (default:
; "0")
;minimum_expiration=60 ; Minimum keep alive time for an AoR (default: "60")
-;remove_existing=no ; Determines whether new contacts replace existing ones
+;remove_existing=no ; Allow a registration to succeed by displacing any existing
+ ; contacts that now exceed the max_contacts count. Any
+ ; removed contacts are the next to expire. The behaviour is
+ ; beneficial when rewrite_contact is enabled and max_contacts
+ ; is greater than one. The removed contact is likely the old
+ ; contact created by rewrite_contact that the device is
+ ; refreshing.
; (default: "no")
;type= ; Must be of type aor (default: "")
;qualify_frequency=0 ; Interval at which to qualify an AoR (default: "0")
@@ -1157,7 +1163,7 @@
;outbound_auth= ; Authentication object(s) to be used for outbound
; publishes.
- ; This is a comma-delimited list of auth sections
+ ; This is a comma-delimited list of auth sections
; defined in pjsip.conf used to respond to outbound
; authentication challenges.
; Using the same auth section for inbound and