* Preamble
*****************************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <vlc_url.h>
#include <vlc_network.h>
#include <vlc_charset.h>
+#include <vlc_strings.h>
/*****************************************************************************
* Module descriptor
ppsz_sout_options, p_stream->p_cfg );
p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
- p_sys->psz_destination = var_GetString( p_stream, SOUT_CFG_PREFIX "dst" );
- if( *p_sys->psz_destination == '\0' )
- {
- free( p_sys->psz_destination );
- p_sys->psz_destination = NULL;
- }
-
+ p_sys->psz_destination = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "dst" );
p_sys->psz_session_name = var_GetString( p_stream, SOUT_CFG_PREFIX "name" );
p_sys->psz_session_description = var_GetString( p_stream, SOUT_CFG_PREFIX "description" );
p_sys->psz_session_url = var_GetString( p_stream, SOUT_CFG_PREFIX "url" );
return VLC_EGENERIC;
}
- var_Get( p_stream, SOUT_CFG_PREFIX "ttl", &val );
- if( val.i_int == 0 )
+ p_sys->i_ttl = var_GetInteger( p_stream, SOUT_CFG_PREFIX "ttl" );
+ if( p_sys->i_ttl == 0 )
{
/* Normally, we should let the default hop limit up to the core,
* but we have to know it to build our SDP properly, which is why
* we ask the core. FIXME: broken when neither sout-rtp-ttl nor
* ttl are set. */
- val.i_int = config_GetInt( p_stream, "ttl" );
+ p_sys->i_ttl = config_GetInt( p_stream, "ttl" );
}
- if( val.i_int > 255 ) val.i_int = 255;
+ if( p_sys->i_ttl > 255 )
+ p_sys->i_ttl = 255;
/* must not exceed 999 once formatted */
- if( val.i_int < 0 )
- msg_Warn( p_stream, "illegal TTL %d, the SDP advertised value will be faked", val.i_int );
- p_sys->i_ttl = val.i_int;
-
- var_Get( p_stream, SOUT_CFG_PREFIX "mp4a-latm", &val );
- p_sys->b_latm = val.b_bool;
+ p_sys->b_latm = var_GetBool( p_stream, SOUT_CFG_PREFIX "mp4a-latm" );
p_sys->i_payload_type = 96;
p_sys->i_es = 0;
{
sout_access_out_t *p_grab;
const char *psz_rtpmap;
- char url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv;
+ char url[NI_MAXHOST + 8], access[22], psz_ttl[5], ipv;
if( b_rtsp )
{
}
else if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
{
- msg_Err( p_stream, "rtp needs a destination when muxing" );
+ msg_Err( p_stream, "RTP needs a destination when muxing" );
free( p_sys );
return VLC_EGENERIC;
}
/* Check muxer type */
- if( !strncasecmp( val.psz_string, "ps", 2 ) || !strncasecmp( val.psz_string, "mpeg1", 5 ) )
+ if( !strncasecmp( val.psz_string, "ps", 2 )
+ || !strncasecmp( val.psz_string, "mpeg1", 5 ) )
{
psz_rtpmap = "MP2P/90000";
}
/* create the access out */
if( p_sys->i_ttl > 0 )
{
- sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl );
+ sprintf( access, "udp{raw,rtcp,ttl=%d}", p_sys->i_ttl );
}
else
{
- sprintf( access, "udp{raw}" );
+ strcat( access, "udp{raw,rtcp}" );
}
- /* IPv6 needs brackets if not already present */
- snprintf( url, sizeof( url ),
- ( ( p_sys->psz_destination[0] != '[' )
- && ( strchr( p_sys->psz_destination, ':' ) != NULL ) )
- ? "[%s]:%d" : "%s:%d", p_sys->psz_destination,
- p_sys->i_port );
- url[sizeof( url ) - 1] = '\0';
/* FIXME: we should check that url is a numerical address, otherwise
* the SDP will be quite broken (regardless of the IP protocol version)
* Also it might be IPv6 with no ':' if it is a DNS name.
*/
ipv = ( strchr( p_sys->psz_destination, ':' ) != NULL ) ? '6' : '4';
+ /* IPv6 needs brackets if not already present */
+ if ((ipv == '6') && (p_sys->psz_destination[0] != '['))
+ snprintf (url, sizeof (url), "[%s]:%d",p_sys->psz_destination,
+ p_sys->i_port);
+ else
+ snprintf (url, sizeof (url), "%s:%d",p_sys->psz_destination,
+ p_sys->i_port);
+
if( !( p_sys->p_access = sout_AccessOutNew( p_sout, access, url ) ) )
{
msg_Err( p_stream, "cannot create the access out for %s://%s",
a= source-filter: we need our source address
a= x-plgroup: (missing)
RTP packets need to get the correct src IP address */
- if( ipv == 4 && net_AddressIsMulticast( VLC_OBJECT(p_stream), p_sys->psz_destination ) )
+ if( ipv == '4'
+ && net_AddressIsMulticast( VLC_OBJECT(p_stream), p_sys->psz_destination ) )
{
snprintf( psz_ttl, sizeof( psz_ttl ), "/%d", p_sys->i_ttl );
psz_ttl[sizeof( psz_ttl ) - 1] = '\0';
if( p_cfg->psz_value == NULL || *p_cfg->psz_value == '\0' )
continue;
- if( !strcmp( p_cfg->psz_value, val.psz_string ) ) /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */
+ /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */
+ if( !strcmp( p_cfg->psz_value, val.psz_string ) )
continue;
SDPHandleUrl( p_stream, p_cfg->psz_value );
block_Release( p_sys->packet );
}
if( p_sys->b_export_sap )
- {
+ {
p_sys->p_mux = NULL;
SapSetup( p_stream );
}
sizeof( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) +
sizeof( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) +
sizeof( "t=0 0\r\n" ) + /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
+ sizeof( "b=RR:0\r\n" ) +
sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) +
sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 +
strlen( psz_destination ) ;
sout_stream_id_t *id = p_sys->es[i];
i_size += strlen( "m=**d*o * RTP/AVP *\r\n" ) + 10 + 10;
+ if ( id->i_bitrate )
+ {
+ i_size += strlen( "b=AS: *\r\n") + 10;
+ }
if( id->psz_rtpmap )
{
i_size += strlen( "a=rtpmap:* *\r\n" ) + strlen( id->psz_rtpmap )+10;
{
i_size += strlen( "a=fmtp:* *\r\n" ) + strlen( id->psz_fmtp ) + 10;
}
- if ( id->i_bitrate)
- {
- i_size += strlen( "b=AS: *\r\n") + 10;
- }
if( b_rtsp )
{
i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10;
p += sprintf( p, "v=0\r\n" );
p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n",
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 )
p += sprintf( p, "s=%s\r\n", p_sys->psz_session_name );
if( *p_sys->psz_session_description )
p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination );
- if( net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) )
- {
- /* Add the ttl if it is a multicast address */
- /* FIXME: 1 is not a correct default value in the case of IPv6 */
- p += sprintf( p, "/%d\r\n", p_sys->i_ttl ? p_sys->i_ttl : 1 );
- }
- else
+ if( ( ipv == 4 )
+ && net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) )
{
- p += sprintf( p, "\r\n" );
+ /* Add the deprecated TTL field if it is an IPv4 multicast address */
+ p += sprintf( p, "/%d", p_sys->i_ttl ?: 1 );
}
+ p += sprintf( p, "\r\n" );
+ p += sprintf( p, "b=RR:0\r\n" );
for( i = 0; i < p_sys->i_es; i++ )
{
{
continue;
}
+ if ( id->i_bitrate )
+ {
+ p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate);
+ }
if( id->psz_rtpmap )
{
p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type,
p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type,
id->psz_fmtp );
}
- if ( id->i_bitrate)
- {
- p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate);
- }
if( b_rtsp )
{
p += sprintf( p, "a=control:/trackID=%d\r\n", i );
if( p_sys->psz_destination )
{
- char access[17];
+ char access[22];
char url[NI_MAXHOST + 8];
/* first try to create the access out */
if( p_sys->i_ttl )
{
- snprintf( access, sizeof( access ), "udp{raw,ttl=%d}",
+ snprintf( access, sizeof( access ), "udp{raw,rtcp,ttl=%d}",
p_sys->i_ttl );
access[sizeof( access ) - 1] = '\0';
}
else
- strcpy( access, "udp{raw}" );
+ strcpy( access, "udp{raw,rtcp}" );
snprintf( url, sizeof( url ), (( p_sys->psz_destination[0] != '[' ) &&
strchr( p_sys->psz_destination, ':' )) ? "[%s]:%d" : "%s:%d",
i_size = i_buffer;
for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++)
{
- if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
+ if( !memcmp (p_buffer + i_offset, "\x00\x00\x00\x01", 4 ) )
{
/* we found another startcode */
i_size = i_offset;
break;
- }
+ }
}
if( i_nal_type == 7 )
{
if( id->p_rtsp_url )
{
+ httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_DESCRIBE, RtspCallbackId, (void*)id );
httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_SETUP, RtspCallbackId, (void*)id );
- //httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream );
- //httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream );
+ httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallbackId, (void*)id );
+ httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallbackId, (void*)id );
+ httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_TEARDOWN, RtspCallbackId, (void*)id );
}
}
return VLC_EGENERIC;
}
httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_DESCRIBE, RtspCallback, (void*)p_stream );
+ httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_SETUP, RtspCallback, (void*)p_stream );
httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream );
httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream );
httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_TEARDOWN, RtspCallback, (void*)p_stream );
char *psz_destination = p_sys->psz_destination;
const char *psz_session = NULL;
const char *psz_cseq = NULL;
- int i_cseq = 0;
if( answer == NULL || query == NULL )
{
answer->i_proto = HTTPD_PROTO_RTSP;
answer->i_version= query->i_version;
answer->i_type = HTTPD_MSG_ANSWER;
+ answer->i_body = 0;
+ answer->p_body = NULL;
+ if( httpd_MsgGet( query, "Require" ) != NULL )
+ answer->i_status = 551;
+ else
switch( query->i_type )
{
case HTTPD_MSG_DESCRIBE:
char *psz_sdp = SDPGenerate( p_stream, psz_destination ? psz_destination : "0.0.0.0", VLC_TRUE );
answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
+ httpd_MsgAdd( answer, "Content-Type", "%s", "application/sdp" );
httpd_MsgAdd( answer, "Content-Base", "%s", p_sys->psz_rtsp_control );
answer->p_body = (uint8_t *)psz_sdp;
answer->i_body = strlen( psz_sdp );
break;
}
+ case HTTPD_MSG_SETUP:
+ answer->i_status = 459;
+ break;
+
case HTTPD_MSG_PLAY:
{
rtsp_client_t *rtsp;
/* for now only multicast so easy */
answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
psz_session = httpd_MsgGet( query, "Session" );
rtsp = RtspClientGet( p_stream, psz_session );
}
break;
}
+
case HTTPD_MSG_PAUSE:
- /* FIXME */
- return VLC_EGENERIC;
+ answer->i_status = 405;
+ httpd_MsgAdd( answer, "Allow", "DESCRIBE, PLAY, TEARDOWN" );
+ break;
+
case HTTPD_MSG_TEARDOWN:
{
rtsp_client_t *rtsp;
/* for now only multicast so easy again */
answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
psz_session = httpd_MsgGet( query, "Session" );
rtsp = RtspClientGet( p_stream, psz_session );
default:
return VLC_EGENERIC;
}
+
httpd_MsgAdd( answer, "Server", PACKAGE_STRING );
httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
psz_cseq = httpd_MsgGet( query, "Cseq" );
- if( psz_cseq )
- i_cseq = atoi( psz_cseq );
- else
- i_cseq = 0;
- httpd_MsgAdd( answer, "Cseq", "%d", i_cseq );
+ httpd_MsgAdd( answer, "Cseq", "%s", psz_cseq ? psz_cseq : "0" );
httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
if( psz_session )
return VLC_SUCCESS;
}
+
+/** Finds the next transport choice */
+static inline const char *transport_next( const char *str )
+{
+ /* Looks for comma */
+ str = strchr( str, ',' );
+ if( str == NULL )
+ return NULL; /* No more transport options */
+
+ str++; /* skips comma */
+ while( strchr( "\r\n\t ", *str ) )
+ str++;
+
+ return (*str) ? str : NULL;
+}
+
+
+/** Finds the next transport parameter */
+static inline const char *parameter_next( const char *str )
+{
+ while( strchr( ",;", *str ) == NULL )
+ str++;
+
+ return (*str == ';') ? (str + 1) : NULL;
+}
+
+
static int RtspCallbackId( httpd_callback_sys_t *p_args,
- httpd_client_t *cl,
- httpd_message_t *answer, httpd_message_t *query )
+ httpd_client_t *cl,
+ httpd_message_t *answer, httpd_message_t *query )
{
sout_stream_id_t *id = (sout_stream_id_t*)p_args;
sout_stream_t *p_stream = id->p_stream;
sout_stream_sys_t *p_sys = p_stream->p_sys;
- char psz_session_init[100];
- const char *psz_session = NULL;
- const char *psz_cseq = NULL;
- int i_cseq = 0;
-
+ char psz_session_init[21];
+ const char *psz_session;
+ const char *psz_cseq;
if( answer == NULL || query == NULL )
return VLC_SUCCESS;
//fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
- /* */
- snprintf( psz_session_init, sizeof(psz_session_init), "%d", rand() );
-
/* */
answer->i_proto = HTTPD_PROTO_RTSP;
answer->i_version= query->i_version;
answer->i_type = HTTPD_MSG_ANSWER;
+ answer->i_body = 0;
+ answer->p_body = NULL;
+ /* Create new session ID if needed */
+ psz_session = httpd_MsgGet( query, "Session" );
+ if( psz_session == NULL )
+ {
+ /* FIXME: should be somewhat secure randomness */
+ snprintf( psz_session_init, sizeof(psz_session_init), I64Fd,
+ NTPtime64() + rand() );
+ }
+
+ if( httpd_MsgGet( query, "Require" ) != NULL )
+ answer->i_status = 551;
+ else
switch( query->i_type )
{
case HTTPD_MSG_SETUP:
{
- const char *psz_transport = httpd_MsgGet( query, "Transport" );
-
- //fprintf( stderr, "HTTPD_MSG_SETUP: transport=%s\n", psz_transport );
+ answer->i_status = 461;
- if( strstr( psz_transport, "multicast" ) && id->psz_destination )
+ for( const char *tpt = httpd_MsgGet( query, "Transport" );
+ tpt != NULL;
+ tpt = transport_next( tpt ) )
{
- //fprintf( stderr, "HTTPD_MSG_SETUP: multicast\n" );
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
-
- psz_session = httpd_MsgGet( query, "Session" );
- if( !psz_session )
- psz_session = psz_session_init;
-
- httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;destination=%s;port=%d-%d;ttl=%d",
- id->psz_destination, id->i_port,id->i_port+1,
- p_sys->i_ttl > 0 ? p_sys->i_ttl : 1);
- }
- else if( strstr( psz_transport, "unicast" ) && strstr( psz_transport, "client_port=" ) )
- {
- int i_port = atoi( strstr( psz_transport, "client_port=" ) + strlen("client_port=") );
- char ip[NI_MAXNUMERICHOST], psz_access[17], psz_url[NI_MAXNUMERICHOST + 8];
+ vlc_bool_t b_multicast = VLC_TRUE, b_unsupp = VLC_FALSE;
+ unsigned loport = 5004, hiport = 5005; /* from RFC3551 */
- sout_access_out_t *p_access;
-
- rtsp_client_t *rtsp = NULL;
+ /* Check transport protocol. */
+ /* Currently, we only support RTP/AVP over UDP */
+ if( strncmp( tpt, "RTP/AVP", 7 ) )
+ continue;
+ tpt += 7;
+ if( strncmp( tpt, "/UDP", 4 ) == 0 )
+ tpt += 4;
+ if( strchr( ";,", *tpt ) == NULL )
+ continue;
- if( httpd_ClientIP( cl, ip ) == NULL )
+ /* Parse transport options */
+ for( const char *opt = parameter_next( tpt );
+ opt != NULL;
+ opt = parameter_next( opt ) )
{
- answer->i_status = 500;
- answer->psz_status = strdup( "Internal server error" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
+ if( strncmp( opt, "multicast", 9 ) == 0)
+ b_multicast = VLC_TRUE;
+ else
+ if( strncmp( opt, "unicast", 7 ) == 0 )
+ b_multicast = VLC_FALSE;
+ else
+ if( sscanf( opt, "client_port=%u-%u", &loport, &hiport ) == 2 )
+ ;
+ else
+ if( strncmp( opt, "mode=", 5 ) == 0 )
+ {
+ if( strncasecmp( opt + 5, "\"PLAY\"", 6 ) )
+ {
+ /* Not playing?! */
+ b_unsupp = VLC_TRUE;
+ break;
+ }
+ }
+ else
+ {
+ /*
+ * Every other option is unsupported:
+ *
+ * "source" and "append" are invalid.
+ *
+ * For multicast, "port", "layers", "ttl" are set by the
+ * stream output configuration.
+ *
+ * For unicast, we do not allow "destination" as it
+ * carries a DoS risk, and we decide on "server_port".
+ *
+ * "interleaved" and "ssrc" are not implemented.
+ */
+ b_unsupp = VLC_TRUE;
+ break;
+ }
}
- //fprintf( stderr, "HTTPD_MSG_SETUP: unicast ip=%s port=%d\n", ip, i_port );
+ if( b_unsupp )
+ continue;
- psz_session = httpd_MsgGet( query, "Session" );
- if( !psz_session )
+ if( b_multicast )
{
- psz_session = psz_session_init;
- rtsp = RtspClientNew( p_stream, psz_session_init );
+ if( id->psz_destination == NULL )
+ continue;
+
+ answer->i_status = 200;
+
+ httpd_MsgAdd( answer, "Transport",
+ "RTP/AVP/UDP;destination=%s;port=%d-%d;ttl=%d",
+ id->psz_destination, id->i_port, id->i_port+1,
+ ( p_sys->i_ttl > 0 ) ? p_sys->i_ttl : 1 );
}
else
{
- rtsp = RtspClientGet( p_stream, psz_session );
- if( rtsp == NULL )
+ char ip[NI_MAXNUMERICHOST], psz_access[22],
+ url[NI_MAXNUMERICHOST + 8];
+ sout_access_out_t *p_access;
+ rtsp_client_t *rtsp = NULL;
+
+ if( ( hiport - loport ) > 1 )
+ continue;
+
+ if( psz_session == NULL )
{
- answer->i_status = 454;
- answer->psz_status = strdup( "Unknown session id" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
+ psz_session = psz_session_init;
+ rtsp = RtspClientNew( p_stream, psz_session );
+ }
+ else
+ {
+ /* FIXME: we probably need to remove an access out,
+ * if there is already one for the same ID */
+ rtsp = RtspClientGet( p_stream, psz_session );
+ if( rtsp == NULL )
+ {
+ answer->i_status = 454;
+ continue;
+ }
}
- }
- /* first try to create the access out */
- if( p_sys->i_ttl )
- snprintf( psz_access, sizeof( psz_access ),
- "udp{raw,ttl=%d}", p_sys->i_ttl );
- else
- strlcpy( psz_access, "udp{raw}", sizeof( psz_access ) );
+ if( httpd_ClientIP( cl, ip ) == NULL )
+ {
+ answer->i_status = 500;
+ continue;
+ }
- snprintf( psz_url, sizeof( psz_url ),
- ( strchr( ip, ':' ) != NULL ) ? "[%s]:%d" : "%s:%d",
- ip, i_port );
+ if( p_sys->i_ttl )
+ snprintf( psz_access, sizeof( psz_access ),
+ "udp{raw,rtcp,ttl=%d}", p_sys->i_ttl );
+ else
+ strcpy( psz_access, "udp{raw,rtcp}" );
- if( ( p_access = sout_AccessOutNew( p_stream->p_sout, psz_access, psz_url ) ) == NULL )
- {
- msg_Err( p_stream, "cannot create the access out for %s://%s",
- psz_access, psz_url );
- answer->i_status = 500;
- answer->psz_status = strdup( "Internal server error" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
- }
+ snprintf( url, sizeof( url ),
+ ( strchr( ip, ':' ) != NULL ) ? "[%s]:%d" : "%s:%d",
+ ip, loport );
- TAB_APPEND( rtsp->i_id, rtsp->id, id );
- TAB_APPEND( rtsp->i_access, rtsp->access, p_access );
+ p_access = sout_AccessOutNew( p_stream->p_sout,
+ psz_access, url );
+ if( p_access == NULL )
+ {
+ msg_Err( p_stream,
+ "cannot create access output for %s://%s",
+ psz_access, url );
+ answer->i_status = 500;
+ break;
+ }
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
+ TAB_APPEND( rtsp->i_id, rtsp->id, id );
+ TAB_APPEND( rtsp->i_access, rtsp->access, p_access );
- httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;client_port=%d-%d", i_port, i_port + 1 );
- }
- else /* TODO strstr( psz_transport, "interleaved" ) ) */
- {
- answer->i_status = 461;
- answer->psz_status = strdup( "Unsupported Transport" );
- answer->i_body = 0;
- answer->p_body = NULL;
+ char *src = var_GetNonEmptyString (p_access, "src-addr");
+ int sport = var_GetInteger (p_access, "src-port");
+
+ httpd_ServerIP( cl, ip );
+ fprintf( stderr, "src = %s, ip = %s\n", src, ip );
+
+ if( ( src != NULL ) && strcmp( src, ip ) )
+ {
+ /* Specify source IP if it is different from the RTSP
+ * control connection server address */
+ httpd_MsgAdd( answer, "Transport",
+ "RTP/AVP/UDP;unicast;source=%s;"
+ "client_port=%u-%u;server_port=%u-%u",
+ src, loport, hiport, sport, sport + 1 );
+ }
+ else
+ {
+ httpd_MsgAdd( answer, "Transport",
+ "RTP/AVP/UDP;unicast;"
+ "client_port=%u-%u;server_port=%u-%u",
+ loport, hiport, sport, sport + 1 );
+ }
+
+ answer->i_status = 200;
+ free( src );
+ }
+ break;
}
break;
}
default:
+ answer->i_status = 460;
+ break;
+
return VLC_EGENERIC;
}
- httpd_MsgAdd( answer, "Server", "VLC Server" );
+
+ httpd_MsgAdd( answer, "Server", PACKAGE_STRING );
httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
psz_cseq = httpd_MsgGet( query, "Cseq" );
- if( psz_cseq )
- i_cseq = atoi( psz_cseq );
- else
- i_cseq = 0;
- httpd_MsgAdd( answer, "Cseq", "%d", i_cseq );
+ httpd_MsgAdd( answer, "Cseq", "%s", psz_cseq ? psz_cseq : "0");
httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
if( psz_session )
projects / vlc / blobdiff