git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@195
fefdeb5f-60dc-0310-8127-
8f9354f1896f
- fix public=
- fix POLYP_SERVER=foo:4711
- fix tcp/native
- fix public=
- fix POLYP_SERVER=foo:4711
- fix tcp/native
** later ***
- xmlrpc/http
** later ***
- xmlrpc/http
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;
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;
assert(core && server && ma);
p = pa_xmalloc(sizeof(struct pa_protocol_esound));
assert(core && server && ma);
p = pa_xmalloc(sizeof(struct pa_protocol_esound));
+ if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) {
+ pa_log(__FILE__": public= expects a boolean argument.\n");
+ return NULL;
+ }
+
if (pa_authkey_load_auto(pa_modargs_get_value(ma, "cookie", DEFAULT_COOKIE_FILE), p->esd_key, sizeof(p->esd_key)) < 0) {
pa_xfree(p);
return NULL;
}
p->module = m;
if (pa_authkey_load_auto(pa_modargs_get_value(ma, "cookie", DEFAULT_COOKIE_FILE), p->esd_key, sizeof(p->esd_key)) < 0) {
pa_xfree(p);
return NULL;
}
p->module = m;
p->server = server;
pa_socket_server_set_callback(p->server, on_connection, p);
p->core = core;
p->server = server;
pa_socket_server_set_callback(p->server, on_connection, p);
p->core = core;
protocol_error(c);
return;
}
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) {
- pa_log(__FILE__": Denied access to client with invalid authorization key.\n");
- pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
- return;
pa_pstream_send_simple_ack(c->pstream, tag);
return;
}
pa_pstream_send_simple_ack(c->pstream, tag);
return;
}
assert(c && ma);
if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) {
assert(c && ma);
if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) {
- pa_log(__FILE__": public= expects numeric argument.\n");
+ pa_log(__FILE__": public= expects a boolean argument.\n");