kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: convert configuration settings names to snake case

Browse Source 
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
This commit is contained in:
Kevin Harwell
2013-11-22 17:27:55 +00:00
parent 2147e39303
commit 1c45a32ee8
8 changed files with 186 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
configs/pjsip.conf.sample
View File

@@ -389,7 +389,7 @@
; NAT obstructs the media session (default: ; NAT obstructs the media session (default:
; "no") ; "no")
;disallow= ; Media Codec s to disallow (default: "") ;disallow= ; Media Codec s to disallow (default: "")
;dtmfmode=rfc4733 ; DTMF mode (default: "rfc4733") ;dtmf_mode=rfc4733 ; DTMF mode (default: "rfc4733")
;external_media_address= ; IP used for External Media handling (default: ;external_media_address= ; IP used for External Media handling (default:
; "") ; "")
;force_rport=yes ; Force use of return port (default: "yes") ;force_rport=yes ; Force use of return port (default: "yes")
@@ -397,7 +397,7 @@
;identify_by=username ; Way s for Endpoint to be identified (default: ;identify_by=username ; Way s for Endpoint to be identified (default:
; "username") ; "username")
;mailboxes= ; Mailbox es to be associated with (default: "") ;mailboxes= ; Mailbox es to be associated with (default: "")
;mohsuggest=default ; Default Music On Hold class (default: "default") ;moh_suggest=default ; Default Music On Hold class (default: "default")
;outbound_auth= ; Authentication object used for outbound requests (default: ;outbound_auth= ; Authentication object used for outbound requests (default:
; "") ; "")
;outbound_proxy= ; Proxy through which to send requests (default: "") ;outbound_proxy= ; Proxy through which to send requests (default: "")
@@ -429,66 +429,66 @@
; "no") ; "no")
;inband_progress=no ; Determines whether chan_pjsip will indicate ringing ;inband_progress=no ; Determines whether chan_pjsip will indicate ringing
; using inband progress (default: "no") ; using inband progress (default: "no")
;callgroup= ; The numeric pickup groups for a channel (default: "") ;call_group= ; The numeric pickup groups for a channel (default: "")
;pickupgroup= ; The numeric pickup groups that a channel can pickup (default: ;pickup_group= ; The numeric pickup groups that a channel can pickup (default:
; "") ; "")
;namedcallgroup= ; The named pickup groups for a channel (default: "") ;named_call_group= ; The named pickup groups for a channel (default: "")
;namedpickupgroup= ; The named pickup groups that a channel can pickup ;named_pickup_group= ; The named pickup groups that a channel can pickup
; (default: "") ; (default: "")
;devicestate_busy_at=0 ; The number of in use channels which will cause busy ;device_state_busy_at=0 ; The number of in use channels which will cause busy
; to be returned as device state (default: "0") ; to be returned as device state (default: "0")
;t38udptl=no ; Whether T 38 UDPTL support is enabled or not (default: "no") ;t38_udptl=no ; Whether T 38 UDPTL support is enabled or not (default: "no")
;t38udptl_ec=none ; T 38 UDPTL error correction method (default: "none") ;t38_udptl_ec=none ; T 38 UDPTL error correction method (default: "none")
;t38udptl_maxdatagram=0 ; T 38 UDPTL maximum datagram size (default: "0") ;t38_udptl_maxdatagram=0 ; T 38 UDPTL maximum datagram size (default: "0")
;faxdetect=no ; Whether CNG tone detection is enabled (default: "no") ;fax_detect=no ; Whether CNG tone detection is enabled (default: "no")
;t38udptl_nat=no ; Whether NAT support is enabled on UDPTL sessions ;t38_udptl_nat=no ; Whether NAT support is enabled on UDPTL sessions
; (default: "no") ; (default: "no")
;t38udptl_ipv6=no ; Whether IPv6 is used for UDPTL Sessions (default: ;t38_udptl_ipv6=no ; Whether IPv6 is used for UDPTL Sessions (default:
; "no") ; "no")
;tonezone= ; Set which country s indications to use for channels created ;tone_zone= ; Set which country s indications to use for channels created
; for this endpoint (default: "") ; for this endpoint (default: "")
;language= ; Set the default language to use for channels created for this ;language= ; Set the default language to use for channels created for this
; endpoint (default: "") ; endpoint (default: "")
;one_touch_recording=no ; Determines whether one touch recording is allowed for ;one_touch_recording=no ; Determines whether one touch recording is allowed for
; this endpoint (default: "no") ; this endpoint (default: "no")
;recordonfeature=automixmon ; The feature to enact when one touch recording ;record_on_feature=automixmon ; The feature to enact when one touch recording
; is turned on (default: "automixmon") ; is turned on (default: "automixmon")
;recordofffeature=automixmon ; The feature to enact when one touch recording ;record_off_feature=automixmon ; The feature to enact when one touch recording
; is turned off (default: "automixmon") ; is turned off (default: "automixmon")
;rtpengine=asterisk ; Name of the RTP engine to use for channels created ;rtp_engine=asterisk ; Name of the RTP engine to use for channels created
; for this endpoint (default: "asterisk") ; for this endpoint (default: "asterisk")
;allowtransfer=yes ; Determines whether SIP REFER transfers are allowed ;allow_transfer=yes ; Determines whether SIP REFER transfers are allowed
; for this endpoint (default: "yes") ; for this endpoint (default: "yes")
;sdpowner=- ; String placed as the username portion of an SDP origin o line ;sdp_owner=- ; String placed as the username portion of an SDP origin o line
; (default: "-") ; (default: "-")
;sdpsession=Asterisk ; String used for the SDP session s line (default: ;sdp_session=Asterisk ; String used for the SDP session s line (default:
; "Asterisk") ; "Asterisk")
;tos_audio=0 ; DSCP TOS bits for audio streams (default: "0") ;tos_audio=0 ; DSCP TOS bits for audio streams (default: "0")
;tos_video=0 ; DSCP TOS bits for video streams (default: "0") ;tos_video=0 ; DSCP TOS bits for video streams (default: "0")
;cos_audio=0 ; Priority for audio streams (default: "0") ;cos_audio=0 ; Priority for audio streams (default: "0")
;cos_video=0 ; Priority for video streams (default: "0") ;cos_video=0 ; Priority for video streams (default: "0")
;allowsubscribe=yes ; Determines if endpoint is allowed to initiate ;allow_subscribe=yes ; Determines if endpoint is allowed to initiate
; subscriptions with Asterisk (default: "yes") ; subscriptions with Asterisk (default: "yes")
;subminexpiry=0 ; The minimum allowed expiry time for subscriptions initiated ;sub_min_expiry=0 ; The minimum allowed expiry time for subscriptions initiated
; by the endpoint (default: "0") ; by the endpoint (default: "0")
;fromuser= ; Username to use in From header for requests to this endpoint ;from_user= ; Username to use in From header for requests to this endpoint
; (default: "") ; (default: "")
;mwifromuser= ; Username to use in From header for unsolicited MWI NOTIFYs to ;mwi_from_user= ; Username to use in From header for unsolicited MWI NOTIFYs to
; this endpoint (default: "") ; this endpoint (default: "")
;fromdomain= ; Domain to user in From header for requests to this endpoint ;fromdomain= ; Domain to user in From header for requests to this endpoint
; (default: "") ; (default: "")
;dtlsverify= ; Verify that the provided peer certificate is valid (default: ;dtls_verify= ; Verify that the provided peer certificate is valid (default:
; "") ; "")
;dtlsrekey= ; Interval at which to renegotiate the TLS session and rekey ;dtls_rekey= ; Interval at which to renegotiate the TLS session and rekey
; the SRTP session (default: "") ; the SRTP session (default: "")
;dtlscertfile= ; Path to certificate file to present to peer (default: "") ;dtls_cert_file= ; Path to certificate file to present to peer (default: "")
;dtlsprivatekey= ; Path to private key for certificate file (default: ;dtls_private_key= ; Path to private key for certificate file (default:
; "") ; "")
;dtlscipher= ; Cipher to use for DTLS negotiation (default: "") ;dtls_cipher= ; Cipher to use for DTLS negotiation (default: "")
;dtlscafile= ; Path to certificate authority certificate (default: "") ;dtls_ca_file= ; Path to certificate authority certificate (default: "")
;dtlscapath= ; Path to a directory containing certificate authority ;dtls_ca_path= ; Path to a directory containing certificate authority
; certificates (default: "") ; certificates (default: "")
;dtlssetup= ; Whether we are willing to accept connections connect to the ;dtls_setup= ; Whether we are willing to accept connections connect to the
; other party or both (default: "") ; other party or both (default: "")
;srtp_tag_32=no ; Determines whether 32 byte tags should be used instead of 80 ;srtp_tag_32=no ; Determines whether 32 byte tags should be used instead of 80
; byte tags (default: "no") ; byte tags (default: "no")
@@ -533,9 +533,9 @@
;external_signaling_port=0 ; External port for SIP signalling (default: ;external_signaling_port=0 ; External port for SIP signalling (default:
; "0") ; "0")
;method= ; Method of SSL transport TLS ONLY (default: "") ;method= ; Method of SSL transport TLS ONLY (default: "")
;localnet= ; Network to consider local used for NAT purposes (default: "") ;local_net= ; Network to consider local used for NAT purposes (default: "")
;password= ; Password required for transport (default: "") ;password= ; Password required for transport (default: "")
;privkey_file= ; Private key file TLS ONLY (default: "") ;priv_key_file= ; Private key file TLS ONLY (default: "")
;protocol=udp ; Protocol to use for SIP traffic (default: "udp") ;protocol=udp ; Protocol to use for SIP traffic (default: "udp")
;require_client_cert= ; Require client certificate TLS ONLY (default: "") ;require_client_cert= ; Require client certificate TLS ONLY (default: "")
;type= ; Must be of type transport (default: "") ;type= ; Must be of type transport (default: "")
@@ -579,9 +579,9 @@
;==========================SYSTEM SECTION OPTIONS========================= ;==========================SYSTEM SECTION OPTIONS=========================
;[system] ;[system]
; SYNOPSIS: Options that apply to the SIP stack as well as other system-wide settings ; SYNOPSIS: Options that apply to the SIP stack as well as other system-wide settings
;timert1=500 ; Set transaction timer T1 value milliseconds (default: "500") ;timer_t1=500 ; Set transaction timer T1 value milliseconds (default: "500")
;timerb=32000 ; Set transaction timer B value milliseconds (default: "32000") ;timer_b=32000 ; Set transaction timer B value milliseconds (default: "32000")
;compactheaders=no ; Use the short forms of common SIP header names ;compact_headers=no ; Use the short forms of common SIP header names
; (default: "no") ; (default: "no")
;threadpool_initial_size=0 ; Initial number of threads in the res_pjsip ;threadpool_initial_size=0 ; Initial number of threads in the res_pjsip
; threadpool (default: "0") ; threadpool (default: "0")
@@ -597,12 +597,12 @@
;==========================GLOBAL SECTION OPTIONS========================= ;==========================GLOBAL SECTION OPTIONS=========================
;[global] ;[global]
; SYNOPSIS: Options that apply globally to all SIP communications ; SYNOPSIS: Options that apply globally to all SIP communications
;maxforwards=70 ; Value used in Max Forwards header for SIP requests (default: ;max_forwards=70 ; Value used in Max Forwards header for SIP requests (default:
; "70") ; "70")
;type= ; Must be of type global (default: "") ;type= ; Must be of type global (default: "")
;useragent= ; Value used in User Agent header for SIP requests and Server ;user_agent= ; Value used in User Agent header for SIP requests and Server
; header for SIP responses (default: Populated by Asterisk ; header for SIP responses (default: Populated by Asterisk
; Version) ; Version)
@@ -612,9 +612,9 @@
;[acl] ;[acl]
; SYNOPSIS: Access Control List ; SYNOPSIS: Access Control List
;acl= ; Name of IP ACL (default: "") ;acl= ; Name of IP ACL (default: "")
;contactacl= ; Name of Contact ACL (default: "") ;contact_acl= ; Name of Contact ACL (default: "")
;contactdeny= ; List of Contact Header addresses to Deny (default: "") ;contact_deny= ; List of Contact Header addresses to Deny (default: "")
;contactpermit= ; List of Contact Header addresses to Permit (default: "") ;contact_permit= ; List of Contact Header addresses to Permit (default: "")
;deny= ; List of IP domains to deny access from (default: "") ;deny= ; List of IP domains to deny access from (default: "")
;permit= ; List of IP domains to allow access from (default: "") ;permit= ; List of IP domains to allow access from (default: "")
;type= ; Must be of type security (default: "") ;type= ; Must be of type security (default: "")

72
contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
View File

@@ -102,6 +102,7 @@ def set_dtmfmode(key, val, section, pjsip, nmapped):
Sets the dtmfmode value. If value matches allowable option in pjsip Sets the dtmfmode value. If value matches allowable option in pjsip
then map it, otherwise set it to none. then map it, otherwise set it to none.
""" """
key = 'dtmf_mode'
# available pjsip.conf values: rfc4733, inband, info, none # available pjsip.conf values: rfc4733, inband, info, none
if val == 'inband' or val == 'info': if val == 'inband' or val == 'info':
set_value(key, val, section, pjsip, nmapped) set_value(key, val, section, pjsip, nmapped)
@@ -191,6 +192,13 @@ def from_recordfeature(key, val, section, pjsip, nmapped):
set_value('one_touch_recording', 'yes', section, pjsip, nmapped) set_value('one_touch_recording', 'yes', section, pjsip, nmapped)
set_value(key, val, section, pjsip, nmapped) set_value(key, val, section, pjsip, nmapped)
def set_record_on_feature(key, val, section, pjsip, nmapped):
"""Sets the record_on_feature in pjsip.conf"""
from_recordfeature('record_on_feature', val, section, pjsip, nmapped)
def set_record_off_feature(key, val, section, pjsip, nmapped):
"""Sets the record_off_feature in pjsip.conf"""
from_recordfeature('record_off_feature', val, section, pjsip, nmapped)
def from_progressinband(key, val, section, pjsip, nmapped): def from_progressinband(key, val, section, pjsip, nmapped):
"""Sets the inband_progress value in pjsip.conf""" """Sets the inband_progress value in pjsip.conf"""
@@ -371,7 +379,7 @@ peer_map = [
['icesupport', set_value('ice_support')], ['icesupport', set_value('ice_support')],
['autoframing', set_value('use_ptime')], ['autoframing', set_value('use_ptime')],
['outboundproxy', set_value('outbound_proxy')], ['outboundproxy', set_value('outbound_proxy')],
['mohsuggest', set_value], ['mohsuggest', set_value('moh_suggest')],
['session-timers', set_timers], # timers ['session-timers', set_timers], # timers
['session-minse', set_value('timers_min_se')], ['session-minse', set_value('timers_min_se')],
['session-expires', set_value('timers_sess_expires')], ['session-expires', set_value('timers_sess_expires')],
@@ -390,42 +398,42 @@ peer_map = [
['send_diversion', set_value], ['send_diversion', set_value],
['encrpytion', set_media_encryption], ['encrpytion', set_media_encryption],
['avpf', set_value('use_avpf')], ['avpf', set_value('use_avpf')],
['recordonfeature', from_recordfeature], # automixon ['recordonfeature', set_record_on_feature], # automixon
['recordofffeature', from_recordfeature], # automixon ['recordofffeature', set_record_off_feature], # automixon
['progressinband', from_progressinband], # in_band_progress ['progressinband', from_progressinband], # in_band_progress
['callgroup', set_value], ['callgroup', set_value('call_group')],
['pickupgroup', set_value], ['pickupgroup', set_value('pickup_group')],
['namedcallgroup', set_value], ['namedcallgroup', set_value('named_call_group')],
['namedpickupgroup', set_value], ['namedpickupgroup', set_value('named_pickup_group')],
['allowtransfer', set_value], ['allowtransfer', set_value('allow_transfer')],
['fromuser', set_value], ['fromuser', set_value('from_user')],
['fromdomain', set_value], ['fromdomain', set_value('from_domain')],
['mwifrom', set_value('mwifromuser')], ['mwifrom', set_value('mwi_from_user')],
['tos_audio', set_value], ['tos_audio', set_value],
['tos_video', set_value], ['tos_video', set_value],
['cos_audio', set_value], ['cos_audio', set_value],
['cos_video', set_value], ['cos_video', set_value],
['sdpowner', set_value], ['sdpowner', set_value('sdp_owner')],
['sdpsession', set_value], ['sdpsession', set_value('sdp_session')],
['tonezone', set_value], ['tonezone', set_value('tone_zone')],
['language', set_value], ['language', set_value],
['allowsubscribe', set_value], ['allowsubscribe', set_value('allow_subscribe')],
['subminexpiry', set_value], ['subminexpiry', set_value('sub_min_expiry')],
['rtp_engine', set_value('rtpengine')], ['rtp_engine', set_value],
['mailbox', from_mailbox], ['mailbox', from_mailbox],
['busylevel', set_value('devicestate_busy_at')], ['busylevel', set_value('device_state_busy_at')],
['secret', setup_auth], ['secret', setup_auth],
['md5secret', setup_auth], ['md5secret', setup_auth],
['type', setup_ident], ['type', setup_ident],
['dtlsenable', from_dtlsenable], ['dtlsenable', from_dtlsenable],
['dtlsverify', set_value], ['dtlsverify', set_value('dtls_verify')],
['dtlsrekey', set_value], ['dtlsrekey', set_value('dtls_rekey')],
['dtlscertfile', set_value], ['dtlscertfile', set_value('dtls_cert_file')],
['dtlsprivatekey', set_value], ['dtlsprivatekey', set_value('dtls_private_key')],
['dtlscipher', set_value], ['dtlscipher', set_value('dtls_cipher')],
['dtlscafile', set_value], ['dtlscafile', set_value('dtls_ca_file')],
['dtlscapath', set_value], ['dtlscapath', set_value('dtls_ca_path')],
['dtlssetup', set_value], ['dtlssetup', set_value('dtls_setup')],
['encryption_taglen', from_encryption_taglen], ['encryption_taglen', from_encryption_taglen],
############################ maps to an aor ################################### ############################ maps to an aor ###################################
@@ -446,9 +454,9 @@ peer_map = [
['permit', merge_value(type='acl', section_to='acl')], ['permit', merge_value(type='acl', section_to='acl')],
['deny', merge_value(type='acl', section_to='acl')], ['deny', merge_value(type='acl', section_to='acl')],
['acl', merge_value(type='acl', section_to='acl')], ['acl', merge_value(type='acl', section_to='acl')],
['contactpermit', merge_value(type='acl', section_to='acl')], ['contactpermit', merge_value('contact_permit', type='acl', section_to='acl')],
['contactdeny', merge_value(type='acl', section_to='acl')], ['contactdeny', merge_value('contact_deny', type='acl', section_to='acl')],
['contactacl', merge_value(type='acl', section_to='acl')], ['contactacl', merge_value('contact_acl', type='acl', section_to='acl')],
########################### maps to transport ################################# ########################### maps to transport #################################
# type = transport # type = transport
@@ -499,7 +507,7 @@ def add_localnet(section, pjsip, nmapped):
the same thing on to every transport. the same thing on to every transport.
""" """
try: try:
merge_value('localnet', sip.get('general', 'localnet')[0], 'general', merge_value('local_net', sip.get('general', 'localnet')[0], 'general',
pjsip, nmapped, 'transport', section) pjsip, nmapped, 'transport', section)
except LookupError: except LookupError:
# No localnet options configured. No biggie! # No localnet options configured. No biggie!
@@ -519,7 +527,7 @@ def set_transport_common(section, pjsip, nmapped):
""" """
try: try:
merge_value('localnet', sip.get('general', 'localnet')[0], 'general', merge_value('local_net', sip.get('general', 'localnet')[0], 'general',
pjsip, nmapped, 'transport', section) pjsip, nmapped, 'transport', section)
except LookupError: except LookupError:
# No localnet options configured. Move on. # No localnet options configured. Move on.
@@ -687,7 +695,7 @@ def set_tls_bindaddr(val, pjsip, nmapped):
def set_tls_private_key(val, pjsip, nmapped): def set_tls_private_key(val, pjsip, nmapped):
"""Sets privkey_file based on sip.conf tlsprivatekey or sslprivatekey""" """Sets privkey_file based on sip.conf tlsprivatekey or sslprivatekey"""
set_value('privkey_file', val, 'transport-tls', pjsip, nmapped, set_value('priv_key_file', val, 'transport-tls', pjsip, nmapped,
'transport') 'transport')

80
res/res_pjsip.c
View File

@@ -189,7 +189,7 @@
<configOption name="disallow"> <configOption name="disallow">
<synopsis>Media Codec(s) to disallow</synopsis> <synopsis>Media Codec(s) to disallow</synopsis>
</configOption> </configOption>
<configOption name="dtmfmode" default="rfc4733"> <configOption name="dtmf_mode" default="rfc4733">
<synopsis>DTMF mode</synopsis> <synopsis>DTMF mode</synopsis>
<description> <description>
<para>This setting allows to choose the DTMF mode for endpoint communication.</para> <para>This setting allows to choose the DTMF mode for endpoint communication.</para>
@@ -247,7 +247,7 @@
<configOption name="mailboxes"> <configOption name="mailboxes">
<synopsis>Mailbox(es) to be associated with</synopsis> <synopsis>Mailbox(es) to be associated with</synopsis>
</configOption> </configOption>
<configOption name="mohsuggest" default="default"> <configOption name="moh_suggest" default="default">
<synopsis>Default Music On Hold class</synopsis> <synopsis>Default Music On Hold class</synopsis>
</configOption> </configOption>
<configOption name="outbound_auth"> <configOption name="outbound_auth">
@@ -388,49 +388,49 @@
to indicate ringing and will NOT send it as audio. to indicate ringing and will NOT send it as audio.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="callgroup"> <configOption name="call_group">
<synopsis>The numeric pickup groups for a channel.</synopsis> <synopsis>The numeric pickup groups for a channel.</synopsis>
<description><para> <description><para>
Can be set to a comma separated list of numbers or ranges between the values Can be set to a comma separated list of numbers or ranges between the values
of 0-63 (maximum of 64 groups). of 0-63 (maximum of 64 groups).
</para></description> </para></description>
</configOption> </configOption>
<configOption name="pickupgroup"> <configOption name="pickup_group">
<synopsis>The numeric pickup groups that a channel can pickup.</synopsis> <synopsis>The numeric pickup groups that a channel can pickup.</synopsis>
<description><para> <description><para>
Can be set to a comma separated list of numbers or ranges between the values Can be set to a comma separated list of numbers or ranges between the values
of 0-63 (maximum of 64 groups). of 0-63 (maximum of 64 groups).
</para></description> </para></description>
</configOption> </configOption>
<configOption name="namedcallgroup"> <configOption name="named_call_group">
<synopsis>The named pickup groups for a channel.</synopsis> <synopsis>The named pickup groups for a channel.</synopsis>
<description><para> <description><para>
Can be set to a comma separated list of case sensitive strings limited by Can be set to a comma separated list of case sensitive strings limited by
supported line length. supported line length.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="namedpickupgroup"> <configOption name="named_pickup_group">
<synopsis>The named pickup groups that a channel can pickup.</synopsis> <synopsis>The named pickup groups that a channel can pickup.</synopsis>
<description><para> <description><para>
Can be set to a comma separated list of case sensitive strings limited by Can be set to a comma separated list of case sensitive strings limited by
supported line length. supported line length.
</para></description> </para></description>
</configOption> </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> <synopsis>The number of in-use channels which will cause busy to be returned as device state</synopsis>
<description><para> <description><para>
When the number of in-use channels for the endpoint matches the devicestate_busy_at setting the 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. PJSIP channel driver will return busy as the device state instead of in use.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="t38udptl" default="no"> <configOption name="t38_udptl" default="no">
<synopsis>Whether T.38 UDPTL support is enabled or not</synopsis> <synopsis>Whether T.38 UDPTL support is enabled or not</synopsis>
<description><para> <description><para>
If set to yes T.38 UDPTL support will be enabled, and T.38 negotiation requests will be accepted If set to yes T.38 UDPTL support will be enabled, and T.38 negotiation requests will be accepted
and relayed. and relayed.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="t38udptl_ec" default="none"> <configOption name="t38_udptl_ec" default="none">
<synopsis>T.38 UDPTL error correction method</synopsis> <synopsis>T.38 UDPTL error correction method</synopsis>
<description> <description>
<enumlist> <enumlist>
@@ -446,34 +446,34 @@
</enumlist> </enumlist>
</description> </description>
</configOption> </configOption>
<configOption name="t38udptl_maxdatagram" default="0"> <configOption name="t38_udptl_maxdatagram" default="0">
<synopsis>T.38 UDPTL maximum datagram size</synopsis> <synopsis>T.38 UDPTL maximum datagram size</synopsis>
<description><para> <description><para>
This option can be set to override the maximum datagram of a remote endpoint for broken This option can be set to override the maximum datagram of a remote endpoint for broken
endpoints. endpoints.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="faxdetect" default="no"> <configOption name="fax_detect" default="no">
<synopsis>Whether CNG tone detection is enabled</synopsis> <synopsis>Whether CNG tone detection is enabled</synopsis>
<description><para> <description><para>
This option can be set to send the session to the fax extension when a CNG tone is This option can be set to send the session to the fax extension when a CNG tone is
detected. detected.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="t38udptl_nat" default="no"> <configOption name="t38_udptl_nat" default="no">
<synopsis>Whether NAT support is enabled on UDPTL sessions</synopsis> <synopsis>Whether NAT support is enabled on UDPTL sessions</synopsis>
<description><para> <description><para>
When enabled the UDPTL stack will send UDPTL packets to the source address of When enabled the UDPTL stack will send UDPTL packets to the source address of
received packets. received packets.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="t38udptl_ipv6" default="no"> <configOption name="t38_udptl_ipv6" default="no">
<synopsis>Whether IPv6 is used for UDPTL Sessions</synopsis> <synopsis>Whether IPv6 is used for UDPTL Sessions</synopsis>
<description><para> <description><para>
When enabled the UDPTL stack will use IPv6. When enabled the UDPTL stack will use IPv6.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="tonezone"> <configOption name="tone_zone">
<synopsis>Set which country's indications to use for channels created for this endpoint.</synopsis> <synopsis>Set which country's indications to use for channels created for this endpoint.</synopsis>
</configOption> </configOption>
<configOption name="language"> <configOption name="language">
@@ -486,7 +486,7 @@
<ref type="configOption">recordofffeature</ref> <ref type="configOption">recordofffeature</ref>
</see-also> </see-also>
</configOption> </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> <synopsis>The feature to enact when one-touch recording is turned on.</synopsis>
<description> <description>
<para>When an INFO request for one-touch recording arrives with a Record header set to "on", this <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> <ref type="configOption">recordofffeature</ref>
</see-also> </see-also>
</configOption> </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> <synopsis>The feature to enact when one-touch recording is turned off.</synopsis>
<description> <description>
<para>When an INFO request for one-touch recording arrives with a Record header set to "off", this <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> <ref type="configOption">recordonfeature</ref>
</see-also> </see-also>
</configOption> </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> <synopsis>Name of the RTP engine to use for channels created for this endpoint</synopsis>
</configOption> </configOption>
<configOption name="allowtransfer" default="yes"> <configOption name="allow_transfer" default="yes">
<synopsis>Determines whether SIP REFER transfers are allowed for this endpoint</synopsis> <synopsis>Determines whether SIP REFER transfers are allowed for this endpoint</synopsis>
</configOption> </configOption>
<configOption name="sdpowner" default="-"> <configOption name="sdp_owner" default="-">
<synopsis>String placed as the username portion of an SDP origin (o=) line.</synopsis> <synopsis>String placed as the username portion of an SDP origin (o=) line.</synopsis>
</configOption> </configOption>
<configOption name="sdpsession" default="Asterisk"> <configOption name="sdp_session" default="Asterisk">
<synopsis>String used for the SDP session (s=) line.</synopsis> <synopsis>String used for the SDP session (s=) line.</synopsis>
</configOption> </configOption>
<configOption name="tos_audio"> <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 See https://wiki.asterisk.org/wiki/display/AST/IP+Quality+of+Service for more information about QoS settings
</para></description> </para></description>
</configOption> </configOption>
<configOption name="allowsubscribe" default="yes"> <configOption name="allow_subscribe" default="yes">
<synopsis>Determines if endpoint is allowed to initiate subscriptions with Asterisk.</synopsis> <synopsis>Determines if endpoint is allowed to initiate subscriptions with Asterisk.</synopsis>
</configOption> </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> <synopsis>The minimum allowed expiry time for subscriptions initiated by the endpoint.</synopsis>
</configOption> </configOption>
<configOption name="fromuser"> <configOption name="from_user">
<synopsis>Username to use in From header for requests to this endpoint.</synopsis> <synopsis>Username to use in From header for requests to this endpoint.</synopsis>
</configOption> </configOption>
<configOption name="mwifromuser"> <configOption name="mwi_from_user">
<synopsis>Username to use in From header for unsolicited MWI NOTIFYs to this endpoint.</synopsis> <synopsis>Username to use in From header for unsolicited MWI NOTIFYs to this endpoint.</synopsis>
</configOption> </configOption>
<configOption name="fromdomain"> <configOption name="from_domain">
<synopsis>Domain to user in From header for requests to this endpoint.</synopsis> <synopsis>Domain to user in From header for requests to this endpoint.</synopsis>
</configOption> </configOption>
<configOption name="dtlsverify"> <configOption name="dtls_verify">
<synopsis>Verify that the provided peer certificate is valid</synopsis> <synopsis>Verify that the provided peer certificate is valid</synopsis>
<description><para> <description><para>
This option only applies if <replaceable>media_encryption</replaceable> is This option only applies if <replaceable>media_encryption</replaceable> is
set to <literal>dtls</literal>. set to <literal>dtls</literal>.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="dtlsrekey"> <configOption name="dtls_rekey">
<synopsis>Interval at which to renegotiate the TLS session and rekey the SRTP session</synopsis> <synopsis>Interval at which to renegotiate the TLS session and rekey the SRTP session</synopsis>
<description><para> <description><para>
This option only applies if <replaceable>media_encryption</replaceable> is 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. If this is not set or the value provided is 0 rekeying will be disabled.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="dtlscertfile"> <configOption name="dtls_cert_file">
<synopsis>Path to certificate file to present to peer</synopsis> <synopsis>Path to certificate file to present to peer</synopsis>
<description><para> <description><para>
This option only applies if <replaceable>media_encryption</replaceable> is This option only applies if <replaceable>media_encryption</replaceable> is
set to <literal>dtls</literal>. set to <literal>dtls</literal>.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="dtlsprivatekey"> <configOption name="dtls_private_key">
<synopsis>Path to private key for certificate file</synopsis> <synopsis>Path to private key for certificate file</synopsis>
<description><para> <description><para>
This option only applies if <replaceable>media_encryption</replaceable> is This option only applies if <replaceable>media_encryption</replaceable> is
set to <literal>dtls</literal>. set to <literal>dtls</literal>.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="dtlscipher"> <configOption name="dtls_cipher">
<synopsis>Cipher to use for DTLS negotiation</synopsis> <synopsis>Cipher to use for DTLS negotiation</synopsis>
<description><para> <description><para>
This option only applies if <replaceable>media_encryption</replaceable> is This option only applies if <replaceable>media_encryption</replaceable> is
@@ -603,21 +603,21 @@
http://www.openssl.org/docs/apps/ciphers.html#CIPHER_STRINGS http://www.openssl.org/docs/apps/ciphers.html#CIPHER_STRINGS
</para></description> </para></description>
</configOption> </configOption>
<configOption name="dtlscafile"> <configOption name="dtls_ca_file">
<synopsis>Path to certificate authority certificate</synopsis> <synopsis>Path to certificate authority certificate</synopsis>
<description><para> <description><para>
This option only applies if <replaceable>media_encryption</replaceable> is This option only applies if <replaceable>media_encryption</replaceable> is
set to <literal>dtls</literal>. set to <literal>dtls</literal>.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="dtlscapath"> <configOption name="dtls_ca_path">
<synopsis>Path to a directory containing certificate authority certificates</synopsis> <synopsis>Path to a directory containing certificate authority certificates</synopsis>
<description><para> <description><para>
This option only applies if <replaceable>media_encryption</replaceable> is This option only applies if <replaceable>media_encryption</replaceable> is
set to <literal>dtls</literal>. set to <literal>dtls</literal>.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="dtlssetup"> <configOption name="dtls_setup">
<synopsis>Whether we are willing to accept connections, connect to the other party, or both.</synopsis> <synopsis>Whether we are willing to accept connections, connect to the other party, or both.</synopsis>
<description> <description>
<para> <para>
@@ -767,7 +767,7 @@
</enumlist> </enumlist>
</description> </description>
</configOption> </configOption>
<configOption name="localnet"> <configOption name="local_net">
<synopsis>Network to consider local (used for NAT purposes).</synopsis> <synopsis>Network to consider local (used for NAT purposes).</synopsis>
<description><para>This must be in CIDR or dotted decimal format with the IP <description><para>This must be in CIDR or dotted decimal format with the IP
and mask separated with a slash ('/').</para></description> and mask separated with a slash ('/').</para></description>
@@ -775,7 +775,7 @@
<configOption name="password"> <configOption name="password">
<synopsis>Password required for transport</synopsis> <synopsis>Password required for transport</synopsis>
</configOption> </configOption>
<configOption name="privkey_file"> <configOption name="priv_key_file">
<synopsis>Private key file (TLS ONLY)</synopsis> <synopsis>Private key file (TLS ONLY)</synopsis>
</configOption> </configOption>
<configOption name="protocol" default="udp"> <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 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. restart Asterisk, or unload res_pjsip.so and then load it again.
</para></description> </para></description>
<configOption name="timert1" default="500"> <configOption name="timer_t1" default="500">
<synopsis>Set transaction timer T1 value (milliseconds).</synopsis> <synopsis>Set transaction timer T1 value (milliseconds).</synopsis>
<description><para> <description><para>
Timer T1 is the base for determining how long to wait before retransmitting 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. For more information on this timer, see RFC 3261, Section 17.1.1.1.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="timerb" default="32000"> <configOption name="timer_b" default="32000">
<synopsis>Set transaction timer B value (milliseconds).</synopsis> <synopsis>Set transaction timer B value (milliseconds).</synopsis>
<description><para> <description><para>
Timer B determines the maximum amount of time to wait after sending an INVITE 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. this timer, see RFC 3261, Section 17.1.1.1.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="compactheaders" default="no"> <configOption name="compact_headers" default="no">
<synopsis>Use the short forms of common SIP header names.</synopsis> <synopsis>Use the short forms of common SIP header names.</synopsis>
</configOption> </configOption>
<configOption name="threadpool_initial_size" default="0"> <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> The settings in this section are global. Unlike options in the <literal>system</literal>
section, these options can be refreshed by performing a reload. section, these options can be refreshed by performing a reload.
</para></description> </para></description>
<configOption name="maxforwards" default="70"> <configOption name="max_forwards" default="70">
<synopsis>Value used in Max-Forwards header for SIP requests.</synopsis> <synopsis>Value used in Max-Forwards header for SIP requests.</synopsis>
</configOption> </configOption>
<configOption name="type"> <configOption name="type">
<synopsis>Must be of type 'global'.</synopsis> <synopsis>Must be of type 'global'.</synopsis>
</configOption> </configOption>
<configOption name="useragent" default="Asterisk &lt;Asterisk Version&gt;"> <configOption name="user_agent" default="Asterisk &lt;Asterisk Version&gt;">
<synopsis>Value used in User-Agent header for SIP requests and Server header for SIP responses.</synopsis> <synopsis>Value used in User-Agent header for SIP requests and Server header for SIP responses.</synopsis>
</configOption> </configOption>
</configObject> </configObject>

4
res/res_pjsip/config_global.c
View File

@@ -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", "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)); 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)); OPT_STRINGFIELD_T, 0, STRFLDSET(struct global_config, useragent));
return 0; return 0;

6
res/res_pjsip/config_system.c
View File

@@ -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", "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)); 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)); 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)); OPT_BOOL_T, 1, FLDSET(struct system_config, compactheaders));
ast_sorcery_object_field_register(system_sorcery, "system", "threadpool_initial_size", "0", ast_sorcery_object_field_register(system_sorcery, "system", "threadpool_initial_size", "0",
OPT_UINT_T, 0, FLDSET(struct system_config, threadpool.initial_size)); OPT_UINT_T, 0, FLDSET(struct system_config, threadpool.initial_size));

4
res/res_pjsip/config_transport.c
View File

@@ -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", "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", "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", "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", "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_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); 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", "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", "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", "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", "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)); ast_sorcery_object_field_register(sorcery, "transport", "cos", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_transport, cos));

66
res/res_pjsip/pjsip_configuration.c
View File

@@ -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", "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", "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(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_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", "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)); 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", "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", "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", "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", "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_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)); 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", "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", "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(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", "call_group", "", 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", "pickup_group", "", 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", "named_call_group", "", 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_custom(sip_sorcery, "endpoint", "named_pickup_group", "", 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", "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", "t38udptl", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.enabled)); 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", "t38udptl_ec", "none", t38udptl_ec_handler, NULL, 0, 0); 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", "t38udptl_maxdatagram", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, media.t38.maxdatagram)); 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", "faxdetect", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, faxdetect)); 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", "t38udptl_nat", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.nat)); 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", "t38udptl_ipv6", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.t38.ipv6)); 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", "tonezone", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, zone)); 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", "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", "record_on_feature", "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", "record_off_feature", "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", "allow_transfer", "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", "sdp_owner", "-", 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", "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_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", "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_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", "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", "allow_subscribe", "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", "sub_min_expiry", "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", "from_user", "", 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", "from_domain", "", 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", "mwi_from_user", "", 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(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", "dtlsverify", "", dtls_handler, NULL, 0, 0); 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", "dtlsrekey", "", 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", "dtlscertfile", "", 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", "dtlsprivatekey", "", 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", "dtlscipher", "", 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", "dtlscafile", "", 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", "dtlscapath", "", 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", "dtlssetup", "", 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)); 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)) { if (ast_sip_initialize_sorcery_transport(sip_sorcery)) {

12
res/res_pjsip_acl.c
View File

@@ -63,14 +63,14 @@
defined as a list of comma-delimited section names. defined as a list of comma-delimited section names.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="contactacl"> <configOption name="contact_acl">
<synopsis>List of Contact ACL section names in acl.conf</synopsis> <synopsis>List of Contact ACL section names in acl.conf</synopsis>
<description><para> <description><para>
This matches sections configured in <literal>acl.conf</literal>. The value is This matches sections configured in <literal>acl.conf</literal>. The value is
defined as a list of comma-delimited section names. defined as a list of comma-delimited section names.
</para></description> </para></description>
</configOption> </configOption>
<configOption name="contactdeny"> <configOption name="contact_deny">
<synopsis>List of Contact header addresses to deny</synopsis> <synopsis>List of Contact header addresses to deny</synopsis>
<description><para> <description><para>
The value is a comma-delimited list of IP addresses. IP addresses may The value is a comma-delimited list of IP addresses. IP addresses may
@@ -79,7 +79,7 @@
mask with a slash ('/') mask with a slash ('/')
</para></description> </para></description>
</configOption> </configOption>
<configOption name="contactpermit"> <configOption name="contact_permit">
<synopsis>List of Contact header addresses to permit</synopsis> <synopsis>List of Contact header addresses to permit</synopsis>
<description><para> <description><para>
The value is a comma-delimited list of IP addresses. IP addresses may 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, "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, "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, "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, "contact_permit", "", 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, "contact_deny", "", 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_acl", "", acl_handler, NULL, 0, 0);
ast_sip_register_service(&acl_module); ast_sip_register_service(&acl_module);
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;