mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 18:55:19 +00:00 
			
		
		
		
	res_pjsip: Whitespace and comment cleanup.
Change-Id: I11139a4a95df34e223ba622aa6227e33ab8f6c38
This commit is contained in:
		| @@ -672,7 +672,7 @@ | |||||||
|                         ; usage of media encryption for this endpoint (default: |                         ; usage of media encryption for this endpoint (default: | ||||||
|                         ; "no") |                         ; "no") | ||||||
| ;media_encryption_optimistic=no ; Use encryption if possible but don't fail the call | ;media_encryption_optimistic=no ; Use encryption if possible but don't fail the call | ||||||
| 								; if not possible. |                                 ; if not possible. | ||||||
| ;g726_non_standard=no   ; When set to "yes" and an endpoint negotiates g.726 | ;g726_non_standard=no   ; When set to "yes" and an endpoint negotiates g.726 | ||||||
|                         ; audio then g.726 for AAL2 packing order is used contrary |                         ; audio then g.726 for AAL2 packing order is used contrary | ||||||
|                         ; to what is recommended in RFC3551. Note, 'g726aal2' also |                         ; to what is recommended in RFC3551. Note, 'g726aal2' also | ||||||
| @@ -752,7 +752,7 @@ | |||||||
| ;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") | ||||||
| ;set_var=       ; Variable set on a channel involving the endpoint. For multiple | ;set_var=       ; Variable set on a channel involving the endpoint. For multiple | ||||||
| 		; channel variables specify multiple 'set_var'(s) |                 ; channel variables specify multiple 'set_var'(s) | ||||||
| ;rtp_keepalive= ; Interval, in seconds, between comfort noise RTP packets if | ;rtp_keepalive= ; Interval, in seconds, between comfort noise RTP packets if | ||||||
|                 ; RTP is not flowing. This setting is useful for ensuring that |                 ; RTP is not flowing. This setting is useful for ensuring that | ||||||
|                 ; holes in NATs and firewalls are kept open throughout a call. |                 ; holes in NATs and firewalls are kept open throughout a call. | ||||||
| @@ -794,7 +794,7 @@ | |||||||
|                 ; (default: "") |                 ; (default: "") | ||||||
| ;ca_list_path=  ; Path to directory containing certificates to read TLS ONLY. | ;ca_list_path=  ; Path to directory containing certificates to read TLS ONLY. | ||||||
|                 ; PJProject version 2.4 or higher is required for this option to |                 ; PJProject version 2.4 or higher is required for this option to | ||||||
| 				; be used. |                 ; be used. | ||||||
|                 ; (default: "") |                 ; (default: "") | ||||||
| ;cert_file=     ; Certificate file for endpoint TLS ONLY | ;cert_file=     ; Certificate file for endpoint TLS ONLY | ||||||
|                 ; Will read .crt or .pem file but only uses cert, |                 ; Will read .crt or .pem file but only uses cert, | ||||||
| @@ -886,8 +886,8 @@ | |||||||
| ;disable_tcp_switch=yes ; Disable automatic switching from UDP to TCP transports | ;disable_tcp_switch=yes ; Disable automatic switching from UDP to TCP transports | ||||||
|                         ; if outgoing request is too large. |                         ; if outgoing request is too large. | ||||||
|                         ; See RFC 3261 section 18.1.1. |                         ; See RFC 3261 section 18.1.1. | ||||||
| 						; Disabling this option has been known to cause interoperability |                         ; Disabling this option has been known to cause interoperability | ||||||
| 						; issues, so disable at your own risk. |                         ; issues, so disable at your own risk. | ||||||
|                         ; (default: "yes") |                         ; (default: "yes") | ||||||
| ;type=  ; Must be of type system (default: "") | ;type=  ; Must be of type system (default: "") | ||||||
|  |  | ||||||
| @@ -917,10 +917,10 @@ | |||||||
| ;contact_expiration_check_interval=30 | ;contact_expiration_check_interval=30 | ||||||
|                         ; The interval (in seconds) to check for expired contacts. |                         ; The interval (in seconds) to check for expired contacts. | ||||||
| ;disable_multi_domain=no | ;disable_multi_domain=no | ||||||
| 			; Disable Multi Domain support. |             ; Disable Multi Domain support. | ||||||
| 			; If disabled it can improve realtime performace by reducing |             ; If disabled it can improve realtime performace by reducing | ||||||
| 			; number of database requsts |             ; number of database requsts | ||||||
| 			; (default: "no") |             ; (default: "no") | ||||||
| ;endpoint_identifier_order=ip,username,anonymous | ;endpoint_identifier_order=ip,username,anonymous | ||||||
|             ; The order by which endpoint identifiers are given priority. |             ; The order by which endpoint identifiers are given priority. | ||||||
|             ; Currently, "ip", "username", "auth_username" and "anonymous" are valid |             ; Currently, "ip", "username", "auth_username" and "anonymous" are valid | ||||||
|   | |||||||
| @@ -749,9 +749,9 @@ struct ast_sip_endpoint { | |||||||
| 	unsigned int usereqphone; | 	unsigned int usereqphone; | ||||||
| 	/*! Whether to pass through hold and unhold using re-invites with recvonly and sendrecv */ | 	/*! Whether to pass through hold and unhold using re-invites with recvonly and sendrecv */ | ||||||
| 	unsigned int moh_passthrough; | 	unsigned int moh_passthrough; | ||||||
| 	/* Access control list */ | 	/*! Access control list */ | ||||||
| 	struct ast_acl_list *acl; | 	struct ast_acl_list *acl; | ||||||
| 	/* Restrict what IPs are allowed in the Contact header (for registration) */ | 	/*! Restrict what IPs are allowed in the Contact header (for registration) */ | ||||||
| 	struct ast_acl_list *contact_acl; | 	struct ast_acl_list *contact_acl; | ||||||
| 	/*! The number of seconds into call to disable fax detection.  (0 = disabled) */ | 	/*! The number of seconds into call to disable fax detection.  (0 = disabled) */ | ||||||
| 	unsigned int faxdetect_timeout; | 	unsigned int faxdetect_timeout; | ||||||
|   | |||||||
| @@ -217,10 +217,9 @@ | |||||||
| 							<enum name="info"> | 							<enum name="info"> | ||||||
| 								<para>DTMF is sent as SIP INFO packets.</para> | 								<para>DTMF is sent as SIP INFO packets.</para> | ||||||
| 							</enum> | 							</enum> | ||||||
|                                                         <enum name="auto"> | 							<enum name="auto"> | ||||||
|                                                                 <para>DTMF is sent as RFC 4733 if the other side supports it or as INBAND if not.</para> | 								<para>DTMF is sent as RFC 4733 if the other side supports it or as INBAND if not.</para> | ||||||
|                                                         </enum> | 							</enum> | ||||||
|  |  | ||||||
| 						</enumlist> | 						</enumlist> | ||||||
| 					</description> | 					</description> | ||||||
| 				</configOption> | 				</configOption> | ||||||
| @@ -510,15 +509,15 @@ | |||||||
| 				<configOption name="g726_non_standard" default="no"> | 				<configOption name="g726_non_standard" default="no"> | ||||||
| 					<synopsis>Force g.726 to use AAL2 packing order when negotiating g.726 audio</synopsis> | 					<synopsis>Force g.726 to use AAL2 packing order when negotiating g.726 audio</synopsis> | ||||||
| 					<description><para> | 					<description><para> | ||||||
|                                                 When set to "yes" and an endpoint negotiates g.726 audio then use g.726 for AAL2 | 						When set to "yes" and an endpoint negotiates g.726 audio then use g.726 for AAL2 | ||||||
|                                                 packing order instead of what is recommended by RFC3551. Since this essentially | 						packing order instead of what is recommended by RFC3551. Since this essentially | ||||||
|                                                 replaces the underlying 'g726' codec with 'g726aal2' then 'g726aal2' needs to be | 						replaces the underlying 'g726' codec with 'g726aal2' then 'g726aal2' needs to be | ||||||
|                                                 specified in the endpoint's allowed codec list. | 						specified in the endpoint's allowed codec list. | ||||||
| 					</para></description> | 					</para></description> | ||||||
| 				</configOption> | 				</configOption> | ||||||
| 				<configOption name="inband_progress" default="no"> | 				<configOption name="inband_progress" default="no"> | ||||||
| 					<synopsis>Determines whether chan_pjsip will indicate ringing using inband | 					<synopsis>Determines whether chan_pjsip will indicate ringing using inband | ||||||
| 					    progress.</synopsis> | 						progress.</synopsis> | ||||||
| 					<description><para> | 					<description><para> | ||||||
| 						If set to <literal>yes</literal>, chan_pjsip will send a 183 Session Progress | 						If set to <literal>yes</literal>, chan_pjsip will send a 183 Session Progress | ||||||
| 						when told to indicate ringing and will immediately start sending ringing | 						when told to indicate ringing and will immediately start sending ringing | ||||||
| @@ -814,7 +813,7 @@ | |||||||
| 				<configOption name="set_var"> | 				<configOption name="set_var"> | ||||||
| 					<synopsis>Variable set on a channel involving the endpoint.</synopsis> | 					<synopsis>Variable set on a channel involving the endpoint.</synopsis> | ||||||
| 					<description><para> | 					<description><para> | ||||||
| 					        When a new channel is created using the endpoint set the specified | 						When a new channel is created using the endpoint set the specified | ||||||
| 						variable(s) on that channel. For multiple channel variables specify | 						variable(s) on that channel. For multiple channel variables specify | ||||||
| 						multiple 'set_var'(s). | 						multiple 'set_var'(s). | ||||||
| 					</para></description> | 					</para></description> | ||||||
| @@ -1455,9 +1454,9 @@ | |||||||
| 					<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> | ||||||
| 				<configOption name="regcontext" default=""> | 				<configOption name="regcontext" default=""> | ||||||
|                                         <synopsis>When set, Asterisk will dynamically create and destroy a NoOp priority 1 extension for a given | 					<synopsis>When set, Asterisk will dynamically create and destroy a NoOp priority 1 extension for a given | ||||||
| 					peer who registers or unregisters with us.</synopsis> | 						peer who registers or unregisters with us.</synopsis> | ||||||
|                                 </configOption> | 				</configOption> | ||||||
| 				<configOption name="default_outbound_endpoint" default="default_outbound_endpoint"> | 				<configOption name="default_outbound_endpoint" default="default_outbound_endpoint"> | ||||||
| 					<synopsis>Endpoint to use when sending an outbound request to a URI without a specified endpoint.</synopsis> | 					<synopsis>Endpoint to use when sending an outbound request to a URI without a specified endpoint.</synopsis> | ||||||
| 				</configOption> | 				</configOption> | ||||||
| @@ -1466,15 +1465,15 @@ | |||||||
| 				</configOption> | 				</configOption> | ||||||
| 				<configOption name="debug" default="no"> | 				<configOption name="debug" default="no"> | ||||||
| 					<synopsis>Enable/Disable SIP debug logging.  Valid options include yes|no or | 					<synopsis>Enable/Disable SIP debug logging.  Valid options include yes|no or | ||||||
|                                         a host address</synopsis> | 						a host address</synopsis> | ||||||
| 				</configOption> | 				</configOption> | ||||||
| 				<configOption name="endpoint_identifier_order" default="ip,username,anonymous"> | 				<configOption name="endpoint_identifier_order" default="ip,username,anonymous"> | ||||||
| 					<synopsis>The order by which endpoint identifiers are processed and checked. | 					<synopsis>The order by which endpoint identifiers are processed and checked. | ||||||
|                                         Identifier names are usually derived from and can be found in the endpoint | 						Identifier names are usually derived from and can be found in the endpoint | ||||||
|                                         identifier module itself (res_pjsip_endpoint_identifier_*). | 						identifier module itself (res_pjsip_endpoint_identifier_*). | ||||||
|                                         You can use the CLI command "pjsip show identifiers" to see the | 						You can use the CLI command "pjsip show identifiers" to see the | ||||||
|                                         identifiers currently available.</synopsis> | 						identifiers currently available.</synopsis> | ||||||
|                     <description> | 					<description> | ||||||
| 						<note><para> | 						<note><para> | ||||||
| 						One of the identifiers is "auth_username" which matches on the username in | 						One of the identifiers is "auth_username" which matches on the username in | ||||||
| 						an Authentication header.  This method has some security considerations because an | 						an Authentication header.  This method has some security considerations because an | ||||||
| @@ -1488,17 +1487,17 @@ | |||||||
| 						how many unmatched requests are received from a single ip address before a security | 						how many unmatched requests are received from a single ip address before a security | ||||||
| 						event is generated using the unidentified_request parameters. | 						event is generated using the unidentified_request parameters. | ||||||
| 						</para></note> | 						</para></note> | ||||||
|                     </description> | 					</description> | ||||||
| 				</configOption> | 				</configOption> | ||||||
| 				<configOption name="default_from_user" default="asterisk"> | 				<configOption name="default_from_user" default="asterisk"> | ||||||
| 					<synopsis>When Asterisk generates an outgoing SIP request, the From header username will be | 					<synopsis>When Asterisk generates an outgoing SIP request, the From header username will be | ||||||
|                                         set to this value if there is no better option (such as CallerID) to be | 						set to this value if there is no better option (such as CallerID) to be | ||||||
|                                         used.</synopsis> | 						used.</synopsis> | ||||||
| 				</configOption> | 				</configOption> | ||||||
| 				<configOption name="default_realm" default="asterisk"> | 				<configOption name="default_realm" default="asterisk"> | ||||||
| 					<synopsis>When Asterisk generates an challenge, the digest will be | 					<synopsis>When Asterisk generates an challenge, the digest will be | ||||||
|                                         set to this value if there is no better option (such as auth/realm) to be | 						set to this value if there is no better option (such as auth/realm) to be | ||||||
|                                         used.</synopsis> | 						used.</synopsis> | ||||||
| 				</configOption> | 				</configOption> | ||||||
| 			</configObject> | 			</configObject> | ||||||
| 		</configFile> | 		</configFile> | ||||||
| @@ -2066,7 +2065,7 @@ | |||||||
| 			Provides a listing of all endpoints.  For each endpoint an <literal>EndpointList</literal> event | 			Provides a listing of all endpoints.  For each endpoint an <literal>EndpointList</literal> event | ||||||
| 			is raised that contains relevant attributes and status information.  Once all | 			is raised that contains relevant attributes and status information.  Once all | ||||||
| 			endpoints have been listed an <literal>EndpointListComplete</literal> event is issued. | 			endpoints have been listed an <literal>EndpointListComplete</literal> event is issued. | ||||||
|                         </para> | 			</para> | ||||||
| 		</description> | 		</description> | ||||||
| 		<responses> | 		<responses> | ||||||
| 			<list-elements> | 			<list-elements> | ||||||
| @@ -2102,7 +2101,7 @@ | |||||||
| 			<literal>IdentifyDetail</literal>.  Some events may be listed multiple times if multiple objects are | 			<literal>IdentifyDetail</literal>.  Some events may be listed multiple times if multiple objects are | ||||||
| 			associated (for instance AoRs).  Once all detail events have been raised a final | 			associated (for instance AoRs).  Once all detail events have been raised a final | ||||||
| 			<literal>EndpointDetailComplete</literal> event is issued. | 			<literal>EndpointDetailComplete</literal> event is issued. | ||||||
|                         </para> | 			</para> | ||||||
| 		</description> | 		</description> | ||||||
| 		<responses> | 		<responses> | ||||||
| 			<list-elements> | 			<list-elements> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user