diff --git a/debian/patches/0003-use-exisitng-convotag-first-instead-of-trying-to-sen.patch b/debian/patches/0003-use-exisitng-convotag-first-instead-of-trying-to-sen.patch deleted file mode 100644 index 3341e614d..000000000 --- a/debian/patches/0003-use-exisitng-convotag-first-instead-of-trying-to-sen.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Jeff Becker -Date: Fri, 11 Jun 2021 11:47:24 -0400 -Subject: use exisitng convotag first instead of trying to send to directly - ---- - llarp/handlers/tun.cpp | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp -index c816297..f9e2820 100644 ---- a/llarp/handlers/tun.cpp -+++ b/llarp/handlers/tun.cpp -@@ -973,10 +973,13 @@ namespace llarp - } - // try sending it on an existing convotag - // this succeds for inbound convos, probably. -- if (SendToOrQueue(to, pkt.ConstBuffer(), type)) -+ if (auto maybe = GetBestConvoTagFor(to)) - { -- MarkIPActive(dst); -- return; -+ if (SendToOrQueue(*maybe, pkt.ConstBuffer(), type)) -+ { -+ MarkIPActive(dst); -+ return; -+ } - } - // try establishing a path to this guy - // will fail if it's an inbound convo diff --git a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch b/debian/patches/0005-Move-default-user-group-into-deb-patch.patch index 6ef2f4bd4..716835a16 100644 --- a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch +++ b/debian/patches/0005-Move-default-user-group-into-deb-patch.patch @@ -8,10 +8,10 @@ Rather than cramming it into CXXFLAGS in debian/rules. 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ff002b..49e4112 100644 +index ea26515..475590b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -111,6 +111,9 @@ include(cmake/unix.cmake) +@@ -116,6 +116,9 @@ include(cmake/unix.cmake) include(cmake/check_for_std_optional.cmake) include(cmake/check_for_std_filesystem.cmake) diff --git a/debian/patches/series b/debian/patches/series index be8a5c077..9c469c08f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 0005-Move-default-user-group-into-deb-patch.patch 0007-Pass-debian-version-as-GIT_VERSION.patch -0003-use-exisitng-convotag-first-instead-of-trying-to-sen.patch