[asterisk-commits] newtonr: trunk r399018 - in /trunk: ./ res/res_pjsip_acl.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Sep 12 18:23:14 CDT 2013
Author: newtonr
Date: Thu Sep 12 18:23:12 2013
New Revision: 399018
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399018
Log:
Documentation fix and improvements to XML configuration help res_pjsip_acl
* One bug fix. Made the synopsis for "type" to accurate.
* changing the usage of "IP-domains" to "IP addresses"
* clarifying the usage for the options, by adding a relevant description for
each
* modified other areas of the XML help for clarity, such as the module
description and a few synopsis changes here and there. See the patch.
(issue ASTERISK-22458)
(closes issue ASTERISK-22458)
Reported By: Rusty Newton
Review: https://reviewboard.asterisk.org/r/2823/
........
Merged revisions 399017 from http://svn.asterisk.org/svn/asterisk/branches/12
Modified:
trunk/ (props changed)
trunk/res/res_pjsip_acl.c
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Sep 12 18:23:12 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-398927,398938,398991
+/branches/12:1-398558,398560-398577,398579-398927,398938,398991,399017
Modified: trunk/res/res_pjsip_acl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_acl.c?view=diff&rev=399018&r1=399017&r2=399018
==============================================================================
--- trunk/res/res_pjsip_acl.c (original)
+++ trunk/res/res_pjsip_acl.c Thu Sep 12 18:23:12 2013
@@ -37,47 +37,77 @@
<synopsis>SIP ACL module</synopsis>
<description><para>
<emphasis>ACL</emphasis>
- </para>
- <para>The ACL module used by <literal>res_pjsip</literal>. This module is
+ </para><para>
+ The ACL module used by <literal>res_pjsip</literal>. This module is
independent of <literal>endpoints</literal> and operates on all inbound
SIP communication using res_pjsip.
</para><para>
- It should be noted that this module can also reference ACLs from
- <filename>acl.conf</filename>.
+ There are two main ways of defining your ACL with the options
+ provided. You can use the <literal>permit</literal> and <literal>deny</literal> options
+ which act on <emphasis>IP</emphasis> addresses, or the <literal>contactpermit</literal>
+ and <literal>contactdeny</literal> options which act on <emphasis>Contact header</emphasis>
+ addresses in incoming REGISTER requests. You can combine the various options to
+ create a mixed ACL.
</para><para>
- There are two main ways of creating an access list: <literal>IP-Domain</literal>
- and <literal>Contact Header</literal>. It is possible to create a combined ACL using
- both IP and Contact.
+ Additionally, instead of defining an ACL with options, you can reference IP or
+ Contact header ACLs from the file <filename>acl.conf</filename> by using the <literal>acl</literal>
+ or <literal>contactacl</literal> options.
</para></description>
<configFile name="pjsip.conf">
<configObject name="acl">
<synopsis>Access Control List</synopsis>
<configOption name="acl">
- <synopsis>Name of IP ACL</synopsis>
- <description><para>
- This matches sections configured in <literal>acl.conf</literal>
+ <synopsis>List of IP ACL section names in acl.conf</synopsis>
+ <description><para>
+ This matches sections configured in <literal>acl.conf</literal>. The value is
+ defined as a list of comma-delimited section names.
</para></description>
</configOption>
<configOption name="contactacl">
- <synopsis>Name of Contact ACL</synopsis>
- <description><para>
- This matches sections configured in <literal>acl.conf</literal>
+ <synopsis>List of Contact ACL section names in acl.conf</synopsis>
+ <description><para>
+ This matches sections configured in <literal>acl.conf</literal>. The value is
+ defined as a list of comma-delimited section names.
</para></description>
</configOption>
<configOption name="contactdeny">
- <synopsis>List of Contact Header addresses to Deny</synopsis>
+ <synopsis>List of Contact header addresses to deny</synopsis>
+ <description><para>
+ The value is a comma-delimited list of IP addresses. IP addresses may
+ have a subnet mask appended. The subnet mask may be written in either
+ CIDR or dotted-decimal notation. Separate the IP address and subnet
+ mask with a slash ('/')
+ </para></description>
</configOption>
<configOption name="contactpermit">
- <synopsis>List of Contact Header addresses to Permit</synopsis>
+ <synopsis>List of Contact header addresses to permit</synopsis>
+ <description><para>
+ The value is a comma-delimited list of IP addresses. IP addresses may
+ have a subnet mask appended. The subnet mask may be written in either
+ CIDR or dotted-decimal notation. Separate the IP address and subnet
+ mask with a slash ('/')
+ </para></description>
</configOption>
<configOption name="deny">
- <synopsis>List of IP-domains to deny access from</synopsis>
+ <synopsis>List of IP addresses to deny access from</synopsis>
+ <description><para>
+ The value is a comma-delimited list of IP addresses. IP addresses may
+ have a subnet mask appended. The subnet mask may be written in either
+ CIDR or dotted-decimal notation. Separate the IP address and subnet
+ mask with a slash ('/')
+ </para></description>
</configOption>
<configOption name="permit">
- <synopsis>List of IP-domains to allow access from</synopsis>
+ <synopsis>List of IP addresses to permit access from</synopsis>
+ <description><para>
+ The value is a comma-delimited list of IP addresses. IP addresses may
+ have a subnet mask appended. The subnet mask may be written in either
+ CIDR or dotted-decimal notation. Separate the IP address and subnet
+ mask with a slash ('/')
+ </para></description>
</configOption>
<configOption name="type">
- <synopsis>Must be of type 'security'.</synopsis>
+ <synopsis>Must be of type 'acl'.</synopsis>
</configOption>
</configObject>
</configFile>
More information about the asterisk-commits
mailing list