Ethereal->Wireshark

svn path=/trunk/; revision=18248
This commit is contained in:
Anders Broman 2006-05-29 20:44:06 +00:00
parent 7e68c9c370
commit 9aa99b16fe
7 changed files with 412 additions and 412 deletions

View File

@ -1,24 +1,24 @@
<? ethereal:protocol proto_name="dc" description="Dublin Core Metadata (DC)" ?> <? wireshark:protocol proto_name="dc" description="Dublin Core Metadata (DC)" ?>
<!-- <!--
elements definitions for the Dublin Core Metadata DC schema 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 element names obtained from http://www.dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd
--> -->
<!DOCTYPE dc [ <!DOCTYPE dc [
<!ELEMENT title (#PCDATA) > <!ELEMENT title (#PCDATA) >
<!ELEMENT creator (#PCDATA) > <!ELEMENT creator (#PCDATA) >
<!ELEMENT subject (#PCDATA) > <!ELEMENT subject (#PCDATA) >
<!ELEMENT description (#PCDATA) > <!ELEMENT description (#PCDATA) >
<!ELEMENT publisher (#PCDATA) > <!ELEMENT publisher (#PCDATA) >
<!ELEMENT contributor (#PCDATA) > <!ELEMENT contributor (#PCDATA) >
<!ELEMENT date (#PCDATA) > <!ELEMENT date (#PCDATA) >
<!ELEMENT type (#PCDATA) > <!ELEMENT type (#PCDATA) >
<!ELEMENT format (#PCDATA) > <!ELEMENT format (#PCDATA) >
<!ELEMENT identifier (#PCDATA) > <!ELEMENT identifier (#PCDATA) >
<!ELEMENT source (#PCDATA) > <!ELEMENT source (#PCDATA) >
<!ELEMENT language (#PCDATA) > <!ELEMENT language (#PCDATA) >
<!ELEMENT relation (#PCDATA) > <!ELEMENT relation (#PCDATA) >
<!ELEMENT coverage (#PCDATA) > <!ELEMENT coverage (#PCDATA) >
<!ELEMENT rights (#PCDATA) > <!ELEMENT rights (#PCDATA) >
]> ]>

View File

@ -1,25 +1,25 @@
<? ethereal:protocol proto_name="itunes" hierarchy="yes" description="iTunes podCast rss elements" ?> <? wireshark:protocol proto_name="itunes" hierarchy="yes" description="iTunes podCast rss elements" ?>
<!DOCTYPE itunes [ <!DOCTYPE itunes [
<!ELEMENT author (#PCDATA) > <!ELEMENT author (#PCDATA) >
<!ELEMENT block (#PCDATA) > <!ELEMENT block (#PCDATA) >
<!ELEMENT category (#PCDATA) > <!ELEMENT category (#PCDATA) >
<!ATTLIST category text CDATA #IMPLIED > <!ATTLIST category text CDATA #IMPLIED >
<!ELEMENT duration (#PCDATA) > <!ELEMENT duration (#PCDATA) >
<!ELEMENT explicit (#PCDATA) > <!ELEMENT explicit (#PCDATA) >
<!ELEMENT keywords (#PCDATA) > <!ELEMENT keywords (#PCDATA) >
<!ELEMENT owner (#PCDATA) > <!ELEMENT owner (#PCDATA) >
<!ELEMENT subtitle (#PCDATA) > <!ELEMENT subtitle (#PCDATA) >
<!ELEMENT summary (#PCDATA) > <!ELEMENT summary (#PCDATA) >
]> ]>

View File

@ -1,4 +1,4 @@
<? ethereal:protocol <? wireshark:protocol
proto_name="reginfo" proto_name="reginfo"
description="Reginfo XML doc (RFC 3680)" description="Reginfo XML doc (RFC 3680)"
hierarchy="yes" ?> hierarchy="yes" ?>

View File

@ -1,106 +1,106 @@
<? ethereal:protocol proto_name="rss" hierarchy="yes" ?> <? 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 this DTD is made so that wireshark can dissect RSS up to 2.0, do not try to use it for validating RSS documents
http://blogs.law.harvard.edu/tech/rss http://blogs.law.harvard.edu/tech/rss
--> -->
<!ELEMENT rss (channel) > <!ELEMENT rss (channel) >
<!ATTLIST rss version CDATA #REQUIRED > <!ATTLIST rss version CDATA #REQUIRED >
<!ELEMENT channel ( title <!ELEMENT channel ( title
| description | description
| link | link
| language | language
| item+ | item+
| rating? | rating?
| image? | image?
| textinput? | textinput?
| copyright? | copyright?
| pubDate? | pubDate?
| lastBuildDate? | lastBuildDate?
| docs? | docs?
| managingEditor? | managingEditor?
| webMaster? | webMaster?
| skipHours? | skipHours?
| skipDays? | skipDays?
| cloud | cloud
| ttl | ttl
)*> )*>
<!ELEMENT title (#PCDATA)> <!ELEMENT title (#PCDATA)>
<!ELEMENT description (#PCDATA)> <!ELEMENT description (#PCDATA)>
<!ELEMENT link (#PCDATA)> <!ELEMENT link (#PCDATA)>
<!ELEMENT image (title | url | link | width? | height? | description?)*> <!ELEMENT image (title | url | link | width? | height? | description?)*>
<!ELEMENT url (#PCDATA)> <!ELEMENT url (#PCDATA)>
<!ELEMENT item ( title | link | description <!ELEMENT item ( title | link | description
| author | category | comments | enclosure | guid | pubDate | source )*> | author | category | comments | enclosure | guid | pubDate | source )*>
<!ELEMENT textinput (title | description | name | link)*> <!ELEMENT textinput (title | description | name | link)*>
<!ELEMENT name (#PCDATA)> <!ELEMENT name (#PCDATA)>
<!ELEMENT rating (#PCDATA)> <!ELEMENT rating (#PCDATA)>
<!ELEMENT language (#PCDATA)> <!ELEMENT language (#PCDATA)>
<!ELEMENT width (#PCDATA)> <!ELEMENT width (#PCDATA)>
<!ELEMENT height (#PCDATA)> <!ELEMENT height (#PCDATA)>
<!ELEMENT copyright (#PCDATA)> <!ELEMENT copyright (#PCDATA)>
<!ELEMENT pubDate (#PCDATA)> <!ELEMENT pubDate (#PCDATA)>
<!ELEMENT lastBuildDate (#PCDATA)> <!ELEMENT lastBuildDate (#PCDATA)>
<!ELEMENT docs (#PCDATA)> <!ELEMENT docs (#PCDATA)>
<!ELEMENT managingEditor (#PCDATA)> <!ELEMENT managingEditor (#PCDATA)>
<!ELEMENT webMaster (#PCDATA)> <!ELEMENT webMaster (#PCDATA)>
<!ELEMENT hour (#PCDATA)> <!ELEMENT hour (#PCDATA)>
<!ELEMENT day (#PCDATA)> <!ELEMENT day (#PCDATA)>
<!ELEMENT skipHours (hour+)> <!ELEMENT skipHours (hour+)>
<!ELEMENT skipDays (day+)> <!ELEMENT skipDays (day+)>
<!ELEMENT cloud (#PCDATA)> <!ELEMENT cloud (#PCDATA)>
<!ATTLIST cloud domain CDATA #IMPLIED <!ATTLIST cloud domain CDATA #IMPLIED
port CDATA #IMPLIED port CDATA #IMPLIED
registerProcedure CDATA #IMPLIED registerProcedure CDATA #IMPLIED
protocol CDATA #IMPLIED protocol CDATA #IMPLIED
path CDATA #IMPLIED > path CDATA #IMPLIED >
<!ELEMENT ttl (#PCDATA)> <!ELEMENT ttl (#PCDATA)>
<!ELEMENT source (#PCDATA)> <!ELEMENT source (#PCDATA)>
<!ATTLIST source url CDATA #IMPLIED > <!ATTLIST source url CDATA #IMPLIED >
<!ELEMENT enclosure (#PCDATA)> <!ELEMENT enclosure (#PCDATA)>
<!ATTLIST enclosure url CDATA #IMPLIED <!ATTLIST enclosure url CDATA #IMPLIED
length CDATA #IMPLIED length CDATA #IMPLIED
type CDATA #IMPLIED > type CDATA #IMPLIED >
<!ELEMENT category (#PCDATA)> <!ELEMENT category (#PCDATA)>
<!ATTLIST category domain CDATA #IMPLIED > <!ATTLIST category domain CDATA #IMPLIED >
<!ELEMENT guid (#PCDATA)> <!ELEMENT guid (#PCDATA)>
<!ATTLIST guid isPermaLink CDATA #IMPLIED > <!ATTLIST guid isPermaLink CDATA #IMPLIED >
<!ELEMENT author (#PCDATA)> <!ELEMENT author (#PCDATA)>
<!ELEMENT comments (#PCDATA)> <!ELEMENT comments (#PCDATA)>

View File

@ -1,252 +1,252 @@
<? ethereal:protocol <? wireshark:protocol
proto_name="smil" proto_name="smil"
media="application/smil" media="application/smil"
description="Synchronized Multimedia Integration Language" description="Synchronized Multimedia Integration Language"
?> ?>
<!-- <!--
This is the XML document type definition (DTD) for SMIL 1.0. This is the XML document type definition (DTD) for SMIL 1.0.
Date: 1998/06/15 08:56:30 Date: 1998/06/15 08:56:30
Authors: Authors:
Jacco van Ossenbruggen <jrvosse@cwi.nl> Jacco van Ossenbruggen <jrvosse@cwi.nl>
Sjoerd Mullender <sjoerd@cwi.nl> Sjoerd Mullender <sjoerd@cwi.nl>
Further information about SMIL is available at: Further information about SMIL is available at:
http://www.w3.org/AudioVideo/ http://www.w3.org/AudioVideo/
--> -->
<!-- Generally useful entities --> <!-- Generally useful entities -->
<!ENTITY % id-attr "id ID #IMPLIED"> <!ENTITY % id-attr "id ID #IMPLIED">
<!ENTITY % title-attr "title CDATA #IMPLIED"> <!ENTITY % title-attr "title CDATA #IMPLIED">
<!ENTITY % skip-attr "skip-content (true|false) 'true'"> <!ENTITY % skip-attr "skip-content (true|false) 'true'">
<!ENTITY % desc-attr " <!ENTITY % desc-attr "
%title-attr; %title-attr;
abstract CDATA #IMPLIED abstract CDATA #IMPLIED
author CDATA #IMPLIED author CDATA #IMPLIED
copyright CDATA #IMPLIED copyright CDATA #IMPLIED
"> ">
<!--=================== SMIL Document =====================================--> <!--=================== SMIL Document =====================================-->
<!-- <!--
The root element SMIL contains all other elements. The root element SMIL contains all other elements.
--> -->
<!ELEMENT smil (head?,body?)> <!ELEMENT smil (head?,body?)>
<!ATTLIST smil <!ATTLIST smil
%id-attr; %id-attr;
> >
<!--=================== The Document Head =================================--> <!--=================== The Document Head =================================-->
<!ENTITY % layout-section "layout|switch"> <!ENTITY % layout-section "layout|switch">
<!ENTITY % head-element "(meta*,((%layout-section;), meta*))?"> <!ENTITY % head-element "(meta*,((%layout-section;), meta*))?">
<!ELEMENT head %head-element;> <!ELEMENT head %head-element;>
<!ATTLIST head %id-attr;> <!ATTLIST head %id-attr;>
<!--=================== Layout Element ====================================--> <!--=================== Layout Element ====================================-->
<!-- <!--
Layout contains the region and root-layout elements defined by Layout contains the region and root-layout elements defined by
smil-basic-layout or other elements defined an external layout smil-basic-layout or other elements defined an external layout
mechanism. mechanism.
--> -->
<!ELEMENT layout (region|root-layout)> <!ELEMENT layout (region|root-layout)>
<!ATTLIST layout <!ATTLIST layout
%id-attr; %id-attr;
type CDATA "text/smil-basic-layout" type CDATA "text/smil-basic-layout"
> >
<!--=================== Region Element ===================================--> <!--=================== Region Element ===================================-->
<!ENTITY % viewport-attrs " <!ENTITY % viewport-attrs "
height CDATA #IMPLIED height CDATA #IMPLIED
width CDATA #IMPLIED width CDATA #IMPLIED
background-color CDATA #IMPLIED background-color CDATA #IMPLIED
"> ">
<!ELEMENT region EMPTY> <!ELEMENT region EMPTY>
<!ATTLIST region <!ATTLIST region
%id-attr; %id-attr;
%title-attr; %title-attr;
%viewport-attrs; %viewport-attrs;
left CDATA "0" left CDATA "0"
top CDATA "0" top CDATA "0"
z-index CDATA "0" z-index CDATA "0"
fit (hidden|fill|meet|scroll|slice) "hidden" fit (hidden|fill|meet|scroll|slice) "hidden"
%skip-attr; %skip-attr;
> >
<!--=================== Root-layout Element ================================--> <!--=================== Root-layout Element ================================-->
<!ELEMENT root-layout EMPTY> <!ELEMENT root-layout EMPTY>
<!ATTLIST root-layout <!ATTLIST root-layout
%id-attr; %id-attr;
%title-attr; %title-attr;
%viewport-attrs; %viewport-attrs;
%skip-attr; %skip-attr;
> >
<!--=================== Meta Element=======================================--> <!--=================== Meta Element=======================================-->
<!ELEMENT meta EMPTY> <!ELEMENT meta EMPTY>
<!ATTLIST meta <!ATTLIST meta
name NMTOKEN #REQUIRED name NMTOKEN #REQUIRED
content CDATA #REQUIRED content CDATA #REQUIRED
%skip-attr; %skip-attr;
> >
<!--=================== The Document Body =================================--> <!--=================== The Document Body =================================-->
<!ENTITY % media-object "audio|video|text|img|animation|textstream|ref"> <!ENTITY % media-object "audio|video|text|img|animation|textstream|ref">
<!ENTITY % schedule "par|seq|(%media-object;)"> <!ENTITY % schedule "par|seq|(%media-object;)">
<!ENTITY % inline-link "a"> <!ENTITY % inline-link "a">
<!ENTITY % assoc-link "anchor"> <!ENTITY % assoc-link "anchor">
<!ENTITY % link "%inline-link;"> <!ENTITY % link "%inline-link;">
<!ENTITY % container-content "(%schedule;)|switch|(%link;)"> <!ENTITY % container-content "(%schedule;)|switch|(%link;)">
<!ENTITY % body-content "(%container-content;)"> <!ENTITY % body-content "(%container-content;)">
<!ELEMENT body (%body-content;)*> <!ELEMENT body (%body-content;)*>
<!ATTLIST body %id-attr;> <!ATTLIST body %id-attr;>
<!--=================== Synchronization Attributes ========================--> <!--=================== Synchronization Attributes ========================-->
<!ENTITY % sync-attributes " <!ENTITY % sync-attributes "
begin CDATA #IMPLIED begin CDATA #IMPLIED
end CDATA #IMPLIED end CDATA #IMPLIED
"> ">
<!--=================== Switch Parameter Attributes =======================--> <!--=================== Switch Parameter Attributes =======================-->
<!ENTITY % system-attribute " <!ENTITY % system-attribute "
system-bitrate CDATA #IMPLIED system-bitrate CDATA #IMPLIED
system-language CDATA #IMPLIED system-language CDATA #IMPLIED
system-required NMTOKEN #IMPLIED system-required NMTOKEN #IMPLIED
system-screen-size CDATA #IMPLIED system-screen-size CDATA #IMPLIED
system-screen-depth CDATA #IMPLIED system-screen-depth CDATA #IMPLIED
system-captions (on|off) #IMPLIED system-captions (on|off) #IMPLIED
system-overdub-or-caption (caption|overdub) #IMPLIED system-overdub-or-caption (caption|overdub) #IMPLIED
"> ">
<!--=================== Fill Attribute ====================================--> <!--=================== Fill Attribute ====================================-->
<!ENTITY % fill-attribute " <!ENTITY % fill-attribute "
fill (remove|freeze) 'remove' fill (remove|freeze) 'remove'
"> ">
<!--=================== The Parallel Element ==============================--> <!--=================== The Parallel Element ==============================-->
<!ENTITY % par-content "%container-content;"> <!ENTITY % par-content "%container-content;">
<!ELEMENT par (%par-content;)*> <!ELEMENT par (%par-content;)*>
<!ATTLIST par <!ATTLIST par
%id-attr; %id-attr;
%desc-attr; %desc-attr;
endsync CDATA "last" endsync CDATA "last"
dur CDATA #IMPLIED dur CDATA #IMPLIED
repeat CDATA "1" repeat CDATA "1"
region IDREF #IMPLIED region IDREF #IMPLIED
%sync-attributes; %sync-attributes;
%system-attribute; %system-attribute;
> >
<!--=================== The Sequential Element ============================--> <!--=================== The Sequential Element ============================-->
<!ENTITY % seq-content "%container-content;"> <!ENTITY % seq-content "%container-content;">
<!ELEMENT seq (%seq-content;)*> <!ELEMENT seq (%seq-content;)*>
<!ATTLIST seq <!ATTLIST seq
%id-attr; %id-attr;
%desc-attr; %desc-attr;
dur CDATA #IMPLIED dur CDATA #IMPLIED
repeat CDATA "1" repeat CDATA "1"
region IDREF #IMPLIED region IDREF #IMPLIED
%sync-attributes; %sync-attributes;
%system-attribute; %system-attribute;
> >
<!--=================== The Switch Element ================================--> <!--=================== The Switch Element ================================-->
<!-- In the head, a switch may contain only layout elements, <!-- In the head, a switch may contain only layout elements,
in the body, only container elements. However, this in the body, only container elements. However, this
constraint cannot be expressed in the DTD (?), so constraint cannot be expressed in the DTD (?), so
we allow both: we allow both:
--> -->
<!ENTITY % switch-content "layout|(%container-content;)"> <!ENTITY % switch-content "layout|(%container-content;)">
<!ELEMENT switch (%switch-content;)*> <!ELEMENT switch (%switch-content;)*>
<!ATTLIST switch <!ATTLIST switch
%id-attr; %id-attr;
%title-attr; %title-attr;
> >
<!--=================== Media Object Elements =============================--> <!--=================== Media Object Elements =============================-->
<!-- SMIL only defines the structure. The real media data is <!-- SMIL only defines the structure. The real media data is
referenced by the src attribute of the media objects. referenced by the src attribute of the media objects.
--> -->
<!-- Furthermore, they have the following attributes as defined <!-- Furthermore, they have the following attributes as defined
in the SMIL specification: in the SMIL specification:
--> -->
<!ENTITY % mo-attributes " <!ENTITY % mo-attributes "
%id-attr; %id-attr;
%desc-attr; %desc-attr;
region IDREF #IMPLIED region IDREF #IMPLIED
alt CDATA #IMPLIED alt CDATA #IMPLIED
longdesc CDATA #IMPLIED longdesc CDATA #IMPLIED
src CDATA #IMPLIED src CDATA #IMPLIED
type CDATA #IMPLIED type CDATA #IMPLIED
dur CDATA #IMPLIED dur CDATA #IMPLIED
repeat CDATA '1' repeat CDATA '1'
%fill-attribute; %fill-attribute;
%sync-attributes; %sync-attributes;
%system-attribute; %system-attribute;
"> ">
<!-- <!--
Most info is in the attributes, media objects are empty or Most info is in the attributes, media objects are empty or
contain associated link elements: contain associated link elements:
--> -->
<!ENTITY % mo-content "(%assoc-link;)*"> <!ENTITY % mo-content "(%assoc-link;)*">
<!ENTITY % clip-attrs " <!ENTITY % clip-attrs "
clip-begin CDATA #IMPLIED clip-begin CDATA #IMPLIED
clip-end CDATA #IMPLIED clip-end CDATA #IMPLIED
"> ">
<!ELEMENT ref %mo-content;> <!ELEMENT ref %mo-content;>
<!ELEMENT audio %mo-content;> <!ELEMENT audio %mo-content;>
<!ELEMENT img %mo-content;> <!ELEMENT img %mo-content;>
<!ELEMENT video %mo-content;> <!ELEMENT video %mo-content;>
<!ELEMENT text %mo-content;> <!ELEMENT text %mo-content;>
<!ELEMENT textstream %mo-content;> <!ELEMENT textstream %mo-content;>
<!ELEMENT animation %mo-content;> <!ELEMENT animation %mo-content;>
<!ATTLIST ref %mo-attributes; %clip-attrs;> <!ATTLIST ref %mo-attributes; %clip-attrs;>
<!ATTLIST audio %mo-attributes; %clip-attrs;> <!ATTLIST audio %mo-attributes; %clip-attrs;>
<!ATTLIST video %mo-attributes; %clip-attrs;> <!ATTLIST video %mo-attributes; %clip-attrs;>
<!ATTLIST animation %mo-attributes; %clip-attrs;> <!ATTLIST animation %mo-attributes; %clip-attrs;>
<!ATTLIST textstream %mo-attributes; %clip-attrs;> <!ATTLIST textstream %mo-attributes; %clip-attrs;>
<!ATTLIST text %mo-attributes;> <!ATTLIST text %mo-attributes;>
<!ATTLIST img %mo-attributes;> <!ATTLIST img %mo-attributes;>
<!--=================== Link Elements =====================================--> <!--=================== Link Elements =====================================-->
<!ENTITY % smil-link-attributes " <!ENTITY % smil-link-attributes "
%id-attr; %id-attr;
%title-attr; %title-attr;
href CDATA #REQUIRED href CDATA #REQUIRED
show (replace|new|pause) 'replace' show (replace|new|pause) 'replace'
"> ">
<!--=================== Inline Link Element ===============================--> <!--=================== Inline Link Element ===============================-->
<!ELEMENT a (%schedule;|switch)*> <!ELEMENT a (%schedule;|switch)*>
<!ATTLIST a <!ATTLIST a
%smil-link-attributes; %smil-link-attributes;
> >
<!--=================== Associated Link Element ===========================--> <!--=================== Associated Link Element ===========================-->
<!ELEMENT anchor EMPTY> <!ELEMENT anchor EMPTY>
<!ATTLIST anchor <!ATTLIST anchor
%skip-attr; %skip-attr;
%smil-link-attributes; %smil-link-attributes;
%sync-attributes; %sync-attributes;
coords CDATA #IMPLIED coords CDATA #IMPLIED
> >

View File

@ -7,7 +7,7 @@
%{ %{
/* dtd_parse.l /* dtd_parse.l
* an XML dissector for ethereal * an XML dissector for Wireshark
* lexical analyzer for DTDs * lexical analyzer for DTDs
* *
* Copyright 2004, Luis E. Garcia Ontanon <luis.ontanon@gmail.com> * Copyright 2004, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
@ -96,8 +96,8 @@ comment_stop "-->"
start_xmlpi "<?" start_xmlpi "<?"
location_xmlpi "ethereal:location" location_xmlpi "wireshark:location"
protocol_xmlpi "ethereal:protocol" protocol_xmlpi "wireshark:protocol"
get_attr_quote =[:blank:]*["] get_attr_quote =[:blank:]*["]
avoid_editor_bug ["] avoid_editor_bug ["]

View File

@ -9,7 +9,7 @@
/* /*
* dtd_preparser.l * dtd_preparser.l
* *
* an XML dissector for ethereal * an XML dissector for wireshark
* *
* DTD Preparser - import a dtd file into a GString * DTD Preparser - import a dtd file into a GString
* including files, removing comments * including files, removing comments
@ -149,7 +149,7 @@ static const gchar* location(void) {
if (loc) g_free(loc); if (loc) g_free(loc);
loc = g_strdup_printf("<? ethereal:location %s:%u ?>", filename, linenum); loc = g_strdup_printf("<? wireshark:location %s:%u ?>", filename, linenum);
return loc; return loc;
} }