提交 59b3cdc2 authored 作者: Robert Joly's avatar Robert Joly

Applied patch to fix some race conditions on call termination, thanks Peter Olsson

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13014 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 d5bf92f1
...@@ -177,7 +177,11 @@ class FSConnection:public OpalLocalConnection { ...@@ -177,7 +177,11 @@ class FSConnection:public OpalLocalConnection {
PCLASSINFO(FSConnection, OpalLocalConnection) PCLASSINFO(FSConnection, OpalLocalConnection)
public: public:
FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile); FSConnection(OpalCall & call,
FSEndPoint & endpoint,
switch_caller_profile_t *outbound_profile,
switch_core_session_t *fsSession,
switch_channel_t *fsChannel);
virtual bool OnIncoming(); virtual bool OnIncoming();
virtual void OnReleased(); virtual void OnReleased();
...@@ -194,7 +198,6 @@ class FSConnection:public OpalLocalConnection { ...@@ -194,7 +198,6 @@ class FSConnection:public OpalLocalConnection {
DECLARE_CALLBACK0(on_init); DECLARE_CALLBACK0(on_init);
DECLARE_CALLBACK0(on_routing); DECLARE_CALLBACK0(on_routing);
DECLARE_CALLBACK0(on_execute); DECLARE_CALLBACK0(on_execute);
//DECLARE_CALLBACK0(on_hangup);
DECLARE_CALLBACK0(on_exchange_media); DECLARE_CALLBACK0(on_exchange_media);
DECLARE_CALLBACK0(on_soft_execute); DECLARE_CALLBACK0(on_soft_execute);
...@@ -251,6 +254,8 @@ class FSMediaStream:public OpalMediaStream { ...@@ -251,6 +254,8 @@ class FSMediaStream:public OpalMediaStream {
RTP_DataFrame m_readRTP; RTP_DataFrame m_readRTP;
bool m_callOnStart; bool m_callOnStart;
uint32_t m_timeStamp; uint32_t m_timeStamp;
bool CheckPatchAndLock();
}; };
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论