From owner-p4-projects@FreeBSD.ORG Thu Jul 6 10:33:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0B1516A4E1; Thu, 6 Jul 2006 10:33:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B53D16A4DA for ; Thu, 6 Jul 2006 10:33:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4899443D45 for ; Thu, 6 Jul 2006 10:33:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66AXb3f062537 for ; Thu, 6 Jul 2006 10:33:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66AXart062534 for perforce@freebsd.org; Thu, 6 Jul 2006 10:33:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 10:33:36 GMT Message-Id: <200607061033.k66AXart062534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 100714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 10:33:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=100714 Change 100714 by rwatson@rwatson_zoo on 2006/07/06 10:33:28 Update to reflect name changes. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#14 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#14 (text+ko) ==== @@ -243,10 +243,10 @@ typedef void (*mpo_ipq_create_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); -typedef void (*mpo_ipq_create_datagram_t) +typedef void (*mpo_ipq_reassemble_t) (struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel); -typedef int (*mpo_ipq_fragment_match_t)(struct mbuf *fragment, +typedef int (*mpo_ipq_match_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); typedef void (*mpo_ipq_update_t)(struct mbuf *fragment, @@ -297,16 +297,9 @@ typedef void (*mpo_mbuf_destroy_label_t)(struct label *label); typedef void (*mpo_mbuf_copy_label_t)(struct label *src, struct label *dest); -typedef void (*mpo_mbuf_create_fragment_t)(struct mbuf *datagram, - struct label *datagramlabel, struct mbuf *fragment, - struct label *fragmentlabel); typedef void (*mpo_mbuf_create_netlayer_t)(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel); -typedef void (*mpo_mbuf_reflect_icmp_t)(struct mbuf *m, - struct label *mlabel); -typedef void (*mpo_mbuf_reflect_tcp_t)(struct mbuf *m, - struct label *mlabel); /* * Object: struct mount (File system mountpoint) @@ -322,6 +315,17 @@ struct label *fslabel); /* + * IPv4 networking. + */ +typedef void (*mpo_netinet_fragment_t)(struct mbuf *datagram, + struct label *datagramlabel, struct mbuf *fragment, + struct label *fragmentlabel); +typedef void (*mpo_netinet_icmp_reply_t)(struct mbuf *m, + struct label *mlabel); +typedef void (*mpo_netinet_tcp_reply_t)(struct mbuf *m, + struct label *mlabel); + +/* * Object: struct pipepair (Pipe) */ typedef void (*mpo_pipe_init_label_t)(struct label *label); @@ -386,29 +390,28 @@ /* * Object: struct msqid_kernel (System V message queue) */ -typedef void (*mpo_sysv_msgqueue_init_label_t)(struct label *label); -typedef void (*mpo_sysv_msgqueue_destroy_t)(struct label *label); -typedef void (*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel); -typedef void (*mpo_sysv_msgqueue_create_msg_t)(struct ucred *cred, +typedef void (*mpo_sysv_msq_init_label_t)(struct label *label); +typedef void (*mpo_sysv_msq_destroy_t)(struct label *label); +typedef void (*mpo_sysv_msq_cleanup_t)(struct label *msqlabel); +typedef void (*mpo_sysv_msq_create_msg_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel); -typedef void (*mpo_sysv_msgqueue_create_t)(struct ucred *cred, +typedef void (*mpo_sysv_msq_create_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel); - -typedef int (*mpo_sysv_msgqueue_check_msgmsq_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msgmsq_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msgrcv_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msgrcv_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_sysv_msgqueue_check_msgrmid_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msgrmid_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_sysv_msgqueue_check_msqget_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msqget_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqsnd_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msqsnd_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqrcv_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msqrcv_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqctl_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msqctl_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd); /*