From owner-svn-src-head@FreeBSD.ORG Fri Nov 1 10:01:58 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 45CFB498; Fri, 1 Nov 2013 10:01:58 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 19EA82DC8; Fri, 1 Nov 2013 10:01:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1A1veA025620; Fri, 1 Nov 2013 10:01:57 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1A1vFf025618; Fri, 1 Nov 2013 10:01:57 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311011001.rA1A1vFf025618@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 1 Nov 2013 10:01:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257498 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 10:01:58 -0000 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 *);