Date: Fri, 1 Nov 2013 10:01:57 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257498 - in head/sys: kern sys Message-ID: <201311011001.rA1A1vFf025618@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Fri Nov 1 10:01:57 2013 New Revision: 257498 URL: http://svnweb.freebsd.org/changeset/base/257498 Log: prison_check_ip4() can take const arguments. Modified: head/sys/kern/kern_jail.c head/sys/sys/jail.h Modified: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Fri Nov 1 07:03:44 2013 (r257497) +++ head/sys/kern/kern_jail.c Fri Nov 1 10:01:57 2013 (r257498) @@ -135,7 +135,7 @@ static void prison_racct_modify(struct p static void prison_racct_detach(struct prison *pr); #endif #ifdef INET -static int _prison_check_ip4(struct prison *pr, struct in_addr *ia); +static int _prison_check_ip4(const struct prison *, const struct in_addr *); static int prison_restrict_ip4(struct prison *pr, struct in_addr *newip4); #endif #ifdef INET6 @@ -2930,7 +2930,7 @@ prison_remote_ip4(struct ucred *cred, st * doesn't allow IPv4. Address passed in in NBO. */ static int -_prison_check_ip4(struct prison *pr, struct in_addr *ia) +_prison_check_ip4(const struct prison *pr, const struct in_addr *ia) { int i, a, z, d; @@ -2960,7 +2960,7 @@ _prison_check_ip4(struct prison *pr, str } int -prison_check_ip4(struct ucred *cred, struct in_addr *ia) +prison_check_ip4(const struct ucred *cred, const struct in_addr *ia) { struct prison *pr; int error; Modified: head/sys/sys/jail.h ============================================================================== --- head/sys/sys/jail.h Fri Nov 1 07:03:44 2013 (r257497) +++ head/sys/sys/jail.h Fri Nov 1 10:01:57 2013 (r257498) @@ -384,7 +384,7 @@ int prison_equal_ip4(struct prison *, st int prison_get_ip4(struct ucred *cred, struct in_addr *ia); int prison_local_ip4(struct ucred *cred, struct in_addr *ia); int prison_remote_ip4(struct ucred *cred, struct in_addr *ia); -int prison_check_ip4(struct ucred *cred, struct in_addr *ia); +int prison_check_ip4(const struct ucred *, const struct in_addr *); int prison_saddrsel_ip4(struct ucred *, struct in_addr *); #ifdef INET6 int prison_equal_ip6(struct prison *, struct prison *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311011001.rA1A1vFf025618>