diff options
author | Anders Broman <anders.broman@ericsson.com> | 2006-06-08 05:56:34 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2006-06-08 05:56:34 +0000 |
commit | 94e818ac34fe76a6279029899945aa71b4ba1f32 (patch) | |
tree | c9b05f8185e3b73f4f5a9f1322d553de3c7b7ffe | |
parent | 14dda9803728ed7276f69d3056d66612b62d02c0 (diff) | |
download | wireshark-94e818ac34fe76a6279029899945aa71b4ba1f32.tar.gz wireshark-94e818ac34fe76a6279029899945aa71b4ba1f32.tar.bz2 wireshark-94e818ac34fe76a6279029899945aa71b4ba1f32.zip |
From Martin Mathieson:
new DTD files for the dtds folder. They are for:
- poc-settings (RFC 4354)
- presence (RFC 3863)
- watcherinfo (RFC 3858)
svn path=/trunk/; revision=18394
-rw-r--r-- | dtds/pocsettings.dtd | 27 | ||||
-rw-r--r-- | dtds/presence.dtd | 24 | ||||
-rw-r--r-- | dtds/watcherinfo.dtd | 23 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 3 |
4 files changed, 77 insertions, 0 deletions
diff --git a/dtds/pocsettings.dtd b/dtds/pocsettings.dtd new file mode 100644 index 0000000000..b474d1c9a5 --- /dev/null +++ b/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/dtds/presence.dtd b/dtds/presence.dtd new file mode 100644 index 0000000000..c044cbd34d --- /dev/null +++ b/dtds/presence.dtd @@ -0,0 +1,24 @@ +<? wireshark:protocol + proto_name="presence" + description="presence XML doc (RFC 3863)" + 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/dtds/watcherinfo.dtd b/dtds/watcherinfo.dtd new file mode 100644 index 0000000000..716e8a2cff --- /dev/null +++ b/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/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 6456b8e85e..c7c91411a1 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -439,9 +439,12 @@ SetOutPath $INSTDIR SetOutPath $INSTDIR\dtds File "..\..\dtds\dc.dtd" File "..\..\dtds\itunes.dtd" +File "..\..\dtds\pocsettings.dtd" +File "..\..\dtds\presence.dtd" File "..\..\dtds\reginfo.dtd" File "..\..\dtds\rss.dtd" File "..\..\dtds\smil.dtd" +File "..\..\dtds\watcherinfo.dtd" SetOutPath $INSTDIR SetOutPath $INSTDIR\help |