Author: sgriepentrog Date: Thu Apr 2 09:56:39 2015 New Revision: 433945 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433945 Log: 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 Modified: trunk/ (props changed) trunk/include/asterisk/res_pjsip_session.h Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/include/asterisk/res_pjsip_session.h URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/res_pjsip_session.h?view=diff&rev=433945&r1=433944&r2=433945 ============================================================================== --- trunk/include/asterisk/res_pjsip_session.h (original) +++ trunk/include/asterisk/res_pjsip_session.h Thu Apr 2 09:56:39 2015 @@ -107,8 +107,6 @@ 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 @@ 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); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
