From nobody Fri Apr 14 10:09:58 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 4PyXHp3Fkdz44wHg; Fri, 14 Apr 2023 10:09:58 +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 4PyXHp2Gvzz3vLj; Fri, 14 Apr 2023 10:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681466998; 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=l5hxuWMCLGsYEEE/SJS/y3iFD9mQH2tfgaYib8xVlCg=; b=iHjg1HjpMT6lEANN4F4zIr8owCJkDqSysjjUa0NF5yvWNJgftPL1ChF+uCQwR8x/T+K5Vw qH0WcadFbB6S7eM3kOlcqefXffNJ6jPcESusQcyqp/vDqRqP/4BfNXZ4rcg25lsuLLNFNk VVTmRC796nc/QQoBgsNB68EQ/kRwB43Em7+nxQq0440CjVHWsM9jWO/dlPJmX4U3zIZyuy Sr7ZIXMDbLs2/Ghx0A2VtGmqOKx+OL+iZo3ipEjkVZWbmFXf1gatIeqfyCA8lb8bdQiAzt dzqOp3wUR+Ltgwqu3j9nN+MKU0ZJ/f7E9AJiK6dufTE6SIuOjsqDWEehNTgNJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681466998; 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=l5hxuWMCLGsYEEE/SJS/y3iFD9mQH2tfgaYib8xVlCg=; b=pnrPiiA408J4WcSVL131HowirwI9sQzdJd8+0IdW3KUj25oyEklHvUEoBtYvC6fk8UO3Zf 59CvGcZi4QyPmsMoAiLRGoMsCgDsOn3H9a+G6BsL/GMbk/z1iu1h7ED1s442bkDXvUduRq CSU/sWzVasTJUdXMB0nPEDpWB3KOcuVhARhRxdu7wep60JT4jho6Xka0pskCQO/WdzXF5P 3+Vrw6iTVHQQyKsZlJAXAJbpKOdSjaqfuh3oYM0D7V5tvduBiRTxMHFiI8N3rhmJWxd5md 8K9siGi9HLSSLQBaMly6mCar2peVwpK2x55ira/mpJOSEjYbabHG+svNEGplEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681466998; a=rsa-sha256; cv=none; b=G+xOCRBsNdepW/ewW4oai76hcHxtEeprYLzYkC/1PdZQqxidjrvSigXsn0bqbv3YsNBG8c FEgMB83rYGpVo6aPmMC/q2+QMkgipN5lmOq5HSdtIDcFzQRkNetSaMZJoDB7IKheKwCUOs NenLKeo8Nx8aSdvTtQjnqsiw2jSY+IOmbOHtlA5zEQMW37a0wgpFjivPD2TN8ad7ui1V9U Njr+4faZeFwWo3dXPfWisOaDsPP46+4z7HwqTVGsyVtVcwKYZGlvifa5yaK4y4DpySdC0o Nd4jz34lrIAohMDMGWVoC+wgExkBnTwKvLRksPHVYCPCcFXoBLqG24k+pupRjw== 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 4PyXHp1MBvzKLV; Fri, 14 Apr 2023 10:09:58 +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 33EA9wF6096929; Fri, 14 Apr 2023 10:09:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EA9wXl096928; Fri, 14 Apr 2023 10:09:58 GMT (envelope-from git) Date: Fri, 14 Apr 2023 10:09:58 GMT Message-Id: <202304141009.33EA9wXl096928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 9af6f4268ac3 - main - bridge: Use the %D identifier to format MAC address 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9af6f4268ac3cc8203f34c746d955b4405279099 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9af6f4268ac3cc8203f34c746d955b4405279099 commit 9af6f4268ac3cc8203f34c746d955b4405279099 Author: Zhenlei Huang AuthorDate: 2023-04-14 10:08:56 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-14 10:08:56 +0000 bridge: Use the %D identifier to format MAC address It is shorter and more readable. No functional change intended. Reviewed by: kp Fixes: 2d3614fb132b bridge: Log MAC address port flapping MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39542 --- sys/net/if_bridge.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index f71d7c0cdfd1..44ee52e62b77 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2957,11 +2957,10 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, if (V_log_mac_flap && ppsratecheck(&V_log_last, &V_log_count, V_log_interval)) { - uint8_t *addr = &brt->brt_addr[0]; log(LOG_NOTICE, - "%s: mac address %02x:%02x:%02x:%02x:%02x:%02x vlan %d moved from %s to %s\n", + "%s: mac address %6D vlan %d moved from %s to %s\n", sc->sc_ifp->if_xname, - addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], + &brt->brt_addr[0], ":", brt->brt_vlan, obif->bif_ifp->if_xname, bif->bif_ifp->if_xname);