aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-02-21Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-4/+1
Change-Id: I05ca21d94bbaa8c92a33f02ceb100c206c198052 Reviewed-on: https://code.wireshark.org/review/298 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-21Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-5/+0
Change-Id: Ic3a240a2e751700f653287dd84fe58016adab9e2 Reviewed-on: https://code.wireshark.org/review/297 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-21Moving custer list/cluster id attribut to itemsMatthieu Texier1-24/+12
Change-Id: If23c530b10c67613311aa8a8a1b1a8acf95f3c48 Reviewed-on: https://code.wireshark.org/review/294 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-21EPL + openSAFETY: Better handling of guint in EPLRoland Knall2-45/+65
This is a permanent solution for bug #9786. guint overflows are now prevented, and the remaining length is queried from tvb and taken into consideration. As a side-effect, the fix brought up two bugs in the openSAFETY dissector, which where fixed as well. Upd: Remove stdio.h and fix one encoding error found by fix-encoding-args.pl Change-Id: Ic2d478a8ea15b0bcfd2536a074c217daf610fe08 Reviewed-on: https://code.wireshark.org/review/291 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-21Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-43/+43
Change-Id: I329fd1cec092e425dd0f6c2c1992d278dcdba743 Reviewed-on: https://code.wireshark.org/review/293 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-21Add test suite for verifying Lua global variables/tables of previous ↵Hadriel Kaplan9-1/+2317
releases have not disappeared. Several bugs have been introduced due to changing of perl scripts or #define names, such that things exported into Lua have dissapeared or changed unintentionally. This commit adds a test suite which compares the Lua global table with the ones from previous releases (1.8 and 1.10), to verify nothing has gone missing. New items can be added, but old ones cannot go away. The added script to verify these things, called 'verify_globals.lua', also has the ability to display what's new - i.e., what was not in the olrder releases. Lastly, this commit also fixes a bug: MENU_STAT_ENDPOINT became MENU_STAT_ENDPOINT_LIST due to a change in the make-init-lua.pl perl script in this 1.11 release. Change-Id: Iba143d1a436e706970635a5f8cc2b317955392bf Reviewed-on: https://code.wireshark.org/review/284 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-02-21And we need wslua_internals.obj as well.Guy Harris1-8/+9
Sort the list to match the .c list while we're at it, to make it easier to check for errors. (Why isn't this done with a Makefile.common file?) Change-Id: I239964d53be9e48bddbd6180aabe118b5cac1fd0 Reviewed-on: https://code.wireshark.org/review/287 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-21Need to include wslua_internals.c here as well.Guy Harris1-1/+2
Change-Id: Ibae7e4473ad0131e399423ee9faba5ad759feaed Reviewed-on: https://code.wireshark.org/review/283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-21Fix warnings - index() is declared as a function in some systems.Guy Harris1-4/+4
Change-Id: If9ee9f0decc0a9d7971095109e1012b015a9dc96 Reviewed-on: https://code.wireshark.org/review/282 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-21Revert "Add test suite for verifying Lua global variables/tables of previous ↵Evan Huus8-2304/+1
releases have not disappeared." This reverts commit 5b7f00178f45149ecdce204f1c71c1598ceedac1. Change-Id: Idf09d25270847970713b67d02bcd7cbc411a4e9c Reviewed-on: https://code.wireshark.org/review/280 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-21Add test suite for verifying Lua global variables/tables of previous ↵Hadriel Kaplan8-1/+2304
releases have not disappeared. Several bugs have been introduced due to changing of perl scripts or #define names, such that things exported into Lua have dissapeared or changed unintentionally. This commit adds a test suite which compares the Lua global table with the ones from previous releases (1.8 and 1.10), to verify nothing has gone missing. New items can be added, but old ones cannot go away. The added script to verify these things, called 'verify_globals.lua', also has the ability to display what's new - i.e., what was not in the olrder releases. Lastly, this commit also fixes a bug: MENU_STAT_ENDPOINT became MENU_STAT_ENDPOINT_LIST due to a change in the make-init-lua.pl perl script in this 1.11 release. Change-Id: Ic46172904256dc535b0fe4543237c07dddb3b9b5 Reviewed-on: https://code.wireshark.org/review/242 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-21Cleanup on aisle 5: normalizes the Lua code to follow common schema/modelHadriel Kaplan15-1360/+1081
Over time the various wslua classes/functions have gotten moldy, with different ways of doing similar things. Some of it can't be changed without breaking backwards compatibility for Lua scripts, so I didn't do that. But I did what I could. The biggest change is a refactoring of how accessors/attributes are handled in the code, so that most of them work the same way using the same code. Specific changes made: * Added null/expired checking macro to class declarations for many classes * Removed extraneous pointer/expired checking, since checkFoo() does that already * Fixed "errors" reported by clang static analyzer; they were false positives, but it was easier to get it to stop complaining by changing the code * Moved internal wslua functions from wslua_utils.c into a new 'wslua_internals.c' file * Changed Listener/NSTime/Pinfo/Proto to use a common setter/getter accessor/attribute code model, instead of each of them doing their own * Fixed some API doc mistakes, mostly around attributes that were documented as read-only but were actually read-write Change-Id: Idddafc5fbd3545ebff29e063acc767e1c743a1a9 Reviewed-on: https://code.wireshark.org/review/271 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-02-21Force "printing" if -T is specified, even if -w is also specified.Guy Harris1-0/+1
Just as "tshark ... -P -w xxx" writes raw packets to xxx *and* writes text packet summaries to the standard output, and just as "tshark ... -V -w xxx" writes raw packets to xxx *and* writes text packet details to the standard output, so should "tshark ... -T fff -w xxx" write raw packets to xxx *and* write whatever "-T fff" (and any "-e" options) specifies to the standard output. Change-Id: I28ab3a4d48531f297533ec4dfb3742031eb69885 Reviewed-on: https://code.wireshark.org/review/278 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-20Try a simpler method of fixing 32/64 issuesEvan Huus1-8/+8
It appears we're only working on four chars anyways, so the cast to gint should be safe. Reverts 602d7d3d39f26b06bcfa25bf9580cfd652a7eee7 Change-Id: Ice101fea7dd7fe4cc65f0d673210c0c791cbe1c5 Reviewed-on: https://code.wireshark.org/review/277 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-20Fix more 32/64 casting errorsEvan Huus1-2/+2
Change-Id: I13a3a19738dd5933d9e19045fc188bb8e2f04fe0 Reviewed-on: https://code.wireshark.org/review/275 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-20g_ascii_strtoull returns a gint64Evan Huus1-7/+7
fixes build errors on certain 32-bit systems Change-Id: I6476107aa753b670df6bede0ce15ea6760e52aeb Reviewed-on: https://code.wireshark.org/review/274 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-20Fix mode for lua test suiteEvan Huus1-0/+0
Change-Id: If516472ca9c4a0ae84da22a0ecfc9449f0495cbb Reviewed-on: https://code.wireshark.org/review/273 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-20Initial basic RTPproxy-ng dissectorPeter Lemenkov1-1/+31
Initial basic RTPproxy-ng dissector which uses bencode packing. Change-Id: I5b3e9f6e745977b3df12263c3a9f4ee9a3e1445e Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> Reviewed-on: https://code.wireshark.org/review/268 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-02-20Android: Add support for ADB Client-Server protocolMichal Labedzki3-0/+1026
ADB Client-Server Protocol is protocol between adbd (ADB Daemon aka Server) and adb client (aka adb). Typically you can find it on "lo" interface over TCP protocol. Change-Id: Iad008560c983f5ede554e1eaa728d703aae95eed Reviewed-on: https://code.wireshark.org/review/233 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-20Fix "off by 1" bug in dissection of OPTION_AFTR_NAME introduced in 0548a7d5.Bill Meier1-1/+1
Change-Id: I461601cd952f1c4d27a004c0a65cfefe82dc0f49 Reviewed-on: https://code.wireshark.org/review/272 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-20Add 4 more test scripts for Lua, and its own testsuite menuHadriel Kaplan7-104/+1086
This adds test scripts for verifying Pinfo, Address, Field, FieldInfo, NSTime and Listener classes/functions. It also moves Lua test scripts out of unittests and into its own new testsuite. Change-Id: I65c238fd459efb96db3f8f9145842cd038dea7c7 Reviewed-on: https://code.wireshark.org/review/270 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20Add support for Bluetooth Linux MonitorMichal Labedzki6-10/+81
BlueZ 5/Linux Kernel introduced new way to sniffing Bluetooth interfaces. We are ready to use it. Libpcap provide new interface called "bluetooth-monior". Also fix trivial typos. Change-Id: Ic608a3d8553bbebbb21f2733ec92c758cbf8f707 Reviewed-on: https://code.wireshark.org/review/253 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20Fix Bug 9792: 'Lua: setting pinfo.dst_port actually sets src_port'Hadriel Kaplan1-1/+1
Setting the Pinfo.dst_port to a value actually changes the src_port's value, due to a bug in wslua_pinfo.c, where both src_port and dst_port attributes use the PARAM_PORT_SRC for their setter type enum. Change-Id: I1b84ba8b343ec857d04a2d0809e16f17ba2a43e8 Reviewed-on: https://code.wireshark.org/review/269 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20Add missing SBC library to cmake buildMichal Labedzki1-0/+1
Change-Id: I4eb2dacc196b8feef62ff633322c53c04f78fc92 Reviewed-on: https://code.wireshark.org/review/252 Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20Enhance pre-commit tools to avoid false positiveAlexis La Goutte1-1/+1
Limit check to file with extension *.c or *.h Change-Id: I6e237e6fd053083d271924120973a6b07e2d4e53 Reviewed-on: https://code.wireshark.org/review/247 Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20BGP : clean up of unused define and adding amount of ext-communities in ↵Matthieu Texier1-41/+1
community item Change-Id: I55793e522d0bdaee0f19ca020a8ef0097f5fb5f1 Reviewed-on: https://code.wireshark.org/review/255 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20Limit the range to the TSNs provided.Irene Rüngeler1-4/+6
Change-Id: Ibf72fb60d06baa7a9590a303f2e10e5a86c61093 Reviewed-on: https://code.wireshark.org/review/254 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-02-20Fix minor bug; Use a consistent whitespace & formatting style; add extended ↵Bill Meier1-429/+429
value-string. Bug fix: don't call col_...() under 'if (tree)' Change-Id: I5f586f16f0e64b30da49fbbb0bb8e41b04ba8833 Reviewed-on: https://code.wireshark.org/review/267 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-19fix endless loopMartin Kaiser1-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9786 Change-Id: I336f2bcc14596d64ad2e3f3e8140269996e077f5 Reviewed-on: https://code.wireshark.org/review/260 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-02-19Create/Use some extended value strings.Bill Meier1-12/+18
Change-Id: I750d04a25a4f7d600e4156aaac4a4580a1f7a345 Reviewed-on: https://code.wireshark.org/review/259 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-19Fix incorrect definition and use of a val64_string which caused a crash.Bill Meier1-2/+2
Change-Id: Ib15ddef167c0e2af24938fc5bb68839eac65ca2c Reviewed-on: https://code.wireshark.org/review/258 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-19Simplify/improve handling of FQDN field in various options; Fix some minor bugs.Bill Meier1-173/+131
Details: - Use dhcpv6_domain() to handle dissection of certain FQDN fields: + OPTION_AFTR_NAME: Don't use get_dns_name(); It allows "compression" which is not valid forthis field. + OPTION_CCCV6_IETF_PROV_SRV: Replace use of swap_field_length_with_char(); Fix bug which caused invalid "expert" message. + OPTION_CCCV6_KRB_REALM: Remove validation; replace use of swap_field_length_with_char(). - Allow filtering for each different FQDN field (rather than using a generic "dhcpv6.domain" for the various FQDN fields). - Fix some bugs in the display of the dissection for NTP_SERVER_OPTION; - Add some "XXX ToDo" comments. - Add some comments as the to specific RFC for certain options; - Note that RFC 4075 is now "deprecated"; - CL-SP-CANN-DHCP-Reg: version I10 is the latest as Feb 2014. Change-Id: I82edafb8293b71037b84629406ce609f9a835f04 Reviewed-on: https://code.wireshark.org/review/257 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-19Remove code which dissects CableLabs options 17.2170.3 thru 17.2170.9Bill Meier1-204/+16
inasmuch as these options don't exist per the spec. See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9690 (especially comment #5). Change-Id: Iab757a71fe1865bbd0b97443512bf947f027dbe1 Reviewed-on: https://code.wireshark.org/review/256 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-19Bug 9721 - profinet write doesn't decode the Profidrive value Type correctWidok1-46/+155
removed win-setup.sh.bak Signed-off-by: Widok <kellingwido@aol.com> Change-Id: I4ec65ef10ca794cd5b43fa66502edd4533c356d1 Reviewed-on: https://code.wireshark.org/review/198 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-18the gif version string is 7bit ASCIIMartin Kaiser1-1/+1
Change-Id: I1e827ad4d2cf64411c5a87f4710235dc4d6efc35 Reviewed-on: https://code.wireshark.org/review/250 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-02-18Fix indent (use tabs)Alexis La Goutte1-16/+16
Change-Id: I45f5e2ed64090947f1605db10eb6cee0e33782bf Reviewed-on: https://code.wireshark.org/review/248 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Fix Branch condition evaluates to a garbage value found by Clang AnalyzerAlexis La Goutte1-0/+4
Change-Id: I745f838a763e5cc89e1b9c0536ad3cb299b00786 Reviewed-on: https://code.wireshark.org/review/245 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Fix typo in name of Radio Type 802.11b (in IEEE802.11 WTP Radio Information)Alexis La Goutte1-1/+1
Found by Massimo Vellucci Change-Id: Ibbe2d0a4d1e421e647028262baf0398d05905c8d Reviewed-on: https://code.wireshark.org/review/246 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Add Logcat to Exported PDUMichal Labedzki4-0/+18
Logcat can be exported from ADB over USB or ADB over TCP where can occur multiple Logcat PDUs in one frame. Change-Id: I290fa131e5600c62357e5be4e76096ea5c35364b Reviewed-on: https://code.wireshark.org/review/234 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Android: Add support for Logcat dissectorMichal Labedzki4-0/+288
Supported is Binary Logcat/Logger, aka adb logcat -Bf /sdcard/log.logcat Change-Id: I883c6d746ec4fe67ef4ce15ca4227adce407fb76 Reviewed-on: https://code.wireshark.org/review/232 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Remove $Id$ from the ASN.1 dissectors and regenerate them.Jeff Morriss1197-4559/+2069
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954 Reviewed-on: https://code.wireshark.org/review/244 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-17BGP : Update Capability CodesAlexis La Goutte1-31/+40
From IANA page: http://www.iana.org/assignments/capability-codes/capability-codes.xhtml Use decimal value (like iana page) Fix Dynamic Capability value... Change-Id: I9a6e672de840403943792b6ba4d913b186b1d09f Reviewed-on: https://code.wireshark.org/review/243 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17<Ctrl>R to restart does not work [Wireshark Qt]Alexis La Goutte2-9/+11
From me : Add reload action Change-Id: Ic47e3ff1ae0c1cc0ae8c40e5019dea9906612f90 Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/238 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17On 'You have unsaved packets' dialog, expected D or <Alt>D to use as ↵Alexis La Goutte1-2/+4
accelerator to discard and S or <Alt>S of save [Wireshark Qt]. From me : Add window title and fix missing text (Do you want to ....) Change-Id: I1448d7b85ad9490a92dac7e89d9fd2fdb51a145e Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/239 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17Menu cannot be reached using accelerators, for example <Alt-F> does not open ↵Alexis La Goutte1-0/+5
File [Wireshark Qt]. Change-Id: I8a67d435510d5604bb501872f264cce4ba23595d Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/237 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17Add Bluetooth SBC Codec support in cmakeMichal Labedzki4-0/+46
SBC Codec can be optionally linked with Wireshark to provide ability to playing RTP/SBC stream by RTP Player. Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5 Reviewed-on: https://code.wireshark.org/review/223 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17Display the number of unknown BGP Path Attribut (use val_to_str)Alexis La Goutte1-1/+1
Change-Id: I6aed8ee3a92cc08aebfef58372285bed5a62e8bd Reviewed-on: https://code.wireshark.org/review/240 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-16Add config.cache to .gitignoreBill Meier1-0/+1
Change-Id: Ic1a5d06f9a0bea4ea10cd009000d5074541bec2a Reviewed-on: https://code.wireshark.org/review/236 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-16[Automatic manuf, services and enterprise-numbers update for 2014-02-16]Gerald Combs4-23/+230
Change-Id: I94453e0ca00d8eaf6877d1b9c2a529431582f08d Reviewed-on: https://code.wireshark.org/review/229 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-16Bluetooth: AVDTP: Fix byte orderMichal Labedzki1-143/+142
AVDTP does not specify byte order of protocol, but define that at byte level (MSB/LSB). Moreover: Codec VendorId is in Little Endian and this patch fix that. Change-Id: I91d8e9321e9909cb07d92d3df348ab6e1e5b1e1b Reviewed-on: https://code.wireshark.org/review/222 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>