pfctl: match geticmpcodeby*()/print_fromto() prototypes to definitions

The definitions use sa_family_t, not u_int8_t.

Sponsored by:	Rubicon Communications, LLC ("Netgate")

This commit is contained in:

Kristof Provost

2023-04-21 15:13:19 +02:00

parent 5e3bb05147

commit dbce131b8f

2 changed files with 5 additions and 5 deletions

									
										sbin/pfctl/pfctl_parser.c
									
		+1
		-1
	
												View File
												
				@@ -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 *);

									
										sbin/pfctl/pfctl_parser.h
									
		+4
		-4
	
												View File
												
				@@ -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;