From owner-svn-src-all@freebsd.org Sat Nov 3 18:03:25 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 956AC10E0342; Sat, 3 Nov 2018 18:03:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40E748C5FB; Sat, 3 Nov 2018 18:03:25 +0000 (UTC) (envelope-from bz@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 20A8E1D304; Sat, 3 Nov 2018 18:03:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA3I3PUX010169; Sat, 3 Nov 2018 18:03:25 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA3I3OYa010166; Sat, 3 Nov 2018 18:03:24 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201811031803.wA3I3OYa010166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 3 Nov 2018 18:03:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340098 - in head/usr.sbin: ndp rtadvd X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: in head/usr.sbin: ndp rtadvd X-SVN-Commit-Revision: 340098 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: Sat, 03 Nov 2018 18:03:25 -0000 Author: bz Date: Sat Nov 3 18:03:24 2018 New Revision: 340098 URL: https://svnweb.freebsd.org/changeset/base/340098 Log: Update the "flag" for draft-ietf-6man-ipv6only-flag. Having the flag named "6" can possibly be a problem for configurations where parsing strings and numbers can produce ambivalent results. Rename the "6" flag to the "S"ix (or Silence-IPv4) flag. Modified: head/usr.sbin/ndp/ndp.c head/usr.sbin/rtadvd/config.c head/usr.sbin/rtadvd/rtadvd.c Modified: head/usr.sbin/ndp/ndp.c ============================================================================== --- head/usr.sbin/ndp/ndp.c Sat Nov 3 03:43:32 2018 (r340097) +++ head/usr.sbin/ndp/ndp.c Sat Nov 3 18:03:24 2018 (r340098) @@ -1097,7 +1097,7 @@ rtrlist() p->flags & ND_RA_FLAG_MANAGED ? "M" : "", p->flags & ND_RA_FLAG_OTHER ? "O" : ""); #ifdef DRAFT_IETF_6MAN_IPV6ONLY_FLAG - printf("%s", p->flags & ND_RA_FLAG_IPV6_ONLY ? "6" : ""); + printf("%s", p->flags & ND_RA_FLAG_IPV6_ONLY ? "S" : ""); #endif rtpref = ((p->flags & ND_RA_FLAG_RTPREF_MASK) >> 3) & 0xff; printf(", pref=%s", rtpref_str[rtpref]); Modified: head/usr.sbin/rtadvd/config.c ============================================================================== --- head/usr.sbin/rtadvd/config.c Sat Nov 3 03:43:32 2018 (r340097) +++ head/usr.sbin/rtadvd/config.c Sat Nov 3 18:03:24 2018 (r340098) @@ -438,7 +438,7 @@ getconfig(struct ifinfo *ifi) val |= ND_RA_FLAG_RTPREF_LOW; } #ifdef DRAFT_IETF_6MAN_IPV6ONLY_FLAG - if (strchr(flagstr, '6')) + if (strchr(flagstr, 'S')) val |= ND_RA_FLAG_IPV6_ONLY; #endif } else Modified: head/usr.sbin/rtadvd/rtadvd.c ============================================================================== --- head/usr.sbin/rtadvd/rtadvd.c Sat Nov 3 03:43:32 2018 (r340097) +++ head/usr.sbin/rtadvd/rtadvd.c Sat Nov 3 18:03:24 2018 (r340098) @@ -1161,11 +1161,11 @@ ra_input(int len, struct nd_router_advert *nra, inconsistent++; } #ifdef DRAFT_IETF_6MAN_IPV6ONLY_FLAG - /* 6 flag */ + /* S "IPv6-Only" (Six, Silence-IPv4) flag */ if ((nra->nd_ra_flags_reserved & ND_RA_FLAG_IPV6_ONLY) != rai->rai_ipv6onlyflg) { syslog(LOG_NOTICE, - "6 flag inconsistent on %s:" + "S flag inconsistent on %s:" " %s from %s, %s from us", ifi->ifi_ifname, on_off[!rai->rai_ipv6onlyflg], inet_ntop(AF_INET6, &from->sin6_addr, ntopbuf,