diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-04 09:10:56 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-04 09:10:56 +0000 |
| commit | 762e166239d313a081568fca41f02f5788fd65e2 (patch) | |
| tree | 1fad5d3d2470503e4f8ccea8567f7fb9b0886517 /configs | |
| parent | 27f789a6796f326105c5a8b1d72716bb30401ad5 (diff) | |
- Remove "incominglimit" as a configuration option in sip.conf
- Add documentation on call-limit, explaining that there's two counters
for a type="friend".
- Document the removval of "incominglimit" in UPGRADE.txt
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7775 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sip.conf.sample | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index e063cdcfb..3452b77f6 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -348,9 +348,15 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;dtmfmode=info ; either RFC2833 or INFO for the BudgeTone ;call-limit=1 ; permit only 1 outgoing call and 1 incoming call at a time ; from the phone to asterisk - ; (1 for the explicit peer, 1 for the explicit user, + ; 1 for the explicit peer, 1 for the explicit user, ; remember that a friend equals 1 peer and 1 user in - ; memory) + ; memory + ; This will affect your subscriptions as well. + ; There is no combined call counter for a "friend" + ; so there's currently no way in sip.conf to limit + ; to one inbound or outbound call per phone. Use + ; the group counters in the dial plan for that. + ; ;mailbox=1234@default ; mailbox 1234 in voicemail context "default" ;disallow=all ; need to disallow=all before we can use allow= ;allow=ulaw ; Note: In user sections the order of codecs |