diff options
| author | George Joseph <george.joseph@fairview5.com> | 2014-03-08 16:50:36 +0000 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2014-03-08 16:50:36 +0000 |
| commit | 3ff60b75b144d70034a768fc7d7da4537bf7cd7a (patch) | |
| tree | 41509c60312f10e14a72c4f3a6bf37bb85c06cb9 /include/asterisk/res_pjsip.h | |
| parent | 5ca081e05369e2611048ac942f6c48e4814e4fe2 (diff) | |
pjsip_cli: Create pjsip show channel and contact, and general cli code cleanup.
Created the 'pjsip show channel' and 'pjsip show contact' commands.
Refactored out the hated ast_hashtab. Replaced with ao2_container.
Cleaned up function naming. Internal only, no public name changes.
Cleaned up whitespace and brace formatting in cli code.
Changed some NULL checking from "if"s to ast_asserts.
Fixed some register/unregister ordering to reduce deadlock potential.
Fixed ast_sip_location_add_contact where the 'name' buffer was too short.
Fixed some self-assignment issues in res_pjsip_outbound_registration.
(closes issue ASTERISK-23276)
Review: http://reviewboard.asterisk.org/r/3283/
........
Merged revisions 410287 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410288 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/res_pjsip.h')
| -rw-r--r-- | include/asterisk/res_pjsip.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 80919c7d8..181a26ef7 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -223,6 +223,19 @@ struct ast_sip_aor { }; /*! + * \brief A wrapper for contact that adds the aor_id and + * a consistent contact id. Used by ast_sip_for_each_contact. + */ +struct ast_sip_contact_wrapper { + /*! The id of the parent aor. */ + char *aor_id; + /*! The id of contact in form of aor_id/contact_uri. */ + char *contact_id; + /*! Pointer to the actual contact. */ + struct ast_sip_contact *contact; +}; + +/*! * \brief DTMF modes for SIP endpoints */ enum ast_sip_dtmf_mode { @@ -1620,7 +1633,8 @@ void *ast_sip_dict_set(pj_pool_t* pool, void *ht, * \brief For every contact on an AOR call the given 'on_contact' handler. * * \param aor the aor containing a list of contacts to iterate - * \param on_contact callback on each contact on an AOR + * \param on_contact callback on each contact on an AOR. The object + * received by the callback will be a ast_sip_contact_wrapper structure. * \param arg user data passed to handler * \retval 0 Success, non-zero on failure */ |