Commit Graph

43043 Commits

Author SHA1 Message Date
Alexis La Goutte ea4f518997 Add Qtshark to Windows Installer (NSIS)
Detect if ./wireshark-qt/qtshark.exe is present and add a option to install Qtshark (Experimental), also add a shortcut.
The option to install qtshark is disable by default (for the moment...)

Now qtshark is (normally) available in automated build !

svn path=/trunk/; revision=45485
2012-10-11 20:45:35 +00:00
Alexis La Goutte b34abdc943 From Alex Badea via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7849
IPsec ESP: allow filtering by ICV verification result

Add hf_esp_icv_good and hf_esp_icv_bad (similar to IP checksums), to allow
filtering based on the ICV check results.

svn path=/trunk/; revision=45483
2012-10-11 20:38:39 +00:00
Alexis La Goutte b504e64b6a From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7842
Make relative time columns rightly right justified

When showing the relative time in the framelist columns, they are left aligned.
This is sub-optimal if you are scanning the list for a different time.

This patch, very small, will properly right justify these times:
DELTA_TIME
DELTA_TIME_DIS

svn path=/trunk/; revision=45481
2012-10-11 20:16:24 +00:00
Alexis La Goutte b0b96f7f07 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7840
packet-smb.c does not handle truncated frames well when dealing with TRANS2 FIND_{FIRST/NEXT} responses

The current code simply throws an exception if any of the expected data is
missing, even though there might be several file's worth of data available.

I will attach a patch that does a better job of handling truncated frames in
such cases.

svn path=/trunk/; revision=45480
2012-10-11 20:09:44 +00:00
Alexis La Goutte a6c72491e4 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7838
packet-smb.c does not correctly dissect INFO_QUERY_EAS_FROM_LIST

[MS-CIFS].pdf makes it clear that, contrary to what packet-smb.c says, handling
the response to a TRANS2/FIND_{FIRST,NEXT} with a level of
INFO_QUERY_EAS_FROM_LIST is not the same as handling INFO_QUERY_EA_SIZE.


svn path=/trunk/; revision=45479
2012-10-11 20:01:37 +00:00
Bill Meier 82d40100d2 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Done on general principles altho upon inspection
none of the cases changed would have actually
resulted in an infinite loop.



svn path=/trunk/; revision=45478
2012-10-11 19:39:32 +00:00
Bill Meier ad0219d033 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)
The changes fix definite problems or
are done "just in case" for cases not esily determined
to be a problem by quick inspection.

Note: in some cases for loop index variables have been renamed
      to ensure  all required codes changes detected.

##backport

svn path=/trunk/; revision=45477
2012-10-11 19:20:21 +00:00
Bill Meier b2cb4007e3 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'.
The changes fix possibly problematical cases
 (not clear upon quick inspection).

Also: fix several bugs wherein an inner 'for' loop used
the same index variable name as an outer loop thus
messing up the outerloop.

##backport


svn path=/trunk/; revision=45476
2012-10-11 19:14:29 +00:00
Gerald Combs 552a9c6b1e Make sure sync_interface_stats_close calls sync_pipe_kill on all
platforms.  This ham-fistedly fixes a delay when moving from the
"Capture" item to the "Open" and "Learn" items on the welcome screen in
the Qt version.

svn path=/trunk/; revision=45475
2012-10-11 16:55:28 +00:00
Anders Broman d7c4e6ccf0 In GTK3 the settings.ini file serves the same purpose as the gtkrc file.
It should be copied to the wireshark executable dir ..\etc\gtk-3.0

I'm not sure if this is the right place to put it.

makefile will be updated later if no one beats me to it or has a better idea where to put the file. I'm not sure if we should strive to make the GTK3 version as equal to the GTK2 version as possible or accept that it looks more like the *nix version.
If we are to use it it needs to be in the nsi installer as well.

svn path=/trunk/; revision=45474
2012-10-11 15:41:34 +00:00
Anders Broman 94374cb6d7 Fix:
../../../epan/dissectors/packet-giop.c: In function 'get_CDR_typeCode':
../../../epan/dissectors/packet-giop.c:3341:15: warning: variable 'ti' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'decode_ServiceContextList':
../../../epan/dissectors/packet-giop.c:3871:7: warning: variable 'temp_offset' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'dissect_giop_request_1_2':
../../../epan/dissectors/packet-giop.c:4443:10: warning: variable 'response_flags' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'get_giop_pdu_len':
../../../epan/dissectors/packet-giop.c:4837:81: error: unused parameter 'offset' [-Werror=unused-parameter]

svn path=/trunk/; revision=45473
2012-10-11 15:04:09 +00:00
Michael Mann a5d56d30b4 Make idl2wrs dissectors filterable - Part 1
Updated wireshark_gen.py to generate hf_ variables for all of the IDL "types".  The "simple" types use proto_tree_add_* (not text), while the "complex" types use the GIOP dissector API.  checkhf.pl generates some warnings because (some of) the hf_ variables are being generated for the "complex" types, but are not being used.  That will be done in Part 2.

expert_add_info_format now linked to a real item instead of being attached to a duplicative proto_tree_add_text().  This cleaned up literally thousands of unnecessary proto_tree_add_text()s

svn path=/trunk/; revision=45472
2012-10-11 14:42:33 +00:00
Michael Mann e258b8e353 Should have been part of r45470, changing format of "magic number"
svn path=/trunk/; revision=45471
2012-10-11 14:22:13 +00:00
Michael Mann 756a564fff General cleanup, made more items filterable. Checking in now to get a new baseline for some idl2wrs improvements involving getting more items filterable (see bug 7822)
svn path=/trunk/; revision=45470
2012-10-11 14:16:25 +00:00
Michael Mann 552e411031 Fix infinite loop in HART/IP dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7845)
I also did a small bit of cleanup dissection while I was there, but it could definitely use more.  I just want to fix the fuzztest crash I discovered before the buildbots get a hold of it.

svn path=/trunk/; revision=45469
2012-10-11 14:05:27 +00:00
Alexis La Goutte 85b7bec830 Fix crash when use pcapng with comments (with QtShark)
ERROR:proto_tree.cpp:125:void proto_tree_draw_node(proto_node*, gpointer): code should not be reached

(Missing color information for PI_COMMENT)

svn path=/trunk/; revision=45468
2012-10-11 12:31:39 +00:00
Anders Broman d88e1202a5 From Bartosz Brachaczek:
Make the SSL dissector work with GnuTLS compiled with nettle.

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

#BACKPORT

svn path=/trunk/; revision=45465
2012-10-11 08:28:57 +00:00
Guy Harris dda0e94161 hf_isup_cic is now BASE_DEC, so there's no reason to use
proto_tree_add_uint_format() to make it display in decimal -
proto_tree_add_uint() suffices.

svn path=/trunk/; revision=45464
2012-10-11 08:23:29 +00:00
Anders Broman f6914a05af "Prepare/Apply a filter" on ISUP CIC should make a filter with decimal CIC number, not hex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7848

svn path=/trunk/; revision=45463
2012-10-11 08:12:41 +00:00
Bill Meier 38f3198b2b Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Done on general principles altho none of the cases
changed would have actually resulted in an infinite
loop because a Bounds error would eventually occur.

svn path=/trunk/; revision=45462
2012-10-11 03:55:33 +00:00
Guy Harris f154882eb5 The usual idiom in C for "do this N times" is "for (i = 0; i < N; i++)",
not "for (i = 1; i < N+1; i++)".

Even if it weren't the idiom, it'd be safer, at least for unsigned
values, as, if i and N are the same width, and N has the maximum
possible value for that width, the first of those runs i from 0 to N-1,
all of which fit in a variable of that width, and the second of those
runs i from 1 to N, the latter of which doesn't fit into a variable of
that width, so modulo arithmetic turns it into 0 and the loop keeps
running forever.

Fixes bug 7844.

svn path=/trunk/; revision=45459
2012-10-11 00:02:14 +00:00
Martin Mathieson 6f112aa115 Copy of tap details needed to be a little bit deeper.
svn path=/trunk/; revision=45458
2012-10-10 23:09:52 +00:00
Guy Harris b8b899fc36 From Bill Parker: fix typo.
svn path=/trunk/; revision=45457
2012-10-10 21:09:10 +00:00
Gerald Combs f003add90f Fix a copy+paste error and a missing include. Adjust the format_size
digit threshold.

svn path=/trunk/; revision=45456
2012-10-10 20:19:18 +00:00
Guy Harris 5ba1ad12cc Based on patch from Bill Parker, check for ws_fopen() failing.
The rest of the code already checks for namelist being null, so it's OK
to call build_tree_view() - and it may be necessary to do so, as the
code below might assume that's worked.

However, we should not call fclose() on namelist if it's null; the C89
standard, at least, does *not* assert that fclose(NULL) is a no-op.

Clean up indentation a little bit.

Last part of fix for bug 7824.

svn path=/trunk/; revision=45455
2012-10-10 19:50:37 +00:00
Guy Harris 8c2916b5bb From Bill Parker: check for ws_fopen() failing.
From me: instead of logging the error with a macro that requires dbg_out
to be set, and giving up, set dbg_out to stderr, log the message (which
now notes that logging will be done to the standard error), and drive
on.

Part of fix for bug 7824.

svn path=/trunk/; revision=45454
2012-10-10 19:33:49 +00:00
Gerald Combs 98b0812341 Add a format_size function similar to g_format_size that renders a size
value in a human-readable format. Use it in the welcome screen, status
bar, and Win32 interface details.

Note that in the welcome screen and status bar we've switched from
customary binary prefixes to strict SI.

svn path=/trunk/; revision=45453
2012-10-10 19:17:31 +00:00
Guy Harris 2ea9adc0de In the include processing code, if ddict_open() fails, bail out
*regardless* of whether errno is non-zero, so we at least report the
failure.

In the standalone test program built if TEST_DIAM_DICT_STANDALONE is
defined, check for ddict_scan() failing.

Part of fix for bug 7824.

svn path=/trunk/; revision=45452
2012-10-10 19:06:34 +00:00
Jakub Zawadzki f68020f1e1 Revert changes to ep_ allocator, revert edt ref-counting.
svn path=/trunk/; revision=45451
2012-10-10 19:05:30 +00:00
Martin Mathieson dbca2e7d8f Get rid of an outdated format
svn path=/trunk/; revision=45450
2012-10-10 16:39:51 +00:00
Martin Mathieson 81a50ff80b Take a deep copy of the tap struct in the tap function, as it is not
safe to access it after the packet has been fully dissected (the
struct will have been allocated with ep_alloc()).

svn path=/trunk/; revision=45449
2012-10-10 16:17:19 +00:00
Martin Mathieson d8fa6d9c9a Update to format of string that indicates SR failure.
svn path=/trunk/; revision=45448
2012-10-10 15:18:52 +00:00
Greg Morris 9ea1ab416e Provide ability to find previous request packets in NCP hash table.
svn path=/trunk/; revision=45447
2012-10-10 13:55:18 +00:00
Jakub Zawadzki 174dabeeca Fix r45445
svn path=/trunk/; revision=45446
2012-10-10 12:30:53 +00:00
Jakub Zawadzki c24a90f49e Fix bug #7814
We need to pass original pointer and length to munmap().

svn path=/trunk/; revision=45445
2012-10-10 12:24:56 +00:00
Evan Huus fd76b098a3 Temporarilly disable ep's use of chunks until the bugs are fixed.
svn path=/trunk/; revision=45444
2012-10-10 11:17:28 +00:00
Jörg Mayer 6f5bc4ea12 Revert
------------------------------------------------------------------------
  r45351 | eapache | 2012-10-06 22:18:28 +0200 (Sa, 06 Okt 2012) | 3 lines

  Don't store qm files in svn: they're generated from the ts files and get removed
  on a make clean.

  ------------------------------------------------------------------------

it breaks out of tree builds and I don't have the time to fix that right now.


svn path=/trunk/; revision=45441
2012-10-10 04:42:03 +00:00
Gerald Combs 18b10390da Move a couple of enums to the common UI directory. Remove an unused
definition.

svn path=/trunk/; revision=45440
2012-10-09 23:51:30 +00:00
Chris Maynard a50e1a98ae Apply Ronnie Sahlberg's ICMP request/response tracking improvements from r45343 to ICMPv6. (Tested using captures from bug 5810).
svn path=/trunk/; revision=45439
2012-10-09 22:34:40 +00:00
Jaap Keuter 7a1e74398d From Mark Phillips:
I have added support for the 11ac VHT Capabilities and Operation IEs.

svn path=/trunk/; revision=45438
2012-10-09 21:29:09 +00:00
Gerald Combs ff32bd8000 If our error output is huge (> 5 MB) trim out the middle of the file.
The recent loop bugs have generated output that's too large to attach to
Bugzilla.

svn path=/trunk/; revision=45437
2012-10-09 20:47:22 +00:00
Jeff Morriss cdd0915add More indentation fixes; add a reminder comment about where new XML files need to be added.
svn path=/trunk/; revision=45436
2012-10-09 20:29:21 +00:00
Pascal Quantin d0b892f450 Add another check for command APDU dissection
svn path=/trunk/; revision=45435
2012-10-09 20:11:48 +00:00
Gerald Combs 3c1ceabb9d Fix the layout of the "Export Dissected Packets" template and tweak a
few other layouts.

svn path=/trunk/; revision=45434
2012-10-09 17:52:38 +00:00
Pascal Quantin b126c01738 Fix dissection of more instructions when having only the command APDU
svn path=/trunk/; revision=45433
2012-10-09 17:49:14 +00:00
Jeff Morriss bb266b5792 Fix up indentation and white space.
svn path=/trunk/; revision=45432
2012-10-09 17:37:49 +00:00
Alexis La Goutte 635554cc51 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7820
wlan_mgt.ht.capabilities bits 8-15 incorrectly decoded (from wrong packet offset)

The bug is that the code defines the bit fields as 16 bit, but increments the
offset in-between decoding B0-B7 and B8-B15 which causes the wrong bits to be
decoded.

Also fix to change "Capability" to "Capabilities" to match spec

From me : Fix wrong length for A-MPDU


svn path=/trunk/; revision=45431
2012-10-09 17:17:22 +00:00
Gerald Combs b28da10eec Fix Qt compilation on Windows. Check the user-supplied range syntax
and provide instant feedback in the Win32 file dialog similar to the Qt
code. Tango-ize some colors. Escape a backslash in QtShark.pro.

svn path=/trunk/; revision=45430
2012-10-09 15:34:40 +00:00
Anders Broman 9d37b98748 Set fence after finishing writing to the info col in order to show
info from more than one (SIP) message in the frame.

svn path=/trunk/; revision=45429
2012-10-09 15:07:46 +00:00
Anders Broman cba1bb8278 As ths SDP dissector adds /SDP to the protocol column I think that
col_append_str(pinfo->cinfo, COL_INFO, ", with session description"); is redundant if some one has a different opinion fel free to revert.

svn path=/trunk/; revision=45428
2012-10-09 15:00:39 +00:00