diff options
| author | Scott Griepentrog <sgriepentrog@digium.com> | 2015-04-02 14:56:39 +0000 |
|---|---|---|
| committer | Scott Griepentrog <sgriepentrog@digium.com> | 2015-04-02 14:56:39 +0000 |
| commit | 6e5efe04bd34ac41f3f9367eef64e82f8927da20 (patch) | |
| tree | edd8856a0e4134dd7e8c37088c698426f562615e /include/asterisk/res_pjsip_session.h | |
| parent | 154ba47766e9195b777373af3bcf88137fac03f0 (diff) | |
pjsip: resolve compatibility problem with ast_sip_session
A change in r430179 inserted a variable near the top of a
structure caused a problem when running DPMA in a version
of Asterisk compiled across the change. This patch moves
the new variable to the end of the structure, eliminating
the problem.
Review: https://reviewboard.asterisk.org/r/4574/
........
Merged revisions 433944 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/res_pjsip_session.h')
| -rw-r--r-- | include/asterisk/res_pjsip_session.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h index 728b2c33c..9143118dd 100644 --- a/include/asterisk/res_pjsip_session.h +++ b/include/asterisk/res_pjsip_session.h @@ -107,8 +107,6 @@ struct ast_sip_session { char exten[AST_MAX_EXTENSION]; /*! The endpoint with which Asterisk is communicating */ struct ast_sip_endpoint *endpoint; - /*! The AOR associated with this session */ - struct ast_sip_aor *aor; /*! The contact associated with this session */ struct ast_sip_contact *contact; /*! The PJSIP details of the session, which includes the dialog */ @@ -147,6 +145,8 @@ struct ast_sip_session { pjsip_rx_data *deferred_reinvite; /*! Current T.38 state */ enum ast_sip_session_t38state t38state; + /*! The AOR associated with this session */ + struct ast_sip_aor *aor; }; typedef int (*ast_sip_session_request_creation_cb)(struct ast_sip_session *session, pjsip_tx_data *tdata); |