aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-12-11Lua: Validate ProtoExpert.new argumentsStig Bjørlykke1-1/+48
Change-Id: I0da829041cda48a35341c315a7889b557b6334d7 Reviewed-on: https://code.wireshark.org/review/12527 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-11epan: Don't export deregister functionsStig Bjørlykke7-19/+8
Most of the deregister functions are used internally from Lua while reloading plugins. Don't export them for others to use. Change-Id: I919dbfa807f696c38d409ca7206104a0fba1ae65 Reviewed-on: https://code.wireshark.org/review/12508 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-11Changed references for IntraPAN to PAN ID Compression as per all versions ↵Chris Brandson2-17/+17
802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11CIP: Add support for common class attributesD. Ulis1-1/+89
Change-Id: Iaa297340708170e8efb2d73d0c164e0358507eb2 Reviewed-on: https://code.wireshark.org/review/12502 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11MIPv6: Fix unknown MH Type message data lengthJoão Valverde1-8/+12
Also improve column info for unknown MH types. Ping-Bug: 11728 Change-Id: I4e54ae56dbb76eaf9ea4f33eb0ff497a518dbd9a Reviewed-on: https://code.wireshark.org/review/12513 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-116LowPAN: Check for NHC IPv6 No Next HeaderJoão Valverde1-1/+1
Bug: 11728 Change-Id: I7b7cc72b4200e53856283e0716383d661a16fa77 Reviewed-on: https://code.wireshark.org/review/12512 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11MIPv6: Change name to "Mobile IPv6" (only)João Valverde1-1/+1
Change-Id: I1955a88025c26564e7dca4dfbb811cc7265632ea Reviewed-on: https://code.wireshark.org/review/12518 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11ssl: fix SSLv2 Client Hello dissectionPeter Wu1-85/+82
Regression introduced with v1.99.4rc0-112-gf0855e0 ("Remove proto_tree_add_text from packet-ssl.c"). While SSL decryption is not needed on the second pass, the items still have to be added. Bug: 11851 Change-Id: Iccb43f2ccff19bbe6d998fb08600b226ac054825 Reviewed-on: https://code.wireshark.org/review/12510 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11Qt: restore conversation coloring rule shortcutsPeter Wu1-0/+27
GTK+ had this very useful Ctrl+1 .. Ctrl+9 shortcuts for conversation coloring rules. Add this functionality to Qt too. Ctrl+0 is not ported though, this now means "Restore zoom" which is quite logical. Also, Ctrl+= (shortcut in GTK+) somehow does not work in Qt 5.5.1 (it is detected as Ctrl++ instead). Change-Id: I5528c723ef6d4ea11298a135db8539a8d03d9aae Reviewed-on: https://code.wireshark.org/review/12506 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11Qt: Reload Lua expert infosStig Bjørlykke5-5/+55
Support reloading Lua plugins with expert infos. Use the same delayed deregister logic as for fields. Change-Id: I36efa0820050b3a7afed4de7a8b0fa16805e8dfa Reviewed-on: https://code.wireshark.org/review/12498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11Fix Recurring check found by PVS Studio (V571)Alexis La Goutte3-7/+5
packet-ncp2222.inc: The 'ncp_rec->func == 0x59' condition was already verified in line 7300. packet-bgp: The 'nlri_len < 21' condition was already verified in line 3879 packet-rtp.c: The 'p_conv_data' condition was already verified in line 1460 Change-Id: I65299718b26454596e3f25665d413a17a99e4ce0 Reviewed-on: https://code.wireshark.org/review/12341 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-11Completely remove new_create_dissector_handle and new_register_dissector.Michael Mann2-4/+2
The macros are no longer needed because the conversion is complete. Change-Id: I42c4b937986d9707eff9225c444cbcab73f8e86a Reviewed-on: https://code.wireshark.org/review/12517 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-11new_create_dissector_handle -> create_dissector_handle for plugins.Michael Mann38-52/+52
Change-Id: I0d485b1337c669291ad58b6c096657ce2db353c8 Reviewed-on: https://code.wireshark.org/review/12516 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-11new_register_dissector -> register_dissector for remaining uses.Michael Mann75-79/+79
Mostly plugins, but also LUA and generated skinny dissector. Change-Id: Ifeb4205442f9a60875266b4e82841ff38b4fdb63 Reviewed-on: https://code.wireshark.org/review/12515 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-10The Bridging Control Protocol is really two protocols.Guy Harris2-158/+186
RFC 3518 defines two protocols, one used to encapsulate bridged PDUs and one used to configure the bridging process. Make them two separately-registered protocols. Change-Id: I393ea31ab7ef44cae2ef2b592ffde5d53ecb113f Reviewed-on: https://code.wireshark.org/review/12509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann168-4325/+4304
names that were generated from asn2wrs.py This includes: 1. new_create_dissector_handle -> create_dissector_handle 2. new_register_dissector -> register_dissector 3. new_register_ber_oid_dissector -> register_ber_oid_dissector 4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore. Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329 Reviewed-on: https://code.wireshark.org/review/12491 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-10Fix link to Display Filter wiki page in WSUGPascal Quantin1-2/+1
Reported by Thomas Guttler in https://wireshark.org/lists/wireshark-dev/201512/msg00069.html Change-Id: Ia482f01e30b734ddfd9ca21081cf4401d26e827b Reviewed-on: https://code.wireshark.org/review/12503 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-10Qt: Reset preferences when reloading Lua pluginsStig Bjørlykke4-9/+11
Reading configuration files may duplicate some entries, so ensure we reset preferences before reloading. Change-Id: I746414cbc10c206ddf47669856f329b9e0202a0d Reviewed-on: https://code.wireshark.org/review/12496 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-10Revert "Added RTI TCP dissector"Anders Broman5-980/+0
This reverts commit 1788e2c33a631056ae02e6cd8f75bd48696faf35. Change-Id: Ie86aa71f92e02935663b46ca00f38e0b8d8ae411 Reviewed-on: https://code.wireshark.org/review/12494 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-10Added RTI TCP dissectorJuanjo Martin5-0/+980
This dissector shows the information related to the RTI TCP Control messages used to manage the TCP connections, but also dissects the RTPS data that is sent on top of RTI TCP. This only happens with RTI's DDS implementation. Bug: 11640 Change-Id: I89fcb620256aeed7cae5829b70d92c6868d94929 Reviewed-on: https://code.wireshark.org/review/11305 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-10debian: Build-depend on qtmultimedia5-dev and libqt5svg5-dev to enable more ↵Balint Reczey1-0/+1
Qt features Change-Id: I14ff81898cd9154805d35ab67976b354e50fbe16 Reviewed-on: https://code.wireshark.org/review/12471 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-09[PPP] Add dissection of BCP NCP 0x8031AndersBroman1-18/+408
Change-Id: Ie4bb0eff6b50027df973cd438761b12408e74b3a Reviewed-on: https://code.wireshark.org/review/12490 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-09Update the packets bar periodically when loading a (large) file.Jeff Morriss1-22/+2
Update the packet bar each time we update the progress bar: 1) in the Qt UI 2) (and) in the Gtk UI if auto_scroll_live wasn't set 3) (and) even if we don't HAVE_LIBPCAP This allows the user to watch the number of packets increasing. (Extracted from I02c46b086f34a026b7980458f2a93d0d70cac23b.) Change-Id: I47a7a2b0dc6da50035098ab0b0eb0d55f7484960 Reviewed-on: https://code.wireshark.org/review/12459 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-09Qt: Disable Refresh Interfaces while refreshingStig Bjørlykke1-0/+2
Doing multiple Refresh Interfaces simultaneously will end up in duplicated interfaces. Change-Id: If9bb4252bbfabc557b78ad42efc0011050012417 Reviewed-on: https://code.wireshark.org/review/12414 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-09CIP: Ensure that all generated data is properly flagged as Generated and no ↵D. Ulis1-60/+110
lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-09Qt: various fixes to VoIP calls / RTP player windowsPascal Quantin11-64/+107
- Flush any remaining tapped packets before emitting captureFileRetapFinished(). This ensures that all packets have been treated before returning from retapPackets(). - Remove VoIP tap listeners when captureFileRetapFinished() is emitted. This avoid summing stats each time the RTP player is opened, leading to wrong information in VoIP calls window - Change voip_calls_tapinfo_t redraw member from a boolean to bitmap so as to identify which tap should call the tapinfo->tap_draw() callback. This allows fixing a race condition where the RTP player can be empty in Qt UI - Reset some more statistics in voip_calls_reset_all_taps() Change-Id: Ie7681702c81d338185c1813f2d340a437edf3a04 Reviewed-on: https://code.wireshark.org/review/12474 Reviewed-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: Anders Broman <a.broman58@gmail.com>
2015-12-09Qt: store the absolute path names of recent files.Jeff Morriss1-3/+3
That way you can still open a file you recently opened (which was in your pwd) even if you happen to change directories (as shell-prompt-dwellers such as myself are wont to do). (The Gtk GUI already stores absolute paths.) Change-Id: If29bcc25d680825c659f8eb4f13b108764029652 Reviewed-on: https://code.wireshark.org/review/12483 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09Skinny: packet-skinnyDiederik de Groot2-6/+16
Fix messages generated by 894X phones, which do not always include all fields Revert accidental change by using of an older packet-skinny.c.in file Change-Id: I4c6f0ef053579cbbd0c15e90b44dda6a6b173d0d Reviewed-on: https://code.wireshark.org/review/12478 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09new_register_dissector -> register_dissector for dissector directory.Michael Mann466-626/+626
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09new_create_dissector_handle -> create_dissector_handle for dissector directory.Michael Mann596-1001/+1001
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09debian: Make wireshark meta-package depend on Qt _or_ GTK+ UIBalint Reczey1-1/+1
Change-Id: I0a6df7bd3b738125dd83be15d7a0e36e2396cc3d Reviewed-on: https://code.wireshark.org/review/12472 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-12-09new_create_dissector_handle_with_name -> create_dissector_handle_with_nameMichael Mann3-4/+3
Change-Id: I32d30ada66ee68782194905a8aa669c07f0dc204 Reviewed-on: https://code.wireshark.org/review/12482 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09"new" dissector API -> dissector API for docs/examplesMichael Mann3-11/+11
Change-Id: If862aadbd483933782d5979a3c0be2cb3c08a480 Reviewed-on: https://code.wireshark.org/review/12481 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09"new" dissector API -> dissector API for ASN.1 dissectors.Michael Mann160-310/+310
Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220 Reviewed-on: https://code.wireshark.org/review/12480 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-08androiddump: fix crash on Windows when running in verbose modePascal Quantin1-133/+133
As explained in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6695#c2 g_frpintf unfortunately crashed on Windows. Let's go back to fprintf instead. It will create warnings with MSVC2015 but we do not use it officially yet and at least androiddump will be working correctly again. Change-Id: Idfdb608576e18af63650af80e01bcda36dd81ac4 Reviewed-on: https://code.wireshark.org/review/12435 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>
2015-12-08Fix crash caused by nullptr in packet_listmichal.orynicz1-2/+2
Fix crash caused by nullptr returned from proto_registrar_get_byname in packet_list.cpp Change-Id: If8324bf7c926585e964a11b27817f73d444beec4 Reviewed-on: https://code.wireshark.org/review/11558 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>
2015-12-08Adding Zigbee dissectors for Groups Cluster and Scenes Cluster.Rishi Dev Singh4-5/+1306
Change-Id: Iac72e5383b623e424ff28d61ff3bdc37ac95fab7 Reviewed-on: https://code.wireshark.org/review/12369 Reviewed-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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-08opcua: expand ReturnDiagnostics field of RequestHeaderHannes Mezger3-60/+121
The ReturnDiagnostics field of RequestHeader is a bitmask. It cannot be generated, as the information needed is not contained in our models used to generate the generated files. This is why I made a manual change to opcua_complextypeparser.c. In the future, this change has to be merged if the file gets regenerated. Change-Id: Ic7db499566e3f3d3006feaff6e25e7b37a427dca Reviewed-on: https://code.wireshark.org/review/12470 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-08opcua: fix order of ExpandedNodeId bitsHannes Mezger1-1/+1
Make fields appear from right to left bit instead of mixed Change-Id: I78152eab6901440f483b0af7d2395edebaa7ab3d Reviewed-on: https://code.wireshark.org/review/12469 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-07Qt: Align extcap label and edit widgetsStig Bjørlykke1-2/+2
Change-Id: I5c1bff7bf3fadffb198ed2c5c96dac06d9e28c81 Reviewed-on: https://code.wireshark.org/review/12462 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-07Qt: Set the packet list width when we apply recent column widths.Gerald Combs1-17/+9
Instead of messing with stretchLastSection, simply widen the packet list to the sum of our column widths. Do this whenever recent column widths are applied instead of only when the packet list is shown. Bug: 11849 Ping-Bug: 11738 Change-Id: If8f8c9a89da08387bbce38c663bbbe1d8f7e649a Reviewed-on: https://code.wireshark.org/review/12455 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-07extcap: Fix extcap_example.bat arguments wildcardStig Bjørlykke1-1/+1
Change-Id: I3aa1b14e8047e4eec14464db80d7e03fa7a5dc57 Reviewed-on: https://code.wireshark.org/review/12464 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-07btavdtp: fix An unconditional 'break' within a loop found by PVS Studio (V612)Alexis La Goutte1-5/+3
Change-Id: Ic96f670bd4b039e12cdd467b8cc59470dd1553f3 Reviewed-on: https://code.wireshark.org/review/12331 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-07SCTP: Fix warning found by PVS Studioruengeler7-38/+19
Change-Id: I713eb6eff3681573baf77274847a32a4cc6b9ee0 Reviewed-on: https://code.wireshark.org/review/12408 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-07Spelling fixes for errors found by lintianBalint Reczey38-56/+56
Change-Id: I889283902875193f4d3f3fd59788f59f8d9bcc20 Reviewed-on: https://code.wireshark.org/review/11945 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-07Qt: It's no translation for "%1 %2"Stig Bjørlykke1-1/+1
Change-Id: If50a19b34b5f1c0076fcee76e59a45c307a9b2db Reviewed-on: https://code.wireshark.org/review/12456 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-07v5ua: The 'then' statement is equivalent to the 'else' statement found by ↵Alexis La Goutte1-58/+25
PVS Studio (V523) Change-Id: I0aa35944dbae45477a9db365f30cf24355f5328d Reviewed-on: https://code.wireshark.org/review/12454 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-07MIP6: Don't no need to have a another subtree (with wrong lenght for LLAAlexis La Goutte1-6/+3
Bug: 10627 Change-Id: Ia6940ef7624a92d453cada6693bcd7f4e145a5b6 Reviewed-on: https://code.wireshark.org/review/12453 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-06Get rid of a bunch of unused variables.Guy Harris3-9/+1
("Unused" includes "set but not used".) Change-Id: Id67859b366e8caa50262f8530630ec4e8ef1507a Reviewed-on: https://code.wireshark.org/review/12457 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-06debian: Merge multiple small packaging fixes from DebianBalint Reczey2-12/+16
* Ask user during installation if she/he wants to allow regular users to capture packets * Fix minor typos in d/control * Handle upgrades from older versions properly * Make wireshark depend on misc:Depends * Sync order of some fields Change-Id: I608b43cfaa81799f165f4c39734182d41cb1d524 Reviewed-on: https://code.wireshark.org/review/12448 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>