From 7673ae15a4039a04951fee7cf525be382d123ec3 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 6 Feb 2013 16:22:29 -0500
Subject: [PATCH] fix merge errors

---
 daemon/call.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/call.c b/daemon/call.c
index bd69e4565..3ad76d3d4 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -1312,8 +1312,8 @@ got_cs:
 			DBG("case 1");
 			/* ... unless we (un)silenced the stream, in which case
 			   we need to copy the new information */
-			if (!IN6_ARE_ADDR_EQUAL(&matched_relay->peer_advertised.ip46, &t->stream.ip46)
-					|| matched_relay->peer_advertised.port != t->stream.port)
+			if (!IN6_ARE_ADDR_EQUAL(&r->peer_advertised.ip46, &t->ip46)
+					|| r->peer_advertised.port != t->port)
 				setup_peer(p, t, tag);
 		}
 		else if (r && cs_o != cs) {