From 169e57d2e066eb49ed2a881aabfbc212a46f01d2 Mon Sep 17 00:00:00 2001
From: Scott Griepentrog <sgriepentrog@digium.com>
Date: Thu, 2 Apr 2015 14:56:00 +0000
Subject: [PATCH] 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/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
include/asterisk/res_pjsip_session.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h
index 93238010a3..05548d5fc8 100644
--- a/include/asterisk/res_pjsip_session.h
+++ b/include/asterisk/res_pjsip_session.h
@@ -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);
--
GitLab