X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtsp.c;h=da781594c532401379fcae1398d97d8cce8715ff;hb=3392ff1e732347b1f8cf0163ba0325eca58622e7;hp=a09e67406c153625b86b317b7448b311957f1834;hpb=b8c1216a38d25e7d261119af30bff6ad21b5c032;p=vlc diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c index a09e67406c..da781594c5 100644 --- a/modules/stream_out/rtsp.c +++ b/modules/stream_out/rtsp.c @@ -1,12 +1,13 @@ /***************************************************************************** * rtsp.c: RTSP support for RTP stream output module ***************************************************************************** - * Copyright (C) 2003-2004 the VideoLAN team + * Copyright (C) 2003-2004, 2010 the VideoLAN team * Copyright © 2007 Rémi Denis-Courmont * - * $Id: rtp.c 21407 2007-08-22 20:10:41Z courmisch $ + * $Id$ * * Authors: Laurent Aimar + * Pierre Ynard * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,16 +27,30 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include #include +#include +#include #include #include #include #include #include +#include + +#ifndef _WIN32 +# include +#endif +#ifdef HAVE_XLOCALE_H +# include +#endif #include "rtp.h" @@ -44,14 +59,18 @@ typedef struct rtsp_session_t rtsp_session_t; struct rtsp_stream_t { vlc_mutex_t lock; - sout_stream_t *owner; + vlc_object_t *owner; + vod_media_t *vod_media; httpd_host_t *host; httpd_url_t *url; char *psz_path; - unsigned port; + unsigned track_id; int sessionc; rtsp_session_t **sessionv; + + int timeout; + vlc_timer_t timer; }; @@ -63,45 +82,52 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, const httpd_message_t *query ); static void RtspClientDel( rtsp_stream_t *rtsp, rtsp_session_t *session ); -rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url ) +static void RtspTimeOut( void *data ); + +rtsp_stream_t *RtspSetup( vlc_object_t *owner, vod_media_t *media, + const char *path ) { rtsp_stream_t *rtsp = malloc( sizeof( *rtsp ) ); - if( rtsp == NULL || ( url->i_port > 99999 ) ) + if( rtsp == NULL ) + { + free( rtsp ); return NULL; + } - rtsp->owner = p_stream; + rtsp->owner = owner; + rtsp->vod_media = media; rtsp->sessionc = 0; rtsp->sessionv = NULL; - vlc_mutex_init( p_stream, &rtsp->lock ); - - msg_Dbg( p_stream, "rtsp setup: %s : %d / %s\n", - url->psz_host, url->i_port, url->psz_path ); - - rtsp->port = (url->i_port > 0) ? url->i_port : 554; - if( url->psz_path != NULL ) - rtsp->psz_path = strdup( url->psz_path + 1 ); - else - rtsp->psz_path = NULL; - -#if 0 - if( asprintf( &rtsp->psz_control, "rtsp://%s:%d%s", - url->psz_host, url->i_port > 0 ? url->i_port : 554, - rtsp->psz_path ) == -1 ) + rtsp->host = NULL; + rtsp->url = NULL; + rtsp->psz_path = NULL; + rtsp->track_id = 0; + vlc_mutex_init( &rtsp->lock ); + + rtsp->timeout = var_InheritInteger(owner, "rtsp-timeout"); + if (rtsp->timeout > 0) { - rtsp->psz_control = NULL; - goto error; + if (vlc_timer_create(&rtsp->timer, RtspTimeOut, rtsp)) + goto error; } -#endif - rtsp->host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, - rtsp->port ); + rtsp->psz_path = strdup( (path != NULL) ? path : "/" ); + if( rtsp->psz_path == NULL ) + goto error; + + msg_Dbg( owner, "RTSP stream at %s", rtsp->psz_path ); + + rtsp->host = vlc_rtsp_HostNew( VLC_OBJECT(owner) ); if( rtsp->host == NULL ) goto error; - rtsp->url = httpd_UrlNewUnique( rtsp->host, - url->psz_path ? url->psz_path : "/", NULL, - NULL, NULL ); + char *user = var_InheritString(owner, "sout-rtsp-user"); + char *pwd = var_InheritString(owner, "sout-rtsp-pwd"); + + rtsp->url = httpd_UrlNew( rtsp->host, rtsp->psz_path, user, pwd ); + free(user); + free(pwd); if( rtsp->url == NULL ) goto error; @@ -122,16 +148,22 @@ error: void RtspUnsetup( rtsp_stream_t *rtsp ) { - while( rtsp->sessionc > 0 ) - RtspClientDel( rtsp, rtsp->sessionv[0] ); - if( rtsp->url ) httpd_UrlDelete( rtsp->url ); if( rtsp->host ) httpd_HostDelete( rtsp->host ); + while( rtsp->sessionc > 0 ) + RtspClientDel( rtsp, rtsp->sessionv[0] ); + + if (rtsp->timeout > 0) + vlc_timer_destroy(rtsp->timer); + + free( rtsp->psz_path ); vlc_mutex_destroy( &rtsp->lock ); + + free( rtsp ); } @@ -140,9 +172,10 @@ struct rtsp_stream_id_t rtsp_stream_t *stream; sout_stream_id_t *sout_id; httpd_url_t *url; - const char *dst; - int ttl; - unsigned loport, hiport; + unsigned track_id; + uint32_t ssrc; + unsigned clock_rate; /* needed to compute rtptime in RTP-Info */ + int mcast_fd; }; @@ -153,6 +186,7 @@ struct rtsp_session_t { rtsp_stream_t *stream; uint64_t id; + mtime_t last_seen; /* for timeouts */ /* output (id-access) */ int trackc; @@ -163,19 +197,41 @@ struct rtsp_session_t /* Unicast session track */ struct rtsp_strack_t { - sout_stream_id_t *id; - sout_access_out_t *access; - vlc_bool_t playing; + rtsp_stream_id_t *id; + sout_stream_id_t *sout_id; + int setup_fd; /* socket created by the SETUP request */ + int rtp_fd; /* socket used by the RTP output, when playing */ + uint32_t ssrc; + uint16_t seq_init; }; +static void RtspTrackClose( rtsp_strack_t *tr ); + +#define TRACK_PATH_SIZE (sizeof("/trackID=999") - 1) + +char *RtspAppendTrackPath( rtsp_stream_id_t *id, const char *base ) +{ + const char *sep = strlen( base ) > 0 && base[strlen( base ) - 1] == '/' ? + "" : "/"; + char *url; + + if( asprintf( &url, "%s%strackID=%u", base, sep, id->track_id ) == -1 ) + url = NULL; + return url; +} + rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid, - unsigned num, - /* Multicast stuff - TODO: cleanup */ - const char *dst, int ttl, - unsigned loport, unsigned hiport ) + uint32_t ssrc, unsigned clock_rate, + int mcast_fd) { - char urlbuf[sizeof( "//trackID=123" ) + strlen( rtsp->psz_path )]; + if (rtsp->track_id > 999) + { + msg_Err(rtsp->owner, "RTSP: too many IDs!"); + return NULL; + } + + char *urlbuf; rtsp_stream_id_t *id = malloc( sizeof( *id ) ); httpd_url_t *url; @@ -184,19 +240,27 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid, id->stream = rtsp; id->sout_id = sid; - /* TODO: can we assume that this need not be strdup'd? */ - id->dst = dst; - if( id->dst != NULL ) + id->track_id = rtsp->track_id; + id->ssrc = ssrc; + id->clock_rate = clock_rate; + id->mcast_fd = mcast_fd; + + urlbuf = RtspAppendTrackPath( id, rtsp->psz_path ); + if( urlbuf == NULL ) { - id->ttl = ttl; - id->loport = loport; - id->hiport = hiport; + free( id ); + return NULL; } - snprintf( urlbuf, sizeof( urlbuf ), "/%s/trackID=%u", rtsp->psz_path, - num ); - msg_Dbg( rtsp->owner, "RTSP: adding %s\n", urlbuf ); - url = id->url = httpd_UrlNewUnique( rtsp->host, urlbuf, NULL, NULL, NULL ); + msg_Dbg( rtsp->owner, "RTSP: adding %s", urlbuf ); + + char *user = var_InheritString(rtsp->owner, "sout-rtsp-user"); + char *pwd = var_InheritString(rtsp->owner, "sout-rtsp-pwd"); + + url = id->url = httpd_UrlNew( rtsp->host, urlbuf, user, pwd ); + free( user ); + free( pwd ); + free( urlbuf ); if( url == NULL ) { @@ -211,12 +275,16 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid, httpd_UrlCatch( url, HTTPD_MSG_GETPARAMETER, RtspCallbackId, (void *)id ); httpd_UrlCatch( url, HTTPD_MSG_TEARDOWN, RtspCallbackId, (void *)id ); + rtsp->track_id++; + return id; } void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t *id ) { + httpd_UrlDelete( id->url ); + vlc_mutex_lock( &rtsp->lock ); for( int i = 0; i < rtsp->sessionc; i++ ) { @@ -224,22 +292,63 @@ void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t *id ) for( int j = 0; j < ses->trackc; j++ ) { - if( ses->trackv[j].id == id->sout_id ) + if( ses->trackv[j].id == id ) { rtsp_strack_t *tr = ses->trackv + j; - sout_AccessOutDelete( tr->access ); + RtspTrackClose( tr ); REMOVE_ELEM( ses->trackv, ses->trackc, j ); - /* FIXME: are we supposed to notify the client? */ } } } vlc_mutex_unlock( &rtsp->lock ); - httpd_UrlDelete( id->url ); free( id ); } +/** rtsp must be locked */ +static void RtspUpdateTimer( rtsp_stream_t *rtsp ) +{ + if (rtsp->timeout <= 0) + return; + + mtime_t timeout = 0; + for (int i = 0; i < rtsp->sessionc; i++) + { + if (timeout == 0 || rtsp->sessionv[i]->last_seen < timeout) + timeout = rtsp->sessionv[i]->last_seen; + } + if (timeout != 0) + timeout += rtsp->timeout * CLOCK_FREQ; + vlc_timer_schedule(rtsp->timer, true, timeout, 0); +} + + +static void RtspTimeOut( void *data ) +{ + rtsp_stream_t *rtsp = data; + + vlc_mutex_lock(&rtsp->lock); + mtime_t now = mdate(); + for (int i = rtsp->sessionc - 1; i >= 0; i--) + { + if (rtsp->sessionv[i]->last_seen + rtsp->timeout * CLOCK_FREQ < now) + { + if (rtsp->vod_media != NULL) + { + char psz_sesbuf[17]; + snprintf( psz_sesbuf, sizeof( psz_sesbuf ), "%"PRIx64, + rtsp->sessionv[i]->id ); + vod_stop(rtsp->vod_media, psz_sesbuf); + } + RtspClientDel(rtsp, rtsp->sessionv[i]); + } + } + RtspUpdateTimer(rtsp); + vlc_mutex_unlock(&rtsp->lock); +} + + /** rtsp must be locked */ static rtsp_session_t *RtspClientNew( rtsp_stream_t *rtsp ) @@ -293,163 +402,154 @@ void RtspClientDel( rtsp_stream_t *rtsp, rtsp_session_t *session ) TAB_REMOVE( rtsp->sessionc, rtsp->sessionv, session ); for( i = 0; i < session->trackc; i++ ) - { - rtp_del_sink( session->trackv[i].id, session->trackv[i].access ); - sout_AccessOutDelete( session->trackv[i].access ); - } + RtspTrackClose( &session->trackv[i] ); free( session->trackv ); free( session ); } -/** Aggregate RTSP callback */ -static int RtspCallback( httpd_callback_sys_t *p_args, - httpd_client_t *cl, - httpd_message_t *answer, - const httpd_message_t *query ) +/** rtsp must be locked */ +static void RtspClientAlive( rtsp_session_t *session ) { - rtsp_stream_t *rtsp = (rtsp_stream_t *)p_args; - const char *psz_session = NULL, *psz; + if (session->stream->timeout <= 0) + return; + + session->last_seen = mdate(); + RtspUpdateTimer(session->stream); +} + +static int dup_socket(int oldfd) +{ + int newfd; +#ifndef _WIN32 + newfd = vlc_dup(oldfd); +#else + WSAPROTOCOL_INFO info; + WSADuplicateSocket (oldfd, GetCurrentProcessId (), &info); + newfd = WSASocket (info.iAddressFamily, info.iSocketType, + info.iProtocol, &info, 0, 0); +#endif + return newfd; +} + +/* Attach a starting VoD RTP id to its RTSP track, and let it + * initialize with the parameters of the SETUP request */ +int RtspTrackAttach( rtsp_stream_t *rtsp, const char *name, + rtsp_stream_id_t *id, sout_stream_id_t *sout_id, + uint32_t *ssrc, uint16_t *seq_init ) +{ + int val = VLC_EGENERIC; + rtsp_session_t *session; + + vlc_mutex_lock(&rtsp->lock); + session = RtspClientGet(rtsp, name); - if( answer == NULL || query == NULL ) + if (session == NULL) + goto out; + + rtsp_strack_t *tr = NULL; + for (int i = 0; i < session->trackc; i++) { - return VLC_SUCCESS; + if (session->trackv[i].id == id) + { + tr = session->trackv + i; + break; + } } - 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 ) + if (tr != NULL) { - answer->i_status = 551; - httpd_MsgAdd( answer, "Unsupported", "%s", - httpd_MsgGet( query, "Require" ) ); + tr->sout_id = sout_id; + tr->rtp_fd = dup_socket(tr->setup_fd); } else - switch( query->i_type ) { - case HTTPD_MSG_DESCRIBE: - { - char ip[NI_MAXNUMERICHOST], *ptr; - char control[sizeof("rtsp://[]:12345/") + sizeof( ip ) - + strlen( rtsp->psz_path )]; - - /* Build self-referential URL */ - httpd_ServerIP( cl, ip ); - ptr = strchr( ip, '%' ); - if( ptr != NULL ) - *ptr = '\0'; - - if( strchr( ip, ':' ) != NULL ) - sprintf( control, "rtsp://[%s]:%u/%s", ip, rtsp->port, - ( rtsp->psz_path != NULL ) ? rtsp->psz_path : "" ); - else - sprintf( control, "rtsp://%s:%u/%s", ip, rtsp->port, - ( rtsp->psz_path != NULL ) ? rtsp->psz_path : "" ); + /* The track was not SETUP. We still create one because we'll + * need the sout_id if we set it up later. */ + rtsp_strack_t track = { .id = id, .sout_id = sout_id, + .setup_fd = -1, .rtp_fd = -1 }; + vlc_rand_bytes (&track.seq_init, sizeof (track.seq_init)); + vlc_rand_bytes (&track.ssrc, sizeof (track.ssrc)); + + INSERT_ELEM(session->trackv, session->trackc, session->trackc, track); + tr = session->trackv + session->trackc - 1; + } - ptr = SDPGenerate( rtsp->owner, control ); + *ssrc = ntohl(tr->ssrc); + *seq_init = tr->seq_init; - answer->i_status = 200; - httpd_MsgAdd( answer, "Content-Type", "%s", "application/sdp" ); - httpd_MsgAdd( answer, "Content-Base", "%s", control ); - answer->p_body = (uint8_t *)ptr; - answer->i_body = strlen( ptr ); - break; - } + if (tr->rtp_fd != -1) + { + uint16_t seq; + rtp_add_sink(tr->sout_id, tr->rtp_fd, false, &seq); + /* To avoid race conditions, sout_id->i_seq_sent_next must + * be set here and now. Make sure the caller did its job + * properly when passing seq_init. */ + assert(tr->seq_init == seq); + } - case HTTPD_MSG_SETUP: - answer->i_status = 459; - break; + val = VLC_SUCCESS; +out: + vlc_mutex_unlock(&rtsp->lock); + return val; +} - case HTTPD_MSG_PLAY: - { - rtsp_session_t *ses; - answer->i_status = 200; - psz_session = httpd_MsgGet( query, "Session" ); - if( httpd_MsgGet( query, "Range" ) != NULL ) +/* Remove references to the RTP id when it is stopped */ +void RtspTrackDetach( rtsp_stream_t *rtsp, const char *name, + sout_stream_id_t *sout_id ) +{ + rtsp_session_t *session; + + vlc_mutex_lock(&rtsp->lock); + session = RtspClientGet(rtsp, name); + + if (session == NULL) + goto out; + + for (int i = 0; i < session->trackc; i++) + { + rtsp_strack_t *tr = session->trackv + i; + if (tr->sout_id == sout_id) + { + if (tr->setup_fd == -1) { - answer->i_status = 456; /* cannot seek */ + /* No (more) SETUP information: better get rid of the + * track so that we can have new random ssrc and + * seq_init next time. */ + REMOVE_ELEM( session->trackv, session->trackc, i ); break; } - - vlc_mutex_lock( &rtsp->lock ); - ses = RtspClientGet( rtsp, psz_session ); - if( ses != NULL ) + /* We keep the SETUP information of the track, but stop it */ + if (tr->rtp_fd != -1) { - for( int i = 0; i < ses->trackc; i++ ) - { - rtsp_strack_t *tr = ses->trackv + i; - if( !tr->playing ) - { - tr->playing = VLC_TRUE; - rtp_add_sink( tr->id, tr->access ); - } - } + rtp_del_sink(tr->sout_id, tr->rtp_fd); + tr->rtp_fd = -1; } - vlc_mutex_unlock( &rtsp->lock ); - - if( httpd_MsgGet( query, "Scale" ) != NULL ) - httpd_MsgAdd( answer, "Scale", "1." ); + tr->sout_id = NULL; break; } + } - case HTTPD_MSG_PAUSE: - answer->i_status = 405; - httpd_MsgAdd( answer, "Allow", - "DESCRIBE, TEARDOWN, PLAY, GET_PARAMETER" ); - break; - - case HTTPD_MSG_GETPARAMETER: - if( query->i_body > 0 ) - { - answer->i_status = 451; - break; - } +out: + vlc_mutex_unlock(&rtsp->lock); +} - answer->i_status = 200; - break; - case HTTPD_MSG_TEARDOWN: +/** rtsp must be locked */ +static void RtspTrackClose( rtsp_strack_t *tr ) +{ + if (tr->setup_fd != -1) + { + if (tr->rtp_fd != -1) { - rtsp_session_t *ses; - - /* for now only multicast so easy again */ - answer->i_status = 200; - - psz_session = httpd_MsgGet( query, "Session" ); - - vlc_mutex_lock( &rtsp->lock ); - ses = RtspClientGet( rtsp, psz_session ); - if( ses != NULL ) - RtspClientDel( rtsp, ses ); - vlc_mutex_unlock( &rtsp->lock ); - break; + rtp_del_sink(tr->sout_id, tr->rtp_fd); + tr->rtp_fd = -1; } - - default: - return VLC_EGENERIC; + net_Close(tr->setup_fd); + tr->setup_fd = -1; } - - httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING ); - httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); - - psz = httpd_MsgGet( query, "Cseq" ); - if( psz != NULL ) - httpd_MsgAdd( answer, "Cseq", "%s", psz ); - psz = httpd_MsgGet( query, "Timestamp" ); - if( psz != NULL ) - httpd_MsgAdd( answer, "Timestamp", "%s", psz ); - - httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" ); - - if( psz_session ) - httpd_MsgAdd( answer, "Session", "%s;timeout=5", psz_session ); - return VLC_SUCCESS; } @@ -479,30 +579,94 @@ static inline const char *parameter_next( const char *str ) } -/** Non-aggregate RTSP callback */ -static int RtspCallbackId( httpd_callback_sys_t *p_args, - httpd_client_t *cl, - httpd_message_t *answer, - const httpd_message_t *query ) +static int64_t ParseNPT (const char *str) { - rtsp_stream_id_t *id = (rtsp_stream_id_t *)p_args; - rtsp_stream_t *rtsp = id->stream; - sout_stream_t *p_stream = id->stream->owner; + locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL); + locale_t oldloc = uselocale (loc); + unsigned hour, min; + float sec; + + if (sscanf (str, "%u:%u:%f", &hour, &min, &sec) == 3) + sec += ((hour * 60) + min) * 60; + else + if (sscanf (str, "%f", &sec) != 1) + sec = -1; + + if (loc != (locale_t)0) + { + uselocale (oldloc); + freelocale (loc); + } + return sec < 0 ? -1 : sec * CLOCK_FREQ; +} + + +/** RTSP requests handler + * @param id selected track for non-aggregate URLs, + * NULL for aggregate URLs + */ +static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id, + httpd_client_t *cl, + httpd_message_t *answer, + const httpd_message_t *query ) +{ + vlc_object_t *owner = rtsp->owner; char psz_sesbuf[17]; - const char *psz_session, *psz; + const char *psz_session = NULL, *psz; + char control[sizeof("rtsp://[]:12345") + NI_MAXNUMERICHOST + + strlen( rtsp->psz_path )]; + bool vod = rtsp->vod_media != NULL; + time_t now; + + time (&now); - if( answer == NULL || query == NULL ) + if( answer == NULL || query == NULL || cl == NULL ) return VLC_SUCCESS; + else + { + /* Build self-referential control URL */ + char ip[NI_MAXNUMERICHOST], *ptr; + int port; + + httpd_ServerIP( cl, ip, &port ); + ptr = strchr( ip, '%' ); + if( ptr != NULL ) + *ptr = '\0'; + + if( strchr( ip, ':' ) != NULL ) + sprintf( control, "rtsp://[%s]:%d%s", ip, port, rtsp->psz_path ); + else + sprintf( control, "rtsp://%s:%d%s", ip, port, rtsp->psz_path ); + } /* */ answer->i_proto = HTTPD_PROTO_RTSP; - answer->i_version= query->i_version; + answer->i_version= 0; answer->i_type = HTTPD_MSG_ANSWER; answer->i_body = 0; answer->p_body = NULL; - psz_session = httpd_MsgGet( query, "Session" ); + httpd_MsgAdd( answer, "Server", "VLC/%s", VERSION ); + + /* Date: is always allowed, and sometimes mandatory with RTSP/2.0. */ + struct tm ut; + if (gmtime_r (&now, &ut) != NULL) + { /* RFC1123 format, GMT is mandatory */ + static const char wdays[7][4] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; + static const char mons[12][4] = { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; + httpd_MsgAdd (answer, "Date", "%s, %02u %s %04u %02u:%02u:%02u GMT", + wdays[ut.tm_wday], ut.tm_mday, mons[ut.tm_mon], + 1900 + ut.tm_year, ut.tm_hour, ut.tm_min, ut.tm_sec); + } + if( query->i_proto != HTTPD_PROTO_RTSP ) + { + answer->i_status = 505; + } + else if( httpd_MsgGet( query, "Require" ) != NULL ) { answer->i_status = 551; @@ -512,16 +676,45 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, else switch( query->i_type ) { + case HTTPD_MSG_DESCRIBE: + { /* Aggregate-only */ + if( id != NULL ) + { + answer->i_status = 460; + break; + } + + answer->i_status = 200; + httpd_MsgAdd( answer, "Content-Type", "%s", "application/sdp" ); + httpd_MsgAdd( answer, "Content-Base", "%s", control ); + + answer->p_body = (uint8_t *) ( vod ? + SDPGenerateVoD( rtsp->vod_media, control ) : + SDPGenerate( (sout_stream_t *)owner, control ) ); + if( answer->p_body != NULL ) + answer->i_body = strlen( (char *)answer->p_body ); + else + answer->i_status = 500; + break; + } + case HTTPD_MSG_SETUP: - { + /* Non-aggregate-only */ + if( id == NULL ) + { + answer->i_status = 459; + break; + } + + psz_session = httpd_MsgGet( query, "Session" ); answer->i_status = 461; for( const char *tpt = httpd_MsgGet( query, "Transport" ); tpt != NULL; tpt = transport_next( tpt ) ) { - vlc_bool_t b_multicast = VLC_TRUE, b_unsupp = VLC_FALSE; - unsigned loport = 5004, hiport = 5005; /* from RFC3551 */ + bool b_multicast = true, b_unsupp = false; + unsigned loport = 5004, hiport; /* from RFC3551 */ /* Check transport protocol. */ /* Currently, we only support RTP/AVP over UDP */ @@ -539,12 +732,13 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, opt = parameter_next( opt ) ) { if( strncmp( opt, "multicast", 9 ) == 0) - b_multicast = VLC_TRUE; + b_multicast = true; else if( strncmp( opt, "unicast", 7 ) == 0 ) - b_multicast = VLC_FALSE; + b_multicast = false; else - if( sscanf( opt, "client_port=%u-%u", &loport, &hiport ) == 2 ) + if( sscanf( opt, "client_port=%u-%u", &loport, &hiport ) + == 2 ) ; else if( strncmp( opt, "mode=", 5 ) == 0 ) @@ -553,7 +747,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, && strncasecmp( opt + 5, "\"PLAY\"", 6 ) ) { /* Not playing?! */ - b_unsupp = VLC_TRUE; + b_unsupp = true; break; } } @@ -561,7 +755,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, if( strncmp( opt,"destination=", 12 ) == 0 ) { answer->i_status = 403; - b_unsupp = VLC_TRUE; + b_unsupp = true; } else { @@ -578,7 +772,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, * * "interleaved" is not implemented. */ - b_unsupp = VLC_TRUE; + b_unsupp = true; break; } } @@ -588,104 +782,158 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, if( b_multicast ) { - const char *dst = id->dst; - if( dst == NULL ) + char dst[NI_MAXNUMERICHOST]; + int dport, ttl; + if( id->mcast_fd == -1 ) continue; + net_GetPeerAddress(id->mcast_fd, dst, &dport); + + ttl = var_InheritInteger(owner, "ttl"); + if (ttl <= 0) + /* FIXME: the TTL is left to the OS default, we can + * only guess that it's 1. */ + ttl = 1; + + if( psz_session == NULL ) + { + /* Create a dummy session ID */ + snprintf( psz_sesbuf, sizeof( psz_sesbuf ), "%lu", + vlc_mrand48() ); + psz_session = psz_sesbuf; + } answer->i_status = 200; httpd_MsgAdd( answer, "Transport", "RTP/AVP/UDP;destination=%s;port=%u-%u;" "ttl=%d;mode=play", - dst, id->loport, id->hiport, - ( id->ttl > 0 ) ? id->ttl : 1 ); + dst, dport, dport + 1, ttl ); + /* FIXME: this doesn't work with RTP + RTCP mux */ } else { - char ip[NI_MAXNUMERICHOST], url[NI_MAXNUMERICHOST + 8]; - static const char access[] = "udp{raw,rtcp}"; + char ip[NI_MAXNUMERICHOST], src[NI_MAXNUMERICHOST]; rtsp_session_t *ses = NULL; - rtsp_strack_t track = { id->sout_id, NULL, VLC_FALSE }; + int fd, sport; + uint32_t ssrc; - if( httpd_ClientIP( cl, ip ) == NULL ) + if( httpd_ClientIP( cl, ip, NULL ) == NULL ) { answer->i_status = 500; continue; } - snprintf( url, sizeof( url ), - ( strchr( ip, ':' ) != NULL ) ? "[%s]:%d" : "%s:%d", - ip, loport ); - - track.access = sout_AccessOutNew( p_stream->p_sout, - access, url ); - if( track.access == NULL ) + fd = net_ConnectDgram( owner, ip, loport, -1, + IPPROTO_UDP ); + if( fd == -1 ) { - msg_Err( p_stream, - "cannot create access output for %s://%s", - access, url ); + msg_Err( owner, + "cannot create RTP socket for %s port %u", + ip, loport ); answer->i_status = 500; continue; } - char *src = var_GetNonEmptyString( track.access, "src-addr" ); - int sport = var_GetInteger( track.access, "src-port" ); + /* Ignore any unexpected incoming packet */ + setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &(int){ 0 }, + sizeof (int)); + net_GetSockAddress( fd, src, &sport ); vlc_mutex_lock( &rtsp->lock ); if( psz_session == NULL ) { ses = RtspClientNew( rtsp ); - snprintf( psz_sesbuf, sizeof( psz_sesbuf ), I64Fx, + snprintf( psz_sesbuf, sizeof( psz_sesbuf ), "%"PRIx64, ses->id ); psz_session = psz_sesbuf; } else { - /* FIXME: we probably need to remove an access out, - * if there is already one for the same ID */ ses = RtspClientGet( rtsp, psz_session ); if( ses == NULL ) { answer->i_status = 454; vlc_mutex_unlock( &rtsp->lock ); + net_Close( fd ); continue; } } + RtspClientAlive(ses); + + rtsp_strack_t *tr = NULL; + for (int i = 0; i < ses->trackc; i++) + { + if (ses->trackv[i].id == id) + { + tr = ses->trackv + i; + break; + } + } + + if (tr == NULL) + { + /* Set up a new track */ + rtsp_strack_t track = { .id = id, + .sout_id = id->sout_id, + .setup_fd = fd, + .rtp_fd = -1 }; + + if (vod) + { + vlc_rand_bytes (&track.seq_init, + sizeof (track.seq_init)); + vlc_rand_bytes (&track.ssrc, sizeof (track.ssrc)); + ssrc = track.ssrc; + } + else + ssrc = id->ssrc; - INSERT_ELEM( ses->trackv, ses->trackc, ses->trackc, track ); + INSERT_ELEM( ses->trackv, ses->trackc, ses->trackc, + track ); + } + else if (tr->setup_fd == -1) + { + /* The track was not SETUP, but it exists + * because there is a sout_id running for it */ + tr->setup_fd = fd; + ssrc = tr->ssrc; + } + else + { + /* The track is already set up, and we don't + * support changing the transport parameters on + * the fly */ + vlc_mutex_unlock( &rtsp->lock ); + answer->i_status = 455; + net_Close( fd ); + break; + } vlc_mutex_unlock( &rtsp->lock ); - httpd_ServerIP( cl, ip ); + httpd_ServerIP( cl, ip, NULL ); - if( ( src != NULL ) && strcmp( src, ip ) ) + /* Specify source IP only if it is different from the + * RTSP control connection server address */ + if( strcmp( src, ip ) ) { - /* Specify source IP if it is different from the RTSP - * control connection server address */ char *ptr = strchr( src, '%' ); if( ptr != NULL ) *ptr = '\0'; /* remove scope ID */ - - httpd_MsgAdd( answer, "Transport", - "RTP/AVP/UDP;unicast;source=%s;" - "client_port=%u-%u;server_port=%u-%u;" - "mode=play", - src, loport, loport + 1, sport, sport + 1 ); } else - { - httpd_MsgAdd( answer, "Transport", - "RTP/AVP/UDP;unicast;" - "client_port=%u-%u;server_port=%u-%u;" - "mode=play", - loport, loport + 1, sport, sport + 1 ); - } + src[0] = '\0'; + + httpd_MsgAdd( answer, "Transport", + "RTP/AVP/UDP;unicast%s%s;" + "client_port=%u-%u;server_port=%u-%u;" + "ssrc=%08X;mode=play", + src[0] ? ";source=" : "", src, + loport, loport + 1, sport, sport + 1, ssrc ); answer->i_status = 200; - free( src ); } break; } break; - } case HTTPD_MSG_PLAY: { @@ -693,38 +941,191 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, answer->i_status = 200; psz_session = httpd_MsgGet( query, "Session" ); - if( httpd_MsgGet( query, "Range" ) != NULL ) + int64_t start = -1, end = -1, npt; + const char *range = httpd_MsgGet (query, "Range"); + if (range != NULL) { - answer->i_status = 456; /* cannot seek */ - break; - } + if (strncmp (range, "npt=", 4)) + { + answer->i_status = 501; + break; + } + start = ParseNPT (range + 4); + range = strchr(range, '-'); + if (range != NULL && *(range + 1)) + end = ParseNPT (range + 1); + + if (end >= 0 && end < start) + { + answer->i_status = 457; + break; + } + + if (vod) + { + if (vod_check_range(rtsp->vod_media, psz_session, + start, end) != VLC_SUCCESS) + { + answer->i_status = 457; + break; + } + } + /* We accept start times of 0 even for broadcast streams + * that already started */ + else if (start > 0 || end >= 0) + { + answer->i_status = 456; + break; + } + } vlc_mutex_lock( &rtsp->lock ); ses = RtspClientGet( rtsp, psz_session ); if( ses != NULL ) { + char info[ses->trackc * ( strlen( control ) + TRACK_PATH_SIZE + + sizeof("url=;seq=65535;rtptime=4294967295, ") + - 1 ) + 1]; + size_t infolen = 0; + RtspClientAlive(ses); + + sout_stream_id_t *sout_id = NULL; + if (vod) + { + /* We don't keep a reference to the sout_stream_t, + * so we check if a sout_id is available instead. */ + for (int i = 0; i < ses->trackc; i++) + { + sout_id = ses->trackv[i].sout_id; + if (sout_id != NULL) + break; + } + } + int64_t ts = rtp_get_ts(vod ? NULL : (sout_stream_t *)owner, + sout_id, rtsp->vod_media, psz_session, + vod ? NULL : &npt); + for( int i = 0; i < ses->trackc; i++ ) { rtsp_strack_t *tr = ses->trackv + i; - if( !tr->playing && ( tr->id == id->sout_id ) ) + if( ( id == NULL ) || ( tr->id == id ) ) { - tr->playing = VLC_TRUE; - rtp_add_sink( tr->id, tr->access ); + if (tr->setup_fd == -1) + /* Track not SETUP */ + continue; + + uint16_t seq; + if( tr->rtp_fd == -1 ) + { + /* Track not PLAYing yet */ + if (tr->sout_id == NULL) + /* Instance not running yet (VoD) */ + seq = tr->seq_init; + else + { + /* Instance running, add a sink to it */ + tr->rtp_fd = dup_socket(tr->setup_fd); + if (tr->rtp_fd == -1) + continue; + + rtp_add_sink( tr->sout_id, tr->rtp_fd, + false, &seq ); + } + } + else + { + /* Track already playing */ + assert( tr->sout_id != NULL ); + seq = rtp_get_seq( tr->sout_id ); + } + char *url = RtspAppendTrackPath( tr->id, control ); + infolen += sprintf( info + infolen, + "url=%s;seq=%u;rtptime=%u, ", + url != NULL ? url : "", seq, + rtp_compute_ts( tr->id->clock_rate, ts ) ); + free( url ); } } + if( infolen > 0 ) + { + info[infolen - 2] = '\0'; /* remove trailing ", " */ + httpd_MsgAdd( answer, "RTP-Info", "%s", info ); + } } vlc_mutex_unlock( &rtsp->lock ); + if (ses != NULL) + { + if (vod) + { + vod_play(rtsp->vod_media, psz_session, &start, end); + npt = start; + } + + double f_npt = (double) npt / CLOCK_FREQ; + httpd_MsgAdd( answer, "Range", "npt=%f-", f_npt ); + } + if( httpd_MsgGet( query, "Scale" ) != NULL ) httpd_MsgAdd( answer, "Scale", "1." ); break; } case HTTPD_MSG_PAUSE: - answer->i_status = 405; - httpd_MsgAdd( answer, "Allow", - "SETUP, TEARDOWN, PLAY, GET_PARAMETER" ); + { + if (id == NULL && !vod) + { + answer->i_status = 405; + httpd_MsgAdd( answer, "Allow", + "%s, TEARDOWN, PLAY, GET_PARAMETER", + ( id != NULL ) ? "SETUP" : "DESCRIBE" ); + break; + } + + rtsp_session_t *ses; + answer->i_status = 200; + psz_session = httpd_MsgGet( query, "Session" ); + vlc_mutex_lock( &rtsp->lock ); + ses = RtspClientGet( rtsp, psz_session ); + if (ses != NULL) + { + if (id != NULL) /* "Mute" the selected track */ + { + bool found = false; + for (int i = 0; i < ses->trackc; i++) + { + rtsp_strack_t *tr = ses->trackv + i;; + if (tr->id == id) + { + if (tr->setup_fd == -1) + break; + + found = true; + if (tr->rtp_fd != -1) + { + rtp_del_sink(tr->sout_id, tr->rtp_fd); + tr->rtp_fd = -1; + } + break; + } + } + if (!found) + answer->i_status = 455; + } + RtspClientAlive(ses); + } + vlc_mutex_unlock( &rtsp->lock ); + + if (ses != NULL && id == NULL) + { + assert(vod); + int64_t npt = 0; + vod_pause(rtsp->vod_media, psz_session, &npt); + double f_npt = (double) npt / CLOCK_FREQ; + httpd_MsgAdd( answer, "Range", "npt=%f-", f_npt ); + } break; + } case HTTPD_MSG_GETPARAMETER: if( query->i_body > 0 ) @@ -733,7 +1134,13 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, break; } + psz_session = httpd_MsgGet( query, "Session" ); answer->i_status = 200; + vlc_mutex_lock( &rtsp->lock ); + rtsp_session_t *ses = RtspClientGet( rtsp, psz_session ); + if (ses != NULL) + RtspClientAlive(ses); + vlc_mutex_unlock( &rtsp->lock ); break; case HTTPD_MSG_TEARDOWN: @@ -748,14 +1155,27 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, ses = RtspClientGet( rtsp, psz_session ); if( ses != NULL ) { - for( int i = 0; i < ses->trackc; i++ ) + if( id == NULL ) /* Delete the entire session */ { - if( ses->trackv[i].id == id->sout_id ) + RtspClientDel( rtsp, ses ); + if (vod) + vod_stop(rtsp->vod_media, psz_session); + RtspUpdateTimer(rtsp); + } + else /* Delete one track from the session */ + { + for( int i = 0; i < ses->trackc; i++ ) { - rtp_del_sink( id->sout_id, ses->trackv[i].access ); - sout_AccessOutDelete( ses->trackv[i].access ); - REMOVE_ELEM( ses->trackv, ses->trackc, i ); + if( ses->trackv[i].id == id ) + { + RtspTrackClose( &ses->trackv[i] ); + /* Keep VoD tracks whose instance is still + * running */ + if (!(vod && ses->trackv[i].sout_id != NULL)) + REMOVE_ELEM( ses->trackv, ses->trackc, i ); + } } + RtspClientAlive(ses); } } vlc_mutex_unlock( &rtsp->lock ); @@ -763,21 +1183,48 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, } default: - answer->i_status = 460; - break; + return VLC_EGENERIC; } + if( psz_session ) + { + if (rtsp->timeout > 0) + httpd_MsgAdd( answer, "Session", "%s;timeout=%d", psz_session, + rtsp->timeout ); + else + httpd_MsgAdd( answer, "Session", "%s", psz_session ); + } + + httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); + httpd_MsgAdd( answer, "Cache-Control", "no-cache" ); + psz = httpd_MsgGet( query, "Cseq" ); if( psz != NULL ) httpd_MsgAdd( answer, "Cseq", "%s", psz ); psz = httpd_MsgGet( query, "Timestamp" ); if( psz != NULL ) httpd_MsgAdd( answer, "Timestamp", "%s", psz ); - httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING ); - httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); - httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" ); - if( psz_session ) - httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session ); return VLC_SUCCESS; } + + +/** Aggregate RTSP callback */ +static int RtspCallback( httpd_callback_sys_t *p_args, + httpd_client_t *cl, + httpd_message_t *answer, + const httpd_message_t *query ) +{ + return RtspHandler( (rtsp_stream_t *)p_args, NULL, cl, answer, query ); +} + + +/** Non-aggregate RTSP callback */ +static int RtspCallbackId( httpd_callback_sys_t *p_args, + httpd_client_t *cl, + httpd_message_t *answer, + const httpd_message_t *query ) +{ + rtsp_stream_id_t *id = (rtsp_stream_id_t *)p_args; + return RtspHandler( id->stream, id, cl, answer, query ); +}