Maintenance: merge master 1.2.2

CMakeLists.txt

@@ -54,6 +54,7 @@ option(ENABLE_LOGGING "Should logging be enabled" ${ENABLE_LOGGING_DEFAULT})
 option(ENABLE_SHARED "Should libsrt be built as a shared library" ON)
 option(ENABLE_SEPARATE_HAICRYPT "Should haicrypt be built as a separate library file" OFF)
 option(ENABLE_SUFLIP "Shuld suflip tool be built" OFF)
+option(USE_GNUTLS "Should use gnutls instead of openssl" OFF)
 option(ENABLE_C_DEPS "Extra library dependencies in srt.pc for C language" OFF)
 option(USE_STATIC_LIBSTDCXX "Should use static rather than shared libstdc++" OFF)
 
@@ -138,6 +139,7 @@ if ( USE_GNUTLS )
 	)
 	message(STATUS "SSL Dependency: using GNUTLS with Nettle, as requested")
 else()
+	set (SSL_REQUIRED_MODULES "openssl libcrypto zlib")
 	find_package(OpenSSL REQUIRED)
 	set (SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
 	set (SSL_LIBRARIES ${OPENSSL_LIBRARIES})
@@ -441,7 +443,7 @@ if (ENABLE_SHARED)
 endif()
 
 if ( WIN32 AND (NOT MINGW AND NOT CYGWIN) )
-   	target_link_libraries(${TARGET_srt} PUBLIC Ws2_32.lib)
+    target_link_libraries(${TARGET_srt} PUBLIC Ws2_32.lib)
 endif()
 
 install(TARGETS ${TARGET_srt}
@@ -520,7 +522,8 @@ if ( ENABLE_CXX11 )
 	# XXX This fix was never necessary, srt_compat.c is
 	# included in the SRT library. This was motivated by some error report
 	# from some CI system, so leaving the commented-out parts for historical reasons.
-
+	# Please remove it completely once 1.3.0 version is released.
+
 	# Enforce interpreting this file as C++ so that C++ compiler is used to compile it.
 	# This should result in exactly the same as when it was compiled as C, with the
 	# exception that the compiler with accept any C++-only COMPILE_FLAGS (e.g. -std=c++11).
@@ -536,7 +539,7 @@ if ( ENABLE_CXX11 )
 		${SOURCES_transmit}
 	)
 
-# srt-file-transmit must be temporarily blocked on Windows because it's not yet portable
+	# srt-file-transmit must be temporarily blocked on Windows because it's not yet portable
 	if (NOT WIN32)
 	add_executable(srt-file-transmit
 		${CMAKE_CURRENT_SOURCE_DIR}/apps/srt-file-transmit.cpp

configure-data.tcl

@@ -280,6 +280,10 @@ proc postprocess {} {
 		set have_gnutls 0
 	}
 
+	if { $have_gnutls } {
+		lappend ::cmakeopt "-DUSE_GNUTLS=ON"
+	}
+
 	set have_pthread 0
 	if { [lsearch -glob $::optkeys --with-pthread*] != -1 } {
 		set have_pthread 1
@@ -366,6 +370,7 @@ proc postprocess {} {
 	if { $::HAVE_DARWIN } {
 
 		if { $have_gnutls } {
+			# Use gnutls explicitly, as found in brew
 			set er [catch {exec brew info gnutls} res]
 			if { $er } {
 				error "Cannot find gnutls in brew"

scripts/srt.pc.in

@@ -9,4 +9,4 @@ Version: @SRT_VERSION@
 Libs: -L${libdir} -l@TARGET_srt@ @IFNEEDED_LINK_HAICRYPT@ @IFNEEDED_SRTBASE@ @IFNEEDED_SRT_LDFLAGS@
 Libs.private: @SRT_LIBS_PRIVATE@
 Cflags: -I${includedir}
-
+Requires.private: @SSL_REQUIRED_MODULES@

srtcore/channel.cpp

@@ -76,6 +76,7 @@ modified by
 #else
    #include <winsock2.h>
    #include <ws2tcpip.h>
+   #include <mswsock.h>
 #endif
 
 #include <iostream>

srtcore/core.cpp

@@ -1066,6 +1066,7 @@ void CUDT::clearData()
    m_llSentTotal = m_llRecvTotal = m_iSndLossTotal = m_iRcvLossTotal = m_iRetransTotal = m_iSentACKTotal = m_iRecvACKTotal = m_iSentNAKTotal = m_iRecvNAKTotal = 0;
    m_LastSampleTime = CTimer::getTime();
    m_llTraceSent = m_llTraceRecv = m_iTraceSndLoss = m_iTraceRcvLoss = m_iTraceRetrans = m_iSentACK = m_iRecvACK = m_iSentNAK = m_iRecvNAK = 0;
+   m_iTraceRcvRetrans = 0;
    m_iTraceReorderDistance = 0;
    m_fTraceBelatedTime = 0.0;
    m_iTraceRcvBelated = 0;