clean up warnings, and re-add a return, how did that get removed?
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3491 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
bb75fcc4db
commit
0afbb8bcbf
|
@ -1251,9 +1251,10 @@ void connection_made(unsigned call_reference)
|
|||
|
||||
p = find_call(call_reference);
|
||||
|
||||
if (!p)
|
||||
if (!p) {
|
||||
ast_log(LOG_ERROR, "Something is wrong: connection\n");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (!p->owner) {
|
||||
ast_log(LOG_ERROR, "Channel has no owner\n");
|
||||
|
@ -1295,25 +1296,25 @@ void chan_ringing(unsigned call_reference)
|
|||
void cleanup_call_details(call_details_t cd)
|
||||
{
|
||||
if (cd.call_token) {
|
||||
free((const char*)cd.call_token);
|
||||
free(cd.call_token);
|
||||
}
|
||||
if (cd.call_source_aliases) {
|
||||
free((const char*)cd.call_source_aliases);
|
||||
free(cd.call_source_aliases);
|
||||
}
|
||||
if (cd.call_dest_alias) {
|
||||
free((const char*)cd.call_dest_alias);
|
||||
free(cd.call_dest_alias);
|
||||
}
|
||||
if (cd.call_source_name) {
|
||||
free((const char*)cd.call_source_name);
|
||||
free(cd.call_source_name);
|
||||
}
|
||||
if (cd.call_source_e164) {
|
||||
free((const char*)cd.call_source_e164);
|
||||
free(cd.call_source_e164);
|
||||
}
|
||||
if (cd.call_dest_e164) {
|
||||
free((const char*)cd.call_dest_e164);
|
||||
free(cd.call_dest_e164);
|
||||
}
|
||||
if (cd.sourceIp) {
|
||||
free((const char*)cd.sourceIp);
|
||||
free(cd.sourceIp);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1211,7 +1211,7 @@ int h323_soft_hangup(const char *data)
|
|||
}
|
||||
|
||||
/* alas, this doesn't work :( */
|
||||
void h323_native_bridge(const char *token, char *them, char *capability)
|
||||
void h323_native_bridge(const char *token, const char *them, char *capability)
|
||||
{
|
||||
H323Channel *channel;
|
||||
MyH323Connection *connection = (MyH323Connection *)endPoint->FindConnectionWithLock(token);
|
||||
|
|
|
@ -108,7 +108,7 @@ typedef struct call_details {
|
|||
} call_details_t;
|
||||
|
||||
typedef struct rtp_info {
|
||||
char *addr;
|
||||
const char *addr;
|
||||
unsigned int port;
|
||||
} rtp_info_t;
|
||||
|
||||
|
@ -194,7 +194,7 @@ extern "C" {
|
|||
/* H323 listener related funcions */
|
||||
int h323_start_listener(int, struct sockaddr_in);
|
||||
|
||||
void h323_native_bridge(const char *, char *, char *);
|
||||
void h323_native_bridge(const char *, const char *, char *);
|
||||
|
||||
/* Send a DTMF tone to remote endpoint */
|
||||
void h323_send_tone(const char *call_token, char tone);
|
||||
|
|
Loading…
Reference in New Issue