[vlc-commits] contribs: live555: disable multicast intf lookups on android

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Feb  9 10:33:10 2021 +0100| [14192fe30953858b2ffde9ab6a3f93909fe93647] | committer: Francois Cartegnie

contribs: live555: disable multicast intf lookups on android

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=14192fe30953858b2ffde9ab6a3f93909fe93647
---

 .../live555/DISABLE_LOOPBACK_IP_ADDRESS_CHECK.patch   | 19 +++++++++++++++++++
 contrib/src/live555/rules.mak                         |  5 +++++
 2 files changed, 24 insertions(+)

diff --git a/contrib/src/live555/DISABLE_LOOPBACK_IP_ADDRESS_CHECK.patch b/contrib/src/live555/DISABLE_LOOPBACK_IP_ADDRESS_CHECK.patch
new file mode 100644
index 0000000000..8a2a5e7220
--- /dev/null
+++ b/contrib/src/live555/DISABLE_LOOPBACK_IP_ADDRESS_CHECK.patch
@@ -0,0 +1,19 @@
+--- live.orig/groupsock/GroupsockHelper.cpp	2016-11-28 22:42:18.000000000 +0100
++++ live/groupsock/GroupsockHelper.cpp	2021-02-09 10:27:15.669908139 +0100
+@@ -616,7 +616,7 @@
+     // that other nodes will think our address is the same as we do.)
+     do {
+       loopbackWorks = 0; // until we learn otherwise
+-
++#ifndef DISABLE_LOOPBACK_IP_ADDRESS_CHECK
+       testAddr.s_addr = our_inet_addr("228.67.43.91"); // arbitrary
+       Port testPort(15947); // ditto
+ 
+@@ -653,6 +653,7 @@
+ 
+       // We use this packet's source address, if it's good:
+       loopbackWorks = !badAddressForUs(fromAddr.sin_addr.s_addr);
++#endif
+     } while (0);
+ 
+     if (sock >= 0) {
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index f5984577dc..262fb867bb 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -26,6 +26,9 @@ ifdef HAVE_LINUX
 LIVE_TARGET := linux
 LIVE_EXTRA_CFLAGS += -DXLOCALE_NOT_USED
 endif
+ifdef HAVE_ANDROID
+LIVE_EXTRA_CFLAGS += -DDISABLE_LOOPBACK_IP_ADDRESS_CHECK=1
+endif
 ifdef HAVE_WIN32
 LIVE_TARGET := mingw
 endif
@@ -79,6 +82,8 @@ endif
 	$(APPLY) $(SRC)/live555/add-pkgconfig-file.patch
 	# Expose Server:
 	$(APPLY) $(SRC)/live555/expose_server_string.patch
+        # Disable Multicast interface lookup option
+	$(APPLY) $(SRC)/live555/DISABLE_LOOPBACK_IP_ADDRESS_CHECK.patch
 ifdef HAVE_ANDROID
 ifneq ($(LEGACY_NDK), 1)
 	# Always access in_addr.s_addr field