kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjsip: resolve compatibility problem with ast_sip_session

Browse Source 
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
This commit is contained in:
Scott Griepentrog
2015-04-02 14:56:00 +00:00
parent 1eb0c5f4e8
commit 169e57d2e0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/res_pjsip_session.h
View File

@@ -105,8 +105,6 @@ struct ast_sip_session {
char exten[AST_MAX_EXTENSION]; char exten[AST_MAX_EXTENSION];
/*! The endpoint with which Asterisk is communicating */ /*! The endpoint with which Asterisk is communicating */
struct ast_sip_endpoint *endpoint; struct ast_sip_endpoint *endpoint;
/*! The AOR associated with this session */
struct ast_sip_aor *aor;
/*! The contact associated with this session */ /*! The contact associated with this session */
struct ast_sip_contact *contact; struct ast_sip_contact *contact;
/*! The PJSIP details of the session, which includes the dialog */ /*! The PJSIP details of the session, which includes the dialog */
@@ -145,6 +143,8 @@ struct ast_sip_session {
pjsip_rx_data *deferred_reinvite; pjsip_rx_data *deferred_reinvite;
/*! Current T.38 state */ /*! Current T.38 state */
enum ast_sip_session_t38state t38state; 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); typedef int (*ast_sip_session_request_creation_cb)(struct ast_sip_session *session, pjsip_tx_data *tdata);