aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-11-22Fix problem where the profile bar moves further left every time Wireshark isJeff Morriss1-16/+46
run. For the saved/restored geometry to be consistently correct we need to always show the expert info and capture file comment icons. Disable them if no capture file is open. Bug: 10518 Change-Id: I6e254f66a17f8f54f28cfbafb4e0f92e02cff70c Reviewed-on: https://code.wireshark.org/review/5404 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-22Add version check in Geneve dissector.Jesse Gross2-17/+35
We should warn when decoding Geneve packets with an unknown version number. Change-Id: Id40b756c3bb0320b69fbd8ee98830a2b05834a48 Reviewed-on: https://code.wireshark.org/review/5420 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-22Add the required c flags for some test executablesGraham Bloice1-5/+19
Change-Id: I93b0c346fff162899e5f97dd2366e01cf99ec38e Reviewed-on: https://code.wireshark.org/review/5435 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-11-22Get rid of another global in the print code.Guy Harris5-15/+16
Pass the "output only these protocols" hash table as an argument, instead. Change-Id: Id8540943037e7b9bbfe377120c3f60dbe54fe0f1 Reviewed-on: https://code.wireshark.org/review/5440 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22Pass a capture_file * to write_psml_preamble() in tfshark as well.Guy Harris1-1/+1
Change-Id: I2b2ae78d4b75bb27a44d185b48e3d85794effdb7 Reviewed-on: https://code.wireshark.org/review/5439 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22Get rid of write_headers global variable.Guy Harris4-38/+27
Have write_psml_preamble() and write_csv_preamble() take a capture_file * as an argument, so they can print the column titles themselves, rather than having to defer it to the routine that prints packet data. Change-Id: Ifd1b7a13062be8ad46846315976922a752778153 Reviewed-on: https://code.wireshark.org/review/5438 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22Fix comments.Guy Harris2-4/+4
Change-Id: I3b7340939b8204102bfc7e2e7d83f4d978cf7bad Reviewed-on: https://code.wireshark.org/review/5437 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22Split the low-level print stream code into a separate file.Guy Harris6-387/+463
Put the low-level print stream code from epan/print.c into epan/print_stream.c, leaving the higher-level stuff in print.c Change-Id: Iae961f168ec655a29f434257b1af0937fca9f025 Reviewed-on: https://code.wireshark.org/review/5436 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-21README.heuristic: rework example code.Bill Meier1-26/+74
Specifically: show the use of tcp_dissect_pdus() for a TCP heuristic dissector Change-Id: I02f184b2c8ef6ed128ef3d0bc59eed759aae54bb Reviewed-on: https://code.wireshark.org/review/5399 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-21VoIP Call (GTK): Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-0/+3
Change-Id: I80029b6238c78dcab83a6a70eca0af5b66e1488d Reviewed-on: https://code.wireshark.org/review/5401 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21Add minimize and maximize buttons to the SCTP analysis windows.Irene Ruengeler6-0/+29
As suggested by Jeff Morriss. Change-Id: Ibe2d30c31d51ab92377d64068527b424a92e8a64 Reviewed-on: https://code.wireshark.org/review/5361 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21CANopen bugfixesMichael Mann1-24/+24
1. Fixed endianess in CANopen dissector. According to CiA 301, 7.1.1. (p. 26): "For numerical data types the encoding is little endian style." 2. Fixed NMT type string in CANopen dissector NMT function code should not display 'EMERGENCY' 3. Fixed time stamp decoding * Offset increment was too low for data type size * Decoding of time_stamp_days must equal time_stamp_msec and thus be letohs instead of ntohs. CANopen data is little-endian encoded. 4. Fix: Use correct description string for NMT error control state bits canopen.nmt_guard.state was faulty named "Node-ID". This was changed to "State". 5. Fix nmt_guard_state value_string array CiA 301 desribes only 4 valid values. All other were deleted. 0x00 was renamed from 'Initalisation' to 'Boot-up' following CiA301. 6. Shortened EMERGENCY to EMCY The term EMCY is the standard abbreviation used in CiA standard for Emergency service. 7. Fix: Allow SYNC and NMT error frames without any payload NMT node guard remote requests do note have a payload, SYNC frames only have an optional payload (counter) If item length is set to -1, decode will cause a 'Malformed Packet' error. 8. Rename MT_NMT_GUARD to MT_NMT_ERR_CTRL which better reflects its scope Change-Id: I676f9b5f2e4efd8e7c9528fe289e7510c4d43235 Reviewed-on: https://code.wireshark.org/review/5425 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21Replace tvb_length()AndersBroman14-54/+54
Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645 Reviewed-on: https://code.wireshark.org/review/5431 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-21Remove some leftover debug printfs.Jeff Morriss1-8/+2
Change-Id: I9f4c7f71ae403059a2a236ba095b21753f7938fa Reviewed-on: https://code.wireshark.org/review/5417 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-21Fix for very big pid and tid numbers in logcat_textMichał Orynicz1-1/+1
There can be no space after pid colon if tid is big enough in logcat long format. Change-Id: I8e03e78c88e4bef1a5fdb3a04b77f58fa7d055bc Reviewed-on: https://code.wireshark.org/review/5411 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-21Move text logcat regex strings to shared headerMichał Orynicz3-20/+10
To avoid further duplication of work and bugfixing, move regex strings to wiretap/logcat_text.h and include this file in epan/dissectors/packet-logcat-text.c Change-Id: I82773cda0e3240844139b104c68738ec82788014 Reviewed-on: https://code.wireshark.org/review/5410 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-21Fix the build: dissect_a21_ie_common() can't be static any more.Jeff Morriss1-1/+1
Change-Id: I93db6bc35aef9c36a294e530730cd295ad6851ef Reviewed-on: https://code.wireshark.org/review/5419 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-21Include "ws_symbol_export.h" to make sure WS_DLL_PUBLIC is defined.Guy Harris1-0/+10
Wrap the declaration for C++ while we're at it. Change-Id: Ifcc1b47bab139f5fb8da8c3dd4f20b1ebb99739e Reviewed-on: https://code.wireshark.org/review/5418 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-20A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Change-Id: Ib2f3816892f1682c175b0dee3c80725caebf3d4d Reviewed-on: https://code.wireshark.org/review/5415 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20EPL: fix warning: no previous prototype for function ... [-Wmissing-prototypes]Alexis La Goutte1-5/+5
Change-Id: I40de0c8c2bd40f18a33947367fdeec5a22a3093a Reviewed-on: https://code.wireshark.org/review/5414 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20Eliminate proto_tree_add_text from some dissectors.Michael Mann9-293/+420
Change-Id: Ib160211198ca02f7eacf29d04568628c11f208a5 Reviewed-on: https://code.wireshark.org/review/5407 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-20Replace tvb_length...() calls.AndersBroman9-55/+55
Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330 Reviewed-on: https://code.wireshark.org/review/5412 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20uat: tighten up dec/hex uat field validity checkingBill Meier1-15/+22
Specifically: - Use the proper code for testing strtol() result; - Also: Values greater than 32-bits treated as an error (on LP64 architectures); Change-Id: I56e8e734fbb9a22dbd9ed4112e24327ffd7ee3c0 Reviewed-on: https://code.wireshark.org/review/5394 Reviewed-by: Bill Meier <wmeier@newsguy.com> Petri-Dish: Bill Meier <wmeier@newsguy.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-20Give better hints as to where the "expert info" fields go.Michael Mann1-2/+2
Change-Id: I9b1cee43ef9280504745b136b87507c2b6bb5369 Reviewed-on: https://code.wireshark.org/review/5406 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-20IrDA: always initialize buffer before accessing itPascal Quantin1-0/+3
Bug: 10716 Change-Id: I8e54f750b70076758d5fd0d7f35f9c782f5d0bf9 Reviewed-on: https://code.wireshark.org/review/5398 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-20Fix global plugin folder when it is set as an absolute pathBalint Reczey1-1/+5
This fixes regression in creating Debian packages caused by 80b36cdbde90ac9639938a14e8fd90a79602666a Change-Id: I46702ad4c9a11ce317da7ef664c84e1f22d3f709 Reviewed-on: https://code.wireshark.org/review/5316 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-20Fix text logcat for changes in android LMichał Orynicz2-2/+2
In L, in line "-- beginning of /<buffer>" the "/" was removed. This commit accomodates text logcat to that change. Change-Id: I4cbfadf5a8169589f2848ce1a5793cea593ba459 Reviewed-on: https://code.wireshark.org/review/5405 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-20MIP6: Access network identifier option is not full decodedAlexis La Goutte1-17/+122
* Add subtype Geo Location (2) and Operator Identifier (3) * Use also offset to calculate the length * Remove proto_tree_add_text Issue reported by Ravindranath K M Bug:10712 Change-Id: I9ad81ece856df134f3a706ad774d34e638cb5c94 Reviewed-on: https://code.wireshark.org/review/5397 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-20White space tweaking to match what's in Samba git.Guy Harris2-14/+13
(Samba git also needs some white space tweaking; this only changes the cases where we're not obviously "better".) Change-Id: Iafb9cf8fea67b898b12850a7793806e3fccb39ac Reviewed-on: https://code.wireshark.org/review/5403 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-19SBC: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I6ac8e0eed88e78521f7d5623b9afdb6a42900ede Reviewed-on: https://code.wireshark.org/review/5402 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-19voip_calls: Fix tap callbacks.Gerald Combs3-147/+160
We don't need to call the VoIP tap reset and draw callbacks repeately. Do so only once from the RTP tap. Packet callbacks should return a gboolean. Clean up some function names and make some static. Change-Id: I5c934ce8ce7f279861e8cc73235bbfc27d7fe622 Reviewed-on: https://code.wireshark.org/review/5396 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-19[pedantic] Replace usage of 'long' and 'long long'Bill Meier3-4/+4
Change-Id: I78fc82c1a83eb04d78a11fc76710c92dfc916208 Reviewed-on: https://code.wireshark.org/review/5395 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-19Add support for PAD chunks.Michael Tüxen1-0/+18
Add support for PAD chunks as defined in RFC 4820. Change-Id: I66a83d5d133429154fe40ccef26687c8350463cf Reviewed-on: https://code.wireshark.org/review/5393 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-11-19Fix the length reported as value length.Michael Tüxen1-3/+6
The length reported as value length for unknown chunks was actually the chunk length. Therefore it was off by 4. Change-Id: Ieea79d2c51b4729fc139395174625d1f362d1ee5 Reviewed-on: https://code.wireshark.org/review/5392 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-11-19Eliminate proto_tree_add_text from packet-mate.cMichael Mann1-28/+50
Change-Id: I3f4b3eb23b91b219df373b3012fbefa63abfa4d3 Reviewed-on: https://code.wireshark.org/review/5350 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-19Remove Windows linker flags from the CMake link flags test as theGraham Bloice1-7/+5
test doesn't actually pass the flags to the VS linker. Change-Id: I5d546afcb80a49e39143078bc8f0855b0ba0f7e8 Reviewed-on: https://code.wireshark.org/review/5384 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-11-19Wiretap: Added file_seek SEEK_END support.Stig Bjørlykke1-4/+13
This is needed for Lua File:seek("end"). Change-Id: I28fb23f2f29ca8083c77bf065db8816e039ae5a1 Reviewed-on: https://code.wireshark.org/review/4722 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-18voip_calls: Regression fixes.Gerald Combs6-43/+62
Fix struct initialization logic. Clear a GQueue instead of deleting it. Don't crash if we have no sequence diagram items. Make sure we show all flows and not just invites. Zero allocated memory in a couple of places. Change-Id: Ia5bb3ba57cf625de4b554b354e098aa0361dff28 Reviewed-on: https://code.wireshark.org/review/5390 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-18dissect TA(1)Martin Kaiser1-5/+88
Change-Id: If618b0c3dc0502f5a31dcc580b9116daacb40239 Reviewed-on: https://code.wireshark.org/review/5389 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-11-18Update Couchbase dissector:Sergey Avseyev1-0/+9
* Register new commands: * 0x5c: DCP_NOOP * 0x5d: DCP_BUFFER_ACKNOWLEDGEMENT * 0x5e: DCP_CONTROL * 0x5f: DCP_RESERVED4 Change-Id: I22d8eb8f6628e07b2e2ab2bc137688329eead1be Reviewed-on: https://code.wireshark.org/review/5385 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18SPDY: do not try to access an uninitialized tvb Pascal Quantin1-0/+2
Coming when data length = 0 Bug: 10704 Change-Id: Ibd0730be661d966aa0429480dba97ed7d3e5c471 Reviewed-on: https://code.wireshark.org/review/5377 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18802.11: Remove proto_tree_add_textAlexis La Goutte1-21/+70
Change-Id: I40d351e3317ff7e207e5c68a39aaedb73faf54f9 Reviewed-on: https://code.wireshark.org/review/5281 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18Fix indentation.Guy Harris1-1/+1
Change-Id: Icc474748f755c21d281620c3b0f5d4d90f09223b Reviewed-on: https://code.wireshark.org/review/5380 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-18MIPv6: display Experimental Mobility Message Data as suchPascal Quantin1-4/+4
Bug: 10703 Change-Id: I9b16f503418d7464234be3c772b5dae3fb5eb7a9 Reviewed-on: https://code.wireshark.org/review/5378 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-18voip_calls: Move to ui.Gerald Combs12-146/+166
Move voip_calls.[ch] to ui. Add callbacks to voip_calls_tapinfo_t. Remove unused function definitions. Change-Id: Ib12db7053d53afa81ef2a66dc0cfe681bc624dd2 Reviewed-on: https://code.wireshark.org/review/5379 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-17voip_calls: Get rid of global variables.Gerald Combs4-354/+366
Move the members of voip_rtp_tapinfo_t to voip_calls_tapinfo_t. Move a bunch of formerly static variables there as well. Note that we might want to make them private again at some point. Remove launch_count. It appeared to be unused. Wrap the individual registration routines in voip_calls_init_all_taps. Wrap the removal routines in voip_calls_remove_all_tap_listeners. Move voip_calls_get_info() to voip_calls_dlg.c. Make it static. Change-Id: I58f9d91f55cfb5e4b0c048a5a1d5d4b947f4641b Reviewed-on: https://code.wireshark.org/review/5372 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-17802.11: Enhance Supported Operating ClassesAlexis La Goutte1-7/+3
* Use expert_info to display warning about length (Remove proto_tree_add_text) Change-Id: I36ce6b6fc1138c53621da4913e23f9f1ceaaca50 Reviewed-on: https://code.wireshark.org/review/5369 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17802.11: Enhance Extenede Channel Switch AnnouncementAlexis La Goutte1-10/+1
* Use expert info to display warning about launch (remove proto_tree_add_text) * Remove a check about Unknown data (Not need) Change-Id: I3ec1d0f5b955019cfe43141df5f712eb1446dce3 Reviewed-on: https://code.wireshark.org/review/5368 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17H248: Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte2-37/+41
Also fix some indent issue Change-Id: I262bdddd031fec6a0f91b7172bb2d67be3c33000 Reviewed-on: https://code.wireshark.org/review/5370 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17DECT: ensure that bfield_data buffer is always fully initiatedPascal Quantin1-0/+4
Bug: 10710 Change-Id: I444bc4ff7e542a8aa5ac8e20bac44a823ac74cfd Reviewed-on: https://code.wireshark.org/review/5371 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>