From f55a7c8d52be5197160e143912513324e2524182 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Thu, 18 Sep 2025 14:24:13 -0400
Subject: [PATCH] MT#63317 reinvite tests

Change-Id: I06aa6e87e7d407fe00d3be200d2a581b610901b0
---
 t/auto-daemon-tests-bundle.pl | 1396 ++++++++++++++++++++++++---------
 1 file changed, 1013 insertions(+), 383 deletions(-)

diff --git a/t/auto-daemon-tests-bundle.pl b/t/auto-daemon-tests-bundle.pl
index 1a50e4898..5d5d19d5c 100755
--- a/t/auto-daemon-tests-bundle.pl
+++ b/t/auto-daemon-tests-bundle.pl
@@ -16,7 +16,7 @@ autotest_start(qw(--config-file=none -t -1 -i 203.0.113.1 -i 2001:db8:4321::1
 
 
 my ($sock_a, $sock_b, $sock_c, $sock_d, $port_a, $port_b, $port_c, $ssrc_a, $ssrc_b, $resp,
-	$sock_ax, $sock_bx, $port_ax, $port_bx, $port_d, $sock_e, $port_e, $sock_cx, $port_cx,
+	$sock_ax, $sock_bx, $port_ax, $port_bx, $port_d, $port_dx, $sock_e, $port_e, $sock_cx, $port_cx,
 	$srtp_ctx_a, $srtp_ctx_b, $srtp_ctx_a_rev, $srtp_ctx_b_rev, $ufrag_a, $ufrag_b,
 	@ret1, @ret2, @ret3, @ret4, $srtp_key_a, $srtp_key_b, $ts, $seq, $tag_medias, $media_labels,
 	$ftr, $ttr, $fts, $ttr2);
@@ -628,29 +628,18 @@ snd($sock_b, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_c, $port_a, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv_no($sock_d);
 
-
-
-
-undef($sock_b);
-
-
-($sock_a, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 6166)],
-		[qw(198.51.100.14 6168)],
-		[qw(198.51.100.14 6170)]);
-
-($port_a, undef, $port_b) = offer('same-port bundle offer',
+($port_ax, undef, $port_bx) = offer('optional bundle offer reinvite',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 6166 RTP/AVP 0
+m=audio 6158 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 6166 RTP/AVP 105
+m=video 6160 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -674,17 +663,17 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('same-port bundle offer',
+($port_cx, undef, $port_dx) = answer('optional bundle offer reinvite',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6168 RTP/AVP 0
+m=audio 6162 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 6170 RTP/AVP 105
+m=video 6164 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -708,56 +697,107 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
-isnt($port_a, $port_b, 'different ports');
-isnt($port_a, $port_c, 'different ports');
-isnt($port_a, $port_d, 'different ports');
-isnt($port_b, $port_c, 'different ports');
-isnt($port_b, $port_d, 'different ports');
-isnt($port_c, $port_d, 'different ports');
+is($port_a, $port_ax, "same port");
+is($port_b, $port_bx, "same port");
+is($port_c, $port_cx, "same port");
+is($port_d, $port_dx, "same port");
 
-snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
+reverse_tags;
 
-snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
-rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160));
+($port_cx, undef, $port_dx) = offer('optional bundle offer reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6162 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:a
+m=video 6164 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=mid:v
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:a
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:v
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
 
-snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
-rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
+($port_ax, undef, $port_bx) = answer('optional bundle offer reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE a v
+m=audio 6158 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:a
+m=video 6160 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=mid:v
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:a
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:v
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
 
-snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
-rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
 
-# mix up bundle ports
 
-snd($sock_a, $port_d,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_d, $port_b, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv_no($sock_c);
 
-snd($sock_a, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
-rcv($sock_c, $port_a, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
-rcv_no($sock_d);
 
 
+undef($sock_b);
 
 
-($sock_a, $sock_b, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 6200)],
-		[qw(198.51.100.14 6202)],
-		[qw(198.51.100.14 6204)],
-		[qw(198.51.100.14 6206)]);
+($sock_a, $sock_c, $sock_d) =
+	new_call([qw(198.51.100.14 6166)],
+		[qw(198.51.100.14 6168)],
+		[qw(198.51.100.14 6170)]);
 
-($port_a, undef, $port_b) = offer('optional bundle offer w bundle-accept',
-	{ bundle => ['accept'] }, <<SDP);
+($port_a, undef, $port_b) = offer('same-port bundle offer',
+	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 6200 RTP/AVP 0
+m=audio 6166 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 6202 RTP/AVP 105
+m=video 6166 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -781,17 +821,17 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('optional bundle offer w bundle-accept',
+($port_c, undef, $port_d) = answer('same-port bundle offer',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6204 RTP/AVP 0
+m=audio 6168 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 6206 RTP/AVP 105
+m=video 6170 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -801,7 +841,6 @@ v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-a=group:BUNDLE a v
 m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
@@ -821,56 +860,51 @@ isnt($port_a, $port_c, 'different ports');
 isnt($port_a, $port_d, 'different ports');
 isnt($port_b, $port_c, 'different ports');
 isnt($port_b, $port_d, 'different ports');
-is($port_c, $port_d, 'same ports');
+isnt($port_c, $port_d, 'different ports');
 
 snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
 rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 
 snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
 rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160));
-rcv_no($sock_b);
 
-snd($sock_b, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 
 snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
 rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
-rcv_no($sock_b);
-
 
 # mix up bundle ports
 
 snd($sock_a, $port_d,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv_no($sock_d);
-
-snd($sock_b, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
-rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv($sock_d, $port_b, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 rcv_no($sock_c);
 
+snd($sock_a, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv($sock_c, $port_a, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv_no($sock_d);
 
 
 
-undef($sock_b);
-
 
-($sock_a, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 6208)],
-		[qw(198.51.100.14 6210)],
-		[qw(198.51.100.14 6212)]);
+($sock_a, $sock_b, $sock_c, $sock_d) =
+	new_call([qw(198.51.100.14 6200)],
+		[qw(198.51.100.14 6202)],
+		[qw(198.51.100.14 6204)],
+		[qw(198.51.100.14 6206)]);
 
-($port_a, undef, $port_b) = offer('same-port bundle offer w bundle-accept',
+($port_a, undef, $port_b) = offer('optional bundle offer w bundle-accept',
 	{ bundle => ['accept'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 6208 RTP/AVP 0
+m=audio 6200 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 6208 RTP/AVP 105
+m=video 6202 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -894,17 +928,17 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('same-port bundle offer w bundle-accept',
+($port_c, undef, $port_d) = answer('optional bundle offer w bundle-accept',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6210 RTP/AVP 0
+m=audio 6204 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 6212 RTP/AVP 105
+m=video 6206 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -941,12 +975,15 @@ rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 
 snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
 rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160));
+rcv_no($sock_b);
 
-snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+snd($sock_b, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 
 snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
 rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
+rcv_no($sock_b);
+
 
 # mix up bundle ports
 
@@ -954,28 +991,24 @@ snd($sock_a, $port_d,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
 rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 rcv_no($sock_d);
 
-snd($sock_a, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+snd($sock_b, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv_no($sock_c);
 
-
-
-offer('same port bundle with non unique PT',
-	{ bundle => ['accept'] }, <<SDP);
+($port_ax, undef, $port_bx) = offer('optional bundle offer w bundle-accept reinvite',
+	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 6208 RTP/AVP 0 100
+m=audio 6200 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-a=rtpmap:100 foo/8000
-m=video 6208 RTP/AVP 105 100
+m=video 6200 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bar/90000
 a=sendrecv
 a=mid:v
 ----------------------------------
@@ -983,33 +1016,31 @@ v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio PORT RTP/AVP 0 100
+m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
 a=rtpmap:0 PCMU/8000
-a=rtpmap:100 foo/8000
 a=sendrecv
 a=rtcp:PORT
-m=video PORT RTP/AVP 105 100
+m=video PORT RTP/AVP 105
 c=IN IP4 203.0.113.1
 a=mid:v
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bar/90000
 a=sendrecv
 a=rtcp:PORT
 SDP
 
-answer('same port bundle with non unique PT',
+($port_cx, undef, $port_dx) = answer('optional bundle offer w bundle-accept reinvite',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6210 RTP/AVP 0
+m=audio 6204 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 6212 RTP/AVP 105
+m=video 6206 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -1019,6 +1050,7 @@ v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
+a=group:BUNDLE a v
 m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
@@ -1033,25 +1065,26 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
+is($port_a, $port_ax, "same port");
+is($port_b, $port_bx, "same port");
+is($port_c, $port_cx, "same port");
+is($port_d, $port_dx, "same port");
 
+reverse_tags;
 
-
-offer('optional bundle with non unique PT',
-	{ bundle => ['accept'] }, <<SDP);
+($port_cx, undef, $port_dx) = offer('optional bundle offer w bundle-accept reinvite',
+	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-a=group:BUNDLE a v
-m=audio 7106 RTP/AVP 0 100
+m=audio 6204 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-a=rtpmap:100 foo/8000
-m=video 7108 RTP/AVP 105 100
+m=video 6206 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bar/90000
 a=sendrecv
 a=mid:v
 ----------------------------------
@@ -1059,33 +1092,34 @@ v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio PORT RTP/AVP 0 100
+a=group:BUNDLE a v
+m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
 a=rtpmap:0 PCMU/8000
-a=rtpmap:100 foo/8000
 a=sendrecv
 a=rtcp:PORT
-m=video PORT RTP/AVP 105 100
+m=video PORT RTP/AVP 105
 c=IN IP4 203.0.113.1
 a=mid:v
+a=bundle-only
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bar/90000
 a=sendrecv
 a=rtcp:PORT
 SDP
 
-answer('same port bundle with non unique PT',
+($port_ax, undef, $port_bx) = answer('optional bundle offer w bundle-accept reinvite',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 7110 RTP/AVP 0
+a=group:BUNDLE a v
+m=audio 6200 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 7112 RTP/AVP 105
+m=video 6200 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -1109,33 +1143,39 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
+is($port_a, $port_ax, "same port");
+is($port_b, $port_bx, "same port");
+is($port_c, $port_cx, "same port");
+is($port_d, $port_dx, "same port");
 
 
 
 
+
+undef($sock_b);
+
+
 ($sock_a, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 6216)],
-		[qw(198.51.100.14 6218)],
-		[qw(198.51.100.14 6220)]);
+	new_call([qw(198.51.100.14 6208)],
+		[qw(198.51.100.14 6210)],
+		[qw(198.51.100.14 6212)]);
 
-($port_a, undef, $port_b) = offer('same-port bundle with extmap',
+($port_a, undef, $port_b) = offer('same-port bundle offer w bundle-accept',
 	{ bundle => ['accept'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 6216 RTP/AVP 0
+m=audio 6208 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-m=video 6216 RTP/AVP 105
+m=video 6208 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
 a=mid:v
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 ----------------------------------
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
@@ -1145,31 +1185,27 @@ m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
 a=rtpmap:0 PCMU/8000
-a=extmap-allow-mixed
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 m=video PORT RTP/AVP 105
 c=IN IP4 203.0.113.1
 a=mid:v
 a=rtpmap:105 H264/90000
-a=extmap-allow-mixed
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('same-port bundle with extmap',
+($port_c, undef, $port_d) = answer('same-port bundle offer w bundle-accept',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6218 RTP/AVP 0
+m=audio 6210 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-m=video 6220 RTP/AVP 105
+m=video 6212 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -1184,14 +1220,12 @@ m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
 a=rtpmap:0 PCMU/8000
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 m=video PORT RTP/AVP 105
 c=IN IP4 203.0.113.1
 a=mid:v
 a=rtpmap:105 H264/90000
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 SDP
@@ -1207,13 +1241,13 @@ snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
 rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 
 snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
-rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160, [[1, 'a']]));
+rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160));
 
 snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 
 snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
-rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800, [[1, 'v']]));
+rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
 
 # mix up bundle ports
 
@@ -1227,32 +1261,24 @@ rcv_no($sock_c);
 
 
 
-
-($sock_a, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 6224)],
-		[qw(198.51.100.14 6226)],
-		[qw(198.51.100.14 6228)]);
-
-($port_a, undef, $port_b) = offer('same-port bundle with extmap & non unique PTs',
+offer('same port bundle with non unique PT',
 	{ bundle => ['accept'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 6224 RTP/AVP 0 100
+m=audio 6208 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-a=rtpmap:100 foobar/1000
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-m=video 6224 RTP/AVP 105 100
+a=rtpmap:100 foo/8000
+m=video 6208 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
+a=rtpmap:100 bar/90000
 a=sendrecv
 a=mid:v
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-a=rtpmap:100 bozo/90000
 ----------------------------------
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
@@ -1262,37 +1288,31 @@ m=audio PORT RTP/AVP 0 100
 c=IN IP4 203.0.113.1
 a=mid:a
 a=rtpmap:0 PCMU/8000
-a=rtpmap:100 foobar/1000
-a=extmap-allow-mixed
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=rtpmap:100 foo/8000
 a=sendrecv
 a=rtcp:PORT
 m=video PORT RTP/AVP 105 100
 c=IN IP4 203.0.113.1
 a=mid:v
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bozo/90000
-a=extmap-allow-mixed
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=rtpmap:100 bar/90000
 a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('same-port bundle with extmap & non unique PTs',
+answer('same port bundle with non unique PT',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6226 RTP/AVP 0 100
+m=audio 6210 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-a=rtpmap:100 foobar/1000
-m=video 6228 RTP/AVP 105 100
+m=video 6212 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bozo/90000
 a=sendrecv
 a=mid:v
 ----------------------------------
@@ -1300,117 +1320,118 @@ v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-a=group:BUNDLE a v
-m=audio PORT RTP/AVP 0 100
+m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
 a=rtpmap:0 PCMU/8000
-a=rtpmap:100 foobar/1000
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
-m=video PORT RTP/AVP 105 100
+m=video PORT RTP/AVP 105
 c=IN IP4 203.0.113.1
 a=mid:v
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bozo/90000
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 SDP
 
-isnt($port_a, $port_b, 'different ports');
-isnt($port_a, $port_c, 'different ports');
-isnt($port_a, $port_d, 'different ports');
-isnt($port_b, $port_c, 'different ports');
-isnt($port_b, $port_d, 'different ports');
-is($port_c, $port_d, 'same ports');
-
-snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
-
-snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
-rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160, [[1, 'a']]));
-
-snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
-rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
-
-snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
-rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800, [[1, 'v']]));
-
-# mix up bundle ports
-
-snd($sock_a, $port_d,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv_no($sock_d);
-
-snd($sock_a, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
-rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
-rcv_no($sock_c);
-
-snd($sock_a, $port_d,  rtp(100, 7000, 11000, 0x25bc, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(100, 7000, 11000, 0x25bc, "\x44" x 160));
-rcv_no($sock_d);
-
-snd($sock_a, $port_c,  rtp(100, 8000, 9000, 0x76a9, "\x33" x 800));
-# recv on wrong sock
-rcv($sock_c, $port_a, rtpm(100, 8000, 9000, 0x76a9, "\x33" x 800));
-rcv_no($sock_d);
-
-# with extension
-
-snd($sock_a, $port_d,  rtp(0, 2001, 6160, 0x1234, "\x44" x 160, [[1, 'a']]));
-rcv($sock_c, $port_a, rtpm(0, 2001, 6160, 0x1234, "\x44" x 160));
-rcv_no($sock_d);
-
-snd($sock_a, $port_c,  rtp(105, 3001, 4160, 0x6321, "\x33" x 800, [[1, 'v']]));
-rcv($sock_d, $port_b, rtpm(105, 3001, 4160, 0x6321, "\x33" x 800));
-rcv_no($sock_c);
-
-snd($sock_a, $port_d,  rtp(100, 7001, 11160, 0x25bc, "\x44" x 160, [[1, 'a']]));
-rcv($sock_c, $port_a, rtpm(100, 7001, 11160, 0x25bc, "\x44" x 160));
-rcv_no($sock_d);
 
-snd($sock_a, $port_c,  rtp(100, 8001, 9160, 0x76a9, "\x33" x 800, [[1, 'v']]));
-# recv now on correct sock
-rcv($sock_d, $port_b, rtpm(100, 8001, 9160, 0x76a9, "\x33" x 800));
-rcv_no($sock_c);
 
-# SSRCs are remembered
-
-snd($sock_a, $port_d,  rtp(100, 7000, 11000, 0x25bc, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(100, 7000, 11000, 0x25bc, "\x44" x 160));
-rcv_no($sock_d);
 
-snd($sock_a, $port_c,  rtp(100, 8000, 9000, 0x76a9, "\x33" x 800));
-# recv still in correct port
-rcv($sock_d, $port_b, rtpm(100, 8000, 9000, 0x76a9, "\x33" x 800));
-rcv_no($sock_c);
+offer('optional bundle with non unique PT',
+	{ bundle => ['accept'] }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE a v
+m=audio 7106 RTP/AVP 0 100
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:a
+a=rtpmap:100 foo/8000
+m=video 7108 RTP/AVP 105 100
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=rtpmap:100 bar/90000
+a=sendrecv
+a=mid:v
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0 100
+c=IN IP4 203.0.113.1
+a=mid:a
+a=rtpmap:0 PCMU/8000
+a=rtpmap:100 foo/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105 100
+c=IN IP4 203.0.113.1
+a=mid:v
+a=rtpmap:105 H264/90000
+a=rtpmap:100 bar/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
 
+answer('same port bundle with non unique PT',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 7110 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:a
+m=video 7112 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=mid:v
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:a
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:v
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
 
 
 
 
 
-($sock_a, $sock_b, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 7116)],
-		[qw(198.51.100.14 7114)],
-		[qw(198.51.100.14 7118)],
-		[qw(198.51.100.14 7120)]);
+($sock_a, $sock_c, $sock_d) =
+	new_call([qw(198.51.100.14 6216)],
+		[qw(198.51.100.14 6218)],
+		[qw(198.51.100.14 6220)]);
 
-($port_a, undef, $port_b) = offer('optional bundle with extmap',
+($port_a, undef, $port_b) = offer('same-port bundle with extmap',
 	{ bundle => ['accept'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 7116 RTP/AVP 0
+m=audio 6216 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-m=video 7114 RTP/AVP 105
+m=video 6216 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -1439,18 +1460,17 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('optional bundle with extmap',
+($port_c, undef, $port_d) = answer('same-port bundle with extmap',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 7118 RTP/AVP 0
+m=audio 6218 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-m=video 7120 RTP/AVP 105
+m=video 6220 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -1485,23 +1505,21 @@ isnt($port_b, $port_d, 'different ports');
 is($port_c, $port_d, 'same ports');
 
 snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160, [[1, 'a']]));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 
 snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
 rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160, [[1, 'a']]));
-rcv_no($sock_b);
 
 snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 
 snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
 rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800, [[1, 'v']]));
-rcv_no($sock_b);
 
 # mix up bundle ports
 
 snd($sock_a, $port_d,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160, [[1, 'a']]));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 rcv_no($sock_d);
 
 snd($sock_a, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
@@ -1511,26 +1529,25 @@ rcv_no($sock_c);
 
 
 
-($sock_a, $sock_b, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 7124)],
-		[qw(198.51.100.14 7122)],
-		[qw(198.51.100.14 7126)],
-		[qw(198.51.100.14 7128)]);
+($sock_a, $sock_c, $sock_d) =
+	new_call([qw(198.51.100.14 6224)],
+		[qw(198.51.100.14 6226)],
+		[qw(198.51.100.14 6228)]);
 
-($port_a, undef, $port_b) = offer('optional bundle with extmap & non unique PTs',
+($port_a, undef, $port_b) = offer('same-port bundle with extmap & non unique PTs',
 	{ bundle => ['accept'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 7124 RTP/AVP 0 100
+m=audio 6224 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
 a=rtpmap:100 foobar/1000
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-m=video 7122 RTP/AVP 105 100
+m=video 6224 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -1562,18 +1579,18 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('optional bundle with extmap & non unique PTs',
+($port_c, undef, $port_d) = answer('same-port bundle with extmap & non unique PTs',
 	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 7126 RTP/AVP 0 100
+m=audio 6226 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
 a=rtpmap:100 foobar/1000
-m=video 7128 RTP/AVP 105 100
+m=video 6228 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=rtpmap:100 bozo/90000
@@ -1615,14 +1632,12 @@ rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 
 snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
 rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160, [[1, 'a']]));
-rcv_no($sock_b);
 
 snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 
 snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
 rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800, [[1, 'v']]));
-rcv_no($sock_b);
 
 # mix up bundle ports
 
@@ -1662,77 +1677,83 @@ snd($sock_a, $port_c,  rtp(100, 8001, 9160, 0x76a9, "\x33" x 800, [[1, 'v']]));
 rcv($sock_d, $port_b, rtpm(100, 8001, 9160, 0x76a9, "\x33" x 800));
 rcv_no($sock_c);
 
+# SSRCs are remembered
+
+snd($sock_a, $port_d,  rtp(100, 7000, 11000, 0x25bc, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(100, 7000, 11000, 0x25bc, "\x44" x 160));
+rcv_no($sock_d);
+
+snd($sock_a, $port_c,  rtp(100, 8000, 9000, 0x76a9, "\x33" x 800));
+# recv still in correct port
+rcv($sock_d, $port_b, rtpm(100, 8000, 9000, 0x76a9, "\x33" x 800));
+rcv_no($sock_c);
+
 
 
 
 
 
 ($sock_a, $sock_b, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 6236)],
-		[qw(198.51.100.14 6234)],
-		[qw(198.51.100.14 6238)],
-		[qw(198.51.100.14 6240)]);
+	new_call([qw(198.51.100.14 7116)],
+		[qw(198.51.100.14 7114)],
+		[qw(198.51.100.14 7118)],
+		[qw(198.51.100.14 7120)]);
 
-($port_a, undef, $port_b) = offer('optional bundle with extmap & non unique PTs & strict source',
-	{ bundle => ['accept'], flags => ['strict source'] }, <<SDP);
+($port_a, undef, $port_b) = offer('optional bundle with extmap',
+	{ bundle => ['accept'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 6236 RTP/AVP 0 100
+m=audio 7116 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-a=rtpmap:100 foobar/1000
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-m=video 6234 RTP/AVP 105 100
+m=video 7114 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
 a=mid:v
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-a=rtpmap:100 bozo/90000
 ----------------------------------
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio PORT RTP/AVP 0 100
+m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
 a=rtpmap:0 PCMU/8000
-a=rtpmap:100 foobar/1000
 a=extmap-allow-mixed
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
-m=video PORT RTP/AVP 105 100
+m=video PORT RTP/AVP 105
 c=IN IP4 203.0.113.1
 a=mid:v
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bozo/90000
 a=extmap-allow-mixed
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('optional bundle with extmap & non unique PTs & strict source',
-	{ flags => ['strict source'] }, <<SDP);
+($port_c, undef, $port_d) = answer('optional bundle with extmap',
+	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6238 RTP/AVP 0 100
+m=audio 7118 RTP/AVP 0
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
-a=rtpmap:100 foobar/1000
-m=video 6240 RTP/AVP 105 100
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+m=video 7120 RTP/AVP 105
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bozo/90000
 a=sendrecv
 a=mid:v
 ----------------------------------
@@ -1741,19 +1762,17 @@ o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio PORT RTP/AVP 0 100
+m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=mid:a
 a=rtpmap:0 PCMU/8000
-a=rtpmap:100 foobar/1000
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
-m=video PORT RTP/AVP 105 100
+m=video PORT RTP/AVP 105
 c=IN IP4 203.0.113.1
 a=mid:v
 a=rtpmap:105 H264/90000
-a=rtpmap:100 bozo/90000
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
@@ -1767,7 +1786,7 @@ isnt($port_b, $port_d, 'different ports');
 is($port_c, $port_d, 'same ports');
 
 snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160, [[1, 'a']]));
 
 snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
 rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160, [[1, 'a']]));
@@ -1783,64 +1802,36 @@ rcv_no($sock_b);
 # mix up bundle ports
 
 snd($sock_a, $port_d,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160, [[1, 'a']]));
 rcv_no($sock_d);
 
 snd($sock_a, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv_no($sock_c);
 
-snd($sock_a, $port_d,  rtp(100, 7000, 11000, 0x25bc, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(100, 7000, 11000, 0x25bc, "\x44" x 160));
-rcv_no($sock_d);
-
-snd($sock_a, $port_c,  rtp(100, 8000, 9000, 0x76a9, "\x33" x 800));
-# recv on wrong sock
-rcv($sock_c, $port_a, rtpm(100, 8000, 9000, 0x76a9, "\x33" x 800));
-rcv_no($sock_d);
-
-# with extension
-
-snd($sock_a, $port_d,  rtp(0, 2001, 6160, 0x1234, "\x44" x 160, [[1, 'a']]));
-rcv($sock_c, $port_a, rtpm(0, 2001, 6160, 0x1234, "\x44" x 160));
-rcv_no($sock_d);
-
-snd($sock_a, $port_c,  rtp(105, 3001, 4160, 0x6321, "\x33" x 800, [[1, 'v']]));
-rcv($sock_d, $port_b, rtpm(105, 3001, 4160, 0x6321, "\x33" x 800));
-rcv_no($sock_c);
-
-snd($sock_a, $port_d,  rtp(100, 7001, 11160, 0x25bc, "\x44" x 160, [[1, 'a']]));
-rcv($sock_c, $port_a, rtpm(100, 7001, 11160, 0x25bc, "\x44" x 160));
-rcv_no($sock_d);
-
-snd($sock_a, $port_c,  rtp(100, 8001, 9160, 0x76a9, "\x33" x 800, [[1, 'v']]));
-# recv now on correct sock
-rcv($sock_d, $port_b, rtpm(100, 8001, 9160, 0x76a9, "\x33" x 800));
-rcv_no($sock_c);
-
-
 
 
 
-($sock_a, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 6248)],
-		[qw(198.51.100.14 6250)],
-		[qw(198.51.100.14 6252)]);
+($sock_a, $sock_b, $sock_c, $sock_d) =
+	new_call([qw(198.51.100.14 7124)],
+		[qw(198.51.100.14 7122)],
+		[qw(198.51.100.14 7126)],
+		[qw(198.51.100.14 7128)]);
 
-($port_a, undef, $port_b) = offer('same port bundle with extmap & non unique PTs & strict source',
-	{ bundle => ['accept'], flags => ['strict source'] }, <<SDP);
+($port_a, undef, $port_b) = offer('optional bundle with extmap & non unique PTs',
+	{ bundle => ['accept'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
 a=group:BUNDLE a v
-m=audio 6248 RTP/AVP 0 100
+m=audio 7124 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
 a=rtpmap:100 foobar/1000
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-m=video 6248 RTP/AVP 105 100
+m=video 7122 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
@@ -1872,18 +1863,18 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('same port bundle with extmap & non unique PTs & strict source',
-	{ flags => ['strict source'] }, <<SDP);
+($port_c, undef, $port_d) = answer('optional bundle with extmap & non unique PTs',
+	{ }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6250 RTP/AVP 0 100
+m=audio 7126 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
 a=mid:a
 a=rtpmap:100 foobar/1000
-m=video 6252 RTP/AVP 105 100
+m=video 7128 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=rtpmap:100 bozo/90000
@@ -1925,12 +1916,14 @@ rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 
 snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
 rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160, [[1, 'a']]));
+rcv_no($sock_b);
 
 snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 
 snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
 rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800, [[1, 'v']]));
+rcv_no($sock_b);
 
 # mix up bundle ports
 
@@ -1976,76 +1969,93 @@ rcv_no($sock_c);
 
 
 ($sock_a, $sock_b, $sock_c, $sock_d) =
-	new_call([qw(198.51.100.14 6190)],
-		[qw(198.51.100.14 6192)],
-		[qw(198.51.100.14 6194)],
-		[qw(198.51.100.14 6196)]);
+	new_call([qw(198.51.100.14 6236)],
+		[qw(198.51.100.14 6234)],
+		[qw(198.51.100.14 6238)],
+		[qw(198.51.100.14 6240)]);
 
-($port_a, undef, $port_b) = offer('make bundle, reject',
-	{ bundle => ['offer'] }, <<SDP);
+($port_a, undef, $port_b) = offer('optional bundle with extmap & non unique PTs & strict source',
+	{ bundle => ['accept'], flags => ['strict source'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6190 RTP/AVP 0
+a=group:BUNDLE a v
+m=audio 6236 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
-a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
-m=video 6192 RTP/AVP 105
+a=mid:a
+a=rtpmap:100 foobar/1000
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+m=video 6234 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
+a=mid:v
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=rtpmap:100 bozo/90000
 ----------------------------------
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-a=group:BUNDLE 1 2
-m=audio PORT RTP/AVP 0
+m=audio PORT RTP/AVP 0 100
 c=IN IP4 203.0.113.1
-a=mid:1
+a=mid:a
 a=rtpmap:0 PCMU/8000
+a=rtpmap:100 foobar/1000
 a=extmap-allow-mixed
-a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
-a=extmap:2 urn:ietf:params:rtp-hdrext:sdes:mid
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
-m=video PORT RTP/AVP 105
+m=video PORT RTP/AVP 105 100
 c=IN IP4 203.0.113.1
-a=mid:2
+a=mid:v
 a=rtpmap:105 H264/90000
+a=rtpmap:100 bozo/90000
 a=extmap-allow-mixed
-a=extmap:2 urn:ietf:params:rtp-hdrext:sdes:mid
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('make bundle, reject',
-	{ }, <<SDP);
+($port_c, undef, $port_d) = answer('optional bundle with extmap & non unique PTs & strict source',
+	{ flags => ['strict source'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6194 RTP/AVP 0
+m=audio 6238 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
-m=video 6196 RTP/AVP 105
+a=mid:a
+a=rtpmap:100 foobar/1000
+m=video 6240 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
+a=rtpmap:100 bozo/90000
 a=sendrecv
+a=mid:v
 ----------------------------------
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio PORT RTP/AVP 0
+a=group:BUNDLE a v
+m=audio PORT RTP/AVP 0 100
 c=IN IP4 203.0.113.1
+a=mid:a
 a=rtpmap:0 PCMU/8000
+a=rtpmap:100 foobar/1000
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
-m=video PORT RTP/AVP 105
+m=video PORT RTP/AVP 105 100
 c=IN IP4 203.0.113.1
+a=mid:v
 a=rtpmap:105 H264/90000
+a=rtpmap:100 bozo/90000
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 SDP
@@ -2055,93 +2065,478 @@ isnt($port_a, $port_c, 'different ports');
 isnt($port_a, $port_d, 'different ports');
 isnt($port_b, $port_c, 'different ports');
 isnt($port_b, $port_d, 'different ports');
-isnt($port_c, $port_d, 'different ports');
+is($port_c, $port_d, 'same ports');
 
 snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
 rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
 
 snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
-rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160));
+rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160, [[1, 'a']]));
+rcv_no($sock_b);
 
-snd($sock_b, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
 rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
 
 snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
-rcv($sock_b, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
+rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800, [[1, 'v']]));
+rcv_no($sock_b);
 
+# mix up bundle ports
 
+snd($sock_a, $port_d,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv_no($sock_d);
 
+snd($sock_a, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv_no($sock_c);
 
-undef($sock_d);
+snd($sock_a, $port_d,  rtp(100, 7000, 11000, 0x25bc, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(100, 7000, 11000, 0x25bc, "\x44" x 160));
+rcv_no($sock_d);
 
-($sock_a, $sock_b, $sock_c) =
-	new_call([qw(198.51.100.14 6374)],
-		[qw(198.51.100.14 6376)],
-		[qw(198.51.100.14 6378)]);
+snd($sock_a, $port_c,  rtp(100, 8000, 9000, 0x76a9, "\x33" x 800));
+# recv on wrong sock
+rcv($sock_c, $port_a, rtpm(100, 8000, 9000, 0x76a9, "\x33" x 800));
+rcv_no($sock_d);
 
-($port_a, undef, $port_b) = offer('make bundle, accept',
-	{ bundle => ['offer'] }, <<SDP);
+# with extension
+
+snd($sock_a, $port_d,  rtp(0, 2001, 6160, 0x1234, "\x44" x 160, [[1, 'a']]));
+rcv($sock_c, $port_a, rtpm(0, 2001, 6160, 0x1234, "\x44" x 160));
+rcv_no($sock_d);
+
+snd($sock_a, $port_c,  rtp(105, 3001, 4160, 0x6321, "\x33" x 800, [[1, 'v']]));
+rcv($sock_d, $port_b, rtpm(105, 3001, 4160, 0x6321, "\x33" x 800));
+rcv_no($sock_c);
+
+snd($sock_a, $port_d,  rtp(100, 7001, 11160, 0x25bc, "\x44" x 160, [[1, 'a']]));
+rcv($sock_c, $port_a, rtpm(100, 7001, 11160, 0x25bc, "\x44" x 160));
+rcv_no($sock_d);
+
+snd($sock_a, $port_c,  rtp(100, 8001, 9160, 0x76a9, "\x33" x 800, [[1, 'v']]));
+# recv now on correct sock
+rcv($sock_d, $port_b, rtpm(100, 8001, 9160, 0x76a9, "\x33" x 800));
+rcv_no($sock_c);
+
+
+
+
+
+($sock_a, $sock_c, $sock_d) =
+	new_call([qw(198.51.100.14 6248)],
+		[qw(198.51.100.14 6250)],
+		[qw(198.51.100.14 6252)]);
+
+($port_a, undef, $port_b) = offer('same port bundle with extmap & non unique PTs & strict source',
+	{ bundle => ['accept'], flags => ['strict source'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio 6374 RTP/AVP 0
+a=group:BUNDLE a v
+m=audio 6248 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
-m=video 6376 RTP/AVP 105
+a=mid:a
+a=rtpmap:100 foobar/1000
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+m=video 6248 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
 a=sendrecv
+a=mid:v
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=rtpmap:100 bozo/90000
 ----------------------------------
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-a=group:BUNDLE 1 2
-m=audio PORT RTP/AVP 0
+m=audio PORT RTP/AVP 0 100
 c=IN IP4 203.0.113.1
-a=mid:1
+a=mid:a
 a=rtpmap:0 PCMU/8000
+a=rtpmap:100 foobar/1000
 a=extmap-allow-mixed
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
-m=video PORT RTP/AVP 105
+m=video PORT RTP/AVP 105 100
 c=IN IP4 203.0.113.1
-a=mid:2
+a=mid:v
 a=rtpmap:105 H264/90000
+a=rtpmap:100 bozo/90000
 a=extmap-allow-mixed
 a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
 a=sendrecv
 a=rtcp:PORT
 SDP
 
-($port_c, undef, $port_d) = answer('make bundle, accept',
-	{ }, <<SDP);
+($port_c, undef, $port_d) = answer('same port bundle with extmap & non unique PTs & strict source',
+	{ flags => ['strict source'] }, <<SDP);
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-a=group:BUNDLE 1 2
-m=audio 6378 RTP/AVP 0
+m=audio 6250 RTP/AVP 0 100
 c=IN IP4 198.51.100.14
 a=sendrecv
-a=mid:1
-a=extmap-allow-mixed
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-m=video 6378 RTP/AVP 105
+a=mid:a
+a=rtpmap:100 foobar/1000
+m=video 6252 RTP/AVP 105 100
 c=IN IP4 198.51.100.14
 a=rtpmap:105 H264/90000
+a=rtpmap:100 bozo/90000
 a=sendrecv
-a=extmap-allow-mixed
-a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
-a=mid:2
+a=mid:v
 ----------------------------------
 v=0
 o=- 1545997027 1 IN IP4 198.51.100.1
 s=tester
 t=0 0
-m=audio PORT RTP/AVP 0
+a=group:BUNDLE a v
+m=audio PORT RTP/AVP 0 100
+c=IN IP4 203.0.113.1
+a=mid:a
+a=rtpmap:0 PCMU/8000
+a=rtpmap:100 foobar/1000
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105 100
+c=IN IP4 203.0.113.1
+a=mid:v
+a=rtpmap:105 H264/90000
+a=rtpmap:100 bozo/90000
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+isnt($port_a, $port_b, 'different ports');
+isnt($port_a, $port_c, 'different ports');
+isnt($port_a, $port_d, 'different ports');
+isnt($port_b, $port_c, 'different ports');
+isnt($port_b, $port_d, 'different ports');
+is($port_c, $port_d, 'same ports');
+
+snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
+
+snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
+rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160, [[1, 'a']]));
+
+snd($sock_a, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
+
+snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
+rcv($sock_a, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800, [[1, 'v']]));
+
+# mix up bundle ports
+
+snd($sock_a, $port_d,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv_no($sock_d);
+
+snd($sock_a, $port_c,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv_no($sock_c);
+
+snd($sock_a, $port_d,  rtp(100, 7000, 11000, 0x25bc, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(100, 7000, 11000, 0x25bc, "\x44" x 160));
+rcv_no($sock_d);
+
+snd($sock_a, $port_c,  rtp(100, 8000, 9000, 0x76a9, "\x33" x 800));
+# recv on wrong sock
+rcv($sock_c, $port_a, rtpm(100, 8000, 9000, 0x76a9, "\x33" x 800));
+rcv_no($sock_d);
+
+# with extension
+
+snd($sock_a, $port_d,  rtp(0, 2001, 6160, 0x1234, "\x44" x 160, [[1, 'a']]));
+rcv($sock_c, $port_a, rtpm(0, 2001, 6160, 0x1234, "\x44" x 160));
+rcv_no($sock_d);
+
+snd($sock_a, $port_c,  rtp(105, 3001, 4160, 0x6321, "\x33" x 800, [[1, 'v']]));
+rcv($sock_d, $port_b, rtpm(105, 3001, 4160, 0x6321, "\x33" x 800));
+rcv_no($sock_c);
+
+snd($sock_a, $port_d,  rtp(100, 7001, 11160, 0x25bc, "\x44" x 160, [[1, 'a']]));
+rcv($sock_c, $port_a, rtpm(100, 7001, 11160, 0x25bc, "\x44" x 160));
+rcv_no($sock_d);
+
+snd($sock_a, $port_c,  rtp(100, 8001, 9160, 0x76a9, "\x33" x 800, [[1, 'v']]));
+# recv now on correct sock
+rcv($sock_d, $port_b, rtpm(100, 8001, 9160, 0x76a9, "\x33" x 800));
+rcv_no($sock_c);
+
+
+
+
+
+
+($sock_a, $sock_b, $sock_c, $sock_d) =
+	new_call([qw(198.51.100.14 6190)],
+		[qw(198.51.100.14 6192)],
+		[qw(198.51.100.14 6194)],
+		[qw(198.51.100.14 6196)]);
+
+($port_a, undef, $port_b) = offer('make bundle, reject',
+	{ bundle => ['offer'] }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6190 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
+m=video 6192 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:1
+a=rtpmap:0 PCMU/8000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
+a=extmap:2 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:2
+a=rtpmap:105 H264/90000
+a=extmap-allow-mixed
+a=extmap:2 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+($port_c, undef, $port_d) = answer('make bundle, reject',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6194 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+m=video 6196 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+isnt($port_a, $port_b, 'different ports');
+isnt($port_a, $port_c, 'different ports');
+isnt($port_a, $port_d, 'different ports');
+isnt($port_b, $port_c, 'different ports');
+isnt($port_b, $port_d, 'different ports');
+isnt($port_c, $port_d, 'different ports');
+
+snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160));
+
+snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
+rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160));
+
+snd($sock_b, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv($sock_d, $port_b, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800));
+
+snd($sock_d, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
+rcv($sock_b, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
+
+
+
+
+undef($sock_d);
+
+($sock_a, $sock_b, $sock_c) =
+	new_call([qw(198.51.100.14 6374)],
+		[qw(198.51.100.14 6376)],
+		[qw(198.51.100.14 6378)]);
+
+($port_a, undef, $port_b) = offer('make bundle, accept',
+	{ bundle => ['offer'] }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6374 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+m=video 6376 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:1
+a=rtpmap:0 PCMU/8000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:2
+a=rtpmap:105 H264/90000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+($port_c, undef, $port_d) = answer('make bundle, accept',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio 6378 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:1
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+m=video 6378 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=mid:2
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+isnt($port_a, $port_b, 'different ports');
+isnt($port_a, $port_c, 'different ports');
+isnt($port_a, $port_d, 'different ports');
+isnt($port_b, $port_c, 'different ports');
+isnt($port_b, $port_d, 'different ports');
+isnt($port_c, $port_d, 'different ports');
+
+snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
+rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160, [[1, '1']]));
+
+snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
+rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160));
+
+snd($sock_b, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
+rcv($sock_c, $port_a, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800, [[1, '2']]));
+
+snd($sock_c, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
+rcv($sock_b, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
+
+($port_ax, undef, $port_bx) = offer('make bundle, accept reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6374 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+m=video 6376 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:1
+a=rtpmap:0 PCMU/8000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:2
+a=bundle-only
+a=rtpmap:105 H264/90000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+($port_cx, undef, $port_dx) = answer('make bundle, accept reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio 6378 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:1
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+m=video 6378 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=mid:2
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=rtpmap:0 PCMU/8000
 a=sendrecv
@@ -2153,24 +2548,94 @@ a=sendrecv
 a=rtcp:PORT
 SDP
 
-isnt($port_a, $port_b, 'different ports');
-isnt($port_a, $port_c, 'different ports');
-isnt($port_a, $port_d, 'different ports');
-isnt($port_b, $port_c, 'different ports');
-isnt($port_b, $port_d, 'different ports');
-isnt($port_c, $port_d, 'different ports');
+is($port_a, $port_ax, "same port");
+is($port_a, $port_bx, "same port");
+is($port_c, $port_cx, "same port");
+is($port_d, $port_dx, "same port");
 
-snd($sock_a, $port_c,  rtp(0, 2000, 6000, 0x1234, "\x44" x 160));
-rcv($sock_c, $port_a, rtpm(0, 2000, 6000, 0x1234, "\x44" x 160, [[1, '1']]));
+reverse_tags;
 
-snd($sock_c, $port_a,  rtp(0, 6000, 8000, 0x5678, "\x77" x 160));
-rcv($sock_a, $port_c, rtpm(0, 6000, 8000, 0x5678, "\x77" x 160));
+($port_cx, undef, $port_dx) = offer('make bundle, accept reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio 6378 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:1
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+m=video 6378 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=mid:2
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:1
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:2
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
 
-snd($sock_b, $port_d,  rtp(105, 3000, 4000, 0x6321, "\x33" x 800));
-rcv($sock_c, $port_a, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800, [[1, '2']]));
+($port_ax, undef, $port_bx) = answer('make bundle, accept reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6374 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+m=video 6376 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:1
+a=rtpmap:0 PCMU/8000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:2
+a=rtpmap:105 H264/90000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+is($port_a, $port_ax, "same port");
+is($port_a, $port_bx, "same port");
+is($port_c, $port_cx, "same port");
+is($port_d, $port_dx, "same port");
 
-snd($sock_c, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
-rcv($sock_b, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
 
 
 
@@ -2275,6 +2740,171 @@ rcv($sock_c, $port_a, rtpm(105, 3000, 4000, 0x6321, "\x33" x 800, [[1, '2']]));
 snd($sock_c, $port_b,  rtp(105, 7000, 9000, 0x8741, "\x22" x 800));
 rcv($sock_b, $port_d, rtpm(105, 7000, 9000, 0x8741, "\x22" x 800));
 
+($port_ax, undef, $port_bx) = offer('require bundle, accept reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6386 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+m=video 6388 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:1
+a=rtpmap:0 PCMU/8000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:2
+a=bundle-only
+a=rtpmap:105 H264/90000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+($port_cx, undef, $port_dx) = answer('require bundle, accept reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio 6390 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:1
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+m=video 6390 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=mid:2
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+is($port_a, $port_ax, "same port");
+is($port_b, $port_bx, "same port");
+is($port_c, $port_cx, "same port");
+is($port_d, $port_dx, "same port");
+
+reverse_tags;
+
+($port_cx, undef, $port_dx) = offer('require bundle, accept reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio 6390 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:1
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+m=video 6390 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=mid:2
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:1
+a=rtpmap:0 PCMU/8000
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:2
+a=rtpmap:105 H264/90000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+($port_ax, undef, $port_bx) = answer('require bundle, accept reinvite',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6386 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+m=video 6388 RTP/AVP 105
+c=IN IP4 198.51.100.14
+a=rtpmap:105 H264/90000
+a=sendrecv
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+a=group:BUNDLE 1 2
+m=audio PORT RTP/AVP 0
+c=IN IP4 203.0.113.1
+a=mid:1
+a=rtpmap:0 PCMU/8000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+m=video PORT RTP/AVP 105
+c=IN IP4 203.0.113.1
+a=mid:2
+a=rtpmap:105 H264/90000
+a=extmap-allow-mixed
+a=extmap:1 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+is($port_a, $port_ax, "same port");
+is($port_b, $port_bx, "same port");
+is($port_c, $port_cx, "same port");
+is($port_d, $port_dx, "same port");
+
+
+
 
 
 #done_testing;NGCP::Rtpengine::AutoTest::terminate('f00');exit;