Dev

.github/workflows/abi.yml

@@ -2,60 +2,94 @@ name: ABI checks
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
 
 env:
   SRT_BASE: v1.5.0
 
 jobs:
-  build:
-    name: ABI checks
+  build_pr:
+    name: Build current version
     runs-on: ubuntu-20.04
 
+    outputs:
+       SRT_BASE: ${{ steps.commands.outputs.SRT_BASE }}
     steps:
     - uses: actions/checkout@v3
       with:
-        path: pull_request
+        path: gitview_pr
     - name: configure
       run: |
-        cd pull_request
+        cd gitview_pr
         mkdir _build && cd _build
         cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNITTESTS=ON ../
     - name: build
       run: |
         sudo apt install -y abi-dumper
-        cd pull_request/_build && cmake --build ./
+        sudo apt install -y tcl
+        cd gitview_pr/_build && cmake --build ./
         make install DESTDIR=./installdir
-        SRT_TAG_VERSION=$(cat version.h |grep SRT_VERSION_MINOR |head -n1 |awk {'print $3'})
-        abi-dumper libsrt.so -o libsrt-pr.dump -public-headers installdir/usr/local/include/srt/ -lver 0
-        SRT_BASE="v1.$SRT_TAG_VERSION.0"
-        echo "SRT_BASE=$SRT_BASE" >> "$GITHUB_ENV"
+        SRT_TAG_VERSION=v$(../scripts/get-build-version.tcl full)
+        SRT_TAG=${SRT_TAG_VERSION}dev-$(git rev-parse --short HEAD)
+        abi-dumper libsrt.so -o libsrt-pr.dump -public-headers installdir/usr/local/include/srt/ -lver $SRT_TAG
+        SRT_BASE=v$(../scripts/get-build-version.tcl base)
+        if [[ $SRT_TAG_VERSION == $SRT_BASE ]]; then
+            echo "NOT CHECKING ABI: base version is being built: $SRT_TAG"
+            echo "SRT_BASE=''" >> "$GITHUB_OUTPUT"
+            exit 0
+        fi
+        echo "SRT_BASE=$SRT_BASE" >> "$GITHUB_OUTPUT"
+
+  build_base:
+    name: Build base version
+    runs-on: ubuntu-20.04
+    needs: build_pr
+    if: ${{ needs.build_pr.outputs.SRT_BASE != '' }}
+
+    env:
+       SRT_BASE: ${{ needs.build_pr.outputs.SRT_BASE }}
+    steps:
     - uses: actions/checkout@v3
       with:
-        path: tag
+        path: gitview_base
         ref: ${{ env.SRT_BASE }}
     - name: configure_tag
       run: |
         echo $SRT_TAG_VERSION
-        cd tag
+        cd gitview_base
         mkdir _build && cd _build
         cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNITTESTS=ON ../
     - name: build_tag
       run: |
-        cd tag      
+        cd gitview_base      
         cd _build && cmake --build ./
         make install DESTDIR=./installdir
-        abi-dumper libsrt.so -o libsrt-tag.dump -public-headers installdir/usr/local/include/srt/ -lver 1
+        abi-dumper libsrt.so -o libsrt-base.dump -public-headers installdir/usr/local/include/srt/ -lver $SRT_BASE
+
+  check_abi:
+    name: Compare ABI
+    runs-on: ubuntu-20.04
+    needs: [build_pr, build_base]
+    env:
+       SRT_BASE: ${{ needs.build_pr.outputs.SRT_BASE }}
+
+    steps:
     - name: abi-check
       run: |
-         git clone https://github.com/lvc/abi-compliance-checker.git
-         cd abi-compliance-checker && sudo make install && cd ../
-         abi-compliance-checker -l libsrt -old tag/_build/libsrt-tag.dump -new pull_request/_build/libsrt-pr.dump
-         RES=$?
-         if (( $RES != 0 ))
-          then
-            echo "ABI/API Compatibility check failed with value $?"
-            exit $RES
-          fi
+        #git clone https://github.com/lvc/abi-compliance-checker.git
+        cd gitview_pr/submodules
+        git submodule update --init abi-compliance-checker
+        cd abi-compliance-checker && sudo make install && cd ../
+        cd ../..
+        abi-compliance-checker -l libsrt -old gitview_base/_build/libsrt-base.dump -new gitview_pr/_build/libsrt-pr.dump
+        RES=$?
+        if (( $RES != 0 )); then
+           echo "ABI/API Compatibility check failed with value $?"
+           exit $RES
+        fi
+    - name: Download report
+      uses: actions/download-artifact@v4
+      with:
+        path: compat_reports

.github/workflows/android.yaml

@@ -2,9 +2,9 @@ name: Android
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
 
 jobs:
   build:

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "experimental/socket-groups" ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "dev" ]
 
 jobs:
   analyze:

.github/workflows/cxx11-macos.yaml

@@ -2,9 +2,9 @@ name: cxx11
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
 
 jobs:
   build:

.github/workflows/cxx11-ubuntu.yaml

@@ -2,14 +2,14 @@ name: cxx11
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
     types: [opened, synchronize, reopened]
 jobs:
   build:
     name: ubuntu
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       BUILD_WRAPPER_OUT_DIR: sonar-output # Directory where build-wrapper output will be placed
     steps:

.github/workflows/cxx11-win.yaml

@@ -2,9 +2,9 @@ name: cxx11
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
 
 jobs:
   build:
@@ -17,7 +17,7 @@ jobs:
     - name: configure
       run: |
         md _build && cd _build
-        cmake ../ -DENABLE_STDCXX_SYNC=ON -DENABLE_ENCRYPTION=OFF -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DUSE_CXX_STD=c++11
+        cmake ../ -DENABLE_STDCXX_SYNC=ON -DENABLE_ENCRYPTION=OFF -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DENABLE_LOCALIF_WIN32=ON -DUSE_CXX_STD=c++11
     - name: build
       run: cd _build && cmake --build ./ --config Release --verbose
     - name: test

.github/workflows/iOS.yaml

@@ -2,9 +2,9 @@ name: iOS
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
 
 jobs:
   build:

.github/workflows/s390x-focal.yaml

@@ -2,9 +2,9 @@ name: QEMU to run s390x-focal
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master", "dev" ]
 
 jobs:
   Tests:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "submodules/abi-compliance-checker"]
+	path = submodules/abi-compliance-checker
+	url = https://github.com/lvc/abi-compliance-checker.git

CMakeLists.txt

@@ -8,7 +8,7 @@
 #
 
 cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-set (SRT_VERSION 1.0.2)
+set (SRT_VERSION 1.6.0)
 
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
 include(haiUtil) # needed for set_version_variables
@@ -173,6 +173,7 @@ option(ENABLE_PKTINFO "Enable using IP_PKTINFO to allow the listener extracting
 option(ENABLE_RELATIVE_LIBPATH "Should application contain relative library paths, like ../lib" OFF)
 option(ENABLE_GETNAMEINFO "In-logs sockaddr-to-string should do rev-dns" OFF)
 option(ENABLE_UNITTESTS "Enable unit tests" OFF)
+option(ENABLE_UNITTESTS_DISCOVERY "Do not discover unit tests when enabled" ON)
 option(ENABLE_ENCRYPTION "Enable encryption in SRT" ON)
 option(ENABLE_AEAD_API_PREVIEW "Enable AEAD API preview in SRT" Off)
 option(ENABLE_MAXREXMITBW "Enable SRTO_MAXREXMITBW (v1.6.0 API preview)" Off)
@@ -186,6 +187,7 @@ option(USE_OPENSSL_PC "Use pkg-config to find OpenSSL libraries" ON)
 option(SRT_USE_OPENSSL_STATIC_LIBS "Link OpenSSL libraries statically." OFF)
 option(USE_BUSY_WAITING "Enable more accurate sending times at a cost of potentially higher CPU load" OFF)
 option(USE_GNUSTL "Get c++ library/headers from the gnustl.pc" OFF)
+option(ENABLE_LOCALIF_WIN32 "Enable local interface check ability on Windows (adds Iphlpapi.lib dep)" OFF)
 option(ENABLE_SOCK_CLOEXEC "Enable setting SOCK_CLOEXEC on a socket" ON)
 option(ENABLE_SHOW_PROJECT_CONFIG "Enable show Project Configuration" OFF)
 
@@ -739,7 +741,7 @@ if (FORCE_CXX_STANDARD)
 endif()
 
 # add extra warning flags for gccish compilers
-if (HAVE_COMPILER_GNU_COMPAT)
+if ((HAVE_COMPILER_GNU_COMPAT) AND (NOT DEFINED SRT_GCC_WARN))
 	set (SRT_GCC_WARN "-Wall -Wextra")
 	if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		set (SRT_GCC_WARN "${SRT_GCC_WARN} -Wshadow=local")
@@ -1113,6 +1115,10 @@ if (srt_libspec_shared)
 	if (ENABLE_ENCRYPTION)
 		target_link_libraries(${TARGET_srt}_shared PRIVATE ${SSL_LIBRARIES})
 	endif()
+	if (WIN32 AND ENABLE_LOCALIF_WIN32)
+		target_link_libraries(${TARGET_srt}_shared PRIVATE Iphlpapi)
+		add_definitions(-DSRT_ENABLE_LOCALIF_WIN32)
+	endif()
 	if (MICROSOFT)
 		target_link_libraries(${TARGET_srt}_shared PRIVATE ws2_32.lib)
 		if (NOT (ENABLE_ENCRYPTION AND "${USE_ENCLIB}" STREQUAL "botan"))
@@ -1134,6 +1140,10 @@ endif()
 
 if (srt_libspec_static)
 	add_library(${TARGET_srt}_static STATIC ${OBJECT_LIB_SUPPORT} ${VIRTUAL_srt})
+	if (WIN32 AND ENABLE_LOCALIF_WIN32)
+		target_link_libraries(${TARGET_srt}_static PRIVATE Iphlpapi)
+		add_definitions(-DSRT_ENABLE_LOCALIF_WIN32)
+	endif()
 
 	# For Windows, leave the name to be "srt_static.lib".
 	# Windows generates two different library files:
@@ -1333,6 +1343,10 @@ macro(srt_add_program_dont_install name)
 	add_executable(${name} ${ARGN})
 	target_include_directories(${name} PRIVATE apps)
 	target_include_directories(${name} PRIVATE common)
+	if (WIN32 AND ENABLE_LOCALIF_WIN32)
+		target_link_libraries(${name} Iphlpapi)
+		add_definitions(-DSRT_ENABLE_LOCALIF_WIN32)
+	endif()
 endmacro()
 
 macro(srt_add_program name)
@@ -1580,7 +1594,9 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11)
 		#set_tests_properties(test-srt PROPERTIES RUN_SERIAL TRUE)
 	else()
 		set_tests_properties(${tests_srt} PROPERTIES RUN_SERIAL TRUE)
-		gtest_discover_tests(test-srt)
+		if (ENABLE_UNITTESTS_DISCOVERY)
+			gtest_discover_tests(test-srt)
+		endif()
 	endif()
 
 	enable_testing()

apps/apputil.cpp

@@ -17,6 +17,7 @@
 #include <memory>
 
 #include "srt.h" // Required for SRT_SYNC_CLOCK_* definitions.
+#include "common.h"
 #include "apputil.hpp"
 #include "netinet_any.h"
 #include "srt_compat.h"
@@ -389,3 +390,40 @@ void PrintLibVersion()
     const int patch = srtver % 0x100;
     cerr << "SRT Library version: " << major << "." << minor << "." << patch << ", clock type: " << SRTClockTypeStr() << endl;
 }
+
+bool IsTargetAddrSelf(const sockaddr* boundaddr, const sockaddr* targetaddr)
+{
+    sockaddr_any bound = boundaddr;
+    sockaddr_any target = targetaddr;
+
+    if (!bound.isany())
+    {
+        // Bound to a specific local address, so only check if
+        // this isn't the same address as 'target'.
+        if (target.equal_address(bound))
+        {
+            return true;
+        }
+    }
+    else
+    {
+        // Bound to INADDR_ANY, so check matching with any local IP address
+        const vector<srt::LocalInterface>& locals = srt::GetLocalInterfaces();
+
+        // If any of the above function fails, it will collect
+        // no local interfaces, so it's impossible to check anything.
+        // OTOH it should also mean that the network isn't working,
+        // so it's unlikely, as well as no address should match the
+        // local address anyway.
+        for (size_t i = 0; i < locals.size(); ++i)
+        {
+            if (locals[i].addr.equal_address(target))
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+

apps/apputil.hpp

@@ -336,6 +336,7 @@ std::string OptionHelpItem(const OptionName& o);
 
 const char* SRTClockTypeStr();
 void PrintLibVersion();
+bool IsTargetAddrSelf(const sockaddr* boundaddr, const sockaddr* targetaddr);
 
 
 namespace srt
@@ -344,7 +345,7 @@ namespace srt
 struct OptionSetterProxy
 {
     SRTSOCKET s;
-    int result = -1;
+    SRTSTATUS result = SRT_ERROR;
 
     OptionSetterProxy(SRTSOCKET ss): s(ss) {}
 
@@ -384,7 +385,7 @@ struct OptionSetterProxy
         return OptionProxy {*this, opt};
     }
 
-    operator int() { return result; }
+    operator SRTSTATUS() { return result; }
 };
 
 inline OptionSetterProxy setopt(SRTSOCKET socket)