From nobody Sat Dec 24 16:08:13 2022 X-Original-To: dev-commits-src-main@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 4NfTVP4sQZz1HKVX; Sat, 24 Dec 2022 16:08:13 +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 4NfTVP4H0gz3HxW; Sat, 24 Dec 2022 16:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671898093; 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=4NuycfaSGZAv/4eMSiAq0t002f6iTI2yc0LTRU5xPeQ=; b=bIShBmViBrqOLWBFJeTVfZx2HT8tpkPy13/IqJVVn43ja5yq/9sCzKTFKWFAQFD1z27v/c 9ZSConbrfg0kv/t8kjzo6Qmv+xNQs2oeqwV5b1XTpJeE59dfmiSPVPxFl8UhZ5jE4rVc+1 5UH8/7PF+qVcp7A6zAoD0Ee9uRtCaikj9CdU+ukYWGuzWMIVw4Tj2YzP/TxuPsORBhpjhv 2k/DxGlbJRqUoafX1DqpfIXLQwr30bx+Ggd1ufJbcFleuCNZ5Vp2NUeshqALAXJ20WQYZa lAMWr4nEKmcL+JHT2DvvVKTFyWNKcOakVmBmkp38+4x9iUY16Y2fxej9RCDhxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671898093; 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=4NuycfaSGZAv/4eMSiAq0t002f6iTI2yc0LTRU5xPeQ=; b=LqNYIuJB4tr+il2B+yzgad4kTOkuf3syDHDDmujS9Eaprrw8HJ7DnzkdcKbvPFq1sblzKZ 6pcHTUc30UM/10jauKnW7qhaT0YdUa5qK5KPEb6+AYRCVYxry7uMOV5ExAu7oKiRmc7jIn iyScmtg0o4JzmzPFiaUo/YCz9aMJWCqLaXOY4xyvndtLtj9FRVnBXs5toe1CvI2B1uaR2D b6YNR9HyF4ggZEyTV3dnToTh8GlKCRLFRi2bTdTP9/hrEFyjjfTWCErgZ/pg3ag6Kjpdwf 04/EIYq/4SFRCuLtuowDi90JQ995bDpm6YdTyeJ+K6L1oFHAA6onCoDskwkolA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671898093; a=rsa-sha256; cv=none; b=W1j0k8Rz/eMRmte9ttUtIDPpXodqKNqraliEXa9T5g7Osj+WDMz6HoYwTdjm+dlYL43V46 Sj+9uf3yRsQB7RvpYmjP7Pq0k4rHS1fFOYVHeeUdc9qX1db2hrEkUYLraJFzFI1q7ovLpg 7gCPLJU4X3sFDgZM2LfKE+mR9t+2JH96WMFCLKki+oq3vpqmm6+lukDrJNuklcD4gUUlHX DFP7yFQ39IssuE8XsoCZtZXvEn3iSKVdTgHnKmHdowZQHihFvzsxQqcglbj0AHi1rl2sNz dwp5BE7/8z9XjaFtujBIlMwPEPOpUoBwWypHz5Q92qFyluDOo2NOm+iAHcmmZg== 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 4NfTVP3LNNzK3h; Sat, 24 Dec 2022 16:08:13 +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 2BOG8DqV032550; Sat, 24 Dec 2022 16:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BOG8DGD032549; Sat, 24 Dec 2022 16:08:13 GMT (envelope-from git) Date: Sat, 24 Dec 2022 16:08:13 GMT Message-Id: <202212241608.2BOG8DGD032549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vincenzo Maffione Subject: git: eda82511883f - main - netmap: pkt-gen: fix ifname before cmp in source_hwaddr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eda82511883f540cd18f8afd2268636c7db97685 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=eda82511883f540cd18f8afd2268636c7db97685 commit eda82511883f540cd18f8afd2268636c7db97685 Author: Vincenzo Maffione AuthorDate: 2022-12-24 16:06:05 +0000 Commit: Vincenzo Maffione CommitDate: 2022-12-24 16:06:05 +0000 netmap: pkt-gen: fix ifname before cmp in source_hwaddr In source_hwaddr(), the configured ifname is compared against all interfaces. However, in main(), the string 'netmap:' is prepended to the interface string if no explicit type is given. Therefore the ifname will not match any system interface and the source MAC address is always empty. Check for the leading 'netmap:' string and skip past it to match against system interfaces. Note that 'tap:' and 'pcap:' devices strip the type string from the ifname in main() so no further work is needed. MFC after: 7 days Submitted by: Brian Poole --- tools/tools/netmap/pkt-gen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/tools/netmap/pkt-gen.c b/tools/tools/netmap/pkt-gen.c index c6bae50188e2..c6cf78ad85ee 100644 --- a/tools/tools/netmap/pkt-gen.c +++ b/tools/tools/netmap/pkt-gen.c @@ -684,6 +684,10 @@ source_hwaddr(const char *ifname, char *buf) return (-1); } + /* remove 'netmap:' prefix before comparing interfaces */ + if (!strncmp(ifname, "netmap:", 7)) + ifname = &ifname[7]; + for (ifap = ifaphead; ifap; ifap = ifap->ifa_next) { struct sockaddr_dl *sdl = (struct sockaddr_dl *)ifap->ifa_addr;