kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

update modopal-10 patch

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14489 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-08-11 15:14:34 +00:00
parent 2dae4c4cef
commit 5e47bafdac
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
patches/MODOPAL-10-svn.diff
View File

@ -1,41 +1,8 @@
Index: src/mod/endpoints/mod_opal/mod_opal.cpp Index: src/mod/endpoints/mod_opal/mod_opal.h
=================================================================== ===================================================================
--- src/mod/endpoints/mod_opal/mod_opal.cpp (revision 13502) --- src/mod/endpoints/mod_opal/mod_opal.h (revision 14477)
+++ src/mod/endpoints/mod_opal/mod_opal.cpp (working copy) +++ src/mod/endpoints/mod_opal/mod_opal.h (working copy)
@@ -509,7 +509,7 @@ @@ -148,7 +148,10 @@
}
-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 @@
FSEndPoint(FSManager & manager); FSEndPoint(FSManager & manager);
virtual bool OnIncomingCall(OpalLocalConnection &); 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, FSEndPoint & endpoint,
switch_caller_profile_t *outbound_profile, switch_caller_profile_t *outbound_profile,
switch_core_session_t *fsSession, switch_core_session_t *fsSession,
@ -58,3 +25,36 @@ Index: src/mod/endpoints/mod_opal/mod_opal.h
virtual bool OnIncoming(); virtual bool OnIncoming();
virtual void OnReleased(); 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)