[Asterisk-cvs] asterisk/channels/h323 ast_h323.cpp, 1.64, 1.65 ast_h323.h, 1.28, 1.29 chan_h323.h, 1.32, 1.33

[jeremy at lists.digium.com]

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

Modified Files:
	ast_h323.cpp ast_h323.h chan_h323.h 
Log Message:
A [possibly] better solution to the CalledPartyAddress problem. Test and report please

Index: ast_h323.cpp
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- ast_h323.cpp	23 Oct 2004 02:43:41 -0000	1.64
+++ ast_h323.cpp	11 Nov 2004 21:30:30 -0000	1.65
@@ -213,7 +213,7 @@
   *					transport = ip.
   *					port = 1720.
   */
-int MyH323EndPoint::MakeCall(const PString & dest, PString & token, unsigned int *callReference, unsigned int port, char *cid_name, char *cid_num)
+int MyH323EndPoint::MakeCall(const PString & dest, PString & token, unsigned int *callReference, char *cid_name, char *cid_num)
 {
 	PString fullAddress;
 	MyH323Connection * connection;
@@ -227,7 +227,7 @@
 	} else {
 		fullAddress = dest; 
 		if (h323debug) {
-			cout << " -- Making call to " << fullAddress << "." << endl;
+			cout << " -- Making call to " << fullAddress << " without gatekeeper." << endl;
 		}
 	}
 	if (!(connection = (MyH323Connection *)H323EndPoint::MakeCallLocked(fullAddress, token))) {
@@ -1086,16 +1086,17 @@
 
 /** Make a call to the remote endpoint.
   */
-int h323_make_call(char *host, call_details_t *cd, call_options_t call_options)
+int h323_make_call(char *dest, call_details_t *cd, call_options_t call_options)
 {
 	int res;
 	PString	token;
-	PString dest(host);
+	PString	host(dest);
 
 	if (!h323_end_point_exist()) {
 		return 1;
 	}
-	res = endPoint->MakeCall(dest, token, &cd->call_reference, call_options.port, call_options.cid_num, call_options.cid_name);
+
+	res = endPoint->MakeCall(host, token, &cd->call_reference, call_options.cid_name, call_options.cid_num);
 	memcpy((char *)(cd->call_token), (const unsigned char *)token, token.GetLength());
 	return res;
 };

Index: ast_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ast_h323.h	23 Oct 2004 02:43:41 -0000	1.28
+++ ast_h323.h	11 Nov 2004 21:30:30 -0000	1.29
@@ -128,7 +128,7 @@
 	PCLASSINFO(MyH323EndPoint, H323EndPoint);
 
 	public:
-	int MakeCall(const PString &, PString &, unsigned int *, unsigned int, char *, char *);
+	int MakeCall(const PString &, PString &, unsigned int *, char *, char *);
 	BOOL ClearCall(const PString &);
 
 	void OnClosedLogicalChannel(H323Connection &, const H323Channel &);

Index: chan_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/chan_h323.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- chan_h323.h	23 Oct 2004 02:43:41 -0000	1.32
+++ chan_h323.h	11 Nov 2004 21:30:30 -0000	1.33
@@ -196,7 +196,7 @@
 	void h323_send_tone(const char *call_token, char tone);
 
 	/* H323 create and destroy sessions */
-	int h323_make_call(char *host, call_details_t *cd, call_options_t);
+	int h323_make_call(char* dest, call_details_t *cd, call_options_t);
 	int h323_clear_call(const char *);
 	
 	/* H.323 alerting and progress */