Commit graph

42167 commits

Author SHA1 Message Date
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
5aad9e0d93 Add diameter/AlcatelLucent.xml to the distribution.
svn path=/trunk/; revision=44424
2012-08-10 15:30:42 +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
Anders Broman
38da3d787b From Yann Bonnamy:
Add Alcatel Lucent vendor AVP:s

Used a different aproach then in the supplied patch.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7613

svn path=/trunk/; revision=44422
2012-08-10 14:40:50 +00:00
Michael Tüxen
734a304c92 Get the windows buildbots happy.
svn path=/trunk/; revision=44421
2012-08-10 14:19:43 +00:00
Irene Rüngeler
7bc3532099 Change window size and wrapping behavior.
svn path=/trunk/; revision=44420
2012-08-10 13:43:35 +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
Jeff Morriss
1c1db865f6 Don't define HAVE_UMTS_KASUMI to anything unless we actually have it.
Use #ifdef HAVE_UMTS_KASUMI instead of #if HAVE_UMTS_KASUMI

Put $Id$ tag in kasumi.h

svn path=/trunk/; revision=44398
2012-08-09 19:33:36 +00:00
Bill Meier
621ab44354 Add svn:eol-style property
svn path=/trunk/; revision=44397
2012-08-09 19:32:59 +00:00
Anders Broman
bd1739c87b Fix a couple of typos.
svn path=/trunk/; revision=44395
2012-08-09 19:07:46 +00:00
Jeff Morriss
6dcc71ff49 Fix up indentation.
svn path=/trunk/; revision=44394
2012-08-09 18:30:49 +00:00
Pascal Quantin
23c35e6d14 Small fixes:
- put back return NULL in line 947 that got removed in r44384: it is mandatory to avoid accessing non initialized variables. Change rlc_channel_assign a bit to fix what was the root cause of this removal (I guess)
- put back add_channel_info in dissect_rlc_am (removed by error?)
- fix some typo errors
- fix indentation a bit

svn path=/trunk/; revision=44393
2012-08-09 18:26:08 +00:00
Martin Mathieson
664e7ed5ad Put #if HAVE_UMTS_KASUMI around a statics that won't be used unless it
is defined.

svn path=/trunk/; revision=44390
2012-08-09 17:43:55 +00:00
Anders Broman
084e754a2d Mark parameters as unused when we don't have kasumi.
Cast the result of strlen to int.

svn path=/trunk/; revision=44388
2012-08-09 17:13:44 +00:00
Anders Broman
dff5959253 Add Custom.common to dist.
svn path=/trunk/; revision=44387
2012-08-09 17:12:38 +00:00
Anders Broman
12d6721d86 Fix a comment.
svn path=/trunk/; revision=44386
2012-08-09 17:11:53 +00:00
Bill Meier
8fde467588 General cleanup:
- remove 'if (tree)' around calls to col_...() fcns and to sub-dissectors;
- call proto_get_id_by_filter_name() in proto_reg-handoff...() (not init routine);
- do some whitespace and formatting changes.

svn path=/trunk/; revision=44385
2012-08-09 16:47:15 +00:00
Anders Broman
efa02ebb7a From Jacob Nordgren and Rishie Sharma:
FP: fixed so hsdsch type 1 also uses communication context id 

Added experimental conditional decryption support.

svn path=/trunk/; revision=44384
2012-08-09 16:42:31 +00:00
Alexis La Goutte
6141467fc0 From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551
Add dissection of sub-options in DNS OPT RRs (RFC 2671)

From me
* use/prefer proto_tree_add_item
* Remove dns_optcode_description function (Use value_string...)

svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
Bill Meier
103ddcbfd5 Use g_slice allocation for 'reassembled_table' keys (instead of se allocation).
Not strictly required, but IMO a bit cleaner (if maybe a bit less efficient).

svn path=/trunk/; revision=44382
2012-08-09 14:55:13 +00:00
Irene Rüngeler
ab3dc72ea0 Change the font in the compile results window to monospace.
svn path=/trunk/; revision=44381
2012-08-09 14:48:22 +00:00
Michael Mann
05a305d332 Make emem_tree_*32_array functions non-destructive. The following dissectors/files have affectively been bugfixed by the change:
packet-classicstun.c
packet-reload-framing.c (probably)
packet-reload.c
packet-sccp.c
packet-sua.c
packet-tcp.c
packet-xmcp.c
\epan\gcp.c

The following files unnecessarily recreate keys because of the previously destructive nature of emem_tree_*32_array functions:
packet-btl2cap.c
packet-nfs.c
packet-rpc.c
packet-scsi-osd.c
packet-stun.c (per Bug 7569)

These could be cleaned up, but it's not like the key recreation is burning CPU cycles.

svn path=/trunk/; revision=44380
2012-08-09 13:59:29 +00:00
Jeff Morriss
7dc5eaec0c Fix MIME type (tools/svnadd does a decent job at setting SVN properties for you.)
svn path=/trunk/; revision=44379
2012-08-09 13:27:27 +00:00
Irene Rüngeler
9fb3d27bee Add green bullet to indicate success.
svn path=/trunk/; revision=44378
2012-08-09 13:23:47 +00:00
Jeff Morriss
ed497d453f From Stephen Donnelly: a better fix for the fuzz failure reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :

Previous patch solved the reported problem. This patch should cover input
validation for the VC Id and Link Rate fields properly.

Note link_rate==0 (unknown) is supported, as some hardware/firmware may not set
this field, but vc_size==0 is defined invalid.


From me: also initialize m_sdh_line_rate when the input is garbage.

svn path=/trunk/; revision=44377
2012-08-09 13:20:39 +00:00
Michael Mann
722fed08b3 Bugfix 7608 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7608)
svn path=/trunk/; revision=44376
2012-08-09 12:46:44 +00:00
Anders Broman
508e1c3027 From Jacob Nordgren and Rishie Sharma:
FP: fixed exotic bug where fakes counter was sometimes not reset, RRC: fixed bug where num_chans_per_flow was not properly cleared

svn path=/trunk/; revision=44375
2012-08-09 10:06:01 +00:00
Martin Mathieson
1586d80a77 RLC: when zooming, use shift and control keys to lock vertical or
horizontal scaling respectively.

RLC+TCP: when already fully zoomed out, don't multiply zoom by 1.0 and redraw.
When holding down the key to zoom out, waiting to several redraws of the
whole graph to complete could take a while...

svn path=/trunk/; revision=44374
2012-08-09 04:02:35 +00:00