PERFORCE change 100753 for review
Robert Watson
rwatson at FreeBSD.org
Thu Jul 6 13:50:07 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100753
Change 100753 by rwatson at rwatson_zoo on 2006/07/06 13:49:53
Rename.
Affected files ...
.. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_icmp.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_options.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_output.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_output.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#10 edit
Differences ...
==== //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#3 (text+ko) ====
@@ -183,11 +183,11 @@
inp->inp_pcbinfo = pcbinfo;
inp->inp_socket = so;
#ifdef MAC
- error = mac_init_inpcb(inp, M_NOWAIT);
+ error = mac_inpcb_init(inp, M_NOWAIT);
if (error != 0)
goto out;
SOCK_LOCK(so);
- mac_create_inpcb_from_socket(so, inp);
+ mac_inpcb_create(so, inp);
SOCK_UNLOCK(so);
#endif
#if defined(IPSEC) || defined(FAST_IPSEC)
@@ -723,7 +723,7 @@
inp->inp_vflag = 0;
INP_LOCK_DESTROY(inp);
#ifdef MAC
- mac_destroy_inpcb(inp);
+ mac_inpcb_destroy(inp);
#endif
uma_zfree(ipi->ipi_zone, inp);
}
==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_icmp.c#3 (text+ko) ====
@@ -228,7 +228,7 @@
if (m == NULL)
goto freeit;
#ifdef MAC
- mac_create_mbuf_netlayer(n, m);
+ mac_mbuf_create_netlayer(n, m);
#endif
icmplen = min(icmplen, M_TRAILINGSPACE(m) - sizeof(struct ip) - ICMP_MINLEN);
m_align(m, ICMP_MINLEN + icmplen);
@@ -709,7 +709,7 @@
}
match:
#ifdef MAC
- mac_reflect_mbuf_icmp(m);
+ mac_netinet_icmp_reply(m);
#endif
t = IA_SIN(ia)->sin_addr;
ip->ip_src = t;
==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#3 (text+ko) ====
@@ -770,7 +770,7 @@
ip->ip_src.s_addr == fp->ipq_src.s_addr &&
ip->ip_dst.s_addr == fp->ipq_dst.s_addr &&
#ifdef MAC
- mac_fragment_match(m, fp) &&
+ mac_ipq_match(m, fp) &&
#endif
ip->ip_p == fp->ipq_p)
goto found;
@@ -846,12 +846,12 @@
if (fp == NULL)
goto dropfrag;
#ifdef MAC
- if (mac_init_ipq(fp, M_NOWAIT) != 0) {
+ if (mac_ipq_init(fp, M_NOWAIT) != 0) {
uma_zfree(ipq_zone, fp);
fp = NULL;
goto dropfrag;
}
- mac_create_ipq(m, fp);
+ mac_ipq_create(m, fp);
#endif
TAILQ_INSERT_HEAD(head, fp, ipq_list);
nipq++;
@@ -867,7 +867,7 @@
} else {
fp->ipq_nfrags++;
#ifdef MAC
- mac_update_ipq(m, fp);
+ mac_ipq_update(m, fp);
#endif
}
@@ -1009,8 +1009,8 @@
m->m_pkthdr.csum_data =
(m->m_pkthdr.csum_data & 0xffff) + (m->m_pkthdr.csum_data >> 16);
#ifdef MAC
- mac_create_datagram_from_ipq(fp, m);
- mac_destroy_ipq(fp);
+ mac_ipq_reassemble(fp, m);
+ mac_ipq_destroy(fp);
#endif
/*
==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_options.c#3 (text+ko) ====
@@ -514,7 +514,7 @@
M_MOVE_PKTHDR(n, m);
n->m_pkthdr.rcvif = NULL;
#ifdef MAC
- mac_copy_mbuf(m, n);
+ mac_mbuf_copy(m, n);
#endif
n->m_pkthdr.len += optlen;
m->m_len -= sizeof(struct ip);
==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_output.c#3 (text+ko) ====
@@ -726,7 +726,7 @@
m->m_pkthdr.len = mhlen + len;
m->m_pkthdr.rcvif = NULL;
#ifdef MAC
- mac_create_fragment(m0, m);
+ mac_netinet_fragment(m0, m);
#endif
m->m_pkthdr.csum_flags = m0->m_pkthdr.csum_flags;
mhip->ip_off = htons(mhip->ip_off);
==== //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#3 (text+ko) ====
@@ -163,7 +163,7 @@
}
#endif /*IPSEC || FAST_IPSEC*/
#ifdef MAC
- if (!policyfail && mac_check_inpcb_deliver(last, n) != 0)
+ if (!policyfail && mac_inpcb_check_deliver(last, n) != 0)
policyfail = 1;
#endif
/* Check the minimum TTL for socket. */
@@ -329,7 +329,7 @@
flags |= IP_SENDONES;
#ifdef MAC
- mac_create_mbuf_from_inpcb(inp, m);
+ mac_inpcb_create_mbuf(inp, m);
#endif
error = ip_output(m, inp->inp_options, NULL, flags,
==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#3 (text+ko) ====
@@ -792,7 +792,7 @@
#ifdef MAC
INP_LOCK_ASSERT(inp);
- if (mac_check_inpcb_deliver(inp, m))
+ if (mac_inpcb_check_deliver(inp, m))
goto drop;
#endif
so = inp->inp_socket;
@@ -1403,7 +1403,7 @@
soisconnected(so);
#ifdef MAC
SOCK_LOCK(so);
- mac_set_socket_peer_from_mbuf(m, so);
+ mac_socket_set_peer_from_mbuf(m, so);
SOCK_UNLOCK(so);
#endif
/* Do window scaling on this connection? */
==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_output.c#3 (text+ko) ====
@@ -819,7 +819,7 @@
SOCKBUF_UNLOCK_ASSERT(&so->so_snd);
m->m_pkthdr.rcvif = (struct ifnet *)0;
#ifdef MAC
- mac_create_mbuf_from_inpcb(tp->t_inpcb, m);
+ mac_inpcb_create_mbuf(tp->t_inpcb, m);
#endif
#ifdef INET6
if (isipv6) {
==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#3 (text+ko) ====
@@ -541,13 +541,13 @@
* label of the response to reflect the socket label.
*/
INP_LOCK_ASSERT(inp);
- mac_create_mbuf_from_inpcb(inp, m);
+ mac_inpcb_create_mbuf(inp, m);
} else {
/*
* Packet is not associated with a socket, so possibly
* update the label in place.
*/
- mac_reflect_mbuf_tcp(m);
+ mac_netinet_tcp_reply(m);
}
#endif
nth->th_seq = htonl(seq);
@@ -1924,7 +1924,7 @@
m->m_data += max_linkhdr;
#ifdef MAC
- mac_create_mbuf_from_inpcb(inp, m);
+ mac_inpcb_create_mbuf(inp, m);
#endif
#ifdef INET6
==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#3 (text+ko) ====
@@ -562,7 +562,7 @@
}
#ifdef MAC
SOCK_LOCK(so);
- mac_set_socket_peer_from_mbuf(m, so);
+ mac_socket_set_peer_from_mbuf(m, so);
SOCK_UNLOCK(so);
#endif
@@ -1118,7 +1118,7 @@
INP_INFO_RUNLOCK(&tcbinfo);
return (ESHUTDOWN);
}
- mac_create_mbuf_from_inpcb(inp, m);
+ mac_inpcb_create_mbuf(inp, m);
INP_UNLOCK(inp);
INP_INFO_RUNLOCK(&tcbinfo);
#endif /* MAC */
==== //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#3 (text+ko) ====
@@ -466,7 +466,7 @@
}
#endif /*IPSEC || FAST_IPSEC*/
#ifdef MAC
- if (mac_check_inpcb_deliver(inp, n) != 0) {
+ if (mac_inpcb_check_deliver(inp, n) != 0) {
m_freem(n);
return;
}
@@ -793,7 +793,7 @@
INP_LOCK(inp);
#ifdef MAC
- mac_create_mbuf_from_inpcb(inp, m);
+ mac_inpcb_create_mbuf(inp, m);
#endif
laddr = inp->inp_laddr;
==== //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#3 (text+ko) ====
@@ -137,7 +137,7 @@
KASSERT(!mtx_owned(&Giant), ("nfssvc(): called with Giant"));
#ifdef MAC
- error = mac_check_system_nfsd(td->td_ucred);
+ error = mac_system_check_nfsd(td->td_ucred);
if (error)
return (error);
#endif
==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#10 (text+ko) ====
@@ -57,7 +57,6 @@
struct devfs_dirent;
struct ifnet;
struct ifreq;
-struct inpcb;
struct image_params;
struct inpcb;
struct ipq;
@@ -130,11 +129,11 @@
struct ifnet *ifnet);
int mac_inpcb_init(struct inpcb *, int flag);
-void mac_inpcb_destroy_inpcb(struct inpcb *);
+void mac_inpcb_destroy(struct inpcb *);
void mac_inpcb_create(struct socket *so, struct inpcb *inp);
void mac_inpcb_create_mbuf(struct inpcb *inp, struct mbuf *m);
void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp);
-int mac_inpcb_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m);
+int mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m);
int mac_ipq_init(struct ipq *, int flag);
void mac_ipq_destroy(struct ipq *);
More information about the p4-projects
mailing list