Commit graph

52499 commits

Author SHA1 Message Date
Guy Harris
cd958c7418 Squelch warnings when built without libz.
Change-Id: I881bb369ccf5d32cb53014998ddf76210aaab73e
Reviewed-on: https://code.wireshark.org/review/1161
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-16 00:28:27 +00:00
Michael Mann
8055351c6d Add SPDY dissector (from SPDYSHARK)
Porting SPDYSHARK Plugin ( http://code.google.com/p/spdyshark/) to built-in dissector

Closed-bug: 9821
Change-Id: I3169ab49e67f67a17e4094a289f4d3a389d610bc
Reviewed-on: https://code.wireshark.org/review/767
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15 23:19:43 +00:00
Martin Kaiser
537a02b365 start a dissector for Ethernet Local Management Interface
Change-Id: I332bd690be67c908067c12e570f993565de98aed
Reviewed-on: https://code.wireshark.org/review/1159
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-15 21:30:25 +00:00
Martin Kaiser
da055b8f52 remove unused variable 'tree'
Change-Id: Icd39b32aa61fd9fc39c7a15d22134350582b9de6
Reviewed-on: https://code.wireshark.org/review/1160
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-15 21:22:12 +00:00
Michael Mann
c538b4498b Cleanup Alljoyn dissector.
Change-Id: I8de7a196ad068506f8e7312021879d20be4063d2
Reviewed-on: https://code.wireshark.org/review/1156
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Joe Huffman <jhuffman@codeaurora.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15 21:16:28 +00:00
Peter Wu
e80f9cda38 Fix crash on invalid SSH_CONNECTION and SSH_CLIENT values
The third parameter to g_strsplit is the maximum number of elements, you
cannot just assume that a vector with exactly that number of elements
is available. This will crash for example: `SSH_CONNECTION= wireshark`.

This patch takes care of that and also fixes a memleak due to missing
g_strfreev. To reduce code bloat, return the filter at last so that
g_strfreev does not have to be repeated before returning.

Note that it still possible for the filter to contain absolute junk
since the port and host number is not validated...

Change-Id: I4414d2a748f83ded59775fb1e733ce1250cfc553
Reviewed-on: https://code.wireshark.org/review/1100
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15 19:40:09 +00:00
Michael Mann
30661905c4 Bug 8214. Don't let array ett_ variables limit the number of array elements dissected. Also add support for set and bag dissection.
Change-Id: I11059ec313aba7d289ce06e38b4992429f2fd999
Reviewed-on: https://code.wireshark.org/review/1123
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15 19:24:37 +00:00
Peter Wu
b4442b875c ui/gtk/voip_calls: Fix minor memleak
Return values from g_strsplit must be always be freed. Also remove a
useless return statement and set a saner maximum split.

Change-Id: I680e20d40fe86103b0dcba210ef41aa5769f4f86
Reviewed-on: https://code.wireshark.org/review/1155
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15 19:07:33 +00:00
Gerald Combs
3f0bc55ed0 Add license compatibility information for GMP (used by GnuTLS).
Update GLib and GTK+ release dates and add Qt release dates while we're
here.

Change-Id: Ia0da8f6e118e5737d19d321ce3fae6de75477b08
Reviewed-on: https://code.wireshark.org/review/1157
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-15 19:01:24 +00:00
Michael Mann
1279068c1d Fix check*.pl errors
Change-Id: Id0526cd9b6b724a8f125574507f9ce6302db540d
Reviewed-on: https://code.wireshark.org/review/1129
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15 18:44:09 +00:00
Gerald Combs
d73d1f14b3 1.11.3 → 1.11.4.
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019
Reviewed-on: https://code.wireshark.org/review/1154
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-15 17:29:19 +00:00
Gerald Combs
1dd5d3a6aa Build 1.11.3.
Change-Id: I8c8f1c22a2cba97e69b27e5fb0b4de9981668966
Reviewed-on: https://code.wireshark.org/review/1153
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-15 16:37:19 +00:00
Alexis La Goutte
38d5b11fa2 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>
2014-04-15 14:40:05 +00:00
Alexis La Goutte
5c5a24f48a Update French translation
Change-Id: If552907a2eb0828198e912fa5c2628efa7190f20
Reviewed-on: https://code.wireshark.org/review/1119
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-15 14:31:24 +00:00
Bill Meier
e7488b7779 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>
2014-04-15 14:28:34 +00:00
Martin Mathieson
bd6ffea1cd 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>
2014-04-15 04:16:52 +00:00
Alexis La Goutte
157fe98533 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>
2014-04-15 02:38:36 +00:00
Shu Shen
e304d5d739 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>
2014-04-15 02:37:47 +00:00
Shu Shen
a88b81109c 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>
2014-04-15 02:37:21 +00:00
Guy Harris
16b26b8e5f 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>
2014-04-14 22:43:25 +00:00
Guy Harris
d3ad27390c 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>
2014-04-14 22:23:20 +00:00
Gerald Combs
7fdd74a009 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>
2014-04-14 22:16:57 +00:00
Guy Harris
a838f1083c 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>
2014-04-14 21:53:12 +00:00
Alexis La Goutte
45143c6eac 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>
2014-04-14 20:34:18 +00:00
Alexis La Goutte
2ce2320de0 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>
2014-04-14 20:31:42 +00:00
Alexis La Goutte
647287f4ac 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>
2014-04-14 20:28:34 +00:00
Alexis La Goutte
a9103e0234 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>
2014-04-14 20:27:24 +00:00
Alexis La Goutte
b00a622bcd 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>
2014-04-14 20:25:41 +00:00
Alexis La Goutte
d029cf158b 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>
2014-04-14 20:24:36 +00:00
Alexis La Goutte
bfc85bb365 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>
2014-04-14 20:23:25 +00:00
Alexis La Goutte
cb51bd0acb 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>
2014-04-14 20:21:51 +00:00
Alexis La Goutte
bcb6f09f6f 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>
2014-04-14 20:20:38 +00:00
Alexis La Goutte
1fceb512f7 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>
2014-04-14 20:19:36 +00:00
Alexis La Goutte
05ce6efb8c 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>
2014-04-14 20:18:29 +00:00
Alexis La Goutte
d685e9b3fe 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>
2014-04-14 18:23:43 +00:00
Joseph Huffman
fad0aa0382 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>
2014-04-14 17:57:02 +00:00
Gerald Combs
dacc7eea39 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>
2014-04-14 17:15:01 +00:00
Matthieu Texier
e9e4277f2a 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>
2014-04-14 16:44:50 +00:00
Gerald Combs
9838ab902e 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>
2014-04-14 16:09:05 +00:00
Philip Rosenberg-Watt
920ae80d33 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>
2014-04-14 15:13:10 +00:00
Martin Kaiser
834c25f50f no need for if(tree)
Change-Id: I90a9d2f31c479d1e13f5842be944b67ef67ed6a7
Reviewed-on: https://code.wireshark.org/review/1117
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-14 14:08:40 +00:00
Martin Kaiser
97d4a8ffa0 TABs -> spaces
add modelines

Change-Id: Iae34900e61c2b1f58e48d5ec2d2a303b00beb137
Reviewed-on: https://code.wireshark.org/review/1116
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-14 14:08:25 +00:00
Alexis La Goutte
9a9ca0ab3d lrelease / lupdate translation files
Change-Id: I2962614ad9d4bd5a263f50e827705133c6c65d9c
Reviewed-on: https://code.wireshark.org/review/1110
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14 13:50:38 +00:00
Alexis La Goutte
eef5e68177 Fix typo (double at...)
Change-Id: If095b9d01817e4345ae588020cdc3332709c18d0
Reviewed-on: https://code.wireshark.org/review/1109
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14 13:50:22 +00:00
Alexis La Goutte
c4626a247c 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>
2014-04-14 13:50:10 +00:00
Alexis La Goutte
12e9baf725 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>
2014-04-14 13:49:59 +00:00
Martin Kaiser
b8d03c5f04 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>
2014-04-14 13:49:32 +00:00
Martin Kaiser
e1c692dd78 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>
2014-04-14 13:49:06 +00:00
Martin Kaiser
85473291a4 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>
2014-04-14 13:48:49 +00:00
Martin Kaiser
dc97682cca 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>
2014-04-14 13:48:34 +00:00