summaryrefslogtreecommitdiffstats
path: root/libmpdemux/librtsp
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/librtsp')
-rw-r--r--libmpdemux/librtsp/rtsp.c804
-rw-r--r--libmpdemux/librtsp/rtsp.h84
-rw-r--r--libmpdemux/librtsp/rtsp_rtp.c700
-rw-r--r--libmpdemux/librtsp/rtsp_rtp.h41
-rw-r--r--libmpdemux/librtsp/rtsp_session.c269
-rw-r--r--libmpdemux/librtsp/rtsp_session.h42
6 files changed, 0 insertions, 1940 deletions
diff --git a/libmpdemux/librtsp/rtsp.c b/libmpdemux/librtsp/rtsp.c
deleted file mode 100644
index 16a77f77d5..0000000000
--- a/libmpdemux/librtsp/rtsp.c
+++ /dev/null
@@ -1,804 +0,0 @@
-/*
- * This file was ported to MPlayer from xine CVS rtsp.c,v 1.9 2003/04/10 02:30:48
- */
-
-/*
- * Copyright (C) 2000-2002 the xine project
- *
- * This file is part of xine, a free video player.
- *
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- *
- * a minimalistic implementation of rtsp protocol,
- * *not* RFC 2326 compilant yet.
- *
- * 2006, Benjamin Zores and Vincent Mussard
- * fixed a lot of RFC compliance issues.
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <assert.h>
-#include "config.h"
-#ifndef HAVE_WINSOCK2
-#define closesocket close
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#else
-#include <winsock2.h>
-#endif
-#include <string.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <inttypes.h>
-
-#include "mp_msg.h"
-#include "rtsp.h"
-#include "rtsp_session.h"
-#include "osdep/timer.h"
-
-/*
-#define LOG
-*/
-
-#define BUF_SIZE 4096
-#define HEADER_SIZE 1024
-#define MAX_FIELDS 256
-
-struct rtsp_s {
-
- int s;
-
- char *host;
- int port;
- char *path;
- char *param;
- char *mrl;
- char *user_agent;
-
- char *server;
- unsigned int server_state;
- uint32_t server_caps;
-
- unsigned int cseq;
- char *session;
-
- char *answers[MAX_FIELDS]; /* data of last message */
- char *scheduled[MAX_FIELDS]; /* will be sent with next message */
-};
-
-/*
- * constants
- */
-
-#define RTSP_PROTOCOL_VERSION "RTSP/1.0"
-
-/* server states */
-#define RTSP_CONNECTED 1
-#define RTSP_INIT 2
-#define RTSP_READY 4
-#define RTSP_PLAYING 8
-#define RTSP_RECORDING 16
-
-/* server capabilities */
-#define RTSP_OPTIONS 0x001
-#define RTSP_DESCRIBE 0x002
-#define RTSP_ANNOUNCE 0x004
-#define RTSP_SETUP 0x008
-#define RTSP_GET_PARAMETER 0x010
-#define RTSP_SET_PARAMETER 0x020
-#define RTSP_TEARDOWN 0x040
-#define RTSP_PLAY 0x080
-#define RTSP_RECORD 0x100
-
-/*
- * network utilities
- */
-
-static int write_stream(int s, const char *buf, int len) {
- int total, timeout;
-
- total = 0; timeout = 30;
- while (total < len){
- int n;
-
- n = send (s, &buf[total], len - total, 0);
-
- if (n > 0)
- total += n;
- else if (n < 0) {
-#ifndef HAVE_WINSOCK2
- if ((timeout>0) && ((errno == EAGAIN) || (errno == EINPROGRESS))) {
-#else
- if ((timeout>0) && ((errno == EAGAIN) || (WSAGetLastError() == WSAEINPROGRESS))) {
-#endif
- usec_sleep (1000000); timeout--;
- } else
- return -1;
- }
- }
-
- return total;
-}
-
-static ssize_t read_stream(int fd, void *buf, size_t count) {
-
- ssize_t ret, total;
-
- total = 0;
-
- while (total < count) {
-
- ret=recv (fd, ((uint8_t*)buf)+total, count-total, 0);
-
- if (ret<0) {
- if(errno == EAGAIN) {
- fd_set rset;
- struct timeval timeout;
-
- FD_ZERO (&rset);
- FD_SET (fd, &rset);
-
- timeout.tv_sec = 30;
- timeout.tv_usec = 0;
-
- if (select (fd+1, &rset, NULL, NULL, &timeout) <= 0) {
- return -1;
- }
- continue;
- }
-
- mp_msg(MSGT_OPEN, MSGL_ERR, "rtsp: read error.\n");
- return ret;
- } else
- total += ret;
-
- /* end of stream */
- if (!ret) break;
- }
-
- return total;
-}
-
-/*
- * rtsp_get gets a line from stream
- * and returns a null terminated string.
- */
-
-static char *rtsp_get(rtsp_t *s) {
-
- int n=1;
- char *buffer = malloc(BUF_SIZE);
- char *string = NULL;
-
- read_stream(s->s, buffer, 1);
- while (n<BUF_SIZE) {
- read_stream(s->s, &(buffer[n]), 1);
- if ((buffer[n-1]==0x0d)&&(buffer[n]==0x0a)) break;
- n++;
- }
-
- if (n>=BUF_SIZE) {
- mp_msg(MSGT_OPEN, MSGL_FATAL, "librtsp: buffer overflow in rtsp_get\n");
- exit(1);
- }
- string=malloc(n);
- memcpy(string,buffer,n-1);
- string[n-1]=0;
-
-#ifdef LOG
- mp_msg(MSGT_OPEN, MSGL_INFO, "librtsp: << '%s'\n", string);
-#endif
-
-
- free(buffer);
- return string;
-}
-
-/*
- * rtsp_put puts a line on stream
- */
-
-static void rtsp_put(rtsp_t *s, const char *string) {
-
- int len=strlen(string);
- char *buf=malloc(len+2);
-
-#ifdef LOG
- mp_msg(MSGT_OPEN, MSGL_INFO, "librtsp: >> '%s'", string);
-#endif
-
- memcpy(buf,string,len);
- buf[len]=0x0d;
- buf[len+1]=0x0a;
-
- write_stream(s->s, buf, len+2);
-
-#ifdef LOG
- mp_msg(MSGT_OPEN, MSGL_INFO, " done.\n");
-#endif
-
- free(buf);
-}
-
-/*
- * extract server status code
- */
-
-static int rtsp_get_code(const char *string) {
-
- char buf[4];
- int code=0;
-
- if (!strncmp(string, RTSP_PROTOCOL_VERSION, strlen(RTSP_PROTOCOL_VERSION)))
- {
- memcpy(buf, string+strlen(RTSP_PROTOCOL_VERSION)+1, 3);
- buf[3]=0;
- code=atoi(buf);
- } else if (!strncmp(string, RTSP_METHOD_SET_PARAMETER,8))
- {
- return RTSP_STATUS_SET_PARAMETER;
- }
-
- if(code != RTSP_STATUS_OK) mp_msg(MSGT_OPEN, MSGL_INFO, "librtsp: server responds: '%s'\n",string);
-
- return code;
-}
-
-/*
- * send a request
- */
-
-static void rtsp_send_request(rtsp_t *s, const char *type, const char *what) {
-
- char **payload=s->scheduled;
- char *buf;
-
- buf = malloc(strlen(type)+strlen(what)+strlen(RTSP_PROTOCOL_VERSION)+3);
-
- sprintf(buf,"%s %s %s",type, what, RTSP_PROTOCOL_VERSION);
- rtsp_put(s,buf);
- free(buf);
- if (payload)
- while (*payload) {
- rtsp_put(s,*payload);
- payload++;
- }
- rtsp_put(s,"");
- rtsp_unschedule_all(s);
-}
-
-/*
- * schedule standard fields
- */
-
-static void rtsp_schedule_standard(rtsp_t *s) {
-
- char tmp[17];
-
- snprintf(tmp, 17, "CSeq: %u", s->cseq);
- rtsp_schedule_field(s, tmp);
-
- if (s->session) {
- char *buf;
- buf = malloc(strlen(s->session)+15);
- sprintf(buf, "Session: %s", s->session);
- rtsp_schedule_field(s, buf);
- free(buf);
- }
-}
-/*
- * get the answers, if server responses with something != 200, return NULL
- */
-
-static int rtsp_get_answers(rtsp_t *s) {
-
- char *answer=NULL;
- unsigned int answer_seq;
- char **answer_ptr=s->answers;
- int code;
- int ans_count = 0;
-
- answer=rtsp_get(s);
- if (!answer)
- return 0;
- code=rtsp_get_code(answer);
- free(answer);
-
- rtsp_free_answers(s);
-
- do { /* while we get answer lines */
-
- answer=rtsp_get(s);
- if (!answer)
- return 0;
-
- if (!strncasecmp(answer,"CSeq:",5)) {
- sscanf(answer,"%*s %u",&answer_seq);
- if (s->cseq != answer_seq) {
-#ifdef LOG
- mp_msg(MSGT_OPEN, MSGL_WARN, "librtsp: warning: CSeq mismatch. got %u, assumed %u", answer_seq, s->cseq);
-#endif
- s->cseq=answer_seq;
- }
- }
- if (!strncasecmp(answer,"Server:",7)) {
- char *buf = malloc(strlen(answer));
- sscanf(answer,"%*s %s",buf);
- if (s->server) free(s->server);
- s->server=strdup(buf);
- free(buf);
- }
- if (!strncasecmp(answer,"Session:",8)) {
- char *buf = calloc(1, strlen(answer));
- sscanf(answer,"%*s %s",buf);
- if (s->session) {
- if (strcmp(buf, s->session)) {
- mp_msg(MSGT_OPEN, MSGL_WARN, "rtsp: warning: setting NEW session: %s\n", buf);
- free(s->session);
- s->session=strdup(buf);
- }
- } else
- {
-#ifdef LOG
- mp_msg(MSGT_OPEN, MSGL_INFO, "rtsp: setting session id to: %s\n", buf);
-#endif
- s->session=strdup(buf);
- }
- free(buf);
- }
- *answer_ptr=answer;
- answer_ptr++;
- } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
-
- s->cseq++;
-
- *answer_ptr=NULL;
- rtsp_schedule_standard(s);
-
- return code;
-}
-
-/*
- * send an ok message
- */
-
-int rtsp_send_ok(rtsp_t *s) {
- char cseq[16];
-
- rtsp_put(s, "RTSP/1.0 200 OK");
- sprintf(cseq,"CSeq: %u", s->cseq);
- rtsp_put(s, cseq);
- rtsp_put(s, "");
- return 0;
-}
-
-/*
- * implementation of must-have rtsp requests; functions return
- * server status code.
- */
-
-int rtsp_request_options(rtsp_t *s, const char *what) {
-
- char *buf;
-
- if (what) {
- buf=strdup(what);
- } else
- {
- buf=malloc(strlen(s->host)+16);
- sprintf(buf,"rtsp://%s:%i", s->host, s->port);
- }
- rtsp_send_request(s,RTSP_METHOD_OPTIONS,buf);
- free(buf);
-
- return rtsp_get_answers(s);
-}
-
-int rtsp_request_describe(rtsp_t *s, const char *what) {
-
- char *buf;
-
- if (what) {
- buf=strdup(what);
- } else
- {
- buf=malloc(strlen(s->host)+strlen(s->path)+16);
- sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
- }
- rtsp_send_request(s,RTSP_METHOD_DESCRIBE,buf);
- free(buf);
-
- return rtsp_get_answers(s);
-}
-
-int rtsp_request_setup(rtsp_t *s, const char *what, char *control) {
-
- char *buf = NULL;
-
- if (what)
- buf = strdup (what);
- else
- {
- int len = strlen (s->host) + strlen (s->path) + 16;
- if (control)
- len += strlen (control) + 1;
-
- buf = malloc (len);
- sprintf (buf, "rtsp://%s:%i/%s%s%s", s->host, s->port, s->path,
- control ? "/" : "", control ? control : "");
- }
-
- rtsp_send_request (s, RTSP_METHOD_SETUP, buf);
- free (buf);
- return rtsp_get_answers (s);
-}
-
-int rtsp_request_setparameter(rtsp_t *s, const char *what) {
-
- char *buf;
-
- if (what) {
- buf=strdup(what);
- } else
- {
- buf=malloc(strlen(s->host)+strlen(s->path)+16);
- sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
- }
- rtsp_send_request(s,RTSP_METHOD_SET_PARAMETER,buf);
- free(buf);
-
- return rtsp_get_answers(s);
-}
-
-int rtsp_request_play(rtsp_t *s, const char *what) {
-
- char *buf;
- int ret;
-
- if (what) {
- buf=strdup(what);
- } else
- {
- buf=malloc(strlen(s->host)+strlen(s->path)+16);
- sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
- }
- rtsp_send_request(s,RTSP_METHOD_PLAY,buf);
- free(buf);
-
- ret = rtsp_get_answers (s);
- if (ret == RTSP_STATUS_OK)
- s->server_state = RTSP_PLAYING;
-
- return ret;
-}
-
-int rtsp_request_teardown(rtsp_t *s, const char *what) {
-
- char *buf;
-
- if (what)
- buf = strdup (what);
- else
- {
- buf =
- malloc (strlen (s->host) + strlen (s->path) + 16);
- sprintf (buf, "rtsp://%s:%i/%s", s->host, s->port, s->path);
- }
- rtsp_send_request (s, RTSP_METHOD_TEARDOWN, buf);
- free (buf);
-
- /* after teardown we're done with RTSP streaming, no need to get answer as
- reading more will only result to garbage and buffer overflow */
- return RTSP_STATUS_OK;
-}
-
-/*
- * read opaque data from stream
- */
-
-int rtsp_read_data(rtsp_t *s, char *buffer, unsigned int size) {
-
- int i,seq;
-
- if (size>=4) {
- i=read_stream(s->s, buffer, 4);
- if (i<4) return i;
- if (((buffer[0]=='S')&&(buffer[1]=='E')&&(buffer[2]=='T')&&(buffer[3]=='_')) ||
- ((buffer[0]=='O')&&(buffer[1]=='P')&&(buffer[2]=='T')&&(buffer[3]=='I'))) // OPTIONS
- {
- char *rest=rtsp_get(s);
- if (!rest)
- return -1;
-
- seq=-1;
- do {
- free(rest);
- rest=rtsp_get(s);
- if (!rest)
- return -1;
- if (!strncasecmp(rest,"CSeq:",5))
- sscanf(rest,"%*s %u",&seq);
- } while (strlen(rest)!=0);
- free(rest);
- if (seq<0) {
-#ifdef LOG
- mp_msg(MSGT_OPEN, MSGL_WARN, "rtsp: warning: CSeq not recognized!\n");
-#endif
- seq=1;
- }
- /* let's make the server happy */
- rtsp_put(s, "RTSP/1.0 451 Parameter Not Understood");
- rest=malloc(17);
- sprintf(rest,"CSeq: %u", seq);
- rtsp_put(s, rest);
- free(rest);
- rtsp_put(s, "");
- i=read_stream(s->s, buffer, size);
- } else
- {
- i=read_stream(s->s, buffer+4, size-4);
- i+=4;
- }
- } else
- i=read_stream(s->s, buffer, size);
-#ifdef LOG
- mp_msg(MSGT_OPEN, MSGL_INFO, "librtsp: << %d of %d bytes\n", i, size);
-#endif
-
- return i;
-}
-
-/*
- * connect to a rtsp server
- */
-
-//rtsp_t *rtsp_connect(const char *mrl, const char *user_agent) {
-rtsp_t *rtsp_connect(int fd, char* mrl, char *path, char *host, int port, char *user_agent) {
-
- rtsp_t *s=malloc(sizeof(rtsp_t));
- int i;
-
- for (i=0; i<MAX_FIELDS; i++) {
- s->answers[i]=NULL;
- s->scheduled[i]=NULL;
- }
-
- s->server=NULL;
- s->server_state=0;
- s->server_caps=0;
-
- s->cseq=0;
- s->session=NULL;
-
- if (user_agent)
- s->user_agent=strdup(user_agent);
- else
- s->user_agent=strdup("User-Agent: RealMedia Player Version 6.0.9.1235 (linux-2.0-libc6-i386-gcc2.95)");
-
- s->mrl = strdup(mrl);
- s->host = strdup(host);
- s->port = port;
- s->path = strdup(path);
- while (*path == '/')
- path++;
- if ((s->param = strchr(s->path, '?')) != NULL)
- s->param++;
- //mp_msg(MSGT_OPEN, MSGL_INFO, "path=%s\n", s->path);
- //mp_msg(MSGT_OPEN, MSGL_INFO, "param=%s\n", s->param ? s->param : "NULL");
- s->s = fd;
-
- if (s->s < 0) {
- mp_msg(MSGT_OPEN, MSGL_ERR, "rtsp: failed to connect to '%s'\n", s->host);
- rtsp_close(s);
- return NULL;
- }
-
- s->server_state=RTSP_CONNECTED;
-
- /* now let's send an options request. */
- rtsp_schedule_field(s, "CSeq: 1");
- rtsp_schedule_field(s, s->user_agent);
- rtsp_schedule_field(s, "ClientChallenge: 9e26d33f2984236010ef6253fb1887f7");
- rtsp_schedule_field(s, "PlayerStarttime: [28/03/2003:22:50:23 00:00]");
- rtsp_schedule_field(s, "CompanyID: KnKV4M4I/B2FjJ1TToLycw==");
- rtsp_schedule_field(s, "GUID: 00000000-0000-0000-0000-000000000000");
- rtsp_schedule_field(s, "RegionData: 0");
- rtsp_schedule_field(s, "ClientID: Linux_2.4_6.0.9.1235_play32_RN01_EN_586");
- /*rtsp_schedule_field(s, "Pragma: initiate-session");*/
- rtsp_request_options(s, NULL);
-
- return s;
-}
-
-
-/*
- * closes an rtsp connection
- */
-
-void rtsp_close(rtsp_t *s) {
-
- if (s->server_state)
- {
- if (s->server_state == RTSP_PLAYING)
- rtsp_request_teardown (s, NULL);
- closesocket (s->s);
- }
-
- if (s->path) free(s->path);
- if (s->host) free(s->host);
- if (s->mrl) free(s->mrl);
- if (s->session) free(s->session);
- if (s->user_agent) free(s->user_agent);
- rtsp_free_answers(s);
- rtsp_unschedule_all(s);
- free(s);
-}
-
-/*
- * search in answers for tags. returns a pointer to the content
- * after the first matched tag. returns NULL if no match found.
- */
-
-char *rtsp_search_answers(rtsp_t *s, const char *tag) {
-
- char **answer;
- char *ptr;
-
- if (!s->answers) return NULL;
- answer=s->answers;
-
- while (*answer) {
- if (!strncasecmp(*answer,tag,strlen(tag))) {
- ptr=strchr(*answer,':');
- if (!ptr) return NULL;
- ptr++;
- while(*ptr==' ') ptr++;
- return ptr;
- }
- answer++;
- }
-
- return NULL;
-}
-
-/*
- * session id management
- */
-
-void rtsp_set_session(rtsp_t *s, const char *id) {
-
- if (s->session) free(s->session);
-
- s->session=strdup(id);
-
-}
-
-char *rtsp_get_session(rtsp_t *s) {
-
- return s->session;
-
-}
-
-char *rtsp_get_mrl(rtsp_t *s) {
-
- return s->mrl;
-
-}
-
-char *rtsp_get_param(rtsp_t *s, const char *p) {
- int len;
- char *param;
- if (!s->param)
- return NULL;
- if (!p)
- return strdup(s->param);
- len = strlen(p);
- param = s->param;
- while (param && *param) {
- char *nparam = strchr(param, '&');
- if (strncmp(param, p, len) == 0 && param[len] == '=') {
- param += len + 1;
- len = nparam ? nparam - param : strlen(param);
- nparam = malloc(len + 1);
- memcpy(nparam, param, len);
- nparam[len] = 0;
- return nparam;
- }
- param = nparam ? nparam + 1 : NULL;
- }
- return NULL;
-}
-
-/*
- * schedules a field for transmission
- */
-
-void rtsp_schedule_field(rtsp_t *s, const char *string) {
-
- int i=0;
-
- if (!string) return;
-
- while(s->scheduled[i]) {
- i++;
- }
- s->scheduled[i]=strdup(string);
-}
-
-/*
- * removes the first scheduled field which prefix matches string.
- */
-
-void rtsp_unschedule_field(rtsp_t *s, const char *string) {
-
- char **ptr=s->scheduled;
-
- if (!string) return;
-
- while(*ptr) {
- if (!strncmp(*ptr, string, strlen(string)))
- break;
- else
- ptr++;
- }
- if (*ptr) free(*ptr);
- ptr++;
- do {
- *(ptr-1)=*ptr;
- } while(*ptr);
-}
-
-/*
- * unschedule all fields
- */
-
-void rtsp_unschedule_all(rtsp_t *s) {
-
- char **ptr;
-
- if (!s->scheduled) return;
- ptr=s->scheduled;
-
- while (*ptr) {
- free(*ptr);
- *ptr=NULL;
- ptr++;
- }
-}
-/*
- * free answers
- */
-
-void rtsp_free_answers(rtsp_t *s) {
-
- char **answer;
-
- if (!s->answers) return;
- answer=s->answers;
-
- while (*answer) {
- free(*answer);
- *answer=NULL;
- answer++;
- }
-}
diff --git a/libmpdemux/librtsp/rtsp.h b/libmpdemux/librtsp/rtsp.h
deleted file mode 100644
index eefdd79d51..0000000000
--- a/libmpdemux/librtsp/rtsp.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * This file was ported to MPlayer from xine CVS rtsp.h,v 1.2 2002/12/16 21:50:55
- */
-
-/*
- * Copyright (C) 2002 the xine project
- *
- * This file is part of xine, a free video player.
- *
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- *
- * a minimalistic implementation of rtsp protocol,
- * *not* RFC 2326 compilant yet.
- *
- * 2006, Benjamin Zores and Vincent Mussard
- * fixed a lot of RFC compliance issues.
- */
-
-#ifndef HAVE_RTSP_H
-#define HAVE_RTSP_H
-
-
-/* some codes returned by rtsp_request_* functions */
-
-#define RTSP_STATUS_SET_PARAMETER 10
-#define RTSP_STATUS_OK 200
-
-#define RTSP_METHOD_OPTIONS "OPTIONS"
-#define RTSP_METHOD_DESCRIBE "DESCRIBE"
-#define RTSP_METHOD_SETUP "SETUP"
-#define RTSP_METHOD_PLAY "PLAY"
-#define RTSP_METHOD_TEARDOWN "TEARDOWN"
-#define RTSP_METHOD_SET_PARAMETER "SET_PARAMETER"
-
-typedef struct rtsp_s rtsp_t;
-
-rtsp_t* rtsp_connect (int fd, char *mrl, char *path, char *host, int port, char *user_agent);
-
-int rtsp_request_options(rtsp_t *s, const char *what);
-int rtsp_request_describe(rtsp_t *s, const char *what);
-int rtsp_request_setup(rtsp_t *s, const char *what, char *control);
-int rtsp_request_setparameter(rtsp_t *s, const char *what);
-int rtsp_request_play(rtsp_t *s, const char *what);
-int rtsp_request_teardown(rtsp_t *s, const char *what);
-
-int rtsp_send_ok(rtsp_t *s);
-
-int rtsp_read_data(rtsp_t *s, char *buffer, unsigned int size);
-
-char* rtsp_search_answers(rtsp_t *s, const char *tag);
-void rtsp_add_to_payload(char **payload, const char *string);
-
-void rtsp_free_answers(rtsp_t *this);
-
-int rtsp_read (rtsp_t *this, char *data, int len);
-void rtsp_close (rtsp_t *this);
-
-void rtsp_set_session(rtsp_t *s, const char *id);
-char *rtsp_get_session(rtsp_t *s);
-
-char *rtsp_get_mrl(rtsp_t *s);
-char *rtsp_get_param(rtsp_t *s, const char *param);
-
-/*int rtsp_peek_header (rtsp_t *this, char *data); */
-
-void rtsp_schedule_field(rtsp_t *s, const char *string);
-void rtsp_unschedule_field(rtsp_t *s, const char *string);
-void rtsp_unschedule_all(rtsp_t *s);
-
-#endif
-
diff --git a/libmpdemux/librtsp/rtsp_rtp.c b/libmpdemux/librtsp/rtsp_rtp.c
deleted file mode 100644
index b6cfd065a1..0000000000
--- a/libmpdemux/librtsp/rtsp_rtp.c
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
- * Copyright (C) 2006 Benjamin Zores
- * based on the Freebox patch for xine by Vincent Mussard
- * but with many enhancements for better RTSP RFC compliance.
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <inttypes.h>
-
-#include "config.h"
-
-#ifndef HAVE_WINSOCK2
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
-#include "mp_msg.h"
-#include "rtsp.h"
-#include "rtsp_rtp.h"
-#include "rtsp_session.h"
-#include "../freesdp/common.h"
-#include "../freesdp/parser.h"
-
-#define RTSP_DEFAULT_PORT 31336
-#define MAX_LENGTH 256
-
-#define RTSP_ACCEPT_SDP "Accept: application/sdp"
-#define RTSP_CONTENT_LENGTH "Content-length"
-#define RTSP_CONTENT_TYPE "Content-Type"
-#define RTSP_APPLICATION_SDP "application/sdp"
-#define RTSP_RANGE "Range: "
-#define RTSP_NPT_NOW "npt=now-"
-#define RTSP_MEDIA_CONTAINER_MPEG_TS "33"
-#define RTSP_TRANSPORT_REQUEST "Transport: RTP/AVP;%s;%s%i-%i;mode=\"PLAY\""
-
-#define RTSP_TRANSPORT_MULTICAST "multicast"
-#define RTSP_TRANSPORT_UNICAST "unicast"
-
-#define RTSP_MULTICAST_PORT "port="
-#define RTSP_UNICAST_CLIENT_PORT "client_port="
-#define RTSP_UNICAST_SERVER_PORT "server_port="
-#define RTSP_SETUP_DESTINATION "destination="
-
-#define RTSP_SESSION "Session"
-#define RTSP_TRANSPORT "Transport"
-
-/* hardcoded RTCP RR - this is _NOT_ RFC compliant */
-#define RTCP_RR_SIZE 32
-#define RTCP_RR "\201\311\0\7(.JD\31+\306\343\0\0\0\0\0\0/E\0\0\2&\0\0\0\0\0\0\0\0\201"
-#define RTCP_SEND_FREQUENCY 1024
-
-int rtsp_port = 0;
-char *rtsp_destination = NULL;
-
-void
-rtcp_send_rr (rtsp_t *s, struct rtp_rtsp_session_t *st)
-{
- if (st->rtcp_socket == -1)
- return;
-
- /* send RTCP RR every RTCP_SEND_FREQUENCY packets
- * FIXME : NOT CORRECT, HARDCODED, BUT MAKES SOME SERVERS HAPPY
- * not rfc compliant
- * http://www.faqs.org/rfcs/rfc1889.html chapter 6 for RTCP
- */
-
- if (st->count == RTCP_SEND_FREQUENCY)
- {
- char rtcp_content[RTCP_RR_SIZE];
- strcpy (rtcp_content, RTCP_RR);
- send (st->rtcp_socket, rtcp_content, RTCP_RR_SIZE, 0);
-
- /* ping RTSP server to keep connection alive.
- we use OPTIONS instead of PING as not all servers support it */
- rtsp_request_options (s, "*");
- st->count = 0;
- }
- else
- st->count++;
-}
-
-static struct rtp_rtsp_session_t *
-rtp_session_new (void)
-{
- struct rtp_rtsp_session_t *st = NULL;
-
- st = malloc (sizeof (struct rtp_rtsp_session_t));
-
- st->rtp_socket = -1;
- st->rtcp_socket = -1;
- st->control_url = NULL;
- st->count = 0;
-
- return st;
-}
-
-void
-rtp_session_free (struct rtp_rtsp_session_t *st)
-{
- if (!st)
- return;
-
- if (st->rtp_socket != -1)
- close (st->rtp_socket);
- if (st->rtcp_socket != -1)
- close (st->rtcp_socket);
-
- if (st->control_url)
- free (st->control_url);
- free (st);
-}
-
-static void
-rtp_session_set_fd (struct rtp_rtsp_session_t *st,
- int rtp_sock, int rtcp_sock)
-{
- if (!st)
- return;
-
- st->rtp_socket = rtp_sock;
- st->rtcp_socket = rtcp_sock;
-}
-
-static int
-parse_port (const char *line, const char *param,
- int *rtp_port, int *rtcp_port)
-{
- char *parse1;
- char *parse2;
- char *parse3;
-
- char *line_copy = strdup (line);
-
- parse1 = strstr (line_copy, param);
-
- if (parse1)
- {
- parse2 = strstr (parse1, "-");
-
- if (parse2)
- {
- parse3 = strstr (parse2, ";");
-
- if (parse3)
- parse3[0] = 0;
-
- parse2[0] = 0;
- }
- else
- {
- free (line_copy);
- return 0;
- }
- }
- else
- {
- free (line_copy);
- return 0;
- }
-
- *rtp_port = atoi (parse1 + strlen (param));
- *rtcp_port = atoi (parse2 + 1);
-
- free (line_copy);
-
- return 1;
-}
-
-static char *
-parse_destination (const char *line)
-{
- char *parse1;
- char *parse2;
-
- char *dest = NULL;
- char *line_copy = strdup (line);
- int len;
-
- parse1 = strstr (line_copy, RTSP_SETUP_DESTINATION);
- if (!parse1)
- {
- free (line_copy);
- return NULL;
- }
-
- parse2 = strstr (parse1, ";");
- if (!parse2)
- {
- free (line_copy);
- return NULL;
- }
-
- len = strlen (parse1) - strlen (parse2)
- - strlen (RTSP_SETUP_DESTINATION) + 1;
- dest = (char *) malloc (len + 1);
- snprintf (dest, len, parse1 + strlen (RTSP_SETUP_DESTINATION));
- free (line_copy);
-
- return dest;
-}
-
-static int
-rtcp_connect (int client_port, int server_port, const char* server_hostname)
-{
- struct sockaddr_in sin;
- struct hostent *hp;
- int s;
-
- if (client_port <= 1023)
- return -1;
-
- s = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (s == -1)
- return -1;
-
- hp = gethostbyname (server_hostname);
- if (!hp)
- {
- close (s);
- return -1;
- }
-
- sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = INADDR_ANY;
- sin.sin_port = htons (client_port);
-
- if (bind (s, (struct sockaddr *) &sin, sizeof (sin)))
- {
-#ifndef HAVE_WINSOCK2
- if (errno != EINPROGRESS)
-#else
- if (WSAGetLastError() != WSAEINPROGRESS)
-#endif
- {
- close (s);
- return -1;
- }
- }
-
- sin.sin_family = AF_INET;
- memcpy (&(sin.sin_addr.s_addr), hp->h_addr, sizeof (hp->h_addr));
- sin.sin_port = htons (server_port);
-
- /* datagram socket */
- if (connect (s, (struct sockaddr *) &sin, sizeof (sin)) < 0)
- {
- close (s);
- return -1;
- }
-
- return s;
-}
-
-static int
-rtp_connect (char *hostname, int port)
-{
- struct sockaddr_in sin;
- struct timeval tv;
- int err, err_len;
- int rxsockbufsz;
- int s;
- fd_set set;
-
- if (port <= 1023)
- return -1;
-
- s = socket (PF_INET, SOCK_DGRAM, 0);
- if (s == -1)
- return -1;
-
- sin.sin_family = AF_INET;
- if (!hostname || !strcmp (hostname, "0.0.0.0"))
- sin.sin_addr.s_addr = htonl (INADDR_ANY);
- else
-#ifndef HAVE_WINSOCK2
-#ifdef USE_ATON
- inet_aton (hostname, &sin.sin_addr);
-#else
- inet_pton (AF_INET, hostname, &sin.sin_addr);
-#endif
-#else
- sin.sin_addr.s_addr = htonl (INADDR_ANY);
-#endif
- sin.sin_port = htons (port);
-
- /* Increase the socket rx buffer size to maximum -- this is UDP */
- rxsockbufsz = 240 * 1024;
- if (setsockopt (s, SOL_SOCKET, SO_RCVBUF,
- &rxsockbufsz, sizeof (rxsockbufsz)))
- mp_msg (MSGT_OPEN, MSGL_ERR, "Couldn't set receive socket buffer size\n");
-
- /* if multicast address, add membership */
- if ((ntohl (sin.sin_addr.s_addr) >> 28) == 0xe)
- {
- struct ip_mreq mcast;
- mcast.imr_multiaddr.s_addr = sin.sin_addr.s_addr;
- mcast.imr_interface.s_addr = 0;
-
- if (setsockopt (s, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mcast, sizeof (mcast)))
- {
- mp_msg (MSGT_OPEN, MSGL_ERR, "IP_ADD_MEMBERSHIP failed\n");
- close (s);
- return -1;
- }
- }
-