Commit Graph

42020 Commits

Author SHA1 Message Date
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
Bill Meier 71818f535d registered init routine action need be done just once in proto_reg_handoff...();
localize handle to proto_reg_handoff();

svn path=/trunk/; revision=44373
2012-08-09 03:10:31 +00:00
Bill Meier a410b946f2 registered init routine actions need be done just once in proto_reg_handoff...();
localize two handles to proto_reg_handoff();

svn path=/trunk/; revision=44372
2012-08-09 03:02:15 +00:00
Bill Meier 3c7d32017f From Jakub Zawadzki: Fix for memory leak in reassemble.c
Bug #4141

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4141#c10

svn path=/trunk/; revision=44371
2012-08-09 02:06:53 +00:00
Michael Mann bec794d51e Bugfix capture column preferences
svn path=/trunk/; revision=44370
2012-08-09 00:46:17 +00:00
Gerald Combs e9b6fa072e se_tree_lookup32_array() can destroy its key. Make sure we refresh it
before passing it to se_tree_insert32_array(). Fixes bug 7569 reported
by Laurent Butti.

svn path=/trunk/; revision=44366
2012-08-09 00:20:18 +00:00
Jeff Morriss adcb1775f6 Remove set-but-not-used variable.
svn path=/trunk/; revision=44365
2012-08-08 23:02:49 +00:00
Michael Mann c5a649d613 Complete compiler warnings from r44348
svn path=/trunk/; revision=44364
2012-08-08 21:40:22 +00:00
Michael Tüxen 58e6d17082 Get it compiling on Mac OS X.
svn path=/trunk/; revision=44363
2012-08-08 21:34:43 +00:00
Michael Mann acf2c06044 Compiler error fixes resulting from r44348
svn path=/trunk/; revision=44359
2012-08-08 20:47:20 +00:00
Pascal Quantin 25523bd0bf Various small changes:
- add a missing test on null pointer
- always initialize rrc_nas_sys_info_gsm_map_type with a value from its associated enum
- fix some typo errors
- remove some useless directives from conformance file
- detabify files (ASN.1 generated dissectors are indented with spaces)

svn path=/trunk/; revision=44358
2012-08-08 20:43:48 +00:00
Anders Broman a1218c94c9 From Jacob Nordgren and Rishie Sharma:
- FP: added header CRC validation, added crc11.c and crc11.h in wsutil/ for EDCH 11 bit CRC, fixed bug in RRC,
And also smaller bugfixes in umts_fp and rrc.

svn path=/trunk/; revision=44349
2012-08-08 17:24:14 +00:00
Michael Mann e0e533d643 Have (almost) all preferences use the generic preferences API (per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7402). This cleaned up a lot of hardcoded code and allows breaking up the prefs structure (or at least prevent it from growing too large) if desired.
Bugfixed problems mentioned in
http://www.wireshark.org/lists/wireshark-dev/201208/msg00001.html

Column preferences now support default '#' character

svn path=/trunk/; revision=44348
2012-08-08 16:54:02 +00:00
Anders Broman 68e2e8b889 From Jacob Nordgren and Rishie Sharma:
Add CRC11 algorithms

svn path=/trunk/; revision=44346
2012-08-08 16:27:10 +00:00
Martin Mathieson 3fc7c2348c Fix a couple of problems with the common zooming function.
svn path=/trunk/; revision=44341
2012-08-08 15:26:12 +00:00
Anders Broman 2e309b4d10 Remove cosshair cursor
svn path=/trunk/; revision=44340
2012-08-08 14:56:09 +00:00
Irene Rüngeler 3a3b4a1fdc Add -A as command line option to wireshark and tshark.
svn path=/trunk/; revision=44339
2012-08-08 14:30:55 +00:00
Anders Broman ae5a2f3b6d Make it possible to merge libpcap files with different encapsulation types by making the output file a pcapng file and construkting SHB and IDB
svn path=/trunk/; revision=44338
2012-08-08 14:06:29 +00:00
Irene Rüngeler bbd9a397f8 Make Ubuntu buildbot happy.
svn path=/trunk/; revision=44337
2012-08-08 13:34:50 +00:00
Alexis La Goutte daa1818d39 Enhance radiotap dissector
* Reorder code ! Match with Wireshark "Rules" (put in top value_string and static hf_..., in bottom proto_register_radiotap...)

svn path=/trunk/; revision=44336
2012-08-08 12:56:37 +00:00
Irene Rüngeler 8c14e27381 Use list view instead of notebooks to display compile results.
svn path=/trunk/; revision=44335
2012-08-08 12:52:48 +00:00
Jörg Mayer bf92ff4a3e Remove an empty line
svn path=/trunk/; revision=44334
2012-08-08 12:33:13 +00:00
Alexis La Goutte 88c219908e Enhance radiotap dissector
* Display unused/not defined present flags
* Add expert info if unused/not defined present flags has not "zero"

svn path=/trunk/; revision=44333
2012-08-08 12:32:04 +00:00
Jörg Mayer 37c7f3a7b0 Fix:
In file included from /home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:131:0:
/home/jmayer/work/wireshark/svn/trunk/epan/prefs.h:423:5: error: ‘struct pref_custom_cbs’ declared inside parameter list [-Werror]


svn path=/trunk/; revision=44332
2012-08-08 12:28:26 +00:00
Michael Mann 3d12ea758b Base framework to allow all preferences to be part of generic preferences API. Implementation will follow, but I wanted the framework in place first.
svn path=/trunk/; revision=44331
2012-08-08 12:13:24 +00:00
Alexis La Goutte 0e9df60466 Add A-MPDU Status Present flag
svn path=/trunk/; revision=44330
2012-08-08 08:30:51 +00:00
Alexis La Goutte 02cd557c95 From Johannes Berg via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7583
Add radiotap A-MPDU status

The new A-MPDU status extension for radiotap was adopted.
http://www.radiotap.org/defined-fields/A-MPDU%20status 

From me 
Use proto_tree_add_item

svn path=/trunk/; revision=44329
2012-08-08 08:16:34 +00:00
Irene Rüngeler 5311957c0e Add refresh button, if interfaces are not found.
svn path=/trunk/; revision=44328
2012-08-08 07:53:57 +00:00
Jörg Mayer 3b8d3f5fe5 As of r44326 everything builds with GDK_DISABLE_DEPRECATED
svn path=/trunk/; revision=44327
2012-08-08 07:09:33 +00:00
Anders Broman f463e9de51 It handles GDK_DISABLE_DEPRECATED
svn path=/trunk/; revision=44326
2012-08-08 07:02:57 +00:00
Jeff Morriss ff748a68c3 From Michael Mann on -dev:
The idl2wrs generated dissectors don't follow the convention of using the
filter name registered with the protocol as the start of any display filter
name.  This patch fixes that.

svn path=/trunk/; revision=44325
2012-08-08 03:37:05 +00:00
Jeff Morriss 98a893986d Use expert infos instead of g_warning when something unexpected is found.
svn path=/trunk/; revision=44324
2012-08-08 03:29:51 +00:00
Jeff Morriss 68aea944da Add SVN Id.
svn path=/trunk/; revision=44323
2012-08-08 03:28:02 +00:00
Jeff Morriss d380312c16 Move the pi==NULL test into TRY_TO_FAKE_THIS_REPR.
Since the tree will only be NULL here if someone messed up in proto.c and
since pi will only be NULL if tree is NULL, assert out if either of them are
NULL (don't use DISSECTOR_ASSERT() since such a condition wouldn't be the
dissector writer's fault).

Use TRY_TO_FAKE_THIS_REPR in ptvcursor_add_text_with_subtree().

We've had TRY_TO_FAKE_THIS_REPR for a long time now, don't wrap it in #if 1.

new_field_info() doesn't return NULL so don't check for it returning NULL in
ptvcursor_add().

svn path=/trunk/; revision=44322
2012-08-08 03:02:27 +00:00
Martin Mathieson aa65475748 Use a common function for doing zoom (shared by mouse and keyboard).
svn path=/trunk/; revision=44321
2012-08-08 02:51:22 +00:00
Gerald Combs cfb93ddbf5 Use ep_strbufs instead of trying to track string offsets manually
and overflowing a buffer. Fixes a crash in bug 7568 discovered by
Laurent Butti.

We do the Dance Of The String Offset Pointers in several other
places. They should probably be changed to ep_strbufs as well.

svn path=/trunk/; revision=44320
2012-08-08 00:40:03 +00:00
Pascal Quantin 9f8b638cfa Remove Uplink messages from the RlcMacDownlink_t structure (as they are part of the RlcMacUplink_t structure that is also used to call csnStreamDissector function)
svn path=/trunk/; revision=44319
2012-08-08 00:11:14 +00:00
Pascal Quantin 670be00aea Various fixes:
- in UM mode, LI size boundary is at 125 bytes (regression introduced in r44292)
- define RLC_LI_UPPERLAYER outside of rlc_li_size enum as it is confusing: when set in preferences it means that the dissector will use the variable, 7 bits or 15 bits LI as indicated in the rlc_info struct (so using one of the rlc_li_size enum value); it is not a new LI value
- add value_string array for direction
- add BCCH channel to UDP framing format
- initialize p2p_dir when using UDP framing format

svn path=/trunk/; revision=44318
2012-08-07 23:25:07 +00:00
Gerald Combs 5bdeb03b83 Fix a large loop found by Stefan Cornelius of Red Hat Security Response
Team (bug 7603).

Display the ACL entry count as decimal instead of hexadecimal.

svn path=/trunk/; revision=44317
2012-08-07 23:06:29 +00:00
Martin Mathieson 9fd94df70f Do the cross like it is in rlc_lte_graph.c, i.e. by just drawing black
lines, then erasing by re-showing the current pixmap.

svn path=/trunk/; revision=44316
2012-08-07 23:04:48 +00:00
Martin Mathieson f8b3e7c317 Fix a test to avoid the cross leaving a line behind at the top of the
graph.

svn path=/trunk/; revision=44315
2012-08-07 23:03:07 +00:00
Jörg Mayer 9b72dc1fb2 Small status update
svn path=/trunk/; revision=44314
2012-08-07 22:10:51 +00:00
Martin Mathieson 5c1c9d2244 Don't add 0.5 to coordinates used for drawing the cross. Was going
beyond the area and leaving artifacts.

svn path=/trunk/; revision=44313
2012-08-07 21:42:53 +00:00
Michael Mann 06c393807c Add a sanity check so we don't unnecessarily allocate memory for a Multiple Service Packet message. Bugfix 7570 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7570)
svn path=/trunk/; revision=44312
2012-08-07 20:09:59 +00:00
Martin Mathieson 41d9e15025 Redo the cross drawing/erasing.
Draw in black, erase by just redrawing the current pixmap.

Will apply to tcp_graph.c if/when this gets through the buildbots.

svn path=/trunk/; revision=44308
2012-08-07 19:11:43 +00:00
Gerald Combs 6c32ba5ff1 Make sure we have a corresponding 'u' member to RlcMacDownlink_t for
every call to csnStreamDissector. This should fix bug 7561. Based on
attachment 8888 from Martin Kaiser.

svn path=/trunk/; revision=44307
2012-08-07 18:36:18 +00:00
Jeff Morriss 846b557614 Fix fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
Don't overflow in_fmt->m_vc_index_array: verify that speed is less than or
equal to DECHAN_MAX_AUG_INDEX before using it.

Also add a comment: there are comments here that indicate that this array
should have 5 entries but there are only 4.

svn path=/trunk/; revision=44306
2012-08-07 18:17:29 +00:00
Alexis La Goutte b245c46c50 lupdate QtShark.pro
Updating 'qtshark_de.ts'...
    Found 72 source text(s) (16 new and 56 already existing)
    Kept 13 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 72 source text(s) (16 new and 56 already existing)
    Kept 10 obsolete entries
    Similar-text heuristic provided 3 translation(s)

Also remove $Id$, it is xml file (auto)generated by Qt (lupdate)

svn path=/trunk/; revision=44305
2012-08-07 16:08:23 +00:00