Move the Diameter dictionary files to a "diameter" subdirectory, along
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 29 Sep 2005 02:20:29 +0000 (02:20 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 29 Sep 2005 02:20:29 +0000 (02:20 +0000)
the lines of what's done for RADIUS.  That keeps them together (and
separate from other files), and makes the layout of the top-level source
directory closer to the layout of the installation directory, so that if
you run Ethereal or Tethereal from the top-level directory on Windows
it'll pick up the Diameter dictionary files (if it supports loading
them), and can do so on UN*X if we support a mechanism to let it find
its control files in the directory in which the binary resides.

Use the diameter_DATA, dtds_DATA, and radius_DATA macros in the
EXTRA_DIST macro, so you only have to change the lists of Diameter, DTD,
and RADIUS files in one place if you add or remove a file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16050 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.am
diameter/dictionary.dtd [moved from dictionary.dtd with 100% similarity]
diameter/dictionary.xml [moved from dictionary.xml with 100% similarity]
diameter/imscxdx.xml [moved from imscxdx.xml with 100% similarity]
diameter/mobileipv4.xml [moved from mobileipv4.xml with 100% similarity]
diameter/nasreq.xml [moved from nasreq.xml with 100% similarity]
diameter/sunping.xml [moved from sunping.xml with 100% similarity]
epan/dissectors/packet-cops.c
packaging/nsis/ethereal.nsi

index 71cc468816a3de6a7d1bf9e3a21481c0723af3a8..2b7f69a9c96dedca87c2ccad9852e637b24d86fc 100644 (file)
@@ -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             \
similarity index 100%
rename from dictionary.dtd
rename to diameter/dictionary.dtd
similarity index 100%
rename from dictionary.xml
rename to diameter/dictionary.xml
similarity index 100%
rename from imscxdx.xml
rename to diameter/imscxdx.xml
similarity index 100%
rename from mobileipv4.xml
rename to diameter/mobileipv4.xml
similarity index 100%
rename from nasreq.xml
rename to diameter/nasreq.xml
similarity index 100%
rename from sunping.xml
rename to diameter/sunping.xml
index df70b5ddc651b9bdd53b2aca32a613ac00a4cba1..3e75478d995a9f118c889802e259977116549d23 100644 (file)
@@ -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);
index adb6a9f067545a9c7650cfb95d4be02b7d8c48e0..d590e92a5fb1241d160ec4af1bb9f22d2c20f510 100644 (file)
@@ -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