Commit graph

18813 commits

Author SHA1 Message Date
Evan Huus
1db1b8e2bb Convert ASN1 dissectors from ep_address_to_str to address_to_str. Clean up a bit
of ansi_tcap code while in the neighbourhood.

svn path=/trunk/; revision=53530
2013-11-23 22:37:33 +00:00
Evan Huus
df1aec4a6b Remove old (2009) and no-longer-necessary compatibility macro.
svn path=/trunk/; revision=53527
2013-11-23 22:03:48 +00:00
Michael Mann
ea63042f9b Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
From Michal Labedzki 

svn path=/trunk/; revision=53525
2013-11-23 21:41:08 +00:00
Michael Mann
55c6869980 Remove ip_ttl from packet_info structure.
Part of the fix includes having the IPv6 dissector populate as much of a ws_ip structure as possible to pass to subdissectors of the "ip.proto" table, so the ttl value can be picked up.

svn path=/trunk/; revision=53522
2013-11-23 19:16:05 +00:00
Pascal Quantin
9150571bf3 Check the packet length when using the "Force decoding of unknown USB control data as MBIM" option to reduce false positives.
Align text in info column.

svn path=/trunk/; revision=53521
2013-11-23 12:30:19 +00:00
Michael Mann
9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Martin Mathieson
65e3e91208 Tweak filter names for expert items, mostly to consistently use - rather than _
svn path=/trunk/; revision=53514
2013-11-22 17:18:11 +00:00
Martin Mathieson
a906b1f5fe Tidy up some TODOs
svn path=/trunk/; revision=53513
2013-11-22 16:52:28 +00:00
Alexis La Goutte
2350754b88 Fix unused-const-variable error when build with clang 3.4
svn path=/trunk/; revision=53511
2013-11-22 14:52:15 +00:00
Alexis La Goutte
14ee1a5a86 Fix unused-const-variable error when build with clang 3.4
svn path=/trunk/; revision=53510
2013-11-22 14:52:04 +00:00
Alexis La Goutte
0d20064172 Fix unused-const-variable error when build with clang 3.4
svn path=/trunk/; revision=53509
2013-11-22 14:51:52 +00:00
Alexis La Goutte
f39f943db0 Fix unused-const-variable error when build with clang 3.4 (with ugly hack... Maybe remove all ugly INIT_FIELD/ ADD_FIELD macro)
svn path=/trunk/; revision=53508
2013-11-22 14:51:43 +00:00
Pascal Quantin
cebc175814 Make use of ctrl_ack_vals value_string array
svn path=/trunk/; revision=53506
2013-11-22 11:22:46 +00:00
Michael Mann
9ba190f2a5 Create multiple dissection functions if packet_info->ipproto is used to distinguish behavior.
svn path=/trunk/; revision=53504
2013-11-22 02:52:41 +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
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
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
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
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
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
Michael Mann
32b66a9671 Fix memory leak from formatted string.
svn path=/trunk/; revision=53468
2013-11-21 03:26:42 +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
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
Evan Huus
3b6573c2fb 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.

svn path=/trunk/; revision=53453
2013-11-20 22:34:36 +00:00
Pascal Quantin
ff6a590edb Mark another parameter as unused
svn path=/trunk/; revision=53451
2013-11-20 20:36:22 +00:00
Pascal Quantin
564b444eb3 Add explicit casts to please GCC
svn path=/trunk/; revision=53449
2013-11-20 20:07:42 +00:00
Pascal Quantin
61a4e7d46d Add explicit casts to please GCC
svn path=/trunk/; revision=53448
2013-11-20 20:05:17 +00:00
Anders Broman
304eba4d95 Mark parameter as unused
packet-ber.c:391: warning: unused parameter 'table_name'

svn path=/trunk/; revision=53447
2013-11-20 19:52:21 +00:00
Michael Mann
01c8945438 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.

svn path=/trunk/; revision=53446
2013-11-20 19:23:02 +00:00
Michael Mann
76ab93ea94 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)

svn path=/trunk/; revision=53445
2013-11-20 19:17:08 +00:00
Alexis La Goutte
91b972ae5e From Jakub via http://www.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

svn path=/trunk/; revision=53444
2013-11-20 18:38:48 +00:00
Michael Mann
f34e11fabe 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.


svn path=/trunk/; revision=53443
2013-11-20 02:28:14 +00:00
Guy Harris
bfc1e51d2d Constants that don't fit in 32 bits must be wrapped in
G_GINT64_CONSTANT().

svn path=/trunk/; revision=53436
2013-11-19 20:05:21 +00:00
Pascal Quantin
935a4debb1 Add dissection of UICC Application Identifier
svn path=/trunk/; revision=53434
2013-11-19 18:20:15 +00:00
Pascal Quantin
5064834661 Fix a typo
svn path=/trunk/; revision=53433
2013-11-19 18:18:52 +00:00
Alexis La Goutte
11b3ae8653 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...

svn path=/trunk/; revision=53431
2013-11-19 12:27:01 +00:00