aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_h323.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-05 20:49:53 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-05 20:49:53 +0000
commitc6e9f5e9a1b3e8b3bf71ec43dda68a89c0e643ff (patch)
tree40959b595141f7ed73a7d9bc3b52dbee52567524 /channels/chan_h323.c
parent2d88bea805bc1241db31feeeb4656b125733fd0d (diff)
update chan_h323 to reflect the new prototype for rtp_set_peer (issue #6560, casper)
This was fixed a couple months ago in the trunk, but never in 1.2. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@25015 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_h323.c')
-rw-r--r--channels/chan_h323.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 469ce398e..ee0bdbd1d 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -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()