提交 5e47bafd authored 作者: Brian West's avatar Brian West

update modopal-10 patch

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14489 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 2dae4c4c
Index: src/mod/endpoints/mod_opal/mod_opal.cpp
===================================================================
--- src/mod/endpoints/mod_opal/mod_opal.cpp (revision 13502)
+++ src/mod/endpoints/mod_opal/mod_opal.cpp (working copy)
@@ -509,7 +509,7 @@
Index: src/mod/endpoints/mod_opal/mod_opal.h
===================================================================
--- src/mod/endpoints/mod_opal/mod_opal.h (revision 14477)
+++ src/mod/endpoints/mod_opal/mod_opal.h (working copy)
@@ -148,7 +148,10 @@
FSEndPoint(FSManager & manager);
virtual bool OnIncomingCall(OpalLocalConnection &);
- virtual OpalLocalConnection *CreateConnection(OpalCall &, void *);
+ virtual OpalLocalConnection *CreateConnection(OpalCall & call,
+ void * userData,
+ unsigned options,
+ OpalConnection::StringOptions * stringOptions);
};
@@ -181,7 +184,9 @@
FSEndPoint & endpoint,
switch_caller_profile_t *outbound_profile,
switch_core_session_t *fsSession,
- switch_channel_t *fsChannel);
+ switch_channel_t *fsChannel,
+ unsigned options,
+ OpalConnection::StringOptions * stringOptions);
virtual bool OnIncoming();
virtual void OnReleased();
Index: src/mod/endpoints/mod_opal/mod_opal.cpp
===================================================================
--- src/mod/endpoints/mod_opal/mod_opal.cpp (revision 14477)
+++ src/mod/endpoints/mod_opal/mod_opal.cpp (working copy)
@@ -509,7 +509,7 @@
}
......@@ -11,7 +38,7 @@ Index: src/mod/endpoints/mod_opal/mod_opal.cpp
{
FSManager & mgr = (FSManager &) GetManager();
switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(),
@@ -524,7 +524,7 @@
@@ -524,7 +524,7 @@
return NULL;
}
......@@ -20,7 +47,7 @@ Index: src/mod/endpoints/mod_opal/mod_opal.cpp
}
@@ -557,8 +557,8 @@
@@ -557,8 +557,8 @@
///////////////////////////////////////////////////////////////////////
......@@ -31,30 +58,3 @@ Index: src/mod/endpoints/mod_opal/mod_opal.cpp
, m_endpoint(endpoint)
, m_fsSession(fsSession)
, m_fsChannel(fsChannel)
Index: src/mod/endpoints/mod_opal/mod_opal.h
===================================================================
--- src/mod/endpoints/mod_opal/mod_opal.h (revision 13502)
+++ src/mod/endpoints/mod_opal/mod_opal.h (working copy)
@@ -148,7 +148,10 @@
FSEndPoint(FSManager & manager);
virtual bool OnIncomingCall(OpalLocalConnection &);
- virtual OpalLocalConnection *CreateConnection(OpalCall &, void *);
+ virtual OpalLocalConnection *CreateConnection(OpalCall & call,
+ void * userData,
+ unsigned options,
+ OpalConnection::StringOptions * stringOptions);
};
@@ -181,7 +184,9 @@
FSEndPoint & endpoint,
switch_caller_profile_t *outbound_profile,
switch_core_session_t *fsSession,
- switch_channel_t *fsChannel);
+ switch_channel_t *fsChannel,
+ unsigned options,
+ OpalConnection::StringOptions * stringOptions);
virtual bool OnIncoming();
virtual void OnReleased();
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论