diff --git a/t/auto-daemon-tests-bundle.pl b/t/auto-daemon-tests-bundle.pl
index d1c944ae2..81e754e59 100755
--- a/t/auto-daemon-tests-bundle.pl
+++ b/t/auto-daemon-tests-bundle.pl
@@ -705,5 +705,546 @@ a=rtcp:PORT
 SDP
 
 
+
+
+
+($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('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 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 6216 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
+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=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',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.100.1
+s=tester
+t=0 0
+m=audio 6218 RTP/AVP 0
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:a
+m=video 6220 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
+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=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
+
+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));
+
+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));
+
+# 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);
+
+
+
+
+($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',
+	{ 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
+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
+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
+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
+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('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 6226 RTP/AVP 0 100
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:a
+a=rtpmap:100 foobar/1000
+m=video 6228 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
+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));
+
+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));
+
+# 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 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',
+	{ 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
+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
+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
+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=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('optional 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
+c=IN IP4 198.51.100.14
+a=sendrecv
+a=mid:a
+m=video 7120 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
+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=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
+
+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));
+
+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)); # XXX wrong socket
+
+# 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);
+
+
+
+
+($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('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 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 7122 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
+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=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=sendrecv
+a=rtcp:PORT
+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 7126 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
+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
+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));
+
+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)); # XXX wrong socket
+
+# 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);
+
+
+
+
+
+
 #done_testing;NGCP::Rtpengine::AutoTest::terminate('f00');exit;
 done_testing();