automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41734 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 10 insertions, 4 deletions

diff --git a/rtp.c b/rtp.c
index 7de9727e9..376bd93ce 100644
--- a/rtp.c
+++ b/rtp.c
@@ -1045,11 +1045,17 @@ void ast_rtp_set_peer(struct ast_rtp *rtp, struct sockaddr_in *them)
 	rtp->rxseqno = 0;
 }
 
-void ast_rtp_get_peer(struct ast_rtp *rtp, struct sockaddr_in *them)
+int ast_rtp_get_peer(struct ast_rtp *rtp, struct sockaddr_in *them)
 {
-	them->sin_family = AF_INET;
-	them->sin_port = rtp->them.sin_port;
-	them->sin_addr = rtp->them.sin_addr;
+	if ((them->sin_family != AF_INET) ||
+	    (them->sin_port != rtp->them.sin_port) ||
+	    (them->sin_addr.s_addr != rtp->them.sin_addr.s_addr)) {
+		them->sin_family = AF_INET;
+		them->sin_port = rtp->them.sin_port;
+		them->sin_addr = rtp->them.sin_addr;
+		return 1;
+	}
+	return 0;
 }
 
 void ast_rtp_get_us(struct ast_rtp *rtp, struct sockaddr_in *us)