forked from Mirrors/freeswitch
update modopal-10 patch
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14489 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
2dae4c4cef
commit
5e47bafdac
|
@ -1,41 +1,8 @@
|
|||
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 @@
|
||||
}
|
||||
|
||||
|
||||
-OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData)
|
||||
+OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void * userData, unsigned options, OpalConnection::StringOptions * stringOptions)
|
||||
{
|
||||
FSManager & mgr = (FSManager &) GetManager();
|
||||
switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(),
|
||||
@@ -524,7 +524,7 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel);
|
||||
+ return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel, options, stringOptions);
|
||||
}
|
||||
|
||||
|
||||
@@ -557,8 +557,8 @@
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
-FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel)
|
||||
- : OpalLocalConnection(call, endpoint, NULL)
|
||||
+FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel, unsigned options, OpalConnection::StringOptions * stringOptions)
|
||||
+ : OpalLocalConnection(call, endpoint, NULL, options, stringOptions)
|
||||
, 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 @@
|
||||
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 &);
|
||||
|
@ -47,7 +14,7 @@ Index: src/mod/endpoints/mod_opal/mod_opal.h
|
|||
};
|
||||
|
||||
|
||||
@@ -181,7 +184,9 @@
|
||||
@@ -181,7 +184,9 @@
|
||||
FSEndPoint & endpoint,
|
||||
switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t *fsSession,
|
||||
|
@ -58,3 +25,36 @@ Index: src/mod/endpoints/mod_opal/mod_opal.h
|
|||
|
||||
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 @@
|
||||
}
|
||||
|
||||
|
||||
-OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData)
|
||||
+OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void * userData, unsigned options, OpalConnection::StringOptions * stringOptions)
|
||||
{
|
||||
FSManager & mgr = (FSManager &) GetManager();
|
||||
switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(),
|
||||
@@ -524,7 +524,7 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel);
|
||||
+ return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel, options, stringOptions);
|
||||
}
|
||||
|
||||
|
||||
@@ -557,8 +557,8 @@
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
-FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel)
|
||||
- : OpalLocalConnection(call, endpoint, NULL)
|
||||
+FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel, unsigned options, OpalConnection::StringOptions * stringOptions)
|
||||
+ : OpalLocalConnection(call, endpoint, NULL, options, stringOptions)
|
||||
, m_endpoint(endpoint)
|
||||
, m_fsSession(fsSession)
|
||||
, m_fsChannel(fsChannel)
|
||||
|
|
Loading…
Reference in New Issue