]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
you use this patch if you're using opal SVN tree...otherwise you use stable ptlib...
authorBrian West <brian@freeswitch.org>
Fri, 26 Jun 2009 19:27:21 +0000 (19:27 +0000)
committerBrian West <brian@freeswitch.org>
Fri, 26 Jun 2009 19:27:21 +0000 (19:27 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13984 d0543943-73ff-0310-b7d9-9358b9ac24b2

patches/MODOPAL-10-svn.diff [new file with mode: 0644]

diff --git a/patches/MODOPAL-10-svn.diff b/patches/MODOPAL-10-svn.diff
new file mode 100644 (file)
index 0000000..6849877
--- /dev/null
@@ -0,0 +1,60 @@
+Index: src/mod/endpoints/mod_opal/mod_opal.cpp\r
+===================================================================\r
+--- src/mod/endpoints/mod_opal/mod_opal.cpp    (revision 13502)\r
++++ src/mod/endpoints/mod_opal/mod_opal.cpp    (working copy)\r
+@@ -509,7 +509,7 @@\r
+ }\r
\r
\r
+-OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData)\r
++OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void * userData, unsigned options, OpalConnection::StringOptions * stringOptions)\r
+ {\r
+     FSManager & mgr = (FSManager &) GetManager();\r
+     switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(), \r
+@@ -524,7 +524,7 @@\r
+         return NULL;\r
+     }\r
\r
+-    return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel);\r
++    return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel, options, stringOptions);\r
+ }\r
\r
\r
+@@ -557,8 +557,8 @@\r
+ ///////////////////////////////////////////////////////////////////////\r
\r
\r
+-FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel)\r
+-  : OpalLocalConnection(call, endpoint, NULL)\r
++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)\r
++  : OpalLocalConnection(call, endpoint, NULL, options, stringOptions)\r
+   , m_endpoint(endpoint)\r
+   , m_fsSession(fsSession)\r
+   , m_fsChannel(fsChannel)\r
+Index: src/mod/endpoints/mod_opal/mod_opal.h\r
+===================================================================\r
+--- src/mod/endpoints/mod_opal/mod_opal.h      (revision 13502)\r
++++ src/mod/endpoints/mod_opal/mod_opal.h      (working copy)\r
+@@ -148,7 +148,10 @@\r
+     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 @@\r
+                  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();