From nobody Sat Oct 31 22:50:12 2026 X-Original-To: dev-commits-src-branches@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 4jHCpr3zcXz6xT3G for ; Sat, 31 Oct 2026 22:50:12 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jHCpr1QDvz3FBr for ; Sat, 31 Oct 2026 22:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793487012; 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=4QMRuyvdYT2E5sANCaPh98Uhz42uHiH3VkPW8gD+mnc=; b=nS6ZE8Lh9BJ2W50sCOZ4GRcj5oNpLNJHq03pDXWI5MQLkNPlPNwkEjUg3UhmYQeLOclDha qlzovw/ZAPd9UC9yJ9Xl1tHmqsxB8/ulTC6d++zUh0/4+dgDHfcctFBk985tAFrfD22yxV s4RJNbFsKMffHOItMF0Z5hPwnFm45GLXbuE6NDkpic7BxlXgMhCXGIW3kahOBOn/lvrOEX HjWAPFfTHpAR2fx0PedBJ8YmBhLBx+x+7lo4q92AGZr4sFpmSuPglhusXbkw4LYImBRTdr CutukJ+s82IEUzTr4hgh/3dx/zPkGLWpP6dC/jRGQkhJHRRJhT9izNF2GOwOKA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793487012; b=R2zasu1oaHnzSNQb5VVqYWvwKDlr5ZGbNJbdHsRtJXfAIdiawZ+Vrsgf86UUizGgc72ag2 rMg8CuSdm1w1X8u/36d4HKMSEGQHUiAaSsGdxKOa+iiIGK4iDXRlKmFkJ4Zg46iX3nlaOY U5HzXKaVmXtsebJgcBS2Q94pLVaIyaIRfSj47LX0QS6I1WFvR5wh7O3oVmNy0C+o+cfyMC 7uZfFeft4yV9dMF3ThkDrSHPWoWUAYeDJtWkFRFYNffTohTL3g71wSYDP7wAwZ9QkeO8sA pRTUNB2z9ARkqP8BXqf6ASHxEBztiHg8S0/C/FOvqyYB9+17TRYncDxC3MnA7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793487012; 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=4QMRuyvdYT2E5sANCaPh98Uhz42uHiH3VkPW8gD+mnc=; b=mK8jhFP5+2AYSD4r1k6hcQ6QgPDgDdgSMcgUiquWLmY/A/WD1mYL6gY0Hq9asMvngOg0QH 4Wp1a43HnUYp+ojLHh/AkyhS4UD1ez2p9RyLiikBRQ5K9Lk0+iMoUWOReZAlH16NdFwIW5 wh/m3Suy3qiT1Xe43w9iXdNNkfmMEqZzg26tzjTXb/8rNmgBgD9RBMCH8UuvktCGydEJro SrRCi4+moVsPGoOsi+PUEDNWdWpt7KqJurTWx2E5bk3mPZQg4S247u3rJmyZcti+1QdQqz wmYZCIujNCEDu1G1W0UAjr7R0GUtjzmkwhtucmuQwYRLHaTz15o6mrpoAOVdhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jHCpr14gfzWLB for ; Sat, 31 Oct 2026 22:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 416e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 22:50:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: a5f3339c0be7 - stable/15 - tests/pf/igmp: fix attribute error with newer versions of scapy List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a5f3339c0be71df08c7d5b758d0b516f784719f8 Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 22:50:12 +0000 Message-Id: <6ae670a4.416e2.373de808@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a5f3339c0be71df08c7d5b758d0b516f784719f8 commit a5f3339c0be71df08c7d5b758d0b516f784719f8 Author: Siva Mahadevan AuthorDate: 2026-10-27 14:23:11 +0000 Commit: Siva Mahadevan CommitDate: 2026-10-31 22:49:53 +0000 tests/pf/igmp: fix attribute error with newer versions of scapy This fixes the flaky testcase in CI[0]. While here: * fix a typo in a comment * remove an unnecessary import * fix this deprecation warning: /usr/local/lib/python3.12/site-packages/scapy/contrib/igmp.py:12: DeprecationWarning: scapy.contrib.igmp is deprecated. Please use scapy.layers.igmp instead ! [0] https://ci.freebsd.org/job/FreeBSD-main-amd64-test/29813/testReport/junit/sys.netpfil.pf.igmp/py/TestIGMP__test_ip_opts/ Reviewed by: kp MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit d9d6e77965b32a8d2f9eeffd34e519a087e603e2) --- tests/sys/netpfil/pf/igmp.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/sys/netpfil/pf/igmp.py b/tests/sys/netpfil/pf/igmp.py index 5d72a1c093a7..6f2a5066155d 100644 --- a/tests/sys/netpfil/pf/igmp.py +++ b/tests/sys/netpfil/pf/igmp.py @@ -54,11 +54,11 @@ class TestIGMP(VnetTestTemplate): packets = self.sp.sniff(iface=ifname, timeout=5) for r in packets: r.show() - igmp = r.getlayer(self.sc.igmp.IGMP) + igmp = r.getlayer(self.sl.igmp.IGMP) if not igmp: continue igmp.show() - if not igmp.gaddr == "230.0.0.1": + if getattr(igmp, 'gaddr', '0.0.0.0') != "230.0.0.1": continue found = True return found @@ -69,33 +69,32 @@ class TestIGMP(VnetTestTemplate): """Verify that we allow IGMP packets with IP options""" ifname = self.vnet.iface_alias_map["if1"].name - # Import in the correct vnet, so at to not confuse Scapy + # Import in the correct vnet, so as to not confuse Scapy import scapy.all as sp - import scapy.contrib as sc - import scapy.contrib.igmp + import scapy.layers as sl self.sp = sp - self.sc = sc + self.sl = sl # We allow IGMP packets with the router alert option pkt = sp.IP(dst="224.0.0.1%%%s" % ifname, ttl=1, options=[sp.IPOption_Router_Alert()]) \ - / sc.igmp.IGMP(type=0x11, mrcode=1) + / sl.igmp.IGMP(type=0x11, mrcode=1) assert self.find_igmp_reply(pkt, ifname) # But not with other options pkt = sp.IP(dst="224.0.0.1%%%s" % ifname, ttl=1, options=[sp.IPOption_NOP()]) \ - / sc.igmp.IGMP(type=0x11, mrcode=1) + / sl.igmp.IGMP(type=0x11, mrcode=1) assert not self.find_igmp_reply(pkt, ifname) # Or with the wrong TTL pkt = sp.IP(dst="224.0.0.1%%%s" % ifname, ttl=2, options=[sp.IPOption_Router_Alert()]) \ - / sc.igmp.IGMP(type=0x11, mrcode=1) + / sl.igmp.IGMP(type=0x11, mrcode=1) assert not self.find_igmp_reply(pkt, ifname) # Or with the wrong destination address pkt = sp.IP(dst="224.0.0.2%%%s" % ifname, ttl=2, options=[sp.IPOption_Router_Alert()]) \ - / sc.igmp.IGMP(type=0x11, mrcode=1) + / sl.igmp.IGMP(type=0x11, mrcode=1) assert not self.find_igmp_reply(pkt, ifname)