Date: Thu, 6 Jul 2006 10:05:59 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 100709 for review Message-ID: <200607061005.k66A5xfm060996@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100709 Change 100709 by rwatson@rwatson_zoo on 2006/07/06 10:04:59 Two name shortenings/simplifications. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#11 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#11 (text+ko) ==== @@ -222,7 +222,7 @@ */ typedef int (*mpo_inpcb_init_label_t)(struct label *label, int flag); typedef void (*mpo_inpcb_destroy_label_t)(struct label *label); -typedef void (*mpo_inpcb_create_from_socket_t)(struct socket *so, +typedef void (*mpo_inpcb_create_t)(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel); typedef void (*mpo_inpcb_create_mbuf_t)(struct inpcb *inp, @@ -474,7 +474,7 @@ char *element_name, char *element_data, int *claimed); typedef void (*mpo_socket_create_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef void (*mpo_socket_create_from_socket_t)(struct socket *oldsocket, +typedef void (*mpo_socket_accept_t)(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel); typedef void (*mpo_socket_relabel_t)(struct ucred *cred, struct socket *so, @@ -711,12 +711,9 @@ mpo_ifnet_check_relabel_t mpo_ifnet_check_relabel; mpo_ifnet_check_transmit_t mpo_ifnet_check_transmit; - /* - * XXXRW: Could s/create_from_socket/create/. - */ mpo_inpcb_init_label_t mpo_inpcb_init_label; mpo_inpcb_destroy_label_t mpo_inpcb_destroy_label; - mpo_inpcb_create_from_socket_t mpo_inpcb_create_from_socket; + mpo_inpcb_create_t mpo_inpcb_create; mpo_inpcb_create_mbuf_t mpo_inpcb_create_mbuf; mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; mpo_inpcb_check_deliver_t mpo_inpcb_check_deliver; @@ -865,7 +862,7 @@ mpo_socket_externalize_peer_label_t mpo_socket_externalize_peer_label; mpo_socket_internalize_label_t mpo_socket_internalize_label; mpo_socket_create_t mpo_socket_create; - mpo_socket_create_from_socket_t mpo_socket_create_from_socket; + mpo_socket_accept_t mpo_socket_accept; mpo_socket_relabel_t mpo_socket_relabel; mpo_socket_set_peer_from_socket_t mpo_socket_set_peer_from_socket; mpo_socket_create_mbuf_t mpo_socket_create_mbuf;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607061005.k66A5xfm060996>