consistently use rid_t instead of struct rid: typedefed

Author: Emmankoko

lib/libnpf/npf.c

@@ -736,7 +736,7 @@ npf_rule_setproc(nl_rule_t *rl, const char *name)
 }
 
 int
-npf_rule_setrid(nl_rule_t *rl, struct r_id *rid, const char *name)
+npf_rule_setrid(nl_rule_t *rl, rid_t *rid, const char *name)
 {
 	uint64_t uid_element[3] = { rid->id[0], rid->id[1], rid->op };
 	nvlist_add_number_array(rl->rule_dict, name, uid_element, 3);

lib/libnpf/npf.h

@@ -106,7 +106,7 @@ nl_rule_t *	npf_rule_create(const char *, uint32_t, const char *);
 int		npf_rule_setcode(nl_rule_t *, int, const void *, size_t);
 int		npf_rule_setprio(nl_rule_t *, int);
 int		npf_rule_setproc(nl_rule_t *, const char *);
-int		npf_rule_setrid(nl_rule_t *, struct r_id *, const char *);
+int		npf_rule_setrid(nl_rule_t *, rid_t *, const char *);
 int		npf_rule_setkey(nl_rule_t *, const void *, size_t);
 int		npf_rule_setinfo(nl_rule_t *, const void *, size_t);
 const char *	npf_rule_getname(nl_rule_t *);

sys/net/npf/npf_impl.h

@@ -485,8 +485,8 @@ void		npf_portmap_sysfini(void);
 /* uid/gid process matching */
 int		npf_socket_lookup_uid(npf_cache_t *, int, uint32_t *);
 int		npf_socket_lookup_gid(npf_cache_t *, int, uint32_t *);
-int		npf_match_gid(struct r_id *, uint32_t);
-int		npf_match_uid(struct r_id *, uint32_t);
+int		npf_match_gid(rid_t *, uint32_t);
+int		npf_match_uid(rid_t *, uint32_t);
 
 void		npf_portmap_init(npf_t *);
 void		npf_portmap_fini(npf_t *);

sys/net/npf/npf_ruleset.c

@@ -720,11 +720,11 @@ npf_rule_setcode(npf_rule_t *rl, const int type, void *code, size_t size)
 }
 
 /* again, use a single rule getid function both uid and gids */
-static struct r_id
+static rid_t
 npf_rule_getrid(const nvlist_t *req, const char *name)
 {
 	size_t nitems;
-	struct r_id id;
+	rid_t id;
 	const uint64_t *rid = nvlist_get_number_array(req, name, &nitems);
 	KASSERT(nitems == 3);
 
@@ -736,9 +736,9 @@ npf_rule_getrid(const nvlist_t *req, const char *name)
 }
 
 static void
-npf_rule_setrid(const nvlist_t *req, struct r_id** rid, const char *name)
+npf_rule_setrid(const nvlist_t *req, rid_t** rid, const char *name)
 {
-	struct r_id id;
+	rid_t id;
 
 	id = npf_rule_getrid(req, name);
 	*rid = kmem_alloc(sizeof(**rid), KM_SLEEP);

sys/net/npf/npf_socket.c

@@ -50,13 +50,13 @@
  */
 
 int
-npf_match_uid(struct r_id *uid, uint32_t uid_lookup)
+npf_match_uid(rid_t *uid, uint32_t uid_lookup)
 {
 	return npf_match(uid->op, uid->id[0], uid->id[1], uid_lookup);
 }
 
 int
-npf_match_gid(struct r_id *gid, uint32_t gid_lookup)
+npf_match_gid(rid_t *gid, uint32_t gid_lookup)
 {
 	return npf_match(gid->op, gid->id[0], gid->id[1], gid_lookup);
 }

usr.sbin/npf/npfctl/npf_data.c

@@ -305,10 +305,10 @@ npfctl_parse_group(const char *group, *uint32_t *gid)
   * this function is called for both gid and uid init in parser
   * both uid and gid are both uint32_t
   */
-struct r_id *
+rid_t *
 npfctl_init_rid(uint32_t uid1, uint32_t uid2, uint8_t op)
 {
-	struct r_id *rid = ecalloc(1, sizeof(*rid));
+	rid_t *rid = ecalloc(1, sizeof(*rid));
 	rid->id[0] = uid1;
 	rid->id[1] = uid2;
 	rid->op = op;

usr.sbin/npf/npfctl/npf_parse.y

@@ -215,8 +215,8 @@ yyerror(const char *fmt, ...)
 	filt_opts_t	filtopts;
 	opt_proto_t	optproto;
 	rule_group_t	rulegroup;
-	struct r_id 	*uid;
-	struct r_id 	*gid;
+	rid_t 	*uid;
+	rid_t 	*gid;
 }
 
 %%

usr.sbin/npf/npfctl/npfctl.h

@@ -78,8 +78,8 @@ typedef struct filt_opts {
 	addr_port_t	fo_to;
 	bool		fo_finvert;
 	bool		fo_tinvert;
-	struct r_id	*uid;
-	struct r_id	*gid;
+	rid_t	*uid;
+	rid_t	*gid;
 } filt_opts_t;
 
 typedef struct opt_proto {
@@ -143,7 +143,7 @@ npfvar_t *	npfctl_parse_fam_addr_mask(const char *, const char *,
 		    unsigned long *);
 int		npfctl_parse_user(const char *, uint32_t *);
 int		npfctl_parse_group(const char *, uint32_t *);
-struct r_id *	npfctl_init_rid(uint32_t, uint32_t, uint8_t);
+rid_t *		npfctl_init_rid(uint32_t, uint32_t, uint8_t);
 bool		npfctl_parse_cidr(char *, fam_addr_mask_t *, int *);
 uint16_t	npfctl_npt66_calcadj(npf_netmask_t, const npf_addr_t *,
 		    const npf_addr_t *);