Skip to content

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

Backport [19747]: IPv6 SDP TTL removal

parent 68733f63
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
modules/stream_out/rtp.c
View file @ 09c7494d
...@@ -828,7 +828,7 @@ static char *SDPGenerate( const sout_stream_t *p_stream, ...@@ -828,7 +828,7 @@ static char *SDPGenerate( const sout_stream_t *p_stream,
p += sprintf( p, "v=0\r\n" ); p += sprintf( p, "v=0\r\n" );
p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n", p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n",
p_sys->i_sdp_id, p_sys->i_sdp_version, p_sys->i_sdp_id, p_sys->i_sdp_version,
ipv, ipv == '6' ? "::" : "127.0.0.1" ); ipv, ipv == '6' ? "::1" : "127.0.0.1" );
if( *p_sys->psz_session_name ) if( *p_sys->psz_session_name )
p += sprintf( p, "s=%s\r\n", p_sys->psz_session_name ); p += sprintf( p, "s=%s\r\n", p_sys->psz_session_name );
if( *p_sys->psz_session_description ) if( *p_sys->psz_session_description )
...@@ -843,16 +843,13 @@ static char *SDPGenerate( const sout_stream_t *p_stream, ...@@ -843,16 +843,13 @@ static char *SDPGenerate( const sout_stream_t *p_stream,
p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination ); p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination );
if( net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) ) if( ( ipv == 4 )
&& net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) )
{ {
/* Add the ttl if it is a multicast address */ /* Add the deprecated TTL field if it is an IPv4 multicast address */
/* FIXME: 1 is not a correct default value in the case of IPv6 */ p += sprintf( p, "/%d", p_sys->i_ttl ?: 1 );
p += sprintf( p, "/%d\r\n", p_sys->i_ttl ?: 1 );
}
else
{
p += sprintf( p, "\r\n" );
} }
p += sprintf( p, "\r\n" );
for( i = 0; i < p_sys->i_es; i++ ) for( i = 0; i < p_sys->i_es; i++ )
{ {
......
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