diff options
author | Jeremy McNamara <jj@nufone.net> | 2004-11-11 21:30:30 +0000 |
---|---|---|
committer | Jeremy McNamara <jj@nufone.net> | 2004-11-11 21:30:30 +0000 |
commit | 0543c5801814df985d9fa585b6bb0f7a1a877f11 (patch) | |
tree | 8c7caf0783855d49f971414b18a6a8381cd23894 /channels/h323 | |
parent | c5c331ab151d9a301d8a61d56e33607175e945ee (diff) |
A [possibly] better solution to the CalledPartyAddress problem. Test and report please
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4214 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/h323')
-rwxr-xr-x | channels/h323/ast_h323.cpp | 11 | ||||
-rwxr-xr-x | channels/h323/ast_h323.h | 2 | ||||
-rwxr-xr-x | channels/h323/chan_h323.h | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp index 6af7b0d6e..6abfff932 100755 --- a/channels/h323/ast_h323.cpp +++ b/channels/h323/ast_h323.cpp @@ -213,7 +213,7 @@ H323Codec * AST_G729ACapability::CreateCodec(H323Codec::Direction direction) con * 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 @@ int MyH323EndPoint::MakeCall(const PString & dest, PString & token, unsigned int } 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 @@ void h323_send_tone(const char *call_token, char tone) /** 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; }; diff --git a/channels/h323/ast_h323.h b/channels/h323/ast_h323.h index 564d9422b..f9a454b6f 100755 --- a/channels/h323/ast_h323.h +++ b/channels/h323/ast_h323.h @@ -128,7 +128,7 @@ class MyH323EndPoint : public H323EndPoint { 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 &); diff --git a/channels/h323/chan_h323.h b/channels/h323/chan_h323.h index 2ea6efcd5..1f84610db 100755 --- a/channels/h323/chan_h323.h +++ b/channels/h323/chan_h323.h @@ -196,7 +196,7 @@ extern "C" { 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 */ |