[Asterisk-cvs] asterisk/channels/h323 ast_h323.cpp,1.24,1.25 chan_h323.h,1.10,1.11

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels/h323
In directory mongoose.digium.com:/tmp/cvs-serv31148

Modified Files:
	ast_h323.cpp chan_h323.h 
Log Message:
rollback transfer support...not properly implemented


Index: ast_h323.cpp
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ast_h323.cpp	6 Sep 2003 20:28:51 -0000	1.24
+++ ast_h323.cpp	22 Sep 2003 06:21:03 -0000	1.25
@@ -407,49 +407,6 @@
 	return new MyH323Connection(*this, callReference, options);
 }
 
-H323Connection * MyH323EndPoint::SetupTransfer(const PString & token,
- 											   const PString & callIdentity,
- 											   const PString & remoteParty,
- 											   PString & newToken,
-											   void * userData)
-{
- 	PString alias;
- 	H323TransportAddress address;
- 	
- 	H323Connection * connection; 
- 
- 	if (h323debug) {
- 		cout << " -- Setup transfer of  " << callIdentity << ":" << endl;
- 		cout << "	-- Call from    " << token << endl;
- 		cout << "	-- Remote Party " << remoteParty << endl;
- 	}
- 
- 	connection = FindConnectionWithLock(token);
- 
- 	if (connection != NULL) {
- 		unsigned int old_call_reference = connection->GetCallReference();
- 
- 		if (h323debug)
- 			cout << " -- Old call reference " << old_call_reference << endl;
- 		connection->Unlock();
- 
- 		if (on_transfer_call(old_call_reference, remoteParty)) {
- 			if (h323debug)
- 				cout << "	-- Transfer succeded " << endl;
- 			if (connection->ClearCall(H323Connection::EndedByCallForwarded))
- 					return NULL;
- 			return NULL;
- 		}
- 	}
- 	if (h323debug)
- 		cout << "	-- Transfer failed " << endl;
- 
- 	if (connection != NULL) {
- 		return connection;
- 	}
- 	return NULL;
-}
-
 /* MyH323Connection */    
 MyH323Connection::MyH323Connection(MyH323EndPoint & ep,
 										   unsigned callReference,
@@ -796,7 +753,6 @@
 /** Installs the callback functions on behalf of the PBX application  */
 void h323_callback_register(setup_incoming_cb  ifunc,
 							setup_outbound_cb  sfunc,
-							setup_transfer_cb  tfunc,
 							on_connection_cb   confunc,
 							start_logchan_cb   lfunc,
  							clear_con_cb	   clfunc,
@@ -804,8 +760,7 @@
  							send_digit_cb	   dfunc)
 {
 	on_incoming_call = ifunc;
-	on_outgoing_call = sfunc;
-	on_transfer_call = tfunc;
+	on_outgoing_call = sfunc;
 	on_create_connection = confunc;
 	on_start_logical_channel = lfunc;
 	on_connection_cleared = clfunc;

Index: chan_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/chan_h323.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- chan_h323.h	6 Sep 2003 20:28:51 -0000	1.10
+++ chan_h323.h	22 Sep 2003 06:21:03 -0000	1.11
@@ -131,11 +131,6 @@
 typedef int (*setup_outbound_cb)(call_details_t);
 setup_outbound_cb	on_outgoing_call; 
 
-/* This is a callback prototype function, called upon
-    a transfer. */
-typedef int (*setup_transfer_cb)(unsigned int, const char *);
-setup_transfer_cb	on_transfer_call;
-
 /* This is a callback prototype function, called when the openh323 
    OnStartLogicalChannel is invoked. */
 typedef void (*start_logchan_cb)(unsigned int, const char *, int);
@@ -171,7 +166,6 @@
 	/* callback function handler*/
 	void h323_callback_register(setup_incoming_cb,
  								setup_outbound_cb,
- 								setup_transfer_cb,
  								on_connection_cb,
  								start_logchan_cb,
  								clear_con_cb,