From nobody Wed Apr 13 23:09:40 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 6E06B1B40F5D; Wed, 13 Apr 2022 23:09:42 +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 4KdywP1PXsz4lyN; Wed, 13 Apr 2022 23:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891381; 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=cjGGiTUs1UZTNF3SIoyrSzIfZ2WYyh8/OkTSk/r3ERE=; b=YHLyGQeQDVA3E4PVbzjdJmu7o/aRIW77seLQqMTMpnLn7XLOYn5nwB+nwAko13DUDucUYW 3A+w6L9AT2Ywy72GrPTOwxpktxdNewPBtVVI6wV/fDW7pbSZ1nnMBAiPCD8AuyJWYeRmua D53WQQcCWz+C4vV1O51Mg05D/H9yhlCR/px1HUSgtDmToDA51TuOIrfv4dnG0h/9kZ31ua QHUbtviveInF+1jFPgo5ohSpspkvgAV8yP3IWBtQjD9a9ZNkBKEHN/4fO1frxJPWBtFltc linCiW64SDMWIuaOXZKdfPQirOn3rCYgPVsVTGqk9sNKls/uVVyaT8yhx77pBA== 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 C3CCE15402; Wed, 13 Apr 2022 23:09:40 +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 23DN9eG7074691; Wed, 13 Apr 2022 23:09:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9eDW074690; Wed, 13 Apr 2022 23:09:40 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:40 GMT Message-Id: <202204132309.23DN9eDW074690@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: 700a395c581c - main - tcp_log_vain/addrs: Use a const pointer for the IPv4 header. 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: 700a395c581c43d77cc827b9fb326ece629bf4c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891381; 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=cjGGiTUs1UZTNF3SIoyrSzIfZ2WYyh8/OkTSk/r3ERE=; b=Zk/Frp4I+UH9yOnC/TkQTn/8XaXbUMJU82BjJ/3TBALA50REPiTZm2XRz+xtULdbHryFsb G1J6SmRfjwOyQeold2ypsApSrzAIXZ2/K+wKfmy61uIQBWXVppJZJrjfrQBHP9D55qdhbK RZG4EwzsMaaVO1MOb3UVOw4zgSI9vK01zyLizNP221OILFIsL6uRM1a+EXDhhKyAzyVsOi 8xpdp5McXDLfgukZULl2bI7zpS2h6d89+kryccWv42a1XiCborD8pOVVZrldvcg1bszRNk v8ODmXSc7KW2RoF5ZPIW990yeQat6kAnjNZe52BSG1qatBOlYyoO3rwWy9Ijeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891381; a=rsa-sha256; cv=none; b=X2DPboKr51rhVQTakoSLcS+CqnYHuoW5gMz2KA9VnVJRMWJ1m+tBPHXED2zL2vgpkQN5No 9P72opxzCZqhWc1ZLc5sLX/7B47pgVJk6VU4++88U+lGMFVB4Y8K4c+la4g8QN2BmlhBwf dJAPVI3WnD1N/ivZToBMWoA12qNjZCNqRlKK7cSG+sWG6ZMw0uV29YVcz4NbnA++zwBpnX RFC3kNUREuWIbse1dL59VBAfbdphA5Mp/rTsuegh5MpQmdkcBqhmp8sdHUiWb0Qaoa1ATN lZJ7Myn/1wFiCeooear82pxW0wbdN3DiUrrWhOp2X4JstywfyOsEMf9/TD29eg== 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=700a395c581c43d77cc827b9fb326ece629bf4c1 commit 700a395c581c43d77cc827b9fb326ece629bf4c1 Author: John Baldwin AuthorDate: 2022-04-13 23:08:21 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:21 +0000 tcp_log_vain/addrs: Use a const pointer for the IPv4 header. The pointer to the IPv6 header was already const. --- sys/netinet/tcp_subr.c | 10 +++++----- sys/netinet/tcp_var.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 189e2cf26fa6..3b02cd6d1945 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -377,7 +377,7 @@ static struct inpcb *tcp_notify(struct inpcb *, int); static struct inpcb *tcp_mtudisc_notify(struct inpcb *, int); static struct inpcb *tcp_mtudisc(struct inpcb *, int); static char * tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th, - void *ip4hdr, const void *ip6hdr); + const void *ip4hdr, const void *ip6hdr); static struct tcp_function_block tcp_def_funcblk = { .tfb_tcp_block_name = "freebsd", @@ -3888,7 +3888,7 @@ SYSCTL_PROC(_net_inet_tcp, OID_AUTO, switch_to_ifnet_tls, * and ip6_hdr pointers have to be passed as void pointers. */ char * -tcp_log_vain(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, +tcp_log_vain(struct in_conninfo *inc, struct tcphdr *th, const void *ip4hdr, const void *ip6hdr) { @@ -3900,7 +3900,7 @@ tcp_log_vain(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, } char * -tcp_log_addrs(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, +tcp_log_addrs(struct in_conninfo *inc, struct tcphdr *th, const void *ip4hdr, const void *ip6hdr) { @@ -3912,13 +3912,13 @@ tcp_log_addrs(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, } static char * -tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, +tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th, const void *ip4hdr, const void *ip6hdr) { char *s, *sp; size_t size; #ifdef INET - struct ip *ip = (struct ip *)ip4hdr; + const struct ip *ip = (const struct ip *)ip4hdr; #endif #ifdef INET6 const struct ip6_hdr *ip6 = (const struct ip6_hdr *)ip6hdr; diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index b9d37471771c..be9ff06f3a85 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1087,9 +1087,9 @@ int tcp_ctloutput(struct socket *, struct sockopt *); void tcp_ctlinput_viaudp(int, struct sockaddr *, void *, void *); void tcp_drain(void); void tcp_fini(void *); -char *tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *, +char *tcp_log_addrs(struct in_conninfo *, struct tcphdr *, const void *, const void *); -char *tcp_log_vain(struct in_conninfo *, struct tcphdr *, void *, +char *tcp_log_vain(struct in_conninfo *, struct tcphdr *, const void *, const void *); int tcp_reass(struct tcpcb *, struct tcphdr *, tcp_seq *, int *, struct mbuf *);