From 4060444c805c42213604670715b623b18fe15319 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 08 2020 08:42:12 +0000
Subject: import kronosnet-1.10-6.el8_2


---

diff --git a/SOURCES/bz1867708-fix-enetunreach.patch b/SOURCES/bz1867708-fix-enetunreach.patch
new file mode 100644
index 0000000..8802cfe
--- /dev/null
+++ b/SOURCES/bz1867708-fix-enetunreach.patch
@@ -0,0 +1,37 @@
+commit b84b48c61368544d14324d6173d3918d24df9837
+Author: Christine Caulfield <ccaulfie@redhat.com>
+Date:   Wed Jan 29 15:52:26 2020 +0000
+
+    [udp] Better fix for -ENETUNREACH
+    
+    This fix for the ENETUNREACH problem works better than the last one
+    in that it also works with Linux kernels > 5.0.0 (which return
+    -ENETUNREACH) if an interfaces is brought down, and also on FreeBSD
+    which returns ENETDOWN.
+
+
+--- a/libknet/transport_udp.c	2020-08-12 10:57:52.480344141 +0100
++++ b/libknet/transport_udp.c	2020-08-12 10:47:43.168435711 +0100
+@@ -395,14 +395,20 @@
+ 			read_errs_from_sock(knet_h, sockfd);
+ 			return 0;
+ 		}
+-		if (recv_errno == EINVAL || recv_errno == EPERM) {
++		if ((recv_errno == EINVAL) || (recv_errno == EPERM) ||
++		    (recv_errno == ENETUNREACH) || (recv_errno == ENETDOWN)) {
++#ifdef DEBUG
++			if ((recv_errno == ENETUNREACH) || (recv_errno == ENETDOWN)) {
++				log_debug(knet_h, KNET_SUB_TRANSP_UDP, "Sock: %d is unreachable.", sockfd);
++			}
++#endif
+ 			return -1;
+ 		}
+ 		if ((recv_errno == ENOBUFS) || (recv_errno == EAGAIN)) {
+ #ifdef DEBUG
+ 			log_debug(knet_h, KNET_SUB_TRANSP_UDP, "Sock: %d is overloaded. Slowing TX down", sockfd);
+ #endif
+-			usleep(KNET_THREADS_TIMERES / 16);
++			usleep(KNET_THREADS_TIMERES / 16);
+ 		} else {
+ 			read_errs_from_sock(knet_h, sockfd);
+ 		}
diff --git a/SPECS/kronosnet.spec b/SPECS/kronosnet.spec
index 79cd799..6c76233 100644
--- a/SPECS/kronosnet.spec
+++ b/SPECS/kronosnet.spec
@@ -83,7 +83,7 @@
 Name: kronosnet
 Summary: Multipoint-to-Multipoint VPN daemon
 Version: 1.10
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.kronosnet.org
 Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz
@@ -92,6 +92,7 @@ Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz
 Patch1: bz1753517-link-mem-corruption.patch
 Patch2: bz1736872-fix-mtu-calculation.patch
 Patch3: bz1761711-fix-data-deliver-corruption-from-fragmented-packets.patch
+Patch4: bz1867708-fix-enetunreach.patch
 
 # Build dependencies
 BuildRequires: gcc
@@ -144,6 +145,7 @@ BuildRequires: autoconf
 %patch1 -p1 -b .bz1753517-link-mem-corruption
 %patch2 -p1 -b .bz1736872-fix-mtu-calculation
 %patch3 -p1 -b .bz1761711-fix-data-deliver-corruption-from-fragmented-packets
+%patch4 -p1 -b .bz1867708-fix-enetunreach.patch
 
 %build
 %if %{defined buildautogen}
@@ -534,6 +536,13 @@ Requires: libnozzle1%{_isa} = %{version}-%{release}
 %endif
 
 %changelog
+* Wed Aug 19 2020 Christine Caulfield <ccaulfie@redhat.com> - 1.10-6
+  Fix syntax of gating tests.yaml
+
+* Wed Aug 12 2020 Christine Caulfield <ccaulfie@redhat.com> - 1.10-5
+  Fix handling of ENETUNREACH so that ifdown doesn't cause us to spin.
+  Resolves: rhbz#1867708
+
 * Thu Oct 17 2019 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.10-4
   Disable fun_pmtud_crypto_test as it can take several hours to run
   Resolves: rhbz#1736872