[Asterisk-cvs] asterisk/channels/h323 ast_h323.cpp,1.26,1.27 chan_h323.h,1.11,1.12

[jeremy at lists.digium.com]

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

Modified Files:
	ast_h323.cpp chan_h323.h 
Log Message:
follow same naming scheme as other simular functions


Index: ast_h323.cpp
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ast_h323.cpp	19 Nov 2003 22:46:21 -0000	1.26
+++ ast_h323.cpp	18 Dec 2003 19:54:18 -0000	1.27
@@ -778,7 +778,7 @@
  */
 extern "C" {
 
-int end_point_exist(void)
+int h323_end_point_exist(void)
 {
 	if (!endPoint) {
 		return 0;
@@ -795,7 +795,7 @@
 
 void h323_gk_urq(void)
 {
-	if (!end_point_exist()) {
+	if (!h323_end_point_exist()) {
 		cout << " ERROR: [h323_gk_urq] No Endpoint, this is bad" << endl;
 		return;
 	}
@@ -843,7 +843,7 @@
     int gsmFrames  = 4;
 
 	
-	if (!end_point_exist()) {
+	if (!h323_end_point_exist()) {
 		cout << " ERROR: [h323_set_capablity] No Endpoint, this is bad" << endl;
 		return 1;
 	}
@@ -910,7 +910,7 @@
 int h323_start_listener(int listenPort, struct sockaddr_in bindaddr)
 {
 	
-	if (!end_point_exist()) {
+	if (!h323_end_point_exist()) {
 		cout << "ERROR: [h323_start_listener] No Endpoint, this is bad!" << endl;
 		return 1;
 	}
@@ -943,7 +943,7 @@
 	PString h323id(alias->name);
 	PString e164(alias->e164);
 	
-	if (!end_point_exist()) {
+	if (!h323_end_point_exist()) {
 		cout << "ERROR: [h323_set_alias] No Endpoint, this is bad!" << endl;
 		return 1;
 	}
@@ -992,7 +992,7 @@
 	PString gkName = PString(gatekeeper);
 	PString pass   = PString(secret);
 
-	if (!end_point_exist()) {
+	if (!h323_end_point_exist()) {
 		cout << "ERROR: [h323_set_gk] No Endpoint, this is bad!" << endl;
 		return 1;
 	}
@@ -1043,7 +1043,7 @@
   */
 void h323_send_tone(const char *call_token, char tone)
 {
-	if (!end_point_exist()) {
+	if (!h323_end_point_exist()) {
 		cout << "ERROR: [h323_send_tone] No Endpoint, this is bad!" << endl;
 		return;
 	}
@@ -1059,7 +1059,7 @@
 	int res;
 	PString	token;
 
-	if (!end_point_exist()) {
+	if (!h323_end_point_exist()) {
 		return 1;
 	}
 	
@@ -1073,7 +1073,7 @@
 
 int h323_clear_call(const char *call_token)
 {
-	if (!end_point_exist()) {
+	if (!h323_end_point_exist()) {
 		return 1;
 	}
 
@@ -1124,12 +1124,7 @@
 {
 	H323Channel *channel;
 	MyH323Connection *connection = (MyH323Connection *)endPoint->FindConnectionWithLock(token);
-	PString mode(capability);
 	
-	if (!mode) {
-		return;
-	}
-
 	if (!connection){
 		cout << "ERROR: No connection found, this is bad\n";
 		return;
@@ -1140,7 +1135,7 @@
 	channel = connection->FindChannel(connection->sessionId, TRUE);
 	connection->bridging = TRUE;
 	connection->CloseLogicalChannelNumber(channel->GetNumber());
-	connection->RequestModeChange(mode);	
+	
 	connection->Unlock();
 	return;
 

Index: chan_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/chan_h323.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- chan_h323.h	22 Sep 2003 06:21:03 -0000	1.11
+++ chan_h323.h	18 Dec 2003 19:54:18 -0000	1.12
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Version Info: $Id$
+ * Version Info: $Id$
  */
 
 #include <arpa/inet.h>
@@ -84,7 +84,7 @@
 /** call_option struct is filled from the 
 	PBX application and passed through make_call 
 	function*/
-typedef struct call_options {
+typedef struct call_options {
 	char		   *callerid;
 	int				noFastStart;
 	int				noH245Tunnelling;
@@ -97,7 +97,7 @@
 	asterisk channels to acutal h.323 connections */
 typedef struct call_details {	
 	unsigned int call_reference;
-
+
 	const char *call_token;				
 	const char *call_source_aliases;
 	const char *call_dest_alias;
@@ -105,11 +105,11 @@
 	const char *call_dest_e164;
 	const char *sourceIp;
 } call_details_t;
-
-typedef struct rtp_info {
-	char *addr;
-	unsigned int port;
-} rtp_info_t;
+
+typedef struct rtp_info {
+	char *addr;
+	unsigned int port;
+} rtp_info_t;
 
 /* This is a callback prototype function, called pass
    DTMF down the RTP. */
@@ -130,7 +130,7 @@
    an outbound call. */
 typedef int (*setup_outbound_cb)(call_details_t);
 setup_outbound_cb	on_outgoing_call; 
-
+
 /* This is a callback prototype function, called when the openh323 
    OnStartLogicalChannel is invoked. */
 typedef void (*start_logchan_cb)(unsigned int, const char *, int);
@@ -159,19 +159,19 @@
 	void h323_gk_urq(void);
 	void h323_end_point_create(void);
 	void h323_end_process(void);
-	int end_point_exist(void);
+	int  h323_end_point_exist(void);
     
 	void h323_debug(int, unsigned);
 
 	/* callback function handler*/
-	void h323_callback_register(setup_incoming_cb,
- 								setup_outbound_cb,
- 								on_connection_cb,
- 								start_logchan_cb,
- 								clear_con_cb,
- 								con_established_cb,
- 								send_digit_cb);
-
+	void h323_callback_register(setup_incoming_cb,
+ 								setup_outbound_cb,
+ 								on_connection_cb,
+ 								start_logchan_cb,
+ 								clear_con_cb,
+ 								con_established_cb,
+ 								send_digit_cb);
+
 
 	int h323_set_capability(int, int);
 	int h323_set_alias(struct oh323_alias *);
@@ -181,7 +181,7 @@
 
 	/* H323 listener related funcions */
 	int h323_start_listener(int, struct sockaddr_in);
-
+
 	void h323_native_bridge(const char *, char *, char *);
 
 	/* Send a DTMF tone to remote endpoint */