Commit Graph

65 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 ba2aae0f8e Use ENC_NA as encoding for FT_PROTOCOL, FT_NONE and FT_BYTES.
svn path=/trunk/; revision=38122
2011-07-19 18:48:31 +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
Graeme Lunt 1b1ee3ca3e Support for X.519 (section 9) Internet Directly Mapped Protocol (IDMP).
IDMP provides a mapping of request-response service elements directly onto the Internet TCP/IP protocol, bypassing the ACSE, Presentation, Session and Transport layers of the OSI model. It also supports the use of TLS services.

The DAP dissector has been updated to use the IDMP protocol.



svn path=/trunk/; revision=33177
2010-06-09 14:17:51 +00:00
Bill Meier a15c9b4836 My try at fixing Bug 4653; (Also reverts SVN #32420)
svn path=/trunk/; revision=32423
2010-04-08 05:17:27 +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
Bill Meier f8b92f8d0b #include <stdio.h> not needed.
svn path=/trunk/; revision=32405
2010-04-06 17:01:14 +00:00
Anders Broman 6a4c131442 Try to get rid of unused code warnings.
svn path=/trunk/; revision=32061
2010-03-01 09:30:45 +00:00
Anders Broman f25e74c524 Dissect error code.
svn path=/trunk/; revision=32060
2010-03-01 07:27:35 +00:00
Stig Bjørlykke bb6bebdad4 Build dependencies for acse.
svn path=/trunk/; revision=32030
2010-02-27 11:45:54 +00:00
Anders Broman ba8d7bd919 Get rid of check_col();
svn path=/trunk/; revision=31544
2010-01-17 12:19:02 +00:00
Stig Bjørlykke 7b9b38018f Update to X.511:08/2005.
svn path=/trunk/; revision=31494
2010-01-11 13:37:36 +00:00
Stig Bjørlykke 112fa32d0b Fixed some OPTIONAL vs. DEFAULT issues.
Regenerate the DOP dissector.

svn path=/trunk/; revision=31313
2009-12-18 17:43:54 +00:00
Stig Bjørlykke b9524c35d1 SearchArgumentData filter and EntryInformationSelection attributes are
OPTIONAL as they are defined with a DEFAULT.

svn path=/trunk/; revision=31128
2009-11-30 12:54:47 +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 fbe646b949 pkixcrmf -> crmf to make directory name consistent with filenames
svn path=/trunk/; revision=30472
2009-10-10 13:00:21 +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 00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Stig Bjørlykke 1511ef5a88 From Chris Ridd (bug 3329):
There are two additional fields in PartialOutcomeQualifiers in X.500(2005) -
the entryCount CHOICE now has an "exact" option, and there's a "streamedResult"
flag.

svn path=/trunk/; revision=27713
2009-03-12 20:51:34 +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
Anders Broman e375c3990a Regenerate all asn2wrs generated dissectors
svn path=/trunk/; revision=26670
2008-11-01 22:30:14 +00:00
Anders Broman 1a109ff02c Update to use unchanged asn1 files and X.501:08/2005.
Hopefullly without breaking to many things.

svn path=/trunk/; revision=26108
2008-09-01 20:29:01 +00:00
Anders Broman cbc3b42cec Fix a warning.
svn path=/trunk/; revision=25773
2008-07-20 21:59:06 +00:00
Bill Meier 1cd76ad66a Remove svn:executable property
svn path=/trunk/; revision=24384
2008-02-18 23:58:45 +00:00
Anders Broman 2942ff4d5b Get rid of some warnings.
svn path=/trunk/; revision=24251
2008-02-03 10:07:42 +00:00
Anders Broman a6d82ae12e Get rid of ber_last_created_item().
svn path=/trunk/; revision=24008
2008-01-04 12:39:52 +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
Graeme Lunt 9c6ac3835f Revised DAP dissector using latest asn2wrs features (requiring fewer changes the ASN.1 module) and table-driven operations.
svn path=/trunk/; revision=23875
2007-12-15 15:21:25 +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
Anders Broman 2555a2f6fb as2wrs now handles EXTERNAL(direct-reference requires no special handling).
svn path=/trunk/; revision=23382
2007-11-06 20:16:59 +00:00
Anders Broman 43700969a6 Use oid_add_from_string for adding names.
(gsmmap and inap does not compile at the moment).

svn path=/trunk/; revision=23324
2007-10-31 21:24:16 +00:00
Anders Broman 1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Graeme Lunt 57ee7ab119 Update to use the -X and -T asn2wrs flags.
Straightforward.

svn path=/trunk/; revision=23247
2007-10-22 17:18:42 +00:00
Jörg Mayer c2d0c8fa31 - Fix svn:ignore for all directories
- gsmmap: uncomment -s option in gsmmap.cnf
- Fix cyclic dependencies:
  + Remove EXPORT_CNF from dependencies for cnf files
  + Replace all INCLUDE ...-exp.cnf with IMPORT ...-exp.cnf

svn path=/trunk/; revision=23202
2007-10-16 13:59:40 +00:00
Jörg Mayer 0e0bed500d - Remove -e option if the generated -exp.cnf file isn't used.
- Add EXPORT_FILES to all files that still contain -e.

svn path=/trunk/; revision=23145
2007-10-11 05:27:27 +00:00
Jörg Mayer 060e9ed954 Add missing dependencies and update syntax of existing ones.
svn path=/trunk/; revision=23143
2007-10-10 22:26:40 +00:00
Jörg Mayer 61cde0d09e - Change Makefiles to include preinc
- Add missing new directories to asn1/Makefile.nmake

svn path=/trunk/; revision=23141
2007-10-10 19:03:24 +00:00
Jörg Mayer 24470fdfae More conversions and updates to existing Makefile stuff
svn path=/trunk/; revision=23127
2007-10-10 08:09:19 +00:00
Jörg Mayer 4a5f7e88a7 Convert some more protocols to new Makefile style.
Renamed the gsmmap template files to not contain an _

svn path=/trunk/; revision=23083
2007-10-07 20:02:30 +00:00
Jörg Mayer 682332dcc0 Convert asn1/dap/
svn path=/trunk/; revision=22997
2007-09-27 09:24:38 +00:00
Luis Ontanon 00c5e48a17 get users of oid_resolv to use the new oids, rollout packet-snmp.c
svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
Jörg Mayer b312e64f6a get_ber_length doesn't need the tree argument, get rid of it.
Rebuild asn1 dissectors.

svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
Tomas Kukosa 1dcf2aaef0 use ASN.1 type names in #.FN_BODY (instead of Wireshark type names)
svn path=/trunk/; revision=22054
2007-06-06 08:12:27 +00:00
Tomas Kukosa 31e45c7a21 not allow #.FN_HDR/FTR for Wireshark types but only for ASN.1 types
it makes interconnection between .cnf file and ASN.1 source more readable
(changes for #.FN_BODY will follow)

svn path=/trunk/; revision=22043
2007-06-05 12:00:57 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
Tomas Kukosa a70a1b3eb6 EXTERNAL type is handled in asn2wrs now
private implementations were renamed EXTERNAL -> EXTERNALt

svn path=/trunk/; revision=21662
2007-05-03 11:37:47 +00:00
Ulf Lamping 647533a5ef put every python script name into "" so the call won't fail on Win32 native python.
The problem is the slash in e.g.:

 @$(PYTHON) ../../tools/make-dissector-reg.py

is interpreted as an option instead of being part of the path.

I didn't wanted to use backslashes as this might introduce new problems with cygwin's python port.

svn path=/trunk/; revision=19730
2006-10-29 17:19:52 +00:00