[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Aug 1 18:22:24 CDT 2011
branch "master" has been updated
via 753d3c79491352932e066826a03c3bd831e5a58f (commit)
from 50b9944368b79ef6b59fa6a5e488277f744c2389 (commit)
Summary of changes:
.../SipSessionManager/SipStateReplicationIf.ice | 74 +++++++-------
src/PJSipModule.cpp | 30 +++---
src/PJSipSessionModule.cpp | 100 ++++++++++----------
src/SipSessionManagerApp.cpp | 2 +-
src/SipStateReplicatorApp.cpp | 2 +-
src/SipStateReplicatorListener.cpp | 74 +++++++-------
6 files changed, 141 insertions(+), 141 deletions(-)
- Log -----------------------------------------------------------------
commit 753d3c79491352932e066826a03c3bd831e5a58f
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Aug 1 17:45:05 2011 -0500
Remove unnecessary 'm' prefixes on slice types.
diff --git a/slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice b/slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice
index 06e7f17..9f9cbec 100644
--- a/slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice
@@ -41,13 +41,13 @@ module V1
unsliceable class SipStateReplicatorParams extends AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams
{
- string mName;
+ string name;
};
class SipStateItem
{
string key;
- string mSessionId;
+ string sessionId;
};
sequence<SipStateItem> SipStateItemSeq;
@@ -66,24 +66,24 @@ module V1
void setState (SipStateItemSeq items);
void removeState(Ice::StringSeq items);
void removeStateForItems(SipStateItemSeq items);
- idempotent SipStateItemSeq getState(Ice::StringSeq itemKeys);
+ idempotent SipStateItemSeq getState(Ice::StringSeq iteKeys);
idempotent SipStateItemSeq getAllState();
};
class SipDialogStateItem extends SipStateItem
{
- string mCallId;
- bool mIsDialogEstablished;
- bool mIsSecure;
- int mLocalCSeq;
- string mLocalTag;
- string mLocalUri;
- int mRemoteCSeq;
- string mRemoteTag;
- string mRemoteUri;
- Ice::StringSeq mRouteSet;
- string mTransport;
- bool mUacHas2xx;
- bool mIsUac;
+ string callId;
+ bool isDialogEstablished;
+ bool isSecure;
+ int localCSeq;
+ string localTag;
+ string localUri;
+ int remoteCSeq;
+ string remoteTag;
+ string remoteUri;
+ Ice::StringSeq routeSet;
+ string transport;
+ bool uacHas2xx;
+ bool isUac;
};
enum InviteSessionState
@@ -100,13 +100,13 @@ module V1
class SipInviteSessionStateItem extends SipStateItem
{
- InviteSessionState mCurrentState;
- bool mCancelling;
- bool mPendingCancel;
- int mCause;
- string mCauseText;
- bool mNotify;
- int mLastAckCseq;
+ InviteSessionState currentState;
+ bool cancelling;
+ bool pendingCancel;
+ int cause;
+ string causeText;
+ bool notify;
+ int lastAckCseq;
};
enum TransactionState
@@ -134,14 +134,14 @@ module V1
class SipTransactionStateItem extends SipStateItem
{
- string mBranch;
- TransactionState mCurrentState;
+ string branch;
+ TransactionState currentState;
//Indicates whether we were the originator
//of the transaction. On a failover, this in
//tandem with the current state of the transaction
//can be used to determine if we are awaiting a
//message or are supposed to be sending one.
- bool mIsClient;
+ bool isClient;
};
sequence<AsteriskSCF::SessionCommunications::V1::SessionListener*> SessionListenerSeq;
@@ -152,17 +152,17 @@ module V1
{
//XXX There probably needs to be a lot more specified
//here, but frankly I have no clue.
- string mEndpointName;
- Ice::Identity mSessionObjectId;
- Ice::Identity mMediaSessionObjectId;
- Ice::Identity mSessionControllerObjectId;
- AsteriskSCF::Media::V1::StreamSourceSeq mSources;
- AsteriskSCF::Media::V1::StreamSinkSeq mSinks;
- AsteriskSCF::Media::V1::StreamInformationDict mStreams;
- RTPMediaSessionSeq mRTPMediaSessions;
- SessionListenerSeq mListeners;
- AsteriskSCF::SessionCommunications::V1::Bridge *mBridge;
- AsteriskSCF::SessionCommunications::V1::SessionCookieDict mCookies;
+ string endpointName;
+ Ice::Identity sessionObjectId;
+ Ice::Identity mediaSessionObjectId;
+ Ice::Identity sessionControllerObjectId;
+ AsteriskSCF::Media::V1::StreamSourceSeq sources;
+ AsteriskSCF::Media::V1::StreamSinkSeq sinks;
+ AsteriskSCF::Media::V1::StreamInformationDict streams;
+ RTPMediaSessionSeq rtpMediaSessions;
+ SessionListenerSeq listeners;
+ AsteriskSCF::SessionCommunications::V1::Bridge *bridge;
+ AsteriskSCF::SessionCommunications::V1::SessionCookieDict cookies;
};
class SipRegistrarStateItem extends SipStateItem
diff --git a/src/PJSipModule.cpp b/src/PJSipModule.cpp
index 68714f5..12497e4 100644
--- a/src/PJSipModule.cpp
+++ b/src/PJSipModule.cpp
@@ -60,27 +60,27 @@ PJSipDialogModInfo::~PJSipDialogModInfo()
*/
void PJSipDialogModInfo::updateDialogState(pjsip_dialog *dialog)
{
- mDialogState->mCallId = std::string(pj_strbuf(&dialog->call_id->id), pj_strlen(&dialog->call_id->id));
- mDialogState->mIsDialogEstablished = dialog->state == PJSIP_DIALOG_STATE_ESTABLISHED ? true : false;
- mDialogState->mIsSecure = dialog->secure == PJ_TRUE ? true : false;
+ mDialogState->callId = std::string(pj_strbuf(&dialog->call_id->id), pj_strlen(&dialog->call_id->id));
+ mDialogState->isDialogEstablished = dialog->state == PJSIP_DIALOG_STATE_ESTABLISHED ? true : false;
+ mDialogState->isSecure = dialog->secure == PJ_TRUE ? true : false;
- mDialogState->mLocalCSeq = dialog->local.cseq;
- mDialogState->mLocalTag = std::string(pj_strbuf(&dialog->local.info->tag), pj_strlen(&dialog->local.info->tag));
+ mDialogState->localCSeq = dialog->local.cseq;
+ mDialogState->localTag = std::string(pj_strbuf(&dialog->local.info->tag), pj_strlen(&dialog->local.info->tag));
char localUri[URI_SIZE];
pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, dialog->local.info->uri, localUri, sizeof(localUri));
- mDialogState->mLocalUri = localUri;
+ mDialogState->localUri = localUri;
- mDialogState->mRemoteCSeq = dialog->remote.cseq;
- mDialogState->mRemoteTag = std::string(pj_strbuf(&dialog->remote.info->tag), pj_strlen(&dialog->remote.info->tag));
+ mDialogState->remoteCSeq = dialog->remote.cseq;
+ mDialogState->remoteTag = std::string(pj_strbuf(&dialog->remote.info->tag), pj_strlen(&dialog->remote.info->tag));
char remoteUri[URI_SIZE];
pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, dialog->remote.info->uri, remoteUri, sizeof(remoteUri));
- mDialogState->mRemoteUri = remoteUri;
+ mDialogState->remoteUri = remoteUri;
//This is a place where the whole "only change what you need" optimization
//will come in super-handy since we have to erase and rebuild the route set
//every time. My recollection is that the route set can only be established
//in the first transaction of a dialog so this is purdy wasteful.
- mDialogState->mRouteSet.erase(mDialogState->mRouteSet.begin(), mDialogState->mRouteSet.end());
+ mDialogState->routeSet.erase(mDialogState->routeSet.begin(), mDialogState->routeSet.end());
for (pjsip_route_hdr *hdr_iter = dialog->route_set.next; hdr_iter != &dialog->route_set; hdr_iter = hdr_iter->next)
{
char routeUri[URI_SIZE];
@@ -91,12 +91,12 @@ void PJSipDialogModInfo::updateDialogState(pjsip_dialog *dialog)
//or it may only be correct depending on whether we're the UAC or UAS.
//Also, for now we're ignoring the optional display name portion of URIs
//in the route set. They're not strictly necessary for routing calls correctly.
- mDialogState->mRouteSet.push_back(routeUri);
+ mDialogState->routeSet.push_back(routeUri);
}
//XXX I'm not 100% sure how to get the transport from a pjsip_dialog, so for now,
//I'll just hardcode this as UDP until we start wanting to actually implement
//other transports.
- mDialogState->mTransport = "UDP";
+ mDialogState->transport = "UDP";
mNeedsReplication = true;
}
@@ -114,10 +114,10 @@ PJSipTransactionModInfo::~PJSipTransactionModInfo()
void PJSipTransactionModInfo::updateTransactionState(pjsip_transaction *transaction)
{
- mTransactionState->mBranch = std::string(pj_strbuf(&transaction->branch), pj_strlen(&transaction->branch));
- mTransactionState->mIsClient =
+ mTransactionState->branch = std::string(pj_strbuf(&transaction->branch), pj_strlen(&transaction->branch));
+ mTransactionState->isClient =
(transaction->role == PJSIP_ROLE_UAC || transaction->role == PJSIP_UAC_ROLE) ? true : false;
- mTransactionState->mCurrentState = transactionStateTranslate(transaction->state);
+ mTransactionState->currentState = transactionStateTranslate(transaction->state);
mNeedsReplication = true;
}
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 76d0d54..0ceb682 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -80,8 +80,8 @@ PJSipSessionModInfo::PJSipSessionModInfo(pjsip_inv_session *inv_session,
{
mSessionState->key = IceUtil::generateUUID();
mInviteState->key = IceUtil::generateUUID();
- mSessionState->mSessionId = mSessionState->key;
- mInviteState->mSessionId = mSessionState->key;
+ mSessionState->sessionId = mSessionState->key;
+ mInviteState->sessionId = mSessionState->key;
updateSessionState(inv_session);
}
@@ -99,34 +99,34 @@ void PJSipSessionModInfo::updateSessionState(pjsip_inv_session *inv_session)
boost::unique_lock<boost::shared_mutex> lock(mLock);
if (mSession)
{
- mSessionState->mEndpointName = mSession->getEndpoint()->getName();
- mSessionState->mSessionObjectId = mSession->getSessionProxy()->ice_getIdentity();
- mSessionState->mMediaSessionObjectId = mSession->getMediaSessionProxy()->ice_getIdentity();
- mSessionState->mSessionControllerObjectId = mSession->getOurSessionControllerProxy()->ice_getIdentity();
- mSessionState->mSources = mSession->getSources();
- mSessionState->mSinks = mSession->getSinks();
- mSessionState->mRTPMediaSessions = mSession->getRTPMediaSessions();
- mSessionState->mListeners = mSession->getListeners();
- mSessionState->mStreams = mSession->getStreams();
+ mSessionState->endpointName = mSession->getEndpoint()->getName();
+ mSessionState->sessionObjectId = mSession->getSessionProxy()->ice_getIdentity();
+ mSessionState->mediaSessionObjectId = mSession->getMediaSessionProxy()->ice_getIdentity();
+ mSessionState->sessionControllerObjectId = mSession->getOurSessionControllerProxy()->ice_getIdentity();
+ mSessionState->sources = mSession->getSources();
+ mSessionState->sinks = mSession->getSinks();
+ mSessionState->rtpMediaSessions = mSession->getRTPMediaSessions();
+ mSessionState->listeners = mSession->getListeners();
+ mSessionState->streams = mSession->getStreams();
try
{
- mSessionState->mBridge = mSession->getBridge();
+ mSessionState->bridge = mSession->getBridge();
}
catch (...)
{
- mSessionState->mBridge = 0;
+ mSessionState->bridge = 0;
}
- mSessionState->mCookies = mSession->getAllCookies();
+ mSessionState->cookies = mSession->getAllCookies();
}
//Now we get stuff from the inv_session itself.
- mInviteState->mCancelling = inv_session->cancelling == PJ_TRUE ? true : false;
- mInviteState->mPendingCancel = inv_session->pending_cancel == PJ_TRUE ? true : false;
- mInviteState->mCause = inv_session->cause;
- mInviteState->mCauseText = std::string(pj_strbuf(&inv_session->cause_text), pj_strlen(&inv_session->cause_text));
- mInviteState->mNotify = inv_session->notify == PJ_TRUE ? true : false;
- mInviteState->mLastAckCseq = inv_session->last_ack_cseq;
- mInviteState->mCurrentState = inviteStateTranslate(inv_session->state);
+ mInviteState->cancelling = inv_session->cancelling == PJ_TRUE ? true : false;
+ mInviteState->pendingCancel = inv_session->pending_cancel == PJ_TRUE ? true : false;
+ mInviteState->cause = inv_session->cause;
+ mInviteState->causeText = std::string(pj_strbuf(&inv_session->cause_text), pj_strlen(&inv_session->cause_text));
+ mInviteState->notify = inv_session->notify == PJ_TRUE ? true : false;
+ mInviteState->lastAckCseq = inv_session->last_ack_cseq;
+ mInviteState->currentState = inviteStateTranslate(inv_session->state);
mNeedsReplication = true;
}
@@ -217,18 +217,18 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
if (dlgInfo)
{
lg(Debug) << "--- Begin Dialog " << dlgInfo->mDialogState->key;
- lg(Debug) << "Callid: " << dlgInfo->mDialogState->mCallId;
- lg(Debug) << "Is Dialog Established: " << dlgInfo->mDialogState->mIsDialogEstablished;
- lg(Debug) << "Is Secure: " << dlgInfo->mDialogState->mIsSecure;
- lg(Debug) << "Local CSeq: " << dlgInfo->mDialogState->mLocalCSeq;
- lg(Debug) << "Local URI: " << dlgInfo->mDialogState->mLocalUri;
- lg(Debug) << "Local tag: " << dlgInfo->mDialogState->mLocalTag;
- lg(Debug) << "Remote CSeq: " << dlgInfo->mDialogState->mRemoteCSeq;
- lg(Debug) << "Remote URI: " << dlgInfo->mDialogState->mRemoteUri;
- lg(Debug) << "Remote tag: " << dlgInfo->mDialogState->mRemoteTag;
- lg(Debug) << "Transport: " << dlgInfo->mDialogState->mTransport;
- lg(Debug) << "UAC Has 2xx: " << dlgInfo->mDialogState->mUacHas2xx;
- lg(Debug) << "Is Uac: " << dlgInfo->mDialogState->mIsUac;
+ lg(Debug) << "Callid: " << dlgInfo->mDialogState->callId;
+ lg(Debug) << "Is Dialog Established: " << dlgInfo->mDialogState->isDialogEstablished;
+ lg(Debug) << "Is Secure: " << dlgInfo->mDialogState->isSecure;
+ lg(Debug) << "Local CSeq: " << dlgInfo->mDialogState->localCSeq;
+ lg(Debug) << "Local URI: " << dlgInfo->mDialogState->localUri;
+ lg(Debug) << "Local tag: " << dlgInfo->mDialogState->localTag;
+ lg(Debug) << "Remote CSeq: " << dlgInfo->mDialogState->remoteCSeq;
+ lg(Debug) << "Remote URI: " << dlgInfo->mDialogState->remoteUri;
+ lg(Debug) << "Remote tag: " << dlgInfo->mDialogState->remoteTag;
+ lg(Debug) << "Transport: " << dlgInfo->mDialogState->transport;
+ lg(Debug) << "UAC Has 2xx: " << dlgInfo->mDialogState->uacHas2xx;
+ lg(Debug) << "Is Uac: " << dlgInfo->mDialogState->isUac;
if (dlgInfo->mPending == true)
{
lg(Debug) << "Dialog is in pending state, not replicating";
@@ -250,26 +250,26 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
{
boost::shared_lock<boost::shared_mutex> lock(sessionInfo->mLock);
lg(Debug) << "--- Begin Session " << sessionInfo->mSessionState->key;
- lg(Debug) << "Endpoint name: " << sessionInfo->mSessionState->mEndpointName;
- lg(Debug) << "Session object identity: " << sessionInfo->mSessionState->mSessionObjectId.name;
- lg(Debug) << "Media session object identity: " << sessionInfo->mSessionState->mMediaSessionObjectId.name;
+ lg(Debug) << "Endpoint name: " << sessionInfo->mSessionState->endpointName;
+ lg(Debug) << "Session object identity: " << sessionInfo->mSessionState->sessionObjectId.name;
+ lg(Debug) << "Media session object identity: " << sessionInfo->mSessionState->mediaSessionObjectId.name;
- for (RTPMediaSessionSeq::const_iterator mediaSession = sessionInfo->mSessionState->mRTPMediaSessions.begin();
- mediaSession != sessionInfo->mSessionState->mRTPMediaSessions.end();
+ for (RTPMediaSessionSeq::const_iterator mediaSession = sessionInfo->mSessionState->rtpMediaSessions.begin();
+ mediaSession != sessionInfo->mSessionState->rtpMediaSessions.end();
++mediaSession)
{
lg(Debug) << "Media session: " << (*mediaSession);
}
- lg(Debug) << "Bridge: " << sessionInfo->mSessionState->mBridge;
+ lg(Debug) << "Bridge: " << sessionInfo->mSessionState->bridge;
lg(Debug) << "--- Begin Invite Session " << sessionInfo->mInviteState->key;
- lg(Debug) << "Current state: " << sessionInfo->mInviteState->mCurrentState;
- lg(Debug) << "Cancelling: " << sessionInfo->mInviteState->mCancelling;
- lg(Debug) << "Pending cancel: " << sessionInfo->mInviteState->mPendingCancel;
- lg(Debug) << "Cause: " << sessionInfo->mInviteState->mCause;
- lg(Debug) << "Cause text: " << sessionInfo->mInviteState->mCauseText;
- lg(Debug) << "Notify: " << sessionInfo->mInviteState->mNotify;
- lg(Debug) << "Last Ack CSeq: " << sessionInfo->mInviteState->mLastAckCseq;
+ lg(Debug) << "Current state: " << sessionInfo->mInviteState->currentState;
+ lg(Debug) << "Cancelling: " << sessionInfo->mInviteState->cancelling;
+ lg(Debug) << "Pending cancel: " << sessionInfo->mInviteState->pendingCancel;
+ lg(Debug) << "Cause: " << sessionInfo->mInviteState->cause;
+ lg(Debug) << "Cause text: " << sessionInfo->mInviteState->causeText;
+ lg(Debug) << "Notify: " << sessionInfo->mInviteState->notify;
+ lg(Debug) << "Last Ack CSeq: " << sessionInfo->mInviteState->lastAckCseq;
if (sessionInfo->mNeedsRemoval == true)
{
removeItems.push_back(sessionInfo->mInviteState->key);
@@ -662,8 +662,8 @@ void PJSipSessionModule::handleNewInvite(pjsip_rx_data *rdata)
PJSipSessionModInfo *session_mod_info(new PJSipSessionModInfo(inv_session, nullSession, sessionWork));
inv_session->mod_data[mModule.id] = (void *) session_mod_info;
- dlg_mod_info->mDialogState->mSessionId = session_mod_info->mSessionState->mSessionId;
- tsx_mod_info->mTransactionState->mSessionId = session_mod_info->mSessionState->mSessionId;
+ dlg_mod_info->mDialogState->sessionId = session_mod_info->mSessionState->sessionId;
+ tsx_mod_info->mTransactionState->sessionId = session_mod_info->mSessionState->sessionId;
if (pjsip_inv_send_msg(inv_session, tdata) != PJ_SUCCESS)
{
@@ -1451,9 +1451,9 @@ void PJSipSessionModule::invOnStateChanged(pjsip_inv_session *inv, pjsip_event *
PJSipSessionModInfo *session_mod_info = static_cast<PJSipSessionModInfo *>(inv->mod_data[mModule.id]);
inv->invite_tsx->mod_data[mModule.id] = (void *) tsx_mod_info;
inv->dlg->mod_data[mModule.id] = (void *) dlg_mod_info;
- dlg_mod_info->mDialogState->mSessionId = session_mod_info->mSessionState->mSessionId;
+ dlg_mod_info->mDialogState->sessionId = session_mod_info->mSessionState->sessionId;
dlg_mod_info->mPending = false;
- tsx_mod_info->mTransactionState->mSessionId = session_mod_info->mSessionState->mSessionId;
+ tsx_mod_info->mTransactionState->sessionId = session_mod_info->mSessionState->sessionId;
lg(Debug) << "Replicating state on new outbound INVITE.";
replicateState(dlg_mod_info, tsx_mod_info, session_mod_info);
}
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index 5722809..59dbf37 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -420,7 +420,7 @@ void SipSessionManager::locateStateReplicator()
SipStateReplicatorParamsPtr replicatorParams = new SipStateReplicatorParams();
replicatorParams->category = StateReplicatorDiscoveryCategory;
- replicatorParams->mName =
+ replicatorParams->name =
mCommunicator->getProperties()->getPropertyWithDefault("Sip.StateReplicatorName", "default");
try
diff --git a/src/SipStateReplicatorApp.cpp b/src/SipStateReplicatorApp.cpp
index cb07b31..8aabcb1 100644
--- a/src/SipStateReplicatorApp.cpp
+++ b/src/SipStateReplicatorApp.cpp
@@ -120,7 +120,7 @@ public:
bool isSupported(const ServiceLocatorParamsPtr ¶ms, const Ice::Current &)
{
SipStateReplicatorParamsPtr sipParams = SipStateReplicatorParamsPtr::dynamicCast(params);
- if (sipParams->mName == mName)
+ if (sipParams->name == mName)
{
return true;
}
diff --git a/src/SipStateReplicatorListener.cpp b/src/SipStateReplicatorListener.cpp
index d2097f2..d9159fb 100644
--- a/src/SipStateReplicatorListener.cpp
+++ b/src/SipStateReplicatorListener.cpp
@@ -232,7 +232,7 @@ public:
for (SipStateItemSeq::const_iterator item = items.begin(); item != items.end(); ++item)
{
std::map<std::string, boost::shared_ptr<SipStateReplicatorItem> >::iterator i =
- mStateItems.find((*item)->mSessionId);
+ mStateItems.find((*item)->sessionId);
SipSessionStateItemPtr session;
SipDialogStateItemPtr dialog;
SipInviteSessionStateItemPtr invitesession;
@@ -245,7 +245,7 @@ public:
{
if (i == mStateItems.end())
{
- SipEndpointPtr endpoint = mEndpointFactory->findByName(session->mEndpointName);
+ SipEndpointPtr endpoint = mEndpointFactory->findByName(session->endpointName);
// If we lack the endpoint (due to misconfiguration) we can't procceed
if (endpoint == 0)
@@ -256,13 +256,13 @@ public:
// Unlike other state items sessions are special in that they create the local class that binds
// everything together
boost::shared_ptr<SipStateReplicatorItem> newitem(new SipStateReplicatorItem());
- mStateItems.insert(make_pair((*item)->mSessionId, newitem));
+ mStateItems.insert(make_pair((*item)->sessionId, newitem));
localitem = newitem;
// Now that all is well we can create an actual session
- SipSessionPtr localSession = endpoint->createSession("", session->mSessionObjectId,
- session->mSessionControllerObjectId,
- session->mMediaSessionObjectId, session->mRTPMediaSessions, session->mSources, session->mSinks);
+ SipSessionPtr localSession = endpoint->createSession("", session->sessionObjectId,
+ session->sessionControllerObjectId,
+ session->mediaSessionObjectId, session->rtpMediaSessions, session->sources, session->sinks);
localitem->setSession(localSession);
}
else
@@ -270,10 +270,10 @@ public:
localitem = i->second;
}
- localitem->getSession()->setListeners(session->mListeners);
- localitem->getSession()->setBridge(session->mBridge);
- localitem->getSession()->setCookies(session->mCookies);
- localitem->getSession()->setStreams(session->mStreams);
+ localitem->getSession()->setListeners(session->listeners);
+ localitem->getSession()->setBridge(session->bridge);
+ localitem->getSession()->setCookies(session->cookies);
+ localitem->getSession()->setStreams(session->streams);
}
else if ((dialog = SipDialogStateItemPtr::dynamicCast((*item))))
{
@@ -288,8 +288,8 @@ public:
{
// Dialogs always start out as UAC since that does not require an actual packet, it is only later
// that we change them
- pj_str_t localUri = pj_str((char*)dialog->mLocalUri.c_str());
- pj_str_t remoteUri = pj_str((char*)dialog->mRemoteUri.c_str());
+ pj_str_t localUri = pj_str((char*)dialog->localUri.c_str());
+ pj_str_t remoteUri = pj_str((char*)dialog->remoteUri.c_str());
if ((pjsip_dlg_create_uac(pjsip_ua_instance(), &localUri, &localUri, &remoteUri, &remoteUri,
&localDialog)) != PJ_SUCCESS)
{
@@ -297,14 +297,14 @@ public:
continue;
}
- localDialog->role = (dialog->mIsUac == true) ? PJSIP_ROLE_UAC : PJSIP_ROLE_UAS;
+ localDialog->role = (dialog->isUac == true) ? PJSIP_ROLE_UAC : PJSIP_ROLE_UAS;
// Since the Call ID will never change for the lifetime of the dialog we only mess with it here when
// creating the dialog itself
- pj_strdup2(localDialog->pool, &localDialog->call_id->id, dialog->mCallId.c_str());
+ pj_strdup2(localDialog->pool, &localDialog->call_id->id, dialog->callId.c_str());
// Secure status is another thing that should never change
- localDialog->secure = (dialog->mIsSecure == true) ? PJ_TRUE : PJ_FALSE;
+ localDialog->secure = (dialog->isSecure == true) ? PJ_TRUE : PJ_FALSE;
i->second->getSession()->setDialog(localDialog);
@@ -312,26 +312,26 @@ public:
localDialog->mod_data[mManager->getSessionModule()->getModule().id] = (void *) dlg_mod_info;
}
- localDialog->state = (dialog->mIsDialogEstablished == true) ? PJSIP_DIALOG_STATE_ESTABLISHED :
+ localDialog->state = (dialog->isDialogEstablished == true) ? PJSIP_DIALOG_STATE_ESTABLISHED :
PJSIP_DIALOG_STATE_NULL;
- localDialog->uac_has_2xx = (dialog->mUacHas2xx == true) ? PJ_TRUE : PJ_FALSE;
- localDialog->local.cseq = dialog->mLocalCSeq;
- localDialog->remote.cseq = dialog->mRemoteCSeq;
+ localDialog->uac_has_2xx = (dialog->uacHas2xx == true) ? PJ_TRUE : PJ_FALSE;
+ localDialog->local.cseq = dialog->localCSeq;
+ localDialog->remote.cseq = dialog->remoteCSeq;
// Strings we do not just set since doing so could needlessly increase memory usage, and we have to be
// careful of that
- if (pj_strcmp2(&localDialog->local.info->tag, dialog->mLocalTag.c_str()))
+ if (pj_strcmp2(&localDialog->local.info->tag, dialog->localTag.c_str()))
{
pjsip_ua_unregister_dlg(pjsip_ua_instance(), localDialog);
- pj_strdup2(localDialog->pool, &localDialog->local.info->tag, dialog->mLocalTag.c_str());
+ pj_strdup2(localDialog->pool, &localDialog->local.info->tag, dialog->localTag.c_str());
localDialog->local.tag_hval = pj_hash_calc(0, localDialog->local.info->tag.ptr,
(unsigned int) localDialog->local.info->tag.slen);
pjsip_ua_register_dlg(pjsip_ua_instance(), localDialog);
}
- if (pj_strcmp2(&localDialog->remote.info->tag, dialog->mRemoteTag.c_str()))
+ if (pj_strcmp2(&localDialog->remote.info->tag, dialog->remoteTag.c_str()))
{
- pj_strdup2(localDialog->pool, &localDialog->remote.info->tag, dialog->mRemoteTag.c_str());
+ pj_strdup2(localDialog->pool, &localDialog->remote.info->tag, dialog->remoteTag.c_str());
localDialog->remote.tag_hval = pj_hash_calc(0, localDialog->remote.info->tag.ptr,
(unsigned int) localDialog->remote.info->tag.slen);
}
@@ -373,46 +373,46 @@ public:
pjsip_dlg_add_usage(localDialog, &mManager->getSessionModule()->getModule(), (void *)dlg_mod_info);
}
- if (invitesession->mCurrentState == InviteSessionStateNull)
+ if (invitesession->currentState == InviteSessionStateNull)
{
localInviteSession->state = PJSIP_INV_STATE_NULL;
}
- else if (invitesession->mCurrentState == InviteSessionStateCalling)
+ else if (invitesession->currentState == InviteSessionStateCalling)
{
localInviteSession->state = PJSIP_INV_STATE_CALLING;
}
- else if (invitesession->mCurrentState == InviteSessionStateIncoming)
+ else if (invitesession->currentState == InviteSessionStateIncoming)
{
localInviteSession->state = PJSIP_INV_STATE_INCOMING;
}
- else if (invitesession->mCurrentState == InviteSessionStateEarly)
+ else if (invitesession->currentState == InviteSessionStateEarly)
{
localInviteSession->state = PJSIP_INV_STATE_EARLY;
}
- else if (invitesession->mCurrentState == InviteSessionStateConnecting)
+ else if (invitesession->currentState == InviteSessionStateConnecting)
{
localInviteSession->state = PJSIP_INV_STATE_CONNECTING;
}
- else if (invitesession->mCurrentState == InviteSessionStateConfirmed)
+ else if (invitesession->currentState == InviteSessionStateConfirmed)
{
localInviteSession->state = PJSIP_INV_STATE_CONFIRMED;
}
- else if (invitesession->mCurrentState == InviteSessionStateDisconnected)
+ else if (invitesession->currentState == InviteSessionStateDisconnected)
{
localInviteSession->state = PJSIP_INV_STATE_DISCONNECTED;
}
- localInviteSession->cancelling = (invitesession->mCancelling == true) ? PJ_TRUE : PJ_FALSE;
- localInviteSession->pending_cancel = (invitesession->mPendingCancel == true) ? PJ_TRUE : PJ_FALSE;
- localInviteSession->cause = (pjsip_status_code) invitesession->mCause;
+ localInviteSession->cancelling = (invitesession->cancelling == true) ? PJ_TRUE : PJ_FALSE;
+ localInviteSession->pending_cancel = (invitesession->pendingCancel == true) ? PJ_TRUE : PJ_FALSE;
+ localInviteSession->cause = (pjsip_status_code) invitesession->cause;
- if (!invitesession->mCauseText.empty())
+ if (!invitesession->causeText.empty())
{
- pj_strdup2(localInviteSession->pool, &localInviteSession->cause_text, invitesession->mCauseText.c_str());
+ pj_strdup2(localInviteSession->pool, &localInviteSession->cause_text, invitesession->causeText.c_str());
}
- localInviteSession->notify = (invitesession->mNotify == true) ? PJ_TRUE : PJ_FALSE;
- localInviteSession->last_ack_cseq = invitesession->mLastAckCseq;
+ localInviteSession->notify = (invitesession->notify == true) ? PJ_TRUE : PJ_FALSE;
+ localInviteSession->last_ack_cseq = invitesession->lastAckCseq;
}
else if ((transaction = SipTransactionStateItemPtr::dynamicCast((*item))))
{
-----------------------------------------------------------------------
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list