From 99b8e062d72c1ae656e4ea45120b2e9c7ffd5980 Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Fri, 6 Jul 2018 16:21:58 +0200
Subject: [PATCH] */config.xsd: fix session-policy declarations

Issue #2908
---
 repos/base/xsd/base_types.xsd             |  6 ++++++
 repos/os/src/app/trace_logger/config.xsd  | 21 +++++++++++++++------
 repos/os/src/server/nic_bridge/config.xsd | 15 +++++++++++----
 repos/os/src/server/nic_router/config.xsd | 15 +++++++++++----
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/repos/base/xsd/base_types.xsd b/repos/base/xsd/base_types.xsd
index 7a8fa74e56..07546a8a41 100644
--- a/repos/base/xsd/base_types.xsd
+++ b/repos/base/xsd/base_types.xsd
@@ -32,4 +32,10 @@
 		</xs:restriction>
 	</xs:simpleType><!-- Session_label -->
 
+	<xs:complexType name="Session_policy">
+		<xs:attribute name="label_prefix" type="Session_label" />
+		<xs:attribute name="label_suffix" type="Session_label" />
+		<xs:attribute name="label"        type="Session_label" />
+	</xs:complexType>
+
 </xs:schema>
diff --git a/repos/os/src/app/trace_logger/config.xsd b/repos/os/src/app/trace_logger/config.xsd
index 0df673acdb..c854de69d5 100644
--- a/repos/os/src/app/trace_logger/config.xsd
+++ b/repos/os/src/app/trace_logger/config.xsd
@@ -15,14 +15,23 @@
 		<xs:complexType>
 			<xs:choice minOccurs="0" maxOccurs="unbounded">
 
+				<xs:element name="default-policy">
+					<xs:complexType>
+						<xs:attribute name="thread" type="Thread_name" />
+						<xs:attribute name="buffer" type="Number_of_bytes" />
+						<xs:attribute name="policy" type="Trace_policy_name" />
+					</xs:complexType>
+				</xs:element><!-- default-policy -->
+
 				<xs:element name="policy">
 					<xs:complexType>
-						<xs:attribute name="label_prefix" type="Session_label" />
-						<xs:attribute name="label_suffix" type="Session_label" />
-						<xs:attribute name="label"        type="Session_label" />
-						<xs:attribute name="thread"       type="Thread_name" />
-						<xs:attribute name="buffer"       type="Number_of_bytes" />
-						<xs:attribute name="policy"       type="Trace_policy_name" />
+					<xs:complexContent>
+					<xs:extension base="Session_policy">
+						<xs:attribute name="thread" type="Thread_name" />
+						<xs:attribute name="buffer" type="Number_of_bytes" />
+						<xs:attribute name="policy" type="Trace_policy_name" />
+					</xs:extension>
+					</xs:complexContent>
 					</xs:complexType>
 				</xs:element><!-- policy -->
 
diff --git a/repos/os/src/server/nic_bridge/config.xsd b/repos/os/src/server/nic_bridge/config.xsd
index f13e2f33b2..df2dbd2511 100644
--- a/repos/os/src/server/nic_bridge/config.xsd
+++ b/repos/os/src/server/nic_bridge/config.xsd
@@ -8,12 +8,19 @@
 		<xs:complexType>
 			<xs:choice minOccurs="0" maxOccurs="unbounded">
 
+				<xs:element name="default-policy">
+					<xs:complexType>
+						<xs:attribute name="ip_addr" type="Ipv4_address" />
+					</xs:complexType>
+				</xs:element><!-- default-policy -->
+
 				<xs:element name="policy">
 					<xs:complexType>
-						<xs:attribute name="label_prefix" type="Session_label" />
-						<xs:attribute name="label_suffix" type="Session_label" />
-						<xs:attribute name="label"        type="Session_label" />
-						<xs:attribute name="ip_addr"      type="Ipv4_address" />
+					<xs:complexContent>
+					<xs:extension base="Session_policy">
+						<xs:attribute name="ip_addr" type="Ipv4_address" />
+					</xs:extension>
+					</xs:complexContent>
 					</xs:complexType>
 				</xs:element><!-- policy -->
 
diff --git a/repos/os/src/server/nic_router/config.xsd b/repos/os/src/server/nic_router/config.xsd
index c71b959163..e14bf90724 100644
--- a/repos/os/src/server/nic_router/config.xsd
+++ b/repos/os/src/server/nic_router/config.xsd
@@ -63,12 +63,19 @@
 					</xs:complexType>
 				</xs:element><!-- report -->
 
+				<xs:element name="default-policy">
+					<xs:complexType>
+						<xs:attribute name="domain" type="Domain_name" />
+					</xs:complexType>
+				</xs:element><!-- default-policy -->
+
 				<xs:element name="policy">
 					<xs:complexType>
-						<xs:attribute name="label_prefix" type="Session_label" />
-						<xs:attribute name="label_suffix" type="Session_label" />
-						<xs:attribute name="label"        type="Session_label" />
-						<xs:attribute name="domain"       type="Domain_name" />
+					<xs:complexContent>
+					<xs:extension base="Session_policy">
+						<xs:attribute name="domain" type="Domain_name" />
+					</xs:extension>
+					</xs:complexContent>
 					</xs:complexType>
 				</xs:element><!-- policy -->