<p>Alexander Traud has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17473">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: Fix for Doxygen.<br><br>ASTERISK-29747<br><br>Change-Id: Ic7a1e9453f805a6264fe86c96b7d18b87b376084<br>---<br>M include/asterisk/res_pjsip.h<br>M include/asterisk/res_pjsip_cli.h<br>M include/asterisk/res_pjsip_presence_xml.h<br>M include/asterisk/res_pjsip_pubsub.h<br>M include/asterisk/res_pjsip_session.h<br>M include/asterisk/res_pjsip_session_caps.h<br>M res/res_pjsip/config_global.c<br>M res/res_pjsip/config_transport.c<br>M res/res_pjsip/include/res_pjsip_private.h<br>M res/res_pjsip/pjsip_distributor.c<br>M res/res_pjsip/pjsip_transport_events.c<br>M res/res_pjsip_authenticator_digest.c<br>M res/res_pjsip_caller_id.c<br>M res/res_pjsip_history.c<br>M res/res_pjsip_messaging.c<br>M res/res_pjsip_outbound_authenticator_digest.c<br>M res/res_pjsip_outbound_registration.c<br>M res/res_pjsip_path.c<br>M res/res_pjsip_publish_asterisk.c<br>M res/res_pjsip_pubsub.c<br>M res/res_pjsip_registrar.c<br>M res/res_pjsip_sdp_rtp.c<br>M res/res_pjsip_session.c<br>M res/res_pjsip_stir_shaken.c<br>24 files changed, 126 insertions(+), 138 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/73/17473/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h</span><br><span>index 2a20e36..41a7d96 100644</span><br><span>--- a/include/asterisk/res_pjsip.h</span><br><span>+++ b/include/asterisk/res_pjsip.h</span><br><span>@@ -351,8 +351,7 @@</span><br><span> /*!</span><br><span> * \brief A contact's status.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \detail Maintains a contact's current status and round trip time</span><br><span style="color: hsl(0, 100%, 40%);">- * if available.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Maintains a contact's current status and round trip time if available.</span><br><span> */</span><br><span> struct ast_sip_contact_status {</span><br><span> AST_DECLARE_STRING_FIELDS(</span><br><span>@@ -583,8 +582,8 @@</span><br><span> * \brief Returns true if the preference is set in the parameter</span><br><span> * \since 18.0.0</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param param A ast_flags struct with one or more of enum ast_sip_call_codec_pref set</span><br><span style="color: hsl(0, 100%, 40%);">- * \param codec_pref The last component of one of the enum values</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param __param A ast_flags struct with one or more of enum ast_sip_call_codec_pref set</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param __codec_pref The last component of one of the enum values</span><br><span> * \retval 1 if the enum value is set</span><br><span> * \retval 0 if not</span><br><span> */</span><br><span>@@ -967,7 +966,7 @@</span><br><span> /*!</span><br><span> * \brief Free contents of an auth vector.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param array Vector whose contents are to be freed</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param vector Vector whose contents are to be freed</span><br><span> */</span><br><span> void ast_sip_auth_vector_destroy(struct ast_sip_auth_vector *vector);</span><br><span> </span><br><span>@@ -1122,7 +1121,7 @@</span><br><span> * An outbound authenticator is responsible for creating responses to</span><br><span> * authentication challenges by remote endpoints.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param auth The authenticator to register</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param outbound_auth The authenticator to register</span><br><span> * \retval 0 Success</span><br><span> * \retval -1 Failure</span><br><span> */</span><br><span>@@ -1892,7 +1891,7 @@</span><br><span> *</span><br><span> * \returns Pointer to \ref ast_sip_sched_task ao2 object which must be dereferenced when done.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \paragraph Serialization</span><br><span style="color: hsl(120, 100%, 40%);">+ * \par Serialization</span><br><span> *</span><br><span> * Specifying a serializer guarantees serialized execution but NOT specifying a serializer</span><br><span> * may still result in tasks being effectively serialized if the thread pool is busy.</span><br><span>@@ -1900,18 +1899,18 @@</span><br><span> * That happens automatically (see below). It's to prevent the task from running at the same</span><br><span> * time as other work using the same serializer, whether or not it's being run by the scheduler.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \paragraph Interval</span><br><span style="color: hsl(120, 100%, 40%);">+ * \par Interval</span><br><span> *</span><br><span> * The interval is used to calculate the next time the task should run. There are two models.</span><br><span> *</span><br><span> * \ref AST_SIP_SCHED_TASK_PERIODIC specifies that the invocations of the task occur at the</span><br><span style="color: hsl(0, 100%, 40%);">- * specific interval. That is, every \ref "interval" milliseconds, regardless of how long the task</span><br><span style="color: hsl(0, 100%, 40%);">- * takes. If the task takes longer than \ref interval, it will be scheduled at the next available</span><br><span style="color: hsl(0, 100%, 40%);">- * multiple of \ref interval. For exmaple: If the task has an interval of 60 seconds and the task</span><br><span style="color: hsl(120, 100%, 40%);">+ * specific interval. That is, every \p interval milliseconds, regardless of how long the task</span><br><span style="color: hsl(120, 100%, 40%);">+ * takes. If the task takes longer than \p interval, it will be scheduled at the next available</span><br><span style="color: hsl(120, 100%, 40%);">+ * multiple of \p interval. For exmaple: If the task has an interval of 60 seconds and the task</span><br><span> * takes 70 seconds, the next invocation will happen at 120 seconds.</span><br><span> *</span><br><span> * \ref AST_SIP_SCHED_TASK_DELAY specifies that the next invocation of the task should start</span><br><span style="color: hsl(0, 100%, 40%);">- * at \ref interval milliseconds after the current invocation has finished.</span><br><span style="color: hsl(120, 100%, 40%);">+ * at \p interval milliseconds after the current invocation has finished.</span><br><span> *</span><br><span> */</span><br><span> struct ast_sip_sched_task *ast_sip_schedule_task(struct ast_taskprocessor *serializer,</span><br><span>@@ -1966,7 +1965,7 @@</span><br><span> * \param[out] last_end Pointer to a timeval structure to contain the time when last ended</span><br><span> * \param[out] interval Pointer to an int to contain the interval in ms</span><br><span> * \param[out] time_left Pointer to an int to contain the ms left to the next run</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] last_end Pointer to a timeval structure to contain the next run time</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] next_start Pointer to a timeval structure to contain the next run time</span><br><span> * \retval 0 Success</span><br><span> * \retval -1 Failure</span><br><span> * \note Any of the pointers can be NULL if you don't need them.</span><br><span>@@ -2001,7 +2000,7 @@</span><br><span> * \param[out] last_end Pointer to a timeval structure to contain the time when last ended</span><br><span> * \param[out] interval Pointer to an int to contain the interval in ms</span><br><span> * \param[out] time_left Pointer to an int to contain the ms left to the next run</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] last_end Pointer to a timeval structure to contain the next run time</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] next_start Pointer to a timeval structure to contain the next run time</span><br><span> * \retval 0 Success</span><br><span> * \retval -1 Failure</span><br><span> * \note Any of the pointers can be NULL if you don't need them.</span><br><span>@@ -2053,6 +2052,7 @@</span><br><span> * \since 13.9.0</span><br><span> *</span><br><span> * \param schtd The task structure pointer</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param name, maxlen</span><br><span> * \retval 0 success</span><br><span> * \retval 1 failure</span><br><span> */</span><br><span>@@ -2146,7 +2146,7 @@</span><br><span> * \brief General purpose method for creating an rdata structure using specific information</span><br><span> * \since 13.15.0</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param rdata[out] The rdata structure that will be populated</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] rdata The rdata structure that will be populated</span><br><span> * \param packet A SIP message</span><br><span> * \param src_name The source IP address of the message</span><br><span> * \param src_port The source port of the message</span><br><span>@@ -2165,7 +2165,7 @@</span><br><span> /*!</span><br><span> * \brief General purpose method for creating an rdata structure using specific information</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param rdata[out] The rdata structure that will be populated</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] rdata The rdata structure that will be populated</span><br><span> * \param packet A SIP message</span><br><span> * \param src_name The source IP address of the message</span><br><span> * \param src_port The source port of the message</span><br><span>@@ -2247,7 +2247,7 @@</span><br><span> *</span><br><span> * \param tdata The request to send</span><br><span> * \param endpoint Optional. If specified, the out-of-dialog request is sent to the endpoint.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param timeout. If non-zero, after the timeout the transaction will be terminated</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param timeout If non-zero, after the timeout the transaction will be terminated</span><br><span> * and the callback will be called with the PJSIP_EVENT_TIMER type.</span><br><span> * \param token Data to be passed to the callback upon receipt of out-of-dialog response.</span><br><span> * \param callback Callback to be called upon receipt of out-of-dialog response.</span><br><span>@@ -2275,7 +2275,7 @@</span><br><span> * \param rdata The rdata from the incoming request.</span><br><span> * \param st_code The response code to transmit.</span><br><span> * \param contact The contact with which this request is associated.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] tdata The newly-created response</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] p_tdata The newly-created response</span><br><span> *</span><br><span> * The provided contact is attached to tdata with its reference bumped, but will</span><br><span> * not survive for the entire lifetime of tdata since the contact is cleaned up</span><br><span>@@ -2297,7 +2297,7 @@</span><br><span> *</span><br><span> * \param res_addr The response address for this response</span><br><span> * \param tdata The response to send</span><br><span style="color: hsl(0, 100%, 40%);">- * \param endpoint The ast_sip_endpoint associated with this response</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param sip_endpoint The ast_sip_endpoint associated with this response</span><br><span> *</span><br><span> * \retval 0 Success</span><br><span> * \retval -1 Failure</span><br><span>@@ -2313,7 +2313,7 @@</span><br><span> *</span><br><span> * \param rdata The request that is being responded to</span><br><span> * \param tdata The response to send</span><br><span style="color: hsl(0, 100%, 40%);">- * \param endpoint The ast_sip_endpoint associated with this response</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param sip_endpoint The ast_sip_endpoint associated with this response</span><br><span> *</span><br><span> * \since 13.4.0</span><br><span> *</span><br><span>@@ -2433,7 +2433,8 @@</span><br><span> * add each part to the SIP message.</span><br><span> *</span><br><span> * \param tdata The message to add the body to</span><br><span style="color: hsl(0, 100%, 40%);">- * \param bodies The parts of the body to add</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param bodies The message bodies to add</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param num_bodies The parts of the body to add</span><br><span> * \retval 0 Success</span><br><span> * \retval -1 Failure</span><br><span> */</span><br><span>@@ -2446,7 +2447,7 @@</span><br><span> * a body if it currently exists, it appends data to an existing body.</span><br><span> *</span><br><span> * \param tdata The message to append the body to</span><br><span style="color: hsl(0, 100%, 40%);">- * \param body The string to append to the end of the current body</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param body_text The string to append to the end of the current body</span><br><span> * \retval 0 Success</span><br><span> * \retval -1 Failure</span><br><span> */</span><br><span>@@ -2546,6 +2547,7 @@</span><br><span> */</span><br><span> void ast_sip_cleanup_auths(struct ast_sip_auth *auths[], size_t num_auths);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AST_VECTOR(ast_sip_auth_objects_vector, struct ast_sip_auth *);</span><br><span> /*!</span><br><span> * \brief Retrieve relevant SIP auth structures from sorcery as a vector</span><br><span> *</span><br><span>@@ -2555,17 +2557,16 @@</span><br><span> * \retval 0 Success</span><br><span> * \retval -1 Number of auth objects found is less than the number of names supplied.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \WARNING The number of auth objects retrieved may be less than the</span><br><span style="color: hsl(120, 100%, 40%);">+ * \warning The number of auth objects retrieved may be less than the</span><br><span> * number of auth ids supplied if auth objects couldn't be found for</span><br><span> * some of them.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \NOTE Since the ref count on all auith objects returned has been</span><br><span style="color: hsl(120, 100%, 40%);">+ * \note Since the ref count on all auith objects returned has been</span><br><span> * bumped, you must call ast_sip_cleanup_auth_objects_vector() to decrement</span><br><span> * the ref count on all of the auth objects in the vector,</span><br><span> * then call AST_VECTOR_FREE() on the vector itself.</span><br><span> *</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-AST_VECTOR(ast_sip_auth_objects_vector, struct ast_sip_auth *);</span><br><span> int ast_sip_retrieve_auths_vector(const struct ast_sip_auth_vector *auth_ids,</span><br><span> struct ast_sip_auth_objects_vector *auth_objects);</span><br><span> </span><br><span>@@ -2832,7 +2833,7 @@</span><br><span> * \brief Converts a sorcery object to a string of object properties.</span><br><span> *</span><br><span> * \param obj the sorcery object to convert</span><br><span style="color: hsl(0, 100%, 40%);">- * \param str the string buffer to write the object data</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param buf the string buffer to write the object data</span><br><span> * \retval 0 Success, non-zero on failure</span><br><span> */</span><br><span> int ast_sip_sorcery_object_to_ami(const void *obj, struct ast_str **buf);</span><br><span>@@ -2841,7 +2842,7 @@</span><br><span> * \brief Formats the endpoint and sends over AMI.</span><br><span> *</span><br><span> * \param endpoint the endpoint to format and send</span><br><span style="color: hsl(0, 100%, 40%);">- * \param endpoint ami AMI variable container</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param ami AMI variable container</span><br><span> * \param count the number of formatters operated on</span><br><span> * \retval 0 Success, otherwise non-zero on error</span><br><span> */</span><br><span>@@ -2992,8 +2993,6 @@</span><br><span> * Similarly, a module could reject an incoming request if desired.</span><br><span> *</span><br><span> * \param supplement The supplement to register</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval 0 Success</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval -1 Failure</span><br><span> */</span><br><span> void ast_sip_register_supplement(struct ast_sip_supplement *supplement);</span><br><span> </span><br><span>@@ -3133,7 +3132,6 @@</span><br><span> *</span><br><span> * \param[out] realm The default realm</span><br><span> * \param size The buffer size of realm</span><br><span style="color: hsl(0, 100%, 40%);">- * \return nothing</span><br><span> */</span><br><span> void ast_sip_get_default_realm(char *realm, size_t size);</span><br><span> </span><br><span>@@ -3146,7 +3144,6 @@</span><br><span> *</span><br><span> * \param[out] from_user The default from user</span><br><span> * \param size The buffer size of from_user</span><br><span style="color: hsl(0, 100%, 40%);">- * \return nothing</span><br><span> */</span><br><span> void ast_sip_get_default_from_user(char *from_user, size_t size);</span><br><span> </span><br><span>@@ -3570,8 +3567,6 @@</span><br><span> *</span><br><span> * \note The data object passed into the original register will have its reference count</span><br><span> * automatically decremeneted.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_transport_monitor_unregister(pjsip_transport *transport,</span><br><span> ast_transport_monitor_shutdown_cb cb, void *data, ast_transport_monitor_data_matcher matches);</span><br><span>@@ -3588,8 +3583,6 @@</span><br><span> *</span><br><span> * \note The data object passed into the original register will have its reference count</span><br><span> * automatically decremeneted.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_transport_monitor_unregister_all(ast_transport_monitor_shutdown_cb cb,</span><br><span> void *data, ast_transport_monitor_data_matcher matches);</span><br><span>@@ -3606,8 +3599,6 @@</span><br><span> * \since 13.18.0</span><br><span> *</span><br><span> * \param element What we are registering.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_transport_state_register(struct ast_sip_tpmgr_state_callback *element);</span><br><span> </span><br><span>@@ -3616,8 +3607,6 @@</span><br><span> * \since 13.18.0</span><br><span> *</span><br><span> * \param element What we are unregistering.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_transport_state_unregister(struct ast_sip_tpmgr_state_callback *element);</span><br><span> </span><br><span>diff --git a/include/asterisk/res_pjsip_cli.h b/include/asterisk/res_pjsip_cli.h</span><br><span>index c253521..36b59b2 100644</span><br><span>--- a/include/asterisk/res_pjsip_cli.h</span><br><span>+++ b/include/asterisk/res_pjsip_cli.h</span><br><span>@@ -73,7 +73,6 @@</span><br><span> /*!</span><br><span> * \brief Registers a CLI formatter.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param name The name of the formatter, usually the sorcery object type.</span><br><span> * \param formatter An ao2_callback_fn that outputs the formatted data.</span><br><span> * \retval 0 Success, non-zero on failure</span><br><span> */</span><br><span>@@ -82,7 +81,7 @@</span><br><span> /*!</span><br><span> * \brief Unregisters a CLI formatter.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param name The name of the formatter, usually the sorcery object type.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param formatter The name of the formatter, usually the sorcery object type.</span><br><span> * \retval 0 Success, non-zero on failure</span><br><span> */</span><br><span> int ast_sip_unregister_cli_formatter(struct ast_sip_cli_formatter_entry *formatter);</span><br><span>@@ -99,7 +98,8 @@</span><br><span> * \brief Prints a sorcery object's ast_variable list</span><br><span> *</span><br><span> * \param obj The sorcery object</span><br><span style="color: hsl(0, 100%, 40%);">- * \param arg The ast_sip_cli_context.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param arg The ast_sip_cli_context</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param flags</span><br><span> * \retval 0 Success, non-zero on failure</span><br><span> */</span><br><span> int ast_sip_cli_print_sorcery_objectset(void *obj, void *arg, int flags);</span><br><span>diff --git a/include/asterisk/res_pjsip_presence_xml.h b/include/asterisk/res_pjsip_presence_xml.h</span><br><span>index 60235ca..7d3d9b7 100644</span><br><span>--- a/include/asterisk/res_pjsip_presence_xml.h</span><br><span>+++ b/include/asterisk/res_pjsip_presence_xml.h</span><br><span>@@ -70,6 +70,7 @@</span><br><span> * \param[out] pidfstate</span><br><span> * \param[out] pidfnote</span><br><span> * \param[out] local_state</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param notify_early_inuse_ringing</span><br><span> */</span><br><span> void ast_sip_presence_exten_state_to_str(int state, char **statestring,</span><br><span> char **pidfstate, char **pidfnote, enum ast_sip_pidf_state *local_state,</span><br><span>@@ -113,7 +114,6 @@</span><br><span> * \param attr_name Name of attribute to find</span><br><span> * \param[out] node Node that was found or created</span><br><span> * \param[out] attr Attribute that was found or created</span><br><span style="color: hsl(0, 100%, 40%);">- * \return The found attribute</span><br><span> */</span><br><span> void ast_sip_presence_xml_find_node_attr(pj_pool_t* pool,</span><br><span> pj_xml_node *parent, const char *node_name, const char *attr_name,</span><br><span>diff --git a/include/asterisk/res_pjsip_pubsub.h b/include/asterisk/res_pjsip_pubsub.h</span><br><span>index 4309a09..354b0b2 100644</span><br><span>--- a/include/asterisk/res_pjsip_pubsub.h</span><br><span>+++ b/include/asterisk/res_pjsip_pubsub.h</span><br><span>@@ -346,7 +346,7 @@</span><br><span> * When a subscriber wishes to create a subscription, it may call this function</span><br><span> * to allocate resources and to send the initial SUBSCRIBE out.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param subscriber The subscriber that is making the request.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param handler The subscriber that is making the request.</span><br><span> * \param endpoint The endpoint to whome the SUBSCRIBE will be sent.</span><br><span> * \param resource The resource to place in the SUBSCRIBE's Request-URI.</span><br><span> */</span><br><span>@@ -742,7 +742,7 @@</span><br><span> * for a given content type if a primary body supplement for that content type</span><br><span> * has already been registered.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param generator Body generator to register</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param supplement Body generator to register</span><br><span> * \retval 0 Success</span><br><span> * \retval -1 Failure</span><br><span> */</span><br><span>@@ -752,7 +752,7 @@</span><br><span> * \since 13.0.0</span><br><span> * \brief Unregister a body generator with the pubsub core.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param generator Body generator to unregister</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param supplement Body generator to unregister</span><br><span> */</span><br><span> void ast_sip_pubsub_unregister_body_supplement(struct ast_sip_pubsub_body_supplement *supplement);</span><br><span> </span><br><span>@@ -773,7 +773,6 @@</span><br><span> * \brief Alert the pubsub core that the subscription is ready for destruction</span><br><span> *</span><br><span> * \param sub The subscription that is complete</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_subscription_destroy(struct ast_sip_subscription *sub);</span><br><span> </span><br><span>diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h</span><br><span>index e2ea64e..49e6007 100644</span><br><span>--- a/include/asterisk/res_pjsip_session.h</span><br><span>+++ b/include/asterisk/res_pjsip_session.h</span><br><span>@@ -493,7 +493,7 @@</span><br><span> *</span><br><span> * \param endpoint The endpoint that this session communicates with</span><br><span> * \param contact The contact associated with this session</span><br><span style="color: hsl(0, 100%, 40%);">- * \param inv_session The PJSIP INVITE session data</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param inv The PJSIP INVITE session data</span><br><span> * \param rdata INVITE request received (NULL if for outgoing allocation)</span><br><span> */</span><br><span> struct ast_sip_session *ast_sip_session_alloc(struct ast_sip_endpoint *endpoint,</span><br><span>@@ -506,8 +506,6 @@</span><br><span> * \param session Which session to suspend the serializer.</span><br><span> *</span><br><span> * \note No channel locks can be held while calling without risk of deadlock.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_session_suspend(struct ast_sip_session *session);</span><br><span> </span><br><span>@@ -516,8 +514,6 @@</span><br><span> * \since 12.7.0</span><br><span> *</span><br><span> * \param session Which session to unsuspend the serializer.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_session_unsuspend(struct ast_sip_session *session);</span><br><span> </span><br><span>@@ -734,7 +730,6 @@</span><br><span> *</span><br><span> * \param session The session on which the answer will be updated</span><br><span> * \param on_sdp_creation Callback called when SDP is created</span><br><span style="color: hsl(0, 100%, 40%);">- * \param generate_new_sdp Boolean to indicate if a new SDP should be created</span><br><span> * \retval 0 Successfully updated the SDP answer</span><br><span> * \retval -1 Failure to updated the SDP answer</span><br><span> */</span><br><span>@@ -859,6 +854,7 @@</span><br><span> /*!</span><br><span> * \brief Save a media stats.</span><br><span> *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param sip_session Session on which to save active media state for</span><br><span> * \param media_state The media state to save</span><br><span> */</span><br><span> void ast_sip_session_media_stats_save(struct ast_sip_session *sip_session, struct ast_sip_session_media_state *media_state);</span><br><span>diff --git a/include/asterisk/res_pjsip_session_caps.h b/include/asterisk/res_pjsip_session_caps.h</span><br><span>index 0d7020f..5c8b746 100644</span><br><span>--- a/include/asterisk/res_pjsip_session_caps.h</span><br><span>+++ b/include/asterisk/res_pjsip_session_caps.h</span><br><span>@@ -31,7 +31,7 @@</span><br><span> * \param remote The "remote" capabilities</span><br><span> * \param local The "local" capabilities</span><br><span> * \param media_type The media type</span><br><span style="color: hsl(0, 100%, 40%);">- * \param codec_prefs One or more of enum ast_sip_call_codec_pref</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param codec_pref One or more of enum ast_sip_call_codec_pref</span><br><span> *</span><br><span> * \retval A pointer to the joint capabilities (which may be empty).</span><br><span> * NULL will be returned only if no memory was available to allocate the structure.</span><br><span>diff --git a/res/res_pjsip/config_global.c b/res/res_pjsip/config_global.c</span><br><span>index aa506ce..700c7a6 100644</span><br><span>--- a/res/res_pjsip/config_global.c</span><br><span>+++ b/res/res_pjsip/config_global.c</span><br><span>@@ -564,8 +564,6 @@</span><br><span> * \param sorcery Instance being observed.</span><br><span> * \param object_type Name of object being observed.</span><br><span> * \param reloaded Non-zero if the object is being reloaded.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void global_loaded_observer(const char *name, const struct ast_sorcery *sorcery, const char *object_type, int reloaded)</span><br><span> {</span><br><span>diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c</span><br><span>index 502ad5b..db62076 100644</span><br><span>--- a/res/res_pjsip/config_transport.c</span><br><span>+++ b/res/res_pjsip/config_transport.c</span><br><span>@@ -1197,6 +1197,7 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0</span><br><span> /*!</span><br><span> * \internal</span><br><span> * \brief Add a new cipher to the transport's cipher list array.</span><br><span>@@ -1207,7 +1208,6 @@</span><br><span> * \retval 0 on success.</span><br><span> * \retval -1 on error.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0</span><br><span> static int transport_cipher_add(struct ast_sip_transport_state *state, const char *name)</span><br><span> {</span><br><span> pj_ssl_cipher cipher;</span><br><span>diff --git a/res/res_pjsip/include/res_pjsip_private.h b/res/res_pjsip/include/res_pjsip_private.h</span><br><span>index f6333bf..dcb821c 100644</span><br><span>--- a/res/res_pjsip/include/res_pjsip_private.h</span><br><span>+++ b/res/res_pjsip/include/res_pjsip_private.h</span><br><span>@@ -178,16 +178,12 @@</span><br><span> /*!</span><br><span> * \internal</span><br><span> * \brief Initialize global headers support</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_initialize_global_headers(void);</span><br><span> </span><br><span> /*!</span><br><span> * \internal</span><br><span> * \brief Destroy global headers support</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void ast_sip_destroy_global_headers(void);</span><br><span> </span><br><span>@@ -383,7 +379,7 @@</span><br><span> * for that period of time, it also prevents issues if the transport</span><br><span> * disconnects while we're still trying to process a response.</span><br><span> * (Attack mitigation)</span><br><span style="color: hsl(0, 100%, 40%);">- * 3. If enabled by global/keep_alive_interval, it sends '\r\n'</span><br><span style="color: hsl(120, 100%, 40%);">+ * 3. If enabled by global/keep_alive_interval, it sends '\\r\\n'</span><br><span> * keepalives on reliable transports at the interval specified.</span><br><span> *</span><br><span> * \retval -1 Failure</span><br><span>diff --git a/res/res_pjsip/pjsip_distributor.c b/res/res_pjsip/pjsip_distributor.c</span><br><span>index 72ed35b..ea8fb02 100644</span><br><span>--- a/res/res_pjsip/pjsip_distributor.c</span><br><span>+++ b/res/res_pjsip/pjsip_distributor.c</span><br><span>@@ -1219,8 +1219,6 @@</span><br><span> * \internal</span><br><span> * \brief Shutdown the serializers in the distributor pool.</span><br><span> * \since 13.10.0</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void distributor_pool_shutdown(void)</span><br><span> {</span><br><span>diff --git a/res/res_pjsip/pjsip_transport_events.c b/res/res_pjsip/pjsip_transport_events.c</span><br><span>index 5eb9868..4df1d5e 100644</span><br><span>--- a/res/res_pjsip/pjsip_transport_events.c</span><br><span>+++ b/res/res_pjsip/pjsip_transport_events.c</span><br><span>@@ -121,8 +121,6 @@</span><br><span> *</span><br><span> * \param transports Active transports container</span><br><span> * \param transport Which transport to do callbacks for.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void transport_state_do_reg_callbacks(struct ao2_container *transports, pjsip_transport *transport)</span><br><span> {</span><br><span>diff --git a/res/res_pjsip_authenticator_digest.c b/res/res_pjsip_authenticator_digest.c</span><br><span>index 231a7e5..2cdbe6e 100644</span><br><span>--- a/res/res_pjsip_authenticator_digest.c</span><br><span>+++ b/res/res_pjsip_authenticator_digest.c</span><br><span>@@ -199,7 +199,8 @@</span><br><span> * is from the same source that the nonce was calculated for. Including the realm</span><br><span> * ensures that multiple challenges to the same request have different nonces.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param A UNIX timestamp expressed as a string</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param nonce</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param timestamp A UNIX timestamp expressed as a string</span><br><span> * \param rdata The incoming request</span><br><span> * \param realm The realm for which authentication should occur</span><br><span> */</span><br><span>diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c</span><br><span>index 3b871cd..287346b 100644</span><br><span>--- a/res/res_pjsip_caller_id.c</span><br><span>+++ b/res/res_pjsip_caller_id.c</span><br><span>@@ -478,6 +478,7 @@</span><br><span> * \internal</span><br><span> * \brief Create an identity header for an outgoing message</span><br><span> * \param hdr_name The name of the header to create</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param base</span><br><span> * \param tdata The message to place the header on</span><br><span> * \param id The identification information for the new header</span><br><span> * \return newly-created header</span><br><span>@@ -554,6 +555,7 @@</span><br><span> /*!</span><br><span> * \internal</span><br><span> * \brief Add a P-Asserted-Identity header to an outbound message</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param session The session on which communication is happening</span><br><span> * \param tdata The message to add the header to</span><br><span> * \param id The identification information used to populate the header</span><br><span> */</span><br><span>@@ -690,6 +692,7 @@</span><br><span> /*!</span><br><span> * \internal</span><br><span> * \brief Add a Remote-Party-ID header to an outbound message</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param session The session on which communication is happening</span><br><span> * \param tdata The message to add the header to</span><br><span> * \param id The identification information used to populate the header</span><br><span> */</span><br><span>@@ -748,7 +751,7 @@</span><br><span> *</span><br><span> * \param session The session on which we will be sending the message</span><br><span> * \param tdata The outbound message</span><br><span style="color: hsl(0, 100%, 40%);">- * \param The identity information to place on the message</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param id The identity information to place on the message</span><br><span> */</span><br><span> static void add_id_headers(const struct ast_sip_session *session, pjsip_tx_data *tdata, const struct ast_party_id *id)</span><br><span> {</span><br><span>diff --git a/res/res_pjsip_history.c b/res/res_pjsip_history.c</span><br><span>index e4b784d..ca86f24 100644</span><br><span>--- a/res/res_pjsip_history.c</span><br><span>+++ b/res/res_pjsip_history.c</span><br><span>@@ -73,12 +73,9 @@</span><br><span> pjsip_msg *msg;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief Mutex that protects \ref vector_history */</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Mutex that protects \c vector_history */</span><br><span> AST_MUTEX_DEFINE_STATIC(history_lock);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief The one and only history that we've captured */</span><br><span style="color: hsl(0, 100%, 40%);">-static AST_VECTOR(vector_history_t, struct pjsip_history_entry *) vector_history;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct expression_token;</span><br><span> </span><br><span> /*! \brief An operator that we understand in an expression */</span><br><span>@@ -161,6 +158,9 @@</span><br><span> /*! \brief Log level for history output */</span><br><span> static int log_level = -1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief The one and only history that we've captured */</span><br><span style="color: hsl(120, 100%, 40%);">+static AST_VECTOR(vector_history_t, struct pjsip_history_entry *) vector_history;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*!</span><br><span> * \brief Operator callback for determining equality</span><br><span> */</span><br><span>@@ -542,7 +542,7 @@</span><br><span> * \param value The value/operator/result to pack into the token</span><br><span> *</span><br><span> * \retval NULL on failure</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval \c expression_token on success</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval expression_token on success</span><br><span> */</span><br><span> static struct expression_token *expression_token_alloc(enum expression_token_type token_type, void *value)</span><br><span> {</span><br><span>@@ -772,7 +772,7 @@</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Remove all entries from \ref vector_history</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Remove all entries from \c vector_history</span><br><span> *</span><br><span> * This must be called from a registered PJSIP thread</span><br><span> */</span><br><span>@@ -794,7 +794,7 @@</span><br><span> * polish notation expression, which is a queue of tokens that can be easily</span><br><span> * parsed.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \params a The CLI arguments provided by the User, containing the infix expression</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param a The CLI arguments provided by the User, containing the infix expression</span><br><span> *</span><br><span> * \retval NULL error</span><br><span> * \retval expression_token A 'queue' of expression tokens in RPN</span><br><span>diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c</span><br><span>index c69601c..1a58b9d 100644</span><br><span>--- a/res/res_pjsip_messaging.c</span><br><span>+++ b/res/res_pjsip_messaging.c</span><br><span>@@ -278,10 +278,13 @@</span><br><span> * \brief Get endpoint and URI when the destination is only a single token</span><br><span> *</span><br><span> * "to" could be one of the following:</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint_name</span><br><span style="color: hsl(0, 100%, 40%);">- * hostname</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbatim</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint_name</span><br><span style="color: hsl(120, 100%, 40%);">+ hostname</span><br><span style="color: hsl(120, 100%, 40%);">+ * \endverbatim</span><br><span> *</span><br><span> * \param to Destination specified in MessageSend</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param destination</span><br><span> * \param uri Pointer to URI variable. Must be freed by caller</span><br><span> * \return endpoint</span><br><span> */</span><br><span>@@ -341,18 +344,21 @@</span><br><span> * \brief Get endpoint and URI when the destination contained a '/'</span><br><span> *</span><br><span> * "to" could be one of the following:</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/aor</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/<sip[s]:host></span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/<sip[s]:user@host></span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/"Bob" <sip[s]:host></span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/"Bob" <sip[s]:user@host></span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/sip[s]:host</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/sip[s]:user@host</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/host</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbatim</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/aor</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/<sip[s]:host></span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/<sip[s]:user@host></span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/"Bob" <sip[s]:host></span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/"Bob" <sip[s]:user@host></span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/sip[s]:host</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/sip[s]:user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/host</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ * \endverbatim</span><br><span> *</span><br><span> * \param to Destination specified in MessageSend</span><br><span> * \param uri Pointer to URI variable. Must be freed by caller</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param destination, slash, atsign, scheme</span><br><span> * \return endpoint</span><br><span> */</span><br><span> static struct ast_sip_endpoint *handle_slash(const char *to, char *destination, char **uri,</span><br><span>@@ -490,16 +496,19 @@</span><br><span> </span><br><span> /*!</span><br><span> * \internal</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Get endpoint and URI when the destination contained a '@' but no '/' or scheme</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Get endpoint and URI when the destination contained a '\@' but no '/' or scheme</span><br><span> *</span><br><span> * "to" could be one of the following:</span><br><span style="color: hsl(0, 100%, 40%);">- * <sip[s]:user@host></span><br><span style="color: hsl(0, 100%, 40%);">- * "Bob" <sip[s]:user@host></span><br><span style="color: hsl(0, 100%, 40%);">- * sip[s]:user@host</span><br><span style="color: hsl(0, 100%, 40%);">- * user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbatim</span><br><span style="color: hsl(120, 100%, 40%);">+ <sip[s]:user@host></span><br><span style="color: hsl(120, 100%, 40%);">+ "Bob" <sip[s]:user@host></span><br><span style="color: hsl(120, 100%, 40%);">+ sip[s]:user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ * \endverbatim</span><br><span> *</span><br><span> * \param to Destination specified in MessageSend</span><br><span> * \param uri Pointer to URI variable. Must be freed by caller</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param destination, slash, atsign, scheme</span><br><span> * \return endpoint</span><br><span> */</span><br><span> static struct ast_sip_endpoint *handle_atsign(const char *to, char *destination, char **uri,</span><br><span>@@ -564,35 +573,45 @@</span><br><span> * Expects the given 'to' to be in one of the following formats:</span><br><span> * Why we allow so many is a mystery.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * Basic:</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint - We'll get URI from the default aor/contact</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/aor - We'll get the URI from the specific aor/contact</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint@domain - We toss the domain part and just use the endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+ * Basic:</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * endpoint : We'll get URI from the default aor/contact</span><br><span style="color: hsl(120, 100%, 40%);">+ * endpoint/aor : We'll get the URI from the specific aor/contact</span><br><span style="color: hsl(120, 100%, 40%);">+ * endpoint@domain : We toss the domain part and just use the endpoint</span><br><span> *</span><br><span> * These all use the endpoint and specified URI:</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/<sip[s]:host></span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/<sip[s]:user@host></span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/"Bob" <sip[s]:host></span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/"Bob" <sip[s]:user@host></span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/sip[s]:host</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/sip[s]:user@host</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/host</span><br><span style="color: hsl(0, 100%, 40%);">- * endpoint/user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbatim</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/<sip[s]:host></span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/<sip[s]:user@host></span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/"Bob" <sip[s]:host></span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/"Bob" <sip[s]:user@host></span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/sip[s]:host</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/sip[s]:user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/host</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint/user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ \endverbatim</span><br><span> *</span><br><span> * These all use the default endpoint and specified URI:</span><br><span style="color: hsl(0, 100%, 40%);">- * <sip[s]:host></span><br><span style="color: hsl(0, 100%, 40%);">- * <sip[s]:user@host></span><br><span style="color: hsl(0, 100%, 40%);">- * "Bob" <sip[s]:host></span><br><span style="color: hsl(0, 100%, 40%);">- * "Bob" <sip[s]:user@host></span><br><span style="color: hsl(0, 100%, 40%);">- * sip[s]:host</span><br><span style="color: hsl(0, 100%, 40%);">- * sip[s]:user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbatim</span><br><span style="color: hsl(120, 100%, 40%);">+ <sip[s]:host></span><br><span style="color: hsl(120, 100%, 40%);">+ <sip[s]:user@host></span><br><span style="color: hsl(120, 100%, 40%);">+ "Bob" <sip[s]:host></span><br><span style="color: hsl(120, 100%, 40%);">+ "Bob" <sip[s]:user@host></span><br><span style="color: hsl(120, 100%, 40%);">+ sip[s]:host</span><br><span style="color: hsl(120, 100%, 40%);">+ sip[s]:user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ \endverbatim</span><br><span> *</span><br><span> * These use the default endpoint and specified host:</span><br><span style="color: hsl(0, 100%, 40%);">- * host</span><br><span style="color: hsl(0, 100%, 40%);">- * user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbatim</span><br><span style="color: hsl(120, 100%, 40%);">+ host</span><br><span style="color: hsl(120, 100%, 40%);">+ user@host</span><br><span style="color: hsl(120, 100%, 40%);">+ \endverbatim</span><br><span> *</span><br><span> * This form is similar to a dialstring:</span><br><span style="color: hsl(0, 100%, 40%);">- * PJSIP/user@endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbatim</span><br><span style="color: hsl(120, 100%, 40%);">+ PJSIP/user@endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+ \endverbatim</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * In this case, the user will be added to the endpoint contact's URI.</span><br><span> * If the contact URI already has a user, it will be replaced.</span><br><span> *</span><br><span>@@ -1203,7 +1222,7 @@</span><br><span> * \internal</span><br><span> * \brief Send a MESSAGE</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param mdata The outbound message data structure</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param data The outbound message data structure</span><br><span> *</span><br><span> * \return 0: success, -1: failure</span><br><span> *</span><br><span>diff --git a/res/res_pjsip_outbound_authenticator_digest.c b/res/res_pjsip_outbound_authenticator_digest.c</span><br><span>index 3f8732c..e0e6d8f 100644</span><br><span>--- a/res/res_pjsip_outbound_authenticator_digest.c</span><br><span>+++ b/res/res_pjsip_outbound_authenticator_digest.c</span><br><span>@@ -118,7 +118,7 @@</span><br><span> * In the end, we'll have accumulated a list of credentials we can pass to</span><br><span> * pjproject that it can use to add Authentication headers to a request.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \NOTE: Neither we nor pjproject can currently handle digest algorithms</span><br><span style="color: hsl(120, 100%, 40%);">+ * \note: Neither we nor pjproject can currently handle digest algorithms</span><br><span> * other than MD5. We don't even have a place for it in the ast_sip_auth</span><br><span> * object. For this reason, we just skip processing any Authenticate</span><br><span> * header that's not MD5. When we support the others, we'll move the</span><br><span>diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c</span><br><span>index ad60318..1422d47 100644</span><br><span>--- a/res/res_pjsip_outbound_registration.c</span><br><span>+++ b/res/res_pjsip_outbound_registration.c</span><br><span>@@ -308,7 +308,7 @@</span><br><span> AST_STRING_FIELD(client_uri);</span><br><span> /*! \brief Optional user for contact header */</span><br><span> AST_STRING_FIELD(contact_user);</span><br><span style="color: hsl(0, 100%, 40%);">- /*! \bried Optional header parameters for contact */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! \brief Optional header parameters for contact */</span><br><span> AST_STRING_FIELD(contact_header_params);</span><br><span> /*! \brief Explicit transport to use for registration */</span><br><span> AST_STRING_FIELD(transport);</span><br><span>@@ -933,8 +933,6 @@</span><br><span> * \param obj What is needed to initiate a reregister attempt.</span><br><span> *</span><br><span> * \note Normally executed by the pjsip monitor thread.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void registration_transport_shutdown_cb(void *obj)</span><br><span> {</span><br><span>@@ -2393,8 +2391,6 @@</span><br><span> * \param sorcery Instance being observed.</span><br><span> * \param object_type Name of object being observed.</span><br><span> * \param reloaded Non-zero if the object is being reloaded.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void registration_loaded_observer(const char *name, const struct ast_sorcery *sorcery, const char *object_type, int reloaded)</span><br><span> {</span><br><span>diff --git a/res/res_pjsip_path.c b/res/res_pjsip_path.c</span><br><span>index 9f48009..5eb3d49 100644</span><br><span>--- a/res/res_pjsip_path.c</span><br><span>+++ b/res/res_pjsip_path.c</span><br><span>@@ -103,8 +103,8 @@</span><br><span> /*!</span><br><span> * \brief Get the path string associated with this contact and tdata</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param endpoint The endpoint from which to pull associated path data</span><br><span style="color: hsl(0, 100%, 40%);">- * \param contact_uri The URI identifying the associated contact</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param pool</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param contact The URI identifying the associated contact</span><br><span> * \param path_str The place to store the retrieved path information</span><br><span> *</span><br><span> * \retval zero on success</span><br><span>diff --git a/res/res_pjsip_publish_asterisk.c b/res/res_pjsip_publish_asterisk.c</span><br><span>index 5fea3bf..a88f9ca 100644</span><br><span>--- a/res/res_pjsip_publish_asterisk.c</span><br><span>+++ b/res/res_pjsip_publish_asterisk.c</span><br><span>@@ -166,9 +166,8 @@</span><br><span> </span><br><span> /*!</span><br><span> * \brief Callback function for device state events</span><br><span style="color: hsl(0, 100%, 40%);">- * \param ast_event</span><br><span> * \param data void pointer to ast_client structure</span><br><span style="color: hsl(0, 100%, 40%);">- * \return void</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param sub, msg</span><br><span> */</span><br><span> static void asterisk_publisher_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg)</span><br><span> {</span><br><span>@@ -225,9 +224,8 @@</span><br><span> </span><br><span> /*!</span><br><span> * \brief Callback function for mailbox state events</span><br><span style="color: hsl(0, 100%, 40%);">- * \param ast_event</span><br><span> * \param data void pointer to ast_client structure</span><br><span style="color: hsl(0, 100%, 40%);">- * \return void</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param sub, msg</span><br><span> */</span><br><span> static void asterisk_publisher_mwistate_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg)</span><br><span> {</span><br><span>diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c</span><br><span>index dd08871..c1cbec1 100644</span><br><span>--- a/res/res_pjsip_pubsub.c</span><br><span>+++ b/res/res_pjsip_pubsub.c</span><br><span>@@ -597,8 +597,6 @@</span><br><span> * \param data What subscription needs to be terminated.</span><br><span> *</span><br><span> * \note Normally executed by the pjsip monitor thread.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void sub_tree_transport_cb(void *data)</span><br><span> {</span><br><span>@@ -927,7 +925,7 @@</span><br><span> *</span><br><span> * \param resource The name of the resource for this tree node.</span><br><span> * \param visited The vector of resources that have been visited.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param if allocating a list, indicate whether full state is requested in notifications.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param full_state if allocating a list, indicate whether full state is requested in notifications.</span><br><span> * \retval NULL Allocation failure.</span><br><span> * \retval non-NULL The newly-allocated tree_node</span><br><span> */</span><br><span>@@ -1456,7 +1454,8 @@</span><br><span> * \param resource The requested resource in the SUBSCRIBE request</span><br><span> * \param generator The body generator to use in leaf subscriptions</span><br><span> * \param tree The resource tree on which the subscription tree is based</span><br><span style="color: hsl(0, 100%, 40%);">- * \param dlg_status[out] The result of attempting to create a dialog.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] dlg_status The result of attempting to create a dialog</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param persistence</span><br><span> *</span><br><span> * \retval NULL Could not create the subscription tree</span><br><span> * \retval non-NULL The root of the created subscription tree</span><br><span>@@ -2021,6 +2020,7 @@</span><br><span> * elements refer to later parts in the multipart body.</span><br><span> *</span><br><span> * \param pool PJLIB allocation pool</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param rlmi</span><br><span> * \param cid Content-ID header of the resource</span><br><span> * \param resource_name Name of the resource</span><br><span> * \param resource_uri URI of the resource</span><br><span>diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c</span><br><span>index 605c0fa..9c999c1 100644</span><br><span>--- a/res/res_pjsip_registrar.c</span><br><span>+++ b/res/res_pjsip_registrar.c</span><br><span>@@ -364,8 +364,6 @@</span><br><span> * \param data What contact needs to be removed.</span><br><span> *</span><br><span> * \note Normally executed by the pjsip monitor thread.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void register_contact_transport_shutdown_cb(void *data)</span><br><span> {</span><br><span>@@ -562,8 +560,7 @@</span><br><span> *</span><br><span> * \param contacts Container of unmodified contacts that could remove.</span><br><span> * \param to_remove Maximum number of contacts to remove.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param response_contacts, remove_existing</span><br><span> */</span><br><span> static void remove_excess_contacts(struct ao2_container *contacts, struct ao2_container *response_contacts,</span><br><span> unsigned int to_remove, unsigned int remove_existing)</span><br><span>diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c</span><br><span>index d422f01..a3bc462 100644</span><br><span>--- a/res/res_pjsip_sdp_rtp.c</span><br><span>+++ b/res/res_pjsip_sdp_rtp.c</span><br><span>@@ -961,7 +961,7 @@</span><br><span> * \brief Checks whether the encryption offered in SDP is compatible with the endpoint's configuration</span><br><span> * \internal</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param endpoint_encryption Media encryption configured for the endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param endpoint Media encryption configured for the endpoint</span><br><span> * \param stream pjmedia_sdp_media stream description</span><br><span> *</span><br><span> * \retval AST_SIP_MEDIA_TRANSPORT_INVALID on encryption mismatch</span><br><span>diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c</span><br><span>index 4eb855a..6724262 100644</span><br><span>--- a/res/res_pjsip_session.c</span><br><span>+++ b/res/res_pjsip_session.c</span><br><span>@@ -1742,6 +1742,7 @@</span><br><span> * \internal</span><br><span> * \brief Validate a media state</span><br><span> *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param session_name For log messages</span><br><span> * \param state Media state</span><br><span> *</span><br><span> * \retval 1 The media state is valid</span><br><span>@@ -1827,7 +1828,7 @@</span><br><span> * \param delayed_pending_state The pending media state at the time the resuest was queued</span><br><span> * \param delayed_active_state The active media state at the time the resuest was queued</span><br><span> * \param current_active_state The current active media state</span><br><span style="color: hsl(0, 100%, 40%);">- * \param run_validation Whether to run validation on the resulting media state or not</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param run_post_validation Whether to run validation on the resulting media state or not</span><br><span> *</span><br><span> * \returns New merged topology or NULL if there's an error</span><br><span> *</span><br><span>@@ -3582,8 +3583,6 @@</span><br><span> * \since 13.5.0</span><br><span> *</span><br><span> * \param session Which session to stop the timer.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void sip_session_defer_termination_stop_timer(struct ast_sip_session *session)</span><br><span> {</span><br><span>diff --git a/res/res_pjsip_stir_shaken.c b/res/res_pjsip_stir_shaken.c</span><br><span>index 1bf2528..27aa4d8 100644</span><br><span>--- a/res/res_pjsip_stir_shaken.c</span><br><span>+++ b/res/res_pjsip_stir_shaken.c</span><br><span>@@ -61,7 +61,8 @@</span><br><span> /*!</span><br><span> * \brief Compare the caller ID from the INVITE with the one in the payload</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param json_str The JSON string represntation of the payload</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param caller_id</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param json_str The JSON string representation of the payload</span><br><span> *</span><br><span> * \retval -1 on failure</span><br><span> * \retval 0 on success</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17473">change 17473</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/17473"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic7a1e9453f805a6264fe86c96b7d18b87b376084 </div>
<div style="display:none"> Gerrit-Change-Number: 17473 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>