rpms
/
kronosnet
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import kronosnet-1.10-6.el8_2

This commit is contained in:
CentOS Sources 2020-09-08 04:42:12 -04:00 committed by Andrew Lukoshko
parent c5d368f57a
commit dae9714d8f
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
SOURCES/bz1867708-fix-enetunreach.patch Normal file
View File

@ -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);
}

11
SPECS/kronosnet.spec
View File

@ -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