Rediff patches

Drop 0002-set-base-v6-address-to-nullopt-when-explicit-empty-s.patch: <REASON>
Drop 0003-catch-ipv6-ioctl-throwing-when-someone-runs-lokinet-.patch: <REASON>
ubuntu/impish
Jason Rhinelander 3 years ago
parent a616e5f84b
commit 0696609da2

@ -1,27 +0,0 @@
From: Jeff Becker <jeff@i2p.rocks>
Date: Wed, 6 Oct 2021 16:21:42 -0400
Subject: set base v6 address to nullopt when explicit empty string is
provided
---
llarp/config/config.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
index 4e1b4c8..52d0185 100644
--- a/llarp/config/config.cpp
+++ b/llarp/config/config.cpp
@@ -569,7 +569,13 @@ namespace llarp
IP6RangeDefault,
[this](std::string arg) {
if (arg.empty())
+ {
+ LogError(
+ "!!! Disabling ipv6 tunneling when you have ipv6 routes WILL lead to "
+ "de-anonymization as lokinet will no longer carry your ipv6 traffic !!!");
+ m_baseV6Address = std::nullopt;
return;
+ }
m_baseV6Address = huint128_t{};
if (not m_baseV6Address->FromString(arg))
throw std::invalid_argument(

@ -1,32 +0,0 @@
From: Jeff Becker <jeff@i2p.rocks>
Date: Wed, 6 Oct 2021 17:48:18 -0400
Subject: catch ipv6 ioctl throwing when someone runs lokinet with no ipv6
---
llarp/vpn/linux.hpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/llarp/vpn/linux.hpp b/llarp/vpn/linux.hpp
index 5401ef1..0f47636 100644
--- a/llarp/vpn/linux.hpp
+++ b/llarp/vpn/linux.hpp
@@ -57,7 +57,6 @@ namespace llarp::vpn
control.ioctl(SIOCGIFINDEX, &ifr);
const int ifindex = ifr.ifr_ifindex;
- IOCTL control6{AF_INET6};
for (const auto& ifaddr : m_Info.addrs)
{
if (ifaddr.fam == AF_INET)
@@ -78,9 +77,9 @@ namespace llarp::vpn
ifr6.ifindex = ifindex;
try
{
- control6.ioctl(SIOCSIFADDR, &ifr6);
+ IOCTL{AF_INET6}.ioctl(SIOCSIFADDR, &ifr6);
}
- catch (permission_error& ex)
+ catch (std::exception& ex)
{
LogError("we are not allowed to use IPv6 on this system: ", ex.what());
}

@ -1,3 +1 @@
0007-Pass-debian-version-as-GIT_VERSION.patch
0002-set-base-v6-address-to-nullopt-when-explicit-empty-s.patch
0003-catch-ipv6-ioctl-throwing-when-someone-runs-lokinet-.patch

Loading…
Cancel
Save