Commit Graph

52529 Commits

Author SHA1 Message Date
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
Martin Kaiser 01d2ca6a74 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>
2014-04-14 13:48:17 +00:00
Martin Kaiser 3aa48c8ad6 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>
2014-04-14 13:35:06 +00:00
AndersBroman c68769765c Fix no previous prototype warnings.
Change-Id: I859597ebc957a58f659800ef63318f94e80feabf
Reviewed-on: https://code.wireshark.org/review/1104
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14 12:50:31 +00:00
Alexis La Goutte 167041a9be 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>
2014-04-14 12:50:13 +00:00
Alexis La Goutte 2414d9df46 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>
2014-04-14 11:52:35 +00:00
Hadriel Kaplan dd002649c3 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>
2014-04-14 11:47:39 +00:00
Alexis La Goutte 92b501303b 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>
2014-04-14 10:35:58 +00:00
Michal Labedzki 3ca06aa167 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>
2014-04-14 06:29:55 +00:00
Michal Labedzki 5d51a8dc08 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>
2014-04-14 06:27:34 +00:00
Michal Labedzki 444cdf5f6b 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>
2014-04-14 06:24:30 +00:00
Alexis La Goutte bf515f5990 lupdate / lrelease translation file...
Change-Id: I6d93828ece6e62e4885c31d6d4429c652ead9389
Reviewed-on: https://code.wireshark.org/review/1090
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14 06:24:16 +00:00
Michal Labedzki 16d45a69ca 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>
2014-04-14 06:23:25 +00:00
Alexis La Goutte fca3746365 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>
2014-04-14 05:18:43 +00:00
Michael Mann d64a5fbeea Fix infinite loop. Bug 9986
Change-Id: Idbd22522918f0db131945d2a39f38b963ca3e0c2
Reviewed-on: https://code.wireshark.org/review/1093
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-14 01:15:52 +00:00
Hadriel Kaplan 0a5572ea77 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>
2014-04-14 00:10:20 +00:00
Pascal Quantin f532fb94fc 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>
2014-04-13 20:55:32 +00:00
Pascal Quantin f6dfda3a33 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>
2014-04-13 20:53:44 +00:00
Pascal Quantin cfe11b1097 Add ENC_ASCII_7BITS encoding
Change-Id: I01ec87ff4181afb5b2de487fd5f5200f8d62f17d
Reviewed-on: https://code.wireshark.org/review/1088
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-13 20:02:52 +00:00
Gerald Combs 63ed4745a2 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>
2014-04-13 18:32:55 +00:00
Gerald Combs cf85d91547 [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>
2014-04-13 16:06:51 +00:00