From nobody Sat Mar 4 05:29:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PTD0h42Dlz3vZBr; Sat, 4 Mar 2023 05:29:08 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PTD0h3HGWz3QHk; Sat, 4 Mar 2023 05:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677907748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nVYDLm6rJmOABZHdNXXT+sbXfjAI4jkny1TfTIon7QI=; b=C9VjSl8jtz/KZvsEbscKFMqV5CHjpEGWM3qYQ5jG5oeli8FNsyyTWQKI0VZRbLgKAW9bKJ j303PniGr8I00op+8ni3QMFTIt9trWrMAXUGQgYoH0Nu5CcWMeHMB5Pd9DjiwpUWjVZvhc IqhfEEvIWk/Gux3Ei83GxrLpnsRRv4zpXzTjwUuGqir6uREBJ7E2Fr0AX4zOe1ii1eIczH b5gdBlf9DaBmqGKidi7r/hP7kcY5lCWgCnVZfcivoa2zeauEq8k7mcnacArOwEj2KVHuC7 MkAj4lujsYH18uUwpkPSoEJ23Hq0B1KNvKFwB/oiaD+RnKd2cFtQj+CbbK2ERA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677907748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nVYDLm6rJmOABZHdNXXT+sbXfjAI4jkny1TfTIon7QI=; b=sEwQ4lUJAnEKZzvCRmhjVhNgf812YN/1VlSUyNHci6oys8aKZJ5vUhRiUrqtkZp75ksfwm hMu+PkbVG1ipcdvdfuXek8JxttHvvNLC9rCZZHutszIFsYxICxgmz8QkSqgx/BxkL/ZxO9 WszZ7POhrfw01zgIafFnzcucfgcWICRs2zeixmpmlnmlILhG2ejEsitauU5FWs4tGKxIhV K/gHvHocaW0jJiU+N+/UUl9aI8NHHLsAli6ft/X+QszSBU3N2aoMEXQJl7gL9IDfqrtsLo 1whinQ5HPuJB0FtBlfTCfF1Z/hwcSrd54rQYZQtUHWoGv/ZqGU+TlXaYkz0goA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677907748; a=rsa-sha256; cv=none; b=Cj2/Rf8xGdz2+qM3DRRTzTb3dz4nHJD2fDjMjGuLUFlh89Wb2loug6YAvk66SzIwZu0/kC 0OoZ+SsqW3VbLwcUpvxFwA7tCix9IWfMcDlpKJEHM6pkxYMcS3GlbxiZ1oD//pXVAAClYv 6AOVMQvrMriSk6z2Naaj4DXW0P8pG8VtIW6L5W4RjiPr9rfvYCan4o0JebuXsotPNCz4Za N3J7HQ9IA7yLvhVfvZ1m9FdztEdDqlBi0c8EiMLsUlW7loQocZynoM3y7cCqsrOXtA5tSQ PE7WcCxrk2asBL9DDwVFRdh3Jmj3HosSEW1lSVsWjxJXnqX99FIdz5HflyYwWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTD0h2L5kzSMC; Sat, 4 Mar 2023 05:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3245T8UM003184; Sat, 4 Mar 2023 05:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3245T8pB003183; Sat, 4 Mar 2023 05:29:08 GMT (envelope-from git) Date: Sat, 4 Mar 2023 05:29:08 GMT Message-Id: <202303040529.3245T8pB003183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 290f7f4a0921 - main - in_mcat.c: change multicast not member condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 290f7f4a0921d1606aae8568a04f12025fbf834c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=290f7f4a0921d1606aae8568a04f12025fbf834c commit 290f7f4a0921d1606aae8568a04f12025fbf834c Author: Fidaullah Noonari AuthorDate: 2023-02-28 16:44:12 +0000 Commit: Warner Losh CommitDate: 2023-03-04 05:25:17 +0000 in_mcat.c: change multicast not member condition If there is no source filter entry => block if that's SSM ("exclude" mode per RFC 3678 clause 3). If there is an entry => check its action & block if the action is "exclude". It would be nice if the test case in this PR were converted into an ATF test case, but not blocking on that. Reviewed by: imp, melifaro Pull Request: https://github.com/freebsd/freebsd-src/pull/601 --- sys/netinet/in_mcast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index bbedbf8ceaa3..ef29a8072ccb 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -480,7 +480,7 @@ imo_multi_filter(const struct ip_moptions *imo, const struct ifnet *ifp, ims = imo_match_source(imf, src); if ((ims == NULL && mode == MCAST_INCLUDE) || - (ims != NULL && ims->imsl_st[0] != mode)) + (ims != NULL && ims->imsl_st[0] == MCAST_EXCLUDE)) return (MCAST_NOTSMEMBER); return (MCAST_PASS);