]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
pjsip: resolve compatibility problem with ast_sip_session
authorScott Griepentrog <sgriepentrog@digium.com>
Thu, 2 Apr 2015 14:56:00 +0000 (14:56 +0000)
committerScott Griepentrog <sgriepentrog@digium.com>
Thu, 2 Apr 2015 14:56:00 +0000 (14:56 +0000)
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/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433944 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/res_pjsip_session.h

index 93238010a3b93e53a50fc5ea0494f0a723188266..05548d5fc80e81b11eb32f8e21ca399354bcc4ed 100644 (file)
@@ -105,8 +105,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 */
@@ -145,6 +143,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);