[svn-commits] simon.perreault: branch group/v6 r84402 - /team/group/v6/trunk/channels/

[SVN commits to the Digium repositories]

Author: simon.perreault
Date: Tue Oct  2 10:01:02 2007
New Revision: 84402

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84402
Log:
Make jingle and gtalk channels compile with the IPv6-enabled RTP.

Modified:
    team/group/v6/trunk/channels/chan_gtalk.c
    team/group/v6/trunk/channels/chan_jingle.c

Modified: team/group/v6/trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/channels/chan_gtalk.c?view=diff&rev=84402&r1=84401&r2=84402
==============================================================================
--- team/group/v6/trunk/channels/chan_gtalk.c (original)
+++ team/group/v6/trunk/channels/chan_gtalk.c Tue Oct  2 10:01:02 2007
@@ -746,6 +746,7 @@
 	struct gtalk_candidate *ours1 = NULL, *ours2 = NULL;
 	struct sockaddr_in sin;
 	struct sockaddr_in dest;
+	socklen_t dummy;
 	struct in_addr us;
 	iks *iq, *gtalk, *candidate, *transport;
 	char user[17], pass[17], preference[5], port[7];
@@ -779,7 +780,7 @@
 		goto safeout;
 	}
 
-	ast_rtp_get_us(p->rtp, &sin);
+	ast_rtp_get_us(p->rtp, (struct sockaddr*) &sin, &dummy);
 	ast_find_ourip(&us, bindaddr);
 
 	/* Setup our gtalk candidates */
@@ -912,7 +913,9 @@
 		ast_copy_string(tmp->us, us, sizeof(tmp->us));
 		tmp->initiator = 1;
 	}
-	tmp->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
+	tmp->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0,
+			(struct sockaddr*) &bindaddr.sin_addr,
+			sizeof(bindaddr.sin_addr));
 	tmp->parent = client;
 	if (!tmp->rtp) {
 		ast_log(LOG_WARNING, "Out of RTP sessions?\n");
@@ -1176,6 +1179,7 @@
 	struct ast_hostent ahp;
 	struct sockaddr_in sin;
 	struct sockaddr_in aux;
+	socklen_t dummy;
 
 	if (time(NULL) == p->laststun)
 		return 0;
@@ -1194,7 +1198,7 @@
 			 p->ourcandidates->username);
 		
 		/* Find out the result of the STUN */
-		ast_rtp_get_peer(p->rtp, &aux);
+		ast_rtp_get_peer(p->rtp, (struct sockaddr*) &aux, &dummy);
 
 		/* If the STUN result is different from the IP of the hostname,
 			lock on the stun IP of the hostname advertised by the

Modified: team/group/v6/trunk/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/channels/chan_jingle.c?view=diff&rev=84402&r1=84401&r2=84402
==============================================================================
--- team/group/v6/trunk/channels/chan_jingle.c (original)
+++ team/group/v6/trunk/channels/chan_jingle.c Tue Oct  2 10:01:02 2007
@@ -594,6 +594,7 @@
 	struct jingle_candidate *ours1 = NULL, *ours2 = NULL;
 	struct sockaddr_in sin;
 	struct sockaddr_in dest;
+	socklen_t dummy;
 	struct in_addr us;
 	struct in_addr externaddr;
 	iks *iq, *jingle, *content, *transport, *candidate;
@@ -629,7 +630,7 @@
 		goto safeout;
 	}
 
-	ast_rtp_get_us(p->rtp, &sin);
+	ast_rtp_get_us(p->rtp, (struct sockaddr*) &sin, &dummy);
 	ast_find_ourip(&us, bindaddr);
 
 	/* Setup our first jingle candidate */
@@ -791,7 +792,9 @@
 		ast_copy_string(tmp->from, idroster, sizeof(tmp->from));
 		tmp->initiator = 1;
 	}
-	tmp->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
+	tmp->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0,
+			(struct sockaddr*) &bindaddr.sin_addr,
+			sizeof(bindaddr.sin_addr));
 	tmp->parent = client;
 	if (!tmp->rtp) {
 		ast_log(LOG_WARNING, "Out of RTP sessions?\n");