MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-03 01:46:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add optional request-session-id to login request

Browse Source 
- should make it easier to write curl scripts to control forked-daapd
since you avoid the need to parse the replies just to find a valid
session id
This commit is contained in:
ejurgensen 2014-04-01 22:47:04 +02:00
parent 7e2f47f9ca
commit d722b18817
1 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/httpd_daap.c
View File

@ -54,7 +54,8 @@
/* httpd event base, from httpd.c */ /* httpd event base, from httpd.c */
extern struct event_base *evbase_httpd; extern struct event_base *evbase_httpd;
/* First session id to use */
#define DAAP_BASE_SESSION_ID 100
/* Session timeout in seconds */ /* Session timeout in seconds */
#define DAAP_SESSION_TIMEOUT 0 /* By default the session never times out */ #define DAAP_SESSION_TIMEOUT 0 /* By default the session never times out */
/* We announce this timeout to the client when returning server capabilities */ /* We announce this timeout to the client when returning server capabilities */
@ -158,7 +159,7 @@ daap_session_timeout_cb(int fd, short what, void *arg)
} }
static struct daap_session * static struct daap_session *
daap_session_register(const char *user_agent) daap_session_register(const char *user_agent, int request_session_id)
{ {
struct timeval tv; struct timeval tv;
struct daap_session *s; struct daap_session *s;
@ -174,9 +175,25 @@ daap_session_register(const char *user_agent)
memset(s, 0, sizeof(struct daap_session)); memset(s, 0, sizeof(struct daap_session));
if (!request_session_id)
{
s->id = next_session_id; s->id = next_session_id;
next_session_id++; next_session_id++;
}
else if (request_session_id < DAAP_BASE_SESSION_ID)
{
s->id = request_session_id;
if (avl_search(daap_sessions, s))
{
DPRINTF(E_LOG, L_DAAP, "Session id requested in login (%d) is not available\n", request_session_id);
return NULL;
}
}
else
{
DPRINTF(E_LOG, L_DAAP, "Session id requested in login (%d) must be below %d\n", request_session_id, DAAP_BASE_SESSION_ID);
return NULL;
}
if (user_agent) if (user_agent)
s->user_agent = strdup(user_agent); s->user_agent = strdup(user_agent);
@ -843,7 +860,8 @@ daap_reply_login(struct evhttp_request *req, struct evbuffer *evbuf, char **uri,
struct pairing_info pi; struct pairing_info pi;
struct daap_session *s; struct daap_session *s;
const char *ua; const char *ua;
const char *guid; const char *param;
int request_session_id;
int ret; int ret;
ret = evbuffer_expand(evbuf, 32); ret = evbuffer_expand(evbuf, 32);
@ -858,8 +876,8 @@ daap_reply_login(struct evhttp_request *req, struct evbuffer *evbuf, char **uri,
ua = evhttp_find_header(req->input_headers, "User-Agent"); ua = evhttp_find_header(req->input_headers, "User-Agent");
if (ua && (strncmp(ua, "Remote", strlen("Remote")) == 0)) if (ua && (strncmp(ua, "Remote", strlen("Remote")) == 0))
{ {
guid = evhttp_find_header(query, "pairing-guid"); param = evhttp_find_header(query, "pairing-guid");
if (!guid) if (!param)
{ {
DPRINTF(E_LOG, L_DAAP, "Login attempt with U-A: Remote and no pairing-guid\n"); DPRINTF(E_LOG, L_DAAP, "Login attempt with U-A: Remote and no pairing-guid\n");
@ -868,7 +886,7 @@ daap_reply_login(struct evhttp_request *req, struct evbuffer *evbuf, char **uri,
} }
memset(&pi, 0, sizeof(struct pairing_info)); memset(&pi, 0, sizeof(struct pairing_info));
pi.guid = strdup(guid + 2); /* Skip leading 0X */ pi.guid = strdup(param + 2); /* Skip leading 0X */
ret = db_pairing_fetch_byguid(&pi); ret = db_pairing_fetch_byguid(&pi);
if (ret < 0) if (ret < 0)
@ -884,7 +902,20 @@ daap_reply_login(struct evhttp_request *req, struct evbuffer *evbuf, char **uri,
free_pi(&pi, 1); free_pi(&pi, 1);
} }
s = daap_session_register(ua); param = evhttp_find_header(query, "request-session-id");
if (param)
{
ret = safe_atoi32(param, &request_session_id);
if (ret < 0)
{
DPRINTF(E_LOG, L_DAAP, "Login request where request-session-id is not an integer\n");
request_session_id = 0;
}
}
else
request_session_id = 0;
s = daap_session_register(ua, request_session_id);
if (!s) if (!s)
{ {
dmap_send_error(req, "mlog", "Could not start session"); dmap_send_error(req, "mlog", "Could not start session");
@ -2611,7 +2642,7 @@ daap_init(void)
int i; int i;
int ret; int ret;
next_session_id = 100; /* gotta start somewhere, right? */ next_session_id = DAAP_BASE_SESSION_ID;
current_rev = 2; current_rev = 2;
update_requests = NULL; update_requests = NULL;