diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-07-07 16:08:47 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-07-07 16:08:47 +0000 |
| commit | 534ffd8481341da6c7539163d7f575e98173cae0 (patch) | |
| tree | 8e3544fd1d29ea55ba15063a865db97f8e3d0138 /include | |
| parent | d4b436d0ea766d51d7743a874df441d40fdcd226 (diff) | |
res_pjsip_dialog_info_body_generator: Add dialog-info+xml support for presence.
This module implements dialog-info+xml for the purposes of presence. This means
that phones such as Grandstreams can now subscribe to receive presence information
for an extension.
ASTERISK-21443 #close
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/3705/
........
Merged revisions 418116 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/res_pjsip_body_generator_types.h | 3 | ||||
| -rw-r--r-- | include/asterisk/res_pjsip_presence_xml.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/asterisk/res_pjsip_body_generator_types.h b/include/asterisk/res_pjsip_body_generator_types.h index 09f234a03..a2cc04313 100644 --- a/include/asterisk/res_pjsip_body_generator_types.h +++ b/include/asterisk/res_pjsip_body_generator_types.h @@ -28,6 +28,7 @@ * \li application/pidf+xml * \li application/xpidf+xml * \li application/cpim-pidf+xml + * \li application/dialog-info+xml */ struct ast_sip_exten_state_data { /*! The extension of the current state change */ @@ -48,6 +49,8 @@ struct ast_sip_exten_state_data { char local[PJSIP_MAX_URL_SIZE]; /*! Remote dialog URI */ char remote[PJSIP_MAX_URL_SIZE]; + /*! Optional subscription */ + struct ast_sip_subscription *sub; /*! Allocation pool */ pj_pool_t *pool; }; diff --git a/include/asterisk/res_pjsip_presence_xml.h b/include/asterisk/res_pjsip_presence_xml.h index a10d5016d..8318067ad 100644 --- a/include/asterisk/res_pjsip_presence_xml.h +++ b/include/asterisk/res_pjsip_presence_xml.h @@ -72,7 +72,7 @@ pj_xml_attr *ast_sip_presence_xml_create_attr(pj_pool_t *pool, * \brief Create XML node * * \param pool Allocation pool - * \param parent Node that will be parent to the created node + * \param parent Optional node that will be parent to the created node * \param name The name for the new node * \return The created node */ |