Commit graph

53 commits

Author SHA1 Message Date
Stig Bjørlykke
340d64e780 Make the third argument to a UAT copy callback a size_t.
svn path=/trunk/; revision=34695
2010-10-29 21:51:59 +00:00
Stig Bjørlykke
e6dac92931 Put Abort reason in info column.
svn path=/trunk/; revision=34159
2010-09-20 12:49:52 +00:00
Graeme Lunt
6fc0e7cb8c Interpret single-ASN1-type as ASN.1 and not as an OCTET STRING.
svn path=/trunk/; revision=33375
2010-06-29 18:09:03 +00:00
Graeme Lunt
eef8c02bd7 Bug 3597 - implicit octet string that is constructed causes PRES/FTAM dissect failure
Introduced some state to remember last dissected Tag/Length so that they can be recalled if an IMPLICIT tag is encountered and stripped. This allows its to be determined if the value has a constructed value - and so can be reassembled.

In this case, it is a IMPLICIT constructed OCTET STRING at the presentation layer.

Many thanks to Fred Gruman for identifying - and apologies for the delay in commiting.


svn path=/trunk/; revision=33048
2010-06-02 14:42:57 +00:00
Stig Bjørlykke
6199e515c9 Don't type prune the data_ptr pointer for UAT.
svn path=/trunk/; revision=32629
2010-05-02 13:50:52 +00:00
Bill Meier
f8b92f8d0b #include <stdio.h> not needed.
svn path=/trunk/; revision=32405
2010-04-06 17:01:14 +00:00
Stig Bjørlykke
2f8830b4d0 From LEGO via bug 3459:
Add a callback to UAT to be called after the table has being updated,
use it to renew the snmp_ue_cache.

svn path=/trunk/; revision=32112
2010-03-04 12:50:18 +00:00
Stig Bjørlykke
8aa7359eb3 Use correct return value type from dissect_ppdu().
Fixed a typo.

svn path=/trunk/; revision=31590
2010-01-20 12:51:04 +00:00
Stig Bjørlykke
9b3a53b8d1 Split in two asn files.
svn path=/trunk/; revision=31445
2010-01-05 08:50:15 +00:00
Anders Broman
e8042d8eec From gonzalocas:
GSSE message dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4370

svn path=/trunk/; revision=31442
2010-01-04 23:17:37 +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
Stig Bjørlykke
843459d075 Made dissect_pres() static.
Added changes from r29446 to .cnf file:
 Switch a bunch of dissectors over to using tvb_new_subset_remaining()

svn path=/trunk/; revision=30385
2009-10-07 07:47:41 +00:00
Kovarththanan Rajaratnam
8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Kovarththanan Rajaratnam
0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
Kovarththanan Rajaratnam
e971354a54 Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
Stig Bjørlykke
5bc7048abf More header_field_info cleanup.
svn path=/trunk/; revision=28802
2009-06-22 06:02:36 +00:00
Stig Bjørlykke
9ebac2bff6 g_free() is NULL safe, so we don't need check against it.
svn path=/trunk/; revision=27719
2009-03-13 22:21:22 +00:00
Stig Bjørlykke
7ff188128b Added a users context list to map a presentation context identifier to an
object identifier when the capture does not contain a PRES package with a
presentation context definition list for the conversation.

Added a few expert infos.

svn path=/trunk/; revision=27631
2009-03-07 00:28:34 +00:00
Bill Meier
f35324d0fd Minor cleanup mostly related to proto_reg_handoff
Remove code for unused handles;
 Localize handles (in proto_reg_handoff) which need not be global;
 Localize (in proto_reg_handoff) "saved prefs";
 Use find_dissector instead of create_dissector_handle as appropriate;
 Use gboolean for "initialized" flag in proto_reg_handoff.

svn path=/trunk/; revision=26693
2008-11-04 21:42:02 +00:00
Graeme Lunt
b2b7c8a769 Annotate the presentation context identifier with the presentation context.
svn path=/trunk/; revision=24982
2008-04-13 16:08:34 +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
Stig Bjørlykke
46d0b5e076 Update do use the -X and -T asn2wrs flags.
svn path=/trunk/; revision=23354
2007-11-04 17:24:25 +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
0241734801 Last set of changes to convert Makefiles for today
svn path=/trunk/; revision=23119
2007-10-09 19:19:36 +00:00
Graeme Lunt
473077719e This patch make PRES context identifiers conversation aware.
svn path=/trunk/; revision=22207
2007-06-27 17:51:19 +00:00
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
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
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
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
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
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
54f6b68edc Add parsertab.pyc in clean target
svn path=/trunk/; revision=17387
2006-02-23 20:05:52 +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
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
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
d9e1a9c0bb 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.

svn path=/trunk/; revision=15679
2005-09-04 16:22:12 +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