From nobody Fri Jul 25 17:39:16 2025 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 4bpZqm5qFkz627nW; Fri, 25 Jul 2025 17:39:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpZqm3PHPz3S65; Fri, 25 Jul 2025 17:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753465156; 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=3tElwIxPygsPKtfjIcfLXr1M6NKcWgfxC6lddTnRfH0=; b=CWVMtDs+GjXyMsoiSdT6qMeL7Dfr6UEOxxFJM8QrTj+lX0jUOJe+AYdUdIq3CLyDHpG8gT ftOqEPUnq3QWdGM//a8uoVSVDUJgjgXisVhUaR0gEClfcM5EsHIsBDeAu7QQ6vhSaIs1rs FjZAp9pHsyYADFmcMVS51X4Xu9yC5sSOA2wY1ugRJo9BMerULTKgg5+1vGSTY/bfaDe7/+ FJhZ2ij/+wnZKTB0mo/uI5FppmVGICQko8wgYjU69EhdVtVR9v9wjYJ0X2Bs4v5nqztswd PzynBEb/VWWH9Yy2vCvf4DMtuUxmuSXOTND3119Gg8QKiMnr5vVgmyylSkhjAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753465156; 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=3tElwIxPygsPKtfjIcfLXr1M6NKcWgfxC6lddTnRfH0=; b=xpgikHcK+O61sTwrt3xYr+f7FIsBZXwlIsikH/svEQmDyBZUgEeQztz54Sc34QMTAp8Phf O2V23cFDPEC1HYk0GiZVqCg+MU/YqkjMcNSSfH6xNCbZigD3D6D5e9lAef85HlJgnGcyaz q08HUQDaivG5p5BGMxFiyie/dNZhIxOf8xSdX9diy/FnrjZbpAAci+iHCuEQfx+TEg5uA5 Pn0pPHprga29axUmmPPX0SYRuvSnQBBhz6JLrWIkwCozI+FWm8a1vG8yKcVv7nxG85pj5H FWQXYacjUYOb5sXP7w13X61DEQwh1THr9CJItofOdVfQxAJReov2PX3EyY8MNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753465156; a=rsa-sha256; cv=none; b=i0lYbrodtTUT0ne6DdB8XVSDX4lswrqmKoiNytluXDjsGZyNDXQ4cDFj4tBNPv0DILFp0d ZNRSfJclXzNi/gh2RhxBj51Fni5ms1iv1rQxXA65b/AMXsuqENMQVJYNmW7z90OgXKfg+s goA4wj9Iq0M5CVc4067FTN5JqLOzQF3JChPTb3bZ+e1yhPRB9DOItCkvvAoWonM15AmkQ7 i3v20D8wviQbuTIcxYi6SHzQj079tUh56qR9IWbHGPiU7bWLOiNc/HaJjnvEZEo0FpJnYI OuTIC8H8jqboHVwdikqVLmieAnE+Y3krA4AobdjFl+Sttpv27tE4gmLGV62otA== 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 4bpZqm2zgwzt7n; Fri, 25 Jul 2025 17:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56PHdGgJ012726; Fri, 25 Jul 2025 17:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PHdGnr012723; Fri, 25 Jul 2025 17:39:16 GMT (envelope-from git) Date: Fri, 25 Jul 2025 17:39:16 GMT Message-Id: <202507251739.56PHdGnr012723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2ff1587e3803 - main - if_ovpn: Sprinkle const over some helper functions 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ff1587e3803e76a9726e1734181a5170079ddbe Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2ff1587e3803e76a9726e1734181a5170079ddbe commit 2ff1587e3803e76a9726e1734181a5170079ddbe Author: Mark Johnston AuthorDate: 2025-07-25 13:13:13 +0000 Commit: Mark Johnston CommitDate: 2025-07-25 17:39:01 +0000 if_ovpn: Sprinkle const over some helper functions No functional change intended. Reviewed by: kp MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51494 --- sys/net/if_ovpn.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 5081cc906433..4c7cbed06bf0 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -204,7 +204,8 @@ static int ovpn_encap(struct ovpn_softc *, uint32_t, struct mbuf *); static int ovpn_get_af(struct mbuf *); static void ovpn_free_kkey_dir(struct ovpn_kkey_dir *); static bool ovpn_check_replay(struct ovpn_kkey_dir *, uint32_t); -static int ovpn_peer_compare(struct ovpn_kpeer *, struct ovpn_kpeer *); +static int ovpn_peer_compare(const struct ovpn_kpeer *, + const struct ovpn_kpeer *); static RB_PROTOTYPE(ovpn_kpeers, ovpn_kpeer, tree, ovpn_peer_compare); static RB_GENERATE(ovpn_kpeers, ovpn_kpeer, tree, ovpn_peer_compare); @@ -277,7 +278,7 @@ SYSCTL_INT(_net_link_openvpn, OID_AUTO, netisr_queue, "Use netisr_queue() rather than netisr_dispatch()."); static int -ovpn_peer_compare(struct ovpn_kpeer *a, struct ovpn_kpeer *b) +ovpn_peer_compare(const struct ovpn_kpeer *a, const struct ovpn_kpeer *b) { return (a->peerid - b->peerid); } @@ -303,15 +304,15 @@ ovpn_find_only_peer(struct ovpn_softc *sc) } static uint16_t -ovpn_get_port(struct sockaddr_storage *s) +ovpn_get_port(const struct sockaddr_storage *s) { switch (s->ss_family) { case AF_INET: { - struct sockaddr_in *in = (struct sockaddr_in *)s; + const struct sockaddr_in *in = (const struct sockaddr_in *)s; return (in->sin_port); } case AF_INET6: { - struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)s; + const struct sockaddr_in6 *in6 = (const struct sockaddr_in6 *)s; return (in6->sin6_port); } default: