guy [Tue, 13 Jul 2010 23:26:07 +0000 (23:26 +0000)]
Add a "-d" flag to dumpcap, to print out the generated code for the
capture filter in human-readable form. (Well, readable by humans who
know BPF machine language, at least. :-))
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33509
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 13 Jul 2010 22:49:17 +0000 (22:49 +0000)]
Rename a variable. "tmp_len" was too similar to "tmp_length".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33506
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 13 Jul 2010 22:41:34 +0000 (22:41 +0000)]
Revert get_ber_length() back to r32530, which removes all of the changes
back to and including my attempt to make it iterative. Move its guts
back into try_get_ber_length() and add a recursion level check.
This should fix CVE-2010-2284 and preserve existing behavior without
introducing any new regressions (such as bug 5000).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33505
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Tue, 13 Jul 2010 21:21:38 +0000 (21:21 +0000)]
From Jan Šafránek:
dftest and randpkt are installed during make install, but they are not
documented in any man page.
This is a start. It's more or less a compilation of information found elsewhere.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33504
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Tue, 13 Jul 2010 16:25:34 +0000 (16:25 +0000)]
Allocate tap structs rather than using one static struct.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33503
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 13 Jul 2010 14:50:16 +0000 (14:50 +0000)]
Trivial: Replace deprecated GTK_CHECK... macros with apropriate G_TYPE_CHECK... macros
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33502
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 13 Jul 2010 14:38:23 +0000 (14:38 +0000)]
From Mellanox Technologies Ltd. via bug 5004:
Added missing variable assignment for dst_qp.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33501
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 13 Jul 2010 14:12:06 +0000 (14:12 +0000)]
Minor cleanup:
- GHFunc's return void not void *;
- Use gboolean where apropriate.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33500
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 13 Jul 2010 13:51:25 +0000 (13:51 +0000)]
Minor cleanup:
- rename rpcstat_t to dcerpcstat_t since a different definition of rpcstat_t in
another Wireshark source file apparently confuses the Windows debugger;
- GHFunc's return void not void *;
- Use gboolean where apropriate.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33499
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 13 Jul 2010 01:38:54 +0000 (01:38 +0000)]
Whitespace cleanup: consistent indentation; tabs==>spaces; etc
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33498
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 13 Jul 2010 00:46:00 +0000 (00:46 +0000)]
GtkOptionMenu ==> GtkComboBox
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33497
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 13 Jul 2010 00:17:08 +0000 (00:17 +0000)]
ws_combo_box_text_and_pointer: allow setting entries as "insensitive".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33494
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 12 Jul 2010 23:52:35 +0000 (23:52 +0000)]
WinPcap 4.1.1 -> 4.1.2.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33493
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 12 Jul 2010 17:30:14 +0000 (17:30 +0000)]
Add length checks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33488
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 11 Jul 2010 15:03:33 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-07-11]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33484
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Sat, 10 Jul 2010 09:47:20 +0000 (09:47 +0000)]
Fix for bug 4993:
Mac support flags are little endian too.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33483
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 9 Jul 2010 21:27:08 +0000 (21:27 +0000)]
The only reason to escape "%" in a string is if you are, incorrectly,
passing a string directly to a routine that expects a format string.
The correct way to handle that is to pass "%s" as the string.
As long as you're escaping non-printable characters, just let
tvb_format_string() handle that.
For null-terminated strings, get the length of the string with
tvb_strsize(), and then just put the string into the protocol tree as a
regular item.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33482
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 9 Jul 2010 20:27:02 +0000 (20:27 +0000)]
Check our field lengths. Should fix the recent randpkt errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33481
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 9 Jul 2010 17:07:34 +0000 (17:07 +0000)]
Assume that if we have more than 500 levels of nested indefinite lengths
we have a malformed packet.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33480
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 9 Jul 2010 01:46:11 +0000 (01:46 +0000)]
Implement a separate pref for enabling tracking of tcp window scaling
(instead of including this pref as part of enabling tcp relative sequence numbers).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33479
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 9 Jul 2010 00:23:27 +0000 (00:23 +0000)]
From Ian Schorr: "NFSv4 COMMIT Calls not decoding"
NFSv4 COMMIT Requests are not decoded. NFS "malformed packet" logic is
tripped.
This was a bug introduced with the changes in bug 4975. The dissector
erroneously tries to decode 4 bytes past the end of the packet.
A patch is attached that fixes that, as well as adds "Offset" info in the Info
column for COMMIT calls.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4990
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33478
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 8 Jul 2010 14:19:32 +0000 (14:19 +0000)]
Add dissector_tables_dlg.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33477
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 8 Jul 2010 14:14:11 +0000 (14:14 +0000)]
From Thomas Dreibholz via bug 4989:
Extend the SSP dissector to support the SSP Environment message type.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33476
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 8 Jul 2010 12:55:03 +0000 (12:55 +0000)]
from Tarjei Knapstad.
Minor cleanups in packet-xml dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4987
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33475
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 8 Jul 2010 11:05:16 +0000 (11:05 +0000)]
Add "WS internal" to the menues this can be used to display internal information like the curren "entry" dissector tables. Emem statistics
could be another item to add.
Add dissector tables treview. This cab be used to find which UDP ports are registered for example.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33474
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 8 Jul 2010 10:04:06 +0000 (10:04 +0000)]
Update the services file from IANA's port-numbers.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33473
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 8 Jul 2010 02:54:26 +0000 (02:54 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4854 (crash when adding
2nd info column):
Duplicate col_do_append_sep_va_fstr()'s code into col_append_fstr() and
col_append_sep_fstr() (and remove col_do_append_sep_va_fstr()) because we need
to call va_start() and va_end() after each call to g_vsnprintf(). (This is a
followon to rev 32961.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33472
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 7 Jul 2010 22:00:44 +0000 (22:00 +0000)]
For: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4984#c4 : In try_get_ber_length() don't let a negative length make us go backwards. This should eliminate a possible infinite loop and appears to /help/ limit the depth of recursion.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33471
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 7 Jul 2010 21:27:13 +0000 (21:27 +0000)]
Fix a buffer overflow found by recent randpkt testing. Replace raw data
pointer access with tvb_memcpy() and tvb_get_ntohs().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33470
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 7 Jul 2010 20:33:19 +0000 (20:33 +0000)]
NEW_FILTER_COMBO_BOX no longer does anything - it's not checked for - so
there's no need to define it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33469
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 7 Jul 2010 19:53:40 +0000 (19:53 +0000)]
Make sure we use the "randpkt-" prefix everywhere.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33468
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 7 Jul 2010 17:13:53 +0000 (17:13 +0000)]
From Pascal Quantin: Add offset of 1 to FMS.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33467
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 7 Jul 2010 16:55:42 +0000 (16:55 +0000)]
Try limiting our stack size.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33466
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 7 Jul 2010 16:07:09 +0000 (16:07 +0000)]
Remove the #ifdefs and code related to the switch to gtk_combo_box().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33465
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 7 Jul 2010 15:52:09 +0000 (15:52 +0000)]
Fix infinite recursion reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4984 : In try_get_ber_length() make sure we move forward before recursing.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33464
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 7 Jul 2010 13:46:08 +0000 (13:46 +0000)]
Some dissectors are added in dissectors/dcerpc/CMakeLists.txt
Remove them here.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33463
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 7 Jul 2010 13:25:36 +0000 (13:25 +0000)]
Synchronize dissector lists between CMakeLists.txt and
dissectors/Makefile.common:
The following dissectors were missing from CM:
dissectors/packet-dcerpc-budb.c
dissectors/packet-dcerpc-butc.c
dissectors/packet-dcerpc-drsuapi.c
dissectors/packet-gsmtap.c
Both: Whitespace fixes and reordering.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33462
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 7 Jul 2010 01:55:34 +0000 (01:55 +0000)]
I added PCAP_NETMASK_UNKNOWN in libpcap 1.1.0; it's not present in
1.0.0. You're supposed to just use 0 in releases prior to 1.1.0 - in
1.1.0 and later, a netmask of PCAP_NETMASK_UNKNOWN will cause errors if
you try to use "ip broadcast" (as you need the netmask to check for
local broadcasts), but, prior to that, the netmask value is blindly used
even if the filter will always fail.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33461
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 6 Jul 2010 22:35:33 +0000 (22:35 +0000)]
Add a target which creates a zip file containing our .pdb files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33460
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Tue, 6 Jul 2010 21:02:19 +0000 (21:02 +0000)]
Add button to look at compiled BPF.
This allows to test and experiment with BPF expressions, before launching
the capture itself.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33459
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 6 Jul 2010 19:37:17 +0000 (19:37 +0000)]
Don't set SDKROOT - which SDK we want depends on which OS we want this
to run on, and not setting it should default to the OS on which we're
building it (as opposed to an OS for which we might not *have* an SDK).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33458
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Tue, 6 Jul 2010 17:22:12 +0000 (17:22 +0000)]
Fix for bug 4982:
Handle concatenated Status and other message.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33457
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 6 Jul 2010 14:57:54 +0000 (14:57 +0000)]
Limit the number of operations to 128 (arbitrary number) to keep us from attempting to mallocate way too much memory. This fixes the fuzz failure reported in bug 4976.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33456
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 6 Jul 2010 13:21:34 +0000 (13:21 +0000)]
Add miising else handling a zero msg_auth_code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33455
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 6 Jul 2010 09:51:28 +0000 (09:51 +0000)]
Use G_GINT64_CONSTANT() to make a 64-bit all-bits-set constant.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33454
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 6 Jul 2010 08:43:07 +0000 (08:43 +0000)]
No need to add a fake field with the opcode as a string - you can just
compare the real opcode field against a string.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33452
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 6 Jul 2010 07:45:38 +0000 (07:45 +0000)]
Try checking for G_MAXUINT64 instead of 0xffffffffffffffff.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33451
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 6 Jul 2010 06:54:51 +0000 (06:54 +0000)]
Removed non-ASCII characters.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33450
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 6 Jul 2010 06:40:34 +0000 (06:40 +0000)]
Fix the build on OSX.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33449
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 6 Jul 2010 05:53:18 +0000 (05:53 +0000)]
Fix:
packet-nfs.c:699: warning: type defaults to 'int' in declaration of 'nfsv4_operation_tiers'
packet-nfs.c:9583: warning: unused variable 'saved_fh_hash'
packet-nfs.c:9580: warning: unused variable 'name'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33448
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 6 Jul 2010 05:46:52 +0000 (05:46 +0000)]
Fix "checked api failed"
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33447
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 6 Jul 2010 04:43:45 +0000 (04:43 +0000)]
From Brett Kuskie:
Enhancement of the dcerpc-svcctl dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4858
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33446
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 6 Jul 2010 04:32:21 +0000 (04:32 +0000)]
From Frank Schorr:
The packet-nbns.c dissector picks random data as the NBSS PDU length in certain situations.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4914
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33445
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 6 Jul 2010 04:27:01 +0000 (04:27 +0000)]
From Sven Eckelmann:
Dissector/packet-batadv: Add support for icmp rr.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4922
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33444
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 6 Jul 2010 04:20:27 +0000 (04:20 +0000)]
From Andrew Feren:
Several small fixes to NetFlow decoding.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4962
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33443
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 6 Jul 2010 04:13:54 +0000 (04:13 +0000)]
From Ian Schorr:
NFSv4 usability enhancements (Info column summaries, filterable fields).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4975
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33442
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Mon, 5 Jul 2010 23:21:58 +0000 (23:21 +0000)]
So many people who love to use easy to remember ports.
Improve heuristics to exclude cases where the traffic
definitely isn't Cisco's IPSEC inside TCP.
Does this obsolete the NDMP protocol check?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33441
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 5 Jul 2010 22:09:10 +0000 (22:09 +0000)]
- Show droped packets counter after stopping a live capture.
- Don't show "Load time" during live capture.
- Fix indentation and minor changes to comments.
Should ignored packets be shown also when drops is known?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33440
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 5 Jul 2010 20:04:46 +0000 (20:04 +0000)]
From Jouni Malinen:
Add dissecting for IEEE 802.11u GAS frames.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33439
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 5 Jul 2010 17:28:28 +0000 (17:28 +0000)]
Change type back to 16-bit to fix buildbot.
Will change subframe numbers to 8-bit later.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33438
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 5 Jul 2010 16:45:36 +0000 (16:45 +0000)]
Show grant-subframe from context info.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33437
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 5 Jul 2010 16:05:21 +0000 (16:05 +0000)]
From Jouni Malinen:
Add dissecting for SA Query Action frames (IEEE 802.11w)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33436
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 5 Jul 2010 15:59:11 +0000 (15:59 +0000)]
From Jouni Malinen:
Add a proto tree item for Current Channel in DS Parameter Set element.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33435
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 5 Jul 2010 12:38:09 +0000 (12:38 +0000)]
Add a checkbox to allow DCT errors to be included in generated display filter.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33434
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 5 Jul 2010 10:53:48 +0000 (10:53 +0000)]
We have no first and second block when dumping bits view, so no adjustments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33433
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 5 Jul 2010 10:50:27 +0000 (10:50 +0000)]
Check range of supplied subframe number. If out, set back to max (9) and
add expert info error. Should fix bug 4970.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33432
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Mon, 5 Jul 2010 10:35:17 +0000 (10:35 +0000)]
For DL HARQ retx, support knowing result or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33431
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 5 Jul 2010 09:05:27 +0000 (09:05 +0000)]
Revert COL_DSCP_VALUE back to value set in packet-ip.c.
Right justify COL_DSCP_VALUE (and COL_DCE_CALL as in the old packet list).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33430
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 4 Jul 2010 15:03:32 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-07-04]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33426
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 2 Jul 2010 13:15:44 +0000 (13:15 +0000)]
Code cleanup:
- Use ep_strdup_printf instead of ep_alloc + g_snprintf
- Untabify
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33414
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 2 Jul 2010 08:52:35 +0000 (08:52 +0000)]
STATUS_UNWIND_CONSOLIDATE "should not happen", so don't include it -
we'd have to include some other headers to get it defined.
Get rid of the include of Winbase.h - it doesn't define
STATUS_UNWIND_CONSOLIDATE, and it's not necessary.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33413
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 2 Jul 2010 08:41:19 +0000 (08:41 +0000)]
Include <Winbase.h> to get error statuses.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33412
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 2 Jul 2010 08:39:08 +0000 (08:39 +0000)]
Attempt to detect when dumpcap dies due to an exception and report that
appropriately.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33411
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 2 Jul 2010 04:11:04 +0000 (04:11 +0000)]
Have sync_pipe_wait_for_child() return the child's exit status on
Windows, just as we do on UN*X.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33410
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 2 Jul 2010 03:50:30 +0000 (03:50 +0000)]
oid_encoded2string() returns a const char *; don't assign it to a char
*.
Don't declare variables in the middle of a block; not all the compilers
we use support that.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33409
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 1 Jul 2010 19:19:03 +0000 (19:19 +0000)]
From Sven Eckelmann: Fix size of seqno in icmp packets
See Bug #4921: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4921
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33405
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 1 Jul 2010 18:42:41 +0000 (18:42 +0000)]
From Sven Eckelmann: Add support for v11 packet format
"Please add support for v11 ogm packets used in linux 2.6.36"
See: Bug #4920: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4920
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33404
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 1 Jul 2010 17:57:53 +0000 (17:57 +0000)]
Don't add raw bytes to the tree.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33403
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 1 Jul 2010 16:35:37 +0000 (16:35 +0000)]
Have get_ber_length() set the length to 0 by default. This restores behavior
that was lost recently.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33402
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 1 Jul 2010 15:11:02 +0000 (15:11 +0000)]
Rework ethernet address resolution: step 3 of 3:
- Primarily: ethernet name lookup returns either
unresolved or resolved ethernet name depending upon whether
MAC Name resolution is disabled or enabled.
Previously: Unresolved or resolved name cached at first reference
and then always returned for future references no matter whether
MAC Name Resolution was enabled or disabled.
- Also: Refactor ethernet, manuf & well-known-addr related code;
ToDo: (separately): Redisplay when 'MAC name resolution' enabled/disabled.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33401
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 1 Jul 2010 14:33:36 +0000 (14:33 +0000)]
Recreate the packet list on DND columns.
This is a quick'n'dirty fix and not optimal, but it fixes the problems we
have with DND columns. We have to rewrite new_packet_list_recreate() to
handle both new, delete and reorder columns.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33400
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 1 Jul 2010 12:21:29 +0000 (12:21 +0000)]
Fetch filter and copy summary from correct column after DND columns.
This does not recreate the internal structures, but we we fix the problem
with fetching wrong data. Printing still uses the configured column order.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33399
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 1 Jul 2010 11:31:24 +0000 (11:31 +0000)]
Remove some double GTK_TREE_VIEW casts.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33398
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 1 Jul 2010 04:01:13 +0000 (04:01 +0000)]
TShark now exits with a status of 1 for an invalid interface or capture
filter; check for that, rather than for a status of 0.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33397
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 1 Jul 2010 00:44:21 +0000 (00:44 +0000)]
Initialize MechType_oid in the right place.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33396
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 1 Jul 2010 00:12:16 +0000 (00:12 +0000)]
From Petr Lautrbach: when capturing, return the exit status of dumpcap,
so we give a non-zero exit status for invalid interfaces or capture
filters.
From me: don't exit immediately if dumpcap failed, print out information
from taps and the like.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33393
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 1 Jul 2010 00:11:14 +0000 (00:11 +0000)]
Initialize more variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33392
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 30 Jun 2010 23:45:24 +0000 (23:45 +0000)]
Initialize a variable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33390
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 30 Jun 2010 23:40:05 +0000 (23:40 +0000)]
Initialize some variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33389
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 30 Jun 2010 23:36:24 +0000 (23:36 +0000)]
Initialize a variable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33388
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 30 Jun 2010 23:20:03 +0000 (23:20 +0000)]
Add Visual C++ project files to the distribution.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33386
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 30 Jun 2010 23:07:58 +0000 (23:07 +0000)]
Use the right array bounds.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33385
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 30 Jun 2010 19:38:26 +0000 (19:38 +0000)]
Reverting
http://anonsvn.wireshark.org/viewvc?view=rev&revision=29861
seems to fix the scrolling in live captures issue.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4891
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33384
f5534014-38df-0310-8fa8-
9805f1628bb7
gal [Wed, 30 Jun 2010 10:06:21 +0000 (10:06 +0000)]
When determining a BER length, make sure the BER identifier was marked as constructed if an indefinite length is encountered.
This helps prevent a stack overflow problem reported in Bug 4951.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33383
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 30 Jun 2010 09:09:18 +0000 (09:09 +0000)]
Added expert info for illegal bitstring padding and when bits are set
in the padded area.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33382
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Wed, 30 Jun 2010 05:37:34 +0000 (05:37 +0000)]
Sort filename expansion
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33381
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 29 Jun 2010 23:50:51 +0000 (23:50 +0000)]
Add End Marker back in.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33380
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 29 Jun 2010 23:48:24 +0000 (23:48 +0000)]
Completely revert r33367 so that we don't duplicate content in
packet-gtp.h.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33379
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 29 Jun 2010 23:37:10 +0000 (23:37 +0000)]
Include packet-gtp.h in the release tarball.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33378
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 29 Jun 2010 22:38:00 +0000 (22:38 +0000)]
Back out what I suspect were private/not-ready-for-prime-time changes,
not all of the parts of which were present, causing the build to fail.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33377
f5534014-38df-0310-8fa8-
9805f1628bb7