[asterisk-commits] branch 1.2 r25015 - /branches/1.2/channels/chan_h323.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri May  5 15:49:53 2006
New Revision: 25015

URL: http://svn.digium.com/view/asterisk?rev=25015&view=rev
Log:
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.

Modified:
    branches/1.2/channels/chan_h323.c

Modified: branches/1.2/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_h323.c?rev=25015&r1=25014&r2=25015&view=diff
==============================================================================
--- branches/1.2/channels/chan_h323.c (original)
+++ branches/1.2/channels/chan_h323.c Fri May  5 15:49:53 2006
@@ -1233,7 +1233,6 @@
   */
 void connection_made(unsigned call_reference, const char *token)
 {
-	struct ast_channel *c = NULL;
 	struct oh323_pvt *pvt;
 
 	if (h323debug)
@@ -1435,7 +1434,6 @@
   */
 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 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 @@
 	.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()