diff options
| -rw-r--r-- | Makefile.am | 92 | ||||
| -rw-r--r-- | diameter/dictionary.dtd (renamed from dictionary.dtd) | 0 | ||||
| -rw-r--r-- | diameter/dictionary.xml (renamed from dictionary.xml) | 0 | ||||
| -rw-r--r-- | diameter/imscxdx.xml (renamed from imscxdx.xml) | 0 | ||||
| -rw-r--r-- | diameter/mobileipv4.xml (renamed from mobileipv4.xml) | 0 | ||||
| -rw-r--r-- | diameter/nasreq.xml (renamed from nasreq.xml) | 0 | ||||
| -rw-r--r-- | diameter/sunping.xml (renamed from sunping.xml) | 0 | ||||
| -rw-r--r-- | epan/dissectors/packet-cops.c | 6 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 12 |
9 files changed, 23 insertions, 87 deletions
diff --git a/Makefile.am b/Makefile.am index 71cc468816..2b7f69a9c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,8 +83,13 @@ pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \ # of that directory. # diameterdir = $(pkgdatadir)/diameter -diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \ - nasreq.xml sunping.xml +diameter_DATA = \ + diameter/dictionary.dtd \ + diameter/dictionary.xml \ + diameter/imscxdx.xml \ + diameter/mobileipv4.xml \ + diameter/nasreq.xml \ + diameter/sunping.xml # # Install the DTDs directory files in the "dtds" subdirectory @@ -92,10 +97,10 @@ diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \ # dtdsdir = $(pkgdatadir)/dtds dtds_DATA = \ - dtds/dc.dtd \ - dtds/itunes.dtd \ - dtds/rss.dtd \ - dtds/smil.dtd + dtds/dc.dtd \ + dtds/itunes.dtd \ + dtds/rss.dtd \ + dtds/smil.dtd # # Install the RADIUS directory files in the "radius" subdirectory @@ -492,8 +497,6 @@ EXTRA_DIST = \ debian/prerm \ debian/rules \ dfilters \ - dictionary.dtd \ - dictionary.xml \ doc/Makefile.am \ doc/Makefile.nmake \ doc/README.capture \ @@ -616,7 +619,6 @@ EXTRA_DIST = \ image/icon_layout_5.xpm \ image/icon_layout_6.xpm \ image/wiretap.rc.in \ - imscxdx.xml \ make-authors-format.pl \ make-authors-short.pl \ make-manuf \ @@ -625,79 +627,13 @@ EXTRA_DIST = \ manuf \ manuf.tmpl \ mergecap.c \ - mobileipv4.xml \ - nasreq.xml \ perlnoutf.pl \ print.ps \ - dtds/dc.dtd \ - dtds/itunes.dtd \ - dtds/rss.dtd \ - dtds/smil.dtd \ - radius/dictionary \ - radius/dictionary.3com \ - radius/dictionary.3gpp \ - radius/dictionary.3gpp2 \ - radius/dictionary.acc \ - radius/dictionary.alcatel \ - radius/dictionary.alteon \ - radius/dictionary.altiga \ - radius/dictionary.aptis \ - radius/dictionary.ascend \ - radius/dictionary.bay \ - radius/dictionary.bintec \ - radius/dictionary.bristol \ - radius/dictionary.cablelabs \ - radius/dictionary.cabletron \ - radius/dictionary.cisco \ - radius/dictionary.cisco.bbsm \ - radius/dictionary.cisco.vpn3000 \ - radius/dictionary.cisco.vpn5000 \ - radius/dictionary.colubris \ - radius/dictionary.columbia_university \ - radius/dictionary.compat \ - radius/dictionary.cosine \ - radius/dictionary.ericsson \ - radius/dictionary.erx \ - radius/dictionary.extreme \ - radius/dictionary.foundry \ - radius/dictionary.freeradius \ - radius/dictionary.gandalf \ - radius/dictionary.garderos \ - radius/dictionary.gemtek \ - radius/dictionary.itk \ - radius/dictionary.juniper \ - radius/dictionary.karlnet \ - radius/dictionary.livingston \ - radius/dictionary.localweb \ - radius/dictionary.merit \ - radius/dictionary.microsoft \ - radius/dictionary.mikrotik \ - radius/dictionary.navini \ - radius/dictionary.netscreen \ - radius/dictionary.nokia \ - radius/dictionary.nomadix \ - radius/dictionary.propel \ - radius/dictionary.quintum \ - radius/dictionary.redback \ - radius/dictionary.redcreek \ - radius/dictionary.shasta \ - radius/dictionary.shiva \ - radius/dictionary.sonicwall \ - radius/dictionary.springtide \ - radius/dictionary.t_systems_nova \ - radius/dictionary.telebit \ - radius/dictionary.trapeze \ - radius/dictionary.tunnel \ - radius/dictionary.unisphere \ - radius/dictionary.unix \ - radius/dictionary.usr \ - radius/dictionary.valemount \ - radius/dictionary.versanet \ - radius/dictionary.wispr \ - radius/dictionary.xedia \ + $(diameter_DATA) \ + $(dtds_DATA) \ + $(radius_DATA) \ randpkt.c \ rdps.c \ - sunping.xml \ text2pcap-scanner.l \ text2pcap.c \ text2pcap.h \ diff --git a/dictionary.dtd b/diameter/dictionary.dtd index 6285108f5d..6285108f5d 100644 --- a/dictionary.dtd +++ b/diameter/dictionary.dtd diff --git a/dictionary.xml b/diameter/dictionary.xml index f04f488270..f04f488270 100644 --- a/dictionary.xml +++ b/diameter/dictionary.xml diff --git a/imscxdx.xml b/diameter/imscxdx.xml index d884339331..d884339331 100644 --- a/imscxdx.xml +++ b/diameter/imscxdx.xml diff --git a/mobileipv4.xml b/diameter/mobileipv4.xml index 37566a8c57..37566a8c57 100644 --- a/mobileipv4.xml +++ b/diameter/mobileipv4.xml diff --git a/nasreq.xml b/diameter/nasreq.xml index 30f36a954c..30f36a954c 100644 --- a/nasreq.xml +++ b/diameter/nasreq.xml diff --git a/sunping.xml b/diameter/sunping.xml index fa3cbc96f2..fa3cbc96f2 100644 --- a/sunping.xml +++ b/diameter/sunping.xml diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index df70b5ddc6..3e75478d99 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1367,10 +1367,10 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of start = offset; - offset = dissect_ber_identifier(pinfo , NULL, tvb, start, &class, &pc, &ber_tag); - offset = dissect_ber_length(pinfo, NULL, tvb, offset, &vb_length, &ind); + offset = dissect_ber_identifier(pinfo , NULL, tvb, start, &class, &pc, &ber_tag); + offset = dissect_ber_length(pinfo, NULL, tvb, offset, &vb_length, &ind); - vb_value_start = offset; + vb_value_start = offset; /* Convert the class, constructed flag, and tag to a type. */ vb_type_name = cops_tag_cls2syntax(ber_tag, class, &vb_type); diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index adb6a9f067..d590e92a5f 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -350,12 +350,12 @@ File "..\..\dfilters" ; of the installation directory. ; SetOutPath $INSTDIR\diameter -File "..\..\dictionary.dtd" -File "..\..\dictionary.xml" -File "..\..\imscxdx.xml" -File "..\..\mobileipv4.xml" -File "..\..\nasreq.xml" -File "..\..\sunping.xml" +File "..\..\diameter\dictionary.dtd" +File "..\..\diameter\dictionary.xml" +File "..\..\diameter\imscxdx.xml" +File "..\..\diameter\mobileipv4.xml" +File "..\..\diameter\nasreq.xml" +File "..\..\diameter\sunping.xml" SetOutPath $INSTDIR |