gerald [Fri, 22 Nov 2013 01:07:36 +0000 (01:07 +0000)]
Add an initial "Decode As" dialog. Currently read-only.
Fixup some of the Statistics menu items.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53499
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 22 Nov 2013 00:20:23 +0000 (00:20 +0000)]
Move common "decode as" preference code to epan.
We presumably want "decode as" behavior to be consistent across UIs so
call load_decode_as_entries() from read_prefs().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53498
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 21 Nov 2013 23:21:49 +0000 (23:21 +0000)]
Comment out *many* unused vars found by CLANG;
Fix 2 minor bugs wherein an incorrect (NULL) tree was always used;
Remove some unneeded initializers;
Localize some variables;
Use consistent indentation & whitespace formatting
Add editor modelines.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53497
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 21 Nov 2013 23:17:59 +0000 (23:17 +0000)]
#if 0 some unused vars found by CLANG
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53496
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Thu, 21 Nov 2013 22:30:55 +0000 (22:30 +0000)]
From Abhik Sarkar
improve relative offset calculations for Kyoto-Tycoon protocol
from me:
use col_append_sep_str()
set the correct length in dissect_kt()
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9418
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53495
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Thu, 21 Nov 2013 21:54:31 +0000 (21:54 +0000)]
next unprocessed descriptor 0xFF means that
all descriptors were processed
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53494
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 21 Nov 2013 20:50:13 +0000 (20:50 +0000)]
Widen the Ethertype to a guint, to avoid compiler warnings.
Fix indentation while we're at it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53493
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 21 Nov 2013 20:33:28 +0000 (20:33 +0000)]
Get rid of unused variable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53492
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 21 Nov 2013 20:24:01 +0000 (20:24 +0000)]
Tap listeners have to be registered before we read our prefs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53491
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 21 Nov 2013 20:20:29 +0000 (20:20 +0000)]
Attempt to fix Qt dependencies for SUSE.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53490
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 20:08:20 +0000 (20:08 +0000)]
Remove ethertype, mpls_label and ppids from packet_info structure.
The information was converted to "proto" data within their respective dissectors strictly for use in "Decode As".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53489
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 19:51:17 +0000 (19:51 +0000)]
Create new dissectors when a protocol goes across ethernet and "something else" instead a single dissector that uses pinfo->ethertype to determine if it's the "ethernet" or the "something else" case.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53488
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 21 Nov 2013 19:11:47 +0000 (19:11 +0000)]
Add some "helper" macros to:
Provide the capability to define a list of value_strings once and
then to expand the list as an enum and/or as a value_string array.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53487
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 21 Nov 2013 18:50:44 +0000 (18:50 +0000)]
Get rid of C++ comments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53486
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 21 Nov 2013 18:48:36 +0000 (18:48 +0000)]
#if 0 out some currently-unused variables and the code that sets them,
to squelch compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53485
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 21 Nov 2013 18:46:40 +0000 (18:46 +0000)]
Do some constification;
Create/use value_string_ext_free();
Display certain numbers also as hex in the
"forced to fall back to linear search: ..." value-string warning msg
Add editor-modelines to some files;
Do some whitespace changes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53484
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 21 Nov 2013 18:37:26 +0000 (18:37 +0000)]
(Trivial) Formatting & whitespace changes ....
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53483
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 21 Nov 2013 18:03:10 +0000 (18:03 +0000)]
Constify two vars;
Add editor modelines;
Rework some whitespace.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53482
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 21 Nov 2013 17:44:12 +0000 (17:44 +0000)]
Add a note about UTF-8.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53481
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 21 Nov 2013 17:41:17 +0000 (17:41 +0000)]
Constify a character array;
Fix a typo;
Add editor modelines.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53480
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 21 Nov 2013 17:39:32 +0000 (17:39 +0000)]
Remove an unused function.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53479
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 17:18:11 +0000 (17:18 +0000)]
Create separate dissector function for TCP functionality so packet_info->ethertype doesn't need to be used.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53478
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 21 Nov 2013 17:12:05 +0000 (17:12 +0000)]
Create/use a number of extended value-strings;
Use FT_BOOLEAN instead of FT_UINT16 with 'ptp_bool_vals' value_string array;
Add editor modelines;
Do some whitespace & formatting changes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53477
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 16:42:10 +0000 (16:42 +0000)]
Remove packet_info->ipproto and packet_info->ethertype uses in the GUI. Convert to walking packet protocol list looking for desired protocols.
I may eventually switch this to use proto_* values instead of strings, but just the addition of the loop is more jarring as compared to the simple comparing of ip or ethernet values. But it should lead to a smaller (less protocol specific) packet_info structure.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53476
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Thu, 21 Nov 2013 15:42:22 +0000 (15:42 +0000)]
Cope with empty VWR files (bug 9428)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53475
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 12:46:31 +0000 (12:46 +0000)]
Revert what I thought was a simple "compile" change for r53473, but causes Wireshark to crash at startup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53474
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 12:16:49 +0000 (12:16 +0000)]
Walk list of protocol strings to determine which protocols are present in a packet rather than rely on protocol specific items in packet_info in an effort to (eventually) reduce packet_info members.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53473
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Thu, 21 Nov 2013 11:20:06 +0000 (11:20 +0000)]
Indicate fragments in info column
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53472
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Thu, 21 Nov 2013 09:33:01 +0000 (09:33 +0000)]
Do not add an unknown tag item for End-of-options
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53471
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 21 Nov 2013 08:42:21 +0000 (08:42 +0000)]
Detect out-of-bounds when handling zero terminated strings from a TvbRange.
This avoids a wireshark crash.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53470
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 21 Nov 2013 05:55:30 +0000 (05:55 +0000)]
Add ui_stats_tree_dialog.h to the list of generated headers not to
install; that should fix the "make distclean" errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53469
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 03:26:42 +0000 (03:26 +0000)]
Fix memory leak from formatted string.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53468
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 21 Nov 2013 02:12:56 +0000 (02:12 +0000)]
Fix buildbing ui/qt/wireshark-tap-register.c with autotools.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53467
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 21 Nov 2013 02:05:36 +0000 (02:05 +0000)]
Try to get qmake to create wireshark-tap-register.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53466
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 21 Nov 2013 01:31:36 +0000 (01:31 +0000)]
Add the new stats tree.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53465
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 21 Nov 2013 01:28:17 +0000 (01:28 +0000)]
Add a statistics tree dialog.
Add menu items for each corresponding item in gtk/main_menubar.c that
calls gtk_stats_tree_cb(). Hopefully that's everything. Note that we use
quite a bit less code than the GTK+ flavor and why we might not want to
do that. Change a few things in ui/qt/CMakeLists.txt to more closely
match the GTK+ version. Add plumbing for tap registrations in
CMakeLists.txt and Makefile.am. Add the ability to copy text as CSV or
YAML.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53464
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 01:18:23 +0000 (01:18 +0000)]
USB CCID and PN532_HCI can be now used in Decode As. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445)
From Michal Labedzki
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53463
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Thu, 21 Nov 2013 01:12:25 +0000 (01:12 +0000)]
Fix DecodeBy priorities. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445)
From Michal Labedzki.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53462
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 21 Nov 2013 00:38:22 +0000 (00:38 +0000)]
strncpy() consideered unsafe (it doesn't, for example, guarantee that
the result is null-terminated); use g_strlcpy() (which *does* guarantee
null termination) instead.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53461
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 21 Nov 2013 00:34:38 +0000 (00:34 +0000)]
We don't need "ws_symbol_export.h" if we're not using anything from it;
see whether that's what's currently causing Windows build problems.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53460
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 21 Nov 2013 00:28:33 +0000 (00:28 +0000)]
GTK3 >= 3.10 will fail building if deprecation warnings are on.
Fix this for the cmake build by disabling these warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53459
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Thu, 21 Nov 2013 00:18:12 +0000 (00:18 +0000)]
Remove one accidentally remaining reference to emem in XMPP utils.
Kill a bunch of now-unused emem tree code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53458
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Wed, 20 Nov 2013 23:32:02 +0000 (23:32 +0000)]
Fix Bug #9457 Update BACnet vendor list
Based on attachment #12139 (diff for adding the table) by rtsking117,
but keep original formatting and encoding (ASCII).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53457
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Wed, 20 Nov 2013 22:51:14 +0000 (22:51 +0000)]
Fix minor issue introduced with conversion to new expert API in r51688.
Specifically, proto_tree_add_expert() must take an actual tree node (for example
from proto_item_add_subtree()) and cannot take just any old item node. The
original intent (before the conversion) appeared to be just to put it on the
tree, so do that.
Another assertion gone from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9406
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53456
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 20 Nov 2013 22:38:15 +0000 (22:38 +0000)]
status, in main, is now used only if we have libpcap.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53455
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 20 Nov 2013 22:36:05 +0000 (22:36 +0000)]
libui is an static library, not a dynamic library, so the WS_DLL_PUBLIC
stuff isn't necessary and doesn't work on Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53454
f5534014-38df-0310-8fa8-
9805f1628bb7
eapache [Wed, 20 Nov 2013 22:34:36 +0000 (22:34 +0000)]
As per suggestion of Mike Morrin via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9406
The GSM CBCH assertion should be <= 48 not <48. Fixes one of the failing
assertions with the capture from that bug.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53453
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 20 Nov 2013 21:00:55 +0000 (21:00 +0000)]
Add support for a new type of frame data record seen in a k18 file, and
handle that file not ending with a 2-byte 0xffff end-of-file record.
This fixes bug 9455, although it doesn't add support for reading an
"index" file for a capture that's in multiple .rf5 files, which is a
separate issue noted in that bug.
It also doesn't attempt to figure out what the data in the new record
type following the data that appears to be the same as that in the other
data record format but preceding the actual packet data is.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53452
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Wed, 20 Nov 2013 20:36:22 +0000 (20:36 +0000)]
Mark another parameter as unused
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53451
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 20 Nov 2013 20:17:33 +0000 (20:17 +0000)]
Add code to dump part of a record as ASCII, and use it to dump strings
in a source description record, including the stack. Dump some other
fields in those records as well.
Attach separate sequential and random read buffers to the private data
structure, rather than allocating them in various routines (and not
always freeing them) and, in at least one case, allocating a single
*common* buffer for all wth's to use.
Fix some comments (the DS0 mask is 32 bytes long, but gets turned into a
bitmask).
Put in a description of what a "stack file"'s contents look like. Much
of it may be useless to us (for example, we have the notion that TCP has
protocol number 6 built-in...), but the RELATION entries that map from
"BASE" to a protocol could obviate the need to have the user specify a
map from stack file names to starting protocols, and we might be able to
use, for example, entries that map TCP/UDP/SCTP port numbers to
protocols to obviate the need for the user to explicitly use Decode As
or otherwise configure port-to-protocol mappings themselves.
Add a bunch of record length checks before we fetch data from records.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53450
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Wed, 20 Nov 2013 20:07:42 +0000 (20:07 +0000)]
Add explicit casts to please GCC
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53449
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Wed, 20 Nov 2013 20:05:17 +0000 (20:05 +0000)]
Add explicit casts to please GCC
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53448
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 20 Nov 2013 19:52:21 +0000 (19:52 +0000)]
Mark parameter as unused
packet-ber.c:391: warning: unused parameter 'table_name'
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53447
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Wed, 20 Nov 2013 19:23:02 +0000 (19:23 +0000)]
Provide "Decode As" functionality through dissectors themselves instead of the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450)
The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table. When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog. Any GUI (GTK+/Qt/tshark) can just hook into the "decode as list" to see what can be provided.
This patch includes the GUI portion of the functionality (including packet-dcerpc.[ch] because it had some GUI dependencies that are now removed).
Other notes:
1. Some "GUI text" (UTF8_LEFTWARDS_ARROW and similar) made their way into the dissector code. Not sure how necessary it is and if reformatting the strings to avoid the macros is desired (TCP/UDP use it, SCTP doesn't).
2. I converted the SCTP functionality to have 2 tabs (instead of radio button), currently both are labeled "Transport" which could be confusing to users. Naming suggestions welcome (as well as for naming of tabs from other dissectors).
3. BER and DCERPC have more opportunity to use Decode As now that they are selected based on dissector presense, not packet_info values.
4. Catapult DCT2000 populates pinfo->ipproto, yet under new design will not show up to do Decode As. Should a "decode as item" be created for it?
5. BER dissector doesn't have Clear/Show Current functionality working (never did)
6. Bluetooth (in old design) could have been used "capture wide" instead of single packet (creating tabs of values not present in current packet), which goes against what I believe to be in the intent of Decode As, but I'm willing to hear counter-arguments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53446
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Wed, 20 Nov 2013 19:17:08 +0000 (19:17 +0000)]
Provide "Decode As" functionality through dissectors themselves instead of the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450)
The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table. When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog.
This patch includes just the dissector portion of the functionality (minus packet-dcerpc.[ch] because it has hooks to the current GUI)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53445
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 20 Nov 2013 18:38:48 +0000 (18:38 +0000)]
From Jakub via wireshark.org/lists/wireshark-dev/201311/msg00153.html
Wrong offset incrementation in r53416 (Add status_request_v2 TLS extension dissection (RFC6961))
From me
Fix encoding args
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53444
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Wed, 20 Nov 2013 02:28:14 +0000 (02:28 +0000)]
Convert ethertype() function into a pure dissector. Bug 9454 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9454)
The main driving force for this was my new Decode As functionality (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450) that wants a dissector/subdissector table relationship for all dissectors wanting to use Decode As functionality. The ethertype() function provides the value to the "ethertype" subdissector table, so I think it should be matched to a dissector. Only odd side effect is the display filter of "ethertype" returns no packets because there is no "item" associated with the dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53443
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Wed, 20 Nov 2013 01:44:06 +0000 (01:44 +0000)]
Remove a few (now unused) variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53442
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 19 Nov 2013 22:22:16 +0000 (22:22 +0000)]
Update URL for the Tektronix manual, and fix a typo in the same comment.
Dump the raw contents of records as hex and ASCII, not just hex.
Sort the record types, and add a new one for a type we've seen in a k18
file and about which we know nothing.
For unknown record types, print the type in hex.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53441
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 19 Nov 2013 20:30:31 +0000 (20:30 +0000)]
Set our IPv6 status when we set addresses.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53440
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 19 Nov 2013 20:29:58 +0000 (20:29 +0000)]
Print one YAML item per packet.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53439
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 19 Nov 2013 20:12:51 +0000 (20:12 +0000)]
Fix some problems with the debugging code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53438
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 19 Nov 2013 20:06:47 +0000 (20:06 +0000)]
Fix missing semicolon.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53437
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 19 Nov 2013 20:05:21 +0000 (20:05 +0000)]
Constants that don't fit in 32 bits must be wrapped in
G_GINT64_CONSTANT().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53436
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 19 Nov 2013 19:45:38 +0000 (19:45 +0000)]
Add routines to set the personal file directory paths (personal
configuration file directory and directory in which to save captures),
have the routine to parse -P options use them, and move that routine to
libui.
Have that routine just return a gboolean.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53435
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Tue, 19 Nov 2013 18:20:15 +0000 (18:20 +0000)]
Add dissection of UICC Application Identifier
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53434
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Tue, 19 Nov 2013 18:18:52 +0000 (18:18 +0000)]
Fix a typo
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53433
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Tue, 19 Nov 2013 12:27:09 +0000 (12:27 +0000)]
Fix compilation with Clang (Remove limitation to -fPIE to only C)
/usr/include/qt5/QtCore/qglobal.h:1079:4: error:
"You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC or -fPIE."
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53432
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Tue, 19 Nov 2013 12:27:01 +0000 (12:27 +0000)]
From Glen Parker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9449
Add support for new PostgreSQL (9.3) error/notice message fields
Improves the PostgreSQL protocol dissector by adding support for the new error and notice fields which are new in PG 9.3:
http://www.postgresql.org/docs/9.3/interactive/protocol-error-fields.html
In particular, it adds support for the 'p', 'q', 's', 't', 'c', 'd', and 'n' field codes.
From me :
Fix wrong hf name...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53431
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Tue, 19 Nov 2013 12:26:49 +0000 (12:26 +0000)]
From Ralph Böhme via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9439
Add missing SMB_QUERY_CIFS_UNIX_INFO capability flags
Listed in https://git.samba.org/?p=samba.git;a=blob_plain;f=libcli/smb/smb_unix_ext.h;hb=HEAD
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53430
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Tue, 19 Nov 2013 08:03:31 +0000 (08:03 +0000)]
add editor modelines
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53429
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Tue, 19 Nov 2013 07:56:30 +0000 (07:56 +0000)]
remove unnecessary if(tree) checks
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53428
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Tue, 19 Nov 2013 07:26:01 +0000 (07:26 +0000)]
From DSR Corporation
fix segfault in ZigBee APS tunnel commands
pass the data parameter to subdissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9438
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53427
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Tue, 19 Nov 2013 07:05:34 +0000 (07:05 +0000)]
fix compiler warning about write-only variable
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53426
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 19 Nov 2013 06:06:38 +0000 (06:06 +0000)]
Fix [-Wmissing-prototypes]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53425
f5534014-38df-0310-8fa8-
9805f1628bb7
mmann [Tue, 19 Nov 2013 01:07:28 +0000 (01:07 +0000)]
Remove ppid member from packet_info structure and just pass it to SCTP subdissectors. There are no subdissectors currently in Wireshark source that use the ppid member so any third party dissectors need to update accordingly.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53424
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 19 Nov 2013 00:32:02 +0000 (00:32 +0000)]
The GTK+ "follow stream" dialogs don't support "save as YAML"; put in a
stub case, complete with a "this can't happen" assert failure, to
squelch compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53423
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 19 Nov 2013 00:29:37 +0000 (00:29 +0000)]
#if 0 out an error check that wasn't doing anything interesting for an
error, and put in a pseudo-code call to stand in for error reporting
code.
Fix a signed-vs-unsigned comparison issue.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53422
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 18 Nov 2013 23:39:47 +0000 (23:39 +0000)]
Follow dialog data display improvements.
Change the "Raw" character type to UTF-8. I'm not sure it's possible
to show true raw data in a QTextEdit widget and calling it UTF-8 more
accurately repesents what happens when you pass a char * to a QString.
Add a YAML display. Hopefully Scapy users will find it useful.
Sort the the character display items alphabetically. Make sure we go
back to the top of the buffer when we change the direction or character
set. Be less aggressive about setting focus on the "find text" entry.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53421
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 18 Nov 2013 23:27:06 +0000 (23:27 +0000)]
Terminate a value_string array.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53420
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 18 Nov 2013 22:02:50 +0000 (22:02 +0000)]
From Matt Texier Enhance BGP Dissector : AS_PATH
Full rewrite of BGP AS_PATH attribut using items and a clearer (and documentated !) heuristic
From me
Fix indent
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53419
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 18 Nov 2013 21:42:43 +0000 (21:42 +0000)]
It's incremented, so not a const.
Clean up indentation while we're at it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53418
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 18 Nov 2013 20:27:04 +0000 (20:27 +0000)]
From Peter Wu
Add RFC6066 CertificateUrl TLS extension
This is not supported by OpenSSL or NSS, the extension itself seems
unsafe, but some implementations seem to support it[1].
Untested, no capture available.
[1]: http://www.ietf.org/mail-archive/web/tls/current/msg02535.html
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53417
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 18 Nov 2013 20:26:55 +0000 (20:26 +0000)]
From Peter Wu
Add status_request_v2 TLS extension dissection (RFC6961)
Besides adding status_request_v2 support, this patch moves the
Certificate Status Type from the OCSP Status subtree to its parent
(the extension tree). This is needed because this type applies to all
OCSPResponse fields.
The check for "tree != NULL" seems unnecessary here, it was not
clarified in the original patch so I removed it.
From me
Fix typo
Remove unneeded tvb_ensure_bytes_exist
Use proto_tree_add_item
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53416
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 18 Nov 2013 20:26:46 +0000 (20:26 +0000)]
From Peter Wu
Add TLS StatusRequest (RFC6066) ClientHello extension recognition
Only empty Responder ID lists and empty Request Extensions are
implemented. I could not really find existing clients or servers that
populate these.
This status_request extension has a different signature for a
ClientHello and ServerHello, in the latter the extension_data field
must be empty. Therefore an additional parameter is added to
dissect_ssl3_hnd_hello_ext.
From me :
Fix typo
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53415
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 18 Nov 2013 20:26:37 +0000 (20:26 +0000)]
From Peter Wu
Support for EncryptedExtensions handshake type (a.k.a. NextProtocol)
Based on https://tools.ietf.org/html/draft-agl-tls-nextprotoneg-04
From me
Fix warning found by fix-encoding-args
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53414
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 18 Nov 2013 20:26:27 +0000 (20:26 +0000)]
Remove duplicate (wireshark_application.h) and unused #include files
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53413
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 18 Nov 2013 17:41:00 +0000 (17:41 +0000)]
1.11.2 → 1.11.3.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53412
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 18 Nov 2013 16:44:16 +0000 (16:44 +0000)]
Build 1.11.2.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53411
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Mon, 18 Nov 2013 11:16:32 +0000 (11:16 +0000)]
fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9448
pass data parameter to afp dissector
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53410
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 18 Nov 2013 07:58:16 +0000 (07:58 +0000)]
I guess "v4" is 1.3 and "v5" is 1.4. I'm sure there's a reason why that
makes sense of a sort....
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53409
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 18 Nov 2013 07:54:48 +0000 (07:54 +0000)]
You don't get to have three separate protocols all with the name
"OpenFlow 1.3".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53408
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Mon, 18 Nov 2013 07:42:23 +0000 (07:42 +0000)]
Beginnings of CheckAPI support. More diligence needed
(need to seperate generated files into their own variables).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53407
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Mon, 18 Nov 2013 07:25:12 +0000 (07:25 +0000)]
Fix some warnings that were really errors.
It would really help to fix the remaining warnings so that these
files can be compiled with -Werror, which gets me to the quesiton:
Is this code still maintained in some form or was it an interesting
experiment that has been terminated?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53406
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 18 Nov 2013 06:24:27 +0000 (06:24 +0000)]
From Zoltán Lajos Kis:
Start of OpenFlow 1.4 dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53405
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 18 Nov 2013 06:22:09 +0000 (06:22 +0000)]
Fix [-Wmissing-prototypes]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53404
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 18 Nov 2013 00:51:22 +0000 (00:51 +0000)]
Get rid of unused trivial wrapper routine.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53403
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sun, 17 Nov 2013 21:25:00 +0000 (21:25 +0000)]
Don't include epan/filesystem.h any more
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53402
f5534014-38df-0310-8fa8-
9805f1628bb7
martink [Sun, 17 Nov 2013 17:51:59 +0000 (17:51 +0000)]
add a cast to fix compiler warning
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53401
f5534014-38df-0310-8fa8-
9805f1628bb7
pascal [Sun, 17 Nov 2013 17:00:11 +0000 (17:00 +0000)]
Fix the number of highlighted bytes in case of unaligned PER constrained integer
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53400
f5534014-38df-0310-8fa8-
9805f1628bb7