summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2017-10-11 06:34:00 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-10-11 06:34:00 -0500
commit5a8c148dcf3898e64f279c2751a4df20dcfe11c6 (patch)
tree25f227dc729c57d5996bb7220d8bf46202961798 /configs
parent821d7428ab5e09c9860067b9e29fd4a535f59ac0 (diff)
parentd388c18abff78b21548523bb706c5c911eb2a883 (diff)
Merge "res_pjsip_registrar.c: Update remove_existing AOR contact handling." into 13
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 c92c98cbb..ba7d93217 100644
--- a/configs/samples/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -894,7 +894,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")
@@ -1133,7 +1139,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