From 41e31ab204ca48ea749c416eb270ebfa2f74b086 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 7 May 2008 01:23:16 +0000 Subject: Rename rtsp.{c,h} to rtsp_client.{c,h}. Renate pa_rtsp_context to pa_rtsp_client. git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2376 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/Makefile.am | 2 +- src/modules/rtp/raop_client.c | 8 +- src/modules/rtp/rtsp.c | 507 ------------------------------------------ src/modules/rtp/rtsp.h | 74 ------ src/modules/rtp/rtsp_client.c | 507 ++++++++++++++++++++++++++++++++++++++++++ src/modules/rtp/rtsp_client.h | 74 ++++++ 6 files changed, 586 insertions(+), 586 deletions(-) delete mode 100644 src/modules/rtp/rtsp.c delete mode 100644 src/modules/rtp/rtsp.h create mode 100644 src/modules/rtp/rtsp_client.c create mode 100644 src/modules/rtp/rtsp_client.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 5bd6388b..91979207 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1008,7 +1008,7 @@ librtp_la_SOURCES = \ modules/rtp/rtp.c modules/rtp/rtp.h \ modules/rtp/sdp.c modules/rtp/sdp.h \ modules/rtp/sap.c modules/rtp/sap.h \ - modules/rtp/rtsp.c modules/rtp/rtsp.h \ + modules/rtp/rtsp_client.c modules/rtp/rtsp_client.h \ modules/rtp/raop_client.c modules/rtp/raop_client.h \ modules/rtp/headerlist.c modules/rtp/headerlist.h \ modules/rtp/base64.c modules/rtp/base64.h diff --git a/src/modules/rtp/raop_client.c b/src/modules/rtp/raop_client.c index 2dd2de94..7bfce930 100644 --- a/src/modules/rtp/raop_client.c +++ b/src/modules/rtp/raop_client.c @@ -56,7 +56,7 @@ #include #include "raop_client.h" -#include "rtsp.h" +#include "rtsp_client.h" #include "base64.h" #define AES_CHUNKSIZE 16 @@ -76,7 +76,7 @@ struct pa_raop_client { pa_mainloop_api *mainloop; const char *host; char *sid; - pa_rtsp_context *rtsp; + pa_rtsp_client *rtsp; uint8_t jack_type; uint8_t jack_status; @@ -273,7 +273,7 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata pa_iochannel_set_callback(c->io, io_callback, c); } -static void rtsp_cb(pa_rtsp_context *rtsp, pa_rtsp_state state, pa_headerlist* headers, void *userdata) +static void rtsp_cb(pa_rtsp_client *rtsp, pa_rtsp_state state, pa_headerlist* headers, void *userdata) { pa_raop_client* c = userdata; pa_assert(c); @@ -396,7 +396,7 @@ int pa_raop_client_connect(pa_raop_client* c, pa_mainloop_api *mainloop, const c c->mainloop = mainloop; c->host = host; - c->rtsp = pa_rtsp_context_new("iTunes/4.6 (Macintosh; U; PPC Mac OS X 10.3)"); + c->rtsp = pa_rtsp_client_new("iTunes/4.6 (Macintosh; U; PPC Mac OS X 10.3)"); /* Initialise the AES encryption system */ pa_random_seed(); diff --git a/src/modules/rtp/rtsp.c b/src/modules/rtp/rtsp.c deleted file mode 100644 index 44cd80b9..00000000 --- a/src/modules/rtp/rtsp.c +++ /dev/null @@ -1,507 +0,0 @@ -/* $Id$ */ - -/*** - This file is part of PulseAudio. - - Copyright 2008 Colin Guthrie - - PulseAudio is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - PulseAudio 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 Lesser General Public License - along with PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_SYS_FILIO_H -#include -#endif - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "rtsp.h" - -struct pa_rtsp_context { - pa_socket_client *sc; - pa_iochannel *io; - pa_ioline *ioline; - - pa_rtsp_cb_t callback; - - void *userdata; - const char *useragent; - - pa_rtsp_state state; - uint8_t waiting; - - pa_headerlist* headers; - char *last_header; - pa_strbuf *header_buffer; - pa_headerlist* response_headers; - - char *localip; - char *url; - uint32_t port; - uint32_t cseq; - char *session; - char *transport; -}; - -static int pa_rtsp_exec(pa_rtsp_context* c, const char* cmd, - const char* content_type, const char* content, - int expect_response, - pa_headerlist* headers) { - pa_strbuf* buf; - char* hdrs; - ssize_t l; - - pa_assert(c); - pa_assert(c->url); - - if (!cmd) - return -1; - - buf = pa_strbuf_new(); - pa_strbuf_printf(buf, "%s %s RTSP/1.0\r\nCSeq: %d\r\n", cmd, c->url, ++c->cseq); - if (c->session) - pa_strbuf_printf(buf, "Session: %s\r\n", c->session); - - /* Add the headers */ - if (headers) { - hdrs = pa_headerlist_to_string(headers); - pa_strbuf_puts(buf, hdrs); - pa_xfree(hdrs); - } - - if (content_type && content) { - pa_strbuf_printf(buf, "Content-Type: %s\r\nContent-Length: %d\r\n", - content_type, (int)strlen(content)); - } - - pa_strbuf_printf(buf, "User-Agent: %s\r\n", c->useragent); - - if (c->headers) { - hdrs = pa_headerlist_to_string(c->headers); - pa_strbuf_puts(buf, hdrs); - pa_xfree(hdrs); - } - - pa_strbuf_puts(buf, "\r\n"); - - if (content_type && content) { - pa_strbuf_puts(buf, content); - } - - /* Our packet is created... now we can send it :) */ - hdrs = pa_strbuf_tostring_free(buf); - /*pa_log_debug("Submitting request:"); - pa_log_debug(hdrs);*/ - l = pa_iochannel_write(c->io, hdrs, strlen(hdrs)); - pa_xfree(hdrs); - - return 0; -} - - -pa_rtsp_context* pa_rtsp_context_new(const char* useragent) { - pa_rtsp_context *c; - - c = pa_xnew0(pa_rtsp_context, 1); - c->headers = pa_headerlist_new(); - - if (useragent) - c->useragent = useragent; - else - c->useragent = "PulseAudio RTSP Client"; - - return c; -} - - -void pa_rtsp_context_free(pa_rtsp_context* c) { - if (c) { - if (c->sc) - pa_socket_client_unref(c->sc); - - pa_xfree(c->url); - pa_xfree(c->localip); - pa_xfree(c->session); - pa_xfree(c->transport); - pa_xfree(c->last_header); - if (c->header_buffer) - pa_strbuf_free(c->header_buffer); - if (c->response_headers) - pa_headerlist_free(c->response_headers); - pa_headerlist_free(c->headers); - } - pa_xfree(c); -} - - -static void headers_read(pa_rtsp_context *c) { - char* token; - char delimiters[] = ";"; - - pa_assert(c); - pa_assert(c->response_headers); - - /* Deal with a SETUP response */ - if (STATE_SETUP == c->state) { - const char* token_state = NULL; - const char* pc = NULL; - c->session = pa_xstrdup(pa_headerlist_gets(c->response_headers, "Session")); - c->transport = pa_xstrdup(pa_headerlist_gets(c->response_headers, "Transport")); - - if (!c->session || !c->transport) { - pa_headerlist_free(c->response_headers); - c->response_headers = NULL; - pa_log("Invalid SETUP response."); - return; - } - - /* Now parse out the server port component of the response. */ - while ((token = pa_split(c->transport, delimiters, &token_state))) { - if ((pc = strstr(token, "="))) { - if (0 == strncmp(token, "server_port", 11)) { - pa_atou(pc+1, &c->port); - pa_xfree(token); - break; - } - } - pa_xfree(token); - } - if (0 == c->port) { - /* Error no server_port in response */ - pa_headerlist_free(c->response_headers); - c->response_headers = NULL; - pa_log("Invalid SETUP response (no port number)."); - return; - } - } - - /* Call our callback */ - if (c->callback) - c->callback(c, c->state, c->response_headers, c->userdata); - - pa_headerlist_free(c->response_headers); - c->response_headers = NULL; -} - - -static void line_callback(pa_ioline *line, const char *s, void *userdata) { - char *delimpos; - char *s2, *s2p; - - pa_rtsp_context *c = userdata; - pa_assert(line); - pa_assert(c); - pa_assert(s); - - s2 = pa_xstrdup(s); - /* Trim trailing carriage returns */ - s2p = s2 + strlen(s2) - 1; - while (s2p >= s2 && '\r' == *s2p) { - *s2p = '\0'; - s2p -= 1; - } - if (c->waiting && 0 == strcmp("RTSP/1.0 200 OK", s2)) { - c->waiting = 0; - pa_assert(!c->response_headers); - c->response_headers = pa_headerlist_new(); - goto exit; - } - if (c->waiting) { - pa_log_warn("Unexpected response: %s", s2); - goto exit;; - } - if (!strlen(s2)) { - /* End of headers */ - /* We will have a header left from our looping itteration, so add it in :) */ - if (c->last_header) { - /* This is not a continuation header so let's dump it into our proplist */ - pa_headerlist_puts(c->response_headers, c->last_header, pa_strbuf_tostring_free(c->header_buffer)); - pa_xfree(c->last_header); - c->last_header = NULL; - c->header_buffer= NULL; - } - - pa_log_debug("Full response received. Dispatching"); - headers_read(c); - c->waiting = 1; - goto exit; - } - - /* Read and parse a header (we know it's not empty) */ - /* TODO: Move header reading into the headerlist. */ - - /* If the first character is a space, it's a continuation header */ - if (c->last_header && ' ' == s2[0]) { - pa_assert(c->header_buffer); - - /* Add this line to the buffer (sans the space. */ - pa_strbuf_puts(c->header_buffer, &(s2[1])); - goto exit; - } - - if (c->last_header) { - /* This is not a continuation header so let's dump the full - header/value into our proplist */ - pa_headerlist_puts(c->response_headers, c->last_header, pa_strbuf_tostring_free(c->header_buffer)); - pa_xfree(c->last_header); - c->last_header = NULL; - c->header_buffer = NULL; - } - - delimpos = strstr(s2, ":"); - if (!delimpos) { - pa_log_warn("Unexpected response when expecting header: %s", s); - goto exit; - } - - pa_assert(!c->header_buffer); - pa_assert(!c->last_header); - - c->header_buffer = pa_strbuf_new(); - if (strlen(delimpos) > 1) { - /* Cut our line off so we can copy the header name out */ - *delimpos++ = '\0'; - - /* Trim the front of any spaces */ - while (' ' == *delimpos) - ++delimpos; - - pa_strbuf_puts(c->header_buffer, delimpos); - } else { - /* Cut our line off so we can copy the header name out */ - *delimpos = '\0'; - } - - /* Save the header name */ - c->last_header = pa_xstrdup(s2); - exit: - pa_xfree(s2); -} - - -static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata) { - pa_rtsp_context *c = userdata; - union { - struct sockaddr sa; - struct sockaddr_in in; - struct sockaddr_in6 in6; - } sa; - socklen_t sa_len = sizeof(sa); - - pa_assert(sc); - pa_assert(c); - pa_assert(c->sc == sc); - - pa_socket_client_unref(c->sc); - c->sc = NULL; - - if (!io) { - pa_log("Connection failed: %s", pa_cstrerror(errno)); - return; - } - pa_assert(!c->io); - c->io = io; - - c->ioline = pa_ioline_new(io); - pa_ioline_set_callback(c->ioline, line_callback, c); - - /* Get the local IP address for use externally */ - if (0 == getsockname(pa_iochannel_get_recv_fd(io), &sa.sa, &sa_len)) { - char buf[INET6_ADDRSTRLEN]; - const char *res = NULL; - - if (AF_INET == sa.sa.sa_family) { - res = inet_ntop(sa.sa.sa_family, &sa.in.sin_addr, buf, sizeof(buf)); - } else if (AF_INET6 == sa.sa.sa_family) { - res = inet_ntop(AF_INET6, &sa.in6.sin6_addr, buf, sizeof(buf)); - } - if (res) - c->localip = pa_xstrdup(res); - } - pa_log_debug("Established RTSP connection from local ip %s", c->localip); - - c->waiting = 1; - c->state = STATE_CONNECT; - if (c->callback) - c->callback(c, c->state, NULL, c->userdata); -} - -int pa_rtsp_connect(pa_rtsp_context *c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port) { - pa_assert(c); - pa_assert(mainloop); - pa_assert(hostname); - pa_assert(port > 0); - - if (!(c->sc = pa_socket_client_new_string(mainloop, hostname, port))) { - pa_log("failed to connect to server '%s:%d'", hostname, port); - return -1; - } - - pa_socket_client_set_callback(c->sc, on_connection, c); - c->state = STATE_CONNECT; - return 0; -} - -void pa_rtsp_set_callback(pa_rtsp_context *c, pa_rtsp_cb_t callback, void *userdata) { - pa_assert(c); - - c->callback = callback; - c->userdata = userdata; -} - -void pa_rtsp_disconnect(pa_rtsp_context *c) { - pa_assert(c); - - if (c->io) - pa_iochannel_free(c->io); - c->io = NULL; -} - - -const char* pa_rtsp_localip(pa_rtsp_context* c) { - pa_assert(c); - - return c->localip; -} - -uint32_t pa_rtsp_serverport(pa_rtsp_context* c) { - pa_assert(c); - - return c->port; -} - -void pa_rtsp_set_url(pa_rtsp_context* c, const char* url) { - pa_assert(c); - - c->url = pa_xstrdup(url); -} - -void pa_rtsp_add_header(pa_rtsp_context *c, const char* key, const char* value) -{ - pa_assert(c); - pa_assert(key); - pa_assert(value); - - pa_headerlist_puts(c->headers, key, value); -} - -void pa_rtsp_remove_header(pa_rtsp_context *c, const char* key) -{ - pa_assert(c); - pa_assert(key); - - pa_headerlist_remove(c->headers, key); -} - -int pa_rtsp_announce(pa_rtsp_context *c, const char* sdp) { - pa_assert(c); - if (!sdp) - return -1; - - c->state = STATE_ANNOUNCE; - return pa_rtsp_exec(c, "ANNOUNCE", "application/sdp", sdp, 1, NULL); -} - - -int pa_rtsp_setup(pa_rtsp_context* c) { - pa_headerlist* headers; - int rv; - - pa_assert(c); - - headers = pa_headerlist_new(); - pa_headerlist_puts(headers, "Transport", "RTP/AVP/TCP;unicast;interleaved=0-1;mode=record"); - - c->state = STATE_SETUP; - rv = pa_rtsp_exec(c, "SETUP", NULL, NULL, 1, headers); - pa_headerlist_free(headers); - return rv; -} - - -int pa_rtsp_record(pa_rtsp_context* c) { - pa_headerlist* headers; - int rv; - - pa_assert(c); - if (!c->session) { - /* No seesion in progres */ - return -1; - } - - headers = pa_headerlist_new(); - pa_headerlist_puts(headers, "Range", "npt=0-"); - pa_headerlist_puts(headers, "RTP-Info", "seq=0;rtptime=0"); - - c->state = STATE_RECORD; - rv = pa_rtsp_exec(c, "RECORD", NULL, NULL, 1, headers); - pa_headerlist_free(headers); - return rv; -} - - -int pa_rtsp_teardown(pa_rtsp_context *c) { - pa_assert(c); - - c->state = STATE_TEARDOWN; - return pa_rtsp_exec(c, "TEARDOWN", NULL, NULL, 0, NULL); -} - - -int pa_rtsp_setparameter(pa_rtsp_context *c, const char* param) { - pa_assert(c); - if (!param) - return -1; - - c->state = STATE_SET_PARAMETER; - return pa_rtsp_exec(c, "SET_PARAMETER", "text/parameters", param, 1, NULL); -} - - -int pa_rtsp_flush(pa_rtsp_context *c) { - pa_headerlist* headers; - int rv; - - pa_assert(c); - - headers = pa_headerlist_new(); - pa_headerlist_puts(headers, "RTP-Info", "seq=0;rtptime=0"); - - c->state = STATE_FLUSH; - rv = pa_rtsp_exec(c, "FLUSH", NULL, NULL, 1, headers); - pa_headerlist_free(headers); - return rv; -} diff --git a/src/modules/rtp/rtsp.h b/src/modules/rtp/rtsp.h deleted file mode 100644 index 6458f851..00000000 --- a/src/modules/rtp/rtsp.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef foortsphfoo -#define foortsphfoo - -/* $Id$ */ - -/*** - This file is part of PulseAudio. - - Copyright 2008 Colin Guthrie - - PulseAudio is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - PulseAudio 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 Lesser General Public License - along with PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "headerlist.h" - -typedef struct pa_rtsp_context pa_rtsp_context; -typedef enum { - STATE_CONNECT, - STATE_ANNOUNCE, - STATE_SETUP, - STATE_RECORD, - STATE_TEARDOWN, - STATE_SET_PARAMETER, - STATE_FLUSH -} pa_rtsp_state; -typedef void (*pa_rtsp_cb_t)(pa_rtsp_context *c, pa_rtsp_state state, pa_headerlist* hl, void *userdata); - -pa_rtsp_context* pa_rtsp_context_new(const char* useragent); -void pa_rtsp_context_free(pa_rtsp_context* c); - -int pa_rtsp_connect(pa_rtsp_context* c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port); -void pa_rtsp_set_callback(pa_rtsp_context *c, pa_rtsp_cb_t callback, void *userdata); - -void pa_rtsp_disconnect(pa_rtsp_context* c); - -const char* pa_rtsp_localip(pa_rtsp_context* c); -uint32_t pa_rtsp_serverport(pa_rtsp_context* c); -void pa_rtsp_set_url(pa_rtsp_context* c, const char* url); -void pa_rtsp_add_header(pa_rtsp_context *c, const char* key, const char* value); -void pa_rtsp_remove_header(pa_rtsp_context *c, const char* key); - -int pa_rtsp_announce(pa_rtsp_context* c, const char* sdp); - -int pa_rtsp_setup(pa_rtsp_context* c); -int pa_rtsp_record(pa_rtsp_context* c); -int pa_rtsp_teardown(pa_rtsp_context* c); - -int pa_rtsp_setparameter(pa_rtsp_context* c, const char* param); -int pa_rtsp_flush(pa_rtsp_context* c); - -#endif diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c new file mode 100644 index 00000000..c22f801e --- /dev/null +++ b/src/modules/rtp/rtsp_client.c @@ -0,0 +1,507 @@ +/* $Id$ */ + +/*** + This file is part of PulseAudio. + + Copyright 2008 Colin Guthrie + + PulseAudio is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + PulseAudio 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 Lesser General Public License + along with PulseAudio; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_SYS_FILIO_H +#include +#endif + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "rtsp_client.h" + +struct pa_rtsp_client { + pa_socket_client *sc; + pa_iochannel *io; + pa_ioline *ioline; + + pa_rtsp_cb_t callback; + + void *userdata; + const char *useragent; + + pa_rtsp_state state; + uint8_t waiting; + + pa_headerlist* headers; + char *last_header; + pa_strbuf *header_buffer; + pa_headerlist* response_headers; + + char *localip; + char *url; + uint32_t port; + uint32_t cseq; + char *session; + char *transport; +}; + +static int pa_rtsp_exec(pa_rtsp_client* c, const char* cmd, + const char* content_type, const char* content, + int expect_response, + pa_headerlist* headers) { + pa_strbuf* buf; + char* hdrs; + ssize_t l; + + pa_assert(c); + pa_assert(c->url); + + if (!cmd) + return -1; + + buf = pa_strbuf_new(); + pa_strbuf_printf(buf, "%s %s RTSP/1.0\r\nCSeq: %d\r\n", cmd, c->url, ++c->cseq); + if (c->session) + pa_strbuf_printf(buf, "Session: %s\r\n", c->session); + + /* Add the headers */ + if (headers) { + hdrs = pa_headerlist_to_string(headers); + pa_strbuf_puts(buf, hdrs); + pa_xfree(hdrs); + } + + if (content_type && content) { + pa_strbuf_printf(buf, "Content-Type: %s\r\nContent-Length: %d\r\n", + content_type, (int)strlen(content)); + } + + pa_strbuf_printf(buf, "User-Agent: %s\r\n", c->useragent); + + if (c->headers) { + hdrs = pa_headerlist_to_string(c->headers); + pa_strbuf_puts(buf, hdrs); + pa_xfree(hdrs); + } + + pa_strbuf_puts(buf, "\r\n"); + + if (content_type && content) { + pa_strbuf_puts(buf, content); + } + + /* Our packet is created... now we can send it :) */ + hdrs = pa_strbuf_tostring_free(buf); + /*pa_log_debug("Submitting request:"); + pa_log_debug(hdrs);*/ + l = pa_iochannel_write(c->io, hdrs, strlen(hdrs)); + pa_xfree(hdrs); + + return 0; +} + + +pa_rtsp_client* pa_rtsp_client_new(const char* useragent) { + pa_rtsp_client *c; + + c = pa_xnew0(pa_rtsp_client, 1); + c->headers = pa_headerlist_new(); + + if (useragent) + c->useragent = useragent; + else + c->useragent = "PulseAudio RTSP Client"; + + return c; +} + + +void pa_rtsp_client_free(pa_rtsp_client* c) { + if (c) { + if (c->sc) + pa_socket_client_unref(c->sc); + + pa_xfree(c->url); + pa_xfree(c->localip); + pa_xfree(c->session); + pa_xfree(c->transport); + pa_xfree(c->last_header); + if (c->header_buffer) + pa_strbuf_free(c->header_buffer); + if (c->response_headers) + pa_headerlist_free(c->response_headers); + pa_headerlist_free(c->headers); + } + pa_xfree(c); +} + + +static void headers_read(pa_rtsp_client *c) { + char* token; + char delimiters[] = ";"; + + pa_assert(c); + pa_assert(c->response_headers); + + /* Deal with a SETUP response */ + if (STATE_SETUP == c->state) { + const char* token_state = NULL; + const char* pc = NULL; + c->session = pa_xstrdup(pa_headerlist_gets(c->response_headers, "Session")); + c->transport = pa_xstrdup(pa_headerlist_gets(c->response_headers, "Transport")); + + if (!c->session || !c->transport) { + pa_headerlist_free(c->response_headers); + c->response_headers = NULL; + pa_log("Invalid SETUP response."); + return; + } + + /* Now parse out the server port component of the response. */ + while ((token = pa_split(c->transport, delimiters, &token_state))) { + if ((pc = strstr(token, "="))) { + if (0 == strncmp(token, "server_port", 11)) { + pa_atou(pc+1, &c->port); + pa_xfree(token); + break; + } + } + pa_xfree(token); + } + if (0 == c->port) { + /* Error no server_port in response */ + pa_headerlist_free(c->response_headers); + c->response_headers = NULL; + pa_log("Invalid SETUP response (no port number)."); + return; + } + } + + /* Call our callback */ + if (c->callback) + c->callback(c, c->state, c->response_headers, c->userdata); + + pa_headerlist_free(c->response_headers); + c->response_headers = NULL; +} + + +static void line_callback(pa_ioline *line, const char *s, void *userdata) { + char *delimpos; + char *s2, *s2p; + + pa_rtsp_client *c = userdata; + pa_assert(line); + pa_assert(c); + pa_assert(s); + + s2 = pa_xstrdup(s); + /* Trim trailing carriage returns */ + s2p = s2 + strlen(s2) - 1; + while (s2p >= s2 && '\r' == *s2p) { + *s2p = '\0'; + s2p -= 1; + } + if (c->waiting && 0 == strcmp("RTSP/1.0 200 OK", s2)) { + c->waiting = 0; + pa_assert(!c->response_headers); + c->response_headers = pa_headerlist_new(); + goto exit; + } + if (c->waiting) { + pa_log_warn("Unexpected response: %s", s2); + goto exit;; + } + if (!strlen(s2)) { + /* End of headers */ + /* We will have a header left from our looping itteration, so add it in :) */ + if (c->last_header) { + /* This is not a continuation header so let's dump it into our proplist */ + pa_headerlist_puts(c->response_headers, c->last_header, pa_strbuf_tostring_free(c->header_buffer)); + pa_xfree(c->last_header); + c->last_header = NULL; + c->header_buffer= NULL; + } + + pa_log_debug("Full response received. Dispatching"); + headers_read(c); + c->waiting = 1; + goto exit; + } + + /* Read and parse a header (we know it's not empty) */ + /* TODO: Move header reading into the headerlist. */ + + /* If the first character is a space, it's a continuation header */ + if (c->last_header && ' ' == s2[0]) { + pa_assert(c->header_buffer); + + /* Add this line to the buffer (sans the space. */ + pa_strbuf_puts(c->header_buffer, &(s2[1])); + goto exit; + } + + if (c->last_header) { + /* This is not a continuation header so let's dump the full + header/value into our proplist */ + pa_headerlist_puts(c->response_headers, c->last_header, pa_strbuf_tostring_free(c->header_buffer)); + pa_xfree(c->last_header); + c->last_header = NULL; + c->header_buffer = NULL; + } + + delimpos = strstr(s2, ":"); + if (!delimpos) { + pa_log_warn("Unexpected response when expecting header: %s", s); + goto exit; + } + + pa_assert(!c->header_buffer); + pa_assert(!c->last_header); + + c->header_buffer = pa_strbuf_new(); + if (strlen(delimpos) > 1) { + /* Cut our line off so we can copy the header name out */ + *delimpos++ = '\0'; + + /* Trim the front of any spaces */ + while (' ' == *delimpos) + ++delimpos; + + pa_strbuf_puts(c->header_buffer, delimpos); + } else { + /* Cut our line off so we can copy the header name out */ + *delimpos = '\0'; + } + + /* Save the header name */ + c->last_header = pa_xstrdup(s2); + exit: + pa_xfree(s2); +} + + +static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata) { + pa_rtsp_client *c = userdata; + union { + struct sockaddr sa; + struct sockaddr_in in; + struct sockaddr_in6 in6; + } sa; + socklen_t sa_len = sizeof(sa); + + pa_assert(sc); + pa_assert(c); + pa_assert(c->sc == sc); + + pa_socket_client_unref(c->sc); + c->sc = NULL; + + if (!io) { + pa_log("Connection failed: %s", pa_cstrerror(errno)); + return; + } + pa_assert(!c->io); + c->io = io; + + c->ioline = pa_ioline_new(io); + pa_ioline_set_callback(c->ioline, line_callback, c); + + /* Get the local IP address for use externally */ + if (0 == getsockname(pa_iochannel_get_recv_fd(io), &sa.sa, &sa_len)) { + char buf[INET6_ADDRSTRLEN]; + const char *res = NULL; + + if (AF_INET == sa.sa.sa_family) { + res = inet_ntop(sa.sa.sa_family, &sa.in.sin_addr, buf, sizeof(buf)); + } else if (AF_INET6 == sa.sa.sa_family) { + res = inet_ntop(AF_INET6, &sa.in6.sin6_addr, buf, sizeof(buf)); + } + if (res) + c->localip = pa_xstrdup(res); + } + pa_log_debug("Established RTSP connection from local ip %s", c->localip); + + c->waiting = 1; + c->state = STATE_CONNECT; + if (c->callback) + c->callback(c, c->state, NULL, c->userdata); +} + +int pa_rtsp_connect(pa_rtsp_client *c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port) { + pa_assert(c); + pa_assert(mainloop); + pa_assert(hostname); + pa_assert(port > 0); + + if (!(c->sc = pa_socket_client_new_string(mainloop, hostname, port))) { + pa_log("failed to connect to server '%s:%d'", hostname, port); + return -1; + } + + pa_socket_client_set_callback(c->sc, on_connection, c); + c->state = STATE_CONNECT; + return 0; +} + +void pa_rtsp_set_callback(pa_rtsp_client *c, pa_rtsp_cb_t callback, void *userdata) { + pa_assert(c); + + c->callback = callback; + c->userdata = userdata; +} + +void pa_rtsp_disconnect(pa_rtsp_client *c) { + pa_assert(c); + + if (c->io) + pa_iochannel_free(c->io); + c->io = NULL; +} + + +const char* pa_rtsp_localip(pa_rtsp_client* c) { + pa_assert(c); + + return c->localip; +} + +uint32_t pa_rtsp_serverport(pa_rtsp_client* c) { + pa_assert(c); + + return c->port; +} + +void pa_rtsp_set_url(pa_rtsp_client* c, const char* url) { + pa_assert(c); + + c->url = pa_xstrdup(url); +} + +void pa_rtsp_add_header(pa_rtsp_client *c, const char* key, const char* value) +{ + pa_assert(c); + pa_assert(key); + pa_assert(value); + + pa_headerlist_puts(c->headers, key, value); +} + +void pa_rtsp_remove_header(pa_rtsp_client *c, const char* key) +{ + pa_assert(c); + pa_assert(key); + + pa_headerlist_remove(c->headers, key); +} + +int pa_rtsp_announce(pa_rtsp_client *c, const char* sdp) { + pa_assert(c); + if (!sdp) + return -1; + + c->state = STATE_ANNOUNCE; + return pa_rtsp_exec(c, "ANNOUNCE", "application/sdp", sdp, 1, NULL); +} + + +int pa_rtsp_setup(pa_rtsp_client* c) { + pa_headerlist* headers; + int rv; + + pa_assert(c); + + headers = pa_headerlist_new(); + pa_headerlist_puts(headers, "Transport", "RTP/AVP/TCP;unicast;interleaved=0-1;mode=record"); + + c->state = STATE_SETUP; + rv = pa_rtsp_exec(c, "SETUP", NULL, NULL, 1, headers); + pa_headerlist_free(headers); + return rv; +} + + +int pa_rtsp_record(pa_rtsp_client* c) { + pa_headerlist* headers; + int rv; + + pa_assert(c); + if (!c->session) { + /* No seesion in progres */ + return -1; + } + + headers = pa_headerlist_new(); + pa_headerlist_puts(headers, "Range", "npt=0-"); + pa_headerlist_puts(headers, "RTP-Info", "seq=0;rtptime=0"); + + c->state = STATE_RECORD; + rv = pa_rtsp_exec(c, "RECORD", NULL, NULL, 1, headers); + pa_headerlist_free(headers); + return rv; +} + + +int pa_rtsp_teardown(pa_rtsp_client *c) { + pa_assert(c); + + c->state = STATE_TEARDOWN; + return pa_rtsp_exec(c, "TEARDOWN", NULL, NULL, 0, NULL); +} + + +int pa_rtsp_setparameter(pa_rtsp_client *c, const char* param) { + pa_assert(c); + if (!param) + return -1; + + c->state = STATE_SET_PARAMETER; + return pa_rtsp_exec(c, "SET_PARAMETER", "text/parameters", param, 1, NULL); +} + + +int pa_rtsp_flush(pa_rtsp_client *c) { + pa_headerlist* headers; + int rv; + + pa_assert(c); + + headers = pa_headerlist_new(); + pa_headerlist_puts(headers, "RTP-Info", "seq=0;rtptime=0"); + + c->state = STATE_FLUSH; + rv = pa_rtsp_exec(c, "FLUSH", NULL, NULL, 1, headers); + pa_headerlist_free(headers); + return rv; +} diff --git a/src/modules/rtp/rtsp_client.h b/src/modules/rtp/rtsp_client.h new file mode 100644 index 00000000..0f1daabd --- /dev/null +++ b/src/modules/rtp/rtsp_client.h @@ -0,0 +1,74 @@ +#ifndef foortspclienthfoo +#define foortspclienthfoo + +/* $Id$ */ + +/*** + This file is part of PulseAudio. + + Copyright 2008 Colin Guthrie + + PulseAudio is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + PulseAudio 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 Lesser General Public License + along with PulseAudio; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "headerlist.h" + +typedef struct pa_rtsp_client pa_rtsp_client; +typedef enum { + STATE_CONNECT, + STATE_ANNOUNCE, + STATE_SETUP, + STATE_RECORD, + STATE_TEARDOWN, + STATE_SET_PARAMETER, + STATE_FLUSH +} pa_rtsp_state; +typedef void (*pa_rtsp_cb_t)(pa_rtsp_client *c, pa_rtsp_state state, pa_headerlist* hl, void *userdata); + +pa_rtsp_client* pa_rtsp_client_new(const char* useragent); +void pa_rtsp_client_free(pa_rtsp_client* c); + +int pa_rtsp_connect(pa_rtsp_client* c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port); +void pa_rtsp_set_callback(pa_rtsp_client *c, pa_rtsp_cb_t callback, void *userdata); + +void pa_rtsp_disconnect(pa_rtsp_client* c); + +const char* pa_rtsp_localip(pa_rtsp_client* c); +uint32_t pa_rtsp_serverport(pa_rtsp_client* c); +void pa_rtsp_set_url(pa_rtsp_client* c, const char* url); +void pa_rtsp_add_header(pa_rtsp_client *c, const char* key, const char* value); +void pa_rtsp_remove_header(pa_rtsp_client *c, const char* key); + +int pa_rtsp_announce(pa_rtsp_client* c, const char* sdp); + +int pa_rtsp_setup(pa_rtsp_client* c); +int pa_rtsp_record(pa_rtsp_client* c); +int pa_rtsp_teardown(pa_rtsp_client* c); + +int pa_rtsp_setparameter(pa_rtsp_client* c, const char* param); +int pa_rtsp_flush(pa_rtsp_client* c); + +#endif -- cgit