Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 900 insertions, 0 deletions

diff --git a/resources/protocols/dtds/dc.dtd b/resources/protocols/dtds/dc.dtd
new file mode 100644
index 00000000..b2f630aa
--- /dev/null
+++ b/resources/protocols/dtds/dc.dtd
@@ -0,0 +1,23 @@
+<? wireshark:protocol proto_name="dc" description="Dublin Core Metadata (DC)" ?>
+<!--
+    elements definitions for the Dublin Core Metadata DC schema
+    element names obtained from http://www.dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd
+-->
+
+<!DOCTYPE dc [
+    <!ELEMENT title (#PCDATA) >
+    <!ELEMENT creator (#PCDATA) >
+    <!ELEMENT subject (#PCDATA) >
+    <!ELEMENT description (#PCDATA) >
+    <!ELEMENT publisher (#PCDATA) >
+    <!ELEMENT contributor (#PCDATA) >
+    <!ELEMENT date (#PCDATA) >
+    <!ELEMENT type (#PCDATA) >
+    <!ELEMENT format (#PCDATA) >
+    <!ELEMENT identifier (#PCDATA) >
+    <!ELEMENT source (#PCDATA) >
+    <!ELEMENT language (#PCDATA) >
+    <!ELEMENT relation (#PCDATA) >
+    <!ELEMENT coverage (#PCDATA) >
+    <!ELEMENT rights (#PCDATA) >
+]>
diff --git a/resources/protocols/dtds/itunes.dtd b/resources/protocols/dtds/itunes.dtd
new file mode 100644
index 00000000..ed1963e6
--- /dev/null
+++ b/resources/protocols/dtds/itunes.dtd
@@ -0,0 +1,25 @@
+<? wireshark:protocol proto_name="itunes" hierarchy="yes" description="iTunes podCast rss elements" ?>
+
+<!DOCTYPE itunes [
+    
+    <!ELEMENT author (#PCDATA) >
+    
+    <!ELEMENT block (#PCDATA) >
+    
+    <!ELEMENT category (#PCDATA) >
+    <!ATTLIST category text CDATA #IMPLIED >
+    
+    <!ELEMENT duration (#PCDATA) >
+    
+    <!ELEMENT explicit (#PCDATA) >
+    
+    <!ELEMENT keywords (#PCDATA) >
+    
+    <!ELEMENT owner (#PCDATA) >
+    
+    <!ELEMENT subtitle (#PCDATA) >
+    
+    <!ELEMENT summary (#PCDATA) >
+
+]>
+
diff --git a/resources/protocols/dtds/mscml.dtd b/resources/protocols/dtds/mscml.dtd
new file mode 100644
index 00000000..97d7ee38
--- /dev/null
+++ b/resources/protocols/dtds/mscml.dtd
@@ -0,0 +1,277 @@
+<? wireshark:protocol 
+   proto_name="mscml" 
+   media="application/mediaservercontrol+xml" 
+   description="Media Server Control Markup Language - draft 07"
+   hierarchy="yes" ?>
+
+<!--
+    DTD for MSCML - draft 07
+		https://tools.ietf.org/html/draft-vandyke-mscml-07
+		See this for current limitations: 
+		https://wireshark.org/lists/ethereal-dev/200605/msg02351.html
+		
+		(c)Copyright 2006 Hewlett-Packard Development Company, LP.
+		   Contact: olivier.jacques@hp.com
+-->
+
+<!ELEMENT MediaServerControl (request | response | notification) >
+<!-- <!ATTLIST MediaServerControl version <!ATTLIST > #REQUIRED > -->
+<!ATTLIST MediaServerControl version CDATA #REQUIRED >
+<!ELEMENT request (configure_conference | configure_leg | play | playcollect | playrecord | managecontent | faxplay | faxrecord | stop)>
+<!ELEMENT configure_conference (subscribe?)>
+<!ATTLIST configure_conference
+	id CDATA #IMPLIED
+	reservedtalkers NMTOKEN #IMPLIED
+        <!-- there should be | 1 | 0 in addition but Wireshark doesn't like it -->
+	reserveconfmedia (yes | no | true | false) "yes"
+>
+<!ELEMENT configure_leg (inputgain?, outputgain?, configure_team?, subscribe?)>
+<!ATTLIST configure_leg
+	id CDATA #IMPLIED
+	type (talker | listener) #IMPLIED
+	mixmode (full | mute | preferred | parked | private) #IMPLIED
+	dtmfclamp (yes | no | true | false) #IMPLIED
+	toneclamp (yes | no | true | false) #IMPLIED
+>
+<!ELEMENT play (prompt?)>
+<!ATTLIST play
+	id CDATA #IMPLIED
+	prompturl CDATA #IMPLIED
+	offset CDATA #IMPLIED
+	promptencoding CDATA #IMPLIED
+>
+<!ELEMENT playcollect (prompt?, pattern?)>
+<!ATTLIST playcollect
+	id CDATA #IMPLIED
+	prompturl CDATA #IMPLIED
+	offset CDATA #IMPLIED
+	barge (yes | no | true | false) "yes"
+	promptencoding CDATA #IMPLIED
+	cleardigits (yes | no | true | false) "no"
+	maxdigits CDATA #IMPLIED
+	firstdigittimer CDATA "5000ms"
+	interdigittimer CDATA "2000ms"
+	extradigittimer CDATA "1000ms"
+	interdigitcriticaltimer CDATA #IMPLIED
+	skipinterval CDATA "6s"
+	ffkey CDATA #IMPLIED
+	rwkey CDATA #IMPLIED
+	returnkey CDATA "#"
+	escapekey CDATA "*"
+	maskdigits (yes | no | true | false) "no"
+>
+<!ELEMENT playrecord (prompt?)>
+<!ATTLIST playrecord
+	id CDATA #IMPLIED
+	prompturl CDATA #IMPLIED
+	promptencoding CDATA #IMPLIED
+	offset CDATA "0"
+	barge (yes | no | true | false) "yes"
+	cleardigits (yes | no | true | false) "no"
+	escapekey CDATA "*"
+	recurl CDATA #REQUIRED
+	mode (append | overwrite) "overwrite"
+	recencoding CDATA #IMPLIED
+	initsilence CDATA #IMPLIED
+	endsilence CDATA #IMPLIED
+	duration CDATA #IMPLIED
+	beep (yes | no | true | false) "yes"
+	recstopmask CDATA "01234567890*#"
+>
+<!ELEMENT managecontent EMPTY>
+<!ATTLIST managecontent
+	id CDATA #IMPLIED
+	fetchtimeout CDATA "10000"
+	mimetype CDATA #IMPLIED
+	name CDATA #IMPLIED
+	httpmethod (put | post) #IMPLIED
+	action (move | delete) #IMPLIED
+	dest CDATA #IMPLIED
+	src CDATA #REQUIRED
+>
+<!ELEMENT faxplay (prompt?)>
+<!ATTLIST faxplay
+	id CDATA #IMPLIED
+	lclid CDATA #IMPLIED
+	prompturl CDATA #IMPLIED
+	recurl CDATA #IMPLIED
+	rmtid CDATA #IMPLIED
+>
+<!ELEMENT faxrecord (prompt?)>
+<!ATTLIST faxrecord
+	id CDATA #IMPLIED
+	lclid CDATA #IMPLIED
+	prompturl CDATA #IMPLIED
+	recurl CDATA #IMPLIED
+	rmtid CDATA #IMPLIED
+>
+<!ELEMENT stop EMPTY>
+<!ATTLIST stop
+	id CDATA #IMPLIED
+>
+<!ELEMENT response (error_info?, team?)>
+<!ATTLIST response
+	request (configure_conference | configure_leg | play | playcollect | playrecord | managecontent | faxplay | faxrecord | stop) #REQUIRED
+	id CDATA #IMPLIED
+	code CDATA #REQUIRED
+	text CDATA #REQUIRED
+	reason CDATA #IMPLIED
+	reclength CDATA #IMPLIED
+	recduration CDATA #IMPLIED
+	digits CDATA #IMPLIED
+	name CDATA #IMPLIED
+	playduration CDATA #IMPLIED
+	playoffset CDATA #IMPLIED
+	faxcode CDATA #IMPLIED
+	pages_sent CDATA #IMPLIED
+	pages_recv CDATA #IMPLIED
+>
+<!ELEMENT notification (conference | keypress | signal)>
+<!ELEMENT conference (activetalkers?)>
+<!ATTLIST conference
+	uniqueid CDATA #REQUIRED
+	numtalkers CDATA #REQUIRED
+>
+<!ELEMENT keypress (status)>
+<!ATTLIST keypress
+	digit CDATA #REQUIRED
+	length (standard | long) #REQUIRED
+	method (standard | long | double) #REQUIRED
+	interdigittime CDATA #REQUIRED
+        <!-- FIXME: Added for events in leg_eventsubscriptionType -->
+        report (standard | long | both | none) #REQUIRED
+        maskdigits (yes | no | true | false) "no"
+        <!-- /FIXME -->
+>
+<!ELEMENT signal EMPTY>
+<!-- FIXME: added because signal can be of type CDATA and nmtoken -->
+<!ATTLIST signal
+	type CDATA #FIXED "busy"
+	report (yes | no | true | false) #REQUIRED
+>
+<!ELEMENT prompt (audio | variable)+>
+<!ATTLIST prompt
+	locale CDATA #IMPLIED
+	baseurl CDATA #IMPLIED
+	stoponerror (yes | no | true | false) "no"
+	gain CDATA "0"
+	gaindelta CDATA "0"
+	rate CDATA "0"
+	ratedelta CDATA "0"
+	repeat CDATA "1"
+	duration CDATA "infinite"
+	offset CDATA "0"
+	delay CDATA "0"
+>
+<!ELEMENT subscribe (events)>
+<!ELEMENT inputgain (auto | fixed)>
+<!ELEMENT outputgain (auto | fixed)>
+<!ELEMENT configure_team (teammate*)>
+<!ATTLIST configure_team
+	id CDATA #IMPLIED
+	action (add | delete | query | set) #REQUIRED
+>
+<!ELEMENT teammate EMPTY>
+<!ATTLIST teammate
+	id CDATA #REQUIRED
+>
+<!ELEMENT pattern (regex+ | mgcpdigitmap | megacodigitmap)>
+<!ELEMENT regex EMPTY>
+<!ATTLIST regex
+	value CDATA #REQUIRED
+	name CDATA #IMPLIED
+>
+<!ELEMENT mgcpdigitmap EMPTY>
+<!ATTLIST mgcpdigitmap
+	value CDATA #REQUIRED
+	name CDATA #IMPLIED
+>
+<!ELEMENT megacodigitmap EMPTY>
+<!ATTLIST megacodigitmap
+	value CDATA #REQUIRED
+	name CDATA #IMPLIED
+>
+<!ELEMENT error_info EMPTY>
+<!ATTLIST error_info
+	code CDATA #REQUIRED
+	text CDATA #REQUIRED
+	context CDATA #REQUIRED
+>
+<!ELEMENT team (teammate*)>
+<!ATTLIST team
+	id CDATA #REQUIRED
+	numteam NMTOKEN #REQUIRED
+>
+<!-- two events elements are possible (conference_eventsubscriptionType, leg_eventsubscriptionType)
+     Let's take the union
+     It should be:
+<!ELEMENT events (activetalkers)>
+<!ELEMENT activetalkers EMPTY>
+<!ATTLIST activetalkers
+	interval CDATA "60s"
+>
+<!ELEMENT events (keypress?, signal*)>
+<!ELEMENT keypress EMPTY>
+<!ATTLIST keypress
+	report (standard | long | both | none) #REQUIRED
+	maskdigits (yes | no | true | false) "no"
+>
+-->
+<!ELEMENT events (activetalkers*, keypress*, signal*)>
+<!-- FIXME: two different activetalkers defined 
+<!ELEMENT activetalkers EMPTY>
+<!ATTLIST activetalkers
+        report (yes | no | true | false) #REQUIRED
+        interval CDATA "60s"
+>
+-->
+
+<!--
+<!ELEMENT signal EMPTY>
+<!ATTLIST signal
+	type NMTOKEN #REQUIRED
+	report (yes | no | true | false) #REQUIRED
+>
+-->
+<!ELEMENT activetalkers (talker*)?>
+<!ATTLIST activetalkers
+        report (yes | no | true | false) #IMPLIED
+        interval CDATA "60s"
+>
+<!ELEMENT talker EMPTY>
+<!ATTLIST talker
+	callid CDATA #REQUIRED
+>
+<!ELEMENT status EMPTY>
+<!ATTLIST status
+	command (idle | play | collect | record) #REQUIRED
+	duration CDATA #REQUIRED
+>
+<!ELEMENT audio EMPTY>
+<!ATTLIST audio
+	url CDATA #REQUIRED
+	encoding CDATA #IMPLIED
+	gain CDATA "0"
+	gaindelta CDATA "0"
+	rate CDATA "0"
+	ratedelta CDATA "0"
+>
+<!ELEMENT variable EMPTY>
+<!ATTLIST variable
+	type (dat | dig | dur | mth | mny | num | sil | str | tme | wkd) #REQUIRED
+        <!-- FIXME: USD creates an error -> is it because of all capital? -->
+	<!-- subtype (mdy | dmy | ymd | ndn | t12 | t24 | USD | gen | ndn | crd | ord) #IMPLIED -->
+	subtype (mdy | dmy | ymd | ndn | usd | t12 | t24 | gen | ndn | crd | ord) #IMPLIED
+	value CDATA #REQUIRED
+>
+<!ELEMENT auto EMPTY>
+<!ATTLIST auto
+	startlevel CDATA #IMPLIED
+	targetlevel CDATA #IMPLIED
+	silencethreshold CDATA #IMPLIED
+>
+<!ELEMENT fixed EMPTY>
+<!ATTLIST fixed
+	level CDATA #IMPLIED
+>
+
diff --git a/resources/protocols/dtds/pocsettings.dtd b/resources/protocols/dtds/pocsettings.dtd
new file mode 100644
index 00000000..b474d1c9
--- /dev/null
+++ b/resources/protocols/dtds/pocsettings.dtd
@@ -0,0 +1,27 @@
+<? wireshark:protocol
+   proto_name="poc-settings"
+   description="poc-settings XML doc (RFC 4354)"
+   hierarchy="yes" ?>
+
+
+<!ELEMENT poc-settings (entity)* >
+<!ATTLIST poc-settings xmlns CDATA #IMPLIED>
+
+<!ELEMENT entity (isb-settings? | am-settings? | ipab-settings? | sss-settings?)* >
+<!ATTLIST entity id CDATA #REQUIRED>
+
+<!ELEMENT isb-settings (incoming-session-barring)>
+<!ELEMENT incoming-session-barring (#PCDATA)>
+<!ATTLIST incoming-session-barring    active CDATA #REQUIRED>
+
+<!ELEMENT am-settings (answer-mode)>
+<!ELEMENT answer-mode (#PCDATA)>
+
+<!ELEMENT ipab-settings (incoming-personal-alert-barring)>
+<!ELEMENT incoming-personal-alert-barring (#PCDATA)>
+<!ATTLIST incoming-personal-alert-barring    active CDATA #REQUIRED>
+
+<!ELEMENT sss-settings (simultaneous-sessions-support)>
+<!ELEMENT simultaneous-sessions-support (#PCDATA)>
+<!ATTLIST simultaneous-sessions-support    active CDATA #REQUIRED>
+
diff --git a/resources/protocols/dtds/presence.dtd b/resources/protocols/dtds/presence.dtd
new file mode 100644
index 00000000..ca292069
--- /dev/null
+++ b/resources/protocols/dtds/presence.dtd
@@ -0,0 +1,25 @@
+<? wireshark:protocol
+   proto_name="presence"
+   description="presence XML doc (RFC 3863)"
+   media="application/cpim-pidf+xml"
+   hierarchy="yes" ?>
+
+
+<!ELEMENT presence (tuple)* >
+<!ATTLIST presence xmlns CDATA #IMPLIED entity CDATA #REQUIRED>
+
+<!ELEMENT tuple (status? | contact? | note? | timestamp?)* >
+<!ATTLIST tuple id CDATA #REQUIRED>
+
+<!ELEMENT status (basic)>
+
+<!ELEMENT basic (#PCDATA)>
+
+<!ELEMENT contact (#PCDATA)>
+<!ATTLIST contact priority CDATA #REQUIRED>
+
+<!ELEMENT note (#PCDATA)>
+<!ATTLIST note    lang CDATA #REQUIRED>
+
+<!ELEMENT timestamp (#PCDATA)>
+
diff --git a/resources/protocols/dtds/reginfo.dtd b/resources/protocols/dtds/reginfo.dtd
new file mode 100644
index 00000000..ba9601f2
--- /dev/null
+++ b/resources/protocols/dtds/reginfo.dtd
@@ -0,0 +1,38 @@
+<? wireshark:protocol
+   proto_name="reginfo"
+   description="Reginfo XML doc (RFC 3680)"
+   hierarchy="yes" ?>
+
+
+<!ELEMENT reginfo (registration)* >
+<!ATTLIST reginfo xmlns CDATA #IMPLIED
+                  version CDATA #REQUIRED
+                  state CDATA #REQUIRED>
+
+<!ELEMENT registration (contact)*>
+<!ATTLIST registration aor CDATA #REQUIRED
+                       id CDATA #REQUIRED
+                       state CDATA #REQUIRED>
+
+<!ELEMENT contact (uri | display-name? | unknown-param?)* >
+<!ATTLIST contact      id CDATA #REQUIRED
+                       state CDATA #REQUIRED
+                       event CDATA #REQUIRED
+                       expires CDATA #IMPLIED
+                       retry-after CDATA #IMPLIED
+                       duration-registered CDATA #IMPLIED
+                       q CDATA #IMPLIED
+                       cseq CDATA #IMPLIED
+                       callid CDATA #IMPLIED>
+
+<!ELEMENT uri (#PCDATA)>
+
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name  lang CDATA #IMPLIED>
+
+<!ELEMENT unknown-param (#PCDATA)>
+<!ATTLIST unknown-param  name CDATA #REQUIRED>
+
+
+
+
diff --git a/resources/protocols/dtds/rlmi.dtd b/resources/protocols/dtds/rlmi.dtd
new file mode 100644
index 00000000..a41b0a72
--- /dev/null
+++ b/resources/protocols/dtds/rlmi.dtd
@@ -0,0 +1,28 @@
+<? wireshark:protocol
+   proto_name="list"
+   description="Event Notification for Resource Lists (RFC 4662)"
+   hierarchy="yes" ?>
+
+
+<!ELEMENT list (name | resource)* >
+<!ATTLIST list xmlns CDATA #IMPLIED
+               uri CDATA #REQUIRED
+               version CDATA #REQUIRED
+               fullstate CDATA #REQUIRED
+               cid CDATA #REQUIRED>
+
+<!ELEMENT resource  (name | instance)*>
+<!ATTLIST resource     uri CDATA #REQUIRED>
+
+<!-- N.B. name appears at 2 different levels in this schema! -->
+<!ELEMENT name  (#PCDATA)>
+<!ATTLIST name     lang CDATA #REQUIRED>
+
+<!ELEMENT instance (#PCDATA)>
+<!ATTLIST instance  id CDATA #IMPLIED
+                    STATE CDATA #IMPLIED
+                    reason CDATA #IMPLIED
+                    cid CDATA #IMPLIED>
+
+
+
diff --git a/resources/protocols/dtds/rss.dtd b/resources/protocols/dtds/rss.dtd
new file mode 100644
index 00000000..dc7651db
--- /dev/null
+++ b/resources/protocols/dtds/rss.dtd
@@ -0,0 +1,106 @@
+<? wireshark:protocol proto_name="rss" hierarchy="yes" ?>
+
+<!--
+    this DTD is made so that wireshark can dissect RSS up to 2.0, do not try to use it for validating RSS documents
+    https://cyber.harvard.edu/rss/rss.html
+-->
+
+<!ELEMENT rss (channel) >
+
+<!ATTLIST rss version CDATA #REQUIRED >
+
+<!ELEMENT channel ( title
+                  | description
+                  | link
+                  | language
+                  | item+
+                  | rating?
+                  | image?
+                  | textinput?
+                  | copyright?
+                  | pubDate?
+                  | lastBuildDate?
+                  | docs?
+                  | managingEditor?
+                  | webMaster?
+                  | skipHours?
+                  | skipDays?
+                  
+                  | cloud
+                  | ttl
+                  )*>
+
+<!ELEMENT title (#PCDATA)>
+
+<!ELEMENT description (#PCDATA)>
+
+<!ELEMENT link (#PCDATA)>
+
+<!ELEMENT image (title | url | link | width? | height? | description?)*>
+
+<!ELEMENT url (#PCDATA)>
+
+<!ELEMENT item ( title | link | description
+               | author | category | comments | enclosure | guid | pubDate | source )*>
+
+<!ELEMENT textinput (title | description | name | link)*>
+
+<!ELEMENT name (#PCDATA)>
+
+<!ELEMENT rating (#PCDATA)>
+
+<!ELEMENT language (#PCDATA)>
+
+<!ELEMENT width (#PCDATA)>
+
+<!ELEMENT height (#PCDATA)>
+
+<!ELEMENT copyright (#PCDATA)>
+
+<!ELEMENT pubDate (#PCDATA)>
+
+<!ELEMENT lastBuildDate (#PCDATA)>
+
+<!ELEMENT docs (#PCDATA)>
+
+<!ELEMENT managingEditor (#PCDATA)>
+
+<!ELEMENT webMaster (#PCDATA)>
+
+<!ELEMENT hour (#PCDATA)>
+
+<!ELEMENT day (#PCDATA)>
+
+<!ELEMENT skipHours (hour+)>
+
+<!ELEMENT skipDays (day+)>
+
+<!ELEMENT cloud (#PCDATA)>
+
+<!ATTLIST cloud domain CDATA #IMPLIED
+                port CDATA #IMPLIED
+                registerProcedure CDATA #IMPLIED
+                protocol CDATA #IMPLIED
+                path CDATA #IMPLIED >
+                    
+<!ELEMENT ttl (#PCDATA)>
+
+<!ELEMENT source (#PCDATA)>
+<!ATTLIST source url CDATA #IMPLIED >
+
+<!ELEMENT enclosure (#PCDATA)>
+<!ATTLIST enclosure url CDATA #IMPLIED
+                    length CDATA #IMPLIED
+                    type CDATA #IMPLIED >
+
+
+<!ELEMENT category (#PCDATA)>
+<!ATTLIST category domain CDATA #IMPLIED >
+
+<!ELEMENT guid (#PCDATA)>
+<!ATTLIST guid isPermaLink CDATA #IMPLIED >
+
+<!ELEMENT author (#PCDATA)>
+
+<!ELEMENT comments (#PCDATA)>
+
diff --git a/resources/protocols/dtds/smil.dtd b/resources/protocols/dtds/smil.dtd
new file mode 100644
index 00000000..7f0ce562
--- /dev/null
+++ b/resources/protocols/dtds/smil.dtd
@@ -0,0 +1,252 @@
+<? wireshark:protocol
+	proto_name="smil"
+	media="application/smil"
+	description="Synchronized Multimedia Integration Language"
+	?>
+
+<!--
+
+    This is the XML document type definition (DTD) for SMIL 1.0.
+
+    Date: 1998/06/15 08:56:30
+
+    Authors: 
+        Jacco van Ossenbruggen <jrvosse@cwi.nl> 
+        Sjoerd Mullender       <sjoerd@cwi.nl>
+        
+    Further information about SMIL is available at:
+
+          https://www.w3.org/AudioVideo/
+
+-->
+
+
+<!-- Generally useful entities -->
+<!ENTITY % id-attr "id ID #IMPLIED">
+<!ENTITY % title-attr "title CDATA #IMPLIED">
+<!ENTITY % skip-attr "skip-content (true|false) 'true'">
+<!ENTITY % desc-attr "
+        %title-attr;
+        abstract        CDATA   #IMPLIED
+        author          CDATA   #IMPLIED
+        copyright       CDATA   #IMPLIED
+">
+
+<!--=================== SMIL Document =====================================-->
+<!--
+     The root element SMIL contains all other elements.
+-->
+<!ELEMENT smil (head?,body?)>
+<!ATTLIST smil
+        %id-attr;
+>
+
+<!--=================== The Document Head =================================-->
+<!ENTITY % layout-section "layout|switch">
+
+<!ENTITY % head-element "(meta*,((%layout-section;), meta*))?">
+
+<!ELEMENT head %head-element;>
+<!ATTLIST head %id-attr;>
+
+
+<!--=================== Layout Element ====================================-->
+<!--
+     Layout contains the region and root-layout elements defined by
+     smil-basic-layout or other elements defined an external layout 
+     mechanism.
+-->
+<!ELEMENT layout (region|root-layout)>
+<!ATTLIST layout
+        %id-attr;
+        type CDATA      "text/smil-basic-layout"
+>
+
+
+<!--=================== Region Element ===================================-->
+<!ENTITY % viewport-attrs "
+        height              CDATA    #IMPLIED
+        width               CDATA    #IMPLIED
+        background-color    CDATA    #IMPLIED
+">
+
+<!ELEMENT region EMPTY>
+<!ATTLIST region
+        %id-attr;
+        %title-attr;
+        %viewport-attrs;
+        left                CDATA    "0"
+        top                 CDATA    "0"
+        z-index             CDATA    "0"
+        fit                 (hidden|fill|meet|scroll|slice)    "hidden"
+        %skip-attr;
+>
+
+<!--=================== Root-layout Element ================================-->
+<!ELEMENT root-layout EMPTY>
+<!ATTLIST root-layout
+        %id-attr;
+        %title-attr;
+        %viewport-attrs;
+        %skip-attr;
+>
+
+
+<!--=================== Meta Element=======================================-->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+        name    NMTOKEN #REQUIRED
+        content CDATA   #REQUIRED
+        %skip-attr;
+>
+
+<!--=================== The Document Body =================================-->
+<!ENTITY % media-object "audio|video|text|img|animation|textstream|ref">
+<!ENTITY % schedule "par|seq|(%media-object;)">
+<!ENTITY % inline-link "a">
+<!ENTITY % assoc-link "anchor">
+<!ENTITY % link "%inline-link;">
+<!ENTITY % container-content "(%schedule;)|switch|(%link;)">
+<!ENTITY % body-content "(%container-content;)">
+
+<!ELEMENT body (%body-content;)*>
+<!ATTLIST body %id-attr;>
+
+<!--=================== Synchronization Attributes ========================-->
+<!ENTITY % sync-attributes "
+        begin   CDATA   #IMPLIED
+        end     CDATA   #IMPLIED
+">
+
+<!--=================== Switch Parameter Attributes =======================-->
+<!ENTITY % system-attribute "
+        system-bitrate             CDATA                #IMPLIED
+        system-language            CDATA                #IMPLIED
+        system-required            NMTOKEN              #IMPLIED
+        system-screen-size         CDATA                #IMPLIED
+        system-screen-depth        CDATA                #IMPLIED
+        system-captions            (on|off)             #IMPLIED
+        system-overdub-or-caption  (caption|overdub)    #IMPLIED
+">
+
+<!--=================== Fill Attribute ====================================-->
+<!ENTITY % fill-attribute "
+        fill    (remove|freeze)    'remove'
+">
+
+
+<!--=================== The Parallel Element ==============================-->
+<!ENTITY % par-content "%container-content;">
+<!ELEMENT par    (%par-content;)*>
+<!ATTLIST par
+        %id-attr;
+        %desc-attr;
+        endsync CDATA           "last"
+        dur     CDATA           #IMPLIED
+        repeat  CDATA           "1"
+        region  IDREF           #IMPLIED
+        %sync-attributes;
+        %system-attribute;
+>
+
+<!--=================== The Sequential Element ============================-->
+<!ENTITY % seq-content "%container-content;">
+<!ELEMENT seq    (%seq-content;)*>
+<!ATTLIST seq
+        %id-attr;
+        %desc-attr;
+        dur     CDATA           #IMPLIED
+        repeat  CDATA           "1"
+        region  IDREF           #IMPLIED
+        %sync-attributes;
+        %system-attribute;
+>
+
+<!--=================== The Switch Element ================================-->
+<!-- In the head, a switch may contain only layout elements,
+     in the body, only container elements. However, this
+     constraint cannot be expressed in the DTD (?), so
+     we allow both:
+-->
+<!ENTITY % switch-content "layout|(%container-content;)">
+<!ELEMENT switch (%switch-content;)*>
+<!ATTLIST switch
+        %id-attr;
+        %title-attr;
+>
+
+<!--=================== Media Object Elements =============================-->
+<!-- SMIL only defines the structure. The real media data is
+     referenced by the src attribute of the media objects.
+-->
+
+<!-- Furthermore, they have the following attributes as defined
+     in the SMIL specification:
+-->
+<!ENTITY % mo-attributes "
+        %id-attr;
+        %desc-attr;
+        region     IDREF           #IMPLIED
+        alt        CDATA           #IMPLIED
+        longdesc   CDATA           #IMPLIED
+        src        CDATA           #IMPLIED
+        type       CDATA           #IMPLIED
+        dur        CDATA           #IMPLIED
+        repeat     CDATA           '1'
+        %fill-attribute;
+        %sync-attributes;
+        %system-attribute;
+">
+
+<!--
+     Most info is in the attributes, media objects are empty or
+     contain associated link elements:
+-->
+<!ENTITY % mo-content "(%assoc-link;)*">
+<!ENTITY % clip-attrs "
+        clip-begin      CDATA   #IMPLIED
+        clip-end        CDATA   #IMPLIED
+">
+
+<!ELEMENT ref           %mo-content;>
+<!ELEMENT audio         %mo-content;>
+<!ELEMENT img           %mo-content;>
+<!ELEMENT video         %mo-content;>
+<!ELEMENT text          %mo-content;>
+<!ELEMENT textstream    %mo-content;>
+<!ELEMENT animation     %mo-content;>
+
+<!ATTLIST ref           %mo-attributes; %clip-attrs;>
+<!ATTLIST audio         %mo-attributes; %clip-attrs;>
+<!ATTLIST video         %mo-attributes; %clip-attrs;>
+<!ATTLIST animation     %mo-attributes; %clip-attrs;>
+<!ATTLIST textstream    %mo-attributes; %clip-attrs;>
+<!ATTLIST text          %mo-attributes;>
+<!ATTLIST img           %mo-attributes;>
+
+<!--=================== Link Elements =====================================-->
+
+<!ENTITY % smil-link-attributes "
+        %id-attr;
+        %title-attr;
+        href            CDATA                   #REQUIRED
+        show            (replace|new|pause)     'replace'
+">
+
+
+<!--=================== Inline Link Element ===============================-->
+<!ELEMENT a (%schedule;|switch)*>
+<!ATTLIST a
+        %smil-link-attributes;
+>
+
+
+<!--=================== Associated Link Element ===========================-->
+<!ELEMENT anchor EMPTY>
+<!ATTLIST anchor
+        %skip-attr;
+        %smil-link-attributes;
+        %sync-attributes;
+        coords          CDATA                   #IMPLIED
+>
+
diff --git a/resources/protocols/dtds/watcherinfo.dtd b/resources/protocols/dtds/watcherinfo.dtd
new file mode 100644
index 00000000..483e5591
--- /dev/null
+++ b/resources/protocols/dtds/watcherinfo.dtd
@@ -0,0 +1,23 @@
+<? wireshark:protocol
+   proto_name="watcherinfo"
+   description="watcherinfo XML doc (RFC 3858)"
+   hierarchy="yes" ?>
+
+
+<!ELEMENT watcherinfo (watcher-list)* >
+<!ATTLIST watcherinfo xmlns CDATA #IMPLIED
+                      version CDATA #REQUIRED
+                      state CDATA #REQUIRED>
+
+<!ELEMENT watcher-list (watcher?)* >
+<!ATTLIST watcher-list resource CDATA #REQUIRED
+                       package CDATA #REQUIRED>
+
+<!ELEMENT watcher (#PCDATA)>
+<!ATTLIST watcher    display-name        CDATA #IMPLIED
+                     status              CDATA #REQUIRED
+                     event               CDATA #REQUIRED
+                     expiration          CDATA #IMPLIED
+                     id                  CDATA #REQUIRED
+                     duration-subscribed CDATA #IMPLIED>
+
diff --git a/resources/protocols/dtds/xcap-caps.dtd b/resources/protocols/dtds/xcap-caps.dtd
new file mode 100644
index 00000000..1f828742
--- /dev/null
+++ b/resources/protocols/dtds/xcap-caps.dtd
@@ -0,0 +1,12 @@
+<? wireshark:protocol
+   proto_name="xcap-caps"
+   description="XML Configuration Access Protocol Server Capabilities"
+   hierarchy="yes" ?>
+
+
+<!ELEMENT xcap-caps ((auid?)*, extension?, (namespace?)*) >
+
+<!ELEMENT auid      (#PCDATA)>
+<!ELEMENT extension (#PCDATA)>
+<!ELEMENT namespace (#PCDATA)>
+
diff --git a/resources/protocols/dtds/xcap-error.dtd b/resources/protocols/dtds/xcap-error.dtd
new file mode 100644
index 00000000..1a21a8c1
--- /dev/null
+++ b/resources/protocols/dtds/xcap-error.dtd
@@ -0,0 +1,64 @@
+<? wireshark:protocol
+   proto_name="xcap-error"
+   description="XCAP Error XML doc (RFC 4825)"
+   hierarchy="yes" ?>
+
+<!ELEMENT xcap-error (schema-validation-error?,
+                      not-xml-frag?,
+                      no-parent?,
+                      cannot-insert?,
+                      not-xml-att-value?,
+                      uniqueness-failure?,
+                      not-well-formed?,
+                      constraint-failure?,
+                      cannot-delete?,
+                      not-utf-8?)*  >
+<!ATTLIST xcap-error xmlns CDATA #IMPLIED >
+
+
+<!ELEMENT schema-validation-error (#PCDATA)>
+<!ATTLIST schema-validation-error phrase CDATA #IMPLIED>
+
+
+<!ELEMENT not-xml-frag (#PCDATA)>
+<!ATTLIST not-xml-frag phrase CDATA #IMPLIED>
+
+
+<!ELEMENT ancestor (#PCDATA)>
+
+<!ELEMENT no-parent (ancestor)>
+<!ATTLIST no-parent phrase CDATA #IMPLIED>
+
+
+<!ELEMENT cannot-insert (#PCDATA)>
+<!ATTLIST cannot-insert phrase CDATA #IMPLIED>
+
+
+<!ELEMENT alt-value (#PCDATA)>
+
+<!ELEMENT exists (alt-value)>
+<!ATTLIST exists field CDATA #IMPLIED>
+
+<!ELEMENT uniqueness-failure (exists)*>
+<!ATTLIST uniqueness-failure phrase CDATA #IMPLIED>
+
+
+<!ELEMENT not-xml-att-value (#PCDATA)>
+<!ATTLIST not-xml-att-value phrase CDATA #IMPLIED>
+
+
+<!ELEMENT not-well-formed (#PCDATA)>
+<!ATTLIST not-well-formed phrase CDATA #IMPLIED>
+
+
+<!ELEMENT constraint-failure (#PCDATA)>
+<!ATTLIST constraint-failure phrase CDATA #IMPLIED>
+
+
+<!ELEMENT cannot-delete (#PCDATA)>
+<!ATTLIST cannot-delete phrase CDATA #IMPLIED>
+
+
+<!ELEMENT not-utf-8 (#PCDATA)>
+<!ATTLIST not-utf-8 phrase CDATA #IMPLIED>
+