This file is part of polypaudio.
polypaudio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
+ 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.
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
+ You should have received a copy of the GNU Lesser General Public License
along with polypaudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
#include "scache.h"
#include "sample-util.h"
#include "authkey.h"
-#include "debug.h"
#include "namereg.h"
#include "xmalloc.h"
#include "log.h"
+/* Don't accept more connection than this */
+#define MAX_CONNECTIONS 10
+
+/* Kick a client if it doesn't authenticate within this time */
+#define AUTH_TIMEOUT 5
+
#define DEFAULT_COOKIE_FILE ".esd_auth"
#define PLAYBACK_BUFFER_SECONDS (.5)
#define SCACHE_PREFIX "esound."
+#define PA_TYPEID_ESOUND PA_TYPEID_MAKE('E', 'S', 'D', 'P')
+
/* This is heavily based on esound's code */
struct connection {
uint32_t index;
+ int dead;
struct pa_protocol_esound *protocol;
struct pa_iochannel *io;
struct pa_client *client;
struct pa_source_output *source_output;
struct pa_memblockq *input_memblockq, *output_memblockq;
struct pa_defer_event *defer_event;
+
struct {
struct pa_memblock *current_memblock;
size_t memblock_index, fragment_size;
} playback;
- struct pa_memchunk scache_memchunk;
- char *scache_name;
- struct pa_sample_spec scache_sample_spec;
+ struct {
+ struct pa_memchunk memchunk;
+ char *name;
+ struct pa_sample_spec sample_spec;
+ } scache;
+
+ struct pa_time_event *auth_timeout_event;
};
struct pa_protocol_esound {
static int esd_proto_sample_cache(struct connection *c, esd_proto_t request, const void *data, size_t length);
static int esd_proto_sample_free_or_play(struct connection *c, esd_proto_t request, const void *data, size_t length);
static int esd_proto_sample_get_id(struct connection *c, esd_proto_t request, const void *data, size_t length);
+static int esd_proto_standby_or_resume(struct connection *c, esd_proto_t request, const void *data, size_t length);
/* the big map of protocol handler info */
static struct proto_handler proto_map[ESD_PROTO_MAX] = {
{ ESD_NAME_MAX + 2 * sizeof(int), esd_proto_stream_record, "stream rec" },
{ ESD_NAME_MAX + 2 * sizeof(int), esd_proto_stream_record, "stream mon" },
- { ESD_NAME_MAX + 3 * sizeof(int), esd_proto_sample_cache, "sample cache" },
+ { ESD_NAME_MAX + 3 * sizeof(int), esd_proto_sample_cache, "sample cache" }, /* 6 */
{ sizeof(int), esd_proto_sample_free_or_play, "sample free" },
- { sizeof(int), esd_proto_sample_free_or_play, "sample play" },
+ { sizeof(int), esd_proto_sample_free_or_play, "sample play" }, /* 8 */
{ sizeof(int), NULL, "sample loop" },
{ sizeof(int), NULL, "sample stop" },
{ -1, NULL, "TODO: sample kill" },
- { ESD_KEY_LEN + sizeof(int), NULL, "standby" },
- { ESD_KEY_LEN + sizeof(int), NULL, "resume" },
+ { ESD_KEY_LEN + sizeof(int), esd_proto_standby_or_resume, "standby" }, /* NOOP! */
+ { ESD_KEY_LEN + sizeof(int), esd_proto_standby_or_resume, "resume" }, /* NOOP! */ /* 13 */
- { ESD_NAME_MAX, esd_proto_sample_get_id, "sample getid" },
+ { ESD_NAME_MAX, esd_proto_sample_get_id, "sample getid" }, /* 14 */
{ ESD_NAME_MAX + 2 * sizeof(int), NULL, "stream filter" },
{ sizeof(int), esd_proto_server_info, "server info" },
pa_xfree(c->read_data);
pa_xfree(c->write_data);
-
- pa_iochannel_free(c->io);
+
+ if (c->io)
+ pa_iochannel_free(c->io);
if (c->defer_event)
c->protocol->core->mainloop->defer_free(c->defer_event);
- if (c->scache_memchunk.memblock)
- pa_memblock_unref(c->scache_memchunk.memblock);
- pa_xfree(c->scache_name);
+ if (c->scache.memchunk.memblock)
+ pa_memblock_unref(c->scache.memchunk.memblock);
+ pa_xfree(c->scache.name);
+
+ if (c->auth_timeout_event)
+ c->protocol->core->mainloop->time_free(c->auth_timeout_event);
pa_xfree(c);
}
return (uint8_t*) c->write_data+i;
}
-static void format_esd2native(int format, struct pa_sample_spec *ss) {
+static void format_esd2native(int format, int swap_bytes, struct pa_sample_spec *ss) {
assert(ss);
ss->channels = ((format & ESD_MASK_CHAN) == ESD_STEREO) ? 2 : 1;
- ss->format = ((format & ESD_MASK_BITS) == ESD_BITS16) ? PA_SAMPLE_S16NE : PA_SAMPLE_U8;
+ if ((format & ESD_MASK_BITS) == ESD_BITS16)
+ ss->format = swap_bytes ? PA_SAMPLE_S16RE : PA_SAMPLE_S16NE;
+ else
+ ss->format = PA_SAMPLE_U8;
}
static int format_native2esd(struct pa_sample_spec *ss) {
}
c->authorized = 1;
+ if (c->auth_timeout_event) {
+ c->protocol->core->mainloop->time_free(c->auth_timeout_event);
+ c->auth_timeout_event = NULL;
+ }
}
ekey = *(uint32_t*)((uint8_t*) data+ESD_KEY_LEN);
rate = maybe_swap_endian_32(c->swap_byte_order, *((int*)data + 1));
ss.rate = rate;
- format_esd2native(format, &ss);
+ format_esd2native(format, c->swap_byte_order, &ss);
- if (!pa_sample_spec_valid(&ss))
+ if (!pa_sample_spec_valid(&ss)) {
+ pa_log(__FILE__": invalid sample specification\n");
return -1;
+ }
if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) {
- pa_log(__FILE__": No output sink\n");
+ pa_log(__FILE__": no such sink\n");
return -1;
}
pa_client_set_name(c->client, name);
- assert(!c->input_memblockq);
+ assert(!c->sink_input && !c->input_memblockq);
+
+ if (!(c->sink_input = pa_sink_input_new(sink, PA_TYPEID_ESOUND, name, &ss, 0, -1))) {
+ pa_log(__FILE__": failed to create sink input.\n");
+ return -1;
+ }
l = (size_t) (pa_bytes_per_second(&ss)*PLAYBACK_BUFFER_SECONDS);
c->input_memblockq = pa_memblockq_new(l, 0, pa_frame_size(&ss), l/2, l/PLAYBACK_BUFFER_FRAGMENTS, c->protocol->core->memblock_stat);
- assert(c->input_memblockq);
pa_iochannel_socket_set_rcvbuf(c->io, l/PLAYBACK_BUFFER_FRAGMENTS*2);
c->playback.fragment_size = l/10;
-
- assert(!c->sink_input);
- c->sink_input = pa_sink_input_new(sink, name, &ss, 0);
- assert(c->sink_input);
c->sink_input->owner = c->protocol->module;
c->sink_input->client = c->client;
rate = maybe_swap_endian_32(c->swap_byte_order, *((int*)data + 1));
ss.rate = rate;
- format_esd2native(format, &ss);
+ format_esd2native(format, c->swap_byte_order, &ss);
- if (!pa_sample_spec_valid(&ss))
+ if (!pa_sample_spec_valid(&ss)) {
+ pa_log(__FILE__": invalid sample specification.\n");
return -1;
+ }
if (request == ESD_PROTO_STREAM_MON) {
struct pa_sink* sink;
- if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1)))
+ if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) {
+ pa_log(__FILE__": no such sink.\n");
return -1;
+ }
- if (!(source = sink->monitor_source))
+ if (!(source = sink->monitor_source)) {
+ pa_log(__FILE__": no such monitor source.\n");
return -1;
+ }
} else {
assert(request == ESD_PROTO_STREAM_REC);
- if (!(source = pa_namereg_get(c->protocol->core, c->protocol->source_name, PA_NAMEREG_SOURCE, 1)))
+ if (!(source = pa_namereg_get(c->protocol->core, c->protocol->source_name, PA_NAMEREG_SOURCE, 1))) {
+ pa_log(__FILE__": no such source.\n");
return -1;
+ }
}
strncpy(name, (char*) data + sizeof(int)*2, sizeof(name));
pa_client_set_name(c->client, name);
- assert(!c->output_memblockq);
+ assert(!c->output_memblockq && !c->source_output);
+
+ if (!(c->source_output = pa_source_output_new(source, PA_TYPEID_ESOUND, name, &ss, -1))) {
+ pa_log(__FILE__": failed to create source output\n");
+ return -1;
+ }
l = (size_t) (pa_bytes_per_second(&ss)*RECORD_BUFFER_SECONDS);
c->output_memblockq = pa_memblockq_new(l, 0, pa_frame_size(&ss), 0, 0, c->protocol->core->memblock_stat);
- assert(c->output_memblockq);
pa_iochannel_socket_set_sndbuf(c->io, l/RECORD_BUFFER_FRAGMENTS*2);
- assert(!c->source_output);
- c->source_output = pa_source_output_new(source, name, &ss);
- assert(c->source_output);
-
c->source_output->owner = c->protocol->module;
c->source_output->client = c->client;
c->source_output->push = source_output_push_cb;
latency = 0;
else {
double usec = pa_sink_get_latency(sink);
- usec += PLAYBACK_BUFFER_SECONDS*1000000; /* A better estimation would be a good idea! */
latency = (int) ((usec*44100)/1000000);
}
rate = maybe_swap_endian_32(c->swap_byte_order, *((int*)data + 1));
ss.rate = rate;
- format_esd2native(format, &ss);
+ format_esd2native(format, c->swap_byte_order, &ss);
sc_length = (size_t) maybe_swap_endian_32(c->swap_byte_order, (*((int*)data + 2)));
strncpy(name+sizeof(SCACHE_PREFIX)-1, (char*) data+3*sizeof(int), ESD_NAME_MAX);
name[sizeof(name)-1] = 0;
- assert(!c->scache_memchunk.memblock);
- c->scache_memchunk.memblock = pa_memblock_new(sc_length, c->protocol->core->memblock_stat);
- c->scache_memchunk.index = 0;
- c->scache_memchunk.length = sc_length;
- c->scache_sample_spec = ss;
- assert(!c->scache_name);
- c->scache_name = pa_xstrdup(name);
+ assert(!c->scache.memchunk.memblock);
+ c->scache.memchunk.memblock = pa_memblock_new(sc_length, c->protocol->core->memblock_stat);
+ c->scache.memchunk.index = 0;
+ c->scache.memchunk.length = sc_length;
+ c->scache.sample_spec = ss;
+ assert(!c->scache.name);
+ c->scache.name = pa_xstrdup(name);
c->state = ESD_CACHING_SAMPLE;
- pa_scache_add_item(c->protocol->core, c->scache_name, NULL, NULL, &index);
+ pa_scache_add_item(c->protocol->core, c->scache.name, NULL, NULL, &index);
ok = connection_write(c, sizeof(int));
assert(ok);
return 0;
}
+static int esd_proto_standby_or_resume(struct connection *c, esd_proto_t request, const void *data, size_t length) {
+ int *ok;
+ ok = connection_write(c, sizeof(int)*2);
+ assert(ok);
+ ok[0] = 1;
+ ok[1] = 1;
+ return 0;
+}
+
/*** client callbacks ***/
static void client_kill_cb(struct pa_client *c) {
static int do_read(struct connection *c) {
assert(c && c->io);
+/* pa_log("READ\n"); */
+
if (c->state == ESD_NEXT_REQUEST) {
ssize_t r;
assert(c->read_data_length < sizeof(c->request));
if ((r = pa_iochannel_read(c->io, ((uint8_t*) &c->request) + c->read_data_length, sizeof(c->request) - c->read_data_length)) <= 0) {
- pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ if (r != 0)
+ pa_log_warn(__FILE__": read() failed: %s\n", strerror(errno));
return -1;
}
handler = proto_map+c->request;
+/* pa_log(__FILE__": executing request #%u\n", c->request); */
+
if (!handler->proc) {
- pa_log(__FILE__": recieved unimplemented request.\n");
+ pa_log(__FILE__": recieved unimplemented request #%u.\n", c->request);
return -1;
}
assert(c->read_data && c->read_data_length < handler->data_length);
if ((r = pa_iochannel_read(c->io, (uint8_t*) c->read_data + c->read_data_length, handler->data_length - c->read_data_length)) <= 0) {
- pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ if (r != 0)
+ pa_log_warn(__FILE__": read() failed: %s\n", strerror(errno));
return -1;
}
} else if (c->state == ESD_CACHING_SAMPLE) {
ssize_t r;
- assert(c->scache_memchunk.memblock && c->scache_name && c->scache_memchunk.index < c->scache_memchunk.length);
+ assert(c->scache.memchunk.memblock && c->scache.name && c->scache.memchunk.index < c->scache.memchunk.length);
- if ((r = pa_iochannel_read(c->io, (uint8_t*) c->scache_memchunk.memblock->data+c->scache_memchunk.index, c->scache_memchunk.length-c->scache_memchunk.index)) <= 0) {
- pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ if ((r = pa_iochannel_read(c->io, (uint8_t*) c->scache.memchunk.memblock->data+c->scache.memchunk.index, c->scache.memchunk.length-c->scache.memchunk.index)) <= 0) {
+ if (r!= 0)
+ pa_log_warn(__FILE__": read() failed: %s\n", strerror(errno));
return -1;
}
- c->scache_memchunk.index += r;
- assert(c->scache_memchunk.index <= c->scache_memchunk.length);
+ c->scache.memchunk.index += r;
+ assert(c->scache.memchunk.index <= c->scache.memchunk.length);
- if (c->scache_memchunk.index == c->scache_memchunk.length) {
+ if (c->scache.memchunk.index == c->scache.memchunk.length) {
uint32_t index;
int *ok;
- c->scache_memchunk.index = 0;
- pa_scache_add_item(c->protocol->core, c->scache_name, &c->scache_sample_spec, &c->scache_memchunk, &index);
+ c->scache.memchunk.index = 0;
+ pa_scache_add_item(c->protocol->core, c->scache.name, &c->scache.sample_spec, &c->scache.memchunk, &index);
- pa_memblock_unref(c->scache_memchunk.memblock);
- c->scache_memchunk.memblock = NULL;
- c->scache_memchunk.index = c->scache_memchunk.length = 0;
+ pa_memblock_unref(c->scache.memchunk.memblock);
+ c->scache.memchunk.memblock = NULL;
+ c->scache.memchunk.index = c->scache.memchunk.length = 0;
- pa_xfree(c->scache_name);
- c->scache_name = NULL;
+ pa_xfree(c->scache.name);
+ c->scache.name = NULL;
c->state = ESD_NEXT_REQUEST;
assert(c->input_memblockq);
+/* pa_log("STREAMING_DATA\n"); */
+
if (!(l = pa_memblockq_missing(c->input_memblockq)))
return 0;
}
if ((r = pa_iochannel_read(c->io, (uint8_t*) c->playback.current_memblock->data+c->playback.memblock_index, l)) <= 0) {
- pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ if (r != 0)
+ pa_log(__FILE__": read() failed: %s\n", strerror(errno));
return -1;
}
+/* pa_log(__FILE__": read %u\n", r); */
+
chunk.memblock = c->playback.current_memblock;
chunk.index = c->playback.memblock_index;
chunk.length = r;
static int do_write(struct connection *c) {
assert(c && c->io);
+/* pa_log("WRITE\n"); */
+
if (c->write_data_length) {
ssize_t r;
pa_log(__FILE__": write(): %s\n", strerror(errno));
return -1;
}
-
+
pa_memblockq_drop(c->output_memblockq, &chunk, r);
pa_memblock_unref(chunk.memblock);
}
assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
c->protocol->core->mainloop->defer_enable(c->defer_event, 0);
- if (pa_iochannel_is_hungup(c->io))
- goto fail;
+/* pa_log("DOWORK %i\n", pa_iochannel_is_hungup(c->io)); */
- if (pa_iochannel_is_writable(c->io))
- if (do_write(c) < 0)
+ if (!c->dead && pa_iochannel_is_readable(c->io))
+ if (do_read(c) < 0)
goto fail;
- if (pa_iochannel_is_readable(c->io))
- if (do_read(c) < 0)
+ if (!c->dead && pa_iochannel_is_writable(c->io))
+ if (do_write(c) < 0)
goto fail;
+ /* In case the line was hungup, make sure to rerun this function
+ as soon as possible, until all data has been read. */
+
+ if (!c->dead && pa_iochannel_is_hungup(c->io))
+ c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
+
return;
fail:
- connection_free(c);
+
+ if (c->state == ESD_STREAMING_DATA && c->sink_input) {
+ c->dead = 1;
+ pa_memblockq_prebuf_disable(c->input_memblockq);
+
+ pa_iochannel_free(c->io);
+ c->io = NULL;
+
+ } else
+ connection_free(c);
}
static void io_callback(struct pa_iochannel*io, void *userdata) {
struct connection *c = userdata;
assert(io && c && c->io == io);
+/* pa_log("IO\n"); */
+
do_work(c);
}
struct connection *c = userdata;
assert(a && c && c->defer_event == e);
+/* pa_log("DEFER\n"); */
+
do_work(c);
}
assert(i && i->userdata && chunk);
c = i->userdata;
- if (pa_memblockq_peek(c->input_memblockq, chunk) < 0)
+ if (pa_memblockq_peek(c->input_memblockq, chunk) < 0) {
+
+ if (c->dead)
+ connection_free(c);
+
return -1;
+ }
return 0;
}
struct connection*c = i->userdata;
assert(i && c && length);
+/* pa_log("DROP\n"); */
+
pa_memblockq_drop(c->input_memblockq, chunk, length);
/* do something */
assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
- c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
+
+ if (!c->dead)
+ c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
/* assert(pa_memblockq_get_length(c->input_memblockq) > 2048); */
}
/* do something */
assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
- c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
+
+ if (!c->dead)
+ c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
}
static void source_output_kill_cb(struct pa_source_output *o) {
/*** socket server callback ***/
+static void auth_timeout(struct pa_mainloop_api*m, struct pa_time_event *e, const struct timeval *tv, void *userdata) {
+ struct connection *c = userdata;
+ assert(m && tv && c && c->auth_timeout_event == e);
+
+ if (!c->authorized)
+ connection_free(c);
+}
+
static void on_connection(struct pa_socket_server*s, struct pa_iochannel *io, void *userdata) {
struct connection *c;
+ struct pa_protocol_esound *p = userdata;
char cname[256];
- assert(s && io && userdata);
+ assert(s && io && p);
+ if (pa_idxset_ncontents(p->connections)+1 > MAX_CONNECTIONS) {
+ pa_log(__FILE__": Warning! Too many connections (%u), dropping incoming connection.\n", MAX_CONNECTIONS);
+ pa_iochannel_free(io);
+ return;
+ }
+
c = pa_xmalloc(sizeof(struct connection));
- c->protocol = userdata;
+ c->protocol = p;
c->io = io;
pa_iochannel_set_callback(c->io, io_callback, c);
pa_iochannel_socket_peer_to_string(io, cname, sizeof(cname));
- assert(c->protocol->core);
- c->client = pa_client_new(c->protocol->core, "ESOUND", cname);
+ assert(p->core);
+ c->client = pa_client_new(p->core, PA_TYPEID_ESOUND, cname);
assert(c->client);
- c->client->owner = c->protocol->module;
+ c->client->owner = p->module;
c->client->kill = client_kill_cb;
c->client->userdata = c;
- c->authorized = c->protocol->public;
+ c->authorized = p->public;
c->swap_byte_order = 0;
+ c->dead = 0;
c->read_data_length = 0;
c->read_data = pa_xmalloc(c->read_data_alloc = proto_map[ESD_PROTO_CONNECT].data_length);
c->playback.memblock_index = 0;
c->playback.fragment_size = 0;
- c->scache_memchunk.length = c->scache_memchunk.index = 0;
- c->scache_memchunk.memblock = NULL;
- c->scache_name = NULL;
+ c->scache.memchunk.length = c->scache.memchunk.index = 0;
+ c->scache.memchunk.memblock = NULL;
+ c->scache.name = NULL;
+
+ if (!c->authorized) {
+ struct timeval tv;
+ pa_gettimeofday(&tv);
+ tv.tv_sec += AUTH_TIMEOUT;
+ c->auth_timeout_event = p->core->mainloop->time_new(p->core->mainloop, &tv, auth_timeout, c);
+ } else
+ c->auth_timeout_event = NULL;
- c->defer_event = c->protocol->core->mainloop->defer_new(c->protocol->core->mainloop, defer_callback, c);
+ c->defer_event = p->core->mainloop->defer_new(p->core->mainloop, defer_callback, c);
assert(c->defer_event);
- c->protocol->core->mainloop->defer_enable(c->defer_event, 0);
+ p->core->mainloop->defer_enable(c->defer_event, 0);
- pa_idxset_put(c->protocol->connections, c, &c->index);
+ pa_idxset_put(p->connections, c, &c->index);
}
/*** entry points ***/
struct pa_protocol_esound* pa_protocol_esound_new(struct pa_core*core, struct pa_socket_server *server, struct pa_module *m, struct pa_modargs *ma) {
struct pa_protocol_esound *p;
- int public;
+ int public = 0;
assert(core && server && ma);
p = pa_xmalloc(sizeof(struct pa_protocol_esound));