From nobody Wed Apr 13 23:09:39 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 44DF71B41096; Wed, 13 Apr 2022 23:09:40 +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 4KdywM527gz4lvQ; Wed, 13 Apr 2022 23:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891379; 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=zQ6GrKUgFvkTty4gomVcCsjbDJyiMg/lv06ZHqipa8k=; b=QEQFazWKt13XDn0TgV+IvMT2LXr35G6M4BEenicXDTj9X3i5a6yuUgOGp42wI0X5NcBU/B DLLFZ+3zxqVlSG9Nul7NTesSzCnPC3NMUeYDbXdNI7TJS+8nfwPwZvSOY2vlTRw2HIdcY3 F6nb2AplRgCCG3blSfVy1JlkhzRcDTJK1jDg4hvJhEOETYuZosafUssHFAwXFS2LHCdGD/ f+V1yWI4tWLCHQePzJJXODRQK2eUIcqiBDDOQlSWTxxJ+UVih75wofbfmx5MbdTX/t+jYm SB7EsiahWGalBB+3iGlnv5Ga5yo5tBJ6TtIE8cprAoVQTkTqepjNdnJ55er9Uw== 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 719B315030; Wed, 13 Apr 2022 23:09:39 +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 23DN9d0s074662; Wed, 13 Apr 2022 23:09:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9dji074661; Wed, 13 Apr 2022 23:09:39 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:39 GMT Message-Id: <202204132309.23DN9dji074661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 13ec6858d64a - main - tcp_log_addr: ip is only used for INET. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13ec6858d64ae47b9c24e3d30dd578114729c9fa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891379; 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=zQ6GrKUgFvkTty4gomVcCsjbDJyiMg/lv06ZHqipa8k=; b=V2krldWTqEyR80HfjzQWSBFxrfFHt52qFazU2GaEuYlekr+2Hdu6qnWK4K9YPclUDUbz06 1wNyaqjXqJL8hWk9NJrsaGMZor0EMOZujFjrgDGOPTRuUeLgvj0g8pqK8o4d5zDe0U+Fbl 10VcYmnwvS0jvZLkanBHI5ykYPbqjMFHPgc7kyMGovAYWjMPndglSjeQ2euKLmVUjwFZ0z qVZo+jPv/5t9UWlM1OtRU1SSk+fnvJ25H9eZzP9Gav7mIqmbfZZePJo5TBxsTC3lPumg+S chJ2RXFXfjOkurdoNNHYnVE49fL9wsC3Y+EQ4mRBxHkFWFRNiaw54Lp8Ri1TKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891379; a=rsa-sha256; cv=none; b=vkeLNppFqisV/AB+zlZqg+MkLPlZ7ITvUxUUQWIE7J6rfi4i5mIWSbCOXxQoFRG7P2/TTc 3jGmkELgjQLFpdtqqyTpnF2hs4YqtOAdJoV+mN/IMVqF6ZP5uaQkuJelr+5mjgwtEbY7YE ehjKkeWiROhdKUMIxl+HmcWnWPF/J1SDzrUDhWqippKGXkOaUZ68L0kQtIsQGdsGDIo1Bi tAzYXCtc2gE0Zbfvm61YxlDjWpj9I8WIRWWa3WAgq0jxeiZqxoOiL8oOLdT1xN35pzSmlZ xi1Ts+hOnoJDop2x57LKSGxOehwQzdZgZTkTlC5DXOmLHDTE2TFJmGX44mvHiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=13ec6858d64ae47b9c24e3d30dd578114729c9fa commit 13ec6858d64ae47b9c24e3d30dd578114729c9fa Author: John Baldwin AuthorDate: 2022-04-13 23:08:21 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:21 +0000 tcp_log_addr: ip is only used for INET. --- sys/netinet/tcp_subr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 348a8bb7151e..189e2cf26fa6 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -3917,13 +3917,12 @@ tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, { char *s, *sp; size_t size; - struct ip *ip; +#ifdef INET + struct ip *ip = (struct ip *)ip4hdr; +#endif #ifdef INET6 - const struct ip6_hdr *ip6; - - ip6 = (const struct ip6_hdr *)ip6hdr; + const struct ip6_hdr *ip6 = (const struct ip6_hdr *)ip6hdr; #endif /* INET6 */ - ip = (struct ip *)ip4hdr; /* * The log line looks like this: