mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a pa_iochannel callback for when the RAOP connection connects.

Browse source 
Properly handle the sequence of events that establish a connection.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2369 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Colin Guthrie 2008-05-06 18:39:09 +00:00
parent 8fb58e3a90
commit 22e299ad3e
3 changed files with 97 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/rtp/rtsp.c
View file

@ -172,6 +172,8 @@ static int pa_rtsp_exec(pa_rtsp_context* c, const char* cmd,
/* 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);
@ -220,15 +222,22 @@ static void io_callback(PA_GCC_UNUSED pa_iochannel *io, void *userdata) {
char delimiters[] = " ";
pa_rtsp_context *c = userdata;
pa_assert(c);
pa_assert(c->io == io);
if (!pa_iochannel_is_readable(c->io)) {
if (STATE_SETUP == c->state || STATE_ANNOUNCE == c->state) return;
goto do_callback;
}
/* TODO: convert this to a pa_ioline based reader */
if (STATE_CONNECT == c->state) {
if (STATE_SETUP == c->state || STATE_ANNOUNCE == c->state) {
response_headers = pa_headerlist_new();
}
timeout = 5000;
/* read in any response headers */
if (pa_read_line(c->io, response, sizeof(response), timeout) > 0) {
const char* token_state = NULL;
pa_log_debug("Response Line: %s", response);
timeout = 1000;
pa_xfree(pa_split(response, delimiters, &token_state));
@ -244,12 +253,15 @@ static void io_callback(PA_GCC_UNUSED pa_iochannel *io, void *userdata) {
/* We want to return the headers? */
if (!response_headers) {
/* We have no storage, so just clear out the response. */
while (pa_read_line(c->io, response, sizeof(response), timeout) > 0);
while (pa_read_line(c->io, response, sizeof(response), timeout) > 0){
pa_log_debug("Response Line: %s", response);
}
} else {
/* TODO: Move header reading into the headerlist. */
header = NULL;
buf = pa_strbuf_new();
while (pa_read_line(c->io, response, sizeof(response), timeout) > 0) {
pa_log_debug("Response Line: %s", response);
/* If the first character is a space, it's a continuation header */
if (header && ' ' == response[0]) {
/* Add this line to the buffer (sans the space. */
@ -297,8 +309,8 @@ static void io_callback(PA_GCC_UNUSED pa_iochannel *io, void *userdata) {
}
}
/* Deal with a CONNECT response */
if (STATE_CONNECT == c->state) {
/* 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(response_headers, "Session"));
@ -330,6 +342,7 @@ static void io_callback(PA_GCC_UNUSED pa_iochannel *io, void *userdata) {
}
/* Call our callback */
do_callback:
if (c->callback)
c->callback(c, c->state, response_headers, c->userdata);
@ -387,6 +400,7 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata
if (res)
c->localip = pa_xstrdup(res);
}
pa_log_debug("Established RTSP connection from local ip %s", c->localip);
}
int pa_rtsp_connect(pa_rtsp_context *c, pa_mainloop_api *mainloop, const char* hostname, uint16_t port) {