Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
mediastreamer2
Commits
f335883e
Commit
f335883e
authored
Jan 22, 2016
by
jehan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix srtp-dtls issue with FireFox 43
parent
687595ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
src/crypto/dtls_srtp.c
src/crypto/dtls_srtp.c
+3
-2
tools/pcap_playback.c
tools/pcap_playback.c
+2
-2
No files found.
src/crypto/dtls_srtp.c
View file @
f335883e
...
...
@@ -525,7 +525,8 @@ static int ms_dtls_srtp_rtp_process_on_receive(struct _RtpTransportModifier *t,
}
if
(
ctx
->
role
!=
MSDtlsSrtpRoleIsServer
)
{
/* close the connection only if we are client, if we are server, the client may ask again for last packets */
ret
=
ssl_close_notify
(
&
(
ctx
->
rtp_dtls_context
->
ssl
)
);
/*FireFox version 43 requires DTLS channel to be kept openned, probably a bug in FireFox ret = ssl_close_notify( &(ctx->rtp_dtls_context->ssl) );*/
}
}
...
...
@@ -596,7 +597,7 @@ static int ms_dtls_srtp_rtcp_process_on_receive(struct _RtpTransportModifier *t,
ms_dtls_srtp_check_channels_status
(
ctx
);
}
}
ret
=
ssl_close_notify
(
&
(
ctx
->
rtcp_dtls_context
->
ssl
)
);
/*FireFox version 43 requires DTLS channel to be kept openned, probably a bug in FireFox
ret = ssl_close_notify( &(ctx->rtcp_dtls_context->ssl) );
*/
}
return
0
;
...
...
tools/pcap_playback.c
View file @
f335883e
...
...
@@ -208,9 +208,9 @@ static void setup_media_streams(MediastreamDatas *args)
/*create the rtp session */
ortp_init
();
if
(
args
->
is_verbose
)
{
ortp_set_log_level_mask
(
ORTP_DEBUG
|
ORTP_MESSAGE
|
ORTP_WARNING
|
ORTP_ERROR
|
ORTP_FATAL
);
ortp_set_log_level_mask
(
ORTP_LOG_DOMAIN
,
ORTP_DEBUG
|
ORTP_MESSAGE
|
ORTP_WARNING
|
ORTP_ERROR
|
ORTP_FATAL
);
}
else
{
ortp_set_log_level_mask
(
ORTP_MESSAGE
|
ORTP_WARNING
|
ORTP_ERROR
|
ORTP_FATAL
);
ortp_set_log_level_mask
(
ORTP_LOG_DOMAIN
,
ORTP_MESSAGE
|
ORTP_WARNING
|
ORTP_ERROR
|
ORTP_FATAL
);
}
rtp_profile_set_payload
(
&
av_profile
,
110
,
&
payload_type_speex_nb
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment