sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#55283 support generating a=tls-id

Browse Source 
RFC 8842

Change-Id: I197e0e80205f6c732c0f8441091c8fda9191e675
pull/1592/head
Richard Fuchs 3 years ago
parent 5a2981b3ec
commit 8f17f140eb
7 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
daemon/dtls.c
Unescape View File

@ -657,6 +657,8 @@ int dtls_connection_init(struct dtls_connection *d, struct packet_stream *ps, in
d->active = active ? -1 : 0; d->active = active ? -1 : 0;
random_string(d->tls_id, sizeof(d->tls_id));
done: done:
return 0; return 0;

17
daemon/sdp.c
Unescape View File

@ -2376,7 +2376,7 @@ static void insert_candidates(GString *s, struct packet_stream *rtp, struct pack
insert_sfd_candidates(s, rtcp, type_pref, local_pref, cand_type, flags); insert_sfd_candidates(s, rtcp, type_pref, local_pref, cand_type, flags);
} }
static void insert_dtls(GString *s, struct call_media *media) { static void insert_dtls(GString *s, struct call_media *media, struct dtls_connection *dtls) {
unsigned char *p; unsigned char *p;
int i; int i;
const struct dtls_hash_func *hf; const struct dtls_hash_func *hf;
@ -2427,6 +2427,16 @@ static void insert_dtls(GString *s, struct call_media *media) {
g_string_truncate(s, s->len - 1); g_string_truncate(s, s->len - 1);
g_string_append(s, "\r\n"); g_string_append(s, "\r\n");
if (dtls) {
g_string_append(s, "a=tls-id:");
p = dtls->tls_id;
for (i = 0; i < sizeof(dtls->tls_id); i++)
g_string_append_printf(s, "%02x", *p++);
g_string_append(s, "\r\n");
}
} }
static void insert_crypto1(GString *s, struct call_media *media, struct crypto_params_sdes *cps, static void insert_crypto1(GString *s, struct call_media *media, struct crypto_params_sdes *cps,
@ -2602,6 +2612,7 @@ static struct packet_stream *print_sdp_media_section(GString *s, struct call_med
struct sdp_ng_flags *flags, struct sdp_ng_flags *flags,
GList *rtp_ps_link, bool is_active, bool force_end_of_ice) GList *rtp_ps_link, bool is_active, bool force_end_of_ice)
{ {
struct packet_stream *rtp_ps = rtp_ps_link->data;
struct packet_stream *ps_rtcp = NULL; struct packet_stream *ps_rtcp = NULL;
if (media->media_id.s) { if (media->media_id.s) {
@ -2628,7 +2639,7 @@ static struct packet_stream *print_sdp_media_section(GString *s, struct call_med
ps_rtcp = print_rtcp(s, media, rtp_ps_link, flags); ps_rtcp = print_rtcp(s, media, rtp_ps_link, flags);
insert_crypto(s, media, flags); insert_crypto(s, media, flags);
insert_dtls(s, media); insert_dtls(s, media, dtls_ptr(rtp_ps->selected_sfd));
if (proto_is_rtp(media->protocol) && media->ptime) if (proto_is_rtp(media->protocol) && media->ptime)
g_string_append_printf(s, "a=ptime:%i\r\n", media->ptime); g_string_append_printf(s, "a=ptime:%i\r\n", media->ptime);
@ -2644,7 +2655,7 @@ static struct packet_stream *print_sdp_media_section(GString *s, struct call_med
if (MEDIA_ISSET(media, TRICKLE_ICE) && media->ice_agent) if (MEDIA_ISSET(media, TRICKLE_ICE) && media->ice_agent)
g_string_append(s, "a=ice-options:trickle\r\n"); g_string_append(s, "a=ice-options:trickle\r\n");
if (MEDIA_ISSET(media, ICE)) if (MEDIA_ISSET(media, ICE))
insert_candidates(s, rtp_ps_link->data, ps_rtcp, flags, sdp_media); insert_candidates(s, rtp_ps, ps_rtcp, flags, sdp_media);
} }
if (MEDIA_ISSET(media, TRICKLE_ICE) && media->ice_agent) if (MEDIA_ISSET(media, TRICKLE_ICE) && media->ice_agent)

1
include/dtls.h
Unescape View File

@ -53,6 +53,7 @@ struct dtls_connection {
SSL *ssl; SSL *ssl;
BIO *r_bio, *w_bio; BIO *r_bio, *w_bio;
void *ptr; void *ptr;
unsigned char tls_id[16];
unsigned int init:1, unsigned int init:1,
active:1, active:1,
connected:1; connected:1;

1
perl/NGCP/Rtpengine/AutoTest.pm
Unescape View File

@ -135,6 +135,7 @@ sub sdp_match {
$regexp =~ s/FINGERPRINT/([0-9a-fA-F:]{59})/gs; $regexp =~ s/FINGERPRINT/([0-9a-fA-F:]{59})/gs;
$regexp =~ s/SDP_VERSION/\\d+ \\d+/gs; $regexp =~ s/SDP_VERSION/\\d+ \\d+/gs;
$regexp =~ s/RTPE_VERSION/rtpengine-\\S+/gs; $regexp =~ s/RTPE_VERSION/rtpengine-\\S+/gs;
$regexp =~ s/TLS_ID/([0-9a-f]{32})/gs;
my $crlf = crlf($sdp); my $crlf = crlf($sdp);
like $crlf, qr/$regexp/s, "$name - output '$cmd' SDP"; like $crlf, qr/$regexp/s, "$name - output '$cmd' SDP";
my @matches = $crlf =~ qr/$regexp/s; my @matches = $crlf =~ qr/$regexp/s;

3
t/auto-daemon-tests-pubsub.pl
Unescape View File

@ -2584,6 +2584,7 @@ a=crypto:9 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:10 NULL_HMAC_SHA1_32 inline:CRYPTO128 a=crypto:10 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
is $ftr, ft(), 'from-tag matches'; is $ftr, ft(), 'from-tag matches';
@ -2690,6 +2691,7 @@ a=crypto:9 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:10 NULL_HMAC_SHA1_32 inline:CRYPTO128 a=crypto:10 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
is $ftr, ft(), 'from-tag matches'; is $ftr, ft(), 'from-tag matches';
@ -2758,6 +2760,7 @@ a=crypto:133 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:134 NULL_HMAC_SHA1_32 inline:CRYPTO128 a=crypto:134 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
($port_b) = answer('SRTP call RTP sub', ($port_b) = answer('SRTP call RTP sub',

12
t/auto-daemon-tests-websocket.py
Unescape View File

@ -522,6 +522,7 @@ class TestVideoroom(unittest.TestCase):
"a=rtcp-mux\r\n" "a=rtcp-mux\r\n"
"a=setup:actpass\r\n" "a=setup:actpass\r\n"
"a=fingerprint:sha-256 .{95}\r\n" "a=fingerprint:sha-256 .{95}\r\n"
"a=tls-id:[0-9a-f]{32}\r\n"
"a=ice-ufrag:.{8}\r\n" "a=ice-ufrag:.{8}\r\n"
"a=ice-pwd:.{26}\r\n" "a=ice-pwd:.{26}\r\n"
"a=ice-options:trickle\r\n" "a=ice-options:trickle\r\n"
@ -699,7 +700,8 @@ class TestVideoroom(unittest.TestCase):
"a=recvonly\r\n" "a=recvonly\r\n"
"a=rtcp:\d+\r\n" "a=rtcp:\d+\r\n"
"a=setup:active\r\n" "a=setup:active\r\n"
"a=fingerprint:sha-256 .{95}\r\n$", "a=fingerprint:sha-256 .{95}\r\n"
"a=tls-id:[0-9a-f]{32}\r\n$",
re.DOTALL, re.DOTALL,
), ),
) )
@ -876,7 +878,8 @@ class TestVideoroom(unittest.TestCase):
"a=recvonly\r\n" "a=recvonly\r\n"
"a=rtcp:\d+\r\n" "a=rtcp:\d+\r\n"
"a=setup:active\r\n" "a=setup:active\r\n"
"a=fingerprint:sha-256 .{95}\r\n$", "a=fingerprint:sha-256 .{95}\r\n"
"a=tls-id:[0-9a-f]{32}\r\n$",
re.DOTALL, re.DOTALL,
), ),
) )
@ -1212,6 +1215,7 @@ class TestVideoroom(unittest.TestCase):
"a=rtcp-mux\r\n" "a=rtcp-mux\r\n"
"a=setup:active\r\n" "a=setup:active\r\n"
"a=fingerprint:sha-256 .{95}\r\n" "a=fingerprint:sha-256 .{95}\r\n"
"a=tls-id:[0-9a-f]{32}\r\n"
"a=ice-ufrag:.{8}\r\n" "a=ice-ufrag:.{8}\r\n"
"a=ice-pwd:.{26}\r\n" "a=ice-pwd:.{26}\r\n"
"a=ice-options:trickle\r\n" "a=ice-options:trickle\r\n"
@ -1231,6 +1235,7 @@ class TestVideoroom(unittest.TestCase):
"a=rtcp-mux\r\n" "a=rtcp-mux\r\n"
"a=setup:active\r\n" "a=setup:active\r\n"
"a=fingerprint:sha-256 .{95}\r\n" "a=fingerprint:sha-256 .{95}\r\n"
"a=tls-id:[0-9a-f]{32}\r\n"
"a=ice-ufrag:.{8}\r\n" "a=ice-ufrag:.{8}\r\n"
"a=ice-pwd:.{26}\r\n" "a=ice-pwd:.{26}\r\n"
"a=ice-options:trickle\r\n" "a=ice-options:trickle\r\n"
@ -1313,6 +1318,7 @@ class TestVideoroom(unittest.TestCase):
"a=rtcp-mux\r\n" "a=rtcp-mux\r\n"
"a=setup:actpass\r\n" "a=setup:actpass\r\n"
"a=fingerprint:sha-256 .{95}\r\n" "a=fingerprint:sha-256 .{95}\r\n"
"a=tls-id:[0-9a-f]{32}\r\n"
"a=ice-ufrag:.{8}\r\n" "a=ice-ufrag:.{8}\r\n"
"a=ice-pwd:.{26}\r\n" "a=ice-pwd:.{26}\r\n"
"a=ice-options:trickle\r\n" "a=ice-options:trickle\r\n"
@ -1353,6 +1359,7 @@ class TestVideoroom(unittest.TestCase):
"a=rtcp-mux\r\n" "a=rtcp-mux\r\n"
"a=setup:actpass\r\n" "a=setup:actpass\r\n"
"a=fingerprint:sha-256 .{95}\r\n" "a=fingerprint:sha-256 .{95}\r\n"
"a=tls-id:[0-9a-f]{32}\r\n"
"a=ice-ufrag:.{8}\r\n" "a=ice-ufrag:.{8}\r\n"
"a=ice-pwd:.{26}\r\n" "a=ice-pwd:.{26}\r\n"
"a=ice-options:trickle\r\n" "a=ice-options:trickle\r\n"
@ -1554,6 +1561,7 @@ class TestVideoroom(unittest.TestCase):
"a=rtcp-mux\r\n" "a=rtcp-mux\r\n"
"a=setup:actpass\r\n" "a=setup:actpass\r\n"
"a=fingerprint:sha-256 .{95}\r\n" "a=fingerprint:sha-256 .{95}\r\n"
"a=tls-id:[0-9a-f]{32}\r\n"
"a=ice-ufrag:.{8}\r\n" "a=ice-ufrag:.{8}\r\n"
"a=ice-pwd:.{26}\r\n" "a=ice-pwd:.{26}\r\n"
"a=ice-options:trickle\r\n" "a=ice-options:trickle\r\n"

11
t/auto-daemon-tests.pl
Unescape View File

@ -8006,6 +8006,7 @@ a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
answer('fingerprint selection', { answer('fingerprint selection', {
@ -8058,6 +8059,7 @@ a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
@ -8094,6 +8096,7 @@ a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=setup:actpass a=setup:actpass
a=fingerprint:sha-1 FINGERPRINT a=fingerprint:sha-1 FINGERPRINT
a=tls-id:TLS_ID
SDP SDP
answer('fingerprint selection', { answer('fingerprint selection', {
@ -8146,6 +8149,7 @@ a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=setup:actpass a=setup:actpass
a=fingerprint:sha-1 FINGERPRINT a=fingerprint:sha-1 FINGERPRINT
a=tls-id:TLS_ID
SDP SDP
new_call; new_call;
@ -8181,6 +8185,7 @@ a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
@ -8233,6 +8238,7 @@ a=crypto:11 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128 a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
rtpe_req('delete', 'GH 1086', { 'from-tag' => ft() }); rtpe_req('delete', 'GH 1086', { 'from-tag' => ft() });
@ -8278,6 +8284,7 @@ a=crypto:11 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128 a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
@ -8675,6 +8682,7 @@ a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=setup:active a=setup:active
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
@ -8728,6 +8736,7 @@ a=sendrecv
a=rtcp:PORT a=rtcp:PORT
a=setup:passive a=setup:passive
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
SDP SDP
@ -8845,6 +8854,7 @@ a=crypto:11 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128 a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
a=ptime:20 a=ptime:20
SDP SDP
@ -8963,6 +8973,7 @@ a=crypto:11 NULL_HMAC_SHA1_80 inline:CRYPTO128
a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128 a=crypto:12 NULL_HMAC_SHA1_32 inline:CRYPTO128
a=setup:actpass a=setup:actpass
a=fingerprint:sha-256 FINGERPRINT256 a=fingerprint:sha-256 FINGERPRINT256
a=tls-id:TLS_ID
a=ptime:20 a=ptime:20
SDP SDP

Write Preview
Loading…
Cancel
Save