diff options
author | Kevin Harwell <kharwell@digium.com> | 2013-11-22 17:27:55 +0000 |
---|---|---|
committer | Kevin Harwell <kharwell@digium.com> | 2013-11-22 17:27:55 +0000 |
commit | 1c45a32ee861fa427e0243abe03c729966fa4436 (patch) | |
tree | 47e0020d224c7e7f6fd0e7537da00c4d9b358a5e /res | |
parent | 2147e3930380b599a0cdab6a8533f0b3d39d0091 (diff) |
res_pjsip: convert configuration settings names to snake case
Renamed, where appropriate, the configuration options for chan/res_pjsip to use
snake case (compound words separated by an underscore). For example, faxdetect
will become fax_detect, recordofffeature will become record_off_feature, etc...
Review: https://reviewboard.asterisk.org/r/3002/
........
Merged revisions 403022 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r-- | res/res_pjsip.c | 80 | ||||
-rw-r--r-- | res/res_pjsip/config_global.c | 4 | ||||
-rw-r--r-- | res/res_pjsip/config_system.c | 6 | ||||
-rw-r--r-- | res/res_pjsip/config_transport.c | 4 | ||||
-rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 66 | ||||
-rw-r--r-- | res/res_pjsip_acl.c | 12 |
6 files changed, 86 insertions, 86 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 3f6fd8c69..cda22a3f5 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -189,7 +189,7 @@ <configOption name="disallow"> <synopsis>Media Codec(s) to disallow</synopsis> </configOption> - <configOption name="dtmfmode" default="rfc4733"> + <configOption name="dtmf_mode" default="rfc4733"> <synopsis>DTMF mode</synopsis> <description> <para>This setting allows to choose the DTMF mode for endpoint communication.</para> @@ -247,7 +247,7 @@ <configOption name="mailboxes"> <synopsis>Mailbox(es) to be associated with</synopsis> </configOption> - <configOption name="mohsuggest" default="default"> + <configOption name="moh_suggest" default="default"> <synopsis>Default Music On Hold class</synopsis> </configOption> <configOption name="outbound_auth"> @@ -388,49 +388,49 @@ to indicate ringing and will NOT send it as audio. </para></description> </configOption> - <configOption name="callgroup"> + <configOption name="call_group"> <synopsis>The numeric pickup groups for a channel.</synopsis> <description><para> Can be set to a comma separated list of numbers or ranges between the values of 0-63 (maximum of 64 groups). </para></description> </configOption> - <configOption name="pickupgroup"> + <configOption name="pickup_group"> <synopsis>The numeric pickup groups that a channel can pickup.</synopsis> <description><para> Can be set to a comma separated list of numbers or ranges between the values of 0-63 (maximum of 64 groups). </para></description> </configOption> - <configOption name="namedcallgroup"> + <configOption name="named_call_group"> <synopsis>The named pickup groups for a channel.</synopsis> <description><para> Can be set to a comma separated list of case sensitive strings limited by supported line length. </para></description> </configOption> - <configOption name="namedpickupgroup"> + <configOption name="named_pickup_group"> <synopsis>The named pickup groups that a channel can pickup.</synopsis> <description><para> Can be set to a comma separated list of case sensitive strings limited by supported line length. </para></description> </configOption> - <configOption name="devicestate_busy_at" default="0"> + <configOption name="device_state_busy_at" default="0"> <synopsis>The number of in-use channels which will cause busy to be returned as device state</synopsis> <description><para> When the number of in-use channels for the endpoint matches the devicestate_busy_at setting the PJSIP channel driver will return busy as the device state instead of in use. </para></description> </configOption> - <configOption name="t38udptl" default="no"> + <configOption name="t38_udptl" default="no"> <synopsis>Whether T.38 UDPTL support is enabled or not</synopsis> <description><para> If set to yes T.38 UDPTL support will be enabled, and T.38 negotiation requests will be accepted and relayed. </para></description> </configOption> - <configOption name="t38udptl_ec" default="none"> + <configOption name="t38_udptl_ec" default="none"> <synopsis>T.38 UDPTL error correction method</synopsis> <description> <enumlist> @@ -446,34 +446,34 @@ </enumlist> </description> </configOption> - <configOption name="t38udptl_maxdatagram" default="0"> + <configOption name="t38_udptl_maxdatagram" default="0"> <synopsis>T.38 UDPTL maximum datagram size</synopsis> <description><para> This option can be set to override the maximum datagram of a remote endpoint for broken endpoints. </para></description> </configOption> - <configOption name="faxdetect" default="no"> + <configOption name="fax_detect" default="no"> <synopsis>Whether CNG tone detection is enabled</synopsis> <description><para> This option can be set to send the session to the fax extension when a CNG tone is detected. </para></description> </configOption> - <configOption name="t38udptl_nat" default="no"> + <configOption name="t38_udptl_nat" default="no"> <synopsis>Whether NAT support is enabled on UDPTL sessions</synopsis> <description><para> When enabled the UDPTL stack will send UDPTL packets to the source address of received packets. </para></description> </configOption> - <configOption name="t38udptl_ipv6" default="no"> + <configOption name="t38_udptl_ipv6" default="no"> <synopsis>Whether IPv6 is used for UDPTL Sessions</synopsis> <description><para> When enabled the UDPTL stack will use IPv6. </para></description> </configOption> - <configOption name="tonezone"> + <configOption name="tone_zone"> <synopsis>Set which country's indications to use for channels created for this endpoint.</synopsis> </configOption> <configOption name="language"> @@ -486,7 +486,7 @@ <ref type="configOption">recordofffeature</ref> </see-also> </configOption> - <configOption name="recordonfeature" default="automixmon"> + <configOption name="record_on_feature" default="automixmon"> <synopsis>The feature to enact when one-touch recording is turned on.</synopsis> <description> <para>When an INFO request for one-touch recording arrives with a Record header set to "on", this @@ -499,7 +499,7 @@ <ref type="configOption">recordofffeature</ref> </see-also> </configOption> - <configOption name="recordofffeature" default="automixmon"> + <configOption name="record_off_feature" default="automixmon"> <synopsis>The feature to enact when one-touch recording is turned off.</synopsis> <description> <para>When an INFO request for one-touch recording arrives with a Record header set to "off", this @@ -512,16 +512,16 @@ <ref type="configOption">recordonfeature</ref> </see-also> </configOption> - <configOption name="rtpengine" default="asterisk"> + <configOption name="rtp_engine" default="asterisk"> <synopsis>Name of the RTP engine to use for channels created for this endpoint</synopsis> </configOption> - <configOption name="allowtransfer" default="yes"> + <configOption name="allow_transfer" default="yes"> <synopsis>Determines whether SIP REFER transfers are allowed for this endpoint</synopsis> </configOption> - <configOption name="sdpowner" default="-"> + <configOption name="sdp_owner" default="-"> <synopsis>String placed as the username portion of an SDP origin (o=) line.</synopsis> </configOption> - <configOption name="sdpsession" default="Asterisk"> + <configOption name="sdp_session" default="Asterisk"> <synopsis>String used for the SDP session (s=) line.</synopsis> </configOption> <configOption name="tos_audio"> @@ -548,29 +548,29 @@ See https://wiki.asterisk.org/wiki/display/AST/IP+Quality+of+Service for more information about QoS settings </para></description> </configOption> - <configOption name="allowsubscribe" default="yes"> + <configOption name="allow_subscribe" default="yes"> <synopsis>Determines if endpoint is allowed to initiate subscriptions with Asterisk.</synopsis> </configOption> - <configOption name="subminexpiry" default="60"> + <configOption name="sub_min_expiry" default="60"> <synopsis>The minimum allowed expiry time for subscriptions initiated by the endpoint.</synopsis> </configOption> - <configOption name="fromuser"> + <configOption name="from_user"> <synopsis>Username to use in From header for requests to this endpoint.</synopsis> </configOption> - <configOption name="mwifromuser"> + <configOption name="mwi_from_user"> <synopsis>Username to use in From header for unsolicited MWI NOTIFYs to this endpoint.</synopsis> </configOption> - <configOption name="fromdomain"> + <configOption name="from_domain"> <synopsis>Domain to user in From header for requests to this endpoint.</synopsis> </configOption> - <configOption name="dtlsverify"> + <configOption name="dtls_verify"> <synopsis>Verify that the provided peer certificate is valid</synopsis> <description><para> This option only applies if <replaceable>media_encryption</replaceable> is set to <literal>dtls</literal>. </para></description> </configOption> - <configOption name="dtlsrekey"> + <configOption name="dtls_rekey"> <synopsis>Interval at which to renegotiate the TLS session and rekey the SRTP session</synopsis> <description><para> This option only applies if <replaceable>media_encryption</replaceable> is @@ -579,21 +579,21 @@ If this is not set or the value provided is 0 rekeying will be disabled. </para></description> </configOption> - <configOption name="dtlscertfile"> + <configOption name="dtls_cert_file"> <synopsis>Path to certificate file to present to peer</synopsis> <description><para> This option only applies if <replaceable>media_encryption</replaceable> is set to <literal>dtls</literal>. </para></description> </configOption> - <configOption name="dtlsprivatekey"> + <configOption name="dtls_private_key"> <synopsis>Path to private key for certificate file</synopsis> <description><para> This option only applies if <replaceable>media_encryption</replaceable> is set to <literal>dtls</literal>. </para></description> </configOption> - <configOption name="dtlscipher"> + <configOption name="dtls_cipher"> <synopsis>Cipher to use for DTLS negotiation</synopsis> <description><para> This option only applies if <replaceable>media_encryption</replaceable> is @@ -603,21 +603,21 @@ http://www.openssl.org/docs/apps/ciphers.html#CIPHER_STRINGS </para></description> </configOption> - <configOption name="dtlscafile"> + <configOption name="dtls_ca_file"> <synopsis>Path to certificate authority certificate</synopsis> <description><para> This option only applies if <replaceable>media_encryption</replaceable> is set to <literal>dtls</literal>. </para></description> </configOption> - <configOption name="dtlscapath"> + <configOption name="dtls_ca_path"> <synopsis>Path to a directory containing certificate authority certificates</synopsis> <description><para> This option only applies if <replaceable>media_encryption</replaceable> is set to <literal>dtls</literal>. </para></description> </configOption> - <configOption name="dtlssetup"> + <configOption name="dtls_setup"> <synopsis>Whether we are willing to accept connections, connect to the other party, or both.</synopsis> <description> <para> @@ -767,7 +767,7 @@ </enumlist> </description> </configOption> - <configOption name="localnet"> + <configOption name="local_net"> <synopsis>Network to consider local (used for NAT purposes).</synopsis> <description><para>This must be in CIDR or dotted decimal format with the IP and mask separated with a slash ('/').</para></description> @@ -775,7 +775,7 @@ <configOption name="password"> <synopsis>Password required for transport</synopsis> </configOption> - <configOption name="privkey_file"> + <configOption name="priv_key_file"> <synopsis>Private key file (TLS ONLY)</synopsis> </configOption> <configOption name="protocol" default="udp"> @@ -952,7 +952,7 @@ before the SIP stack is initialized. The only way to reset these values is to either restart Asterisk, or unload res_pjsip.so and then load it again. </para></description> - <configOption name="timert1" default="500"> + <configOption name="timer_t1" default="500"> <synopsis>Set transaction timer T1 value (milliseconds).</synopsis> <description><para> Timer T1 is the base for determining how long to wait before retransmitting @@ -960,7 +960,7 @@ For more information on this timer, see RFC 3261, Section 17.1.1.1. </para></description> </configOption> - <configOption name="timerb" default="32000"> + <configOption name="timer_b" default="32000"> <synopsis>Set transaction timer B value (milliseconds).</synopsis> <description><para> Timer B determines the maximum amount of time to wait after sending an INVITE @@ -969,7 +969,7 @@ this timer, see RFC 3261, Section 17.1.1.1. </para></description> </configOption> - <configOption name="compactheaders" default="no"> + <configOption name="compact_headers" default="no"> <synopsis>Use the short forms of common SIP header names.</synopsis> </configOption> <configOption name="threadpool_initial_size" default="0"> @@ -995,13 +995,13 @@ The settings in this section are global. Unlike options in the <literal>system</literal> section, these options can be refreshed by performing a reload. </para></description> - <configOption name="maxforwards" default="70"> + <configOption name="max_forwards" default="70"> <synopsis>Value used in Max-Forwards header for SIP requests.</synopsis> </configOption> <configOption name="type"> <synopsis>Must be of type 'global'.</synopsis> </configOption> - <configOption name="useragent" default="Asterisk <Asterisk Version>"> + <configOption name="user_agent" default="Asterisk <Asterisk Version>"> <synopsis>Value used in User-Agent header for SIP requests and Server header for SIP responses.</synopsis> </configOption> </configObject> diff --git a/res/res_pjsip/config_global.c b/res/res_pjsip/config_global.c index 2b2c021ee..d883e5d47 100644 --- a/res/res_pjsip/config_global.c +++ b/res/res_pjsip/config_global.c @@ -81,9 +81,9 @@ int ast_sip_initialize_sorcery_global(struct ast_sorcery *sorcery) } ast_sorcery_object_field_register(sorcery, "global", "type", "", OPT_NOOP_T, 0, 0); - ast_sorcery_object_field_register(sorcery, "global", "maxforwards", __stringify(DEFAULT_MAX_FORWARDS), + ast_sorcery_object_field_register(sorcery, "global", "max_forwards", __stringify(DEFAULT_MAX_FORWARDS), OPT_UINT_T, 0, FLDSET(struct global_config, max_forwards)); - ast_sorcery_object_field_register(sorcery, "global", "useragent", default_useragent, + ast_sorcery_object_field_register(sorcery, "global", "user_agent", default_useragent, OPT_STRINGFIELD_T, 0, STRFLDSET(struct global_config, useragent)); return 0; diff --git a/res/res_pjsip/config_system.c b/res/res_pjsip/config_system.c index 01067991e..5303ddfae 100644 --- a/res/res_pjsip/config_system.c +++ b/res/res_pjsip/config_system.c @@ -128,11 +128,11 @@ int ast_sip_initialize_system(void) } ast_sorcery_object_field_register(system_sorcery, "system", "type", "", OPT_NOOP_T, 0, 0); - ast_sorcery_object_field_register(system_sorcery, "system", "timert1", __stringify(DEFAULT_TIMER_T1), + ast_sorcery_object_field_register(system_sorcery, "system", "timer_t1", __stringify(DEFAULT_TIMER_T1), OPT_UINT_T, 0, FLDSET(struct system_config, timert1)); - ast_sorcery_object_field_register(system_sorcery, "system", "timerb", __stringify(DEFAULT_TIMER_B), + ast_sorcery_object_field_register(system_sorcery, "system", "timer_b", __stringify(DEFAULT_TIMER_B), OPT_UINT_T, 0, FLDSET(struct system_config, timerb)); - ast_sorcery_object_field_register(system_sorcery, "system", "compactheaders", "no", + ast_sorcery_object_field_register(system_sorcery, "system", "compact_headers", "no", OPT_BOOL_T, 1, FLDSET(struct system_config, compactheaders)); ast_sorcery_object_field_register(system_sorcery, "system", "threadpool_initial_size", "0", OPT_UINT_T, 0, FLDSET(struct system_config, threadpool.initial_size)); diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c index fa5603e54..4ace1821b 100644 --- a/res/res_pjsip/config_transport.c +++ b/res/res_pjsip/config_transport.c @@ -319,7 +319,7 @@ int ast_sip_initialize_sorcery_transport(struct ast_sorcery *sorcery) ast_sorcery_object_field_register(sorcery, "transport", "async_operations", "1", OPT_UINT_T, 0, FLDSET(struct ast_sip_transport, async_operations)); ast_sorcery_object_field_register(sorcery, "transport", "ca_list_file", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, ca_list_file)); ast_sorcery_object_field_register(sorcery, "transport", "cert_file", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, cert_file)); - ast_sorcery_object_field_register(sorcery, "transport", "privkey_file", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, privkey_file)); + ast_sorcery_object_field_register(sorcery, "transport", "priv_key_file", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, privkey_file)); ast_sorcery_object_field_register(sorcery, "transport", "password", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, password)); ast_sorcery_object_field_register(sorcery, "transport", "external_signaling_address", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, external_signaling_address)); ast_sorcery_object_field_register(sorcery, "transport", "external_signaling_port", "0", OPT_UINT_T, PARSE_IN_RANGE, FLDSET(struct ast_sip_transport, external_signaling_port), 0, 65535); @@ -330,7 +330,7 @@ int ast_sip_initialize_sorcery_transport(struct ast_sorcery *sorcery) ast_sorcery_object_field_register_custom(sorcery, "transport", "require_client_cert", "", transport_tls_bool_handler, NULL, 0, 0); ast_sorcery_object_field_register_custom(sorcery, "transport", "method", "", transport_tls_method_handler, NULL, 0, 0); ast_sorcery_object_field_register_custom(sorcery, "transport", "cipher", "", transport_tls_cipher_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sorcery, "transport", "localnet", "", transport_localnet_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sorcery, "transport", "local_net", "", transport_localnet_handler, NULL, 0, 0); ast_sorcery_object_field_register(sorcery, "transport", "tos", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_transport, tos)); ast_sorcery_object_field_register(sorcery, "transport", "cos", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_transport, cos)); diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index 0f98a65ae..d382fefaf 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -661,7 +661,7 @@ int ast_res_pjsip_initialize_configuration(void) ast_sorcery_object_field_register(sip_sorcery, "endpoint", "context", "default", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, context)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "disallow", "", OPT_CODEC_T, 0, FLDSET(struct ast_sip_endpoint, media.prefs, media.codecs)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "allow", "", OPT_CODEC_T, 1, FLDSET(struct ast_sip_endpoint, media.prefs, media.codecs)); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtmfmode", "rfc4733", dtmf_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtmf_mode", "rfc4733", dtmf_handler, NULL, 0, 0); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "rtp_ipv6", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.rtp.ipv6)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "rtp_symmetric", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.rtp.symmetric)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "ice_support", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.rtp.ice_support)); @@ -670,7 +670,7 @@ int ast_res_pjsip_initialize_configuration(void) ast_sorcery_object_field_register(sip_sorcery, "endpoint", "rewrite_contact", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, nat.rewrite_contact)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "transport", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, transport)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "outbound_proxy", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, outbound_proxy)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "mohsuggest", "default", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, mohsuggest)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "moh_suggest", "default", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, mohsuggest)); ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "100rel", "yes", prack_handler, NULL, 0, 0); ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "timers", "yes", timers_handler, NULL, 0, 0); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "timers_min_se", "90", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, extensions.timer.min_se)); @@ -699,42 +699,42 @@ int ast_res_pjsip_initialize_configuration(void) ast_sorcery_object_field_register(sip_sorcery, "endpoint", "use_avpf", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.rtp.use_avpf)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "one_touch_recording", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, info.recording.enabled)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "inband_progress", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, inband_progress)); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "callgroup", "", group_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "pickupgroup", "", group_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "namedcallgroup", "", named_groups_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "namedpickupgroup", "", named_groups_handler, NULL, 0, 0); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "devicestate_busy_at", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, devicestate_busy_at)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "t38udptl", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.enabled)); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "t38udptl_ec", "none", t38udptl_ec_handler, NULL, 0, 0); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "t38udptl_maxdatagram", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, media.t38.maxdatagram)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "faxdetect", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, faxdetect)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "t38udptl_nat", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.nat)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "t38udptl_ipv6", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.ipv6)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "tonezone", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, zone)); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "call_group", "", group_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "pickup_group", "", group_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "named_call_group", "", named_groups_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "named_pickup_group", "", named_groups_handler, NULL, 0, 0); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "device_state_busy_at", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, devicestate_busy_at)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "t38_udptl", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.enabled)); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "t38_udptl_ec", "none", t38udptl_ec_handler, NULL, 0, 0); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "t38_udptl_maxdatagram", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, media.t38.maxdatagram)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "fax_detect", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, faxdetect)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "t38_udptl_nat", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.nat)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "t38_udptl_ipv6", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.ipv6)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "tone_zone", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, zone)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "language", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, language)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "recordonfeature", "automixmon", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, info.recording.onfeature)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "recordofffeature", "automixmon", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, info.recording.offfeature)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "allowtransfer", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, allowtransfer)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "sdpowner", "-", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, media.sdpowner)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "sdpsession", "Asterisk", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, media.sdpsession)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "record_on_feature", "automixmon", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, info.recording.onfeature)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "record_off_feature", "automixmon", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, info.recording.offfeature)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "allow_transfer", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, allowtransfer)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "sdp_owner", "-", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, media.sdpowner)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "sdp_session", "Asterisk", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, media.sdpsession)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "tos_audio", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, media.tos_audio)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "tos_video", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, media.tos_video)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "cos_audio", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, media.cos_audio)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "cos_video", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, media.cos_video)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "allowsubscribe", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, subscription.allow)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "subminexpiry", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, subscription.minexpiry)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "fromuser", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, fromuser)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "fromdomain", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, fromdomain)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "mwifromuser", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, subscription.mwi.fromuser)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "rtpengine", "asterisk", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, media.rtp.engine)); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlsverify", "", dtls_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlsrekey", "", dtls_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlscertfile", "", dtls_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlsprivatekey", "", dtls_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlscipher", "", dtls_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlscafile", "", dtls_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlscapath", "", dtls_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlssetup", "", dtls_handler, NULL, 0, 0); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "allow_subscribe", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, subscription.allow)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "sub_min_expiry", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, subscription.minexpiry)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "from_user", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, fromuser)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "from_domain", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, fromdomain)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "mwi_from_user", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, subscription.mwi.fromuser)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "rtp_engine", "asterisk", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, media.rtp.engine)); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtls_verify", "", dtls_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtls_rekey", "", dtls_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtls_cert_file", "", dtls_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtls_private_key", "", dtls_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtls_cipher", "", dtls_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtls_ca_file", "", dtls_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtls_ca_path", "", dtls_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtls_setup", "", dtls_handler, NULL, 0, 0); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "srtp_tag_32", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.rtp.srtp_tag_32)); if (ast_sip_initialize_sorcery_transport(sip_sorcery)) { diff --git a/res/res_pjsip_acl.c b/res/res_pjsip_acl.c index 7046cde5d..8d632ec1f 100644 --- a/res/res_pjsip_acl.c +++ b/res/res_pjsip_acl.c @@ -63,14 +63,14 @@ defined as a list of comma-delimited section names. </para></description> </configOption> - <configOption name="contactacl"> + <configOption name="contact_acl"> <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"> + <configOption name="contact_deny"> <synopsis>List of Contact header addresses to deny</synopsis> <description><para> The value is a comma-delimited list of IP addresses. IP addresses may @@ -79,7 +79,7 @@ mask with a slash ('/') </para></description> </configOption> - <configOption name="contactpermit"> + <configOption name="contact_permit"> <synopsis>List of Contact header addresses to permit</synopsis> <description><para> The value is a comma-delimited list of IP addresses. IP addresses may @@ -281,9 +281,9 @@ static int load_module(void) ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "permit", "", acl_handler, NULL, 0, 0); ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "deny", "", acl_handler, NULL, 0, 0); ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "acl", "", acl_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "contactpermit", "", acl_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "contactdeny", "", acl_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "contactacl", "", acl_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "contact_permit", "", acl_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "contact_deny", "", acl_handler, NULL, 0, 0); + ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE, "contact_acl", "", acl_handler, NULL, 0, 0); ast_sip_register_service(&acl_module); return AST_MODULE_LOAD_SUCCESS; |