Commit Graph

50223 Commits

Author SHA1 Message Date
Michael Mann 237c580bd7 Replace packet_info->ipproto with packet_info->layers loop to determine TCP/UDP.
svn path=/trunk/; revision=53503
2013-11-22 02:49:00 +00:00
Gerald Combs 635a5b196c Fix qmake builds on Unix.
tap_register.variable_out adds wireshark-tap-register.c to SOURCES. We
don't have to add it again ourselves.

svn path=/trunk/; revision=53502
2013-11-22 02:11:40 +00:00
Gerald Combs 629d5f1697 Mark a parameter unused.
svn path=/trunk/; revision=53501
2013-11-22 01:25:17 +00:00
Gerald Combs e5c9616fd2 Remove a commented-out duplicate dissector_table definition.
svn path=/trunk/; revision=53500
2013-11-22 01:11:49 +00:00
Gerald Combs 78266fe17e Add an initial "Decode As" dialog. Currently read-only.
Fixup some of the Statistics menu items.

svn path=/trunk/; revision=53499
2013-11-22 01:07:36 +00:00
Gerald Combs 70709e1b35 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().

svn path=/trunk/; revision=53498
2013-11-22 00:20:23 +00:00
Bill Meier fc5adb9b66 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.

svn path=/trunk/; revision=53497
2013-11-21 23:21:49 +00:00
Bill Meier 9f485b9e89 #if 0 some unused vars found by CLANG
svn path=/trunk/; revision=53496
2013-11-21 23:17:59 +00:00
Martin Kaiser a5317f8646 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

svn path=/trunk/; revision=53495
2013-11-21 22:30:55 +00:00
Martin Kaiser 36f11a79cc next unprocessed descriptor 0xFF means that
all descriptors were processed

svn path=/trunk/; revision=53494
2013-11-21 21:54:31 +00:00
Guy Harris 63c8b20360 Widen the Ethertype to a guint, to avoid compiler warnings.
Fix indentation while we're at it.

svn path=/trunk/; revision=53493
2013-11-21 20:50:13 +00:00
Guy Harris dad2b94703 Get rid of unused variable.
svn path=/trunk/; revision=53492
2013-11-21 20:33:28 +00:00
Gerald Combs fd51955989 Tap listeners have to be registered before we read our prefs.
svn path=/trunk/; revision=53491
2013-11-21 20:24:01 +00:00
Jeff Morriss ebc4cbc74e Attempt to fix Qt dependencies for SUSE.
svn path=/trunk/; revision=53490
2013-11-21 20:20:29 +00:00
Michael Mann eabaddaca9 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".

svn path=/trunk/; revision=53489
2013-11-21 20:08:20 +00:00
Michael Mann 9fa6c9fb80 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.
svn path=/trunk/; revision=53488
2013-11-21 19:51:17 +00:00
Bill Meier 82f7344f45 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.


svn path=/trunk/; revision=53487
2013-11-21 19:11:47 +00:00
Guy Harris a36046c784 Get rid of C++ comments.
svn path=/trunk/; revision=53486
2013-11-21 18:50:44 +00:00
Guy Harris a1f2a76427 #if 0 out some currently-unused variables and the code that sets them,
to squelch compiler warnings.

svn path=/trunk/; revision=53485
2013-11-21 18:48:36 +00:00
Bill Meier 7727623d8c 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.

svn path=/trunk/; revision=53484
2013-11-21 18:46:40 +00:00
Bill Meier de60c9c76b (Trivial) Formatting & whitespace changes ....
svn path=/trunk/; revision=53483
2013-11-21 18:37:26 +00:00
Bill Meier 13124b7b8b Constify two vars;
Add editor modelines;
Rework some whitespace.

svn path=/trunk/; revision=53482
2013-11-21 18:03:10 +00:00
Gerald Combs 694d2cb903 Add a note about UTF-8.
svn path=/trunk/; revision=53481
2013-11-21 17:44:12 +00:00
Bill Meier 0f5f63bbf0 Constify a character array;
Fix a typo;
Add editor modelines.

svn path=/trunk/; revision=53480
2013-11-21 17:41:17 +00:00
Gerald Combs 22f8920d56 Remove an unused function.
svn path=/trunk/; revision=53479
2013-11-21 17:39:32 +00:00
Michael Mann f4360dc48c Create separate dissector function for TCP functionality so packet_info->ethertype doesn't need to be used.
svn path=/trunk/; revision=53478
2013-11-21 17:18:11 +00:00
Bill Meier 774b7caa05 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.

svn path=/trunk/; revision=53477
2013-11-21 17:12:05 +00:00
Michael Mann 64c687346b 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.

svn path=/trunk/; revision=53476
2013-11-21 16:42:10 +00:00
Martin Mathieson d5433fd9b6 Cope with empty VWR files (bug 9428)
svn path=/trunk/; revision=53475
2013-11-21 15:42:22 +00:00
Michael Mann 2e983ba89f Revert what I thought was a simple "compile" change for r53473, but causes Wireshark to crash at startup.
svn path=/trunk/; revision=53474
2013-11-21 12:46:31 +00:00
Michael Mann ad1d471b1b 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.
svn path=/trunk/; revision=53473
2013-11-21 12:16:49 +00:00
Pascal Quantin 3894de27f3 Indicate fragments in info column
svn path=/trunk/; revision=53472
2013-11-21 11:20:06 +00:00
Pascal Quantin 2f3d057857 Do not add an unknown tag item for End-of-options
svn path=/trunk/; revision=53471
2013-11-21 09:33:01 +00:00
Stig Bjørlykke 52ce5acbdf Detect out-of-bounds when handling zero terminated strings from a TvbRange.
This avoids a wireshark crash.

svn path=/trunk/; revision=53470
2013-11-21 08:42:21 +00:00
Guy Harris 0604779baa Add ui_stats_tree_dialog.h to the list of generated headers not to
install; that should fix the "make distclean" errors.

svn path=/trunk/; revision=53469
2013-11-21 05:55:30 +00:00
Michael Mann 32b66a9671 Fix memory leak from formatted string.
svn path=/trunk/; revision=53468
2013-11-21 03:26:42 +00:00
Gerald Combs daa8b5e046 Fix buildbing ui/qt/wireshark-tap-register.c with autotools.
svn path=/trunk/; revision=53467
2013-11-21 02:12:56 +00:00
Gerald Combs 26325020a2 Try to get qmake to create wireshark-tap-register.c.
svn path=/trunk/; revision=53466
2013-11-21 02:05:36 +00:00
Gerald Combs 31b216d8ce Add the new stats tree.
svn path=/trunk/; revision=53465
2013-11-21 01:31:36 +00:00
Gerald Combs ea28298e96 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.

svn path=/trunk/; revision=53464
2013-11-21 01:28:17 +00:00
Michael Mann 3111b6c889 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

svn path=/trunk/; revision=53463
2013-11-21 01:18:23 +00:00
Michael Mann 091fd3d12b Fix DecodeBy priorities. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445)
From Michal Labedzki.

svn path=/trunk/; revision=53462
2013-11-21 01:12:25 +00:00
Guy Harris 8b8cf5671d strncpy() consideered unsafe (it doesn't, for example, guarantee that
the result is null-terminated); use g_strlcpy() (which *does* guarantee
null termination) instead.

svn path=/trunk/; revision=53461
2013-11-21 00:38:22 +00:00
Guy Harris 1ee50439ca 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.

svn path=/trunk/; revision=53460
2013-11-21 00:34:38 +00:00
Jörg Mayer 254614fe73 GTK3 >= 3.10 will fail building if deprecation warnings are on.
Fix this for the cmake build by disabling these warnings.

svn path=/trunk/; revision=53459
2013-11-21 00:28:33 +00:00
Evan Huus 123caff957 Remove one accidentally remaining reference to emem in XMPP utils.
Kill a bunch of now-unused emem tree code.

svn path=/trunk/; revision=53458
2013-11-21 00:18:12 +00:00
Jakub Zawadzki 50aa247c72 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).

svn path=/trunk/; revision=53457
2013-11-20 23:32:02 +00:00
Evan Huus a252026213 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

svn path=/trunk/; revision=53456
2013-11-20 22:51:14 +00:00
Guy Harris bd625113ea status, in main, is now used only if we have libpcap.
svn path=/trunk/; revision=53455
2013-11-20 22:38:15 +00:00
Guy Harris 44b4d2aab0 libui is an static library, not a dynamic library, so the WS_DLL_PUBLIC
stuff isn't necessary and doesn't work on Windows.

svn path=/trunk/; revision=53454
2013-11-20 22:36:05 +00:00