Commit Graph

109 Commits

Author SHA1 Message Date
Stig Bjørlykke 093facc8c6 Corrected oid name.
svn path=/trunk/; revision=27672
2009-03-09 13:25:43 +00:00
Stig Bjørlykke b43af91fe0 Added an expert info when dissector is not available.
svn path=/trunk/; revision=27632
2009-03-07 00:31:03 +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
Anders Broman 742ae8413d Get rid of some unused code warnings.
svn path=/trunk/; revision=25791
2008-07-22 17:28:38 +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
Anders Broman 3b1f0881e2 Update to use the -X and -T asn2wrs flags.
svn path=/trunk/; revision=23366
2007-11-05 20:41:44 +00:00
Anders Broman 528ac73cfd Use oid_add_from_string for adding names.
svn path=/trunk/; revision=23318
2007-10-31 08:26:52 +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 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 548b224e28 Change some additional protocols to the new build system
svn path=/trunk/; revision=22958
2007-09-25 18:02:49 +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
Graeme Lunt fc842e9933 Dissection of octet-aligned EXTERNALs.
svn path=/trunk/; revision=22308
2007-07-14 08:21:58 +00:00
Anders Broman 58f01d87cc Preparations for updated CMIP dissector:
- Export AE-title from ACSE
- Start REAL dissection(unfinished).

svn path=/trunk/; revision=22083
2007-06-12 21:29:27 +00:00
Anders Broman dca634c4de Prepare for the use of the new -X parameter for BER encoded protocols.
svn path=/trunk/; revision=21889
2007-05-22 16:17:54 +00:00
Anders Broman f08cd1e5e3 actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +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
Anders Broman 334177b096 Show BER internal fields in external type in ACSE, update a comment in packet-ber.c.
svn path=/trunk/; revision=21685
2007-05-04 20:27:43 +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
Graeme Lunt 8618db09eb An octet string form of the ASO-qualifier used by some systems from the days when it was an ANY.
Really just an elaboration of the "...".


svn path=/trunk/; revision=19050
2006-08-27 09:03:21 +00:00
Tomas Kukosa 56d7db0c08 remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related
use add_oid_str_name() and get_oid_str_name() instead of them

svn path=/trunk/; revision=18595
2006-06-28 14:19:08 +00:00
Tomas Kukosa 604000a6b3 - remove some #.MODULE_IMPORT from .cng files
- regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs

svn path=/trunk/; revision=18217
2006-05-24 12:24:54 +00:00
Tomas Kukosa 55600fb60a Ethereal -> Wireshark
asn2eth -> asn2wrs

svn path=/trunk/; revision=18214
2006-05-23 15:17:14 +00:00
Tomas Kukosa 62da958bd9 - asn2eth renamed to asn2wrs
- remove obsolete -X option from makefiles
- not generate enumerated map table for BER

dissector will be regenerated later

svn path=/trunk/; revision=18199
2006-05-21 14:36:05 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Guy Harris a6930fe4ae Add distclean and maintainerclean rules.
svn path=/trunk/; revision=17999
2006-04-25 18:45:08 +00:00
Anders Broman 4e13ea2982 Add parsertab.pyc in clean target
svn path=/trunk/; revision=17386
2006-02-23 20:05:05 +00:00
Anders Broman c33182b898 From Graeme Lunt:
Here are a number of small patches for asn1 based dissectors:

acse:
  release request/response column information (many X.400/X.500 unbinds are
empty)
  "standardised" PNAME to "ISO 8650-1 OSI Association Control Service"
  fix for crash when using EXTERNAL dissector

rtse:
  column information when attempting a resume

x509if:
  generation of LDAP-style DNs from RDNSequences 
  new function x509if_get_last_dn() to get the last DN generated.

x509af:
  DSS parameters
  certificate extension naming
  subject naming of certificate

x509sat:
  Guide syntax (as SET now supported)
  PDU exports.
  
cms:
  verification of message digest attribute (SHA-1 and MD5)
  
ess:
  enumerated/restrictive/permissive/informative security categories

x411:
  generation of string encoding of X.400 addresses, trace information and message identifiers.

s4406:
  separate types for primary and copy precedence to allow better filtering (e.g. primary precedence = flash)
  priority-level-qualifier


svn path=/trunk/; revision=16508
2005-11-16 07:13:12 +00:00
Tomas Kukosa 3b770d5c7c - dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
 - BER dissectors adapted and regenerated

svn path=/trunk/; revision=16501
2005-11-14 10:02:31 +00:00
Anders Broman 314c36da9a From Graeme Lunt:
The ftbp.patch file includes:
a) A fix to acse.cnf which works around an asn2eth bug (it is the AE-qualifier EXPORT I want, but asn2eth doesn't generate the appropriate extern for the values). Also a small cosmetic change for EXTERNAL decodings.
b) New EXPORTs for the FTAM dissector for use in FTBP.
c) A fix to asn2eth to solve the problem if you EXPORT types that include a '-' character in the name (e.g. "AE-qualifier" from acse.cnf, "Date-and-Time-Attribute" from ftam.cnf). The problem is that asn2eth generates the "xxxx-exp.cnf" file using the 'C' name (which has replaced '-' with '_') rather than the original 'ASN' name. The fix just undoes the replacement as I couldn't see the original name being preserved anywhere. There still remains a problem if the type has a '.' in the name - but generally I don't think they do.

* Better ROS handling and registration
* Simplified RTSE registration
* X411 column information, extension naming and use of new RTSE/ROS registration
* X420 notification extensions, warnings removal and export of ExtensionsField (missed from recent FTBP patch).
* Better highlighting of S4406 protocol.


svn path=/trunk/; revision=16296
2005-10-24 21:42:19 +00:00
Gerald Combs f4eaf40648 Don't pass a null value to strcmp(). Fixes bug 540.
svn path=/trunk/; revision=16262
2005-10-18 13:36:32 +00:00
Guy Harris 6e759b47f2 .FN_BODY text gets printf-style expansion done on it, so format strings
in the code have to have %'s escaped.  Do so.

svn path=/trunk/; revision=16260
2005-10-18 00:07:49 +00:00
Gerald Combs 5cadbb4de4 When dissecting an ACSE APDU make sure our OID isn't for an ACSE APDU
(which would make us recurse until we crashed).

svn path=/trunk/; revision=16252
2005-10-17 16:12:24 +00:00
Ronnie Sahlberg 23caf5e4d3 remove some strcpy() calls
svn path=/trunk/; revision=16228
2005-10-15 22:46:20 +00:00
Guy Harris a9c08c4421 Show internal errors with REPORT_DISSECTOR_BUG().
svn path=/trunk/; revision=16208
2005-10-13 02:21:01 +00:00
Ronnie Sahlberg 719be76291 fix for bug 529
a CHOICE might not consume any butes in teh encoding if there were no matching
choice arms found.

make the loop in acse abort with malformed packet if the choice failed to decode anything  to prevent an infinite loop in bug 529


svn path=/trunk/; revision=16207
2005-10-13 01:39:53 +00:00
Anders Broman 00faf71e47 From Graeme Lunt
X420 - incorrect ExtendedBodyPart handling
ACSE - support for implicitly tagged EXTERNALs and dissection based upon direct-reference RTSE - same change for RTSE EXTERNAL handling as above CMS  - support for ContentType, MessageDigest, SigningTime and CounterSignature attributes ESS  - support for ESSSecurityLabel and EquivalentLabels attributes


svn path=/trunk/; revision=16070
2005-10-03 05:14:39 +00:00
Gerald Combs adce5ed6a5 Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
to fix compilation under Windows NT.  This should fix bug 403.

The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'".  They appear to work under XP, but if anything
broke I blame Larry Wall.

svn path=/trunk/; revision=15710
2005-09-07 13:26:23 +00:00
Guy Harris 3008628138 Squelch a compiler warning.
svn path=/trunk/; revision=15695
2005-09-05 22:36:52 +00:00
Anders Broman bc4b6481b4 From Graeme Lunt:
Basically the changes are:
a) [pres] make the find_oid_by_[pres_]ctx_id (I changed the name to make it more specific) non-static so it can be called from other dissectors (see acse.cnf changes). I also call it from RTSE and ROS dissectors
b) [acse] remove (#ifdef NOT_NEEDED) the oid lookup table and any reference to acse_handle - as these are no longer needed
c) [acse] register the acse dissector on 2.2.1.0.1
with some modifications: -#ifdef:ed code removed
- renamed aco -> pco

svn path=/trunk/; revision=15678
2005-09-04 09:00:01 +00:00
Anders Broman 5dd3862875 Upadte to call Data dissector from PRES based on OID in Presentation Context,
based on the code in ACSE.

svn path=/trunk/; revision=15643
2005-08-31 20:20:56 +00:00
Anders Broman 2273b1b7fc MapDialougePDU.cnf
Fix a typo.

packet-ber.c 
packet-acse.c
packet-cmip.c
- Add  OID(s)

packet-ses.c
Fix export of a value string and change names to the ones used in the protocol spec.

Replace PRES dissector with an asn2eth generated one.

svn path=/trunk/; revision=15614
2005-08-29 20:07:06 +00:00
Guy Harris eadcfd642a There's no longer a need to individually remove items from
acse_ctx_oid_table - destroying the hash table will destroy the hash
table items, and the destroy function no longer has any work to do
because the OID strings are now allocated with se_strdup() (and thus get
freed when the capture is closed).

Regenerate packet-acse.c, which also regenerates acse-exp.cnf.

svn path=/trunk/; revision=15480
2005-08-20 18:17:36 +00:00
Luis Ontanon 831775973a some ememification
svn path=/trunk/; revision=15433
2005-08-19 15:50:48 +00:00
Ronnie Sahlberg c30eeef7d8 some more gmemchunk -> se_alloc() updates
there are only 5 gmemchunks left   but they have different litetime for their allocations   than the 100+   ones that have been removed.

The remaining 5 should be converted some other way.




svn path=/trunk/; revision=15328
2005-08-13 01:29:31 +00:00
Jörg Mayer b7cd596353 Fix svn properties where needed:
Remove svn:executable
        Add svn:eol-style
        Add svn:keywords


svn path=/trunk/; revision=15178
2005-08-02 05:21:19 +00:00
Guy Harris 34ae8c850f Fix up a bunch of arguments to "dissect_ber_identifier()" to match its
current signature ("class" is a "gint8 *", not a "guint8 *", and "tag"
is a "gint32 *", not a "guint32 *").  Re-generate the dissectors from
the ASN.1 and the .cnf files in the cases where the arguments were fixed
in a .cnf file.

Give some dissectors the right svn:keywords and svn:eol-style settings.

svn path=/trunk/; revision=14885
2005-07-09 02:58:07 +00:00
Ronnie Sahlberg 50f4e721ce export a few more symbols from acse
svn path=/trunk/; revision=14835
2005-07-03 05:28:12 +00:00
Ronnie Sahlberg d0a7c6efcd Make ACSE export the EXTERNAL construct since both CMIP and FTAM rely on it.
svn path=/trunk/; revision=14746
2005-06-25 07:46:14 +00:00
Ronnie Sahlberg 1a663222b4 only create the ACSE protocol tree if there is an ACSE layer present.
do not create it if it is just a SES_DATA_TRANSFER PDU


svn path=/trunk/; revision=14726
2005-06-22 08:28:59 +00:00
Ronnie Sahlberg 5a3ff9906c remove a dissector table we no longer use from ACSE
and also from the CMIP and FTAM dissectors that tried to register against it.

Implement a workaround for the asn2eth bug (can not yet handle tagged assignments) to the conformance file and remove the warnings from the template file.

Since workaround is implemented in conformance file, make make copy_files install the dissector instead of printing a warning message.



svn path=/trunk/; revision=14725
2005-06-22 08:15:18 +00:00
Ronnie Sahlberg 33f4400f83 the maximum ASN OID length is 256 bytes and there is a define to control this.
fix bug251 and all other occurances where an oid string  passed to packet_ber_object_identifier()
is not defined as foo[MAX_OID_STR_LEN]

svn path=/trunk/; revision=14720
2005-06-21 09:38:59 +00:00
Ronnie Sahlberg a0a9d9ec06 add Sids email as the original author of ACSE dissector
svn path=/trunk/; revision=14707
2005-06-20 02:37:42 +00:00
Ronnie Sahlberg fddc09d930 New autogenerated ACSE dissector.
There is a bug in ASN2ETH which means one can not do make copy_files
instead one needs to change two bugs in the generated code manually.
These two changes are in the comment at the top of the template/generated file


svn path=/trunk/; revision=14698
2005-06-19 11:51:23 +00:00