MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-07-16 12:21:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

[spotify] Fix Bullseye breakage by updating librespot-c to 0.6

Browse Source
This commit is contained in:
ejurgensen 2025-06-21 00:21:49 +02:00
parent 6028c39408
commit c09026f7c3
4 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/inputs/librespot-c/configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([librespot-c], [0.1]) AC_INIT([librespot-c], [0.6])
AC_CONFIG_AUX_DIR([.]) AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
@ -26,8 +26,7 @@ PKG_CHECK_MODULES([LIBGCRYPT], [libgcrypt], [], [
AM_PATH_LIBGCRYPT([], [], [AC_MSG_ERROR([[libgcrypt is required]])]) AM_PATH_LIBGCRYPT([], [], [AC_MSG_ERROR([[libgcrypt is required]])])
]) ])
dnl Need 7.83.0 for curl_easy_nextheader() PKG_CHECK_MODULES([LIBCURL], [libcurl])
PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.83.0])
PKG_CHECK_MODULES([LIBPROTOBUF_C], [libprotobuf-c]) PKG_CHECK_MODULES([LIBPROTOBUF_C], [libprotobuf-c])
AC_CONFIG_FILES([Makefile tests/Makefile]) AC_CONFIG_FILES([Makefile tests/Makefile])

2
src/inputs/librespot-c/librespot-c.h
View File

@ -6,7 +6,7 @@
#include <pthread.h> #include <pthread.h>
#define LIBRESPOT_C_VERSION_MAJOR 0 #define LIBRESPOT_C_VERSION_MAJOR 0
#define LIBRESPOT_C_VERSION_MINOR 5 #define LIBRESPOT_C_VERSION_MINOR 6
struct sp_session; struct sp_session;

55
src/inputs/librespot-c/src/http.c
View File

@ -38,7 +38,7 @@ http_request_free(struct http_request *request, bool only_content)
free(request->url); free(request->url);
free(request->body); free(request->body);
for (i = 0; request->headers[i]; i++) for (i = 0; i < HTTP_MAX_HEADERS && request->headers[i]; i++)
free(request->headers[i]); free(request->headers[i]);
if (only_content) if (only_content)
@ -57,7 +57,7 @@ http_response_free(struct http_response *response, bool only_content)
free(response->body); free(response->body);
for (i = 0; response->headers[i]; i++) for (i = 0; i < HTTP_MAX_HEADERS && response->headers[i]; i++)
free(response->headers[i]); free(response->headers[i]);
if (only_content) if (only_content)
@ -66,22 +66,42 @@ http_response_free(struct http_response *response, bool only_content)
free(response); free(response);
} }
static void static size_t
headers_save(struct http_response *response, CURL *curl) header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
{ {
struct curl_header *prev = NULL; struct http_response *response = userdata;
struct curl_header *header; size_t realsize = size * nmemb;
int i = 0; char *header;
char *end;
while ((header = curl_easy_nextheader(curl, CURLH_HEADER, 0, prev)) && i < HTTP_MAX_HEADERS)
{
if (asprintf(&response->headers[i], "%s:%s", header->name, header->value) < 0)
return;
prev = header; if (response->headers_count >= HTTP_MAX_HEADERS)
i++; goto out;
if (realsize >= 6 && strncmp(ptr, "HTTP/", 5) == 0)
goto out;
header = malloc(realsize + 1);
memcpy(header, ptr, realsize);
header[realsize] = '\0';
for (end = header + strlen(header) - 1; end > header; end--)
{
if (*end == '\n' || *end == '\r')
*end = '\0';
} }
}
if (strlen(header) == 0)
{
free(header);
goto out;
}
response->headers[response->headers_count] = header;
response->headers_count++;
out:
return realsize;
}
static size_t static size_t
body_cb(char *ptr, size_t size, size_t nmemb, void *userdata) body_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
@ -167,6 +187,9 @@ http_request(struct http_response *response, struct http_request *request, struc
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, body_cb); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, body_cb);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, response); curl_easy_setopt(curl, CURLOPT_WRITEDATA, response);
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_cb);
curl_easy_setopt(curl, CURLOPT_HEADERDATA, response);
// Allow redirects // Allow redirects
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 5); curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 5);
@ -181,8 +204,6 @@ http_request(struct http_response *response, struct http_request *request, struc
res = curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &content_length); res = curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &content_length);
response->content_length = (res == CURLE_OK) ? (ssize_t)content_length : -1; response->content_length = (res == CURLE_OK) ? (ssize_t)content_length : -1;
headers_save(response, curl);
curl_slist_free_all(headers); curl_slist_free_all(headers);
if (!session) if (!session)
curl_easy_cleanup(curl); curl_easy_cleanup(curl);

1
src/inputs/librespot-c/src/http.h
View File

@ -57,6 +57,7 @@ struct http_response
ssize_t content_length; // -1 = unknown ssize_t content_length; // -1 = unknown
char *headers[HTTP_MAX_HEADERS]; char *headers[HTTP_MAX_HEADERS];
int headers_count;
uint8_t *body; // Allocated, must be freed by caller uint8_t *body; // Allocated, must be freed by caller
size_t body_len; size_t body_len;
}; };