Commit graph

42 commits

Author SHA1 Message Date
Jörg Mayer
65ff43fada Finish asn1 emem -> wmem conversion.
Left are snmp and those functions that don't have wmem equivalents.

svn path=/trunk/; revision=52060
2013-09-15 14:37:46 +00:00
Evan Huus
d63bd5330f Back out some of the wmem conversions (r50063 and r50057).
These dissectors allocate ephemeral or seasonal memory in UAT callbacks, which
really makes no sense because UAT callbacks can occur when there is no packet or
file in scope, making this effectively a leak if the user is fiddling with their
UAT and never opens a capture.

Emem let you get away with this, wmem forces an assertion. Back out the changes
so that the UATs are usable until the code can be properly fixed to not use
out-of-scope allocators.

svn path=/trunk/; revision=50073
2013-06-20 06:26:03 +00:00
Evan Huus
b1e12ec925 Convert the rest of the ASN1 dissectors from emem to wmem.
svn path=/trunk/; revision=50063
2013-06-19 22:47:36 +00:00
Michael Mann
7fe5422c4b Convert ASN.1 dissectors to use filterable expert info.
NOTE: Kerberos ASN.1 template was updated, but not generated to source.

svn path=/trunk/; revision=49707
2013-06-03 03:42:36 +00:00
Anders Broman
7c56677cf9 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48429
2013-03-19 21:22:31 +00:00
Stig Bjørlykke
f6f46de2ca Moved users table lookup to find_oid_by_pres_ctx_id() so other
dissectors (acse, ros, rtse) can benefit from the configured settings.

svn path=/trunk/; revision=46520
2012-12-12 15:17:36 +00:00
Jeff Morriss
3551a86c36 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45015
2012-09-20 01:29:52 +00:00
Guy Harris
659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Alexis La Goutte
62de88285d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=41300
2012-03-02 11:02:46 +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
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
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
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
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
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
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
Ronnie Sahlberg
89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +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
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