kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

follow same naming scheme as other simular functions

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeremy McNamara
2003-12-18 19:54:18 +00:00
parent 83c63206c1
commit 9e996ceef8
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
channels/h323/ast_h323.cpp
View File

@@ -778,7 +778,7 @@ BOOL MyGatekeeperServer::Initialise()
*/ */
extern "C" { extern "C" {
int end_point_exist(void) int h323_end_point_exist(void)
{ {
if (!endPoint) { if (!endPoint) {
return 0; return 0;
@@ -795,7 +795,7 @@ void h323_end_point_create(void)
void h323_gk_urq(void) 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; cout << " ERROR: [h323_gk_urq] No Endpoint, this is bad" << endl;
return; return;
} }
@@ -843,7 +843,7 @@ int h323_set_capability(int cap, int dtmfMode)
int gsmFrames = 4; int gsmFrames = 4;
if (!end_point_exist()) { if (!h323_end_point_exist()) {
cout << " ERROR: [h323_set_capablity] No Endpoint, this is bad" << endl; cout << " ERROR: [h323_set_capablity] No Endpoint, this is bad" << endl;
return 1; return 1;
} }
@@ -910,7 +910,7 @@ int h323_set_capability(int cap, int dtmfMode)
int h323_start_listener(int listenPort, struct sockaddr_in bindaddr) 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; cout << "ERROR: [h323_start_listener] No Endpoint, this is bad!" << endl;
return 1; return 1;
} }
@@ -943,7 +943,7 @@ int h323_set_alias(struct oh323_alias *alias)
PString h323id(alias->name); PString h323id(alias->name);
PString e164(alias->e164); PString e164(alias->e164);
if (!end_point_exist()) { if (!h323_end_point_exist()) {
cout << "ERROR: [h323_set_alias] No Endpoint, this is bad!" << endl; cout << "ERROR: [h323_set_alias] No Endpoint, this is bad!" << endl;
return 1; return 1;
} }
@@ -992,7 +992,7 @@ int h323_set_gk(int gatekeeper_discover, char *gatekeeper, char *secret)
PString gkName = PString(gatekeeper); PString gkName = PString(gatekeeper);
PString pass = PString(secret); PString pass = PString(secret);
if (!end_point_exist()) { if (!h323_end_point_exist()) {
cout << "ERROR: [h323_set_gk] No Endpoint, this is bad!" << endl; cout << "ERROR: [h323_set_gk] No Endpoint, this is bad!" << endl;
return 1; return 1;
} }
@@ -1043,7 +1043,7 @@ int h323_set_gk(int gatekeeper_discover, char *gatekeeper, char *secret)
*/ */
void h323_send_tone(const char *call_token, char tone) 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; cout << "ERROR: [h323_send_tone] No Endpoint, this is bad!" << endl;
return; return;
} }
@@ -1059,7 +1059,7 @@ int h323_make_call(char *host, call_details_t *cd, call_options_t call_options)
int res; int res;
PString token; PString token;
if (!end_point_exist()) { if (!h323_end_point_exist()) {
return 1; return 1;
} }
@@ -1073,7 +1073,7 @@ int h323_make_call(char *host, call_details_t *cd, call_options_t call_options)
int h323_clear_call(const char *call_token) int h323_clear_call(const char *call_token)
{ {
if (!end_point_exist()) { if (!h323_end_point_exist()) {
return 1; return 1;
} }
@@ -1124,11 +1124,6 @@ void h323_native_bridge(const char *token, char *them, char *capability)
{ {
H323Channel *channel; H323Channel *channel;
MyH323Connection *connection = (MyH323Connection *)endPoint->FindConnectionWithLock(token); MyH323Connection *connection = (MyH323Connection *)endPoint->FindConnectionWithLock(token);
PString mode(capability);
if (!mode) {
return;
}
if (!connection){ if (!connection){
cout << "ERROR: No connection found, this is bad\n"; cout << "ERROR: No connection found, this is bad\n";
@@ -1140,7 +1135,7 @@ void h323_native_bridge(const char *token, char *them, char *capability)
channel = connection->FindChannel(connection->sessionId, TRUE); channel = connection->FindChannel(connection->sessionId, TRUE);
connection->bridging = TRUE; connection->bridging = TRUE;
connection->CloseLogicalChannelNumber(channel->GetNumber()); connection->CloseLogicalChannelNumber(channel->GetNumber());
connection->RequestModeChange(mode);
connection->Unlock(); connection->Unlock();
return; return;

2
channels/h323/chan_h323.h
View File

@@ -159,7 +159,7 @@ extern "C" {
void h323_gk_urq(void); void h323_gk_urq(void);
void h323_end_point_create(void); void h323_end_point_create(void);
void h323_end_process(void); void h323_end_process(void);
int end_point_exist(void); int h323_end_point_exist(void);
void h323_debug(int, unsigned); void h323_debug(int, unsigned);