From d4c1bdf9d0baab204ac3a178e661c56cab8320d4 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 4 Jul 2021 14:27:22 +0800
Subject: [PATCH 01/19] Update README for v3.0-r7

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6743d07b4..46e837d37 100755
--- a/README.md
+++ b/README.md
@@ -786,6 +786,7 @@ Other important wiki:
 
 ## Releases
 
+* 2021-07-04, [Release v3.0-r7](https://github.com/ossrs/srs/releases/tag/v3.0-r7), 3.0 release7, 3.0.167, 123463 lines.
 * 2021-06-26, [Release v3.0-r6](https://github.com/ossrs/srs/releases/tag/v3.0-r6), 3.0 release6, 3.0.163, 123011 lines.
 * 2021-04-28, [Release v3.0-r5][r3.0r5], 3.0 release5, 3.0.161, 122750 lines.
 * 2021-04-24, [Release v3.0-r4][r3.0r4], 3.0 release4, 3.0.160, 122750 lines.

From ea064166b7906d1d48b78337060ac2fff336c0ed Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 6 Jul 2021 11:20:52 +0800
Subject: [PATCH 02/19] Add role(srs) to query versions

---
 trunk/src/app/srs_app_latest_version.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp
index 70cb9201b..9588f2daa 100644
--- a/trunk/src/app/srs_app_latest_version.cpp
+++ b/trunk/src/app/srs_app_latest_version.cpp
@@ -103,7 +103,7 @@ srs_error_t SrsLatestVersion::query_latest_version()
     stringstream ss;
     ss << "http://api.ossrs.net/service/v1/releases?"
           << "version=v" << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION
-          << "&id=" << server_id_
+          << "&id=" << server_id_ << "&role=srs"
           << "&eip=" << srs_get_public_internet_address()
           << "&ts=" << srsu2ms(srs_get_system_time());
     string url = ss.str();

From 5c6bb63bf25b500a2f785e087befbea7cf58a0d8 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 6 Aug 2021 21:13:20 +0800
Subject: [PATCH 03/19] API: Use libuuid to generate uuid. v3.0.165

---
 trunk/configure                          |    2 +-
 trunk/src/app/srs_app_latest_version.cpp |   15 +-
 trunk/src/app/srs_app_uuid.cpp           | 1320 ++++++++++++++++++++++
 trunk/src/app/srs_app_uuid.hpp           |  112 ++
 trunk/src/core/srs_core_version3.hpp     |    2 +-
 5 files changed, 1444 insertions(+), 7 deletions(-)
 create mode 100644 trunk/src/app/srs_app_uuid.cpp
 create mode 100644 trunk/src/app/srs_app_uuid.hpp

diff --git a/trunk/configure b/trunk/configure
index 04644562c..916e1ba99 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -228,7 +228,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
             "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static"
             "srs_app_recv_thread" "srs_app_security" "srs_app_statistic" "srs_app_hds"
             "srs_app_mpegts_udp" "srs_app_rtsp" "srs_app_listener" "srs_app_async_call"
-            "srs_app_caster_flv" "srs_app_latest_version" "srs_app_process" "srs_app_ng_exec"
+            "srs_app_caster_flv" "srs_app_latest_version" "srs_app_uuid" "srs_app_process" "srs_app_ng_exec"
             "srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
             "srs_app_coworkers")
     DEFINES=""
diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp
index 9588f2daa..e1a591ec1 100644
--- a/trunk/src/app/srs_app_latest_version.cpp
+++ b/trunk/src/app/srs_app_latest_version.cpp
@@ -33,6 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_app_http_conn.hpp>
 #include <srs_app_http_client.hpp>
 #include <srs_app_utility.hpp>
+#include <srs_app_uuid.hpp>
 
 #include <unistd.h>
 #include <sstream>
@@ -54,12 +55,16 @@ srs_error_t SrsLatestVersion::start()
         return srs_success;
     }
 
-    char buf[16];
-    srs_random_generate(buf, sizeof(buf));
-    for (int i = 0; i < (int)sizeof(buf); i++) {
-        buf[i] = 'a' + uint8_t(buf[i])%25;
+    if (true) {
+        uuid_t uuid;
+        uuid_generate_time(uuid);
+
+        char buf[32];
+        for (int i = 0; i < 16; i++) {
+            snprintf(buf + i * 2, sizeof(buf), "%02x", uuid[i]);
+        }
+        server_id_ = string(buf, sizeof(buf));
     }
-    server_id_ = string(buf, sizeof(buf));
 
     return trd_->start();
 }
diff --git a/trunk/src/app/srs_app_uuid.cpp b/trunk/src/app/srs_app_uuid.cpp
new file mode 100644
index 000000000..721efbf7b
--- /dev/null
+++ b/trunk/src/app/srs_app_uuid.cpp
@@ -0,0 +1,1320 @@
+//
+// libuuid BSD License @see https://sourceforge.net/projects/libuuid/
+//
+// SPDX-License-Identifier: BSD-3-Clause
+//
+
+#include <srs_app_uuid.hpp>
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/file.h>
+#define HAVE_USLEEP
+////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////
+
+/*
+ * Fundamental C definitions.
+ */
+
+#ifndef UTIL_LINUX_C_H
+#define UTIL_LINUX_C_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <limits.h>
+#include <stddef.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+# ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+# endif
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#ifdef HAVE_ERR_H
+# include <err.h>
+#endif
+
+#ifndef HAVE_USLEEP
+# include <time.h>
+#endif
+
+/*
+ * Compiler specific stuff
+ */
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min) \
+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#ifdef __GNUC__
+
+/* &a[0] degrades to a pointer: a different type from an array */
+# define __must_be_array(a) \
+	UL_BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(__typeof__(a), __typeof__(&a[0])))
+
+# define ignore_result(x) ({ \
+	__typeof__(x) __dummy __attribute__((__unused__)) = (x); (void) __dummy; \
+})
+
+#else /* !__GNUC__ */
+# define __must_be_array(a)	0
+# define __attribute__(_arg_)
+# define ignore_result(x) ((void) (x))
+#endif /* !__GNUC__ */
+
+/*
+ * Function attributes
+ */
+#ifndef __ul_alloc_size
+# if __GNUC_PREREQ (4, 3)
+#  define __ul_alloc_size(s) __attribute__((alloc_size(s)))
+# else
+#  define __ul_alloc_size(s)
+# endif
+#endif
+
+#ifndef __ul_calloc_size
+# if __GNUC_PREREQ (4, 3)
+#  define __ul_calloc_size(n, s) __attribute__((alloc_size(n, s)))
+# else
+#  define __ul_calloc_size(n, s)
+# endif
+#endif
+
+/* Force a compilation error if condition is true, but also produce a
+ * result (of value 0 and type size_t), so the expression can be used
+ * e.g. in a structure initializer (or where-ever else comma expressions
+ * aren't permitted).
+ */
+#define UL_BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
+#define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
+
+#ifndef ARRAY_SIZE
+# define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX 4096
+#endif
+
+#ifndef TRUE
+# define TRUE 1
+#endif
+
+#ifndef FALSE
+# define FALSE 0
+#endif
+
+#ifndef min
+# define min(x, y) ({				\
+	__typeof__(x) _min1 = (x);		\
+	__typeof__(y) _min2 = (y);		\
+	(void) (&_min1 == &_min2);		\
+	_min1 < _min2 ? _min1 : _min2; })
+#endif
+
+#ifndef max
+# define max(x, y) ({				\
+	__typeof__(x) _max1 = (x);		\
+	__typeof__(y) _max2 = (y);		\
+	(void) (&_max1 == &_max2);		\
+	_max1 > _max2 ? _max1 : _max2; })
+#endif
+
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
+#ifndef container_of
+#define container_of(ptr, type, member) ({                       \
+	const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
+
+#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+# ifdef HAVE___PROGNAME
+extern char *__progname;
+#  define program_invocation_short_name __progname
+# else
+#  ifdef HAVE_GETEXECNAME
+#   define program_invocation_short_name \
+		prog_inv_sh_nm_from_file(getexecname(), 0)
+#  else
+#   define program_invocation_short_name \
+		prog_inv_sh_nm_from_file((char*)__FILE__, 1)
+#  endif
+static char prog_inv_sh_nm_buf[256];
+static inline char *
+prog_inv_sh_nm_from_file(char *f, char stripext)
+{
+    char *t;
+
+    if ((t = strrchr(f, '/')) != NULL)
+        t++;
+    else
+        t = f;
+
+    strncpy(prog_inv_sh_nm_buf, t, sizeof(prog_inv_sh_nm_buf) - 1);
+    prog_inv_sh_nm_buf[sizeof(prog_inv_sh_nm_buf) - 1] = '\0';
+
+    if (stripext && (t = strrchr(prog_inv_sh_nm_buf, '.')) != NULL)
+        *t = '\0';
+
+    return prog_inv_sh_nm_buf;
+}
+# endif
+#endif
+
+
+#ifndef HAVE_ERR_H
+static inline void
+errmsg(char doexit, int excode, char adderr, const char *fmt, ...)
+{
+    fprintf(stderr, "%s: ", program_invocation_short_name);
+    if (fmt != NULL) {
+        va_list argp;
+        va_start(argp, fmt);
+        vfprintf(stderr, fmt, argp);
+        va_end(argp);
+        if (adderr)
+            fprintf(stderr, ": ");
+    }
+    if (adderr)
+        fprintf(stderr, "%m");
+    fprintf(stderr, "\n");
+    if (doexit)
+        exit(excode);
+}
+
+#ifndef HAVE_ERR
+# define err(E, FMT...) errmsg(1, E, 1, FMT)
+#endif
+
+#ifndef HAVE_ERRX
+# define errx(E, FMT...) errmsg(1, E, 0, FMT)
+#endif
+
+#ifndef HAVE_WARN
+# define warn(FMT...) errmsg(0, 0, 1, FMT)
+#endif
+
+#ifndef HAVE_WARNX
+# define warnx(FMT...) errmsg(0, 0, 0, FMT)
+#endif
+#endif /* !HAVE_ERR_H */
+
+
+static inline __attribute__((const)) int is_power_of_2(unsigned long num)
+{
+    return (num != 0 && ((num & (num - 1)) == 0));
+}
+
+#ifndef HAVE_LOFF_T
+typedef int64_t loff_t;
+#endif
+
+#if !defined(HAVE_DIRFD) && (!defined(HAVE_DECL_DIRFD) || HAVE_DECL_DIRFD == 0) && defined(HAVE_DIR_DD_FD)
+#include <sys/types.h>
+#include <dirent.h>
+static inline int dirfd(DIR *d)
+{
+	return d->dd_fd;
+}
+#endif
+
+/*
+ * Fallback defines for old versions of glibc
+ */
+#include <fcntl.h>
+
+#ifdef O_CLOEXEC
+#define UL_CLOEXECSTR	"e"
+#else
+#define UL_CLOEXECSTR	""
+#endif
+
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
+
+
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG 0x0020
+#endif
+
+#ifndef IUTF8
+#define IUTF8 0040000
+#endif
+
+/*
+ * MAXHOSTNAMELEN replacement
+ */
+static inline size_t get_hostname_max(void)
+{
+#if HAVE_DECL__SC_HOST_NAME_MAX
+    long len = sysconf(_SC_HOST_NAME_MAX);
+
+	if (0 < len)
+		return len;
+#endif
+
+#ifdef MAXHOSTNAMELEN
+    return MAXHOSTNAMELEN;
+#elif HOST_NAME_MAX
+    return HOST_NAME_MAX;
+#endif
+    return 64;
+}
+
+#ifndef HAVE_USLEEP
+/*
+ * This function is marked obsolete in POSIX.1-2001 and removed in
+ * POSIX.1-2008. It is replaced with nanosleep().
+ */
+static inline int usleep(useconds_t usec)
+{
+    struct timespec waittime = {
+            .tv_sec   =  usec / 1000000L,
+            .tv_nsec  = (usec % 1000000L) * 1000
+    };
+    return nanosleep(&waittime, NULL);
+}
+#endif
+
+/*
+ * Constant strings for usage() functions. For more info see
+ * Documentation/howto-usage-function.txt and disk-utils/delpart.c
+ */
+#define USAGE_HEADER     _("\nUsage:\n")
+#define USAGE_OPTIONS    _("\nOptions:\n")
+#define USAGE_SEPARATOR  _("\n")
+#define USAGE_HELP       _(" -h, --help     display this help and exit\n")
+#define USAGE_VERSION    _(" -V, --version  output version information and exit\n")
+#define USAGE_MAN_TAIL(_man)   _("\nFor more details see %s.\n"), _man
+
+#define UTIL_LINUX_VERSION _("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING
+
+/*
+ * scanf modifiers for "strings allocation"
+ */
+#ifdef HAVE_SCANF_MS_MODIFIER
+#define UL_SCNsA	"%ms"
+#elif defined(HAVE_SCANF_AS_MODIFIER)
+#define UL_SCNsA	"%as"
+#endif
+
+/*
+ * seek stuff
+ */
+#ifndef SEEK_DATA
+# define SEEK_DATA	3
+#endif
+#ifndef SEEK_HOLE
+# define SEEK_HOLE	4
+#endif
+
+#endif /* UTIL_LINUX_C_H */
+
+/*
+ * Definitions used by the uuidd daemon
+ *
+ * Copyright (C) 2007 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#ifndef _UUID_UUIDD_H
+#define _UUID_UUIDD_H
+
+#define UUIDD_DIR		_PATH_LOCALSTATEDIR "/uuidd"
+#define UUIDD_SOCKET_PATH	UUIDD_DIR "/request"
+#define UUIDD_PIDFILE_PATH	UUIDD_DIR "/uuidd.pid"
+#define UUIDD_PATH		"/usr/sbin/uuidd"
+
+#define UUIDD_OP_GETPID			0
+#define UUIDD_OP_GET_MAXOP		1
+#define UUIDD_OP_TIME_UUID		2
+#define UUIDD_OP_RANDOM_UUID		3
+#define UUIDD_OP_BULK_TIME_UUID		4
+#define UUIDD_OP_BULK_RANDOM_UUID	5
+#define UUIDD_MAX_OP			UUIDD_OP_BULK_RANDOM_UUID
+
+extern int __uuid_generate_time(uuid_t out, int *num);
+extern void __uuid_generate_random(uuid_t out, int *num);
+
+#endif /* _UUID_UUID_H */
+
+#ifndef UTIL_LINUX_RANDUTILS
+#define UTIL_LINUX_RANDUTILS
+
+#ifdef HAVE_SRANDOM
+#define srand(x)	srandom(x)
+#define rand()		random()
+#endif
+
+extern int random_get_fd(void);
+extern void random_get_bytes(void *buf, size_t nbytes);
+
+#endif
+
+/*
+ * uuid.h -- private header file for uuids
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include <inttypes.h>
+#include <sys/types.h>
+
+//#include "uuid.h"
+
+#define LIBUUID_CLOCK_FILE	"/var/lib/libuuid/clock.txt"
+
+/*
+ * Offset between 15-Oct-1582 and 1-Jan-70
+ */
+#define TIME_OFFSET_HIGH 0x01B21DD2
+#define TIME_OFFSET_LOW  0x13814000
+
+struct uuid {
+    uint32_t	time_low;
+    uint16_t	time_mid;
+    uint16_t	time_hi_and_version;
+    uint16_t	clock_seq;
+    uint8_t	node[6];
+};
+
+
+/*
+ * prototypes
+ */
+void uuid_pack(const struct uuid *uu, uuid_t ptr);
+void uuid_unpack(const uuid_t in, struct uuid *uu);
+
+/*
+ * gen_uuid.c --- generate a DCE-compatible uuid
+ *
+ * Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+/*
+ * Force inclusion of SVID stuff since we need it if we're compiling in
+ * gcc-wall wall mode
+ */
+#ifndef _SVID_SOURCE
+#define _SVID_SOURCE
+#endif
+
+#ifdef _WIN32
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#define UUID MYUUID
+#endif
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <limits.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/stat.h>
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NET_IF_DL_H
+#include <net/if_dl.h>
+#endif
+#if defined(__linux__) && defined(HAVE_SYS_SYSCALL_H)
+#include <sys/syscall.h>
+#endif
+
+//#include "all-io.h"
+//#include "uuidP.h"
+//#include "uuidd.h"
+//#include "randutils.h"
+//#include "c.h"
+
+#ifdef HAVE_TLS
+#define THREAD_LOCAL static __thread
+#else
+#define THREAD_LOCAL static
+#endif
+
+#ifndef LOCK_EX
+/* flock() replacement */
+#define LOCK_EX 1
+#define LOCK_SH 2
+#define LOCK_UN 3
+#define LOCK_NB 4
+
+static int flock(int fd, int op)
+{
+    int rc = 0;
+
+#if defined(F_SETLK) && defined(F_SETLKW)
+    struct flock fl = {0};
+
+    switch (op & (LOCK_EX|LOCK_SH|LOCK_UN)) {
+    case LOCK_EX:
+        fl.l_type = F_WRLCK;
+        break;
+
+    case LOCK_SH:
+        fl.l_type = F_RDLCK;
+        break;
+
+    case LOCK_UN:
+        fl.l_type = F_UNLCK;
+        break;
+
+    default:
+        errno = EINVAL;
+        return -1;
+    }
+
+    fl.l_whence = SEEK_SET;
+    rc = fcntl (fd, op & LOCK_NB ? F_SETLK : F_SETLKW, &fl);
+
+    if (rc && (errno == EAGAIN))
+        errno = EWOULDBLOCK;
+#endif /* defined(F_SETLK) && defined(F_SETLKW)  */
+
+    return rc;
+}
+
+#endif /* LOCK_EX */
+
+#ifdef _WIN32
+static void gettimeofday (struct timeval *tv, void *dummy)
+{
+	FILETIME	ftime;
+	uint64_t	n;
+
+	GetSystemTimeAsFileTime (&ftime);
+	n = (((uint64_t) ftime.dwHighDateTime << 32)
+	     + (uint64_t) ftime.dwLowDateTime);
+	if (n) {
+		n /= 10;
+		n -= ((369 * 365 + 89) * (uint64_t) 86400) * 1000000;
+	}
+
+	tv->tv_sec = n / 1000000;
+	tv->tv_usec = n % 1000000;
+}
+
+static int getuid (void)
+{
+	return 1;
+}
+#endif
+
+/*
+ * Get the ethernet hardware address, if we can find it...
+ *
+ * XXX for a windows version, probably should use GetAdaptersInfo:
+ * http://www.codeguru.com/cpp/i-n/network/networkinformation/article.php/c5451
+ * commenting out get_node_id just to get gen_uuid to compile under windows
+ * is not the right way to go!
+ */
+static int get_node_id(unsigned char *node_id)
+{
+#ifdef HAVE_NET_IF_H
+    int		sd;
+	struct ifreq	ifr, *ifrp;
+	struct ifconf	ifc;
+	char buf[1024];
+	int		n, i;
+	unsigned char	*a;
+#ifdef HAVE_NET_IF_DL_H
+	struct sockaddr_dl *sdlp;
+#endif
+
+/*
+ * BSD 4.4 defines the size of an ifreq to be
+ * max(sizeof(ifreq), sizeof(ifreq.ifr_name)+ifreq.ifr_addr.sa_len
+ * However, under earlier systems, sa_len isn't present, so the size is
+ * just sizeof(struct ifreq)
+ */
+#ifdef HAVE_SA_LEN
+#define ifreq_size(i) max(sizeof(struct ifreq),\
+     sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
+#else
+#define ifreq_size(i) sizeof(struct ifreq)
+#endif /* HAVE_SA_LEN */
+
+	sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+	if (sd < 0) {
+		return -1;
+	}
+	memset(buf, 0, sizeof(buf));
+	ifc.ifc_len = sizeof(buf);
+	ifc.ifc_buf = buf;
+	if (ioctl (sd, SIOCGIFCONF, (char *)&ifc) < 0) {
+		close(sd);
+		return -1;
+	}
+	n = ifc.ifc_len;
+	for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
+		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
+		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
+#ifdef SIOCGIFHWADDR
+		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
+			continue;
+		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
+#else
+#ifdef SIOCGENADDR
+		if (ioctl(sd, SIOCGENADDR, &ifr) < 0)
+			continue;
+		a = (unsigned char *) ifr.ifr_enaddr;
+#else
+#ifdef HAVE_NET_IF_DL_H
+		sdlp = (struct sockaddr_dl *) &ifrp->ifr_addr;
+		if ((sdlp->sdl_family != AF_LINK) || (sdlp->sdl_alen != 6))
+			continue;
+		a = (unsigned char *) &sdlp->sdl_data[sdlp->sdl_nlen];
+#else
+		/*
+		 * XXX we don't have a way of getting the hardware
+		 * address
+		 */
+		close(sd);
+		return 0;
+#endif /* HAVE_NET_IF_DL_H */
+#endif /* SIOCGENADDR */
+#endif /* SIOCGIFHWADDR */
+		if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
+			continue;
+		if (node_id) {
+			memcpy(node_id, a, 6);
+			close(sd);
+			return 1;
+		}
+	}
+	close(sd);
+#endif
+    return 0;
+}
+
+/* Assume that the gettimeofday() has microsecond granularity */
+#define MAX_ADJUSTMENT 10
+
+/*
+ * Get clock from global sequence clock counter.
+ *
+ * Return -1 if the clock counter could not be opened/locked (in this case
+ * pseudorandom value is returned in @ret_clock_seq), otherwise return 0.
+ */
+static int get_clock(uint32_t *clock_high, uint32_t *clock_low,
+                     uint16_t *ret_clock_seq, int *num)
+{
+    THREAD_LOCAL int		adjustment = 0;
+    THREAD_LOCAL struct timeval	last = {0, 0};
+    THREAD_LOCAL int		state_fd = -2;
+    THREAD_LOCAL FILE		*state_f;
+    THREAD_LOCAL uint16_t		clock_seq;
+    struct timeval			tv;
+    uint64_t			clock_reg;
+    mode_t				save_umask;
+    int				len;
+    int				ret = 0;
+
+    if (state_fd == -2) {
+        save_umask = umask(0);
+        state_fd = open(LIBUUID_CLOCK_FILE, O_RDWR|O_CREAT|O_CLOEXEC, 0660);
+        (void) umask(save_umask);
+        if (state_fd != -1) {
+            state_f = fdopen(state_fd, "r+" UL_CLOEXECSTR);
+            if (!state_f) {
+                close(state_fd);
+                state_fd = -1;
+                ret = -1;
+            }
+        }
+        else
+            ret = -1;
+    }
+    if (state_fd >= 0) {
+        rewind(state_f);
+        while (flock(state_fd, LOCK_EX) < 0) {
+            if ((errno == EAGAIN) || (errno == EINTR))
+                continue;
+            fclose(state_f);
+            close(state_fd);
+            state_fd = -1;
+            ret = -1;
+            break;
+        }
+    }
+    if (state_fd >= 0) {
+        unsigned int cl;
+        unsigned long tv1, tv2;
+        int a;
+
+        if (fscanf(state_f, "clock: %04x tv: %lu %lu adj: %d\n",
+                   &cl, &tv1, &tv2, &a) == 4) {
+            clock_seq = cl & 0x3FFF;
+            last.tv_sec = tv1;
+            last.tv_usec = tv2;
+            adjustment = a;
+        }
+    }
+
+    if ((last.tv_sec == 0) && (last.tv_usec == 0)) {
+        random_get_bytes(&clock_seq, sizeof(clock_seq));
+        clock_seq &= 0x3FFF;
+        gettimeofday(&last, 0);
+        last.tv_sec--;
+    }
+
+    try_again:
+    gettimeofday(&tv, 0);
+    if ((tv.tv_sec < last.tv_sec) ||
+        ((tv.tv_sec == last.tv_sec) &&
+         (tv.tv_usec < last.tv_usec))) {
+        clock_seq = (clock_seq+1) & 0x3FFF;
+        adjustment = 0;
+        last = tv;
+    } else if ((tv.tv_sec == last.tv_sec) &&
+               (tv.tv_usec == last.tv_usec)) {
+        if (adjustment >= MAX_ADJUSTMENT)
+            goto try_again;
+        adjustment++;
+    } else {
+        adjustment = 0;
+        last = tv;
+    }
+
+    clock_reg = tv.tv_usec*10 + adjustment;
+    clock_reg += ((uint64_t) tv.tv_sec)*10000000;
+    clock_reg += (((uint64_t) 0x01B21DD2) << 32) + 0x13814000;
+
+    if (num && (*num > 1)) {
+        adjustment += *num - 1;
+        last.tv_usec += adjustment / 10;
+        adjustment = adjustment % 10;
+        last.tv_sec += last.tv_usec / 1000000;
+        last.tv_usec = last.tv_usec % 1000000;
+    }
+
+    if (state_fd >= 0) {
+        rewind(state_f);
+        len = fprintf(state_f,
+                      "clock: %04x tv: %016lu %08lu adj: %08d\n",
+                      clock_seq, last.tv_sec, last.tv_usec, adjustment);
+        fflush(state_f);
+        if (ftruncate(state_fd, len) < 0) {
+            fprintf(state_f, "                   \n");
+            fflush(state_f);
+        }
+        rewind(state_f);
+        flock(state_fd, LOCK_UN);
+    }
+
+    *clock_high = clock_reg >> 32;
+    *clock_low = clock_reg;
+    *ret_clock_seq = clock_seq;
+    return ret;
+}
+
+#if defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H)
+/*
+ * Try using the uuidd daemon to generate the UUID
+ *
+ * Returns 0 on success, non-zero on failure.
+ */
+static int get_uuid_via_daemon(int op, uuid_t out, int *num)
+{
+	char op_buf[64];
+	int op_len;
+	int s;
+	ssize_t ret;
+	int32_t reply_len = 0, expected = 16;
+	struct sockaddr_un srv_addr;
+
+	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+		return -1;
+
+	srv_addr.sun_family = AF_UNIX;
+	strcpy(srv_addr.sun_path, UUIDD_SOCKET_PATH);
+
+	if (connect(s, (const struct sockaddr *) &srv_addr,
+		    sizeof(struct sockaddr_un)) < 0)
+		goto fail;
+
+	op_buf[0] = op;
+	op_len = 1;
+	if (op == UUIDD_OP_BULK_TIME_UUID) {
+		memcpy(op_buf+1, num, sizeof(*num));
+		op_len += sizeof(*num);
+		expected += sizeof(*num);
+	}
+
+	ret = write(s, op_buf, op_len);
+	if (ret < 1)
+		goto fail;
+
+	ret = read_all(s, (char *) &reply_len, sizeof(reply_len));
+	if (ret < 0)
+		goto fail;
+
+	if (reply_len != expected)
+		goto fail;
+
+	ret = read_all(s, op_buf, reply_len);
+
+	if (op == UUIDD_OP_BULK_TIME_UUID)
+		memcpy(op_buf+16, num, sizeof(int));
+
+	memcpy(out, op_buf, 16);
+
+	close(s);
+	return ((ret == expected) ? 0 : -1);
+
+fail:
+	close(s);
+	return -1;
+}
+
+#else /* !defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H) */
+static int get_uuid_via_daemon(int op, uuid_t out, int *num)
+{
+    return -1;
+}
+#endif
+
+int __uuid_generate_time(uuid_t out, int *num)
+{
+    static unsigned char node_id[6];
+    static int has_init = 0;
+    struct uuid uu;
+    uint32_t	clock_mid;
+    int ret;
+
+    if (!has_init) {
+        if (get_node_id(node_id) <= 0) {
+            random_get_bytes(node_id, 6);
+            /*
+             * Set multicast bit, to prevent conflicts
+             * with IEEE 802 addresses obtained from
+             * network cards
+             */
+            node_id[0] |= 0x01;
+        }
+        has_init = 1;
+    }
+    ret = get_clock(&clock_mid, &uu.time_low, &uu.clock_seq, num);
+    uu.clock_seq |= 0x8000;
+    uu.time_mid = (uint16_t) clock_mid;
+    uu.time_hi_and_version = ((clock_mid >> 16) & 0x0FFF) | 0x1000;
+    memcpy(uu.node, node_id, 6);
+    uuid_pack(&uu, out);
+    return ret;
+}
+
+/*
+ * Generate time-based UUID and store it to @out
+ *
+ * Tries to guarantee uniqueness of the generated UUIDs by obtaining them from the uuidd daemon,
+ * or, if uuidd is not usable, by using the global clock state counter (see get_clock()).
+ * If neither of these is possible (e.g. because of insufficient permissions), it generates
+ * the UUID anyway, but returns -1. Otherwise, returns 0.
+ */
+static int uuid_generate_time_generic(uuid_t out) {
+#ifdef HAVE_TLS
+    THREAD_LOCAL int		num = 0;
+	THREAD_LOCAL struct uuid	uu;
+	THREAD_LOCAL time_t		last_time = 0;
+	time_t				now;
+
+	if (num > 0) {
+		now = time(0);
+		if (now > last_time+1)
+			num = 0;
+	}
+	if (num <= 0) {
+		num = 1000;
+		if (get_uuid_via_daemon(UUIDD_OP_BULK_TIME_UUID,
+					out, &num) == 0) {
+			last_time = time(0);
+			uuid_unpack(out, &uu);
+			num--;
+			return 0;
+		}
+		num = 0;
+	}
+	if (num > 0) {
+		uu.time_low++;
+		if (uu.time_low == 0) {
+			uu.time_mid++;
+			if (uu.time_mid == 0)
+				uu.time_hi_and_version++;
+		}
+		num--;
+		uuid_pack(&uu, out);
+		return 0;
+	}
+#else
+    if (get_uuid_via_daemon(UUIDD_OP_TIME_UUID, out, 0) == 0)
+        return 0;
+#endif
+
+    return __uuid_generate_time(out, 0);
+}
+
+/*
+ * Generate time-based UUID and store it to @out.
+ *
+ * Discards return value from uuid_generate_time_generic()
+ */
+void uuid_generate_time(uuid_t out)
+{
+    (void)uuid_generate_time_generic(out);
+}
+
+
+int uuid_generate_time_safe(uuid_t out)
+{
+    return uuid_generate_time_generic(out);
+}
+
+
+void __uuid_generate_random(uuid_t out, int *num)
+{
+    uuid_t	buf;
+    struct uuid uu;
+    int i, n;
+
+    if (!num || !*num)
+        n = 1;
+    else
+        n = *num;
+
+    for (i = 0; i < n; i++) {
+        random_get_bytes(buf, sizeof(buf));
+        uuid_unpack(buf, &uu);
+
+        uu.clock_seq = (uu.clock_seq & 0x3FFF) | 0x8000;
+        uu.time_hi_and_version = (uu.time_hi_and_version & 0x0FFF)
+                                 | 0x4000;
+        uuid_pack(&uu, out);
+        out += sizeof(uuid_t);
+    }
+}
+
+void uuid_generate_random(uuid_t out)
+{
+    int	num = 1;
+    /* No real reason to use the daemon for random uuid's -- yet */
+
+    __uuid_generate_random(out, &num);
+}
+
+/*
+ * Check whether good random source (/dev/random or /dev/urandom)
+ * is available.
+ */
+static int have_random_source(void)
+{
+    struct stat s;
+
+    return (!stat("/dev/random", &s) || !stat("/dev/urandom", &s));
+}
+
+
+/*
+ * This is the generic front-end to uuid_generate_random and
+ * uuid_generate_time.  It uses uuid_generate_random only if
+ * /dev/urandom is available, since otherwise we won't have
+ * high-quality randomness.
+ */
+void uuid_generate(uuid_t out)
+{
+    if (have_random_source())
+        uuid_generate_random(out);
+    else
+        uuid_generate_time(out);
+}
+
+/*
+ * General purpose random utilities
+ *
+ * Based on libuuid code.
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include <sys/syscall.h>
+
+//#include "randutils.h"
+
+#ifdef HAVE_TLS
+#define THREAD_LOCAL static __thread
+#else
+#define THREAD_LOCAL static
+#endif
+
+#if defined(__linux__) && defined(__NR_gettid) && defined(HAVE_JRAND48)
+#define DO_JRAND_MIX
+THREAD_LOCAL unsigned short ul_jrand_seed[3];
+#endif
+
+int random_get_fd(void)
+{
+    int i, fd;
+    struct timeval	tv;
+
+    gettimeofday(&tv, 0);
+    fd = open("/dev/urandom", O_RDONLY);
+    if (fd == -1)
+        fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
+    if (fd >= 0) {
+        i = fcntl(fd, F_GETFD);
+        if (i >= 0)
+            fcntl(fd, F_SETFD, i | FD_CLOEXEC);
+    }
+    srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
+
+#ifdef DO_JRAND_MIX
+    ul_jrand_seed[0] = getpid() ^ (tv.tv_sec & 0xFFFF);
+	ul_jrand_seed[1] = getppid() ^ (tv.tv_usec & 0xFFFF);
+	ul_jrand_seed[2] = (tv.tv_sec ^ tv.tv_usec) >> 16;
+#endif
+    /* Crank the random number generator a few times */
+    gettimeofday(&tv, 0);
+    for (i = (tv.tv_sec ^ tv.tv_usec) & 0x1F; i > 0; i--)
+        rand();
+    return fd;
+}
+
+
+/*
+ * Generate a stream of random nbytes into buf.
+ * Use /dev/urandom if possible, and if not,
+ * use glibc pseudo-random functions.
+ */
+void random_get_bytes(void *buf, size_t nbytes)
+{
+    size_t i, n = nbytes;
+    int fd = random_get_fd();
+    int lose_counter = 0;
+    unsigned char *cp = (unsigned char *) buf;
+
+    if (fd >= 0) {
+        while (n > 0) {
+            ssize_t x = read(fd, cp, n);
+            if (x <= 0) {
+                if (lose_counter++ > 16)
+                    break;
+                continue;
+            }
+            n -= x;
+            cp += x;
+            lose_counter = 0;
+        }
+
+        close(fd);
+    }
+
+    /*
+     * We do this all the time, but this is the only source of
+     * randomness if /dev/random/urandom is out to lunch.
+     */
+    for (cp = (unsigned char *)buf, i = 0; i < nbytes; i++)
+        *cp++ ^= (rand() >> 7) & 0xFF;
+
+#ifdef DO_JRAND_MIX
+    {
+		unsigned short tmp_seed[3];
+
+		memcpy(tmp_seed, ul_jrand_seed, sizeof(tmp_seed));
+		ul_jrand_seed[2] = ul_jrand_seed[2] ^ syscall(__NR_gettid);
+		for (cp = buf, i = 0; i < nbytes; i++)
+			*cp++ ^= (jrand48(tmp_seed) >> 7) & 0xFF;
+		memcpy(ul_jrand_seed, tmp_seed,
+		       sizeof(ul_jrand_seed)-sizeof(unsigned short));
+	}
+#endif
+
+    return;
+}
+
+#ifdef TEST_PROGRAM
+int main(int argc __attribute__ ((__unused__)),
+         char *argv[] __attribute__ ((__unused__)))
+{
+	unsigned int v, i;
+
+	/* generate and print 10 random numbers */
+	for (i = 0; i < 10; i++) {
+		random_get_bytes(&v, sizeof(v));
+		printf("%d\n", v);
+	}
+
+	return EXIT_SUCCESS;
+}
+#endif /* TEST_PROGRAM */
+
+/*
+ * Internal routine for packing UUIDs
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include <string.h>
+//#include "uuidP.h"
+
+void uuid_pack(const struct uuid *uu, uuid_t ptr)
+{
+    uint32_t	tmp;
+    unsigned char	*out = ptr;
+
+    tmp = uu->time_low;
+    out[3] = (unsigned char) tmp;
+    tmp >>= 8;
+    out[2] = (unsigned char) tmp;
+    tmp >>= 8;
+    out[1] = (unsigned char) tmp;
+    tmp >>= 8;
+    out[0] = (unsigned char) tmp;
+
+    tmp = uu->time_mid;
+    out[5] = (unsigned char) tmp;
+    tmp >>= 8;
+    out[4] = (unsigned char) tmp;
+
+    tmp = uu->time_hi_and_version;
+    out[7] = (unsigned char) tmp;
+    tmp >>= 8;
+    out[6] = (unsigned char) tmp;
+
+    tmp = uu->clock_seq;
+    out[9] = (unsigned char) tmp;
+    tmp >>= 8;
+    out[8] = (unsigned char) tmp;
+
+    memcpy(out+10, uu->node, 6);
+}
+
+/*
+ * Internal routine for unpacking UUID
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include <string.h>
+//#include "uuidP.h"
+
+void uuid_unpack(const uuid_t in, struct uuid *uu)
+{
+    const uint8_t	*ptr = in;
+    uint32_t		tmp;
+
+    tmp = *ptr++;
+    tmp = (tmp << 8) | *ptr++;
+    tmp = (tmp << 8) | *ptr++;
+    tmp = (tmp << 8) | *ptr++;
+    uu->time_low = tmp;
+
+    tmp = *ptr++;
+    tmp = (tmp << 8) | *ptr++;
+    uu->time_mid = tmp;
+
+    tmp = *ptr++;
+    tmp = (tmp << 8) | *ptr++;
+    uu->time_hi_and_version = tmp;
+
+    tmp = *ptr++;
+    tmp = (tmp << 8) | *ptr++;
+    uu->clock_seq = tmp;
+
+    memcpy(uu->node, ptr, 6);
+}
+
diff --git a/trunk/src/app/srs_app_uuid.hpp b/trunk/src/app/srs_app_uuid.hpp
new file mode 100644
index 000000000..689fa239e
--- /dev/null
+++ b/trunk/src/app/srs_app_uuid.hpp
@@ -0,0 +1,112 @@
+//
+// libuuid BSD License @see https://sourceforge.net/projects/libuuid/
+//
+// SPDX-License-Identifier: BSD-3-Clause
+//
+#include <srs_core.hpp>
+
+/*
+ * Public include file for the UUID library
+ *
+ * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#ifndef _UUID_UUID_H
+#define _UUID_UUID_H
+
+#include <sys/types.h>
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+#include <time.h>
+
+typedef unsigned char uuid_t[16];
+
+/* UUID Variant definitions */
+#define UUID_VARIANT_NCS	0
+#define UUID_VARIANT_DCE	1
+#define UUID_VARIANT_MICROSOFT	2
+#define UUID_VARIANT_OTHER	3
+
+/* UUID Type definitions */
+#define UUID_TYPE_DCE_TIME   1
+#define UUID_TYPE_DCE_RANDOM 4
+
+/* Allow UUID constants to be defined */
+#ifdef __GNUC__
+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
+	static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
+#else
+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
+	static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* clear.c */
+void uuid_clear(uuid_t uu);
+
+/* compare.c */
+int uuid_compare(const uuid_t uu1, const uuid_t uu2);
+
+/* copy.c */
+void uuid_copy(uuid_t dst, const uuid_t src);
+
+/* gen_uuid.c */
+void uuid_generate(uuid_t out);
+void uuid_generate_random(uuid_t out);
+void uuid_generate_time(uuid_t out);
+int uuid_generate_time_safe(uuid_t out);
+
+/* isnull.c */
+int uuid_is_null(const uuid_t uu);
+
+/* parse.c */
+int uuid_parse(const char *in, uuid_t uu);
+
+/* unparse.c */
+void uuid_unparse(const uuid_t uu, char *out);
+void uuid_unparse_lower(const uuid_t uu, char *out);
+void uuid_unparse_upper(const uuid_t uu, char *out);
+
+/* uuid_time.c */
+time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
+int uuid_type(const uuid_t uu);
+int uuid_variant(const uuid_t uu);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UUID_UUID_H */
+
diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp
index c18ea6914..684a4fc32 100644
--- a/trunk/src/core/srs_core_version3.hpp
+++ b/trunk/src/core/srs_core_version3.hpp
@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 164
+#define SRS_VERSION3_REVISION 165
 
 #endif

From 5c97da28c6bc55afb1e5cc605dde78e68effa272 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 7 Aug 2021 15:59:00 +0800
Subject: [PATCH 04/19] API: For #2508, query feature docker and packager.
 v3.0.166

---
 trunk/auto/auto_headers.sh               |  1 +
 trunk/src/app/srs_app_latest_version.cpp | 10 ++++++++++
 trunk/src/core/srs_core_version3.hpp     |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/trunk/auto/auto_headers.sh b/trunk/auto/auto_headers.sh
index 25564d1d2..3983433a9 100755
--- a/trunk/auto/auto_headers.sh
+++ b/trunk/auto/auto_headers.sh
@@ -11,6 +11,7 @@ echo "#ifndef SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
 echo "" >> $SRS_AUTO_HEADERS_H
 
+echo "#define SRS_AUTO_PACKAGER \"${SRS_AUTO_PACKAGER}\"" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_AUTO_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_AUTO_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_AUTO_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H
diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp
index e1a591ec1..fce658795 100644
--- a/trunk/src/app/srs_app_latest_version.cpp
+++ b/trunk/src/app/srs_app_latest_version.cpp
@@ -39,6 +39,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sstream>
 using namespace std;
 
+// Whether we are in docker, defined in main module.
+extern bool _srs_in_docker;
+
+void srs_build_features(stringstream& ss)
+{
+    ss << "&docker=" << _srs_in_docker
+        << "&packager=" << SRS_AUTO_PACKAGER;
+}
+
 SrsLatestVersion::SrsLatestVersion()
 {
     trd_ = new SrsSTCoroutine("signal", this);
@@ -111,6 +120,7 @@ srs_error_t SrsLatestVersion::query_latest_version()
           << "&id=" << server_id_ << "&role=srs"
           << "&eip=" << srs_get_public_internet_address()
           << "&ts=" << srsu2ms(srs_get_system_time());
+    srs_build_features(ss);
     string url = ss.str();
 
     SrsHttpUri uri;
diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp
index 684a4fc32..90289f055 100644
--- a/trunk/src/core/srs_core_version3.hpp
+++ b/trunk/src/core/srs_core_version3.hpp
@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 165
+#define SRS_VERSION3_REVISION 166
 
 #endif

From d81cba4d1613e45a22db62b001f079b49d9174c1 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 13 Aug 2021 14:43:17 +0800
Subject: [PATCH 05/19] Update README

---
 README.md | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 46e837d37..bda6eaf60 100755
--- a/README.md
+++ b/README.md
@@ -14,14 +14,7 @@ SRS is a simple, high efficiency and realtime video server, supports RTMP/HLS/HT
 <a name="product"></a>
 ## Usage
 
-Recommend running SRS by [docker][docker-srs3], images is [here](https://hub.docker.com/r/ossrs/srs/tags) or [there](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/srs/images):
-
-```bash
-docker run --rm -p 1935:1935 -p 1985:1985 -p 8080:8080 ossrs/srs:3 \
-  ./objs/srs -c conf/srs.conf
-```
-
-Or build SRS from source(or [mirrors](#mirrors)), by CentOS7(or Linux([CN][v3_CN_Build],[EN][v3_EN_Build])):
+Build SRS from source, please read **Wiki: Gettting Started( [EN](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started) / [CN](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started) )**:
 
 ```
 git clone -b 3.0release https://gitee.com/ossrs/srs.git &&
@@ -29,11 +22,10 @@ cd srs/trunk && ./configure && make && ./objs/srs -c conf/srs.conf
 ```
 
 Open [http://localhost:8080/](http://localhost:8080/) to check it, then publish 
-[stream](https://github.com/ossrs/srs/blob/3.0release/trunk/doc/source.flv) by:
+by [FFmpeg](https://ffmpeg.org/download.html) or [OBS](https://obsproject.com/download) as:
 
 ```bash
-docker run --rm -it --network=host ossrs/srs:encoder \
-  ffmpeg -re -i ./doc/source.flv -c copy -f flv -y rtmp://localhost/live/livestream
+ffmpeg -re -i ./doc/source.flv -c copy -f flv -y rtmp://localhost/live/livestream
 ```
 
 Play the following streams by [players](https://ossrs.net):

From 6543aa8635620ebbf962fc1c102d94ebe2e5439e Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 13 Aug 2021 14:44:22 +0800
Subject: [PATCH 06/19] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bda6eaf60..c470aa09a 100755
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ SRS is a simple, high efficiency and realtime video server, supports RTMP/HLS/HT
 <a name="product"></a>
 ## Usage
 
-Build SRS from source, please read **Wiki: Gettting Started( [EN](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started) / [CN](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started) )**:
+Build SRS from source, please read **Wiki: Gettting Started( [EN](https://github.com/ossrs/srs/wiki/v3_EN_Home#getting-started) / [CN](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started) )**:
 
 ```
 git clone -b 3.0release https://gitee.com/ossrs/srs.git &&

From d21dadb2858a5e2a3a3c50efffbc99fc3499b016 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 13 Aug 2021 14:52:10 +0800
Subject: [PATCH 07/19] Update README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c470aa09a..aa84fe53e 100755
--- a/README.md
+++ b/README.md
@@ -39,8 +39,8 @@ Play the following streams by [players](https://ossrs.net):
 
 From here, please read wikis:
 
-* [SRS 3.0 English Wiki][v3_EN_Home], please read Wiki first.
-* [SRS 3.0 中文Wiki][v3_CN_Home]，不读Wiki一定扑街，不读文档请不要提Issue，不读文档请不要提问题，任何文档中明确说过的疑问都不会解答。
+* [Getting Started](https://github.com/ossrs/srs/wiki/v3_EN_Home#getting-started), please read Wiki first.
+* [中文文档：起步](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started)，不读Wiki一定扑街，不读文档请不要提Issue，不读文档请不要提问题，任何文档中明确说过的疑问都不会解答。
 
 Fast index for Wikis:
 

From 34117027fd1c6e08ca184b33125bd49b2579a3e1 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 13 Aug 2021 14:53:54 +0800
Subject: [PATCH 08/19] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aa84fe53e..b3aacf2e8 100755
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ From here, please read wikis:
 
 Fast index for Wikis:
 
-* Overview? ([CN][v3_EN_Home], [EN][v3_CN_Home])
+* Overview? ([CN][v3_CN_Home], [EN][v3_EN_Home])
 * How to deliver RTMP streaming?([CN][v1_CN_SampleRTMP], [EN][v1_EN_SampleRTMP])
 * How to build RTMP Edge-Cluster?([CN][v3_CN_SampleRTMPCluster], [EN][v3_EN_SampleRTMPCluster])
 * How to build RTMP Origin-Cluster?([CN][v3_CN_SampleOriginCluster], [EN][v3_EN_SampleOriginCluster])

From b8177ff2fb10c41bdcfbddae9b26c6245360a48a Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 14 Aug 2021 08:56:43 +0800
Subject: [PATCH 09/19] Release v3.0-r8, 3.0.168

---
 README.md                                |  5 ++++-
 trunk/src/app/srs_app_latest_version.cpp | 19 +++++++++----------
 trunk/src/core/srs_core_version3.hpp     |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index b3aacf2e8..7d9ec939f 100755
--- a/README.md
+++ b/README.md
@@ -129,6 +129,7 @@ Other important wiki:
 
 ## V3 changes
 
+* <strong>v3.0, 2021-08-14, [3.0 release8(3.0.168)](https://github.com/ossrs/srs/releases/tag/v3.0-r8) released. 124469 lines.</strong>
 * <strong>v3.0, 2021-07-04, [3.0 release7(3.0.164)](https://github.com/ossrs/srs/releases/tag/v3.0-r7) released. 123463 lines.</strong>
 * v3.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 3.0.164
 * <strong>v3.0, 2021-06-26, [3.0 release6(3.0.163)](https://github.com/ossrs/srs/releases/tag/v3.0-r6) released. 123011 lines.</strong>
@@ -336,7 +337,8 @@ Other important wiki:
 
 ## V2 changes
 
-* <strong>v2.0, 2021-07-04, [2.0 release9(2.0.274)](https://github.com/ossrs/srs/releases/tag/v2.0-r10) released. 87575 lines.</strong>
+* <strong>v2.0, 2021-08-14, [2.0 release11(2.0.276)](https://github.com/ossrs/srs/releases/tag/v2.0-r11) released. 89013 lines.</strong>
+* <strong>v2.0, 2021-07-04, [2.0 release10(2.0.274)](https://github.com/ossrs/srs/releases/tag/v2.0-r10) released. 87575 lines.</strong>
 * v2.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 2.0.274
 * <strong>v2.0, 2021-06-26, [2.0 release9(2.0.273)](https://github.com/ossrs/srs/releases/tag/v2.0-r9) released. 87552 lines.</strong>
 * v2.0, 2021-06-25, For [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 2.0.273
@@ -778,6 +780,7 @@ Other important wiki:
 
 ## Releases
 
+* 2021-08-14, [Release v3.0-r8](https://github.com/ossrs/srs/releases/tag/v3.0-r8), 3.0 release8, 3.0.168, 124469 lines.
 * 2021-07-04, [Release v3.0-r7](https://github.com/ossrs/srs/releases/tag/v3.0-r7), 3.0 release7, 3.0.167, 123463 lines.
 * 2021-06-26, [Release v3.0-r6](https://github.com/ossrs/srs/releases/tag/v3.0-r6), 3.0 release6, 3.0.163, 123011 lines.
 * 2021-04-28, [Release v3.0-r5][r3.0r5], 3.0 release5, 3.0.161, 122750 lines.
diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp
index fce658795..d67f40af4 100644
--- a/trunk/src/app/srs_app_latest_version.cpp
+++ b/trunk/src/app/srs_app_latest_version.cpp
@@ -82,21 +82,18 @@ srs_error_t SrsLatestVersion::cycle()
 {
     srs_error_t err = srs_success;
 
-    srs_utime_t starttime = srs_update_system_time();
-    if ((err = query_latest_version()) != srs_success) {
-        srs_warn("query err %s", srs_error_desc(err).c_str());
-        srs_freep(err); // Ignore any error.
-    }
-
     srs_utime_t first_random_wait = 0;
     srs_random_generate((char*)&first_random_wait, 8);
-    first_random_wait = srs_utime_t(uint64_t((first_random_wait + starttime + getpid())) % (60 * 60)) * SRS_UTIME_SECONDS; // in s.
+    first_random_wait = srs_utime_t(uint64_t((first_random_wait + srs_update_system_time() + getpid())) % (5 * 60)) * SRS_UTIME_SECONDS; // in s.
 
-    srs_trace("Startup query id=%s, eip=%s, match=%s, stable=%s, wait=%ds, cost=%dms", server_id_.c_str(), srs_get_public_internet_address().c_str(), match_version_.c_str(), stable_version_.c_str(), srsu2msi(first_random_wait)/1000, srsu2msi(srs_update_system_time() - starttime));
+    // Only report after 5+ minutes.
+    first_random_wait += 5 * 60 * SRS_UTIME_SECONDS;
+
+    srs_trace("Startup query id=%s, eip=%s, wait=%ds", server_id_.c_str(), srs_get_public_internet_address().c_str(), srsu2msi(first_random_wait)/1000);
     srs_usleep(first_random_wait);
 
     while (true) {
-        starttime = srs_update_system_time();
+        srs_utime_t starttime = srs_update_system_time();
         if ((err = query_latest_version()) != srs_success) {
             srs_warn("query err %s", srs_error_desc(err).c_str());
             srs_freep(err); // Ignore any error.
@@ -119,8 +116,10 @@ srs_error_t SrsLatestVersion::query_latest_version()
           << "version=v" << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION
           << "&id=" << server_id_ << "&role=srs"
           << "&eip=" << srs_get_public_internet_address()
-          << "&ts=" << srsu2ms(srs_get_system_time());
+          << "&ts=" << srs_get_system_time()
+          << "&alive=" << srsu2ms(srs_get_system_time() - srs_get_system_startup_time()) / 1000;
     srs_build_features(ss);
+
     string url = ss.str();
 
     SrsHttpUri uri;
diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp
index 90289f055..838281207 100644
--- a/trunk/src/core/srs_core_version3.hpp
+++ b/trunk/src/core/srs_core_version3.hpp
@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 166
+#define SRS_VERSION3_REVISION 168
 
 #endif

From c2b133bd07cbb70302d9b130d40be64b4cb5c175 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 14 Aug 2021 20:46:52 +0800
Subject: [PATCH 10/19] Support Github Actions

---
 .github/workflows/release.yml | 75 +++++++++++++++++++++++++++++++++++
 trunk/Dockerfile              | 36 +++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 .github/workflows/release.yml
 create mode 100644 trunk/Dockerfile

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..00418403a
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,75 @@
+name: "Release"
+
+on:
+  push:
+    tags:
+      - v3*
+
+jobs:
+  k8s:
+    name: release-k8s
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # The github.ref is, for example, refs/tags/v3.0.145 or refs/tags/v3.0-r8
+      # Generate variables like:
+      #   SRS_TAG=v3.0.145
+      #   SRS_TAG=v3.0-r8
+      #   SRS_MAJOR=3
+      # @see https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
+      - name: Generate varaiables
+        shell: bash
+        run: |
+          SRS_TAG=$(echo ${{ github.ref }}| awk -F '/' '{print $3}')
+          echo "SRS_TAG=$SRS_TAG" >> $GITHUB_ENV
+          SRS_MAJOR=$(echo $SRS_TAG| cut -c 2)
+          echo "SRS_MAJOR=$SRS_MAJOR" >> $GITHUB_ENV
+
+      - name: Build SRS
+        shell: bash
+        run: |
+          echo "Release ossrs/srs:$SRS_TAG"
+          docker build --tag ossrs/srs:$SRS_TAG trunk
+
+      - name: Login docker hub
+        uses: docker/login-action@v1
+        with:
+          username: "${{ secrets.DOCKER_USERNAME }}"
+          password: "${{ secrets.DOCKER_PASSWORD }}"
+      - name: Push to docker hub
+        shell: bash
+        run: |
+          docker push ossrs/srs:$SRS_TAG
+          docker tag ossrs/srs:$SRS_TAG ossrs/srs:$SRS_MAJOR
+          docker push ossrs/srs:$SRS_MAJOR
+
+      - name: Login Aliyun docker hub
+        uses: aliyun/acr-login@v1
+        with:
+          login-server: https://registry.cn-hangzhou.aliyuncs.com
+          username: "${{ secrets.ACR_USERNAME }}"
+          password: "${{ secrets.ACR_PASSWORD }}"
+      - name: Push to Aliyun docker hub
+        shell: bash
+        run: |
+          docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
+          docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
+          docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_MAJOR
+          docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_MAJOR
+
+      - name: Setup KUBCONFIG for Aliyun ACK
+        shell: bash
+        run: |-
+          KUBECONFIG=$RUNNER_TEMP/kubeconfig_$(date +%s)
+          echo "${{ secrets.KUBCONFIG }}" > $KUBECONFIG
+          echo "KUBECONFIG=$KUBECONFIG" >> $GITHUB_ENV
+
+      - name: Release SRS 3.0 to Aliyun ACK
+        shell: bash
+        if: ${{ startsWith(github.ref, 'refs/tags/v3') }}
+        run: |-
+          kubectl set image deploy/srs3-deploy srs=registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
+          kubectl describe deploy/srs3-deploy
\ No newline at end of file
diff --git a/trunk/Dockerfile b/trunk/Dockerfile
new file mode 100644
index 000000000..a48b22e79
--- /dev/null
+++ b/trunk/Dockerfile
@@ -0,0 +1,36 @@
+FROM ossrs/srs:dev AS build
+
+# Install depends tools.
+RUN yum install -y gcc make gcc-c++ patch unzip perl git
+
+# Build and install SRS.
+COPY . /trunk
+WORKDIR /trunk
+RUN ./configure --jobs=2 && make -j2 && make install
+
+# All config files for SRS.
+RUN cp -R conf /usr/local/srs/conf
+# The default index.html and srs-console.
+RUN cp research/api-server/static-dir/index.html /usr/local/srs/objs/nginx/html/
+RUN cp research/api-server/static-dir/favicon.ico /usr/local/srs/objs/nginx/html/
+RUN cp research/players/crossdomain.xml /usr/local/srs/objs/nginx/html/
+RUN cp -R research/console /usr/local/srs/objs/nginx/html/
+RUN cp -R research/players /usr/local/srs/objs/nginx/html/
+#RUN cp -R 3rdparty/signaling/www/demos /usr/local/srs/objs/nginx/html/
+
+############################################################
+# dist
+############################################################
+FROM centos:7 AS dist
+
+# Expose ports for streaming @see https://github.com/ossrs/srs#ports
+EXPOSE 1935 1985 8080 8000/udp 10080/udp
+
+# FFMPEG 4.1
+COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg
+# SRS binary, config files and srs-console.
+COPY --from=build /usr/local/srs /usr/local/srs
+
+# Default workdir and command.
+WORKDIR /usr/local/srs
+CMD ["./objs/srs", "-c", "conf/srs.conf"]

From b02c81425118015f11f005ce0976ef5f17d625d6 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 14 Aug 2021 21:09:44 +0800
Subject: [PATCH 11/19] Expose live streaming ports for SRS 3.0

---
 trunk/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/trunk/Dockerfile b/trunk/Dockerfile
index a48b22e79..34b6b0589 100644
--- a/trunk/Dockerfile
+++ b/trunk/Dockerfile
@@ -23,8 +23,8 @@ RUN cp -R research/players /usr/local/srs/objs/nginx/html/
 ############################################################
 FROM centos:7 AS dist
 
-# Expose ports for streaming @see https://github.com/ossrs/srs#ports
-EXPOSE 1935 1985 8080 8000/udp 10080/udp
+# Expose ports for live streaming
+EXPOSE 1935 1985 8080
 
 # FFMPEG 4.1
 COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg

From 8d44b982ee15c541318b4193c10a758782afddbd Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 15 Aug 2021 12:05:15 +0800
Subject: [PATCH 12/19] Actions: Add CI for utest and coverage

---
 .github/workflows/release.yml |  2 +-
 .github/workflows/test.yml    | 40 +++++++++++++++++++++++++++++++++++
 README.md                     |  2 +-
 trunk/Dockerfile              |  4 ++--
 trunk/Dockerfile.cov          |  9 ++++++++
 trunk/Dockerfile.test         |  9 ++++++++
 trunk/auto/coverage.sh        | 38 +++++++++++++++------------------
 7 files changed, 79 insertions(+), 25 deletions(-)
 create mode 100644 .github/workflows/test.yml
 create mode 100644 trunk/Dockerfile.cov
 create mode 100644 trunk/Dockerfile.test

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 00418403a..e3be44e94 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   k8s:
-    name: release-k8s
+    name: actions-release-k8s
     runs-on: ubuntu-20.04
 
     steps:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..a0b439693
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,40 @@
+name: "Test"
+
+on: [push, pull_request]
+
+jobs:
+  utest:
+    name: actions-test-utest
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      ################################################################
+      # Tests
+      - name: Build test image
+        run: docker build --tag srs:test -f trunk/Dockerfile.test trunk
+      # For utest
+      - name: Run SRS utest
+        run: docker run --rm srs:test bash -c 'make && ./objs/srs_utest'
+  coverage:
+    name: actions-test-coverage
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      ################################################################
+      # Tests
+      - name: Build coverage image
+        run: docker build --tag srs:cov -f trunk/Dockerfile.cov .
+      # For coverage
+      - name: Run SRS covergae
+        if: ${{ startsWith(github.ref, 'refs/heads/') }}
+        run: |
+          SRS_BRANCH=$(echo ${{ github.ref }}| awk -F '/' '{print $3}') && SRS_SHA=${{ github.sha }} && SRS_PROJECT=/srs
+          echo "For ref=${{ github.ref }}, sha=${{ github.sha }}, SRS_BRANCH=$SRS_BRANCH, SRS_SHA=$SRS_SHA, SRS_PROJECT=$SRS_PROJECT"
+          docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
+            srs:cov bash -c 'make && ./objs/srs_utest && bash auto/coverage.sh'
\ No newline at end of file
diff --git a/README.md b/README.md
index 7d9ec939f..8aac68cb7 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # SRS(Simple Realtime Server)
 
 ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/srs3)
-[![](https://circleci.com/gh/ossrs/srs/tree/3.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/3.0release)
+[![](https://github.com/ossrs/srs/actions/workflows/test.yml/badge.svg?branch=3.0release)](https://github.com/ossrs/srs/actions?query=workflow%3ATest+branch%3A3.0release)
 [![](https://codecov.io/gh/ossrs/srs/branch/3.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/3.0release)
 [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
 
diff --git a/trunk/Dockerfile b/trunk/Dockerfile
index 34b6b0589..7fcb72aab 100644
--- a/trunk/Dockerfile
+++ b/trunk/Dockerfile
@@ -4,8 +4,8 @@ FROM ossrs/srs:dev AS build
 RUN yum install -y gcc make gcc-c++ patch unzip perl git
 
 # Build and install SRS.
-COPY . /trunk
-WORKDIR /trunk
+COPY . /srs/trunk
+WORKDIR /srs/trunk
 RUN ./configure --jobs=2 && make -j2 && make install
 
 # All config files for SRS.
diff --git a/trunk/Dockerfile.cov b/trunk/Dockerfile.cov
new file mode 100644
index 000000000..a898cb969
--- /dev/null
+++ b/trunk/Dockerfile.cov
@@ -0,0 +1,9 @@
+FROM ossrs/srs:dev
+
+# Install depends tools.
+RUN yum install -y gcc make gcc-c++ patch unzip perl git
+
+# Build and install SRS.
+COPY . /srs
+WORKDIR /srs/trunk
+RUN ./configure --with-utest --gcov --jobs=2 && make -j2
diff --git a/trunk/Dockerfile.test b/trunk/Dockerfile.test
new file mode 100644
index 000000000..ca41c2072
--- /dev/null
+++ b/trunk/Dockerfile.test
@@ -0,0 +1,9 @@
+FROM ossrs/srs:dev
+
+# Install depends tools.
+RUN yum install -y gcc make gcc-c++ patch unzip perl git
+
+# Build and install SRS.
+COPY . /srs/trunk
+WORKDIR /srs/trunk
+RUN ./configure --with-utest --jobs=2 && make -j2
diff --git a/trunk/auto/coverage.sh b/trunk/auto/coverage.sh
index 55cb7ce46..0e7443f28 100644
--- a/trunk/auto/coverage.sh
+++ b/trunk/auto/coverage.sh
@@ -1,36 +1,31 @@
 #!/bin/bash
 
 # In .circleci/config.yml, generate *.gcno with
-#       ./configure --gcov --without-research --without-librtmp && make
+#       ./configure --gcov --with-utest --without-research --without-librtmp && make
 # and generate *.gcda by
 #       ./objs/srs_utest
 
 # Workdir is objs/cover.
 workdir=`pwd`/objs/cover
 
-# Tool git is required to map the right path.
-git --version >/dev/null 2>&1
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Tool git is required, ret=$ret"; exit $ret; fi
-
 # Create trunk under workdir.
 mkdir -p $workdir && cd $workdir
 ret=$?; if [[ $ret -ne 0 ]]; then echo "Enter workdir failed, ret=$ret"; exit $ret; fi
 
-# Collect all *.gcno and *.gcda to objs/cover.
-cd $workdir && (rm -rf src && cp -R ../../src . && cp -R ../src/* src/)
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect *.gcno and *.gcda failed, ret=$ret"; exit $ret; fi
-
-# Generate *.gcov for coverage.
-cd $workdir &&
-for file in `find src -name "*.cpp"|grep -v utest`; do
-    gcov $file -o `dirname $file`
-    ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect $file failed, ret=$ret"; exit $ret; fi
-done
-
-# Cook the gcov files.
-cd $workdir &&
-find . -name "*.gcov"|grep -v srs|xargs rm -f
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Cook gcov files failed, ret=$ret"; exit $ret; fi
+CODECOV_ARGS=""
+if [[ $SRS_BRANCH != '' ]]; then
+  # -B branch    Specify the branch name
+  CODECOV_ARGS="$CODECOV_ARGS -B $SRS_BRANCH"
+fi
+if [[ $SRS_SHA != '' ]]; then
+  # -C sha       Specify the commit sha
+  CODECOV_ARGS="$CODECOV_ARGS -C $SRS_SHA"
+fi
+if [[ $SRS_PROJECT != '' ]]; then
+  # -R root dir  Used when not in git/hg project to identify project root directory
+  # -p dir       Project root directory. Also used when preparing gcov
+  CODECOV_ARGS="$CODECOV_ARGS -R $SRS_PROJECT -p $SRS_PROJECT"
+fi
 
 # Upload report with *.gcov
 # Remark: The file codecov.yml is not neccessary. It literally depends on git.
@@ -41,5 +36,6 @@ ret=$?; if [[ $ret -ne 0 ]]; then echo "Cook gcov files failed, ret=$ret"; exit
 #       https://circleci.com/gh/ossrs/srs/tree/3.0release
 cd $workdir &&
 export CODECOV_TOKEN="493bba46-c468-4e73-8b45-8cdd8ff62d96" &&
-bash <(curl -s https://codecov.io/bash) &&
+bash <(curl -s https://codecov.io/bash) $CODECOV_ARGS &&
 echo "Done" && exit 0
+

From 1d79ef87a516475b241d5c5a96c1b5b7fef12da1 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 15 Aug 2021 17:41:15 +0800
Subject: [PATCH 13/19] Acitons: Support pullrequest CI

---
 .github/workflows/test.yml | 15 +++++++++++----
 trunk/auto/coverage.sh     | 12 ++++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a0b439693..19f8b7914 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,9 +32,16 @@ jobs:
         run: docker build --tag srs:cov -f trunk/Dockerfile.cov .
       # For coverage
       - name: Run SRS covergae
-        if: ${{ startsWith(github.ref, 'refs/heads/') }}
+        if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/remotes/') }}
         run: |
-          SRS_BRANCH=$(echo ${{ github.ref }}| awk -F '/' '{print $3}') && SRS_SHA=${{ github.sha }} && SRS_PROJECT=/srs
-          echo "For ref=${{ github.ref }}, sha=${{ github.sha }}, SRS_BRANCH=$SRS_BRANCH, SRS_SHA=$SRS_SHA, SRS_PROJECT=$SRS_PROJECT"
-          docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
+          # The hash of commit.
+          SRS_SHA=${{ github.sha }}
+          # Note that the root of SRS, must contains .git, for report fixing.
+          SRS_PROJECT=/srs
+          # The github.ref is, for example, refs/heads/3.0release
+          SRS_BRANCH=$(echo ${{ github.ref }}| awk -F 'refs/heads/' '{print $2}'| awk -F '/' '{print $1}')
+          # The github.ref is, for example, refs/remotes/pull/2536/merge
+          SRS_PR=$(echo ${{ github.ref }}| awk -F 'refs/remotes/pull/' '{print $2}'| awk -F '/' '{print $1}')
+          echo "For ref=${{ github.ref }}, sha=${{ github.sha }}, SRS_BRANCH=$SRS_BRANCH, SRS_PR=$SRS_PR, SRS_SHA=$SRS_SHA, SRS_PROJECT=$SRS_PROJECT"
+          docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
             srs:cov bash -c 'make && ./objs/srs_utest && bash auto/coverage.sh'
\ No newline at end of file
diff --git a/trunk/auto/coverage.sh b/trunk/auto/coverage.sh
index 0e7443f28..25f7041d5 100644
--- a/trunk/auto/coverage.sh
+++ b/trunk/auto/coverage.sh
@@ -13,6 +13,11 @@ mkdir -p $workdir && cd $workdir
 ret=$?; if [[ $ret -ne 0 ]]; then echo "Enter workdir failed, ret=$ret"; exit $ret; fi
 
 CODECOV_ARGS=""
+if [[ $SRS_PROJECT != '' ]]; then
+  # -R root dir  Used when not in git/hg project to identify project root directory
+  # -p dir       Project root directory. Also used when preparing gcov
+  CODECOV_ARGS="$CODECOV_ARGS -R $SRS_PROJECT -p $SRS_PROJECT"
+fi
 if [[ $SRS_BRANCH != '' ]]; then
   # -B branch    Specify the branch name
   CODECOV_ARGS="$CODECOV_ARGS -B $SRS_BRANCH"
@@ -21,10 +26,9 @@ if [[ $SRS_SHA != '' ]]; then
   # -C sha       Specify the commit sha
   CODECOV_ARGS="$CODECOV_ARGS -C $SRS_SHA"
 fi
-if [[ $SRS_PROJECT != '' ]]; then
-  # -R root dir  Used when not in git/hg project to identify project root directory
-  # -p dir       Project root directory. Also used when preparing gcov
-  CODECOV_ARGS="$CODECOV_ARGS -R $SRS_PROJECT -p $SRS_PROJECT"
+if [[ $SRS_PR != '' ]]; then
+  # -P pr        Specify the pull request number
+  CODECOV_ARGS="$CODECOV_ARGS -P $SRS_PR"
 fi
 
 # Upload report with *.gcov

From b3516b88dca225301762ea68f9c31fbd5d4593c5 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 15 Aug 2021 17:45:43 +0800
Subject: [PATCH 14/19] Acitons: Support pullrequest CI

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 19f8b7914..da05795f2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,7 +32,6 @@ jobs:
         run: docker build --tag srs:cov -f trunk/Dockerfile.cov .
       # For coverage
       - name: Run SRS covergae
-        if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/remotes/') }}
         run: |
           # The hash of commit.
           SRS_SHA=${{ github.sha }}

From 2431e0b14034673ea430f2e96b165620647f7981 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 15 Aug 2021 17:49:03 +0800
Subject: [PATCH 15/19] Acitons: Support pullrequest CI

---
 .github/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index da05795f2..3dd2f54be 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,6 +32,7 @@ jobs:
         run: docker build --tag srs:cov -f trunk/Dockerfile.cov .
       # For coverage
       - name: Run SRS covergae
+        if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/pull/') }}
         run: |
           # The hash of commit.
           SRS_SHA=${{ github.sha }}
@@ -39,8 +40,8 @@ jobs:
           SRS_PROJECT=/srs
           # The github.ref is, for example, refs/heads/3.0release
           SRS_BRANCH=$(echo ${{ github.ref }}| awk -F 'refs/heads/' '{print $2}'| awk -F '/' '{print $1}')
-          # The github.ref is, for example, refs/remotes/pull/2536/merge
-          SRS_PR=$(echo ${{ github.ref }}| awk -F 'refs/remotes/pull/' '{print $2}'| awk -F '/' '{print $1}')
+          # The github.ref is, for example, refs/pull/2536/merge
+          SRS_PR=$(echo ${{ github.ref }}| awk -F 'refs/pull/' '{print $2}'| awk -F '/' '{print $1}')
           echo "For ref=${{ github.ref }}, sha=${{ github.sha }}, SRS_BRANCH=$SRS_BRANCH, SRS_PR=$SRS_PR, SRS_SHA=$SRS_SHA, SRS_PROJECT=$SRS_PROJECT"
           docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
             srs:cov bash -c 'make && ./objs/srs_utest && bash auto/coverage.sh'
\ No newline at end of file

From 9eadebdde7f99aadf79c22b1b97bb938c8999992 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 15 Aug 2021 21:33:08 +0800
Subject: [PATCH 16/19] Fix version query bug.

---
 trunk/src/app/srs_app_latest_version.cpp | 2 ++
 trunk/src/core/srs_core_version3.hpp     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp
index d67f40af4..66ac01561 100644
--- a/trunk/src/app/srs_app_latest_version.cpp
+++ b/trunk/src/app/srs_app_latest_version.cpp
@@ -44,6 +44,8 @@ extern bool _srs_in_docker;
 
 void srs_build_features(stringstream& ss)
 {
+    ss << "&os=linux";
+
     ss << "&docker=" << _srs_in_docker
         << "&packager=" << SRS_AUTO_PACKAGER;
 }
diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp
index 838281207..688c75843 100644
--- a/trunk/src/core/srs_core_version3.hpp
+++ b/trunk/src/core/srs_core_version3.hpp
@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 168
+#define SRS_VERSION3_REVISION 169
 
 #endif

From 21be9daba4797800231204711a10537f1672d6cc Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 15 Aug 2021 21:49:24 +0800
Subject: [PATCH 17/19] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8aac68cb7..3fd14ca29 100755
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/srs3)
 [![](https://github.com/ossrs/srs/actions/workflows/test.yml/badge.svg?branch=3.0release)](https://github.com/ossrs/srs/actions?query=workflow%3ATest+branch%3A3.0release)
+[![](https://github.com/ossrs/srs/actions/workflows/release.yml/badge.svg)](https://github.com/ossrs/srs/actions?query=workflow%3ARelease)
 [![](https://codecov.io/gh/ossrs/srs/branch/3.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/3.0release)
 [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
 

From b4220ee7c110c61da91a9bdf325befa1c0a57d72 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 5 Sep 2021 15:03:03 +0800
Subject: [PATCH 18/19] Refine Dockerfile

---
 .github/workflows/release.yml | 2 +-
 .github/workflows/test.yml    | 2 +-
 trunk/Dockerfile              | 2 +-
 trunk/Dockerfile.test         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e3be44e94..574217ba5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
         shell: bash
         run: |
           echo "Release ossrs/srs:$SRS_TAG"
-          docker build --tag ossrs/srs:$SRS_TAG trunk
+          docker build --tag ossrs/srs:$SRS_TAG -f trunk/Dockerfile .
 
       - name: Login docker hub
         uses: docker/login-action@v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3dd2f54be..291ee14f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       ################################################################
       # Tests
       - name: Build test image
-        run: docker build --tag srs:test -f trunk/Dockerfile.test trunk
+        run: docker build --tag srs:test -f trunk/Dockerfile.test .
       # For utest
       - name: Run SRS utest
         run: docker run --rm srs:test bash -c 'make && ./objs/srs_utest'
diff --git a/trunk/Dockerfile b/trunk/Dockerfile
index 7fcb72aab..7a3e32d34 100644
--- a/trunk/Dockerfile
+++ b/trunk/Dockerfile
@@ -4,7 +4,7 @@ FROM ossrs/srs:dev AS build
 RUN yum install -y gcc make gcc-c++ patch unzip perl git
 
 # Build and install SRS.
-COPY . /srs/trunk
+COPY . /srs
 WORKDIR /srs/trunk
 RUN ./configure --jobs=2 && make -j2 && make install
 
diff --git a/trunk/Dockerfile.test b/trunk/Dockerfile.test
index ca41c2072..de1eb633e 100644
--- a/trunk/Dockerfile.test
+++ b/trunk/Dockerfile.test
@@ -4,6 +4,6 @@ FROM ossrs/srs:dev
 RUN yum install -y gcc make gcc-c++ patch unzip perl git
 
 # Build and install SRS.
-COPY . /srs/trunk
+COPY . /srs
 WORKDIR /srs/trunk
 RUN ./configure --with-utest --jobs=2 && make -j2

From e801174ab21b306462cb760abc47e514e8568195 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 28 Jun 2020 16:58:14 +0800
Subject: [PATCH 19/19] Fix #2606: Memory leak for RTMP client, pick from 4.0.
 v3.0.170

---
 README.md                                   | 1 +
 trunk/src/core/srs_core_version3.hpp        | 2 +-
 trunk/src/service/srs_service_rtmp_conn.cpp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3fd14ca29..39d262cf4 100755
--- a/README.md
+++ b/README.md
@@ -130,6 +130,7 @@ Other important wiki:
 
 ## V3 changes
 
+* v3.0, 2021-10-08, Fix [#2606](https://github.com/ossrs/srs/issues/2606): Memory leak for RTMP client, pick from 4.0. v3.0.170
 * <strong>v3.0, 2021-08-14, [3.0 release8(3.0.168)](https://github.com/ossrs/srs/releases/tag/v3.0-r8) released. 124469 lines.</strong>
 * <strong>v3.0, 2021-07-04, [3.0 release7(3.0.164)](https://github.com/ossrs/srs/releases/tag/v3.0-r7) released. 123463 lines.</strong>
 * v3.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 3.0.164
diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp
index 688c75843..d4156cec3 100644
--- a/trunk/src/core/srs_core_version3.hpp
+++ b/trunk/src/core/srs_core_version3.hpp
@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 169
+#define SRS_VERSION3_REVISION 170
 
 #endif
diff --git a/trunk/src/service/srs_service_rtmp_conn.cpp b/trunk/src/service/srs_service_rtmp_conn.cpp
index 2a7c7c8bb..2f856d824 100644
--- a/trunk/src/service/srs_service_rtmp_conn.cpp
+++ b/trunk/src/service/srs_service_rtmp_conn.cpp
@@ -57,6 +57,7 @@ SrsBasicRtmpClient::~SrsBasicRtmpClient()
     close();
     srs_freep(kbps);
     srs_freep(clk);
+    srs_freep(req);
 }
 
 srs_error_t SrsBasicRtmpClient::connect()