Commit Graph

19059 Commits

Author SHA1 Message Date
Guy Harris ff6a33fdb4 Mark a parameter as unused.
Clean up indentation and get rid of trailing white space.

svn path=/trunk/; revision=44562
2012-08-18 06:53:39 +00:00
Guy Harris 549d81fe37 epan/dissectors/packet-ansi_map.c shouldn't be edited - it's generated
from the files in asn1/ansi_map.  Update packet-ansi_map-template.c to
reflect the use of session-scope-allocated data for the saved invoke
data, and regenerate the dissector - which means that
TransactionId_table_cleanup() still exists, and is still used, it just
frees only the hash table key, which is g_strdup()ed, not the value,
which is automatically freed when the session-scope-allocated data is
all freed.

svn path=/trunk/; revision=44561
2012-08-18 06:33:08 +00:00
Guy Harris c3caa3ba4f epan/dissectors/packet-ansi_tcap.c shouldn't be edited - it's generated
from the files in asn1/ansi_tcap.  Update packet-ansi_tcap-template.c to
reflect the use of session-scope-allocated data for the saved invoke
data, and regenerate the dissector - which means that
TransactionId_table_cleanup() still exists, and is still used, it just
frees only the hash table key, which is g_strdup()ed, not the value,
which is automatically freed when the session-scope-allocated data is
all freed.

svn path=/trunk/; revision=44560
2012-08-18 06:20:32 +00:00
Michael Mann 14a6d40267 Use capture scoped memory for hash table functionality
svn path=/trunk/; revision=44559
2012-08-18 02:55:18 +00:00
Michael Mann db98d944e5 Use capture scoped memory for hash table functionality
svn path=/trunk/; revision=44558
2012-08-18 02:54:06 +00:00
Michael Mann 5672bee3a8 Fix bug 7650 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7650)
prefs.gui_colorized_fg and prefs.gui_colorized_bg not properly integrated into newer preference architecture

svn path=/trunk/; revision=44557
2012-08-18 02:47:37 +00:00
Pascal Quantin 6d711993f7 Squelch a few "dereferencing type-punned pointer" warnings when compiling with GCC 4.1.3
svn path=/trunk/; revision=44553
2012-08-17 17:29:51 +00:00
Ronnie Sahlberg a6c45b0582 iSCSI: DATA-IN only contain LUN and TTT iff the A-bit is set
svn path=/trunk/; revision=44550
2012-08-17 03:51:43 +00:00
Bill Meier 98eab94319 Cleanup:
- remove/rework some 'if (tree)' usage so that:
  . col_...() not called under same;
  . dissection doesn't change depending upon same;
- simplify some code;
- use consistent indentation & whitespace formatting.

svn path=/trunk/; revision=44546
2012-08-16 23:52:27 +00:00
Bill Meier a9bb084310 Fix (minor ?) memory leak;
General cleanup:
 - use expert...() instead of a 'printf()';
 - #include <stdio.h> only if debug enabled;
 - remove unneeded variable initializations;
 - localize some variables;
 - reformat hf[] entries;
 - use consistent whitespace formatting.

svn path=/trunk/; revision=44545
2012-08-16 19:58:29 +00:00
Bill Meier 1b8e41afab General cleanup of whitespace formatting.
svn path=/trunk/; revision=44543
2012-08-16 18:06:57 +00:00
Bill Meier cf706ca547 From Stefan Metzmacher: Updates for the SMB2/3
This patches add some missing things for SMB2/3 and support for decryption
of SMB3 traffic

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7645

From me: Change an initializer from C99 to C89 style (since the
 Microsoft compiler doesn't support C99).

svn path=/trunk/; revision=44542
2012-08-16 17:03:07 +00:00
Bill Meier 832b999c2c - Don't call col...() under 'if (tree)';
- Move proto_reg_handoff...() to the end of the file;
- Remove some uneeded variable initialization;
- Use consistent indentation (e.g., no 4 space tabs) and whitespace formatting.

svn path=/trunk/; revision=44541
2012-08-16 15:53:39 +00:00
Michael Mann 3329b7f0a7 restore tvb_ensure_bytes_exist checks. There are better ways to do this, but for now, keep the buildbots happy.
Also some other cleanup noticed while trying to fix buildbot fuzz failure.

svn path=/trunk/; revision=44540
2012-08-16 13:58:12 +00:00
Bill Meier 9c7f4006c0 Add editor modelines;
Do minor whitespace reformatting.

svn path=/trunk/; revision=44539
2012-08-16 13:51:54 +00:00
Bill Meier 51cc4887d2 col_...() and expert...() fcns should not be under 'if (tree)';
'tab-width/tabstop/tabSize' in editor modelines should really always be 8;

svn path=/trunk/; revision=44538
2012-08-16 13:44:40 +00:00
Bill Meier f3fe778851 'tab-width/tabstop/tabSize' in editor modelines should really always be 8;
Also:
- In one case #include <epan/prefs.h> not needed;
- Do some minor whitespace reformatting.

svn path=/trunk/; revision=44537
2012-08-16 13:17:48 +00:00
Pascal Quantin 12a705af47 Miscellaneous changes:
- move channel information before header dissection
- add channel information to TM and RLC Control PDUs
- take into account rlc information in rlc_is_ciphered function
- update function prototypes according to the coding rules used in packet-rlc.c

svn path=/trunk/; revision=44535
2012-08-15 21:45:32 +00:00
Pascal Quantin e5b7968030 Fix some headers fields that were wrongly marked as 64 bits instead of 32 bits
svn path=/trunk/; revision=44533
2012-08-15 20:43:00 +00:00
Martin Kaiser c6cf211ccf dissect ake_send_pairing_info message
svn path=/trunk/; revision=44528
2012-08-15 19:40:22 +00:00
Martin Kaiser af9a518763 move hdcp2 dissector to a separate file
use hdcp2 for protocol name, info column and filter names

(actually, hdcp and hdcp2 have nothing in common -
 hdcp2 was a complete redesign to fix security issues in hdcp)


svn path=/trunk/; revision=44527
2012-08-15 19:22:05 +00:00
Martin Kaiser 168a40cb4d hdcp2: dissect ake_no_stored_km message
svn path=/trunk/; revision=44526
2012-08-15 18:58:07 +00:00
Michael Tüxen 91f65904c2 Recommit:
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44502
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44511
and do some whitespace cleanups while there.

svn path=/trunk/; revision=44522
2012-08-15 16:02:01 +00:00
Michael Mann 3d40a7b94f Updated MPLS dissectors display filters per checkfiltername.pl
Tried to provide consistency with MPLS dissector filter names

svn path=/trunk/; revision=44521
2012-08-15 15:52:27 +00:00
Michael Tüxen 171e2abe13 Get it compiling.
svn path=/trunk/; revision=44518
2012-08-15 15:28:26 +00:00
Michael Mann 3082032be6 convert GStrings to more "ephemeral friendly" use.
svn path=/trunk/; revision=44515
2012-08-15 13:56:59 +00:00
Michael Mann a3db9aedfb bugfix minor memory leaks with GString use
svn path=/trunk/; revision=44514
2012-08-15 13:55:29 +00:00
Pascal Quantin 870b536e6c Fix field type for some 64 bits header fields
svn path=/trunk/; revision=44513
2012-08-15 13:42:46 +00:00
Michael Tüxen 54e5d13d4b Move registration to a better place.
svn path=/trunk/; revision=44511
2012-08-15 06:14:10 +00:00
Pascal Quantin d34ca4d69d From Jan de Jongh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7624 :
dissect_per_constrained_integer_64b fails for 64 bits

svn path=/trunk/; revision=44510
2012-08-14 22:12:31 +00:00
Chris Maynard 03a9a37863 Don't add proto_bssap to the tree twice, once as a hidden item and once using proto_tree_add_text(). Instead use proto_tree_add_protocol_format(). Problem reported here: http://article.gmane.org/gmane.network.wireshark.user/14509
svn path=/trunk/; revision=44509
2012-08-14 21:58:36 +00:00
Michael Tüxen 08280810b7 Register DIAMETER/DTLS/SCTP.
svn path=/trunk/; revision=44502
2012-08-14 20:53:39 +00:00
Jeff Morriss 70851c9765 Register for Diameter's SCTP PPID.
svn path=/trunk/; revision=44501
2012-08-14 20:44:58 +00:00
Michael Tüxen e7a645ad9f Update SCTP PPIDs.
This also fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7635

svn path=/trunk/; revision=44500
2012-08-14 20:31:49 +00:00
Michael Mann c3f223d356 Bug 3725 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3725)
Have giop dissector use more ephemeral memory.
Update idl2wrs dissector generator accordingly.

svn path=/trunk/; revision=44498
2012-08-14 18:33:58 +00:00
Michael Mann 5dd7371960 more ephemeral memory cleanup
svn path=/trunk/; revision=44496
2012-08-14 17:58:41 +00:00
Jakub Zawadzki bc67498fb4 cleanup get_column_format_matches()
fmt_list[format] is set to TRUE on begin of function as 'obvious' thing to do

svn path=/trunk/; revision=44494
2012-08-14 16:58:34 +00:00
Michael Mann 4108285179 fix subtle g_strdup_printf() memory leaks with ephemeral memory
svn path=/trunk/; revision=44491
2012-08-14 16:29:38 +00:00
Michael Mann c7a6af44bb convert g_strdup_printf() to ep_strdup_printf()
svn path=/trunk/; revision=44490
2012-08-14 16:13:18 +00:00
Michael Mann f929edfe09 Have strings use ephemeral memory. This dissector appears to need a massive overhaul to using proto_tree_add_item, but for now I'll settle for using ephemeral memory.
svn path=/trunk/; revision=44488
2012-08-14 15:36:13 +00:00
Evan Huus 6960a27c75 From Bodo Petermann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7632
Fix dissection of ISUP message Generic Numbers with no digits.

svn path=/trunk/; revision=44487
2012-08-14 11:58:20 +00:00
Graham Bloice 5a93983e41 Various DNP3 cleanups and fixes:
1.  Fix time displayed in object values when using relative time from a CTO.
2.  Fix some text for IIN flags regarding Outputs in local control
3.  Try out DNP3 as a heuristic dissector.

svn path=/trunk/; revision=44486
2012-08-14 11:52:46 +00:00
Graham Bloice c0ed3ba818 Added proto_tree_free to the libwireshark expoert definitions for use in plugins
svn path=/trunk/; revision=44485
2012-08-14 11:24:22 +00:00
Gerald Combs a9f5507086 Keep field_info_tmp from being prematurely freed. Better fix for bug 7621.
svn path=/trunk/; revision=44478
2012-08-13 22:43:17 +00:00
Martin Kaiser aeb9a630d8 use correct protocol id for hdcp2
svn path=/trunk/; revision=44477
2012-08-13 21:02:47 +00:00
Gerald Combs 7950fc1c94 Add length checks to make sure we don't underflow an integer. Make
sure we allocate and copy the same amount of data. Fixes bug 7621.

svn path=/trunk/; revision=44476
2012-08-13 19:30:42 +00:00
Bill Meier a9424a9284 From Tobias Rutz; Minor updates.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7518

svn path=/trunk/; revision=44475
2012-08-13 18:54:58 +00:00
Jörg Mayer a55aba13a2 - dissect_skype -> dissect_skype_udp
- track conversations to record the global src and dst addresses
  for later crc and rc4

svn path=/trunk/; revision=44473
2012-08-13 18:07:28 +00:00
Jörg Mayer a866adef25 - One of the unknown values is probably the (global) destination address
- Update comments

svn path=/trunk/; revision=44472
2012-08-13 16:52:12 +00:00
Jörg Mayer 606cd90224 Fix typo in comment
svn path=/trunk/; revision=44469
2012-08-13 16:20:42 +00:00