Gerald Combs [Tue, 15 Apr 2014 16:31:24 +0000 (09:31 -0700)]
Build 1.11.3.
Change-Id: I8c8f1c22a2cba97e69b27e5fb0b4de9981668966
Reviewed-on: https://code.wireshark.org/review/1153
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Alexis La Goutte [Tue, 15 Apr 2014 14:19:20 +0000 (16:19 +0200)]
Fix warning when build with -Wdocumentation
epan/wmem/wmem_strutl.h:85:63: error: parameter 'str' is already documented [-Werror,-Wdocumentation]
epan/wmem/wmem_strutl.h:85:27: note: previous documentation
epan/wmem/wmem_strutl.h:90:39: error: parameter 'str' is already documented [-Werror,-Wdocumentation]
epan/wmem/wmem_strutl.h:85:57: note: previous documentation
epan/wmem/wmem_strutl.h:83:11: error: parameter 'allocator:' not found in the function declaration
epan/wmem/wmem_strutl.h:83:11: note: did you mean 'allocator'?
epan/wmem/wmem_strutl.h:84:11: error: parameter 'str:' not found in the function declaration [-Werror,-Wdocumentation]
epan/wmem/wmem_strutl.h:85:11: error: parameter 'len:' not found in the function declaration [-Werror,-Wdocumentation]
epan/wmem/wmem_strutl.h:85:11: note: did you mean 'len'?
Change-Id: Id2888c5967c94c48f9b53957c8be361bbebd3488
Reviewed-on: https://code.wireshark.org/review/1151
Reviewed-by: Evan Huus <eapache@gmail.com>
Alexis La Goutte [Sun, 13 Apr 2014 18:27:05 +0000 (20:27 +0200)]
Update French translation
Change-Id: If552907a2eb0828198e912fa5c2628efa7190f20
Reviewed-on: https://code.wireshark.org/review/1119
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Bill Meier [Tue, 15 Apr 2014 14:25:51 +0000 (10:25 -0400)]
Fix "might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]" warning from gcc 4.9.
Change-Id: I0d8f2a03d615840a1733602d0a5a6524caba6ff5
Reviewed-on: https://code.wireshark.org/review/1152
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Martin Mathieson [Mon, 14 Apr 2014 21:27:32 +0000 (23:27 +0200)]
LTE RRC: break the sr-configIndex down into periodicity and subframe offset
Change-Id: I5e153ebba9957f3dc5551f540cf333a1d0ff89f7
Reviewed-on: https://code.wireshark.org/review/1141
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 20:27:10 +0000 (22:27 +0200)]
Update .gitignore to ignore doxygen generate file/directory (wsar_html...)
Change-Id: I3d45c03f923dcc1c9216b8b102235221e8e3d556
Reviewed-on: https://code.wireshark.org/review/1140
Reviewed-by: Evan Huus <eapache@gmail.com>
Shu Shen [Mon, 14 Apr 2014 23:11:27 +0000 (16:11 -0700)]
Fix typo in packet-openflow_v1 and v5
Change-Id: Iefc02123447edecbd02cd9a31fff0f412edc8461
Signed-off-by: Shu Shen <shu.shen@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1148
Reviewed-by: Evan Huus <eapache@gmail.com>
Shu Shen [Mon, 14 Apr 2014 23:04:50 +0000 (16:04 -0700)]
Fix typo for packet-openflow_v4.c, Unknown Message Type
Change-Id: I6b416785f99c9a333d799188f06637d6643b4a38
Signed-off-by: Shu Shen <shu.shen@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1147
Reviewed-by: Evan Huus <eapache@gmail.com>
Guy Harris [Mon, 14 Apr 2014 22:43:03 +0000 (15:43 -0700)]
Put the system ID in the top-level items for neighbors.
Add a tvb_print_system_id() routine, and use that in various ISIS
dissectors, while we're at it.
Change-Id: I31b6b9ea8faf2b4849f974ec7ed27fbdd14b91ef
Reviewed-on: https://code.wireshark.org/review/1145
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 14 Apr 2014 22:22:50 +0000 (15:22 -0700)]
Call each item in the Extended IS Reachability CLV an "IS Neighbor".
This makes it a bit more like the (un-extended) Reachability CLVs.
Also, just make the top-level items just a text field, just like the
top-level items for neighbors in the (un-extended) Reachability CLVs.
Rename the system IDs to be "... neighbor ID", not just "neighbor"; the
top-level items hold all the information for the neighbor, and the
system ID for the neighbor is just one of those pieces of information.
Change-Id: I72182dea496f8cfa6048cff3b0d2474df8f31282
Reviewed-on: https://code.wireshark.org/review/1144
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Mon, 14 Apr 2014 16:53:01 +0000 (09:53 -0700)]
Release note updates for 1.11.3.
Change-Id: I16b70456b86fbc83b791186dd6e1a7e815815e0e
Reviewed-on: https://code.wireshark.org/review/1143
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Mon, 14 Apr 2014 21:52:25 +0000 (14:52 -0700)]
You can't use proto_item_set_len() to make an item unknown-length.
You also shouldn't use an item for one *element* of a structure to
represent the entire structure.
Fix both of those.
Change-Id: Id1711238ebec02f135c404ac001aa51d783b3c69
Reviewed-on: https://code.wireshark.org/review/1142
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Mon, 14 Apr 2014 06:59:07 +0000 (08:59 +0200)]
Fix Argument with 'nonnull' attribute passed null found by Clang
Change-Id: I9b8a6c37e4ed589ac3066ec9cbb1b63a9f30a12b
Reviewed-on: https://code.wireshark.org/review/1097
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 19:21:42 +0000 (21:21 +0200)]
Upgrade doxygen configuration (with doxyen 1.8)
With doxygen -u doxygen_global.cfg
Fix warning
Warning: Tag `SYMBOL_CACHE_SIZE' at line 290 of file doxygen_global.cfg has become obsolete.
To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u"
Warning: Tag `SHOW_DIRECTORIES' at line 490 of file doxygen_global.cfg has become obsolete.
To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u"
Warning: Tag `HTML_ALIGN_MEMBERS' at line 847 of file doxygen_global.cfg has become obsolete.
To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u"
Warning: Tag `USE_INLINE_TREES' at line 1032 of file doxygen_global.cfg has become obsolete.
To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u"
Change-Id: Ic0b5dda7f4bcaa17b7bf915928a938e614d54f30
Reviewed-on: https://code.wireshark.org/review/1139
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 19:15:33 +0000 (21:15 +0200)]
Fix warning when generate documentation (doxygen)
ui/decode_as_utils.h:42: Warning: The following parameters of decode_build_reset_list(const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data) are not documented:
parameter 'selector_type'
Change-Id: I8353dae120e87c9651c6611924c1fc652436146d
Reviewed-on: https://code.wireshark.org/review/1138
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 19:15:12 +0000 (21:15 +0200)]
Fix warning when generate documentation (doxygen)
ui/gtk/gui_stat_menu.h:42: Warning: The following parameters of register_menu_bar_menu_items(const char *gui_path, const char *name, const gchar *stock_id, const char *label, const char *accelerator, const gchar *tooltip, gpointer callback, gpointer callback_data, gboolean enabled, gboolean(*selected_packet_enabled)(frame_data *, struct epan_dissect *, gpointer callback_data), gboolean(*selected_tree_row_enabled)(field_info *, gpointer callback_data)) are not documented:
parameter 'gui_path'
parameter 'label'
parameter 'accelerator'
parameter 'tooltip'
parameter 'enabled'
Change-Id: I422d767741b29b8722c85a4ef97186d599d802c3
Reviewed-on: https://code.wireshark.org/review/1137
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 18:25:25 +0000 (20:25 +0200)]
Fix warning when generate documentation (doxygen)
ui/gtk/gui_utils.h:277: Warning: argument 'parent' of command @param is not found in the argument list of pixbuf_to_widget(const guint8 *pb_data)
ui/gtk/gui_utils.h:277: Warning: argument 'xpm' of command @param is not found in the argument list of pixbuf_to_widget(const guint8 *pb_data)
Change-Id: I9182a6f8c85b69bd8b0bab7e03af441dee31fc1d
Reviewed-on: https://code.wireshark.org/review/1136
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 18:23:59 +0000 (20:23 +0200)]
Fix warning when generate documentation (doxygen)
pcapio.h:65: Warning: The following parameters of pcapng_write_session_header_block(FILE *pfile, const char *comment, const char *hw, const char *os, const char *appname, guint64 section_length, guint64 *bytes_written, int *err) are not documented:
parameter 'err'
Change-Id: I0eaa55a44436de5b9687c9b7846c199fe77d98e4
Reviewed-on: https://code.wireshark.org/review/1135
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 18:22:58 +0000 (20:22 +0200)]
Fix warning when generate documentation (doxygen)
airpcap.h:422: Warning: unable to resolve reference to `radiotap' for \ref command
airpcap.h:443: Warning: unable to resolve reference to `radiotap' for \ref command
Change-Id: I40028cbf16ba7a3a3da5fd84abf453e4b2d39b75
Reviewed-on: https://code.wireshark.org/review/1134
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 18:21:08 +0000 (20:21 +0200)]
Fix warning when generate documentation (doxygen)
build/epan/proto.h:384: warning: Found unknown command `\uXXXX'
Change-Id: Ic42730e49ba9b956090269a3b80ffd7a87da33d3
Reviewed-on: https://code.wireshark.org/review/1133
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 18:20:24 +0000 (20:20 +0200)]
Fix warning when generate documentation (doxygen)
ui/packet_list_utils.h:32: warning: argument 'IN' of command @param is not found in the argument list of right_justify_column(gint col, capture_file *cf)
ui/packet_list_utils.h:32: warning: argument 'IN' of command @param is not found in the argument list of right_justify_column(gint col, capture_file *cf)
ui/packet_list_utils.h:32: warning: The following parameters of right_justify_column(gint col, capture_file *cf) are not documented:
parameter 'col'
parameter 'cf'
ui/packet_list_utils.h:42: warning: argument 'IN' of command @param is not found in the argument list of resolve_column(gint col, capture_file *cf)
ui/packet_list_utils.h:42: warning: argument 'IN' of command @param is not found in the argument list of resolve_column(gint col, capture_file *cf)
ui/packet_list_utils.h:42: warning: The following parameters of resolve_column(gint col, capture_file *cf) are not documented:
parameter 'col'
parameter 'cf'
Change-Id: I15c7046a36cc72d9904002946eab4dec81ab6861
Reviewed-on: https://code.wireshark.org/review/1132
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 18:16:40 +0000 (20:16 +0200)]
Fix warning when generate documentation (doxygen)
epan/wmem/wmem_strutl.h:82: warning: Found unknown command `\allocator'
epan/wmem/wmem_strutl.h:82: warning: Found unknown command `\allocator'
epan/wmem/wmem_strutl.h:80: warning: Found unknown command `\str'
epan/wmem/wmem_strutl.h:81: warning: Found unknown command `\len'
epan/wmem/wmem_strutl.h:81: warning: Found unknown command `\str'
epan/wmem/wmem_strutl.h:81: warning: Found unknown command `\st
Change-Id: I0c3908f0e4aa84cc20fad954638b0cb10b1d6dee
Reviewed-on: https://code.wireshark.org/review/1131
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 17:17:06 +0000 (19:17 +0200)]
Fix warning when generate documentation (doxygen)
wireshark/epan/wmem/wmem_stack.h:39: Warning: group wmem-stack: ignoring title "Stack-bbab" that does not match old title "Queue"
Change-Id: I9376651d89d9df21aeca82ddb952c230d546169a
Reviewed-on: https://code.wireshark.org/review/1130
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 15:10:06 +0000 (17:10 +0200)]
Fix warning found by -Wunused-const-variable (Clang 3.5)
Change-Id: I246aa28be28194576b4bd58714b2e6ac36f7a29a
Reviewed-on: https://code.wireshark.org/review/1121
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Joseph Huffman [Mon, 18 Nov 2013 16:52:07 +0000 (08:52 -0800)]
Addition of AllJoyn packet dissector. Bug 9361
Change-Id: Ia582732ee27ce9c1e4280afef5a6b3e3be959d23
Reviewed-on: https://code.wireshark.org/review/1127
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Mon, 14 Apr 2014 16:53:47 +0000 (09:53 -0700)]
Pull in some changes from master-1.10/make-version.pl.
Matches versioning behavior in stable branches.
Change-Id: Ic4d451e7e9941b65d24a76bfaf57de2b4fb58239
Reviewed-on: https://code.wireshark.org/review/1124
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Matthieu Texier [Fri, 4 Apr 2014 11:39:18 +0000 (13:39 +0200)]
Add support of RFC 6514 PMSI bgp attribute and tunnel ID decoding
Change-Id: Ia170002fb5af5f6548595688956cc01ec4a72298
Reviewed-on: https://code.wireshark.org/review/960
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Gerald Combs [Mon, 14 Apr 2014 16:06:03 +0000 (09:06 -0700)]
Adjust path width for OS X & Linux.
Change-Id: Icc51e8c3c93f78cbfa0a0aeda3552ceb4c82803d
Reviewed-on: https://code.wireshark.org/review/1122
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Philip Rosenberg-Watt [Mon, 14 Apr 2014 13:43:34 +0000 (07:43 -0600)]
Fixed deprecated tvb_length and tvb_length_remaining.
Change-Id: Icb7b703319f2d76383fe0a52294ca8c2d06bef84
Reviewed-on: https://code.wireshark.org/review/1118
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Kaiser [Mon, 14 Apr 2014 14:07:46 +0000 (16:07 +0200)]
no need for if(tree)
Change-Id: I90a9d2f31c479d1e13f5842be944b67ef67ed6a7
Reviewed-on: https://code.wireshark.org/review/1117
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Mon, 14 Apr 2014 14:04:48 +0000 (16:04 +0200)]
TABs -> spaces
add modelines
Change-Id: Iae34900e61c2b1f58e48d5ec2d2a303b00beb137
Reviewed-on: https://code.wireshark.org/review/1116
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Alexis La Goutte [Mon, 14 Apr 2014 13:42:16 +0000 (15:42 +0200)]
lrelease / lupdate translation files
Change-Id: I2962614ad9d4bd5a263f50e827705133c6c65d9c
Reviewed-on: https://code.wireshark.org/review/1110
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 13:38:15 +0000 (15:38 +0200)]
Fix typo (double at...)
Change-Id: If095b9d01817e4345ae588020cdc3332709c18d0
Reviewed-on: https://code.wireshark.org/review/1109
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 13:36:23 +0000 (15:36 +0200)]
Fix typo (Link size => Link type) in Qt Summary window
Change-Id: I78844161e19eaa88a62417f492ac5e439c6bbac0
Reviewed-on: https://code.wireshark.org/review/1108
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 13:33:04 +0000 (15:33 +0200)]
Fix typo and make buildbot doc happy
Change-Id: I9e60fd8a8353e740c1b57f52daac86b1af1b784f
Reviewed-on: https://code.wireshark.org/review/1106
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Martin Kaiser [Sun, 13 Apr 2014 17:20:38 +0000 (19:20 +0200)]
always get the transfer type from the conversation
Change-Id: Iadd45be615053cd070f69cd836d2a4abb2d5588f
Reviewed-on: https://code.wireshark.org/review/1115
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Sun, 13 Apr 2014 16:25:55 +0000 (18:25 +0200)]
check for is_setup, not for the value of the setup flag
Change-Id: I9fe0f2e180a3ccf13a4db13918a73b1999e29ade
Reviewed-on: https://code.wireshark.org/review/1114
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Sun, 13 Apr 2014 16:54:40 +0000 (18:54 +0200)]
remove device_address parameter from try_dissect_next_protocol()
read the transfer type from the usb conversation instead
Change-Id: I91b835aea32edbf7916c392afc0eb14e711f1baf
Reviewed-on: https://code.wireshark.org/review/1113
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Sun, 13 Apr 2014 16:49:16 +0000 (18:49 +0200)]
remove bus_id parameter from try_dissect_next_protocol()
read the transfer type from the usb conversation instead
Change-Id: I246a64f72b8c38b98337f463ee137e30fc9b504d
Reviewed-on: https://code.wireshark.org/review/1112
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Sun, 13 Apr 2014 16:41:19 +0000 (18:41 +0200)]
remove type parameter from try_dissect_next_protocol()
read the transfer type from the usb conversation instead
Change-Id: Iec4866ac9c58bf576422f4bcb3bc8947bca27f06
Reviewed-on: https://code.wireshark.org/review/1111
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Mon, 14 Apr 2014 13:33:25 +0000 (15:33 +0200)]
path is used only for libsmi and geoip
fix a compile error when they're both unused
Change-Id: I23b341bc02624e3e56320818056ac3cc8cd65b99
Reviewed-on: https://code.wireshark.org/review/1107
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
AndersBroman [Mon, 14 Apr 2014 12:47:30 +0000 (14:47 +0200)]
Fix no previous prototype warnings.
Change-Id: I859597ebc957a58f659800ef63318f94e80feabf
Reviewed-on: https://code.wireshark.org/review/1104
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 12:34:37 +0000 (14:34 +0200)]
Try to make happy Ubuntu Buildbot
../../../epan/wslua/wslua_tree.c: In function 'TreeItem_add_packet_field':
../../../epan/wslua/wslua_tree.c:151:14: error: variable 'tvbr' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]
../../../epan/wslua/wslua_tree.c:154:9: error: variable 'ett' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]
../../../epan/wslua/wslua_tree.c:159:9: error: variable 'nargs' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]
Change-Id: I1720a62613f4bf94ae2f8649a04139a7899fb106
Reviewed-on: https://code.wireshark.org/review/1103
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 06:59:28 +0000 (08:59 +0200)]
Fix Argument with 'nonnull' attribute passed null found by Clang
Change-Id: If1c907308a7c776a6198530663f8dce03839d43b
Reviewed-on: https://code.wireshark.org/review/1098
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Hadriel Kaplan [Sat, 12 Apr 2014 04:32:20 +0000 (00:32 -0400)]
Add tvb_get and proto_tree_add for string-encoded timestamps
This commit adds tvb_get_string_time and proto_tree_add_time_item routines for
getting nstime fields from the tvb when they are encoded in ASCII string form.
The proto_tree_add_time_item routine is also usable for normal
big/little-endian encoded time_t, and has the advantage of retrieving
the value even if there's no proto tree.
It also exposes the routines to Lua, both so that a Lua script can take
advantage of this, but also so I can write a testsuite to test the functions.
Change-Id: I955da10f68f2680e3da3a5be5ad8fdce7ed6808c
Reviewed-on: https://code.wireshark.org/review/1084
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 14 Apr 2014 10:34:10 +0000 (12:34 +0200)]
Enhance translation (rename also pixel => Pixel to avoid similar string...)
Change-Id: Ic2e0ca99382208c13ea2c71c11684c43b34b9988
Reviewed-on: https://code.wireshark.org/review/1099
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Michal Labedzki [Mon, 14 Apr 2014 06:07:58 +0000 (08:07 +0200)]
Increase tap limit to 5000
This will fix "Warn Too many taps queued" information,
while there is more then 100 PDUs to be exported.
For example while exporting Logcat from TCP/IP it is quite
often to have PDU with multiple Logcat PDUs around 1000.
Change-Id: I24d0619e57ae494c836c19c8a67df44503c54318
Reviewed-on: https://code.wireshark.org/review/1096
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Michal Labedzki [Tue, 1 Apr 2014 06:53:39 +0000 (08:53 +0200)]
Fix wtap displayable names
Also fix indentions.
Change-Id: I5440859aaf3ec1dbf416d9da6c1dab71bec803d8
Reviewed-on: https://code.wireshark.org/review/1094
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Michal Labedzki [Mon, 14 Apr 2014 05:59:25 +0000 (07:59 +0200)]
Bluetooth: ATT: Add missing offset calculations
Change-Id: Ia0fe426bff7d48a45d915a18aa679bb8978d2fca
Reviewed-on: https://code.wireshark.org/review/1095
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Sun, 13 Apr 2014 18:31:21 +0000 (20:31 +0200)]
lupdate / lrelease translation file...
Change-Id: I6d93828ece6e62e4885c31d6d4429c652ead9389
Reviewed-on: https://code.wireshark.org/review/1090
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Michal Labedzki [Fri, 11 Apr 2014 15:59:17 +0000 (17:59 +0200)]
Allow FT_BYTES, FT_NONE, FT_STRING use length "-1"
All three types support zero length, so using
-1 (aka length remaining) should be safe.
Change-Id: Ia616d652ce6884f8e12a5ac5782073403810b10b
Reviewed-on: https://code.wireshark.org/review/1072
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Sun, 13 Apr 2014 18:30:42 +0000 (20:30 +0200)]
Enhance translation (rename toolTip to avoid similar string...)
Change-Id: I66a17871829a769fe6ffecb2becbb5f4cc7fa078
Reviewed-on: https://code.wireshark.org/review/1089
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Michael Mann [Mon, 14 Apr 2014 01:08:34 +0000 (21:08 -0400)]
Fix infinite loop. Bug 9986
Change-Id: Idbd22522918f0db131945d2a39f38b963ca3e0c2
Reviewed-on: https://code.wireshark.org/review/1093
Reviewed-by: Michael Mann <mmann78@netscape.net>
Hadriel Kaplan [Thu, 3 Apr 2014 21:42:54 +0000 (17:42 -0400)]
Fix Bug 9951: 'git commit hook isn't calling checkAPIs.pl with arguments for the dissectors'
I recently made a change to packet-rtp.c and inappropriately included
g_error() in it, which the builbots caught during their run of checkAPIs.pl.
But checkAPIs.pl is supposed to catch such things for us before we submit, by
being invoked in the git pre-commit hook.
Apparently though, buildbots call checkAPIs.pl with extra arguments for
different cases... and for packet dissectors it calls it with a '-g abort'
argument, which is how it caught the g_error.
So the "bug" is that the pre-commit hook should invoke checAPIs.pl with that
argument too, for epan/dissectors/packet-*.c files.
Change-Id: Ie8f9dcc55f2248918208dea85a04f67e6bf9829a
Reviewed-on: https://code.wireshark.org/review/953
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Sun, 13 Apr 2014 20:47:53 +0000 (22:47 +0200)]
MBIM: fix dissection of ENVELOPE Sim Toolkit messages
Change-Id: I3e6567e8ebfe83f12a0e2cbb2998b2e43ad2277a
Reviewed-on: https://code.wireshark.org/review/1092
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Sun, 13 Apr 2014 20:39:29 +0000 (22:39 +0200)]
MBIM: add decoding of text based CDMA SMS
Change-Id: Id2497597660bffeff2d98087d6511b91bfd93b1a
Reviewed-on: https://code.wireshark.org/review/1091
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Sun, 13 Apr 2014 16:53:29 +0000 (18:53 +0200)]
Add ENC_ASCII_7BITS encoding
Change-Id: I01ec87ff4181afb5b2de487fd5f5200f8d62f17d
Reviewed-on: https://code.wireshark.org/review/1088
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Gerald Combs [Thu, 10 Apr 2014 22:30:00 +0000 (15:30 -0700)]
Replace QTableWidgets with QLabels + HTML tables.
This lets the user select and copy the folder and plugin data as text.
Add clickable local filesystem URLs while we're at it.
(I suspect that you shouldn't use QTableWidgets unless you're creating a
spreadsheet.)
Change-Id: I45650bd4f4b6215824a4ed70ec80698d0805baba
Reviewed-on: https://code.wireshark.org/review/1064
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Sun, 13 Apr 2014 15:04:54 +0000 (08:04 -0700)]
[Automatic manuf, services and enterprise-numbers update for 2014-04-13]
Change-Id: I0af1de7915bf152ae59e48b4fb2e80c302aa4b39
Reviewed-on: https://code.wireshark.org/review/1085
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Guy Harris [Sat, 12 Apr 2014 22:39:20 +0000 (15:39 -0700)]
Use ftype_name() to get the name of an FT_ value.
That way we don't have to update the hf_types[] value_string if a new
type is added.
Change-Id: If4fd0a8ff2d6b54d0b70140be407dae9c4ab6b3b
Reviewed-on: https://code.wireshark.org/review/1083
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sat, 12 Apr 2014 22:26:34 +0000 (15:26 -0700)]
Get rid of more tvb_get_nstringz* calls.
Add an FT_STRINGZPAD type, for null-padded strings (typically
fixed-length fields, where the string can be up to the length of the
field, and is null-padded if it's shorter than that), and use it. Use
IS_FT_STRING() in more cases, so that less code needs to know what types
are string types.
Add a tvb_get_stringzpad() routine, which gets null-padded strings.
Currently, it does the same thing that tvb_get_string_enc() does, but
that might change if we don't store string values as null-terminated
strings.
Change-Id: I46f56e130de8f419a19b56ded914e24cc7518a66
Reviewed-on: https://code.wireshark.org/review/1082
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pascal Quantin [Sat, 12 Apr 2014 17:19:04 +0000 (19:19 +0200)]
Update E.212 list to Operational Bulletin No. 1047 (1.III.2014)
Change-Id: I6eddb03a0ef541f94fc166a03417a91bb219e235
Reviewed-on: https://code.wireshark.org/review/1081
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Sat, 12 Apr 2014 14:13:36 +0000 (16:13 +0200)]
Add MQTT to release notes
Change-Id: I553698c522b4a1eba370591a4ab788a139f8f221
Reviewed-on: https://code.wireshark.org/review/1080
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Martin Kaiser [Sat, 12 Apr 2014 12:08:41 +0000 (14:08 +0200)]
no need for if(tree)
Change-Id: Ic74a8f080628dc200fe1f5a4d34ff5f9bb60e232
Reviewed-on: https://code.wireshark.org/review/1079
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Sat, 12 Apr 2014 12:07:08 +0000 (14:07 +0200)]
TABs -> spaces
add editor modelines
Change-Id: Ieee4ea5c5043c519c465a4b0570357f2c22e311c
Reviewed-on: https://code.wireshark.org/review/1078
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Alexis La Goutte [Fri, 11 Apr 2014 14:56:38 +0000 (16:56 +0200)]
Fix packet-vp8.c:168:6: warning: redundant redeclaration of 'proto_reg_handoff_vp8' [-Wredundant-decls]
packet-vp8.c:30:6: note: previous declaration of 'proto_reg_handoff_vp8' was here
Change-Id: Ibbae1eeffaa672224e5ea77bda8e207d077b7262
Reviewed-on: https://code.wireshark.org/review/1071
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Sat, 12 Apr 2014 08:53:33 +0000 (01:53 -0700)]
Add Mac Roman and DOS CP437.
Change-Id: Ib96f2cf4ea71cd0cc2c703d58b9d254bf4c1248a
Reviewed-on: https://code.wireshark.org/review/1077
Reviewed-by: Guy Harris <guy@alum.mit.edu>
David Ameiss [Thu, 10 Apr 2014 13:53:48 +0000 (08:53 -0500)]
Fixes for numerous fuzz crashes - bug 9962.
Change-Id: I34fb09b62e79bfadd362c0ade81bec80dd0f14e0
Reviewed-on: https://code.wireshark.org/review/1058
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Shu Shen [Fri, 11 Apr 2014 21:22:56 +0000 (14:22 -0700)]
Adding message type to COL_INFO for multipart messages
Change-Id: I0ae84101c71f31e2d6ab91c7f7b74da81865b8f3
Signed-off-by: Shu Shen <shu.shen@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1075
Reviewed-by: Michael Mann <mmann78@netscape.net>
Evan Huus [Fri, 11 Apr 2014 18:08:14 +0000 (14:08 -0400)]
Fix non-standard format specifiers
C90 permits plain %f for doubles. Thanks to Alexis for pointing this out.
Change-Id: I3f927b0a50e5764c2297c7f9d680c6363ba9fd0e
Reviewed-on: https://code.wireshark.org/review/1073
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Fri, 11 Apr 2014 20:24:23 +0000 (22:24 +0200)]
Fix compilation if not HAVE_LIBGNUTLS and not HAVE_LIBGCRYPT
This was introduced in the previous compilation fix.
Change-Id: I4ec652a2708d90f35f3f00ec2c3261acb3e68397
Reviewed-on: https://code.wireshark.org/review/1074
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Fri, 11 Apr 2014 13:20:00 +0000 (15:20 +0200)]
Fix compilation if HAVE_LIBGNUTLS but not HAVE_LIBGCRYPT.
Also fixed a comment for a #endif for the same defines.
Change-Id: Icbbf619dbaeb1d4d154a5f1a8273f252d35c6981
Reviewed-on: https://code.wireshark.org/review/1070
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Niels de Vos [Fri, 11 Apr 2014 08:47:19 +0000 (10:47 +0200)]
GlusterFS: correctly dissect flags passed with OPEN, CREATE, etc.
RPC/XDR is in big-endian, just like dissect_rpc_uint64() and friends.
Change-Id: I0843e280bd2ffc2c4bd9a5273a7343a17d81ad6a
Reported-by: Xavier Hernandez <xhernandez@datalab.es>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.wireshark.org/review/1066
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Stig Bjørlykke [Fri, 11 Apr 2014 11:13:42 +0000 (13:13 +0200)]
Improved TLS/DTLS Heartbeat Message handling.
Added an expert info for invalid payload length (heartbleed).
Change-Id: I9e09d1ae2b997091bbce2483c098dba7e6631859
Reviewed-on: https://code.wireshark.org/review/1067
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Fri, 11 Apr 2014 11:17:56 +0000 (13:17 +0200)]
Added P1 extension 34.
Change-Id: Iccaaf39d4de21e1a12a26c40a184321a67b41f3e
Reviewed-on: https://code.wireshark.org/review/1068
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Gerald Combs [Fri, 11 Apr 2014 01:25:50 +0000 (18:25 -0700)]
Fix unused variable warnings found by clang.
Change-Id: I31ff6d9bfcedfc1e3cab4e191d8dbf8de347abb1
Reviewed-on: https://code.wireshark.org/review/1065
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Alexis La Goutte [Thu, 10 Apr 2014 20:53:11 +0000 (22:53 +0200)]
Fix called C++ object pointer is null found by Clang Analyzer
Change-Id: I7d142ed60af8bb776ea732bf9ef94ad92bc23d70
Reviewed-on: https://code.wireshark.org/review/1061
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Kaiser [Thu, 10 Apr 2014 21:00:59 +0000 (23:00 +0200)]
display LCNs as decimal number
this makes them easier to compare with your TVs channel list
Change-Id: Ie78d1a7df8aa83455ff723fa523b84a067231e5f
Reviewed-on: https://code.wireshark.org/review/1063
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Thu, 10 Apr 2014 20:59:19 +0000 (22:59 +0200)]
use the CI+ value string for CI+ descriptor tags
Change-Id: I48f3304f74263672a65a74f523f14ebb7950d2d6
Reviewed-on: https://code.wireshark.org/review/1062
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Bill Meier [Thu, 10 Apr 2014 17:56:52 +0000 (13:56 -0400)]
Comment out a section re SVN usage; svn ==> git in a few cases; Fix some typos.
Change-Id: I0bd7a7d4bdcc566af6b8f672a25fb937176fde21
Reviewed-on: https://code.wireshark.org/review/1060
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Michael Mann [Thu, 10 Apr 2014 12:53:53 +0000 (08:53 -0400)]
Fix infinite loop. Bug 9970
Change-Id: I4f928187b9ba3e522f63f6b6987587e3638d8ba7
Reviewed-on: https://code.wireshark.org/review/1057
Reviewed-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Bill Meier [Thu, 10 Apr 2014 16:55:28 +0000 (12:55 -0400)]
Remove unneeded #include.
Change-Id: I3675f664f1e67c3881e5911427725fade8d1d0f0
Reviewed-on: https://code.wireshark.org/review/1059
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
AndersBroman [Thu, 10 Apr 2014 10:33:21 +0000 (12:33 +0200)]
Update to the latest packet format.
Change-Id: I745a05c9a9e7a5addc00befc2b4ff019aca2a4cc
Reviewed-on: https://code.wireshark.org/review/1056
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Thu, 10 Apr 2014 08:00:16 +0000 (10:00 +0200)]
Add a hint in the protocol tree.
Change-Id: Id565b153e322599430218eb6f7a542e2dd763458
Reviewed-on: https://code.wireshark.org/review/1055
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Thu, 10 Apr 2014 07:43:47 +0000 (09:43 +0200)]
Have the checkum preference only affect IPv4
Change-Id: I6416ab40ac4e1e652bc453fb8e6d3eaa6ec5fe65
Reviewed-on: https://code.wireshark.org/review/1054
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Thu, 10 Apr 2014 01:41:54 +0000 (18:41 -0700)]
More zero-length checks.
Fixes bug 9965.
(Also fixes a typo in an expert info string.)
Change-Id: I0b4f9bc4619e0d2ba291795973070598e2e142fe
Reviewed-on: https://code.wireshark.org/review/1051
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 10 Apr 2014 01:30:03 +0000 (18:30 -0700)]
Check for zero-length options.
Otherwise, we get an infinite loop when processing options. This might
be the cause of bug 9967.
Change-Id: If115c8cc8fc87b0c4252ab3cd07bfa34952786c6
Reviewed-on: https://code.wireshark.org/review/1050
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 10 Apr 2014 01:06:20 +0000 (18:06 -0700)]
Fix two ett_ variables that weren't getting registered.
Change-Id: I0b37bf3d89a108978a6c917fc4d3a33cba456493
Reviewed-on: https://code.wireshark.org/review/1048
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 10 Apr 2014 00:48:32 +0000 (17:48 -0700)]
Avoid bug 9962 - don't use variables that haven't been set.
See the comment for details.
Change-Id: I0b1800dd884736e00201f09166c0d2bd6795b6c3
Reviewed-on: https://code.wireshark.org/review/1047
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 9 Apr 2014 22:58:59 +0000 (15:58 -0700)]
Fix white space.
Change-Id: Ia36d439d1210f93be25a31d2a7288474688e0d9c
Reviewed-on: https://code.wireshark.org/review/1046
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Evan Huus [Wed, 9 Apr 2014 21:19:31 +0000 (17:19 -0400)]
Update kafka OffsetFetchResponse dissection
Per https://github.com/Shopify/sarama/pull/77 the spec is out of date, there is
no longer a clientID field in certain messages.
Change-Id: Ieeb7b8f1dd32b326b3d9507e3d5897574a1b09fd
Reviewed-on: https://code.wireshark.org/review/1043
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Wed, 9 Apr 2014 12:34:47 +0000 (08:34 -0400)]
Improve dissection of RFC 6607. Bug 9960
Change-Id: Ibab13b0ab7b3f0ac1d9c2e305cb428bb17689313
Reviewed-on: https://code.wireshark.org/review/1039
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 6 Apr 2014 20:31:53 +0000 (16:31 -0400)]
Added support for MQTT protocol. Bug 9930
Change-Id: I04fc3a6225c56af9905f4f9bbbca5bc10f214843
Reviewed-on: https://code.wireshark.org/review/873
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Wed, 9 Apr 2014 21:37:31 +0000 (14:37 -0700)]
Clean up white space.
Change-Id: If274c6239859127485d306b92a59e4d473c26d39
Reviewed-on: https://code.wireshark.org/review/1045
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 9 Apr 2014 21:32:15 +0000 (14:32 -0700)]
Use tvb_strncaseeql() to check for XML.
This avoids using tvb_get_nstringz0(), and simplifies the check.
Change-Id: Ib33cf22bf79d4fac8896c25a8b879eeb6e506831
Reviewed-on: https://code.wireshark.org/review/1044
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Martin Kaiser [Wed, 9 Apr 2014 12:39:15 +0000 (14:39 +0200)]
iTXt chunk name
Change-Id: I0310368319fe70782bd2c3b48e100292cd93d8c4
Reviewed-on: https://code.wireshark.org/review/1042
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
AndersBroman [Wed, 9 Apr 2014 13:56:06 +0000 (15:56 +0200)]
There seems to be some ambigiousy on how to calculate V3 checksums for
IPv4. Introduce a preference to use the same metod as for VRRP V2.
http://ask.wireshark.org/questions/15291/does-wireshark-uses-a-pseudo-header-for-vrrpv3-ipv4-checksum-calculation
Change-Id: I14bf279b0c85405c1963784737add9321d5cb7c4
Reviewed-on: https://code.wireshark.org/review/1040
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Tue, 8 Apr 2014 18:01:01 +0000 (20:01 +0200)]
Switch back Windows 32 bits build to GTK2
GTK3 does not work great on Windows:
- the GUI is quite ugly
- features like background color in filter box does not work
- x64 builds are still using GTK2
- no one is putting efforts on this to fix those issues
As we are transitioning to Qt, I do not expect any improvement soon.
Let's switch back to a more user friendly GUI.
Change-Id: I04c0856b8ac8ce808c1942f7f26b14dd57388d1a
Reviewed-on: https://code.wireshark.org/review/1026
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Wed, 9 Apr 2014 09:44:15 +0000 (02:44 -0700)]
Clean up the dissection of ServiceContexts.
Make the top-level item for a ServiceContext an item for the
ServiceContext as a while, and put the VSCID under it like other items,
rather than making the VSCID the top-level item.
Don't dissect the VSCID using the value_string field for the Object
Management Group's SCIDs; use that value_string field for the SCID if
the VSCID is 0 (meaning "Object Management Group"), and have no
value_string field for the VSCID otherwise (the interpretation of the
SCID depends on the value of the VSCID).
Dissect the encapsulation information even for unknown ServiceContexts.
If the ServiceContext's length is bigger than what it's supposed to be,
throw an exception if it's also bigger than the data available in the
packet; this squelches a run-time warning in that case.
Change-Id: I11cc62c2e32f4623dba2a551119b3146a7037e6d
Reviewed-on: https://code.wireshark.org/review/1038
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Martin Kaiser [Tue, 8 Apr 2014 14:22:13 +0000 (16:22 +0200)]
remove usb_trans_info parameter
trans_info is part of the conversation info
Change-Id: I3eafe893324d7d6d23c5475f6f7aa34b7520a6b8
Reviewed-on: https://code.wireshark.org/review/1018
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>