MT#55283 SSRC substitution re-encrypts, and each sink gets its own copy

A sink that substitutes the SSRC rewrites the header the sender authenticated,
so it re-encrypts the packet. A fixed egress SSRC on a stream forwarded under
the sender's key used to reach the receiver with the sender's authentication
tag over the rewritten header, and the receiver dropped every packet. The
predicate is the one the kernel module already uses for ssrc_subst: echo,
transcoding or a fixed egress SSRC.

The handlers rewrite the packet in place while every sink of the stream is
handed the same received buffer, so a fixed egress SSRC, the sequence offset
and an injected DTMF event used to reach the next sink too, and after an event
the next sink read a header on the handler's stack. The sink loop now starts
every sink from the packet as received and gives each one its own copy unless
it is the last, as it already did for RTCP.

Closes #2209

Change-Id: I265d6b2d3eeac4effcbc76dcd65bd1d3fe8d2ba1
pull/2223/head
Nikolay Feshenko 4 weeks ago committed by Richard Fuchs
parent f89eec4a06
commit 467a7f8d5f

@ -1790,6 +1790,11 @@ static const char *kernelize_target(kernelize_state *s, struct packet_stream *st
return NULL;
}
// the kernel's ssrc_subst cases: echo, transcoding or a fixed egress SSRC
static bool sink_substitutes_ssrc(struct call_media *in, const struct sink_handler *sh, struct call_media *out) {
return MEDIA_ISSET(in, ECHO) || sh->attrs.transcoding || (out && out->fixed_egress_ssrc);
}
/**
* The linkage between userspace and kernel module is in the kernelize_one().
*
@ -1889,8 +1894,7 @@ static const char *kernelize_one(kernelize_state *s,
}
if (MEDIA_ISSET(media, ECHO) || sink_handler->attrs.transcoding
|| sink->media->fixed_egress_ssrc)
if (sink_substitutes_ssrc(media, sink_handler, sink->media))
redi->output.ssrc_subst = 1;
__re_address_translate_ep(&redi->output.dst_addr, &sink->endpoint);
@ -2623,7 +2627,7 @@ const struct streamhandler *determine_sink_handler(struct packet_stream *in, str
must_recrypt = true;
else if (ML_ISSET(in->media->monologue, INJECT_DTMF) || (out && ML_ISSET(out->media->monologue, INJECT_DTMF)))
must_recrypt = true;
else if (sh->attrs.transcoding)
else if (sink_substitutes_ssrc(media_in, sh, media_out)) // the header is rewritten: the packet is encrypted anew
must_recrypt = true;
else if (in->call->recording)
must_recrypt = true;
@ -3487,6 +3491,22 @@ void media_packet_release(struct media_packet *mp) {
}
// gives a sink its own copy of the packet to rewrite, with the header, payload and extensions pointing into it
static void media_packet_sink_copy(struct media_packet *mp, GQueue *free_list) {
char *buf = bufferpool_alloc(media_bufferpool, mp->raw.len + RTP_BUFFER_TAIL_ROOM);
memcpy(buf, mp->raw.s, mp->raw.len);
g_queue_push_tail(free_list, buf);
if (mp->rtp)
mp->rtp = (void *) (buf + ((char *) mp->rtp - mp->raw.s));
if (mp->rtcp)
mp->rtcp = (void *) (buf + ((char *) mp->rtcp - mp->raw.s));
if (mp->payload.s)
mp->payload.s = buf + (mp->payload.s - mp->raw.s);
if (mp->extensions.s)
mp->extensions.s = buf + (mp->extensions.s - mp->raw.s);
mp->raw.s = buf;
}
static int media_packet_queue_dup(codec_packet_q *q) {
IQUEUE_FOREACH(q, p) {
if (p->free_func) // nothing to do, already private
@ -3661,12 +3681,26 @@ static int stream_packet(struct packet_handler_ctx *phc) {
///////////////// EGRESS HANDLING
str orig_raw = STR_NULL;
// the handlers may rewrite the packet in place, but we may have multiple outputs: every sink
// starts from the packet as received and gets its own copy of it unless it's the last one
const str orig_raw = phc->mp.raw;
struct rtp_header *const orig_rtp = phc->mp.rtp;
struct rtcp_packet *const orig_rtcp = phc->mp.rtcp;
const str orig_payload = phc->mp.payload;
const str orig_extensions = phc->mp.extensions;
for (__auto_type sh_link = phc->sinks->head; sh_link; sh_link = sh_link->next) {
struct sink_handler *sh = sh_link->data;
struct packet_stream *sink = sh->bundle_sink;
phc->mp.raw = orig_raw;
phc->mp.rtp = orig_rtp;
phc->mp.rtcp = orig_rtcp;
phc->mp.payload = orig_payload;
phc->mp.extensions = orig_extensions;
if (sh_link->next)
media_packet_sink_copy(&phc->mp, &free_list);
// this sets rtcp, in_srtp, out_srtp, media_out, and sink
media_packet_rtcp_mux(phc, sh);
@ -3678,16 +3712,6 @@ static int stream_packet(struct packet_handler_ctx *phc) {
if (phc->rtcp) {
phc->rtcp_discard = false;
handler_ret = -1;
// these functions may do in-place rewriting, but we may have multiple
// outputs - make a copy if this isn't the last sink
if (sh_link->next) {
if (!orig_raw.s)
orig_raw = phc->mp.raw;
char *buf = bufferpool_alloc(media_bufferpool, orig_raw.len + RTP_BUFFER_TAIL_ROOM);
memcpy(buf, orig_raw.s, orig_raw.len);
phc->mp.raw.s = buf;
g_queue_push_tail(&free_list, buf);
}
if (do_rtcp_parse(phc))
goto out;
if (phc->rtcp_discard)

@ -9943,6 +9943,114 @@ rcv($sock_b, $port_a, rtpm(8, 1010, 4280, 0x1234, "\x00" x 160));
# inject DTMF with passthrough: a second sink of the stream receives the packets as sent
($sock_a, $sock_b, $sock_c) = new_call([qw(198.51.100.50 3070)], [qw(198.51.100.50 3072)],
[qw(198.51.100.50 3074)]);
($port_a) = offer('inject passthrough, second sink',
{ flags => [qw(inject-DTMF)] }, <<SDP);
v=0
o=- 1545997027 1 IN IP4 198.51.100.11
s=tester
t=0 0
m=audio 3070 RTP/AVP 8 101
c=IN IP4 198.51.100.50
a=sendrecv
a=rtpmap:101 telephone-event/8000
----------------------------------
v=0
o=- 1545997027 1 IN IP4 198.51.100.11
s=tester
t=0 0
m=audio PORT RTP/AVP 8 101
c=IN IP4 203.0.113.1
a=rtpmap:8 PCMA/8000
a=rtpmap:101 telephone-event/8000
a=sendrecv
a=rtcp:PORT
SDP
($port_b) = answer('inject passthrough, second sink',
{ flags => [qw(inject-DTMF)] }, <<SDP);
v=0
o=- 1545997027 1 IN IP4 198.51.100.11
s=tester
t=0 0
m=audio 3072 RTP/AVP 8 101
c=IN IP4 198.51.100.50
a=sendrecv
a=rtpmap:101 telephone-event/8000
----------------------------------
v=0
o=- 1545997027 1 IN IP4 198.51.100.11
s=tester
t=0 0
m=audio PORT RTP/AVP 8 101
c=IN IP4 203.0.113.1
a=rtpmap:8 PCMA/8000
a=rtpmap:101 telephone-event/8000
a=sendrecv
a=rtcp:PORT
SDP
$resp = rtpe_req('subscribe request', 'second sink of A',
{ 'from-tag' => ft(), 'to-tag' => 'second-sink' });
($port_c) = $resp->{sdp} =~ /m=audio (\d+) RTP\/AVP 8 101/;
ok($port_c, 'second sink of A has a media port');
subscribe_answer('second sink of A', { 'to-tag' => 'second-sink' }, <<SDP);
v=0
o=- 1545997027 1 IN IP4 198.51.100.11
s=tester
t=0 0
m=audio 3074 RTP/AVP 8 101
c=IN IP4 198.51.100.50
a=rtpmap:8 PCMA/8000
a=rtpmap:101 telephone-event/8000
a=sendrecv
SDP
snd($sock_a, $port_b, rtp(8, 1000, 3000, 0x1234, "\x00" x 160));
rcv($sock_b, $port_a, rtpm(8, 1000, 3000, 0x1234, "\x00" x 160));
rcv($sock_c, $port_c, rtpm(8, 1000, 3000, 0x1234, "\x00" x 160));
snd($sock_a, $port_b, rtp(8, 1001, 3160, 0x1234, "\x00" x 160));
rcv($sock_b, $port_a, rtpm(8, 1001, 3160, 0x1234, "\x00" x 160));
rcv($sock_c, $port_c, rtpm(8, 1001, 3160, 0x1234, "\x00" x 160));
snd($sock_a, $port_b, rtp(8, 1002, 3320, 0x1234, "\x00" x 160));
rcv($sock_b, $port_a, rtpm(8, 1002, 3320, 0x1234, "\x00" x 160));
rcv($sock_c, $port_c, rtpm(8, 1002, 3320, 0x1234, "\x00" x 160));
$resp = rtpe_req('play DTMF', 'inject DTMF towards B beside a second sink',
{ 'from-tag' => ft(), code => '0', volume => 10, duration => 100 });
# B gets the event, the second sink gets the packets as A sent them
snd($sock_a, $port_b, rtp(8, 1003, 3480, 0x1234, "\x00" x 160));
rcv($sock_b, $port_a, rtpm(101 | 0x80, 1003, 3480, 0x1234, "\x00\x0a\x00\xa0"));
rcv($sock_c, $port_c, rtpm(8, 1003, 3480, 0x1234, "\x00" x 160));
snd($sock_a, $port_b, rtp(8, 1004, 3640, 0x1234, "\x00" x 160));
rcv($sock_b, $port_a, rtpm(101, 1004, 3480, 0x1234, "\x00\x0a\x01\x40"));
rcv($sock_c, $port_c, rtpm(8, 1004, 3640, 0x1234, "\x00" x 160));
snd($sock_a, $port_b, rtp(8, 1005, 3800, 0x1234, "\x00" x 160));
rcv($sock_b, $port_a, rtpm(101, 1005, 3480, 0x1234, "\x00\x0a\x01\xe0"));
rcv($sock_c, $port_c, rtpm(8, 1005, 3800, 0x1234, "\x00" x 160));
snd($sock_a, $port_b, rtp(8, 1006, 3960, 0x1234, "\x00" x 160));
rcv($sock_b, $port_a, rtpm(101, 1006, 3480, 0x1234, "\x00\x0a\x02\x80"));
rcv($sock_c, $port_c, rtpm(8, 1006, 3960, 0x1234, "\x00" x 160));
snd($sock_a, $port_b, rtp(8, 1007, 4120, 0x1234, "\x00" x 160));
# end event
rcv($sock_b, $port_a, rtpm(101, 1007, 3480, 0x1234, "\x00\x8a\x03\x20"));
rcv($sock_b, $port_a, rtpm(101, 1008, 3480, 0x1234, "\x00\x8a\x03\x20"));
rcv($sock_b, $port_a, rtpm(101, 1009, 3480, 0x1234, "\x00\x8a\x03\x20"));
rcv($sock_c, $port_c, rtpm(8, 1007, 4120, 0x1234, "\x00" x 160));
# B continues after the event's three end packets, the second sink with A's own numbering
snd($sock_a, $port_b, rtp(8, 1008, 4280, 0x1234, "\x00" x 160));
rcv($sock_b, $port_a, rtpm(8, 1010, 4280, 0x1234, "\x00" x 160));
rcv($sock_c, $port_c, rtpm(8, 1008, 4280, 0x1234, "\x00" x 160));
# inject DTMF to SRTP with passthrough
($sock_a, $sock_b) = new_call([qw(198.51.100.50 3056)], [qw(198.51.100.50 3058)]);

Loading…
Cancel
Save