From 772db96c360d8b569e5ad5ad3d055a6ddd211eda Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Mon, 8 Feb 2021 08:41:06 -0500
Subject: [PATCH] TT#91151 fix check for trickle ICE and zero address

Avoid using an explicit test for the trickle ICE endpoint address and
instead use the TRICKLE_ICE flag.

Change-Id: I821ced7e77c798004c9d88ec072848b7f6e24a85
---
 daemon/call.c          |  2 +-
 t/auto-daemon-tests.pl | 95 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/daemon/call.c b/daemon/call.c
index 7affbc3e5..f2c0f0fb2 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -2261,7 +2261,7 @@ int monologue_offer_answer(struct call_monologue *other_ml, GQueue *streams,
 			__disable_streams(other_media, num_ports);
 			goto init;
 		}
-		if (is_addr_unspecified(&sp->rtp_endpoint.address) && !is_trickle_ice_address(&sp->rtp_endpoint)) {
+		if (is_addr_unspecified(&sp->rtp_endpoint.address) && !MEDIA_ISSET(other_media, TRICKLE_ICE)) {
 			/* Zero endpoint address, equivalent to setting the media stream
 			 * to sendonly or inactive */
 			MEDIA_CLEAR(media, RECV);
diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl
index 4e8236e8e..68957e647 100755
--- a/t/auto-daemon-tests.pl
+++ b/t/auto-daemon-tests.pl
@@ -86,6 +86,50 @@ SDP
 
 new_call;
 
+offer('null address test A trickle',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+t=0 0
+m=audio 9 RTP/AVP 8
+c=IN IP4 0.0.0.0
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 8
+c=IN IP4 0.0.0.0
+a=rtpmap:8 PCMA/8000
+a=sendonly
+a=rtcp:PORT
+SDP
+
+new_call;
+
+offer('null address test B trickle',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+c=IN IP4 0.0.0.0
+t=0 0
+m=audio 9 RTP/AVP 8
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+c=IN IP4 0.0.0.0
+t=0 0
+m=audio PORT RTP/AVP 8
+a=rtpmap:8 PCMA/8000
+a=sendonly
+a=rtcp:PORT
+SDP
+
+new_call;
+
 offer('null address test C',
 	{ }, <<SDP);
 v=0
@@ -369,6 +413,57 @@ SDP
 
 new_call;
 
+offer('trickle ICE test A no ICE',
+	{ ICE => 'remove' }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+c=IN IP4 0.0.0.0
+t=0 0
+m=audio 9 RTP/AVP 8
+a=ice-ufrag:Ci7n
+a=ice-pwd:l9QndxLG6OycZRcQe9zcT95c
+a=ice-options:trickle
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+c=IN IP4 203.0.113.1
+t=0 0
+m=audio PORT RTP/AVP 8
+a=rtpmap:8 PCMA/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+new_call;
+
+offer('trickle ICE test B no ICE',
+	{ ICE => 'remove' }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+c=IN IP4 198.51.110.1
+t=0 0
+m=audio 6666 RTP/AVP 8
+a=ice-ufrag:Ci7n
+a=ice-pwd:l9QndxLG6OycZRcQe9zcT95c
+a=ice-options:trickle
+a=rtcp:9 IN IP4 0.0.0.0
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+c=IN IP4 203.0.113.1
+t=0 0
+m=audio PORT RTP/AVP 8
+a=rtpmap:8 PCMA/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+new_call;
+
 offer('trickle ICE test C',
 	{ }, <<SDP);
 v=0