From owner-svn-src-all@freebsd.org Tue Mar 3 15:33:44 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 60E20253AB3; Tue, 3 Mar 2020 15:33:44 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48X1J80P46z3MQm; Tue, 3 Mar 2020 15:33:44 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8BDB758B; Tue, 3 Mar 2020 15:33:43 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 023FXh08052517; Tue, 3 Mar 2020 15:33:43 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 023FXhKb052515; Tue, 3 Mar 2020 15:33:43 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202003031533.023FXhKb052515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 3 Mar 2020 15:33:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358585 - in head: sys/net tests/sys/netinet tests/sys/netinet6 X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: in head: sys/net tests/sys/netinet tests/sys/netinet6 X-SVN-Commit-Revision: 358585 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2020 15:33:44 -0000 Author: melifaro Date: Tue Mar 3 15:33:43 2020 New Revision: 358585 URL: https://svnweb.freebsd.org/changeset/base/358585 Log: Fix dynamic redrects by adding forgotten RTF_HOST flag. Improve tests to verify the generated route flags. Reported by: jtl MFC after: 2 weeks Modified: head/sys/net/route.c head/tests/sys/netinet/redirect.sh head/tests/sys/netinet6/redirect.sh Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Tue Mar 3 15:31:40 2020 (r358584) +++ head/sys/net/route.c Tue Mar 3 15:33:43 2020 (r358585) @@ -632,7 +632,7 @@ rib_add_redirect(u_int fibnum, struct sockaddr *dst, s info.rti_info[RTAX_GATEWAY] = gateway; info.rti_ifa = ifa; info.rti_ifp = ifp; - info.rti_flags = flags | RTF_DYNAMIC; + info.rti_flags = flags | RTF_HOST | RTF_DYNAMIC; /* Setup route metrics to define expire time. */ bzero(&rti_rmx, sizeof(rti_rmx)); Modified: head/tests/sys/netinet/redirect.sh ============================================================================== --- head/tests/sys/netinet/redirect.sh Tue Mar 3 15:31:40 2020 (r358584) +++ head/tests/sys/netinet/redirect.sh Tue Mar 3 15:33:43 2020 (r358585) @@ -92,9 +92,8 @@ valid_redirect_body() { --route ${dst_addr4} --gw ${new_rtr_ip} \ --iface ${epair}a - count=`jexec ${jname} route -n get -4 ${dst_addr4} | grep destination | grep -c ${dst_addr4}` - # Verify redirect got installed - atf_check_equal "1" "${count}" + atf_check -o match:"destination: ${dst_addr4}\$" jexec ${jname} route -n get -4 ${dst_addr4} + atf_check -o match:'flags: ' jexec ${jname} route -n get -4 ${dst_addr4} } valid_redirect_cleanup() { Modified: head/tests/sys/netinet6/redirect.sh ============================================================================== --- head/tests/sys/netinet6/redirect.sh Tue Mar 3 15:31:40 2020 (r358584) +++ head/tests/sys/netinet6/redirect.sh Tue Mar 3 15:33:43 2020 (r358585) @@ -94,9 +94,9 @@ valid_redirect_body() { --route ${dst_addr6} --gw ${new_rtr_ll_ip} \ --iface ${epair}a - count=`jexec ${jname} route -n get -6 ${dst_addr6} | grep destination | grep -c ${dst_addr6}` # Verify redirect got installed - atf_check_equal "1" "${count}" + atf_check -o match:"destination: ${dst_addr6}\$" jexec ${jname} route -n get -6 ${dst_addr6} + atf_check -o match:'flags: ' jexec ${jname} route -n get -6 ${dst_addr6} } valid_redirect_cleanup() {