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

[spotify] Submit actual system info to Spotify

Browse Source
This commit is contained in:
ejurgensen 2021-06-05 21:09:44 +02:00
parent 4463d4e7d8
commit 9fbbf9836c
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ AC_PROG_CC
AM_PROG_AR AM_PROG_AR
AC_PROG_RANLIB AC_PROG_RANLIB
AC_CHECK_HEADERS_ONCE([endian.h sys/endian.h]) AC_CHECK_HEADERS_ONCE([endian.h sys/endian.h sys/utsname.h])
AC_CHECK_DECL([htobe16], [], AC_CHECK_DECL([htobe16], [],
[AC_CHECK_HEADERS([libkern/OSByteOrder.h], [], [AC_MSG_ERROR([[Missing functions to swap byte order]])])], [AC_CHECK_HEADERS([libkern/OSByteOrder.h], [], [AC_MSG_ERROR([[Missing functions to swap byte order]])])],
) )

45
src/inputs/librespot-c/src/connection.c
View File

@ -8,6 +8,10 @@
#include <json-c/json.h> #include <json-c/json.h>
#ifdef HAVE_SYS_UTSNAME_H
# include <sys/utsname.h>
#endif
#include "librespot-c-internal.h" #include "librespot-c-internal.h"
#include "connection.h" #include "connection.h"
#include "channel.h" #include "channel.h"
@ -83,6 +87,45 @@ debug_mock_response(struct sp_message *msg, struct sp_connection *conn)
/* --------------------------------- Helpers -------------------------------- */ /* --------------------------------- Helpers -------------------------------- */
#ifdef HAVE_SYS_UTSNAME_H
static void
system_info_from_uname(SystemInfo *system_info)
{
struct utsname uts = { 0 };
if (uname(&uts) < 0)
return;
if (strcmp(uts.sysname, "Linux") == 0)
system_info->os = OS__OS_LINUX;
else if (strcmp(uts.sysname, "Darwin") == 0)
system_info->os = OS__OS_OSX;
else if (strcmp(uts.sysname, "FreeBSD") == 0)
system_info->os = OS__OS_FREEBSD;
if (strcmp(uts.machine, "x86_64") == 0)
system_info->cpu_family = CPU_FAMILY__CPU_X86_64;
else if (strncmp(uts.machine, "arm", 3) == 0)
system_info->cpu_family = CPU_FAMILY__CPU_ARM;
else if (strcmp(uts.machine, "aarch64") == 0)
system_info->cpu_family = CPU_FAMILY__CPU_ARM;
else if (strcmp(uts.machine, "i386") == 0)
system_info->cpu_family = CPU_FAMILY__CPU_X86;
else if (strcmp(uts.machine, "i686") == 0)
system_info->cpu_family = CPU_FAMILY__CPU_X86;
else if (strcmp(uts.machine, "ppc") == 0)
system_info->cpu_family = CPU_FAMILY__CPU_PPC;
else if (strcmp(uts.machine, "ppc64") == 0)
system_info->cpu_family = CPU_FAMILY__CPU_PPC_64;
}
#else
static void
system_info_from_uname(SystemInfo *system_info)
{
return;
}
#endif
// Returns true if format of a is preferred over b (and is valid). According to // Returns true if format of a is preferred over b (and is valid). According to
// librespot comment most podcasts are 96 kbit. // librespot comment most podcasts are 96 kbit.
static bool static bool
@ -984,6 +1027,8 @@ msg_make_client_response_encrypted(uint8_t *out, size_t out_len, struct sp_sessi
system_info.system_information_string = system_information_string; system_info.system_information_string = system_information_string;
system_info.device_id = sp_sysinfo.device_id; system_info.device_id = sp_sysinfo.device_id;
system_info_from_uname(&system_info);
client_response.login_credentials = &login_credentials; client_response.login_credentials = &login_credentials;
client_response.system_info = &system_info; client_response.system_info = &system_info;
snprintf(version_string, sizeof(version_string), "%s-%s", sp_sysinfo.client_name, sp_sysinfo.client_version); snprintf(version_string, sizeof(version_string), "%s-%s", sp_sysinfo.client_name, sp_sysinfo.client_version);