From nobody Sat Apr 22 17:44:29 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 4Q3f0Z17ddz46467; Sat, 22 Apr 2023 17:44:30 +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 4Q3f0Y6mvfz3LLj; Sat, 22 Apr 2023 17:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682185470; 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=JwwGj4Z3IqUZ8i4D6Y4ygGpJQvuuU08ApMZOcYr+zDI=; b=Gmk5kSjCbpSWs6JOX0VLRlyXODDYpJM240OdKYlYQJadxhs8iuE8b4UHpiVy6M2lGLg9uU MokMEA+B+UuaoRzKM2vz4O0CbLOF0Q7jYAt3EW2eFEGb1J5jBdZjJiQRhoi/WYaUkmos+d pPAAglnXGpRPxYVsHewB1qm/WH3/cjHW7ubWkLMUB4CEFQyI/4lGTi8gnx9QX/DJEnraaT 6h4tBHS8EKp/ssDqHNRq1uEKkuoMUBvs7sYVD6A2YtGdutOD7NhnPjA3bmXyUDsz/fyURf rTinOevcEFZRhMKvBxW3PdFi2irgrEEXQo3BXoqmugOFCxAzpOEJuRC/O5qj9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682185470; 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=JwwGj4Z3IqUZ8i4D6Y4ygGpJQvuuU08ApMZOcYr+zDI=; b=NsZlXInypYZ9jg3A540ST1YVpxVycS8LlqKQuvmjqWIOK2nV0+Ktq+jLgpRROAsaTLHYKQ EVUrHkWvfA9P8z9R2UuraUlhHBW82tL3Am3aRmbBtPAvnJXh8ynqay61v7DGCr6B/EkPag 7bhoSQSxHUCl5fiRhkTMXcstOo0KcF5XhmSJ6I8YZHNlPD86qkeOVB465Y/IfHnmgkRin5 VikDvy3Pl0LARl+JhSzJ8fKbTgrUaLFEEw5K7dOvUS2ufrX5J1jj7KdmM9ty6l51bLEMM+ 1Cxg1bbUt7kjmflIL+pp50SzNValm60ZVfquRrnUqzm5Hw9Mc8Tq3nxx85M4/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682185470; a=rsa-sha256; cv=none; b=L3PMi5d4aNCfck5mmO9hmkLiBf6bYI7FRN6MmqSUqo53xRWpmDBfD9LZ35X2V9HzCOKI1k C5a2tIbZ1p+7lCu2ANe+okc0/1EgThE+GTHis6EEes4INhg71ww1+tyPh0wBS88MH4qw1I +xWXHFcyUf2yFP/msX27oIXxnmd2hh5rZNygG2RRzY5nzucZvI/ZRNmL2ZohUatqpqZeZD sp0QLYFLAEJVPZv6+2emRGO14SeaS0bPg9rwLrDOXRNNXJE9vrgdH0fFanX+MBK+ukI6Gs HEfbwRLeUe8XRpWGLD1UO8PbbwRWMVceXZXaWOSimiIe3LDXeA7ue0BAgH+Exg== 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 4Q3f0Y4N0Gz19Zj; Sat, 22 Apr 2023 17:44:29 +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 33MHiT9u036239; Sat, 22 Apr 2023 17:44:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33MHiTHX036236; Sat, 22 Apr 2023 17:44:29 GMT (envelope-from git) Date: Sat, 22 Apr 2023 17:44:29 GMT Message-Id: <202304221744.33MHiTHX036236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: dbce131b8f40 - main - pfctl: match geticmpcodeby*()/print_fromto() prototypes to definitions 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbce131b8f40dbd5997db130e59ed7736a79f680 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dbce131b8f40dbd5997db130e59ed7736a79f680 commit dbce131b8f40dbd5997db130e59ed7736a79f680 Author: Kristof Provost AuthorDate: 2023-04-21 13:13:19 +0000 Commit: Kristof Provost CommitDate: 2023-04-22 17:43:56 +0000 pfctl: match geticmpcodeby*()/print_fromto() prototypes to definitions The definitions use sa_family_t, not u_int8_t. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 2 +- sbin/pfctl/pfctl_parser.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 15ed8c29abd0..1f8627f5e246 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -71,7 +71,7 @@ void print_port (u_int8_t, u_int16_t, u_int16_t, const char *, int); void print_ugid (u_int8_t, unsigned, unsigned, const char *, unsigned); void print_flags (u_int8_t); void print_fromto(struct pf_rule_addr *, pf_osfp_t, - struct pf_rule_addr *, u_int8_t, u_int8_t, int, int); + struct pf_rule_addr *, sa_family_t, u_int8_t, int, int); int ifa_skip_if(const char *filter, struct node_host *p); struct node_host *host_if(const char *, int, int *); diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h index c5da3408fb93..563c525c1707 100644 --- a/sbin/pfctl/pfctl_parser.h +++ b/sbin/pfctl/pfctl_parser.h @@ -340,10 +340,10 @@ struct icmpcodeent { u_int8_t code; }; -const struct icmptypeent *geticmptypebynumber(u_int8_t, u_int8_t); -const struct icmptypeent *geticmptypebyname(char *, u_int8_t); -const struct icmpcodeent *geticmpcodebynumber(u_int8_t, u_int8_t, u_int8_t); -const struct icmpcodeent *geticmpcodebyname(u_long, char *, u_int8_t); +const struct icmptypeent *geticmptypebynumber(u_int8_t, sa_family_t); +const struct icmptypeent *geticmptypebyname(char *, sa_family_t); +const struct icmpcodeent *geticmpcodebynumber(u_int8_t, u_int8_t, sa_family_t); +const struct icmpcodeent *geticmpcodebyname(u_long, char *, sa_family_t); struct pf_timeout { const char *name;