aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-04-14Upgrade doxygen configuration (with doxyen 1.8)Alexis La Goutte1-140/+401
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-0/+2
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-2/+12
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-1/+3
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-1/+2
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-2/+2
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-1/+1
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-4/+4
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-4/+4
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-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-1/+1
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-14Fix warning found by -Wunused-const-variable (Clang 3.5)Alexis La Goutte2-29/+18
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-14Addition of AllJoyn packet dissector. Bug 9361Joseph Huffman3-0/+2538
Change-Id: Ia582732ee27ce9c1e4280afef5a6b3e3be959d23 Reviewed-on: https://code.wireshark.org/review/1127 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-14Pull in some changes from master-1.10/make-version.pl.Gerald Combs1-19/+11
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-14Add support of RFC 6514 PMSI bgp attribute and tunnel ID decodingMatthieu Texier3-50/+312
Change-Id: Ia170002fb5af5f6548595688956cc01ec4a72298 Reviewed-on: https://code.wireshark.org/review/960 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Adjust path width for OS X & Linux.Gerald Combs1-1/+1
Change-Id: Icc51e8c3c93f78cbfa0a0aeda3552ceb4c82803d Reviewed-on: https://code.wireshark.org/review/1122 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-14Fixed deprecated tvb_length and tvb_length_remaining.Philip Rosenberg-Watt2-12/+12
Change-Id: Icb7b703319f2d76383fe0a52294ca8c2d06bef84 Reviewed-on: https://code.wireshark.org/review/1118 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14no need for if(tree)Martin Kaiser1-37/+30
Change-Id: I90a9d2f31c479d1e13f5842be944b67ef67ed6a7 Reviewed-on: https://code.wireshark.org/review/1117 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-14TABs -> spacesMartin Kaiser1-128/+142
add modelines Change-Id: Iae34900e61c2b1f58e48d5ec2d2a303b00beb137 Reviewed-on: https://code.wireshark.org/review/1116 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-14lrelease / lupdate translation filesAlexis La Goutte4-154/+51
Change-Id: I2962614ad9d4bd5a263f50e827705133c6c65d9c Reviewed-on: https://code.wireshark.org/review/1110 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Fix typo (double at...)Alexis La Goutte1-1/+1
Change-Id: If095b9d01817e4345ae588020cdc3332709c18d0 Reviewed-on: https://code.wireshark.org/review/1109 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Fix typo (Link size => Link type) in Qt Summary windowAlexis La Goutte1-1/+1
Change-Id: I78844161e19eaa88a62417f492ac5e439c6bbac0 Reviewed-on: https://code.wireshark.org/review/1108 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Fix typo and make buildbot doc happyAlexis La Goutte1-1/+1
Change-Id: I9e60fd8a8353e740c1b57f52daac86b1af1b784f Reviewed-on: https://code.wireshark.org/review/1106 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14always get the transfer type from the conversationMartin Kaiser1-3/+3
Change-Id: Iadd45be615053cd070f69cd836d2a4abb2d5588f Reviewed-on: https://code.wireshark.org/review/1115 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-14check for is_setup, not for the value of the setup flagMartin Kaiser1-4/+4
Change-Id: I9fe0f2e180a3ccf13a4db13918a73b1999e29ade Reviewed-on: https://code.wireshark.org/review/1114 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-14remove device_address parameter from try_dissect_next_protocol()Martin Kaiser1-8/+8
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-14remove bus_id parameter from try_dissect_next_protocol()Martin Kaiser1-8/+9
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-14remove type parameter from try_dissect_next_protocol()Martin Kaiser1-6/+6
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-14path is used only for libsmi and geoipMartin Kaiser1-1/+1
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-14Fix no previous prototype warnings.AndersBroman13-2/+36
Change-Id: I859597ebc957a58f659800ef63318f94e80feabf Reviewed-on: https://code.wireshark.org/review/1104 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Try to make happy Ubuntu BuildbotAlexis La Goutte1-3/+3
../../../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-14Fix Argument with 'nonnull' attribute passed null found by ClangAlexis La Goutte1-0/+5
Change-Id: If1c907308a7c776a6198530663f8dce03839d43b Reviewed-on: https://code.wireshark.org/review/1098 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Add tvb_get and proto_tree_add for string-encoded timestampsHadriel Kaplan10-159/+1400
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-14Enhance translation (rename also pixel => Pixel to avoid similar string...)Alexis La Goutte1-8/+8
Change-Id: Ic2e0ca99382208c13ea2c71c11684c43b34b9988 Reviewed-on: https://code.wireshark.org/review/1099 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Increase tap limit to 5000Michal Labedzki1-1/+1
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-14Fix wtap displayable namesMichal Labedzki1-12/+12
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-14Bluetooth: ATT: Add missing offset calculationsMichal Labedzki1-2/+5
Change-Id: Ia0fe426bff7d48a45d915a18aa679bb8978d2fca Reviewed-on: https://code.wireshark.org/review/1095 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14lupdate / lrelease translation file...Alexis La Goutte7-2629/+4713
Change-Id: I6d93828ece6e62e4885c31d6d4429c652ead9389 Reviewed-on: https://code.wireshark.org/review/1090 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Allow FT_BYTES, FT_NONE, FT_STRING use length "-1"Michal Labedzki1-1/+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-14Enhance translation (rename toolTip to avoid similar string...)Alexis La Goutte2-10/+10
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-14Fix infinite loop. Bug 9986Michael Mann1-0/+3
Change-Id: Idbd22522918f0db131945d2a39f38b963ca3e0c2 Reviewed-on: https://code.wireshark.org/review/1093 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-14Fix Bug 9951: 'git commit hook isn't calling checkAPIs.pl with arguments for ↵Hadriel Kaplan2-1/+15
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-13MBIM: fix dissection of ENVELOPE Sim Toolkit messagesPascal Quantin1-8/+8
Change-Id: I3e6567e8ebfe83f12a0e2cbb2998b2e43ad2277a Reviewed-on: https://code.wireshark.org/review/1092 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-13MBIM: add decoding of text based CDMA SMSPascal Quantin1-21/+92
Change-Id: Id2497597660bffeff2d98087d6511b91bfd93b1a Reviewed-on: https://code.wireshark.org/review/1091 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-13Add ENC_ASCII_7BITS encodingPascal Quantin6-116/+156
Change-Id: I01ec87ff4181afb5b2de487fd5f5200f8d62f17d Reviewed-on: https://code.wireshark.org/review/1088 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-13Replace QTableWidgets with QLabels + HTML tables.Gerald Combs4-153/+186
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[Automatic manuf, services and enterprise-numbers update for 2014-04-13]Gerald Combs3-68/+257
Change-Id: I0af1de7915bf152ae59e48b4fb2e80c302aa4b39 Reviewed-on: https://code.wireshark.org/review/1085 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-12Use ftype_name() to get the name of an FT_ value.Guy Harris1-51/+13
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>
2014-04-12Get rid of more tvb_get_nstringz* calls.Guy Harris27-162/+261
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>
2014-04-12Update E.212 list to Operational Bulletin No. 1047 (1.III.2014)Pascal Quantin1-9/+28
Change-Id: I6eddb03a0ef541f94fc166a03417a91bb219e235 Reviewed-on: https://code.wireshark.org/review/1081 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-12Add MQTT to release notesPascal Quantin1-0/+1
Change-Id: I553698c522b4a1eba370591a4ab788a139f8f221 Reviewed-on: https://code.wireshark.org/review/1080 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>