kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@25055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-05 21:07:01 +00:00
parent f923e2c1b8
commit 0d352c2e09
4 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_h323.c
View File

@@ -1233,7 +1233,6 @@ void setup_rtp_connection(unsigned call_reference, const char *remoteIp, int rem
*/
void connection_made(unsigned call_reference, const char *token)
{
struct ast_channel *c = NULL;
struct oh323_pvt *pvt;
if (h323debug)
@@ -1435,7 +1434,6 @@ int setup_outgoing_call(call_details_t *cd)
*/
void chan_ringing(unsigned call_reference, const char *token)
{
struct ast_channel *c = NULL;
struct oh323_pvt *pvt;
if (h323debug)
@@ -2281,7 +2279,7 @@ static char *convertcap(int cap)
}
}
static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs)
static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs, int nat_active)
{
/* XXX Deal with Video */
struct oh323_pvt *pvt;
@@ -2310,7 +2308,7 @@ static struct ast_rtp_protocol oh323_rtp = {
.type = type,
.get_rtp_info = oh323_get_rtp_peer,
.get_vrtp_info = oh323_get_vrtp_peer,
.set_rtp_peer= oh323_set_rtp_peer,
.set_rtp_peer = oh323_set_rtp_peer,
};
int load_module()