Update codebase from upstream

Author: adamcstephens

CHANGELOG

@@ -1,2 +1,5 @@
+2025-09-10
+ - send keep-alive
+
 2023-12
- - raop_streamer: no content-length on chunked-encoding, even on range request
+-- raop_streamer: no content-length on chunked-encoding, even on range request

Makefile

@@ -4,7 +4,7 @@ endif
 
 ifeq ($(findstring gcc,$(CC)),gcc)
 CFLAGS  += -Wno-stringop-truncation -Wno-stringop-overflow -Wno-format-truncation -Wno-multichar
-LDFLAGS += -s -lstdc++
+LDFLAGS += -s -lstdc++ -latomic
 else
 CFLAGS += -fno-temp-file
 LDFLAGS += -lc++
@@ -19,7 +19,7 @@ BUILDDIR   = $(dir $(CORE))$(HOST)/$(PLATFORM)
 LIB        = lib/$(HOST)/$(PLATFORM)/libraop.a
 EXECUTABLE = $(CORE)-$(PLATFORM)
 
-DEFINES  = -DNDEBUG -D_GNU_SOURCE
+DEFINES  = -DNDEBUG -D_GNU_SOURCE -DOPENSSL_SUPPRESS_DEPRECATED
 CFLAGS  += -Wall -fPIC -ggdb -O2 $(DEFINES) -fdata-sections -ffunction-sections
 LDFLAGS += -lpthread -ldl -lm -L.
 

crosstools

@@ -79,7 +79,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>FLAC__NO_DLL;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FLAC__NO_DLL;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;OPENSSL_SUPPRESS_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>crosstools\src;dmap-parser;libmdns\targets\include\mdnssvc;libmdns\targets\include\mdnssd;libcodecs\targets\include\faac;libcodecs\targets\include\flac;libcodecs\targets\include\shine;libcodecs\targets\include\addons;libpthreads4w\targets\win32\x86\include;libopenssl\targets\win32\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4267;4244;5105</DisableSpecificWarnings>

curve25519

@@ -130,6 +130,7 @@ typedef struct {
 typedef struct raopcl_s {
 	struct rtspcl_s *rtspcl;
 	raop_state_t state;
+	uint64_t last_keepalive;  // Track last keepalive time
 	char DACP_id[17], active_remote[11];
 	struct {
 		unsigned int ctrl, time;
@@ -675,6 +676,7 @@ struct raopcl_s *raopcl_create(struct in_addr host, uint16_t port_base, uint16_t
 	raopcld = malloc(sizeof(raopcl_data_t));
 	memset(raopcld, 0, sizeof(raopcl_data_t));
 
+	raopcld->last_keepalive = raopcl_get_ntp(NULL);  // Initialize last keepalive time
 	//  raopcld->sane is set to 0
 	raopcld->port_base = port_base;
 	raopcld->port_range = port_base ? port_range : 1;
@@ -749,7 +751,6 @@ static void _raopcl_terminate_rtp(struct raopcl_s *p)
 bool raopcl_set_volume(struct raopcl_s *p, float vol)
 {
 	char a[128];
-
 	if (!p) return false;
 
 	if ((vol < -30 || vol > 0) && vol != -144.0) return false;
@@ -1136,6 +1137,7 @@ bool _raopcl_disconnect(struct raopcl_s *p, bool force)
 
 	pthread_mutex_lock(&p->mutex);
 	p->state = RAOP_DOWN;
+	p->last_keepalive = raopcl_get_ntp(NULL);
 	pthread_mutex_unlock(&p->mutex);
 
 	_raopcl_terminate_rtp(p);
@@ -1359,6 +1361,14 @@ void *_rtp_control_thread(void *args)
 	while (raopcld->ctrl_running)	{
 		struct timeval timeout = { 1, 0 };
 		fd_set rfds;
+		uint64_t now = raopcl_get_ntp(NULL);
+
+		// Send keepalive packet every 25 seconds
+		if (now - raopcld->last_keepalive >= MS2NTP(25000)) {
+			LOG_INFO("[%p]: sending keepalive packet", raopcld);
+			raopcl_keepalive(raopcld);
+			raopcld->last_keepalive = now;
+		}
 
 		FD_ZERO(&rfds);
 		FD_SET(raopcld->rtp_ports.ctrl.fd, &rfds);

libcodecs

@@ -659,8 +659,12 @@ static bool exec_request(struct rtspcl_s *rtspcld, char *cmd, char *content_type
 
 	token = strtok(line, delimiters);
 	token = strtok(NULL, delimiters);
+
+	// ignore 501 when 
 	if (token == NULL || strcmp(token, "200")) {
-		LOG_ERROR("[%p]: <------ : request failed, error %s", rtspcld, line);
+		if (strcmp(token, "501") || strcmp(cmd, "OPTIONS")) {
+			LOG_ERROR("[%p]: <------ : request failed, error %s %s", rtspcld, line, (token ? token : ""));
+		}
 		if (get_response == 1) return false;
 	} else {
 		LOG_DEBUG("[%p]: <------ : %s: request ok", rtspcld, token);