mcproxy: fix up sourcefilter patch
this spewed out 2 compile warnings In file included from build_dir/target-mipsel_24kc_musl/mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/mc_socket.cpp:43:0: build_dir/target-mipsel_24kc_musl/mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/sourcefilter.cpp: In function 'int setsourcefilter(int, uint32_t, const sockaddr*, socklen_t, uint32_t, uint32_t, const sockaddr_storage*)': build_dir/target-mipsel_24kc_musl/mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/sourcefilter.cpp:157:3: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ build_dir/target-mipsel_24kc_musl/mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/sourcefilter.cpp:160:5: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'else' int save_errno = errno; ^~~ Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
parent
a56d996b94
commit
ff7c509caa
|
@ -1,5 +1,7 @@
|
||||||
--- a/mcproxy/src/utils/mc_socket.cpp
|
Index: mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/mc_socket.cpp
|
||||||
+++ b/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 @@
|
@@ -37,6 +37,10 @@
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -11,8 +13,10 @@
|
||||||
std::string ipAddrResolver(std::string ipAddr)
|
std::string ipAddrResolver(std::string ipAddr)
|
||||||
{
|
{
|
||||||
std::string str[][2] = {
|
std::string str[][2] = {
|
||||||
|
Index: mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/sourcefilter.cpp
|
||||||
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/mcproxy/src/utils/sourcefilter.cpp
|
+++ mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/utils/sourcefilter.cpp
|
||||||
@@ -0,0 +1,165 @@
|
@@ -0,0 +1,165 @@
|
||||||
+/* Get source filter. Linux version.
|
+/* Get source filter. Linux version.
|
||||||
+ Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
+ Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||||
|
@ -173,9 +177,9 @@
|
||||||
+ else
|
+ else
|
||||||
+ result = setsockopt (s, sol, MCAST_MSFILTER, gf, needed);
|
+ result = setsockopt (s, sol, MCAST_MSFILTER, gf, needed);
|
||||||
+
|
+
|
||||||
+ int save_errno = errno;
|
+ int save_errno = errno;
|
||||||
+ free (gf);
|
+ free (gf);
|
||||||
+ errno = save_errno;
|
+ errno = save_errno;
|
||||||
+
|
+
|
||||||
+ return result;
|
+ return result;
|
||||||
+}
|
+}
|
||||||
|
|
Loading…
Reference in New Issue