Commit Graph

37 Commits

Author SHA1 Message Date
Graeme Lunt 21209f9b5b This patch adds RTSE reassembly. The reassembly is done when
receiving a SES MAJOR SYNC POINT, as this indicates the end of the
COTP DT Data stream.  Previous the RTSE dissector was called when
receiving a COTP DT Data fragment with the "last data unit" bit set,
but this does not work with messages fragmented in RTSE.  Reassembly
can be turned off in the preferences.


svn path=/trunk/; revision=22176
2007-06-24 05:28: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 4c692a62b6 Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
2007-05-06 22:34:05 +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
Ronnie Sahlberg 8920a7e7f2 change the signature that asn2wrs generates for functions to marm all parameters as _U_
to reduce the number of compiler warnings.

update some template and cnf files to use _U_ as well 


svn path=/trunk/; revision=21088
2007-03-21 10:22:22 +00:00
Tomas Kukosa 5cd8c719e6 ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb
svn path=/trunk/; revision=18921
2006-08-16 05:58:39 +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
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Guy Harris b45d2efe6d Regenerate with the latest asn2eth, to get FT_OID used, and to add #line.
svn path=/trunk/; revision=16736
2005-12-08 23:29:21 +00:00
Jörg Mayer eff40f65db Trivial warning fixes
svn path=/trunk/; revision=16561
2005-11-22 12:51:14 +00:00
Guy Harris a30e519736 When registering a context ID and OID, set the OID to NULL if we don't
have an OID to register.

If our table of context identifiers and OIDs is to keep that association
on a per-conversation basis, it should use conversations, not
address/port, as we aren't necessarily running over TCP or UDP.

svn path=/trunk/; revision=16554
2005-11-20 04:34:58 +00:00
Ronnie Sahlberg 2d8fb070ca if the packet is mangled the oid string might be NULL.
dont try to register a NULL oid



svn path=/trunk/; revision=16553
2005-11-20 02:48:26 +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 b67a452476 A small patch for presentation to:
a) maintain the session presentation context 
b) support SES_REFUSE

svn path=/trunk/; revision=16213
2005-10-13 05:20:40 +00:00
Anders Broman bb18a56bbd Dissect "nbs-9".
svn path=/trunk/; revision=15742
2005-09-09 19:46:57 +00:00
Anders Broman 4029a91b8b Ftam - Use some mofe FN_PAR:s
PRES Dissect PDU type based on SS-user data from SES(Info from asn1 file).

svn path=/trunk/; revision=15703
2005-09-06 18:08:45 +00:00
Anders Broman bbf0fb6dde From Graeme Lunt
I attach my RTSE dissector (in tar file) which requires the included ROS dissector, as well as a patch to the latest pres.{cnf,asn}. The ROS dissector uses a new field in the SESSION_DATA_STRUCTURE to pass the ROS operation to the sub-dissector, though this is also set by other dissectors (RTSE uses it in X.410 mode). 
 
 Note that X.400 P1 in X.410 mode doesn't use ROS, so it is useful not to explicitly include ROS in my X411 dissector. However, the inclusion of a ROS dissector won't effect any dissectors that currently implement their own ROS.
 
 I also include dissectors for:
 
 X.411 	(P1) 		X.400 OSI Message Transfer Service
 X.420 	(P22) 	X.400 OSI Information Object
 STANAG 4406	(P772)	STANAG 4406 Military Message Extensions (to P22)
 
 These rely on the RTSE and ROS dissectors.

Withs some changes to remove various warnings and errors.

svn path=/trunk/; revision=15680
2005-09-04 20:30:31 +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
Gerald Combs e66bb9e691 Break out of an infinite loop. Fixes bugs 392 - 395. Add a UNIX Makefile
for generation of the PRES dissector.

svn path=/trunk/; revision=15626
2005-08-30 19:43:32 +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 bcb91d2f45 The OID strings returned by new_format_oid(), and the OID string
returned by format_oid(), are allocated with the ep_alloc routines;
don't free them.

svn path=/trunk/; revision=15525
2005-08-25 03:31:54 +00:00
Guy Harris 554f620001 Constify to remove a bunch of warnings. Add some casts to squelch
(presumably-)harmless-but-otherwise-unremovable const-to-nonconst
warnings.

In the TACACS dissector, clean up the variables used in option parsing
to avoid some const-to-nonconst warnings.

Clean up some white space.

svn path=/trunk/; revision=15043
2005-07-24 19:01:28 +00:00
Ronnie Sahlberg beb9e86120 push one more object into the session structure so acse can pick it up later.
svn path=/trunk/; revision=14695
2005-06-19 11:40:39 +00:00
Gerald Combs c2b4cd7993 Don't roll our own buffer-overflow-able string_to_hex() routine
when there's a perfectly good tvb_bytes_to_str() lying around, just
_begging_ to be used.

Fix up white space.

svn path=/trunk/; revision=14304
2005-05-04 15:35:21 +00:00
Gerald Combs 9ab36a73a8 Back out all of the tvb_ensure_bytes_exist() calls. They shouldn't be
neccessary any more, and were causing problems.

svn path=/trunk/; revision=14298
2005-05-03 18:43:06 +00:00
Gerald Combs 310c8a8434 Add a slew of tvb_ensure_bytes_exist() calls. This should probably be
converted to use the new-style ASN.1 code.  Fixes bug 102.

svn path=/trunk/; revision=14193
2005-04-26 22:06:04 +00:00
Ulf Lamping ad23912341 buildbot bugfix: yet another (un-)signed problem.
Guy, you may have a look to add some "invalid" message to the tree in this case

svn path=/trunk/; revision=13907
2005-03-25 23:44:49 +00:00
Ulf Lamping 2f836c20a8 fix a typo: lenght -> length
This seems to be a "more common" typo, fixed it 13 times throughout the code ...

svn path=/trunk/; revision=13452
2005-02-20 22:36:34 +00:00
Lars Roland ec9ca01616 Move the following files from /trunk to /trunk/epan:
asn1.[ch]
follow.[ch]
ptvcursor.[ch]
reassemble.[ch]
xmlstub.[ch]

fix #include statements accordingly.

svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
Ulf Lamping 1c9781b4ec throw the new FieldError exception, if a dissector tries to add a field with invalid parameters
add a message parameter to the show_exception function

svn path=/trunk/; revision=13074
2005-01-16 16:06:15 +00:00
Guy Harris 018883dea9 "string_to_hex()" doesn't modify its first argument, so make it a
"const" pointer, and don't cast away the constness of "tvb_get_ptr()"s
result when passing it to "string_to_hex()".

svn path=/trunk/; revision=12898
2004-12-31 03:14:18 +00:00
Guy Harris 92f52c4e1c From Yuriy Sidelnikov: take stuff that has to be done regardless of
whether a protocol tree is being built outside "if (tree)".

svn path=/trunk/; revision=12480
2004-11-03 19:46:09 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00