git.sesse.net Git - vlc/blob - modules/stream_out/rtsp.c

   1 /*****************************************************************************
   2  * rtsp.c: RTSP support for RTP stream output module
   3  *****************************************************************************
   4  * Copyright (C) 2003-2004 the VideoLAN team
   5  * Copyright © 2007 Rémi Denis-Courmont
   6  *
   7  * $Id$
   8  *
   9  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  10  *
  11  * This program is free software; you can redistribute it and/or modify
  12  * it under the terms of the GNU General Public License as published by
  13  * the Free Software Foundation; either version 2 of the License, or
  14  * (at your option) any later version.
  15  *
  16  * This program is distributed in the hope that it will be useful,
  17  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  18  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  19  * GNU General Public License for more details.
  20  *
  21  * You should have received a copy of the GNU General Public License
  22  * along with this program; if not, write to the Free Software
  23  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  24  *****************************************************************************/
  25
  26 /*****************************************************************************
  27  * Preamble
  28  *****************************************************************************/
  29 #ifdef HAVE_CONFIG_H
  30 # include "config.h"
  31 #endif
  32
  33 #include <vlc/vlc.h>
  34 #include <vlc_sout.h>
  35
  36 #include <vlc_httpd.h>
  37 #include <vlc_url.h>
  38 #include <vlc_network.h>
  39 #include <vlc_rand.h>
  40 #include <assert.h>
  41 #include <errno.h>
  42 #include <stdlib.h>
  43
  44 #include "rtp.h"
  45
  46 typedef struct rtsp_session_t rtsp_session_t;
  47
  48 struct rtsp_stream_t
  49 {
  50     vlc_mutex_t     lock;
  51     sout_stream_t  *owner;
  52     httpd_host_t   *host;
  53     httpd_url_t    *url;
  54     char           *psz_path;
  55     const char     *track_fmt;
  56     unsigned        port;
  57
  58     int             sessionc;
  59     rtsp_session_t **sessionv;
  60 };
  61
  62
  63 static int  RtspCallback( httpd_callback_sys_t *p_args,
  64                           httpd_client_t *cl, httpd_message_t *answer,
  65                           const httpd_message_t *query );
  66 static int  RtspCallbackId( httpd_callback_sys_t *p_args,
  67                             httpd_client_t *cl, httpd_message_t *answer,
  68                             const httpd_message_t *query );
  69 static void RtspClientDel( rtsp_stream_t *rtsp, rtsp_session_t *session );
  70
  71 rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
  72 {
  73     rtsp_stream_t *rtsp = malloc( sizeof( *rtsp ) );
  74
  75     if( rtsp == NULL || ( url->i_port > 99999 ) )
  76     {
  77         free( rtsp );
  78         return NULL;
  79     }
  80
  81     rtsp->owner = p_stream;
  82     rtsp->sessionc = 0;
  83     rtsp->sessionv = NULL;
  84     rtsp->host = NULL;
  85     rtsp->url = NULL;
  86     rtsp->psz_path = NULL;
  87     vlc_mutex_init( p_stream, &rtsp->lock );
  88
  89     rtsp->port = (url->i_port > 0) ? url->i_port : 554;
  90     rtsp->psz_path = strdup( ( url->psz_path != NULL ) ? url->psz_path : "/" );
  91     if( rtsp->psz_path == NULL )
  92         goto error;
  93
  94     assert( strlen( rtsp->psz_path ) > 0 );
  95     if( rtsp->psz_path[strlen( rtsp->psz_path ) - 1] == '/' )
  96         rtsp->track_fmt = "%strackID=%u";
  97     else
  98         rtsp->track_fmt = "%s/trackID=%u";
  99
 100     msg_Dbg( p_stream, "RTSP stream: host %s port %d at %s",
 101              url->psz_host, rtsp->port, rtsp->psz_path );
 102
 103     rtsp->host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host,
 104                                 rtsp->port );
 105     if( rtsp->host == NULL )
 106         goto error;
 107
 108     rtsp->url = httpd_UrlNewUnique( rtsp->host, rtsp->psz_path,
 109                                     NULL, NULL, NULL );
 110     if( rtsp->url == NULL )
 111         goto error;
 112
 113     httpd_UrlCatch( rtsp->url, HTTPD_MSG_DESCRIBE, RtspCallback, (void*)rtsp );
 114     httpd_UrlCatch( rtsp->url, HTTPD_MSG_SETUP,    RtspCallback, (void*)rtsp );
 115     httpd_UrlCatch( rtsp->url, HTTPD_MSG_PLAY,     RtspCallback, (void*)rtsp );
 116     httpd_UrlCatch( rtsp->url, HTTPD_MSG_PAUSE,    RtspCallback, (void*)rtsp );
 117     httpd_UrlCatch( rtsp->url, HTTPD_MSG_GETPARAMETER, RtspCallback,
 118                     (void*)rtsp );
 119     httpd_UrlCatch( rtsp->url, HTTPD_MSG_TEARDOWN, RtspCallback, (void*)rtsp );
 120     return rtsp;
 121
 122 error:
 123     RtspUnsetup( rtsp );
 124     return NULL;
 125 }
 126
 127
 128 void RtspUnsetup( rtsp_stream_t *rtsp )
 129 {
 130     while( rtsp->sessionc > 0 )
 131         RtspClientDel( rtsp, rtsp->sessionv[0] );
 132
 133     if( rtsp->url )
 134         httpd_UrlDelete( rtsp->url );
 135
 136     if( rtsp->host )
 137         httpd_HostDelete( rtsp->host );
 138
 139     free( rtsp->psz_path );
 140     vlc_mutex_destroy( &rtsp->lock );
 141 }
 142
 143
 144 struct rtsp_stream_id_t
 145 {
 146     rtsp_stream_t    *stream;
 147     sout_stream_id_t *sout_id;
 148     httpd_url_t      *url;
 149     const char       *dst;
 150     int               ttl;
 151     uint32_t          ssrc;
 152     uint16_t          loport, hiport;
 153 };
 154
 155
 156 typedef struct rtsp_strack_t rtsp_strack_t;
 157
 158 /* For unicast streaming */
 159 struct rtsp_session_t
 160 {
 161     rtsp_stream_t *stream;
 162     uint64_t       id;
 163
 164     /* output (id-access) */
 165     int            trackc;
 166     rtsp_strack_t *trackv;
 167 };
 168
 169
 170 /* Unicast session track */
 171 struct rtsp_strack_t
 172 {
 173     sout_stream_id_t  *id;
 174     int                fd;
 175     bool         playing;
 176 };
 177
 178
 179 rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
 180                              unsigned num, uint32_t ssrc,
 181                              /* Multicast stuff - TODO: cleanup */
 182                              const char *dst, int ttl,
 183                              unsigned loport, unsigned hiport )
 184 {
 185     char urlbuf[sizeof( "/trackID=123" ) + strlen( rtsp->psz_path )];
 186     rtsp_stream_id_t *id = malloc( sizeof( *id ) );
 187     httpd_url_t *url;
 188
 189     if( id == NULL )
 190         return NULL;
 191
 192     id->stream = rtsp;
 193     id->sout_id = sid;
 194     id->ssrc = ssrc;
 195     /* TODO: can we assume that this need not be strdup'd? */
 196     id->dst = dst;
 197     if( id->dst != NULL )
 198     {
 199         id->ttl = ttl;
 200         id->loport = loport;
 201         id->hiport = hiport;
 202     }
 203
 204     /* FIXME: num screws up if any ES has been removed and re-added */
 205     snprintf( urlbuf, sizeof( urlbuf ), rtsp->track_fmt, rtsp->psz_path,
 206               num );
 207     msg_Dbg( rtsp->owner, "RTSP: adding %s", urlbuf );
 208     url = id->url = httpd_UrlNewUnique( rtsp->host, urlbuf, NULL, NULL, NULL );
 209
 210     if( url == NULL )
 211     {
 212         free( id );
 213         return NULL;
 214     }
 215
 216     httpd_UrlCatch( url, HTTPD_MSG_DESCRIBE, RtspCallbackId, (void *)id );
 217     httpd_UrlCatch( url, HTTPD_MSG_SETUP,    RtspCallbackId, (void *)id );
 218     httpd_UrlCatch( url, HTTPD_MSG_PLAY,     RtspCallbackId, (void *)id );
 219     httpd_UrlCatch( url, HTTPD_MSG_PAUSE,    RtspCallbackId, (void *)id );
 220     httpd_UrlCatch( url, HTTPD_MSG_GETPARAMETER, RtspCallbackId, (void *)id );
 221     httpd_UrlCatch( url, HTTPD_MSG_TEARDOWN, RtspCallbackId, (void *)id );
 222
 223     return id;
 224 }
 225
 226
 227 void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t *id )
 228 {
 229     vlc_mutex_lock( &rtsp->lock );
 230     for( int i = 0; i < rtsp->sessionc; i++ )
 231     {
 232         rtsp_session_t *ses = rtsp->sessionv[i];
 233
 234         for( int j = 0; j < ses->trackc; j++ )
 235         {
 236             if( ses->trackv[j].id == id->sout_id )
 237             {
 238                 rtsp_strack_t *tr = ses->trackv + j;
 239                 net_Close( tr->fd );
 240                 REMOVE_ELEM( ses->trackv, ses->trackc, j );
 241             }
 242         }
 243     }
 244
 245     vlc_mutex_unlock( &rtsp->lock );
 246     httpd_UrlDelete( id->url );
 247     free( id );
 248 }
 249
 250
 251 /** rtsp must be locked */
 252 static
 253 rtsp_session_t *RtspClientNew( rtsp_stream_t *rtsp )
 254 {
 255     rtsp_session_t *s = malloc( sizeof( *s ) );
 256     if( s == NULL )
 257         return NULL;
 258
 259     s->stream = rtsp;
 260     vlc_rand_bytes (&s->id, sizeof (s->id));
 261     s->trackc = 0;
 262     s->trackv = NULL;
 263
 264     TAB_APPEND( rtsp->sessionc, rtsp->sessionv, s );
 265
 266     return s;
 267 }
 268
 269
 270 /** rtsp must be locked */
 271 static
 272 rtsp_session_t *RtspClientGet( rtsp_stream_t *rtsp, const char *name )
 273 {
 274     char *end;
 275     uint64_t id;
 276     int i;
 277
 278     if( name == NULL )
 279         return NULL;
 280
 281     errno = 0;
 282     id = strtoull( name, &end, 0x10 );
 283     if( errno || *end )
 284         return NULL;
 285
 286     /* FIXME: use a hash/dictionary */
 287     for( i = 0; i < rtsp->sessionc; i++ )
 288     {
 289         if( rtsp->sessionv[i]->id == id )
 290             return rtsp->sessionv[i];
 291     }
 292     return NULL;
 293 }
 294
 295
 296 /** rtsp must be locked */
 297 static
 298 void RtspClientDel( rtsp_stream_t *rtsp, rtsp_session_t *session )
 299 {
 300     int i;
 301     TAB_REMOVE( rtsp->sessionc, rtsp->sessionv, session );
 302
 303     for( i = 0; i < session->trackc; i++ )
 304         rtp_del_sink( session->trackv[i].id, session->trackv[i].fd );
 305
 306     free( session->trackv );
 307     free( session );
 308 }
 309
 310
 311 /** Finds the next transport choice */
 312 static inline const char *transport_next( const char *str )
 313 {
 314     /* Looks for comma */
 315     str = strchr( str, ',' );
 316     if( str == NULL )
 317         return NULL; /* No more transport options */
 318
 319     str++; /* skips comma */
 320     while( strchr( "\r\n\t ", *str ) )
 321         str++;
 322
 323     return (*str) ? str : NULL;
 324 }
 325
 326
 327 /** Finds the next transport parameter */
 328 static inline const char *parameter_next( const char *str )
 329 {
 330     while( strchr( ",;", *str ) == NULL )
 331         str++;
 332
 333     return (*str == ';') ? (str + 1) : NULL;
 334 }
 335
 336
 337 /** RTSP requests handler
 338  * @param id selected track for non-aggregate URLs,
 339  *           NULL for aggregate URLs
 340  */
 341 static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
 342                         httpd_client_t *cl,
 343                         httpd_message_t *answer,
 344                         const httpd_message_t *query )
 345 {
 346     sout_stream_t *p_stream = rtsp->owner;
 347     char psz_sesbuf[17];
 348     const char *psz_session = NULL, *psz;
 349     char control[sizeof("rtsp://[]:12345") + NI_MAXNUMERICHOST
 350                   + strlen( rtsp->psz_path )];
 351
 352     if( answer == NULL || query == NULL || cl == NULL )
 353         return VLC_SUCCESS;
 354     else
 355     {
 356         /* Build self-referential control URL */
 357         char ip[NI_MAXNUMERICHOST], *ptr;
 358
 359         httpd_ServerIP( cl, ip );
 360         ptr = strchr( ip, '%' );
 361         if( ptr != NULL )
 362             *ptr = '\0';
 363
 364         if( strchr( ip, ':' ) != NULL )
 365             sprintf( control, "rtsp://[%s]:%u%s", ip, rtsp->port,
 366                      rtsp->psz_path );
 367         else
 368             sprintf( control, "rtsp://%s:%u%s", ip, rtsp->port,
 369                      rtsp->psz_path );
 370     }
 371
 372     /* */
 373     answer->i_proto = HTTPD_PROTO_RTSP;
 374     answer->i_version= 0;
 375     answer->i_type   = HTTPD_MSG_ANSWER;
 376     answer->i_body = 0;
 377     answer->p_body = NULL;
 378
 379     if( query->i_proto != HTTPD_PROTO_RTSP )
 380     {
 381         answer->i_status = 505;
 382     }
 383     else
 384     if( httpd_MsgGet( query, "Require" ) != NULL )
 385     {
 386         answer->i_status = 551;
 387         httpd_MsgAdd( answer, "Unsupported", "%s",
 388                       httpd_MsgGet( query, "Require" ) );
 389     }
 390     else
 391     switch( query->i_type )
 392     {
 393         case HTTPD_MSG_DESCRIBE:
 394         {   /* Aggregate-only */
 395             if( id != NULL )
 396             {
 397                 answer->i_status = 460;
 398                 break;
 399             }
 400
 401             answer->i_status = 200;
 402             httpd_MsgAdd( answer, "Content-Type",  "%s", "application/sdp" );
 403             httpd_MsgAdd( answer, "Content-Base",  "%s", control );
 404             answer->p_body = (uint8_t *)SDPGenerate( rtsp->owner, control );
 405             if( answer->p_body != NULL )
 406                 answer->i_body = strlen( (char *)answer->p_body );
 407             else
 408                 answer->i_status = 500;
 409             break;
 410         }
 411
 412         case HTTPD_MSG_SETUP:
 413             /* Non-aggregate-only */
 414             if( id == NULL )
 415             {
 416                 answer->i_status = 459;
 417                 break;
 418             }
 419
 420             psz_session = httpd_MsgGet( query, "Session" );
 421             answer->i_status = 461;
 422
 423             for( const char *tpt = httpd_MsgGet( query, "Transport" );
 424                  tpt != NULL;
 425                  tpt = transport_next( tpt ) )
 426             {
 427                 bool b_multicast = true, b_unsupp = false;
 428                 unsigned loport = 5004, hiport = 5005; /* from RFC3551 */
 429
 430                 /* Check transport protocol. */
 431                 /* Currently, we only support RTP/AVP over UDP */
 432                 if( strncmp( tpt, "RTP/AVP", 7 ) )
 433                     continue;
 434                 tpt += 7;
 435                 if( strncmp( tpt, "/UDP", 4 ) == 0 )
 436                     tpt += 4;
 437                 if( strchr( ";,", *tpt ) == NULL )
 438                     continue;
 439
 440                 /* Parse transport options */
 441                 for( const char *opt = parameter_next( tpt );
 442                      opt != NULL;
 443                      opt = parameter_next( opt ) )
 444                 {
 445                     if( strncmp( opt, "multicast", 9 ) == 0)
 446                         b_multicast = true;
 447                     else
 448                     if( strncmp( opt, "unicast", 7 ) == 0 )
 449                         b_multicast = false;
 450                     else
 451                     if( sscanf( opt, "client_port=%u-%u", &loport, &hiport )
 452                                 == 2 )
 453                         ;
 454                     else
 455                     if( strncmp( opt, "mode=", 5 ) == 0 )
 456                     {
 457                         if( strncasecmp( opt + 5, "play", 4 )
 458                          && strncasecmp( opt + 5, "\"PLAY\"", 6 ) )
 459                         {
 460                             /* Not playing?! */
 461                             b_unsupp = true;
 462                             break;
 463                         }
 464                     }
 465                     else
 466                     if( strncmp( opt,"destination=", 12 ) == 0 )
 467                     {
 468                         answer->i_status = 403;
 469                         b_unsupp = true;
 470                     }
 471                     else
 472                     {
 473                     /*
 474                      * Every other option is unsupported:
 475                      *
 476                      * "source" and "append" are invalid (server-only);
 477                      * "ssrc" also (as clarified per RFC2326bis).
 478                      *
 479                      * For multicast, "port", "layers", "ttl" are set by the
 480                      * stream output configuration.
 481                      *
 482                      * For unicast, we want to decide "server_port" values.
 483                      *
 484                      * "interleaved" is not implemented.
 485                      */
 486                         b_unsupp = true;
 487                         break;
 488                     }
 489                 }
 490
 491                 if( b_unsupp )
 492                     continue;
 493
 494                 if( b_multicast )
 495                 {
 496                     const char *dst = id->dst;
 497                     if( dst == NULL )
 498                         continue;
 499
 500                     if( psz_session == NULL )
 501                     {
 502                         /* Create a dummy session ID */
 503                         snprintf( psz_sesbuf, sizeof( psz_sesbuf ), "%d",
 504                                   rand() );
 505                         psz_session = psz_sesbuf;
 506                     }
 507                     answer->i_status = 200;
 508
 509                     httpd_MsgAdd( answer, "Transport",
 510                                   "RTP/AVP/UDP;destination=%s;port=%u-%u;"
 511                                   "ttl=%d;mode=play",
 512                                   dst, id->loport, id->hiport,
 513                                   ( id->ttl > 0 ) ? id->ttl : 1 );
 514                 }
 515                 else
 516                 {
 517                     char ip[NI_MAXNUMERICHOST], src[NI_MAXNUMERICHOST];
 518                     rtsp_session_t *ses = NULL;
 519                     rtsp_strack_t track = { id->sout_id, -1, false };
 520                     int sport;
 521
 522                     if( httpd_ClientIP( cl, ip ) == NULL )
 523                     {
 524                         answer->i_status = 500;
 525                         continue;
 526                     }
 527
 528                     track.fd = net_ConnectDgram( p_stream, ip, loport, -1,
 529                                                  IPPROTO_UDP );
 530                     if( track.fd == -1 )
 531                     {
 532                         msg_Err( p_stream,
 533                                  "cannot create RTP socket for %s port %u",
 534                                  ip, loport );
 535                         answer->i_status = 500;
 536                         continue;
 537                     }
 538
 539                     net_GetSockAddress( track.fd, src, &sport );
 540
 541                     vlc_mutex_lock( &rtsp->lock );
 542                     if( psz_session == NULL )
 543                     {
 544                         ses = RtspClientNew( rtsp );
 545                         snprintf( psz_sesbuf, sizeof( psz_sesbuf ), I64Fx,
 546                                   ses->id );
 547                         psz_session = psz_sesbuf;
 548                     }
 549                     else
 550                     {
 551                         /* FIXME: we probably need to remove an access out,
 552                          * if there is already one for the same ID */
 553                         ses = RtspClientGet( rtsp, psz_session );
 554                         if( ses == NULL )
 555                         {
 556                             answer->i_status = 454;
 557                             vlc_mutex_unlock( &rtsp->lock );
 558                             continue;
 559                         }
 560                     }
 561
 562                     INSERT_ELEM( ses->trackv, ses->trackc, ses->trackc,
 563                                  track );
 564                     vlc_mutex_unlock( &rtsp->lock );
 565
 566                     httpd_ServerIP( cl, ip );
 567
 568                     if( strcmp( src, ip ) )
 569                     {
 570                         /* Specify source IP if it is different from the RTSP
 571                          * control connection server address */
 572                         char *ptr = strchr( src, '%' );
 573                         if( ptr != NULL ) *ptr = '\0'; /* remove scope ID */
 574
 575                         httpd_MsgAdd( answer, "Transport",
 576                                       "RTP/AVP/UDP;unicast;source=%s;"
 577                                       "client_port=%u-%u;server_port=%u-%u;"
 578                                       "ssrc=%08X;mode=play",
 579                                       src, loport, loport + 1, sport,
 580                                       sport + 1, id->ssrc );
 581                     }
 582                     else
 583                     {
 584                         httpd_MsgAdd( answer, "Transport",
 585                                       "RTP/AVP/UDP;unicast;"
 586                                       "client_port=%u-%u;server_port=%u-%u;"
 587                                       "ssrc=%08X;mode=play",
 588                                       loport, loport + 1, sport, sport + 1,
 589                                       id->ssrc );
 590                     }
 591
 592                     answer->i_status = 200;
 593                 }
 594                 break;
 595             }
 596             break;
 597
 598         case HTTPD_MSG_PLAY:
 599         {
 600             rtsp_session_t *ses;
 601             answer->i_status = 200;
 602
 603             psz_session = httpd_MsgGet( query, "Session" );
 604 #if 0
 605             /* FIXME: This breaks totem, mplayer and quicktime at least */
 606             if( httpd_MsgGet( query, "Range" ) != NULL )
 607             {
 608                 answer->i_status = 456; /* cannot seek, stream not seekable */
 609                 break;
 610             }
 611 #endif
 612             vlc_mutex_lock( &rtsp->lock );
 613             ses = RtspClientGet( rtsp, psz_session );
 614             if( ses != NULL )
 615             {
 616                 /* FIXME: we really need to limit the number of tracks... */
 617                 char info[ses->trackc * ( strlen( control )
 618                                   + sizeof("/trackID=123;seq=65535, ") ) + 1];
 619                 size_t infolen = 0;
 620
 621                 for( int i = 0; i < ses->trackc; i++ )
 622                 {
 623                     rtsp_strack_t *tr = ses->trackv + i;
 624                     if( ( id == NULL ) || ( tr->id == id->sout_id ) )
 625                     {
 626                         if( !tr->playing )
 627                         {
 628                             tr->playing = true;
 629                             rtp_add_sink( tr->id, tr->fd, false );
 630                         }
 631                         infolen += sprintf( info + infolen,
 632                                             "%s/trackID=%u;seq=%u, ", control,
 633                                             rtp_get_num( tr->id ),
 634                                             rtp_get_seq( tr->id ) );
 635                     }
 636                 }
 637                 if( infolen > 0 )
 638                 {
 639                     info[infolen - 2] = '\0'; /* remove trailing ", " */
 640                     httpd_MsgAdd( answer, "RTP-Info", "%s", info );
 641                 }
 642             }
 643             vlc_mutex_unlock( &rtsp->lock );
 644
 645             if( httpd_MsgGet( query, "Scale" ) != NULL )
 646                 httpd_MsgAdd( answer, "Scale", "1." );
 647             break;
 648         }
 649
 650         case HTTPD_MSG_PAUSE:
 651             answer->i_status = 405;
 652             httpd_MsgAdd( answer, "Allow",
 653                           "%s, TEARDOWN, PLAY, GET_PARAMETER",
 654                           ( id != NULL ) ? "SETUP" : "DESCRIBE" );
 655             break;
 656
 657         case HTTPD_MSG_GETPARAMETER:
 658             if( query->i_body > 0 )
 659             {
 660                 answer->i_status = 451;
 661                 break;
 662             }
 663
 664             psz_session = httpd_MsgGet( query, "Session" );
 665             answer->i_status = 200;
 666             break;
 667
 668         case HTTPD_MSG_TEARDOWN:
 669         {
 670             rtsp_session_t *ses;
 671
 672             answer->i_status = 200;
 673
 674             psz_session = httpd_MsgGet( query, "Session" );
 675
 676             vlc_mutex_lock( &rtsp->lock );
 677             ses = RtspClientGet( rtsp, psz_session );
 678             if( ses != NULL )
 679             {
 680                 if( id == NULL ) /* Delete the entire session */
 681                     RtspClientDel( rtsp, ses );
 682                 else /* Delete one track from the session */
 683                 for( int i = 0; i < ses->trackc; i++ )
 684                 {
 685                     if( ses->trackv[i].id == id->sout_id )
 686                     {
 687                         rtp_del_sink( id->sout_id, ses->trackv[i].fd );
 688                         REMOVE_ELEM( ses->trackv, ses->trackc, i );
 689                     }
 690                 }
 691             }
 692             vlc_mutex_unlock( &rtsp->lock );
 693             break;
 694         }
 695
 696         default:
 697             return VLC_EGENERIC;
 698     }
 699
 700     httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING );
 701     if( psz_session )
 702         httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session );
 703
 704     httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
 705     httpd_MsgAdd( answer, "Cache-Control", "no-cache" );
 706
 707     psz = httpd_MsgGet( query, "Cseq" );
 708     if( psz != NULL )
 709         httpd_MsgAdd( answer, "Cseq", "%s", psz );
 710     psz = httpd_MsgGet( query, "Timestamp" );
 711     if( psz != NULL )
 712         httpd_MsgAdd( answer, "Timestamp", "%s", psz );
 713
 714     return VLC_SUCCESS;
 715 }
 716
 717
 718 /** Aggregate RTSP callback */
 719 static int RtspCallback( httpd_callback_sys_t *p_args,
 720                          httpd_client_t *cl,
 721                          httpd_message_t *answer,
 722                          const httpd_message_t *query )
 723 {
 724     return RtspHandler( (rtsp_stream_t *)p_args, NULL, cl, answer, query );
 725 }
 726
 727
 728 /** Non-aggregate RTSP callback */
 729 static int RtspCallbackId( httpd_callback_sys_t *p_args,
 730                            httpd_client_t *cl,
 731                            httpd_message_t *answer,
 732                            const httpd_message_t *query )
 733 {
 734     rtsp_stream_id_t *id = (rtsp_stream_id_t *)p_args;
 735     return RtspHandler( id->stream, id, cl, answer, query );
 736 }