Skip to content

V
vlc-1.1
Commit d02fbdb8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Handle TTL in SDP properly (IPv4 at least) for raw UDP (closes #404)

parent cae770e5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/stream_out/standard.c
View file @ d02fbdb8
...@@ -353,8 +353,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -353,8 +353,7 @@ static int Open( vlc_object_t *p_this )
p_session->psz_sdp = NULL; p_session->psz_sdp = NULL;
var_Get( p_access, "sout-udp-ttl", &val ); var_Get( p_access, "sout-udp-ttl", &val );
p_session->i_ttl = val.i_int ? p_session->i_ttl = val.i_int;
val.i_int : config_GetInt( p_sout, "ttl" );
p_session->i_payload = 33; p_session->i_payload = 33;
p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0; p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0;
......
src/stream_output/sap.c
View file @ d02fbdb8
...@@ -616,7 +616,9 @@ static char *SDPGenerate( sap_handler_t *p_sap, ...@@ -616,7 +616,9 @@ static char *SDPGenerate( sap_handler_t *p_sap,
"%s%s%s", "%s%s%s",
i_sdp_id, i_sdp_version, i_sdp_id, i_sdp_version,
ipv, p_addr->psz_machine, ipv, p_addr->psz_machine,
psz_name, ipv, psz_uri, p_session->i_ttl, psz_name, ipv, psz_uri,
/* FIXME: 1 is IPv4 default TTL, not that of IPv6 */
p_session->i_ttl ?: (config_GetInt( p_sap, "ttl" ) ?: 1),
p_session->i_port, p_session->i_port,
p_session->b_rtp ? "RTP/AVP" : "udp", p_session->b_rtp ? "RTP/AVP" : "udp",
p_session->i_payload, p_session->i_payload,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment