Author: bebuild Date: Mon Apr 6 09:35:43 2015 New Revision: 434019 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=434019 Log: Merge 433944 for 13.2.1
Removed: tags/13.2.1/asterisk-13.2.0-summary.html tags/13.2.1/asterisk-13.2.0-summary.txt Modified: tags/13.2.1/ (props changed) tags/13.2.1/.version tags/13.2.1/ChangeLog tags/13.2.1/include/asterisk/res_pjsip_session.h Propchange: tags/13.2.1/ ------------------------------------------------------------------------------ svn:mergeinfo = /branches/13:433944 Modified: tags/13.2.1/.version URL: http://svnview.digium.com/svn/asterisk/tags/13.2.1/.version?view=diff&rev=434019&r1=434018&r2=434019 ============================================================================== --- tags/13.2.1/.version (original) +++ tags/13.2.1/.version Mon Apr 6 09:35:43 2015 @@ -1,1 +1,1 @@ -13.2.0 +13.2.1 Modified: tags/13.2.1/ChangeLog URL: http://svnview.digium.com/svn/asterisk/tags/13.2.1/ChangeLog?view=diff&rev=434019&r1=434018&r2=434019 ============================================================================== --- tags/13.2.1/ChangeLog (original) +++ tags/13.2.1/ChangeLog Mon Apr 6 09:35:43 2015 @@ -1,3 +1,15 @@ +2015-04-06 Asterisk Development Team <asteriskt...@digium.com> + + * Asterisk 13.2.1 Released. + + * pjsip: resolve ABI compatibility problem with external modules + + A change in r430179 inserted a variable near the top of a + structure in ast_sip_session caused a problem when running external + modules, such as the 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. + 2015-02-06 Asterisk Development Team <asteriskt...@digium.com> * Asterisk 13.2.0 Released. Modified: tags/13.2.1/include/asterisk/res_pjsip_session.h URL: http://svnview.digium.com/svn/asterisk/tags/13.2.1/include/asterisk/res_pjsip_session.h?view=diff&rev=434019&r1=434018&r2=434019 ============================================================================== --- tags/13.2.1/include/asterisk/res_pjsip_session.h (original) +++ tags/13.2.1/include/asterisk/res_pjsip_session.h Mon Apr 6 09:35:43 2015 @@ -105,8 +105,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 */ @@ -143,6 +141,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