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 "xmalloc.h"
#include "util.h"
#include "subscribe.h"
+#include "log.h"
+#include "autoload.h"
+#include "authkey-prop.h"
+#include "strlist.h"
+#include "props.h"
+
+/* Kick a client if it doesn't authenticate within this time */
+#define AUTH_TIMEOUT 5
+
+/* Don't accept more connection than this */
+#define MAX_CONNECTIONS 10
struct connection;
struct pa_protocol_native;
struct pa_idxset *record_streams, *output_streams;
uint32_t rrobin_index;
struct pa_subscription *subscription;
+ struct pa_time_event *auth_timeout_event;
};
struct pa_protocol_native {
struct pa_socket_server *server;
struct pa_idxset *connections;
uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH];
+ int auth_cookie_in_property;
};
static int sink_input_peek_cb(struct pa_sink_input *i, struct pa_memchunk *chunk);
-static void sink_input_drop_cb(struct pa_sink_input *i, size_t length);
+static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk *chunk, size_t length);
static void sink_input_kill_cb(struct pa_sink_input *i);
-static uint32_t sink_input_get_latency_cb(struct pa_sink_input *i);
+static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i);
static void request_bytes(struct playback_stream*s);
static void source_output_kill_cb(struct pa_source_output *o);
static void source_output_push_cb(struct pa_source_output *o, const struct pa_memchunk *chunk);
+static pa_usec_t source_output_get_latency_cb(struct pa_source_output *o);
static void command_exit(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_create_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_create_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_delete_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_auth(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_set_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_set_client_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_lookup(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_stat(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_get_playback_latency(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_get_record_latency(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_create_upload_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_finish_upload_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_play_sample(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_get_info_list(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_get_server_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_subscribe(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_cork_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_flush_or_trigger_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_set_default_sink_or_source(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_set_stream_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_kill(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_load_module(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_unload_module(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_add_autoload(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_remove_autoload(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_get_autoload_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_get_autoload_info_list(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_cork_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_flush_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static const struct pa_pdispatch_command command_table[PA_COMMAND_MAX] = {
[PA_COMMAND_ERROR] = { NULL },
[PA_COMMAND_AUTH] = { command_auth },
[PA_COMMAND_REQUEST] = { NULL },
[PA_COMMAND_EXIT] = { command_exit },
- [PA_COMMAND_SET_NAME] = { command_set_name },
+ [PA_COMMAND_SET_CLIENT_NAME] = { command_set_client_name },
[PA_COMMAND_LOOKUP_SINK] = { command_lookup },
[PA_COMMAND_LOOKUP_SOURCE] = { command_lookup },
[PA_COMMAND_STAT] = { command_stat },
[PA_COMMAND_GET_PLAYBACK_LATENCY] = { command_get_playback_latency },
+ [PA_COMMAND_GET_RECORD_LATENCY] = { command_get_record_latency },
[PA_COMMAND_CREATE_UPLOAD_STREAM] = { command_create_upload_stream },
[PA_COMMAND_DELETE_UPLOAD_STREAM] = { command_delete_stream },
[PA_COMMAND_FINISH_UPLOAD_STREAM] = { command_finish_upload_stream },
[PA_COMMAND_REMOVE_SAMPLE] = { command_remove_sample },
[PA_COMMAND_GET_SINK_INFO] = { command_get_info },
[PA_COMMAND_GET_SOURCE_INFO] = { command_get_info },
+ [PA_COMMAND_GET_CLIENT_INFO] = { command_get_info },
+ [PA_COMMAND_GET_MODULE_INFO] = { command_get_info },
+ [PA_COMMAND_GET_SINK_INPUT_INFO] = { command_get_info },
+ [PA_COMMAND_GET_SOURCE_OUTPUT_INFO] = { command_get_info },
+ [PA_COMMAND_GET_SAMPLE_INFO] = { command_get_info },
[PA_COMMAND_GET_SINK_INFO_LIST] = { command_get_info_list },
[PA_COMMAND_GET_SOURCE_INFO_LIST] = { command_get_info_list },
+ [PA_COMMAND_GET_MODULE_INFO_LIST] = { command_get_info_list },
+ [PA_COMMAND_GET_CLIENT_INFO_LIST] = { command_get_info_list },
+ [PA_COMMAND_GET_SINK_INPUT_INFO_LIST] = { command_get_info_list },
+ [PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST] = { command_get_info_list },
+ [PA_COMMAND_GET_SAMPLE_INFO_LIST] = { command_get_info_list },
[PA_COMMAND_GET_SERVER_INFO] = { command_get_server_info },
[PA_COMMAND_SUBSCRIBE] = { command_subscribe },
+
+ [PA_COMMAND_SET_SINK_VOLUME] = { command_set_volume },
+ [PA_COMMAND_SET_SINK_INPUT_VOLUME] = { command_set_volume },
+
+ [PA_COMMAND_CORK_PLAYBACK_STREAM] = { command_cork_playback_stream },
+ [PA_COMMAND_FLUSH_PLAYBACK_STREAM] = { command_flush_or_trigger_playback_stream },
+ [PA_COMMAND_TRIGGER_PLAYBACK_STREAM] = { command_flush_or_trigger_playback_stream },
+ [PA_COMMAND_PREBUF_PLAYBACK_STREAM] = { command_flush_or_trigger_playback_stream },
+
+ [PA_COMMAND_CORK_RECORD_STREAM] = { command_cork_record_stream },
+ [PA_COMMAND_FLUSH_RECORD_STREAM] = { command_flush_record_stream },
+
+ [PA_COMMAND_SET_DEFAULT_SINK] = { command_set_default_sink_or_source },
+ [PA_COMMAND_SET_DEFAULT_SOURCE] = { command_set_default_sink_or_source },
+ [PA_COMMAND_SET_PLAYBACK_STREAM_NAME] = { command_set_stream_name },
+ [PA_COMMAND_SET_RECORD_STREAM_NAME] = { command_set_stream_name },
+ [PA_COMMAND_KILL_CLIENT] = { command_kill },
+ [PA_COMMAND_KILL_SINK_INPUT] = { command_kill },
+ [PA_COMMAND_KILL_SOURCE_OUTPUT] = { command_kill },
+ [PA_COMMAND_LOAD_MODULE] = { command_load_module },
+ [PA_COMMAND_UNLOAD_MODULE] = { command_unload_module },
+ [PA_COMMAND_GET_AUTOLOAD_INFO] = { command_get_autoload_info },
+ [PA_COMMAND_GET_AUTOLOAD_INFO_LIST] = { command_get_autoload_info_list },
+ [PA_COMMAND_ADD_AUTOLOAD] = { command_add_autoload },
+ [PA_COMMAND_REMOVE_AUTOLOAD] = { command_remove_autoload },
+
};
/* structure management */
size_t base;
assert(c && source && ss && name && maxlength);
- if (!(source_output = pa_source_output_new(source, name, ss)))
+ if (!(source_output = pa_source_output_new(source, name, ss, -1)))
return NULL;
s = pa_xmalloc(sizeof(struct record_stream));
s->source_output = source_output;
s->source_output->push = source_output_push_cb;
s->source_output->kill = source_output_kill_cb;
+ s->source_output->get_latency = source_output_get_latency_cb;
s->source_output->userdata = s;
s->source_output->owner = c->protocol->module;
s->source_output->client = c->client;
- s->memblockq = pa_memblockq_new(maxlength, 0, base = pa_frame_size(ss), 0, 0);
+ s->memblockq = pa_memblockq_new(maxlength, 0, base = pa_frame_size(ss), 0, 0, c->protocol->core->memblock_stat);
assert(s->memblockq);
s->fragment_size = (fragment_size/base)*base;
assert(r && r->connection);
pa_idxset_remove_by_data(r->connection->record_streams, r, NULL);
- pa_source_output_free(r->source_output);
+ pa_source_output_disconnect(r->source_output);
+ pa_source_output_unref(r->source_output);
pa_memblockq_free(r->memblockq);
pa_xfree(r);
}
size_t maxlength,
size_t tlength,
size_t prebuf,
- size_t minreq) {
+ size_t minreq,
+ pa_volume_t volume) {
struct playback_stream *s;
struct pa_sink_input *sink_input;
assert(c && sink && ss && name && maxlength);
- if (!(sink_input = pa_sink_input_new(sink, name, ss)))
+ if (!(sink_input = pa_sink_input_new(sink, name, ss, 0, -1)))
return NULL;
s = pa_xmalloc(sizeof(struct playback_stream));
s->sink_input->owner = c->protocol->module;
s->sink_input->client = c->client;
- s->memblockq = pa_memblockq_new(maxlength, tlength, pa_frame_size(ss), prebuf, minreq);
+ s->memblockq = pa_memblockq_new(maxlength, tlength, pa_frame_size(ss), prebuf, minreq, c->protocol->core->memblock_stat);
assert(s->memblockq);
s->requested_bytes = 0;
s->drain_request = 0;
+
+ s->sink_input->volume = volume;
pa_idxset_put(c->output_streams, s, &s->index);
return s;
pa_pstream_send_error(p->connection->pstream, p->drain_tag, PA_ERROR_NOENTITY);
pa_idxset_remove_by_data(p->connection->output_streams, p, NULL);
- pa_sink_input_free(p->sink_input);
+ pa_sink_input_disconnect(p->sink_input);
+ pa_sink_input_unref(p->sink_input);
pa_memblockq_free(p->memblockq);
pa_xfree(p);
}
upload_stream_free((struct upload_stream*) o);
pa_idxset_free(c->output_streams, NULL, NULL);
- pa_pdispatch_free(c->pdispatch);
- pa_pstream_free(c->pstream);
+ pa_pdispatch_unref(c->pdispatch);
+ pa_pstream_close(c->pstream);
+ pa_pstream_unref(c->pstream);
pa_client_free(c->client);
if (c->subscription)
pa_subscription_free(c->subscription);
+
+ if (c->auth_timeout_event)
+ c->protocol->core->mainloop->time_free(c->auth_timeout_event);
pa_xfree(c);
}
if (!(l = pa_memblockq_missing(s->memblockq)))
return;
-
+
if (l <= s->requested_bytes)
return;
pa_tagstruct_putu32(t, l);
pa_pstream_send_tagstruct(s->connection->pstream, t);
- /*fprintf(stderr, "Requesting %u bytes\n", l);*/
+/* pa_log(__FILE__": Requesting %u bytes\n", l); */
}
static void send_memblock(struct connection *c) {
return;
if (pa_memblockq_peek(r->memblockq, &chunk) >= 0) {
- if (chunk.length > r->fragment_size)
- chunk.length = r->fragment_size;
+ struct pa_memchunk schunk = chunk;
+
+ if (schunk.length > r->fragment_size)
+ schunk.length = r->fragment_size;
- pa_pstream_send_memblock(c->pstream, r->index, 0, &chunk);
- pa_memblockq_drop(r->memblockq, chunk.length);
- pa_memblock_unref(chunk.memblock);
+ pa_pstream_send_memblock(c->pstream, r->index, 0, &schunk);
+ pa_memblockq_drop(r->memblockq, &chunk, schunk.length);
+ pa_memblock_unref(schunk.memblock);
return;
}
pa_pstream_send_tagstruct(r->connection->pstream, t);
}
-
/*** sinkinput callbacks ***/
static int sink_input_peek_cb(struct pa_sink_input *i, struct pa_memchunk *chunk) {
return 0;
}
-static void sink_input_drop_cb(struct pa_sink_input *i, size_t length) {
+static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk *chunk, size_t length) {
struct playback_stream *s;
assert(i && i->userdata && length);
s = i->userdata;
- pa_memblockq_drop(s->memblockq, length);
+ pa_memblockq_drop(s->memblockq, chunk, length);
request_bytes(s);
if (s->drain_request && !pa_memblockq_is_readable(s->memblockq)) {
pa_pstream_send_simple_ack(s->connection->pstream, s->drain_tag);
s->drain_request = 0;
}
+
+/* pa_log(__FILE__": after_drop: %u\n", pa_memblockq_get_length(s->memblockq)); */
}
static void sink_input_kill_cb(struct pa_sink_input *i) {
playback_stream_free((struct playback_stream *) i->userdata);
}
-static uint32_t sink_input_get_latency_cb(struct pa_sink_input *i) {
+static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i) {
struct playback_stream *s;
assert(i && i->userdata);
s = i->userdata;
+ /*pa_log(__FILE__": get_latency: %u\n", pa_memblockq_get_length(s->memblockq));*/
+
return pa_bytes_to_usec(pa_memblockq_get_length(s->memblockq), &s->sink_input->sample_spec);
}
assert(o && o->userdata && chunk);
s = o->userdata;
- pa_memblockq_push(s->memblockq, chunk, 0);
+ pa_memblockq_push_align(s->memblockq, chunk, 0);
if (!pa_pstream_is_pending(s->connection->pstream))
send_memblock(s->connection);
}
record_stream_free((struct record_stream *) o->userdata);
}
+static pa_usec_t source_output_get_latency_cb(struct pa_source_output *o) {
+ struct record_stream *s;
+ assert(o && o->userdata);
+ s = o->userdata;
+
+ /*pa_log(__FILE__": get_latency: %u\n", pa_memblockq_get_length(s->memblockq));*/
+
+ return pa_bytes_to_usec(pa_memblockq_get_length(s->memblockq), &o->sample_spec);
+}
+
/*** pdispatch callbacks ***/
static void protocol_error(struct connection *c) {
- fprintf(stderr, __FILE__": protocol error, kicking client\n");
+ pa_log(__FILE__": protocol error, kicking client\n");
connection_free(c);
}
struct pa_sample_spec ss;
struct pa_tagstruct *reply;
struct pa_sink *sink;
+ pa_volume_t volume;
+ int corked;
assert(c && t && c->protocol && c->protocol->core);
- if (pa_tagstruct_gets(t, &name) < 0 ||
+ if (pa_tagstruct_gets(t, &name) < 0 || !name ||
pa_tagstruct_get_sample_spec(t, &ss) < 0 ||
pa_tagstruct_getu32(t, &sink_index) < 0 ||
pa_tagstruct_gets(t, &sink_name) < 0 ||
pa_tagstruct_getu32(t, &maxlength) < 0 ||
+ pa_tagstruct_get_boolean(t, &corked) < 0 ||
pa_tagstruct_getu32(t, &tlength) < 0 ||
pa_tagstruct_getu32(t, &prebuf) < 0 ||
pa_tagstruct_getu32(t, &minreq) < 0 ||
+ pa_tagstruct_getu32(t, &volume) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
}
+
if (!c->authorized) {
pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
return;
if (sink_index != (uint32_t) -1)
sink = pa_idxset_get_by_index(c->protocol->core->sinks, sink_index);
else
- sink = pa_namereg_get(c->protocol->core, *sink_name ? sink_name : NULL, PA_NAMEREG_SINK, 1);
+ sink = pa_namereg_get(c->protocol->core, sink_name, PA_NAMEREG_SINK, 1);
if (!sink) {
pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
return;
}
- if (!(s = playback_stream_new(c, sink, &ss, name, maxlength, tlength, prebuf, minreq))) {
+ if (!(s = playback_stream_new(c, sink, &ss, name, maxlength, tlength, prebuf, minreq, volume))) {
pa_pstream_send_error(c->pstream, tag, PA_ERROR_INVALID);
return;
}
+
+ pa_sink_input_cork(s->sink_input, corked);
reply = pa_tagstruct_new(NULL, 0);
assert(reply);
pa_tagstruct_putu32(reply, s->index);
assert(s->sink_input);
pa_tagstruct_putu32(reply, s->sink_input->index);
+ pa_tagstruct_putu32(reply, s->requested_bytes = pa_memblockq_missing(s->memblockq));
pa_pstream_send_tagstruct(c->pstream, reply);
request_bytes(s);
}
struct pa_sample_spec ss;
struct pa_tagstruct *reply;
struct pa_source *source;
+ int corked;
assert(c && t && c->protocol && c->protocol->core);
- if (pa_tagstruct_gets(t, &name) < 0 ||
+ if (pa_tagstruct_gets(t, &name) < 0 || !name ||
pa_tagstruct_get_sample_spec(t, &ss) < 0 ||
pa_tagstruct_getu32(t, &source_index) < 0 ||
pa_tagstruct_gets(t, &source_name) < 0 ||
pa_tagstruct_getu32(t, &maxlength) < 0 ||
+ pa_tagstruct_get_boolean(t, &corked) < 0 ||
pa_tagstruct_getu32(t, &fragment_size) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
if (source_index != (uint32_t) -1)
source = pa_idxset_get_by_index(c->protocol->core->sources, source_index);
else
- source = pa_namereg_get(c->protocol->core, *source_name ? source_name : NULL, PA_NAMEREG_SOURCE, 1);
+ source = pa_namereg_get(c->protocol->core, source_name, PA_NAMEREG_SOURCE, 1);
if (!source) {
pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
pa_pstream_send_error(c->pstream, tag, PA_ERROR_INVALID);
return;
}
+
+ pa_source_output_cork(s->source_output, corked);
reply = pa_tagstruct_new(NULL, 0);
assert(reply);
protocol_error(c);
return;
}
+
+ if (!c->authorized) {
+ if (memcmp(c->protocol->auth_cookie, cookie, PA_NATIVE_COOKIE_LENGTH) != 0) {
+ pa_log(__FILE__": Denied access to client with invalid authorization key.\n");
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
- if (memcmp(c->protocol->auth_cookie, cookie, PA_NATIVE_COOKIE_LENGTH) != 0) {
- fprintf(stderr, "protocol-native.c: Denied access to client with invalid authorization key.\n");
- pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
- return;
+ c->authorized = 1;
+ if (c->auth_timeout_event) {
+ c->protocol->core->mainloop->time_free(c->auth_timeout_event);
+ c->auth_timeout_event = NULL;
+ }
}
-
- c->authorized = 1;
+
pa_pstream_send_simple_ack(c->pstream, tag);
return;
}
-static void command_set_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_set_client_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
struct connection *c = userdata;
const char *name;
assert(c && t);
- if (pa_tagstruct_gets(t, &name) < 0 ||
+ if (pa_tagstruct_gets(t, &name) < 0 || !name ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
}
- pa_client_rename(c->client, name);
+ pa_client_set_name(c->client, name);
pa_pstream_send_simple_ack(c->pstream, tag);
return;
}
uint32_t index = PA_IDXSET_INVALID;
assert(c && t);
- if (pa_tagstruct_gets(t, &name) < 0 ||
+ if (pa_tagstruct_gets(t, &name) < 0 || !name ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
}
s->drain_request = 0;
+
+ pa_memblockq_prebuf_disable(s->memblockq);
- if (!pa_memblockq_is_readable(s->memblockq))
+ if (!pa_memblockq_is_readable(s->memblockq)) {
+/* pa_log("immediate drain: %u\n", pa_memblockq_get_length(s->memblockq)); */
pa_pstream_send_simple_ack(c->pstream, tag);
- else {
+ } else {
+/* pa_log("slow drain triggered\n"); */
s->drain_request = 1;
s->drain_tag = tag;
+
+ pa_sink_notify(s->sink_input->sink);
}
}
static void command_stat(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
struct connection *c = userdata;
- assert(c && t);
struct pa_tagstruct *reply;
+ assert(c && t);
if (!pa_tagstruct_eof(t)) {
protocol_error(c);
assert(reply);
pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
pa_tagstruct_putu32(reply, tag);
- pa_tagstruct_putu32(reply, pa_memblock_get_count());
- pa_tagstruct_putu32(reply, pa_memblock_get_total());
+ pa_tagstruct_putu32(reply, c->protocol->core->memblock_stat->total);
+ pa_tagstruct_putu32(reply, c->protocol->core->memblock_stat->total_size);
+ pa_tagstruct_putu32(reply, c->protocol->core->memblock_stat->allocated);
+ pa_tagstruct_putu32(reply, c->protocol->core->memblock_stat->allocated_size);
+ pa_tagstruct_putu32(reply, pa_scache_total_size(c->protocol->core));
pa_pstream_send_tagstruct(c->pstream, reply);
}
static void command_get_playback_latency(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
struct connection *c = userdata;
- assert(c && t);
struct pa_tagstruct *reply;
struct playback_stream *s;
- uint32_t index, latency;
-
+ struct timeval tv, now;
+ uint64_t counter;
+ uint32_t index;
+ assert(c && t);
+
if (pa_tagstruct_getu32(t, &index) < 0 ||
+ pa_tagstruct_get_timeval(t, &tv) < 0 ||
+ pa_tagstruct_getu64(t, &counter) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
return;
}
- latency = pa_sink_input_get_latency(s->sink_input);
reply = pa_tagstruct_new(NULL, 0);
assert(reply);
pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
pa_tagstruct_putu32(reply, tag);
- pa_tagstruct_putu32(reply, latency);
+ pa_tagstruct_put_usec(reply, pa_sink_input_get_latency(s->sink_input));
+ pa_tagstruct_put_usec(reply, pa_sink_get_latency(s->sink_input->sink));
+ pa_tagstruct_put_usec(reply, 0);
+ pa_tagstruct_put_boolean(reply, pa_memblockq_is_readable(s->memblockq));
+ pa_tagstruct_putu32(reply, pa_memblockq_get_length(s->memblockq));
+ pa_tagstruct_put_timeval(reply, &tv);
+ gettimeofday(&now, NULL);
+ pa_tagstruct_put_timeval(reply, &now);
+ pa_tagstruct_putu64(reply, counter);
+ pa_pstream_send_tagstruct(c->pstream, reply);
+}
+
+static void command_get_record_latency(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ struct pa_tagstruct *reply;
+ struct record_stream *s;
+ struct timeval tv, now;
+ uint64_t counter;
+ uint32_t index;
+ assert(c && t);
+
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ pa_tagstruct_get_timeval(t, &tv) < 0 ||
+ pa_tagstruct_getu64(t, &counter) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (!(s = pa_idxset_get_by_index(c->record_streams, index))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ reply = pa_tagstruct_new(NULL, 0);
+ assert(reply);
+ pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
+ pa_tagstruct_putu32(reply, tag);
+ pa_tagstruct_put_usec(reply, pa_source_output_get_latency(s->source_output));
+ pa_tagstruct_put_usec(reply, s->source_output->source->monitor_of ? pa_sink_get_latency(s->source_output->source->monitor_of) : 0);
+ pa_tagstruct_put_usec(reply, pa_source_get_latency(s->source_output->source));
+ pa_tagstruct_put_boolean(reply, 0);
+ pa_tagstruct_putu32(reply, pa_memblockq_get_length(s->memblockq));
+ pa_tagstruct_put_timeval(reply, &tv);
+ gettimeofday(&now, NULL);
+ pa_tagstruct_put_timeval(reply, &now);
+ pa_tagstruct_putu64(reply, counter);
pa_pstream_send_tagstruct(c->pstream, reply);
}
+
static void command_create_upload_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
struct connection *c = userdata;
struct upload_stream *s;
struct pa_tagstruct *reply;
assert(c && t && c->protocol && c->protocol->core);
- if (pa_tagstruct_gets(t, &name) < 0 ||
+ if (pa_tagstruct_gets(t, &name) < 0 || !name ||
pa_tagstruct_get_sample_spec(t, &ss) < 0 ||
pa_tagstruct_getu32(t, &length) < 0 ||
!pa_tagstruct_eof(t)) {
pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
pa_tagstruct_putu32(reply, tag);
pa_tagstruct_putu32(reply, s->index);
- pa_pstream_send_tagstruct(c->pstream, reply);
-
- reply = pa_tagstruct_new(NULL, 0);
- assert(reply);
- pa_tagstruct_putu32(reply, PA_COMMAND_REQUEST);
- pa_tagstruct_putu32(reply, (uint32_t) -1); /* tag */
- pa_tagstruct_putu32(reply, s->index);
pa_tagstruct_putu32(reply, length);
pa_pstream_send_tagstruct(c->pstream, reply);
}
if (pa_tagstruct_getu32(t, &sink_index) < 0 ||
pa_tagstruct_gets(t, &sink_name) < 0 ||
pa_tagstruct_getu32(t, &volume) < 0 ||
- pa_tagstruct_gets(t, &name) < 0 ||
+ pa_tagstruct_gets(t, &name) < 0 || !name ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
if (sink_index != (uint32_t) -1)
sink = pa_idxset_get_by_index(c->protocol->core->sinks, sink_index);
else
- sink = pa_namereg_get(c->protocol->core, *sink_name ? sink_name : NULL, PA_NAMEREG_SINK, 1);
+ sink = pa_namereg_get(c->protocol->core, sink_name, PA_NAMEREG_SINK, 1);
if (!sink) {
pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
const char *name;
assert(c && t);
- if (pa_tagstruct_gets(t, &name) < 0 ||
+ if (pa_tagstruct_gets(t, &name) < 0 || !name ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
assert(t && sink);
pa_tagstruct_putu32(t, sink->index);
pa_tagstruct_puts(t, sink->name);
- pa_tagstruct_puts(t, sink->description ? sink->description : "");
+ pa_tagstruct_puts(t, sink->description);
pa_tagstruct_put_sample_spec(t, &sink->sample_spec);
pa_tagstruct_putu32(t, sink->owner ? sink->owner->index : (uint32_t) -1);
pa_tagstruct_putu32(t, sink->volume);
pa_tagstruct_putu32(t, sink->monitor_source->index);
pa_tagstruct_puts(t, sink->monitor_source->name);
- pa_tagstruct_putu32(t, pa_sink_get_latency(sink));
+ pa_tagstruct_put_usec(t, pa_sink_get_latency(sink));
}
static void source_fill_tagstruct(struct pa_tagstruct *t, struct pa_source *source) {
assert(t && source);
pa_tagstruct_putu32(t, source->index);
pa_tagstruct_puts(t, source->name);
- pa_tagstruct_puts(t, source->description ? source->description : "");
+ pa_tagstruct_puts(t, source->description);
pa_tagstruct_put_sample_spec(t, &source->sample_spec);
pa_tagstruct_putu32(t, source->owner ? source->owner->index : (uint32_t) -1);
pa_tagstruct_putu32(t, source->monitor_of ? source->monitor_of->index : (uint32_t) -1);
- pa_tagstruct_puts(t, source->monitor_of ? source->monitor_of->name : "");
+ pa_tagstruct_puts(t, source->monitor_of ? source->monitor_of->name : NULL);
+ pa_tagstruct_put_usec(t, pa_source_get_latency(source));
+}
+
+static void client_fill_tagstruct(struct pa_tagstruct *t, struct pa_client *client) {
+ assert(t && client);
+ pa_tagstruct_putu32(t, client->index);
+ pa_tagstruct_puts(t, client->name);
+ pa_tagstruct_puts(t, client->protocol_name);
+ pa_tagstruct_putu32(t, client->owner ? client->owner->index : (uint32_t) -1);
+}
+
+static void module_fill_tagstruct(struct pa_tagstruct *t, struct pa_module *module) {
+ assert(t && module);
+ pa_tagstruct_putu32(t, module->index);
+ pa_tagstruct_puts(t, module->name);
+ pa_tagstruct_puts(t, module->argument);
+ pa_tagstruct_putu32(t, module->n_used);
+ pa_tagstruct_put_boolean(t, module->auto_unload);
+}
+
+static void sink_input_fill_tagstruct(struct pa_tagstruct *t, struct pa_sink_input *s) {
+ assert(t && s);
+ pa_tagstruct_putu32(t, s->index);
+ pa_tagstruct_puts(t, s->name);
+ pa_tagstruct_putu32(t, s->owner ? s->owner->index : (uint32_t) -1);
+ pa_tagstruct_putu32(t, s->client ? s->client->index : (uint32_t) -1);
+ pa_tagstruct_putu32(t, s->sink->index);
+ pa_tagstruct_put_sample_spec(t, &s->sample_spec);
+ pa_tagstruct_putu32(t, s->volume);
+ pa_tagstruct_put_usec(t, pa_sink_input_get_latency(s));
+ pa_tagstruct_put_usec(t, pa_sink_get_latency(s->sink));
+}
+
+static void source_output_fill_tagstruct(struct pa_tagstruct *t, struct pa_source_output *s) {
+ assert(t && s);
+ pa_tagstruct_putu32(t, s->index);
+ pa_tagstruct_puts(t, s->name);
+ pa_tagstruct_putu32(t, s->owner ? s->owner->index : (uint32_t) -1);
+ pa_tagstruct_putu32(t, s->client ? s->client->index : (uint32_t) -1);
+ pa_tagstruct_putu32(t, s->source->index);
+ pa_tagstruct_put_sample_spec(t, &s->sample_spec);
+ pa_tagstruct_put_usec(t, pa_source_output_get_latency(s));
+ pa_tagstruct_put_usec(t, pa_source_get_latency(s->source));
+}
+
+static void scache_fill_tagstruct(struct pa_tagstruct *t, struct pa_scache_entry *e) {
+ assert(t && e);
+ pa_tagstruct_putu32(t, e->index);
+ pa_tagstruct_puts(t, e->name);
+ pa_tagstruct_putu32(t, e->volume);
+ pa_tagstruct_put_usec(t, pa_bytes_to_usec(e->memchunk.length, &e->sample_spec));
+ pa_tagstruct_put_sample_spec(t, &e->sample_spec);
+ pa_tagstruct_putu32(t, e->memchunk.length);
+ pa_tagstruct_put_boolean(t, e->lazy);
+ pa_tagstruct_puts(t, e->filename);
}
static void command_get_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
uint32_t index;
struct pa_sink *sink = NULL;
struct pa_source *source = NULL;
+ struct pa_client *client = NULL;
+ struct pa_module *module = NULL;
+ struct pa_sink_input *si = NULL;
+ struct pa_source_output *so = NULL;
+ struct pa_scache_entry *sce = NULL;
const char *name;
struct pa_tagstruct *reply;
assert(c && t);
+
if (pa_tagstruct_getu32(t, &index) < 0 ||
- pa_tagstruct_gets(t, &name) < 0 ||
+ (command != PA_COMMAND_GET_CLIENT_INFO &&
+ command != PA_COMMAND_GET_MODULE_INFO &&
+ command != PA_COMMAND_GET_SINK_INPUT_INFO &&
+ command != PA_COMMAND_GET_SOURCE_OUTPUT_INFO &&
+ pa_tagstruct_gets(t, &name) < 0) ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
if (index != (uint32_t) -1)
sink = pa_idxset_get_by_index(c->protocol->core->sinks, index);
else
- sink = pa_namereg_get(c->protocol->core, *name ? name : NULL, PA_NAMEREG_SINK, 1);
- } else {
- assert(command == PA_COMMAND_GET_SOURCE_INFO);
+ sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK, 1);
+ } else if (command == PA_COMMAND_GET_SOURCE_INFO) {
if (index != (uint32_t) -1)
source = pa_idxset_get_by_index(c->protocol->core->sources, index);
else
- source = pa_namereg_get(c->protocol->core, *name ? name : NULL, PA_NAMEREG_SOURCE, 1);
+ source = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SOURCE, 1);
+ } else if (command == PA_COMMAND_GET_CLIENT_INFO)
+ client = pa_idxset_get_by_index(c->protocol->core->clients, index);
+ else if (command == PA_COMMAND_GET_MODULE_INFO)
+ module = pa_idxset_get_by_index(c->protocol->core->modules, index);
+ else if (command == PA_COMMAND_GET_SINK_INPUT_INFO)
+ si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, index);
+ else if (command == PA_COMMAND_GET_SOURCE_OUTPUT_INFO)
+ so = pa_idxset_get_by_index(c->protocol->core->source_outputs, index);
+ else {
+ assert(command == PA_COMMAND_GET_SAMPLE_INFO);
+ if (index != (uint32_t) -1)
+ sce = pa_idxset_get_by_index(c->protocol->core->scache, index);
+ else
+ sce = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SAMPLE, 0);
}
-
- if (!sink && !source) {
+
+ if (!sink && !source && !client && !module && !si && !so && !sce) {
pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
return;
}
pa_tagstruct_putu32(reply, tag);
if (sink)
sink_fill_tagstruct(reply, sink);
- else
+ else if (source)
source_fill_tagstruct(reply, source);
+ else if (client)
+ client_fill_tagstruct(reply, client);
+ else if (module)
+ module_fill_tagstruct(reply, module);
+ else if (si)
+ sink_input_fill_tagstruct(reply, si);
+ else if (so)
+ source_output_fill_tagstruct(reply, so);
+ else
+ scache_fill_tagstruct(reply, sce);
pa_pstream_send_tagstruct(c->pstream, reply);
}
if (command == PA_COMMAND_GET_SINK_INFO_LIST)
i = c->protocol->core->sinks;
- else {
- assert(command == PA_COMMAND_GET_SOURCE_INFO_LIST);
+ else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST)
i = c->protocol->core->sources;
+ else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST)
+ i = c->protocol->core->clients;
+ else if (command == PA_COMMAND_GET_MODULE_INFO_LIST)
+ i = c->protocol->core->modules;
+ else if (command == PA_COMMAND_GET_SINK_INPUT_INFO_LIST)
+ i = c->protocol->core->sink_inputs;
+ else if (command == PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST)
+ i = c->protocol->core->source_outputs;
+ else {
+ assert(command == PA_COMMAND_GET_SAMPLE_INFO_LIST);
+ i = c->protocol->core->scache;
}
- for (p = pa_idxset_first(i, &index); p; p = pa_idxset_next(i, &index)) {
- if (command == PA_COMMAND_GET_SINK_INFO_LIST)
- sink_fill_tagstruct(reply, p);
- else {
- assert(command == PA_COMMAND_GET_SOURCE_INFO_LIST);
- source_fill_tagstruct(reply, p);
+ if (i) {
+ for (p = pa_idxset_first(i, &index); p; p = pa_idxset_next(i, &index)) {
+ if (command == PA_COMMAND_GET_SINK_INFO_LIST)
+ sink_fill_tagstruct(reply, p);
+ else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST)
+ source_fill_tagstruct(reply, p);
+ else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST)
+ client_fill_tagstruct(reply, p);
+ else if (command == PA_COMMAND_GET_MODULE_INFO_LIST)
+ module_fill_tagstruct(reply, p);
+ else if (command == PA_COMMAND_GET_SINK_INPUT_INFO_LIST)
+ sink_input_fill_tagstruct(reply, p);
+ else if (command == PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST)
+ source_output_fill_tagstruct(reply, p);
+ else {
+ assert(command == PA_COMMAND_GET_SAMPLE_INFO_LIST);
+ scache_fill_tagstruct(reply, p);
+ }
}
- }
+ }
pa_pstream_send_tagstruct(c->pstream, reply);
}
struct connection *c = userdata;
struct pa_tagstruct *reply;
char txt[256];
+ const char *n;
assert(c && t);
if (!pa_tagstruct_eof(t)) {
pa_tagstruct_puts(reply, PACKAGE_NAME);
pa_tagstruct_puts(reply, PACKAGE_VERSION);
pa_tagstruct_puts(reply, pa_get_user_name(txt, sizeof(txt)));
- pa_tagstruct_puts(reply, pa_get_host_name(txt, sizeof(txt)));
+ pa_tagstruct_puts(reply, pa_get_fqdn(txt, sizeof(txt)));
pa_tagstruct_put_sample_spec(reply, &c->protocol->core->default_sample_spec);
+
+ n = pa_namereg_get_default_sink_name(c->protocol->core);
+ pa_tagstruct_puts(reply, n);
+ n = pa_namereg_get_default_source_name(c->protocol->core);
+ pa_tagstruct_puts(reply, n);
pa_pstream_send_tagstruct(c->pstream, reply);
}
c->subscription = NULL;
pa_pstream_send_simple_ack(c->pstream, tag);
-
}
-/*** pstream callbacks ***/
-
-static void pstream_packet_callback(struct pa_pstream *p, struct pa_packet *packet, void *userdata) {
+static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
struct connection *c = userdata;
- assert(p && packet && packet->data && c);
+ uint32_t index, volume;
+ struct pa_sink *sink = NULL;
+ struct pa_sink_input *si = NULL;
+ const char *name = NULL;
+ assert(c && t);
- if (pa_pdispatch_run(c->pdispatch, packet, c) < 0) {
- fprintf(stderr, "protocol-native: invalid packet.\n");
- connection_free(c);
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ (command == PA_COMMAND_SET_SINK_VOLUME && pa_tagstruct_gets(t, &name) < 0) ||
+ pa_tagstruct_getu32(t, &volume) ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
}
-}
-
-static void pstream_memblock_callback(struct pa_pstream *p, uint32_t channel, int32_t delta, const struct pa_memchunk *chunk, void *userdata) {
- struct connection *c = userdata;
- struct output_stream *stream;
- assert(p && chunk && userdata);
-
- if (!(stream = pa_idxset_get_by_index(c->output_streams, channel))) {
- fprintf(stderr, "protocol-native: client sent block for invalid stream.\n");
- connection_free(c);
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
return;
}
- if (stream->type == PLAYBACK_STREAM) {
- struct playback_stream *p = (struct playback_stream*) stream;
- if (chunk->length >= p->requested_bytes)
- p->requested_bytes = 0;
+ if (command == PA_COMMAND_SET_SINK_VOLUME) {
+ if (index != (uint32_t) -1)
+ sink = pa_idxset_get_by_index(c->protocol->core->sinks, index);
else
- p->requested_bytes -= chunk->length;
-
- pa_memblockq_push_align(p->memblockq, chunk, delta);
- assert(p->sink_input);
- pa_sink_notify(p->sink_input->sink);
- /*fprintf(stderr, "Recieved %u bytes.\n", chunk->length);*/
- } else {
- struct upload_stream *u = (struct upload_stream*) stream;
- size_t l;
- assert(u->type == UPLOAD_STREAM);
-
- if (!u->memchunk.memblock) {
- if (u->length == chunk->length) {
- u->memchunk = *chunk;
- pa_memblock_ref(u->memchunk.memblock);
- u->length = 0;
- fprintf(stderr, "COPY\n");
- } else {
- u->memchunk.memblock = pa_memblock_new(u->length);
- u->memchunk.index = u->memchunk.length = 0;
- }
- }
-
- assert(u->memchunk.memblock);
-
- l = u->length;
- if (l > chunk->length)
- l = chunk->length;
+ sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK, 1);
+ } else {
+ assert(command == PA_COMMAND_SET_SINK_INPUT_VOLUME);
+ si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, index);
+ }
- if (l > 0) {
- memcpy(u->memchunk.memblock->data + u->memchunk.index + u->memchunk.length, chunk->memblock->data+chunk->index, l);
- u->memchunk.length += l;
- u->length -= l;
- }
+ if (!si && !sink) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
}
-}
-static void pstream_die_callback(struct pa_pstream *p, void *userdata) {
- struct connection *c = userdata;
- assert(p && c);
- connection_free(c);
+ if (sink)
+ pa_sink_set_volume(sink, volume);
+ else if (si)
+ pa_sink_input_set_volume(si, volume);
- fprintf(stderr, "protocol-native: connection died.\n");
+ pa_pstream_send_simple_ack(c->pstream, tag);
}
-
-static void pstream_drain_callback(struct pa_pstream *p, void *userdata) {
+static void command_cork_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
struct connection *c = userdata;
- assert(p && c);
-
- send_memblock(c);
-}
+ uint32_t index;
+ int b;
+ struct playback_stream *s;
+ assert(c && t);
-/*** client callbacks ***/
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ pa_tagstruct_get_boolean(t, &b) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
-static void client_kill_cb(struct pa_client *c) {
- assert(c && c->userdata);
- connection_free(c->userdata);
-}
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
-/*** socket server callbacks ***/
+ if (!(s = pa_idxset_get_by_index(c->output_streams, index)) || s->type != PLAYBACK_STREAM) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
-static void on_connection(struct pa_socket_server*s, struct pa_iochannel *io, void *userdata) {
- struct pa_protocol_native *p = userdata;
- struct connection *c;
- assert(s && io && p);
+ pa_sink_input_cork(s->sink_input, b);
+ pa_pstream_send_simple_ack(c->pstream, tag);
+}
- c = pa_xmalloc(sizeof(struct connection));
- c->authorized = p->public;
- c->protocol = p;
- assert(p->core);
- c->client = pa_client_new(p->core, "NATIVE", "Client");
- assert(c->client);
- c->client->kill = client_kill_cb;
- c->client->userdata = c;
- c->client->owner = p->module;
-
- c->pstream = pa_pstream_new(p->core->mainloop, io);
- assert(c->pstream);
+static void command_flush_or_trigger_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ uint32_t index;
+ struct playback_stream *s;
+ assert(c && t);
- pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c);
- pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c);
- pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c);
- pa_pstream_set_drain_callback(c->pstream, pstream_drain_callback, c);
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
- c->pdispatch = pa_pdispatch_new(p->core->mainloop, command_table, PA_COMMAND_MAX);
- assert(c->pdispatch);
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
- c->record_streams = pa_idxset_new(NULL, NULL);
- c->output_streams = pa_idxset_new(NULL, NULL);
- assert(c->record_streams && c->output_streams);
+ if (!(s = pa_idxset_get_by_index(c->output_streams, index)) || s->type != PLAYBACK_STREAM) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
- c->rrobin_index = PA_IDXSET_INVALID;
- c->subscription = NULL;
+ if (command == PA_COMMAND_PREBUF_PLAYBACK_STREAM)
+ pa_memblockq_prebuf_reenable(s->memblockq);
+ else if (command == PA_COMMAND_TRIGGER_PLAYBACK_STREAM)
+ pa_memblockq_prebuf_disable(s->memblockq);
+ else {
+ assert(command == PA_COMMAND_FLUSH_PLAYBACK_STREAM);
+ pa_memblockq_flush(s->memblockq);
+ /*pa_log(__FILE__": flush: %u\n", pa_memblockq_get_length(s->memblockq));*/
+ }
- pa_idxset_put(p->connections, c, NULL);
+ pa_sink_notify(s->sink_input->sink);
+ pa_pstream_send_simple_ack(c->pstream, tag);
+ request_bytes(s);
}
-/*** module entry points ***/
+static void command_cork_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ uint32_t index;
+ struct record_stream *s;
+ int b;
+ assert(c && t);
-struct pa_protocol_native* pa_protocol_native_new(struct pa_core *core, struct pa_socket_server *server, struct pa_module *m, struct pa_modargs *ma) {
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ pa_tagstruct_get_boolean(t, &b) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (!(s = pa_idxset_get_by_index(c->record_streams, index))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_source_output_cork(s->source_output, b);
+ pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
+static void command_flush_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ uint32_t index;
+ struct record_stream *s;
+ assert(c && t);
+
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (!(s = pa_idxset_get_by_index(c->record_streams, index))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_memblockq_flush(s->memblockq);
+ pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
+static void command_set_default_sink_or_source(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ uint32_t index;
+ const char *s;
+ assert(c && t);
+
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ pa_tagstruct_gets(t, &s) < 0 || !s ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ pa_namereg_set_default(c->protocol->core, s, command == PA_COMMAND_SET_DEFAULT_SOURCE ? PA_NAMEREG_SOURCE : PA_NAMEREG_SINK);
+ pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
+static void command_set_stream_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ uint32_t index;
+ const char *name;
+ assert(c && t);
+
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ pa_tagstruct_gets(t, &name) < 0 || !name ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (command == PA_COMMAND_SET_PLAYBACK_STREAM_NAME) {
+ struct playback_stream *s;
+
+ if (!(s = pa_idxset_get_by_index(c->output_streams, index)) || s->type != PLAYBACK_STREAM) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_sink_input_set_name(s->sink_input, name);
+
+ } else {
+ struct record_stream *s;
+
+ if (!(s = pa_idxset_get_by_index(c->record_streams, index))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_source_output_set_name(s->source_output, name);
+ }
+
+ pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
+static void command_kill(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ uint32_t index;
+ assert(c && t);
+
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (command == PA_COMMAND_KILL_CLIENT) {
+ struct pa_client *client;
+
+ if (!(client = pa_idxset_get_by_index(c->protocol->core->clients, index))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_client_kill(client);
+ } else if (command == PA_COMMAND_KILL_SINK_INPUT) {
+ struct pa_sink_input *s;
+
+ if (!(s = pa_idxset_get_by_index(c->protocol->core->sink_inputs, index))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_sink_input_kill(s);
+ } else {
+ struct pa_source_output *s;
+
+ assert(command == PA_COMMAND_KILL_SOURCE_OUTPUT);
+
+ if (!(s = pa_idxset_get_by_index(c->protocol->core->source_outputs, index))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_source_output_kill(s);
+ }
+
+ pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
+static void command_load_module(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ struct pa_module *m;
+ const char *name, *argument;
+ struct pa_tagstruct *reply;
+ assert(c && t);
+
+ if (pa_tagstruct_gets(t, &name) < 0 || !name ||
+ pa_tagstruct_gets(t, &argument) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (!(m = pa_module_load(c->protocol->core, name, argument))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_INITFAILED);
+ return;
+ }
+
+ reply = pa_tagstruct_new(NULL, 0);
+ pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
+ pa_tagstruct_putu32(reply, tag);
+ pa_tagstruct_putu32(reply, m->index);
+ pa_pstream_send_tagstruct(c->pstream, reply);
+}
+
+static void command_unload_module(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ uint32_t index;
+ struct pa_module *m;
+ assert(c && t);
+
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (!(m = pa_idxset_get_by_index(c->protocol->core->modules, index))) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_module_unload_request(m);
+ pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
+static void command_add_autoload(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ const char *name, *module, *argument;
+ uint32_t type;
+ uint32_t index;
+ struct pa_tagstruct *reply;
+ assert(c && t);
+
+ if (pa_tagstruct_gets(t, &name) < 0 || !name ||
+ pa_tagstruct_getu32(t, &type) < 0 || type > 1 ||
+ pa_tagstruct_gets(t, &module) < 0 || !module ||
+ pa_tagstruct_gets(t, &argument) < 0 ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (pa_autoload_add(c->protocol->core, name, type == 0 ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE, module, argument, &index) < 0) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_EXIST);
+ return;
+ }
+
+ reply = pa_tagstruct_new(NULL, 0);
+ pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
+ pa_tagstruct_putu32(reply, tag);
+ pa_tagstruct_putu32(reply, index);
+ pa_pstream_send_tagstruct(c->pstream, reply);
+}
+
+static void command_remove_autoload(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ const char *name = NULL;
+ uint32_t type, index = PA_IDXSET_INVALID;
+ int r;
+ assert(c && t);
+
+ if ((pa_tagstruct_getu32(t, &index) < 0 &&
+ (pa_tagstruct_gets(t, &name) < 0 ||
+ pa_tagstruct_getu32(t, &type) < 0)) ||
+ (!name && index == PA_IDXSET_INVALID) ||
+ (name && type > 1) ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (name)
+ r = pa_autoload_remove_by_name(c->protocol->core, name, type == 0 ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE);
+ else
+ r = pa_autoload_remove_by_index(c->protocol->core, index);
+
+ if (r < 0) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
+static void autoload_fill_tagstruct(struct pa_tagstruct *t, const struct pa_autoload_entry *e) {
+ assert(t && e);
+
+ pa_tagstruct_putu32(t, e->index);
+ pa_tagstruct_puts(t, e->name);
+ pa_tagstruct_putu32(t, e->type == PA_NAMEREG_SINK ? 0 : 1);
+ pa_tagstruct_puts(t, e->module);
+ pa_tagstruct_puts(t, e->argument);
+}
+
+static void command_get_autoload_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ const struct pa_autoload_entry *a = NULL;
+ uint32_t type, index;
+ const char *name;
+ struct pa_tagstruct *reply;
+ assert(c && t);
+
+ if ((pa_tagstruct_getu32(t, &index) < 0 &&
+ (pa_tagstruct_gets(t, &name) < 0 ||
+ pa_tagstruct_getu32(t, &type) < 0)) ||
+ (!name && index == PA_IDXSET_INVALID) ||
+ (name && type > 1) ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+
+ if (name)
+ a = pa_autoload_get_by_name(c->protocol->core, name, type == 0 ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE);
+ else
+ a = pa_autoload_get_by_index(c->protocol->core, index);
+
+ if (!a) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ reply = pa_tagstruct_new(NULL, 0);
+ assert(reply);
+ pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
+ pa_tagstruct_putu32(reply, tag);
+ autoload_fill_tagstruct(reply, a);
+ pa_pstream_send_tagstruct(c->pstream, reply);
+}
+
+static void command_get_autoload_info_list(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ struct pa_tagstruct *reply;
+ assert(c && t);
+
+ if (!pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ reply = pa_tagstruct_new(NULL, 0);
+ pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
+ pa_tagstruct_putu32(reply, tag);
+
+ if (c->protocol->core->autoload_hashmap) {
+ struct pa_autoload_entry *a;
+ void *state = NULL;
+
+ while ((a = pa_hashmap_iterate(c->protocol->core->autoload_hashmap, &state, NULL)))
+ autoload_fill_tagstruct(reply, a);
+ }
+
+ pa_pstream_send_tagstruct(c->pstream, reply);
+}
+
+/*** pstream callbacks ***/
+
+static void pstream_packet_callback(struct pa_pstream *p, struct pa_packet *packet, void *userdata) {
+ struct connection *c = userdata;
+ assert(p && packet && packet->data && c);
+
+ if (pa_pdispatch_run(c->pdispatch, packet, c) < 0) {
+ pa_log(__FILE__": invalid packet.\n");
+ connection_free(c);
+ }
+}
+
+static void pstream_memblock_callback(struct pa_pstream *p, uint32_t channel, uint32_t delta, const struct pa_memchunk *chunk, void *userdata) {
+ struct connection *c = userdata;
+ struct output_stream *stream;
+ assert(p && chunk && userdata);
+
+ if (!(stream = pa_idxset_get_by_index(c->output_streams, channel))) {
+ pa_log(__FILE__": client sent block for invalid stream.\n");
+ connection_free(c);
+ return;
+ }
+
+ if (stream->type == PLAYBACK_STREAM) {
+ struct playback_stream *p = (struct playback_stream*) stream;
+ if (chunk->length >= p->requested_bytes)
+ p->requested_bytes = 0;
+ else
+ p->requested_bytes -= chunk->length;
+
+ pa_memblockq_push_align(p->memblockq, chunk, delta);
+ assert(p->sink_input);
+/* pa_log(__FILE__": after_recv: %u\n", pa_memblockq_get_length(p->memblockq)); */
+
+ pa_sink_notify(p->sink_input->sink);
+/* pa_log(__FILE__": Recieved %u bytes.\n", chunk->length); */
+
+ } else {
+ struct upload_stream *u = (struct upload_stream*) stream;
+ size_t l;
+ assert(u->type == UPLOAD_STREAM);
+
+ if (!u->memchunk.memblock) {
+ if (u->length == chunk->length) {
+ u->memchunk = *chunk;
+ pa_memblock_ref(u->memchunk.memblock);
+ u->length = 0;
+ } else {
+ u->memchunk.memblock = pa_memblock_new(u->length, c->protocol->core->memblock_stat);
+ u->memchunk.index = u->memchunk.length = 0;
+ }
+ }
+
+ assert(u->memchunk.memblock);
+
+ l = u->length;
+ if (l > chunk->length)
+ l = chunk->length;
+
+ if (l > 0) {
+ memcpy((uint8_t*) u->memchunk.memblock->data + u->memchunk.index + u->memchunk.length,
+ (uint8_t*) chunk->memblock->data+chunk->index, l);
+ u->memchunk.length += l;
+ u->length -= l;
+ }
+ }
+}
+
+static void pstream_die_callback(struct pa_pstream *p, void *userdata) {
+ struct connection *c = userdata;
+ assert(p && c);
+ connection_free(c);
+
+/* pa_log(__FILE__": connection died.\n");*/
+}
+
+
+static void pstream_drain_callback(struct pa_pstream *p, void *userdata) {
+ struct connection *c = userdata;
+ assert(p && c);
+
+ send_memblock(c);
+}
+
+/*** client callbacks ***/
+
+static void client_kill_cb(struct pa_client *c) {
+ assert(c && c->userdata);
+ connection_free(c->userdata);
+}
+
+/*** socket server callbacks ***/
+
+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 pa_protocol_native *p = userdata;
+ struct connection *c;
+ assert(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->authorized =!! p->public;
+
+ if (!c->authorized) {
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ 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->protocol = p;
+ assert(p->core);
+ c->client = pa_client_new(p->core, "NATIVE", "Client");
+ assert(c->client);
+ c->client->kill = client_kill_cb;
+ c->client->userdata = c;
+ c->client->owner = p->module;
+
+ c->pstream = pa_pstream_new(p->core->mainloop, io, p->core->memblock_stat);
+ assert(c->pstream);
+
+ pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c);
+ pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c);
+ pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c);
+ pa_pstream_set_drain_callback(c->pstream, pstream_drain_callback, c);
+
+ c->pdispatch = pa_pdispatch_new(p->core->mainloop, command_table, PA_COMMAND_MAX);
+ assert(c->pdispatch);
+
+ c->record_streams = pa_idxset_new(NULL, NULL);
+ c->output_streams = pa_idxset_new(NULL, NULL);
+ assert(c->record_streams && c->output_streams);
+
+ c->rrobin_index = PA_IDXSET_INVALID;
+ c->subscription = NULL;
+
+ pa_idxset_put(p->connections, c, NULL);
+}
+
+/*** module entry points ***/
+
+static int load_key(struct pa_protocol_native*p, const char*fn) {
+ assert(p);
+
+ p->auth_cookie_in_property = 0;
+
+ if (!fn && pa_authkey_prop_get(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME, p->auth_cookie, sizeof(p->auth_cookie)) >= 0) {
+ pa_log(__FILE__": using already loaded auth cookie.\n");
+ pa_authkey_prop_ref(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
+ p->auth_cookie_in_property = 1;
+ return 0;
+ }
+
+ if (!fn)
+ fn = PA_NATIVE_COOKIE_FILE;
+
+ if (pa_authkey_load_from_home(fn, p->auth_cookie, sizeof(p->auth_cookie)) < 0)
+ return -1;
+
+ pa_log(__FILE__": loading cookie from disk.\n");
+
+ if (pa_authkey_prop_put(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME, p->auth_cookie, sizeof(p->auth_cookie)) >= 0)
+ p->auth_cookie_in_property = 1;
+
+ return 0;
+}
+
+static struct pa_protocol_native* protocol_new_internal(struct pa_core *c, struct pa_module *m, struct pa_modargs *ma) {
struct pa_protocol_native *p;
- uint32_t public;
- assert(core && server && ma);
+ int public = 0;
+ assert(c && ma);
- if (pa_modargs_get_value_u32(ma, "public", &public) < 0) {
- fprintf(stderr, __FILE__": public= expects numeric argument.\n");
+ if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) {
+ pa_log(__FILE__": public= expects a boolean argument.\n");
return NULL;
}
p = pa_xmalloc(sizeof(struct pa_protocol_native));
+ p->core = c;
+ p->module = m;
+ p->public = public;
+ p->server = NULL;
- if (pa_authkey_load_from_home(pa_modargs_get_value(ma, "cookie", PA_NATIVE_COOKIE_FILE), p->auth_cookie, sizeof(p->auth_cookie)) < 0) {
+ if (load_key(p, pa_modargs_get_value(ma, "cookie", NULL)) < 0) {
pa_xfree(p);
return NULL;
}
- p->module = m;
- p->public = public;
- p->server = server;
- p->core = core;
p->connections = pa_idxset_new(NULL, NULL);
assert(p->connections);
+ return p;
+}
+
+struct pa_protocol_native* pa_protocol_native_new(struct pa_core *core, struct pa_socket_server *server, struct pa_module *m, struct pa_modargs *ma) {
+ char t[256];
+ struct pa_protocol_native *p;
+
+ if (!(p = protocol_new_internal(core, m, ma)))
+ return NULL;
+
+ p->server = server;
pa_socket_server_set_callback(p->server, on_connection, p);
+
+ if (pa_socket_server_get_address(p->server, t, sizeof(t))) {
+ struct pa_strlist *l;
+ l = pa_property_get(core, PA_NATIVE_SERVER_PROPERTY_NAME);
+ l = pa_strlist_prepend(l, t);
+ pa_property_replace(core, PA_NATIVE_SERVER_PROPERTY_NAME, l);
+ }
return p;
}
while ((c = pa_idxset_first(p->connections, NULL)))
connection_free(c);
pa_idxset_free(p->connections, NULL, NULL);
- pa_socket_server_free(p->server);
+
+ if (p->server) {
+ char t[256];
+
+ if (pa_socket_server_get_address(p->server, t, sizeof(t))) {
+ struct pa_strlist *l;
+ l = pa_property_get(p->core, PA_NATIVE_SERVER_PROPERTY_NAME);
+ l = pa_strlist_remove(l, t);
+
+ if (l)
+ pa_property_replace(p->core, PA_NATIVE_SERVER_PROPERTY_NAME, l);
+ else
+ pa_property_remove(p->core, PA_NATIVE_SERVER_PROPERTY_NAME);
+ }
+
+ pa_socket_server_unref(p->server);
+ }
+
+ if (p->auth_cookie_in_property)
+ pa_authkey_prop_unref(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
+
pa_xfree(p);
}
+
+struct pa_protocol_native* pa_protocol_native_new_iochannel(struct pa_core*core, struct pa_iochannel *io, struct pa_module *m, struct pa_modargs *ma) {
+ struct pa_protocol_native *p;
+
+ if (!(p = protocol_new_internal(core, m, ma)))
+ return NULL;
+
+ on_connection(NULL, io, p);
+
+ return p;
+}
projects / profile / ivi / pulseaudio-panda.git / blobdiff