stamp update for kh19

version numbrer update, with whitespace and copyright update

NEWS

@@ -18,6 +18,25 @@ Feature differences from Xiph release
 
 any extra tags are shown in the conf/icecast.xml.dist file
 
+2.4.0.kh19
+. Another update to xml parsing. Allows for cleaner and more flexible handling of
+  parameters and tags.
+  Added fallback to mirror fallback-mount, so that it reads better in certain cases
+  eg <fallback mount="/backup" rate="128k"/>. The other layouts are also handled.
+  Empty tags are now ignored, seen with some with intro tags
+  original shoutcast port compatability settings handled better.
+. Optional feature, set hijack to true on mount to allow a source to kick off the
+  existing stream without touching listeners. This is primarily for replacing a
+  relay stream as a replacment for fallback handling as it keeps listeners on the
+  same mountpoint. While the feature will stay, the exact methos to enable is still
+  subject for change but setting this on the mount block is reasonable.
+. fix relay intialization failure case.
+. relay internal state fix on reload. restart on certain changes.
+. range header case fixed. playback issue in browsers
+. various code cleanups, possible lockup issues resolved, crash cases, work done
+  at shutdown etc.
+. reduce some excessive logging in certain cases.
+
 2.4.0.kh18
 . Extend http headers work from previous release.
   Can now be used to create POST data. This improves code readability and also

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Icecast 2.4.0-kh18.3.
+# Generated by GNU Autoconf 2.71 for Icecast 2.4.0-kh19.
 #
 # Report bugs to <[email protected]>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Icecast'
 PACKAGE_TARNAME='icecast'
-PACKAGE_VERSION='2.4.0-kh18.3'
-PACKAGE_STRING='Icecast 2.4.0-kh18.3'
+PACKAGE_VERSION='2.4.0-kh19'
+PACKAGE_STRING='Icecast 2.4.0-kh19'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1423,7 +1423,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Icecast 2.4.0-kh18.3 to adapt to many kinds of systems.
+\`configure' configures Icecast 2.4.0-kh19 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1494,7 +1494,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Icecast 2.4.0-kh18.3:";;
+     short | recursive ) echo "Configuration of Icecast 2.4.0-kh19:";;
    esac
   cat <<\_ACEOF
 
@@ -1628,7 +1628,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Icecast configure 2.4.0-kh18.3
+Icecast configure 2.4.0-kh19
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2182,7 +2182,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Icecast $as_me 2.4.0-kh18.3, which was
+It was created by Icecast $as_me 2.4.0-kh19, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3669,7 +3669,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='icecast'
- VERSION='2.4.0-kh18.3'
+ VERSION='2.4.0-kh19'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -21566,7 +21566,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Icecast $as_me 2.4.0-kh18.3, which was
+This file was extended by Icecast $as_me 2.4.0-kh19, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21634,7 +21634,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Icecast config.status 2.4.0-kh18.3
+Icecast config.status 2.4.0-kh19
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([Icecast], [2.4.0-kh18.3], [[email protected]])
+AC_INIT([Icecast], [2.4.0-kh19], [[email protected]])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign])
 

src/connection.c

@@ -1743,7 +1743,7 @@ static int _handle_source_request (client_t *client)
     INFO1("Source logging in at mountpoint \"%s\"", uri);
 
     client->flags &= ~CLIENT_KEEPALIVE;
-    
+
     if (uri[0] != '/')
     {
         WARN1 ("mountpoint not starting with / (%s)", uri);

src/log/log.c

@@ -70,7 +70,7 @@ typedef struct log_tag
     log_entry_t *written_entry;
     log_entry_t *log_head;
     log_entry_t *log_tail;
-    
+
     char *buffer;
 } log_t;
 
@@ -89,7 +89,7 @@ static int _log_open (int id, time_t now)
         return 0;
 
     /* check for cases where an open of the logfile is wanted */
-    if (loglist [id] . logfile == NULL || 
+    if (loglist [id] . logfile == NULL ||
        (loglist [id] . duration && loglist [id] . reopen_at <= now) ||
        (loglist [id] . trigger_level && loglist [id] . size > loglist [id] . trigger_level))
     {
@@ -637,7 +637,7 @@ int log_contents (int log_id, char **_contents, unsigned int *_len)
 }
 
 
-void log_write(int log_id, unsigned priority, const char *cat, const char *func, 
+void log_write(int log_id, unsigned priority, const char *cat, const char *func,
         const char *fmt, ...)
 {
     static char *prior[] = { "EROR", "WARN", "INFO", "DBUG" };
@@ -673,7 +673,7 @@ void log_write_direct(int log_id, const char *fmt, ...)
     char line[LOG_MAXLINELEN];
 
     if (log_id < 0 || log_id >= LOG_MAXLOGS) return;
-    
+
     va_start(ap, fmt);
 
     _lock_logger();

src/net/sock.c

@@ -2,6 +2,7 @@
 /* sock.c: General Socket Functions
  *
  * Copyright (c) 1999 the icecast team
+ * Copyright (c) 2010-2023 Karl Heyes <[email protected]>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -132,8 +133,8 @@ char *sock_get_localip(char *buff, int len)
 }
 
 /* sock_error
-** 
-** returns the last socket error
+*
+* returns the last socket error
 */
 int sock_error(void)
 {
@@ -272,7 +273,7 @@ int inet_aton(const char *s, struct in_addr *a)
     }
 
     a->s_addr = inet_addr(s);
-    
+
     return (a->s_addr != INADDR_NONE);
 }
 #endif /* _WIN32 */
@@ -304,7 +305,7 @@ int sock_set_blocking(sock_t sock, int block)
 int sock_set_nolinger(sock_t sock)
 {
     struct linger lin = { 0, 0 };
-    return setsockopt(sock, SOL_SOCKET, SO_LINGER, (void *)&lin, 
+    return setsockopt(sock, SOL_SOCKET, SO_LINGER, (void *)&lin,
             sizeof(struct linger));
 }
 
@@ -342,7 +343,7 @@ int sock_set_delay(sock_t sock)
 int sock_set_keepalive(sock_t sock)
 {
     int keepalive = 1;
-    return setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, 
+    return setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive,
             sizeof(int));
 }
 
@@ -370,7 +371,7 @@ sock_t _sock_open_cloexec (int domain, int type, int protocol)
 {
     static int sock_cloexec = SOCK_CLOEXEC;
     sock_t s = socket (domain, type|sock_cloexec, protocol);
-    if (s >= 0) 
+    if (s >= 0)
     {
         if (sock_cloexec == 0) sock_set_cloexec (s);
         return s;
@@ -613,7 +614,7 @@ int sock_read_line(sock_t sock, char *buff, const int len)
 {
     char c = '\0';
     int read_bytes, pos;
-  
+
     /*if (!sock_valid_socket(sock)) {
         return 0;
     } else*/ if (!buff) {
@@ -634,7 +635,7 @@ int sock_read_line(sock_t sock, char *buff, const int len)
             buff[pos++] = c;
         read_bytes = recv(sock, &c, 1, 0);
     }
-    
+
     if (read_bytes == 1) {
         buff[pos] = '\0';
         return 1;
@@ -648,7 +649,7 @@ int sock_read_line(sock_t sock, char *buff, const int len)
  * return SOCK_TIMEOUT for timeout
  * return SOCK_ERROR for failure
  * return 0 for try again, interrupted
- * return 1 for ok 
+ * return 1 for ok
  */
 #ifdef HAVE_POLL
 int sock_connected (sock_t sock, int timeout)
@@ -761,7 +762,7 @@ sock_t sock_connect_non_blocking (const char *hostname, unsigned port)
         {
             sock_set_cloexec(sock);
             sock_set_blocking (sock, 0);
-            if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 && 
+            if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 &&
                     !sock_connect_pending(sock_error()))
             {
                 sock_close (sock);
@@ -773,7 +774,7 @@ sock_t sock_connect_non_blocking (const char *hostname, unsigned port)
         ai = ai->ai_next;
     }
     if (head) freeaddrinfo (head);
-    
+
     return sock;
 }
 

src/net/sock.h

@@ -2,17 +2,18 @@
  * - General Socket Function Headers
  *
  * Copyright (c) 1999 the icecast team
+ * Copyright (c) 2010-2023 Karl Heyes <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -58,8 +59,8 @@
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #define IOVEC struct iovec
-#define sock_readv readv 
-#define sock_writev writev 
+#define sock_readv readv
+#define sock_writev writev
 #elif WIN32
 #include <ws2tcpip.h>
 #define IOVEC WSABUF

src/thread/thread.c

@@ -1,6 +1,7 @@
 /* threads.c: Thread Abstraction Functions
  *
  * Copyright (c) 1999, 2000 the icecast team <[email protected]>
+ * Copyright (c) 2020-2023 Karl Heyes <[email protected]>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public

src/thread/thread.h

@@ -2,6 +2,7 @@
  * - Thread Abstraction Function Headers
  *
  * Copyright (c) 1999, 2000 the icecast team <[email protected]>
+ * Copyright (c) 2019-2023 Karl Heyes <[email protected]>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -32,7 +33,7 @@ typedef struct {
 
     /* the time the thread was created */
     time_t create_time;
-    
+
     /* the file and line which created this thread */
     const char *file;
     int line;
@@ -63,7 +64,7 @@ typedef struct {
 #endif
     /* the file and line where the mutex was locked */
     const char *file;
-    int line;    
+    int line;
 
     /* the system specific mutex */
     pthread_mutex_t sys_mutex;
@@ -181,7 +182,7 @@ void thread_shutdown(void);
 void thread_use_log_id(int log_id);
 
 /* creation, destruction, locking, unlocking, signalling and waiting */
-thread_type *thread_create_c(char *name, void *(*start_routine)(void *), 
+thread_type *thread_create_c(char *name, void *(*start_routine)(void *),
         void *arg, int detached, int line, const char *file);
 void thread_mutex_create_c(mutex_t *mutex, int line, const char *file);
 void thread_mutex_lock_c(mutex_t *mutex, int line, const char *file);

src/timing/timing.c

@@ -43,8 +43,8 @@
 
 /* see timing.h for an explanation of _mangle() */
 
-/* 
- * Returns milliseconds no matter what. 
+/*
+ * Returns milliseconds no matter what.
  */
 uint64_t timing_get_time(void)
 {

win32/icecast.nsis

@@ -13,7 +13,7 @@
 # installer containing your program.
 
 Name "Icecast KH"
-OutFile "icecast-2.4.0-kh18_win32_setup.exe"
+OutFile "icecast-2.4.0-kh19_win32_setup.exe"
 
 InstallDir "$ProgramFiles\Icecast KH"
 InstallDirRegKey HKLM SOFTWARE\Icecast "Install_Dir"
@@ -31,12 +31,12 @@ XPStyle on
 
 ;Version Information
 
-VIProductVersion "2.4.0.18"
+VIProductVersion "2.4.0.19"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Icecast KH"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "2.4.0"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Karl Heyes @2000-2023"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Icecast KH streaming media server installer"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.4.0-KH18"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.4.0-KH19"
 
 Page components
 Page directory

win32/icecast64.nsis

@@ -13,7 +13,7 @@
 # installer containing your program.
 
 Name "Icecast KH"
-OutFile "icecast-2.4.0-kh18_win64_setup.exe"
+OutFile "icecast-2.4.0-kh19_win64_setup.exe"
 
 InstallDir "$ProgramFiles64\Icecast KH"
 InstallDirRegKey HKLM SOFTWARE\Icecast "Install_Dir"
@@ -31,12 +31,12 @@ XPStyle on
 
 ;Version Information
 
-VIProductVersion "2.4.0.18"
+VIProductVersion "2.4.0.19"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Icecast KH"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "2.4.0"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Karl Heyes @2000-2023"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Icecast KH streaming media server installer"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.4.0-KH18"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.4.0-KH19"
 
 Page components
 Page directory