Add support for ipv6 address resolution preferences to srt. (#4317)

.github/opam/liquidsoap-core-windows.opam

@@ -73,6 +73,7 @@ depopts: [
   "osx-secure-transport-windows"
   "portaudio-windows"
   "posix-time2-windows"
+  "posix-socket-windows"
   "pulseaudio-windows"
   "prometheus-liquidsoap-windows"
   "samplerate-windows"
@@ -111,12 +112,13 @@ conflicts: [
   "ogg-windows" {< "0.7.4"}
   "opus-windows" {< "0.2.0"}
   "portaudio-windows" {< "0.2.0"}
+  "posix-socket-windows" {< "2.1.0"}
   "pulseaudio-windows" {< "0.1.4"}
   "samplerate-windows" {< "0.1.5"}
   "shine-windows" {< "0.2.0"}
   "soundtouch-windows" {< "0.1.9"}
   "speex-windows" {< "0.4.0"}
-  "srt-windows" {< "0.3.0"}
+  "srt-windows" {< "0.3.2"}
   "ssl-windows" {< "0.5.2"}
   "sdl-liquidsoap-windows" {< "2"}
   "tsdl-image-windows" {< "0.3.2"}

.github/scripts/build-posix.sh

@@ -39,20 +39,11 @@ echo "::endgroup::"
 
 echo "::group::Setting up specific dependencies"
 
-opam install -y xml-light
-
 git clone https://github.com/savonet/ocaml-xiph.git
 cd ocaml-xiph
 opam install -y .
 cd ..
 
-cd /tmp
-rm -rf ocaml-posix
-git clone https://github.com/savonet/ocaml-posix.git
-cd ocaml-posix
-opam pin -ny .
-opam install -y posix-socket.2.1.0 posix-base.2.1.0 posix-time2.2.1.0 posix-types.2.1.0
-
 cd /tmp/liquidsoap-full/liquidsoap
 
 ./.github/scripts/checkout-deps.sh
@@ -64,7 +55,8 @@ cd ..
 
 opam update
 opam remove -y jemalloc
-opam install -y tls.1.0.2 ca-certs mirage-crypto-rng cstruct saturn_lockfree.0.5.0 ppx_hash memtrace
+opam unpin -n posix-socket posix-base posix-time2 posix-types
+opam install -y tls.1.0.2 ca-certs mirage-crypto-rng cstruct saturn_lockfree.0.5.0 ppx_hash memtrace xml-light posix-socket.2.1.0 posix-base.2.1.0 posix-time2.2.1.0 posix-types.2.1.0
 
 cd /tmp/liquidsoap-full
 

.github/scripts/build-win32.sh

@@ -45,7 +45,8 @@ echo "::group::Installing deps"
 
 eval "$(opam config env)"
 opam repository set-url windows https://github.com/ocaml-cross/opam-cross-windows.git
-opam update windows
+opam update
+opam install -y srt-windows.0.3.2
 
 echo "::endgroup::"
 

CHANGES.md

@@ -2,6 +2,8 @@
 
 New:
 
+- Added support for addressed resolution preference in SRT (#4317)
+- Added global address resolution settings for SRT and Icecast (#4317)
 - Added support for parsing and rendering XML natively (#4252)
 - Added support for `WAVE_FORMAT_EXTENSIBLE` to the internal
   wav dexcoder.
@@ -23,6 +25,8 @@ Changed:
 - `output.icecast` now re-sends the last metadata when connecting to the
   remote server unless explicitly disabled using the `send_last_metadata_on_connect`
   option (#3906)
+- Add full explicit support for `ipv4` vs. `ipv6` resolution in SRT inputs and outputs,
+  add global `settings.srt.prefer_address` and `settings.icecast.prefer_address` (#4317)
 
 Fixed:
 

dune-project

@@ -92,6 +92,7 @@
     osc-unix
     portaudio
     posix-time2
+    posix-socket
     pulseaudio
     prometheus-liquidsoap
     samplerate
@@ -129,12 +130,13 @@
     (opus (< 0.2.0))
     (portaudio (< 0.2.0))
     (posix-time2 (< 2.0.2))
+    (posix-socket (< 2.1.0))
     (pulseaudio (< 0.1.4))
     (samplerate (< 0.1.5))
     (shine (< 0.2.0))
     (soundtouch (< 0.1.9))
     (speex (< 1.0.0))
-    (srt (< 0.3.0))
+    (srt (< 0.3.2))
     (ssl (< 0.7.0))
     (tls (< 1.0.2))
     (sdl-liquidsoap (< 2))

liquidsoap-core.opam

@@ -57,6 +57,7 @@ depopts: [
   "osc-unix"
   "portaudio"
   "posix-time2"
+  "posix-socket"
   "pulseaudio"
   "prometheus-liquidsoap"
   "samplerate"
@@ -95,12 +96,13 @@ conflicts: [
   "opus" {< "0.2.0"}
   "portaudio" {< "0.2.0"}
   "posix-time2" {< "2.0.2"}
+  "posix-socket" {< "2.1.0"}
   "pulseaudio" {< "0.1.4"}
   "samplerate" {< "0.1.5"}
   "shine" {< "0.2.0"}
   "soundtouch" {< "0.1.9"}
   "speex" {< "1.0.0"}
-  "srt" {< "0.3.0"}
+  "srt" {< "0.3.2"}
   "ssl" {< "0.7.0"}
   "tls" {< "1.0.2"}
   "sdl-liquidsoap" {< "2"}