From 2e1bc6e500be4b7bdec3304245c8d19ab186a97c Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 9 Jan 2018 09:59:55 -0800 Subject: Cleaned up old code for attempted fix for ticket #600 --- service/OneService.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'service') diff --git a/service/OneService.cpp b/service/OneService.cpp index e65ad0e2..92b78a8c 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1609,6 +1609,7 @@ public: bool haveRoute = false; // Ignore routes implied by local managed IPs since adding the IP adds the route + // Commented out to fix ticket #600 (disappearing routes on macOS). Remove this block when we're sure there's no side effects /* for(std::vector::iterator ip(n.managedIps.begin());ip!=n.managedIps.end();++ip) { if ((target->netmaskBits() == ip->netmaskBits())&&(target->containsAddress(*ip))) { -- cgit v1.2.3 From 7e2d6149759e84ab4dc4a4f2e025d143b2882900 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 9 Jan 2018 10:16:49 -0800 Subject: Attempted fix for ticket #656 (failes to acknowledge physical blacklists) --- service/OneService.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'service') diff --git a/service/OneService.cpp b/service/OneService.cpp index 8aeecd5e..2e9c530d 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -2279,6 +2279,8 @@ public: return 0; } } + } + if (gbl) { for(std::vector::const_iterator a(gbl->begin());a!=gbl->end();++a) { if (a->containsAddress(*reinterpret_cast(remoteAddr))) return 0; -- cgit v1.2.3