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

[dmap] Add a function able to make generate dmap errors without also sending them

Browse Source
This commit is contained in:
ejurgensen 2017-10-25 23:33:22 +02:00
parent b710d728f8
commit 50638223ac
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/dmap_common.c
View File

@ -346,13 +346,24 @@ dmap_add_field(struct evbuffer *evbuf, const struct dmap_field *df, char *strval
} }
} }
void
dmap_error_make(struct evbuffer *evbuf, const char *container, const char *errmsg)
{
int len;
len = 12 + 8 + 8 + strlen(errmsg);
CHECK_ERR(L_DMAP, evbuffer_expand(evbuf, len));
dmap_add_container(evbuf, container, len - 8);
dmap_add_int(evbuf, "mstt", 500);
dmap_add_string(evbuf, "msts", errmsg);
}
void void
dmap_send_error(struct evhttp_request *req, const char *container, const char *errmsg) dmap_send_error(struct evhttp_request *req, const char *container, const char *errmsg)
{ {
struct evbuffer *evbuf; struct evbuffer *evbuf;
int len;
int ret;
if (!req) if (!req)
return; return;
@ -366,22 +377,7 @@ dmap_send_error(struct evhttp_request *req, const char *container, const char *e
return; return;
} }
len = 12 + 8 + 8 + strlen(errmsg); dmap_error_make(evbuf, container, errmsg);
ret = evbuffer_expand(evbuf, len);
if (ret < 0)
{
DPRINTF(E_LOG, L_DMAP, "Could not expand evbuffer for DMAP error\n");
httpd_send_error(req, HTTP_SERVUNAVAIL, "Internal Server Error");
evbuffer_free(evbuf);
return;
}
dmap_add_container(evbuf, container, len - 8);
dmap_add_int(evbuf, "mstt", 500);
dmap_add_string(evbuf, "msts", errmsg);
httpd_send_reply(req, HTTP_OK, "OK", evbuf, HTTPD_SEND_NO_GZIP); httpd_send_reply(req, HTTP_OK, "OK", evbuf, HTTPD_SEND_NO_GZIP);

2
src/dmap_common.h
View File

@ -75,6 +75,8 @@ dmap_add_string(struct evbuffer *evbuf, const char *tag, const char *str);
void void
dmap_add_field(struct evbuffer *evbuf, const struct dmap_field *df, char *strval, int32_t intval); dmap_add_field(struct evbuffer *evbuf, const struct dmap_field *df, char *strval, int32_t intval);
void
dmap_error_make(struct evbuffer *evbuf, const char *container, const char *errmsg);
void void
dmap_send_error(struct evhttp_request *req, const char *container, const char *errmsg); dmap_send_error(struct evhttp_request *req, const char *container, const char *errmsg);