Date: Mon, 29 Jul 2002 09:40:25 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 15129 for review Message-ID: <200207291640.g6TGeP9q093871@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15129 Change 15129 by rwatson@rwatson_paprika on 2002/07/29 09:39:31 Further entry point naming improvements: mac_create_mbuf_linklayer_for_ifnet -> mac_create_mbuf_linklayer All packets created for the link layer are created in the context of a specific interface, therefore drop the interface from the entry point name. mac_create_mbuf_multicast_encap_from_mbuf -> mac_create_mbuf_multicast_encap All packets created (currently) in the context of multicast encapsulation are created in the context of an existing mbuf, so drop that from the name. mac_create_mbuf_netlayer_from_mbuf -> mac_create_mbuf_netlayer All packets created (currently) in the context of the network layer without a socket are done in the context of a specific existing mbuf, so drop that from the name. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#219 edit .. //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#4 edit .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#12 edit .. //depot/projects/trustedbsd/mac/sys/netinet/igmp.c#6 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#12 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#11 edit .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#8 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#84 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#72 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#59 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#66 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#29 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#136 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#101 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#219 (text+ko) ==== @@ -574,8 +574,8 @@ mpc->mpc_ops->mpo_create_mbuf_from_mbuf = mpe->mpe_function; break; - case MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET: - mpc->mpc_ops->mpo_create_mbuf_linklayer_for_ifnet = + case MAC_CREATE_MBUF_LINKLAYER: + mpc->mpc_ops->mpo_create_mbuf_linklayer = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_BPFDESC: @@ -586,12 +586,12 @@ mpc->mpc_ops->mpo_create_mbuf_from_ifnet = mpe->mpe_function; break; - case MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF: - mpc->mpc_ops->mpo_create_mbuf_multicast_encap_from_mbuf = + case MAC_CREATE_MBUF_MULTICAST_ENCAP: + mpc->mpc_ops->mpo_create_mbuf_multicast_encap = mpe->mpe_function; break; - case MAC_CREATE_MBUF_NETLAYER_FROM_MBUF: - mpc->mpc_ops->mpo_create_mbuf_netlayer_from_mbuf = + case MAC_CREATE_MBUF_NETLAYER: + mpc->mpc_ops->mpo_create_mbuf_netlayer = mpe->mpe_function; break; case MAC_FRAGMENT_MATCH: @@ -2275,11 +2275,11 @@ } void -mac_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, struct mbuf *mbuf) +mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *mbuf) { - MAC_PERFORM(create_mbuf_linklayer_for_ifnet, ifnet, &ifnet->if_label, - mbuf, &mbuf->m_pkthdr.label); + MAC_PERFORM(create_mbuf_linklayer, ifnet, &ifnet->if_label, mbuf, + &mbuf->m_pkthdr.label); } void @@ -2291,21 +2291,21 @@ } void -mac_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, - struct ifnet *ifnet, struct mbuf *newmbuf) +mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, + struct mbuf *newmbuf) { - MAC_PERFORM(create_mbuf_multicast_encap_from_mbuf, oldmbuf, + MAC_PERFORM(create_mbuf_multicast_encap, oldmbuf, &oldmbuf->m_pkthdr.label, ifnet, &ifnet->if_label, newmbuf, &newmbuf->m_pkthdr.label); } void -mac_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf) +mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf) { - MAC_PERFORM(create_mbuf_netlayer_from_mbuf, oldmbuf, - &oldmbuf->m_pkthdr.label, newmbuf, &newmbuf->m_pkthdr.label); + MAC_PERFORM(create_mbuf_netlayer, oldmbuf, &oldmbuf->m_pkthdr.label, + newmbuf, &newmbuf->m_pkthdr.label); } int ==== //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#4 (text+ko) ==== @@ -131,7 +131,7 @@ return; } #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(ac->ac_if, m); + mac_create_mbuf_linklayer(ac->ac_if, m); #endif m->m_len = sizeof( *ea ); m->m_pkthdr.len = sizeof( *ea ); @@ -555,7 +555,7 @@ return; } #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(ac->ac_if, m); + mac_create_mbuf_linklayer(ac->ac_if, m); #endif m->m_len = sizeof( *ea ); m->m_pkthdr.len = sizeof( *ea ); ==== //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#12 (text+ko) ==== @@ -307,7 +307,7 @@ return; m->m_pkthdr.rcvif = (struct ifnet *)0; #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(ifp, m); + mac_create_mbuf_linklayer(ifp, m); #endif switch (ifp->if_type) { case IFT_ARCNET: ==== //depot/projects/trustedbsd/mac/sys/netinet/igmp.c#6 (text+ko) ==== @@ -451,7 +451,7 @@ m->m_pkthdr.rcvif = loif; #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(inm->inm_ifp, m); + mac_create_mbuf_linklayer(inm->inm_ifp, m); #endif m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN; MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip)); ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#12 (text+ko) ==== @@ -160,7 +160,7 @@ */ m = m_gethdr(M_DONTWAIT, MT_HEADER); #ifdef MAC - mac_create_mbuf_netlayer_from_mbuf(n, m); + mac_create_mbuf_netlayer(n, m); #endif if (m == NULL) goto freeit; ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#11 (text+ko) ==== @@ -1632,7 +1632,7 @@ if (mb_copy == NULL) return; #ifdef MAC - mac_create_mbuf_multicast_encap_from_mbuf(m, vifp, mb_copy); + mac_create_mbuf_multicast_encap(m, vifp, mb_copy); #endif mb_copy->m_data += max_linkhdr; mb_copy->m_len = sizeof(multicast_encap_iphdr); ==== //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#8 (text+ko) ==== @@ -2018,7 +2018,7 @@ sendpkt: #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(ifp, m); + mac_create_mbuf_linklayer(ifp, m); #endif if ((ifp->if_flags & IFF_LOOPBACK) != 0) { return((*ifp->if_output)(origifp, m, (struct sockaddr *)dst, ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#84 (text+ko) ==== @@ -995,8 +995,8 @@ } static void -mac_biba_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) +mac_biba_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *mbuf, struct label *mbuflabel) { struct mac_biba *dest; @@ -1030,7 +1030,7 @@ } static void -mac_biba_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_biba_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1043,9 +1043,8 @@ } static void -mac_biba_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) +mac_biba_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, + struct mbuf *newmbuf, struct label *newmbuflabel) { struct mac_biba *source, *dest; @@ -2110,16 +2109,16 @@ (macop_t)mac_biba_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_biba_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_biba_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_biba_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_biba_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_biba_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_biba_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_biba_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_biba_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_biba_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, (macop_t)mac_biba_fragment_match }, { MAC_RELABEL_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#72 (text+ko) ==== @@ -944,8 +944,8 @@ } static void -mac_mls_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) +mac_mls_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *mbuf, struct label *mbuflabel) { struct mac_mls *dest; @@ -979,7 +979,7 @@ } static void -mac_mls_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_mls_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -992,9 +992,8 @@ } static void -mac_mls_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) +mac_mls_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, + struct mbuf *newmbuf, struct label *newmbuflabel) { struct mac_mls *source, *dest; @@ -2061,16 +2060,16 @@ (macop_t)mac_mls_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_mls_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_mls_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_mls_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_mls_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_mls_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_mls_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_mls_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_mls_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_mls_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, (macop_t)mac_mls_fragment_match }, { MAC_RELABEL_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#59 (text+ko) ==== @@ -309,15 +309,15 @@ } static void -mac_none_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, +mac_none_update_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { } static void -mac_none_update_procfsvnode_from_cred(struct vnode *vp, - struct label *vnodelabel, struct ucred *cred) +mac_none_update_procfsvnode(struct vnode *vp, struct label *vnodelabel, + struct ucred *cred) { } @@ -444,8 +444,8 @@ } static void -mac_none_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) +mac_none_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *mbuf, struct label *mbuflabel) { } @@ -465,7 +465,7 @@ } static void -mac_none_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_none_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -473,9 +473,8 @@ } static void -mac_none_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) +mac_none_create_mbuf_netlayer(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { } @@ -949,10 +948,10 @@ (macop_t)mac_none_create_root_mount }, { MAC_RELABEL_VNODE, (macop_t)mac_none_relabel_vnode }, - { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, - (macop_t)mac_none_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_CRED, - (macop_t)mac_none_update_procfsvnode_from_cred }, + { MAC_UPDATE_DEVFSDIRENT, + (macop_t)mac_none_update_devfsdirent }, + { MAC_UPDATE_PROCFSVNODE, + (macop_t)mac_none_update_procfsvnode }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_none_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, @@ -987,16 +986,16 @@ (macop_t)mac_none_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_none_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_none_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_none_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_none_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_none_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_none_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_none_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_none_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_none_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, (macop_t)mac_none_fragment_match }, { MAC_RELABEL_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#66 (text+ko) ==== @@ -883,8 +883,8 @@ } static void -mac_te_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *iflabel, struct mbuf *mbuf, struct label *mblabel) +mac_te_create_mbuf_linklayer(struct ifnet *ifnet, struct label *iflabel, + struct mbuf *mbuf, struct label *mblabel) { mac_te_init_label_as(SLOT(mblabel), MAC_TE_TYPE_EQUAL); @@ -899,7 +899,7 @@ } static void -mac_te_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_te_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmblabel, struct ifnet *ifnet, struct label *iflabel, struct mbuf *newmbuf, struct label *nmblabel) { @@ -908,8 +908,8 @@ } static void -mac_te_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmblabel, struct mbuf *newmbuf, struct label *nmblabel) +mac_te_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmblabel, + struct mbuf *newmbuf, struct label *nmblabel) { mac_te_copy_label(SLOT(oldmblabel), SLOT(nmblabel)); @@ -1725,16 +1725,16 @@ (macop_t)mac_te_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_te_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_te_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_te_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_te_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_te_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_te_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_te_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_te_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_te_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, (macop_t)mac_te_fragment_match }, { MAC_RELABEL_IFNET, (macop_t)mac_te_relabel_ifnet }, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#29 (text+ko) ==== @@ -651,8 +651,8 @@ } static void -mac_test_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) +mac_test_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *mbuf, struct label *mbuflabel) { } @@ -672,7 +672,7 @@ } static void -mac_test_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_test_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -680,7 +680,7 @@ } static void -mac_test_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, +mac_test_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1148,8 +1148,8 @@ (macop_t)mac_test_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_test_create_devfs_vnode }, - { MAC_CREATE_VNODE_FROM_VNODE, - (macop_t)mac_test_create_vnode_from_vnode }, + { MAC_CREATE_VNODE, + (macop_t)mac_test_create_vnode }, { MAC_CREATE_MOUNT, (macop_t)mac_test_create_mount }, { MAC_CREATE_ROOT_MOUNT, @@ -1192,18 +1192,18 @@ (macop_t)mac_test_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_test_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_test_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_test_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_test_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_test_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_test_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_test_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_test_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_test_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, - (macop_t)mac_test_fragment }, + (macop_t)mac_test_fragment_match }, { MAC_RELABEL_IFNET, (macop_t)mac_test_relabel_ifnet }, { MAC_UPDATE_IPQ, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#136 (text+ko) ==== @@ -295,14 +295,12 @@ void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment); void mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf); -void mac_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct mbuf *m); +void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m); void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m); -void mac_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +void mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, struct mbuf *newmbuf); -void mac_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct mbuf *newmbuf); +void mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); int mac_fragment_match(struct mbuf *fragment, struct ipq *ipq); void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#101 (text+ko) ==== @@ -176,7 +176,7 @@ void (*mpo_create_mbuf_from_mbuf)(struct mbuf *oldmbuf, struct label *oldlabel, struct mbuf *newmbuf, struct label *newlabel); - void (*mpo_create_mbuf_linklayer_for_ifnet)(struct ifnet *ifnet, + void (*mpo_create_mbuf_linklayer)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); void (*mpo_create_mbuf_from_bpfdesc)(struct bpf_d *bpf_d, @@ -185,11 +185,11 @@ void (*mpo_create_mbuf_from_ifnet)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); - void (*mpo_create_mbuf_multicast_encap_from_mbuf) - (struct mbuf *oldmbuf, struct label *oldmbuflabel, - struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *newmbuf, struct label *newmbuflabel); - void (*mpo_create_mbuf_netlayer_from_mbuf)(struct mbuf *oldmbuf, + void (*mpo_create_mbuf_multicast_encap)(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct ifnet *ifnet, + struct label *ifnetlabel, struct mbuf *newmbuf, + struct label *newmbuflabel); + void (*mpo_create_mbuf_netlayer)(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel); int (*mpo_fragment_match)(struct mbuf *fragment, @@ -384,11 +384,11 @@ MAC_CREATE_IPQ, MAC_CREATE_FRAGMENT, MAC_CREATE_MBUF_FROM_MBUF, - MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, + MAC_CREATE_MBUF_LINKLAYER, MAC_CREATE_MBUF_FROM_BPFDESC, MAC_CREATE_MBUF_FROM_IFNET, - MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, + MAC_CREATE_MBUF_MULTICAST_ENCAP, + MAC_CREATE_MBUF_NETLAYER, MAC_FRAGMENT_MATCH, MAC_RELABEL_IFNET, MAC_UPDATE_IPQ, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207291640.g6TGeP9q093871>