Merge pull request #476 from blogic/master

[feed/routing.git] / mcproxy / patches / 0003-add-sourcefilter.patch

diff --git a/mcproxy/patches/0003-add-sourcefilter.patch b/mcproxy/patches/0003-add-sourcefilter.patch
index 6e50263ed0c08ebf68202e735b10b197e8eb9c35..26dc98df94cad0028a1878cd6fd1692ea72e7205 100644 (file)
--- a/mcproxy/patches/0003-add-sourcefilter.patch
+++ b/mcproxy/patches/0003-add-sourcefilter.patch
@@ -1,5 +1,7 @@
---- a/mcproxy/src/utils/mc_socket.cpp
-+++ b/mcproxy/src/utils/mc_socket.cpp
+Index: mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/mc_socket.cpp
+===================================================================
+--- mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99.orig/mcproxy/src/utils/mc_socket.cpp
++++ mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/mc_socket.cpp
 @@ -37,6 +37,10 @@
  #include <numeric>
  #include <unistd.h>
@@ -11,8 +13,10 @@
  std::string ipAddrResolver(std::string ipAddr)
  {
      std::string str[][2] = {
+Index: mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/sourcefilter.cpp
+===================================================================
 --- /dev/null
-+++ b/mcproxy/src/utils/sourcefilter.cpp
++++ mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/sourcefilter.cpp
 @@ -0,0 +1,165 @@
 +/* Get source filter.  Linux version.
 +   Copyright (C) 2004-2014 Free Software Foundation, Inc.
@@ -173,9 +177,9 @@
 +  else
 +    result = setsockopt (s, sol, MCAST_MSFILTER, gf, needed);
 +
-+    int save_errno = errno;
-+    free (gf);
-+    errno = save_errno;
++  int save_errno = errno;
++  free (gf);
++  errno = save_errno;
 +
 +  return result;
 +}