mac_ipacl: Use IfAPI
Use `if_t` instead of `struct ifnet *`, and if_name() accessor. Sponsored by: Juniper Networks, Inc.
This commit is contained in:
parent
2a3716432d
commit
b820820ece
@ -317,7 +317,7 @@ SYSCTL_PROC(_security_mac_ipacl, OID_AUTO, rules,
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
rules_check(struct ucred *cred,
|
rules_check(struct ucred *cred,
|
||||||
struct ipacl_addr *ip_addr, struct ifnet *ifp)
|
struct ipacl_addr *ip_addr, if_t ifp)
|
||||||
{
|
{
|
||||||
struct ip_rule *rule;
|
struct ip_rule *rule;
|
||||||
int error;
|
int error;
|
||||||
@ -344,7 +344,7 @@ rules_check(struct ucred *cred,
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (strcmp(rule->if_name, "\0") &&
|
if (strcmp(rule->if_name, "\0") &&
|
||||||
strcmp(rule->if_name, ifp->if_xname))
|
strcmp(rule->if_name, if_name(ifp)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
switch (rule->af) {
|
switch (rule->af) {
|
||||||
@ -397,7 +397,7 @@ rules_check(struct ucred *cred,
|
|||||||
#ifdef INET
|
#ifdef INET
|
||||||
static int
|
static int
|
||||||
ipacl_ip4_check_jail(struct ucred *cred,
|
ipacl_ip4_check_jail(struct ucred *cred,
|
||||||
const struct in_addr *ia, struct ifnet *ifp)
|
const struct in_addr *ia, if_t ifp)
|
||||||
{
|
{
|
||||||
struct ipacl_addr ip4_addr;
|
struct ipacl_addr ip4_addr;
|
||||||
|
|
||||||
@ -417,7 +417,7 @@ ipacl_ip4_check_jail(struct ucred *cred,
|
|||||||
#ifdef INET6
|
#ifdef INET6
|
||||||
static int
|
static int
|
||||||
ipacl_ip6_check_jail(struct ucred *cred,
|
ipacl_ip6_check_jail(struct ucred *cred,
|
||||||
const struct in6_addr *ia6, struct ifnet *ifp)
|
const struct in6_addr *ia6, if_t ifp)
|
||||||
{
|
{
|
||||||
struct ipacl_addr ip6_addr;
|
struct ipacl_addr ip6_addr;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user