From owner-svn-ports-all@freebsd.org Thu Apr 9 20:31:46 2020 Return-Path: Delivered-To: svn-ports-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 DF5F227DF8E; Thu, 9 Apr 2020 20:31:46 +0000 (UTC) (envelope-from farrokhi@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 48yt8y5Kf6z4Dlj; Thu, 9 Apr 2020 20:31:46 +0000 (UTC) (envelope-from farrokhi@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 B225C1AA8D; Thu, 9 Apr 2020 20:31:46 +0000 (UTC) (envelope-from farrokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 039KVkVh067310; Thu, 9 Apr 2020 20:31:46 GMT (envelope-from farrokhi@FreeBSD.org) Received: (from farrokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 039KVkOh067306; Thu, 9 Apr 2020 20:31:46 GMT (envelope-from farrokhi@FreeBSD.org) Message-Id: <202004092031.039KVkOh067306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: farrokhi set sender to farrokhi@FreeBSD.org using -f From: Babak Farrokhi Date: Thu, 9 Apr 2020 20:31:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531270 - in head/net/radvd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: farrokhi X-SVN-Commit-Paths: in head/net/radvd: . files X-SVN-Commit-Revision: 531270 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Apr 2020 20:31:46 -0000 Author: farrokhi Date: Thu Apr 9 20:31:45 2020 New Revision: 531270 URL: https://svnweb.freebsd.org/changeset/ports/531270 Log: net/radvd: fix group join fail on multiple tries PR: 245393 Submitted by: Franco Fichtner Modified: head/net/radvd/Makefile head/net/radvd/files/patch-device-bsd44.c Modified: head/net/radvd/Makefile ============================================================================== --- head/net/radvd/Makefile Thu Apr 9 20:23:25 2020 (r531269) +++ head/net/radvd/Makefile Thu Apr 9 20:31:45 2020 (r531270) @@ -3,6 +3,7 @@ PORTNAME= radvd PORTVERSION= 2.18 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.litech.org/radvd/dist/ Modified: head/net/radvd/files/patch-device-bsd44.c ============================================================================== --- head/net/radvd/files/patch-device-bsd44.c Thu Apr 9 20:23:25 2020 (r531269) +++ head/net/radvd/files/patch-device-bsd44.c Thu Apr 9 20:31:45 2020 (r531270) @@ -1,6 +1,6 @@ ---- device-bsd44.c.orig 2017-06-29 04:32:29 UTC +--- device-bsd44.c.orig 2018-02-18 22:45:02 UTC +++ device-bsd44.c -@@ -126,7 +126,28 @@ ret: +@@ -126,7 +126,31 @@ ret: return -1; } @@ -18,7 +18,10 @@ + flog(LOG_ERR, "inet_pton failed"); + return (-1); + } -+ ++ ++ /* if we leave unconditionally the join cannot fail */ ++ setsockopt(sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mreq, sizeof(mreq)); ++ + if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, + &mreq, sizeof(mreq)) < 0) { + flog(LOG_ERR, "can't join ipv6-allrouters on %s", iface->props.name); @@ -30,3 +33,10 @@ int set_interface_linkmtu(const char *iface, uint32_t mtu) { +@@ -161,5 +185,5 @@ int check_ip6_forwarding(void) + int check_ip6_iface_forwarding(const char *iface) + { + dlog(LOG_DEBUG, 4, "checking ipv6 forwarding of interface not supported"); +- return -1; ++ return 1; + }