Commit Graph

19025 Commits

Author SHA1 Message Date
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
Evan Huus ad759c88f8 Safely handle empty OIDs and other weird cases where we can't find a sub-id.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7219

svn path=/trunk/; revision=44460
2012-08-12 21:04:39 +00:00
Bill Meier 38b39b6b77 Add 'fragment_table_destroy()'
svn path=/trunk/; revision=44459
2012-08-12 20:53:17 +00:00
Gerald Combs 517ef559c2 Fix a copy/paste error which triggered bug
svn path=/trunk/; revision=44456
2012-08-12 15:48:36 +00:00
Jakub Zawadzki 0cf7f5087d Revert r41311, fix bug #7581
svn path=/trunk/; revision=44454
2012-08-12 15:08:00 +00:00
Gerald Combs 645d61c2e7 [Automatic manuf, services and enterprise-numbers update for 2012-08-12]
svn path=/trunk/; revision=44450
2012-08-12 14:03:33 +00:00
Evan Huus 3db7e4c5ae Create a function for dissecting address blocks, and use it in
several places.

svn path=/trunk/; revision=44449
2012-08-12 13:45:02 +00:00
Evan Huus 7120972f9e Add modelines. Make sure all #defines are prefixed by the dissector
name to avoid collisions.

svn path=/trunk/; revision=44448
2012-08-12 12:54:47 +00:00
Pascal Quantin 765c81a932 Revert r44441: pinfo may be NULL only when pi is not NULL
svn path=/trunk/; revision=44445
2012-08-11 17:57:18 +00:00
Jörg Mayer f0486d582a After commit r44435: pinfo -> NULL
svn path=/trunk/; revision=44441
2012-08-11 07:10:40 +00:00
Gerald Combs 72ddab2c98 Instead of calling DISSECTOR_ASSERT() whenever we get an invalid length,
add an expert item. For unusable lengths throw ReportedBoundsError but
try to continue on otherwise.

Based on a patch from Mike Morrin in bug 3884.

svn path=/trunk/; revision=44439
2012-08-10 23:05:04 +00:00
Bill Meier 638d74d43f Use val_to_str_const() where appropriate;
Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc

svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
Gerald Combs e6ffe7b59b Add a missing NULL check pointed out by Jakub.
svn path=/trunk/; revision=44437
2012-08-10 22:52:04 +00:00
Bill Meier 23ed5c6320 Bug fixes and general cleanup;
- untermintated range-string array can/will cause crash
    (e.g. 'tshark -G values');
- remove all 'if (tree)':
    calling col_...() and sub-dissectors under 'if (tree)' not OK;
- simplify code for heuristic test;
- find_dissector() calls need to be done only once
   (not on each prefs callback);
- do some whitespace/indentation changes.

svn path=/trunk/; revision=44436
2012-08-10 22:20:28 +00:00
Gerald Combs cd3cca7edc Make the corresponding packet_info available to each tree item. This
lets us pass a NULL pinfo to expert_add_info_format() and
expert_add_undecoded_item(), which makes it possible to use those
routines deep in the bowels of many dissectors. As a proof of concept
remove the recent pinfo additions to packet-afp.c. This should also make
it easier to fix bug 3884.

svn path=/trunk/; revision=44435
2012-08-10 20:33:01 +00:00
Pascal Quantin f464eb4b58 Fix missing dissection of HSDSCH-Paging-System-InformationFDD (bug introduced in r44037) and HSDSCH-MACdPDUSizeFormat (bug introduced in r44423).
While we are at it, fix a few typo errors.

svn path=/trunk/; revision=44434
2012-08-10 18:41:40 +00:00
Bill Meier 7f4dcbb055 Subdissectors & etc shouldn't be under 'if (tree)';
Use val_to_str_const() as appropriate.

svn path=/trunk/; revision=44429
2012-08-10 17:41:48 +00:00
Bill Meier 2d81e31f18 General cleanup:
- Add svn:keywords and svn:eol-style properties;
- col_...() and expert...() shouldn't be done under 'if (tree)';
- #if 0 an unused value-string;
- Use val_to_str_const as appropriate;
- Do some reformatting (whitespace changes).

svn path=/trunk/; revision=44426
2012-08-10 17:03:59 +00:00
Anders Broman 3cf2df1ef5 Try to make the buildbot happy.
svn path=/trunk/; revision=44425
2012-08-10 15:59:35 +00:00
Anders Broman 0e68cac192 From Jacob Nordgren and Rishie Sharma:
RLC: changed so reassembly fail flag is set per channel instead of globally.
RLC: added reset channel function
Added support for reconfigurin HSDSCH flows, and E-DCH flows (just needs to figure out when it should become active for 'overloaded' ports), also changed slightly how ehs headers are configured in nbap.
Removed extra (debugging)  port in nbap

This is the last patch set for a while.

svn path=/trunk/; revision=44423
2012-08-10 15:22:50 +00:00
Jeff Morriss 9802b80159 From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
Remove another invalid array write.

svn path=/trunk/; revision=44419
2012-08-10 13:00:20 +00:00
Anders Broman 29140b97c3 From Jacob Nordgren and Rishie Sharma:
RLC: fixed weird dereferencing of things that were not pointers

svn path=/trunk/; revision=44418
2012-08-10 09:45:06 +00:00
Jörg Mayer 8b16955d3c Looks like some packets in the sample trace have type 0,
so add Unknown_0 to the mix

svn path=/trunk/; revision=44416
2012-08-10 08:35:21 +00:00
Jörg Mayer f86358dc69 The packet id seems to be only 16 bits. The "extra" 4 bits
may be a subtype or additional information for the type.

svn path=/trunk/; revision=44415
2012-08-10 08:08:50 +00:00
Bill Meier c6289587ed General cleanup:
- remove 'if (tree)'
   * col_...() shouldn't be called under 'if (tree)';
   * new-style dissector should alwyas return same 'bytes dissected'
     (independent of 'if (tree)');
- create/use extended value string;
- Use consistent indentation;

svn path=/trunk/; revision=44414
2012-08-10 03:19:13 +00:00
Michael Mann 1d9c472cae convert some simple uses to use ephemeral memory
svn path=/trunk/; revision=44413
2012-08-10 02:05:19 +00:00
Jörg Mayer 94b65da547 Beginnings of a Skype dissector. Requires "decode as".
svn path=/trunk/; revision=44412
2012-08-10 00:35:00 +00:00
Martin Mathieson 5f1b2bd6ed If not configured to call MAC for MAC-is PDUs, don't (avoiding
assertion).  Do show extent of MAC-is PDU.

Didn't it used to show the MAC-is SDUs inside too?

svn path=/trunk/; revision=44411
2012-08-10 00:34:39 +00:00
Gerald Combs 5107d75c82 Try to fix a compiler warning.
svn path=/trunk/; revision=44408
2012-08-09 22:45:43 +00:00
Jeff Morriss 3bbeaec351 Don't leak memory when loading UATs. Also reformat a bit.
svn path=/trunk/; revision=44407
2012-08-09 22:29:46 +00:00
Gerald Combs 54fcbe03ff Add a check for the number of nodes. Fixes a DoS in bug 7573 reported by
Ben Schmidt.

svn path=/trunk/; revision=44403
2012-08-09 22:04:46 +00:00
Gerald Combs 015f22cc9a Use wording that's more in line with other expert messages.
svn path=/trunk/; revision=44402
2012-08-09 22:02:28 +00:00
Gerald Combs 097f33c41d Iterate over the emem_tree_*32_array key data instead of using
recursion. I've only done minimal testing but it seems to work OK.

svn path=/trunk/; revision=44401
2012-08-09 21:46:34 +00:00
Martin Kaiser 9f4c89bad3 call mpeg_pmt dissector directly for CI+ tune_broadcast_req apdu
svn path=/trunk/; revision=44400
2012-08-09 20:24:50 +00:00
Michael Tüxen 10f32a3b7f Not usre if this makes sense. At least the compiler doesn't complain
anymore.

svn path=/trunk/; revision=44399
2012-08-09 20:08:08 +00:00