Commit graph

23 commits

Author SHA1 Message Date
Jeff Morriss
b21b495f9f Don't generate the conformance file for exported types when building the
dissector; instead built it only when the separate target (generate_export)
is built.

Built generate_export when building "all".

This prevents the exp_*.cnf files from being regenerated each time another one
of the exp_*.cnf files (which the current dissector depends on) has changed
(despite the fact that the exported types does not depe

Also fix the CLEANFILES definition so it actually cleans things.

svn path=/trunk/; revision=39421
2011-10-14 10:22:01 +00:00
Jeff Morriss
cf012d27b1 Build the ASN.1 dissectors directly into epan/dissectors (rather than building
them and then copying them over).  The "all" target to builds these dissectors
now (instead of "generate_files" and/or "copy_files").

asn2wrs's "-O" option now means "the dissector goes in this directory" (rather
than "all output goes in this directory"); it also means that the "-s" (single
output file) option is now required.

Fix things up so that it's possible to build all of the ASN.1 dissectors in
one shot.

Fix building of conformance files when doing out-of-source-tree builds.


Unfortunately "make all" in the asn1 directory always builds something--I think
because of circular depedencies.

svn path=/trunk/; revision=39333
2011-10-10 02:31:11 +00:00
Stig Bjørlykke
d9ef8f9ad1 Ensure we always have a valid top_tree for p1.content. This fixes a problem
with other dissectors using p1.content, such as p7.

Reset global content_type_id so this will be correct in more cases.
This is still not a good solution, because ContentType and Content are
generic objects which may occur individual in P7.

Indicate when to report invalid content-type.

svn path=/trunk/; revision=36025
2011-02-22 10:23:44 +00:00
Stig Bjørlykke
5868c7d026 Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent
on the naming policy for X.400 protocols.

svn path=/trunk/; revision=36013
2011-02-20 17:03:29 +00:00
Guy Harris
a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Jeff Morriss
f2fc5d42fd Make some prefs callback functions static. (These modules don't use proto_reg_handoff_*() as their prefs callback.)
svn path=/trunk/; revision=35138
2010-12-06 22:08:48 +00:00
Bill Meier
9ade30a7b1 #include <string.h> and/or #include <stdio.h> not needed.
svn path=/trunk/; revision=32417
2010-04-07 16:54:29 +00:00
Anders Broman
b3ca18378d Try to fix p7 compilation. Changed p7.cnf and regenerated but the generated dissector shows no difference which should be good.
svn path=/trunk/; revision=32408
2010-04-06 19:30:11 +00:00
Stig Bjørlykke
fb56cceeb7 Regenerate P7 with SIZE constraints checking.
Added MSUpperBounds.asn.
Export upper bounds from X411, rename some duplicate definitions in P7.

svn path=/trunk/; revision=31321
2009-12-19 14:26:26 +00:00
Stig Bjørlykke
6d1dae6f28 Make all proto_* values static.
svn path=/trunk/; revision=30516
2009-10-11 16:24:29 +00:00
Kovarththanan Rajaratnam
7ab993bee7 Remove unused NEED_PACKET_PROTO_H variable
svn path=/trunk/; revision=30409
2009-10-08 17:26:57 +00:00
Kovarththanan Rajaratnam
830dd8e8f0 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30126
2009-09-24 20:07:41 +00:00
Graeme Lunt
57d4cea4d5 Update to:
* support the P3 protocol in addition to the P1 protocol; and 
* reduce the number of changes to the ASN.1 modules (as asn2wrs now handles more of the ASN.1 constructs).
P3 is currently only supported over ROS (and not RTSE)


svn path=/trunk/; revision=28593
2009-06-02 11:04:14 +00:00
Bill Meier
35e5fa9bc1 #include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ...
svn path=/trunk/; revision=27390
2009-02-07 14:33:47 +00:00
Bill Meier
488933518c Small cleanups mostly related to proto_reg_handoff
svn path=/trunk/; revision=26750
2008-11-11 15:05:00 +00:00
Guy Harris
d7a51fc7de Get rid of an unused variable in the P7 dissector.
Create a set of warning-clean ASN.1 dissectors and build them with
-Werror, to try to prevent errors creeping back in.  Put the P7
dissector there.

svn path=/trunk/; revision=26090
2008-08-26 01:04:39 +00:00
Anders Broman
c79cce34cb See if this gets rid of some unused code warnings...
svn path=/trunk/; revision=25782
2008-07-21 19:39:47 +00:00
Graeme Lunt
8a0e3ffb37 Additional EXPORTS for X.420 attributes and general fixes.
svn path=/trunk/; revision=23980
2008-01-02 09:30:45 +00:00
Jörg Mayer
3d22aa561b asn1/*/Makefile.nmake were not part of the source package.
Spotted by Tomas Kukosa.

svn path=/trunk/; revision=23921
2007-12-19 10:02:50 +00:00
Tomas Kukosa
1e794fc494 ANSI TCAP regenerated and tested with -T -X asn2wrs options
asn2wrs has -T (tagged types support) and -X (new BER sttructures) default behavior
remove all -T and -X usage

svn path=/trunk/; revision=23823
2007-12-10 08:35:41 +00:00
Graeme Lunt
a58643173d Revised P7 dissector to use #.TABLE directive to generate tables for the ROS dissector from
the [ABSTRACT] OPERATIONS definitions in the ASN.1 file.


svn path=/trunk/; revision=23707
2007-12-03 19:32:28 +00:00
Graeme Lunt
a7dec11ce6 Changes suggested/provided by Anders so that fewer changes are required to the ASN modules.
Also includes the MSAccessProtocol.asn to generate defines for the operation numbers.


svn path=/trunk/; revision=23586
2007-11-25 17:46:42 +00:00
Graeme Lunt
0c571bb235 Basic P7 (X.400 Message Store Access Protocol) dissection after request from the list:
http://www.wireshark.org/lists/wireshark-dev/200711/msg00228.html

Only a single (private) capture file is currently available which contains only a few of the P7 operations, so testing has been minimal.
General attribute types, containing information from the X.400 envelope, are also included.


svn path=/trunk/; revision=23479
2007-11-17 18:08:01 +00:00