From 320ea9833048cdfc2e00459ee1696688af3cd840 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Thu, 17 Jan 2008 15:28:24 +0000
Subject: [PATCH] trunk: add 3rd party corenet interfaces for (secmark)
 packets.

---
 policy/modules/kernel/corenetwork.if.in | 69 +++++++++++++++++++++----
 policy/modules/kernel/corenetwork.te.in |  2 +-
 2 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/policy/modules/kernel/corenetwork.if.in b/policy/modules/kernel/corenetwork.if.in
index a24cfb0a..7dfaa8d0 100644
--- a/policy/modules/kernel/corenetwork.if.in
+++ b/policy/modules/kernel/corenetwork.if.in
@@ -12,9 +12,8 @@
 ##	Define type to be a network port type
 ##	</p>
 ##	<p>
-##	This is a template to support third party modules
-##	and its use is not allowed in upstream reference
-##	policy.
+##	This is for supporting third party modules and its
+##	use is not allowed in upstream reference policy.
 ##	</p>
 ## </desc>
 ## <param name="domain">
@@ -40,9 +39,8 @@ interface(`corenet_port',`
 ##	Define network type to be a reserved port (lt 1024)
 ##	</p>
 ##	<p>
-##	This is a template to support third party modules
-##	and its use is not allowed in upstream reference
-##	policy.
+##	This is for supporting third party modules and its
+##	use is not allowed in upstream reference policy.
 ##	</p>
 ## </desc>
 ## <param name="domain">
@@ -68,9 +66,8 @@ interface(`corenet_reserved_port',`
 ##	Define network type to be a rpc port ( 512 lt PORT lt 1024)
 ##	</p>
 ##	<p>
-##	This is a template to support third party modules
-##	and its use is not allowed in upstream reference
-##	policy.
+##	This is for supporting third party modules and its
+##	use is not allowed in upstream reference policy.
 ##	</p>
 ## </desc>
 ## <param name="domain">
@@ -87,6 +84,60 @@ interface(`corenet_rpc_port',`
 	typeattribute $1 rpc_port_type;
 ')
 
+########################################
+## <summary>
+##	Define type to be a network client packet type
+## </summary>
+## <desc>
+##	<p>
+##	Define type to be a network client packet type
+##	</p>
+##	<p>
+##	This is for supporting third party modules and its
+##	use is not allowed in upstream reference policy.
+##	</p>
+## </desc>
+## <param name="domain">
+##	<summary>
+##	Type to be used for a network client packet.
+##	</summary>
+## </param>
+#
+interface(`corenet_client_packet',`
+	gen_require(`
+		attribute packet_type, client_packet_type;
+	')
+
+	typeattribute $1 client_packet_type, packet_type;
+')
+
+########################################
+## <summary>
+##	Define type to be a network server packet type
+## </summary>
+## <desc>
+##	<p>
+##	Define type to be a network server packet type
+##	</p>
+##	<p>
+##	This is for supporting third party modules and its
+##	use is not allowed in upstream reference policy.
+##	</p>
+## </desc>
+## <param name="domain">
+##	<summary>
+##	Type to be used for a network server packet.
+##	</summary>
+## </param>
+#
+interface(`corenet_server_packet',`
+	gen_require(`
+		attribute packet_type, server_packet_type;
+	')
+
+	typeattribute $1 server_packet_type, packet_type;
+')
+
 ########################################
 ## <summary>
 ##	Send and receive TCP network traffic on the generic interfaces.
diff --git a/policy/modules/kernel/corenetwork.te.in b/policy/modules/kernel/corenetwork.te.in
index 8b6ee1b5..a1811859 100644
--- a/policy/modules/kernel/corenetwork.te.in
+++ b/policy/modules/kernel/corenetwork.te.in
@@ -1,5 +1,5 @@
 
-policy_module(corenetwork,1.2.14)
+policy_module(corenetwork,1.2.15)
 
 ########################################
 #