MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-29 00:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Implement DAAP auto-logout

Browse Source 
And advertise it.
This commit is contained in:
Julien BLACHE 2010-03-06 10:30:59 +01:00
parent 8c2def5ef5
commit 20c57d5289
1 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/httpd_daap.c
View File

@ -48,6 +48,13 @@
#include "daap_query.h" #include "daap_query.h"
#include "dmap_helpers.h" #include "dmap_helpers.h"
/* httpd event base, from httpd.c */
extern struct event_base *evbase_httpd;
/* Session timeout in seconds */
#define DAAP_SESSION_TIMEOUT 1800
struct uri_map { struct uri_map {
regex_t preg; regex_t preg;
@ -57,6 +64,8 @@ struct uri_map {
struct daap_session { struct daap_session {
int id; int id;
struct event timeout;
}; };
struct daap_update_request { struct daap_update_request {
@ -519,14 +528,30 @@ daap_session_compare(const void *aa, const void *bb)
static void static void
daap_session_kill(struct daap_session *s) daap_session_kill(struct daap_session *s)
{ {
evtimer_del(&s->timeout);
avl_delete(daap_sessions, s); avl_delete(daap_sessions, s);
} }
static void
daap_session_timeout_cb(int fd, short what, void *arg)
{
struct daap_session *s;
s = (struct daap_session *)arg;
DPRINTF(E_DBG, L_DAAP, "Session %d timed out\n", s->id);
daap_session_kill(s);
}
static struct daap_session * static struct daap_session *
daap_session_register(void) daap_session_register(void)
{ {
struct timeval tv;
struct daap_session *s; struct daap_session *s;
avl_node_t *node; avl_node_t *node;
int ret;
s = (struct daap_session *)malloc(sizeof(struct daap_session)); s = (struct daap_session *)malloc(sizeof(struct daap_session));
if (!s) if (!s)
@ -541,6 +566,9 @@ daap_session_register(void)
next_session_id++; next_session_id++;
evtimer_set(&s->timeout, daap_session_timeout_cb, s);
event_base_set(evbase_httpd, &s->timeout);
node = avl_insert(daap_sessions, s); node = avl_insert(daap_sessions, s);
if (!node) if (!node)
{ {
@ -550,6 +578,13 @@ daap_session_register(void)
return NULL; return NULL;
} }
evutil_timerclear(&tv);
tv.tv_sec = DAAP_SESSION_TIMEOUT;
ret = evtimer_add(&s->timeout, &tv);
if (ret < 0)
DPRINTF(E_LOG, L_DAAP, "Could not add session timeout event for session %d\n", s->id);
return s; return s;
} }
@ -557,6 +592,8 @@ struct daap_session *
daap_session_find(struct evhttp_request *req, struct evkeyvalq *query, struct evbuffer *evbuf) daap_session_find(struct evhttp_request *req, struct evkeyvalq *query, struct evbuffer *evbuf)
{ {
struct daap_session needle; struct daap_session needle;
struct timeval tv;
struct daap_session *s;
avl_node_t *node; avl_node_t *node;
const char *param; const char *param;
int ret; int ret;
@ -579,7 +616,18 @@ daap_session_find(struct evhttp_request *req, struct evkeyvalq *query, struct ev
goto invalid; goto invalid;
} }
return (struct daap_session *)node->item; s = (struct daap_session *)node->item;
event_del(&s->timeout);
evutil_timerclear(&tv);
tv.tv_sec = DAAP_SESSION_TIMEOUT;
ret = evtimer_add(&s->timeout, &tv);
if (ret < 0)
DPRINTF(E_LOG, L_DAAP, "Could not add session timeout event for session %d\n", s->id);
return s;
invalid: invalid:
evhttp_send_error(req, 403, "Forbidden"); evhttp_send_error(req, 403, "Forbidden");
@ -935,7 +983,7 @@ daap_reply_server_info(struct evhttp_request *req, struct evbuffer *evbuf, char
passwd = cfg_getstr(lib, "password"); passwd = cfg_getstr(lib, "password");
name = cfg_getstr(lib, "name"); name = cfg_getstr(lib, "name");
len = 148 + strlen(name); len = 169 + strlen(name);
if (!supports_update) if (!supports_update)
len -= 9; len -= 9;
@ -974,6 +1022,9 @@ daap_reply_server_info(struct evhttp_request *req, struct evbuffer *evbuf, char
dmap_add_int(evbuf, "mstm", 1800); /* 12 */ dmap_add_int(evbuf, "mstm", 1800); /* 12 */
dmap_add_string(evbuf, "minm", name); /* 8 + strlen(name) */ dmap_add_string(evbuf, "minm", name); /* 8 + strlen(name) */
dmap_add_int(evbuf, "mstm", DAAP_SESSION_TIMEOUT); /* 12 */
dmap_add_char(evbuf, "msal", 1); /* 9 */
dmap_add_char(evbuf, "mslr", 1); /* 9 */ dmap_add_char(evbuf, "mslr", 1); /* 9 */
dmap_add_char(evbuf, "msau", (passwd) ? 2 : 0); /* 9 */ dmap_add_char(evbuf, "msau", (passwd) ? 2 : 0); /* 9 */
dmap_add_char(evbuf, "msex", 1); /* 9 */ dmap_add_char(evbuf, "msex", 1); /* 9 */