summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-19Fix lua file testsuite not working and weak heuristic readers not being ↵Hadriel Kaplan5-13/+32
registered The testsuite for Lua file reader/writer uses the acme_file.lua script to generate a pcapng file from an Acme sipmsg.log file. It then compares the tshark verbose output of this new pcapng file to a sip.pcapng file in the test/captures directory that was previously made. Unfortunately, the acme_file.lua script generates a timestamp based on local system timezone, rather than UTC, so the testsuite fails if not run in the EST timezone where the sip.pcapng file was originally made. This has now been fixed. Also, trying to register new weak heuristic readers fails because the GArray is terminated with a NULL-based row without Glib knowing about that. So this commit changes it to let Glib handle the NULL-terminated row, so that appending takes it into account automatically. Change-Id: I037ce1cfbda03585b3a1e159df78ff8ebb41fc32 Reviewed-on: https://code.wireshark.org/review/741 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Wiretap: Add support for Android LogcatMichal Labedzki7-2/+685
Now Androit Logcat (Logger) binary logs are supported. Try "adb logcat -Bf /sdcard/log.logcat; adb pull /sdcard/log.logcat". Also there is possibility to save logs to text format like by "adb". Change-Id: If7bfc53d3fbd549a0978d1dbf96f3fff671fd601 Reviewed-on: https://code.wireshark.org/review/235 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19Add a new case to find existing assocs when only the information of an INIT ↵ruengeler1-0/+6
chunk is provided. Change-Id: I88c5367652fb59a3da2cfd8895a1c0cc5176b859 Reviewed-on: https://code.wireshark.org/review/740 Reviewed-by: Michael Tüxen <tuexen@wireshark.org> Tested-by: Michael Tüxen <tuexen@wireshark.org>
2014-03-19Add check of whitespace error after Wireshark check (checkhf, checAPIs...)Alexis La Goutte1-3/+4
(Because check whitespace quit after check... and no longer launch other check...) Change-Id: I97ee0191c3d985934e74d23576f88984ec0e9b46 Reviewed-on: https://code.wireshark.org/review/739 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+1
Change-Id: I303184523c22d17c3f642852bcd97a9533bf5521 Reviewed-on: https://code.wireshark.org/review/738 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Try to fix Mac OS X BuildbotAlexis La Goutte1-3/+3
packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type packet-ieee80211.c:8585: warning: integer constant is too large for 'long' type Change-Id: I5badc6e0d2595d4353e33cd273d55f28737b34a8 Reviewed-on: https://code.wireshark.org/review/737 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Fix warning/error found by CheckAPIAlexis La Goutte1-8/+8
(and fix also fix-encodings-args) Change-Id: Ic2e99ca02398b7525b1cf68ab0d8279a2909940e Reviewed-on: https://code.wireshark.org/review/736 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19USB: decode HID desc for unknown iface classPeter Wu1-1/+2
If the interface class is not yet known (for example, in the enumeration phase; or if the interface descriptor was missed), then a HID descriptor would not get dissected. Instead of printing an unhelpful "unknown descriptor" message, always try to find a HID descriptor. Change-Id: Ic162d6b93b0428a1edd3a925229093dfcc52c42d Reviewed-on: https://code.wireshark.org/review/735 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19USB: show data fragment for control messagesPeter Wu1-1/+1
This makes the usb.data_fragment field more useful in tshark, i.e., showing the bytes for the data stage. Previously, the GUI would just show the "Data Fragment" text label which is not really useful on its own. Change-Id: Id0ca39a9a144a37aa6d0b4ae65c1d655deb76748 Reviewed-on: https://code.wireshark.org/review/734 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Try to make Mac OS X buildbot HappyAlexis La Goutte1-4/+5
packet-ieee80211.c:8581: warning: implicit conversion shortens 64-bit value into a 32-bit value packet-ieee80211.c:8582: warning: integer constant is too large for 'long' type packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type packet-ieee80211.c:8583: warning: implicit conversion shortens 64-bit value into a 32-bit value packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type packet-ieee80211.c:8584: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: I8f8c5518239c7d6e55006abfca8d9452f9a09c6a Reviewed-on: https://code.wireshark.org/review/733 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Fix buildAlexis La Goutte1-1/+1
wslua_file.c:92:13: error: request for implicit conversion from 'WFILE_T' to 'FILE_T' not permitted in C++ [-Werror=c++-compat] Change-Id: Iff9cc716333802a3902429a8c68e5f4cdac2ee9e Reviewed-on: https://code.wireshark.org/review/732 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19The 1.11.x installer puts the global plugins in the wrong place [Mac OS X]Alexis La Goutte2-2/+2
Issue found by rols The installer puts the normal included plugins (e.g. mate, wimax) in /Applications/Wireshark.app/Contents/Frameworks/wireshark/plugins, however the global plugins directory is set to /Applications/Wireshark.app/Contents/Resources/lib/wireshark/plugins (as it was in previous versions) so no plugins load at startup. In order to make them load you have to create this directory and copy the plugins there, or put them in your personal directory. From remark of Gerald, use recommandation of Bundle Programming Guide (use Contents/PlugIns for plugin) https://developer.apple.com/library/mac/documentation/corefoundation/conceptual/cfbundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW19 Change-Id: Ib1ae7da48a8fa94f7037912cd44c05532a238b71 Closed-bug: 9854 Reviewed-on: https://code.wireshark.org/review/602 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Support for IEEE 802.11adMoraney Jalil1-158/+3755
(according to the 9th draft of the standard) Closed-bug: 8594 Change-Id: I742726027bcab7d25ca4a9ce3a406518db6d272f Reviewed-on: https://code.wireshark.org/review/632 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Fix Error: the name for hf_lg8979_start_ptnum8 ("lg8979.start_ptnum8") hasAndersBroman1-1/+1
trailing space in packet-lg8979.c Change-Id: I80e5c93846c66aad1d1bc6f91b20501e0f384a6c Reviewed-on: https://code.wireshark.org/review/729 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19Exported PDU: add support for data length on the wirePascal Quantin13-18/+31
Change-Id: Iff14ec4d0297ec85f3597b33871fb0ab5256a597 Reviewed-on: https://code.wireshark.org/review/728 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19Fix Bug 9885: 'Buildbot crash output: fuzz-2014-03-14-15333.pcap'Hadriel Kaplan2-2/+15
The Buildbot found a crash which is cause by a bug that has been there all along, but a recent change exposed. This bug is likely in 1.10.6 as well, so I'll backport this if I can reproduce it in 1.10.6. Change-Id: I505bc73cbe6281e6d64f00de441c8e6231b55000 Reviewed-on: https://code.wireshark.org/review/702 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-19New Dissector for Landis & Gyr (Telegyr) 8979cbontje4-0/+1573
Commit includes dissector code for lg8979 as well as additions to RTAC Serial code to call dissector when required. See bug report 9874 for further details and sample pcap files UPDATE1: L&G 8979 commit for addressing comments from Anders and Alexis and added Cmakelists.txt UPDATE2: address further comments from Alexis re. proto_item_set_text / proto_item_add_text entries. Also add modelines UPDATE3: fix compilation error noted by Alexis UPDATE4: address proto_tree_add_* comments from Michael Change-Id: I6e69d2b7b7e91e6efa12e4a5fb7dbd140c0540ed Reviewed-on: https://code.wireshark.org/review/610 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-19Add capture file reader/writer support for Lua so scripts can implement new ↵Michael Mann23-171/+4874
capture file formats. This enables a Lua script to implement a brand new capture file format reader/writer, so that for example one could write a script to read from vendor-specific "logs" of packets, and show them as normal packets in wireshark. Change-Id: Id394edfffa94529f39789844c382b7ab6cc2d814 Reviewed-on: https://code.wireshark.org/review/431 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-18Fix OS-X compilation broken by gc354675Pascal Quantin1-2/+0
Change-Id: Ie32a2c256055059d1eade29af69eaad9011ca78b Reviewed-on: https://code.wireshark.org/review/727 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-18Dechunk/export sctp payloads trough export PDU.AndersBroman1-2/+51
Change-Id: I86d21cadcbd3e85b7a91d509ffd3c317d76a2ce2 Reviewed-on: https://code.wireshark.org/review/726 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17ULP: upgrade dissector to approved version 2.0.1Pascal Quantin5-35/+42
Change-Id: I9d7b16c450cb99aa1d66b0a180241c36f8869637 Reviewed-on: https://code.wireshark.org/review/716 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-17Enhance pre-commit tools to avoid false positiveAlexis La Goutte1-1/+1
Limit check to file with extension *.c or *.h Patch revert by mistake in 49394d3101ec286b335213a9845b6d4202955021 Change-Id: Ifed4c833c740218e5e24b3176dc20802fa5849bb Reviewed-on: https://code.wireshark.org/review/719 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-17Revert "Try to make the heuristic a bit more efficient."Bill Meier1-5/+5
(based upon an OK from Anders). (The commit caused 'reload_framing_info' to be referenced before being set). This reverts commit b3ce4ecc1460fc0171d65e69549e155b447d851a. svn path=/trunk/; revision=52004 Change-Id: If715e1cad041fd832f460411cc652d9b5764d069 Reviewed-on: https://code.wireshark.org/review/718 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-17Heuristics length check must use captured_length; Do other misc changes:Bill Meier1-164/+185
- Use tvb_reported_length() iso tvb_length() in various places; - Add some 'if(tree) {...}'; - Remove an unneeded length-check; - Use a consistent formatting style for hf[]array entries; - Do some minor whitespace changes; - Add editor modelines. Change-Id: Iac0a74142c5a5944e69fc911e54b0fbdfd1f5bab Reviewed-on: https://code.wireshark.org/review/717 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-17Try to fix warning: cast discards__attribute__((const)) qualifierAndersBroman1-172/+172
from pointer target type [-Wcast-qual] Change-Id: Idb1d8c9ac6fee135d3c3c7438d46ad6fb396954f Reviewed-on: https://code.wireshark.org/review/715 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17Try to fix trivial varningsAndersBroman6-17/+28
Change-Id: I7b09999fe34ffded73f0b26c3e561b39d2120643 Reviewed-on: https://code.wireshark.org/review/714 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17Mark tree as unused.AndersBroman1-1/+1
Change-Id: I57c201c0077144aace68bb51a6b0c7350dd8d5a8 Reviewed-on: https://code.wireshark.org/review/713 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17Inhance summary output for some 3GPP AVPsAndersBroman2-14/+107
Change-Id: I3657cef87070b91ae17a438140f1fb77edae8622 Reviewed-on: https://code.wireshark.org/review/709 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17Remove -Wunreachable-code it is removed from GCCAlexis La Goutte2-10/+0
http://gcc.gnu.org/ml/gcc-help/2011-05/msg00360.html Change-Id: I3f016611d0dc5e7cc6d53965f9b5d2b1ee88fe1c Reviewed-on: https://code.wireshark.org/review/677 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-17Fix some typo on 802.11 dissectorAlexis La Goutte1-11/+23
(Found by Jalil Moraney in change to add 802.11ad support review 632) Change-Id: I547bf647ae7400633ad27c7849088fd088928075 Reviewed-on: https://code.wireshark.org/review/708 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17Asterix CAT062 fix. Units for cartesian velocity of track were displayed ↵Marko Hrastovec1-2/+2
with wrong units. Change-Id: I716dfeb16b049544e691dcdf75c488758d9e1fa0 Reviewed-on: https://code.wireshark.org/review/707 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-17Revert de6bfa12b0c002e1930cfb9946078097d294acf8 (break Linux and Mac OS X ↵Alexis La Goutte2-5/+7
buildbot...) Change-Id: If5a6a77909b2d178052605cf2fc6fc0ef758553c Reviewed-on: https://code.wireshark.org/review/706 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-17Fix build on my old Windows XP Buildbot (With VS2008EE)Alexis La Goutte2-7/+5
../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot open include file: 'stdint.h': No such file or directory Change-Id: I8825a2f0b6440ec5a4bbfb49ea5c183dd8cbf03f Reviewed-on: https://code.wireshark.org/review/705 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16Print a message in case we don't have an X11 SDK installed about whereJoerg Mayer1-0/+8
to find xquartz. Change-Id: I76548fba0b01f8274d12bbb55f4f16622d9a7eff Reviewed-on: https://code.wireshark.org/review/704 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16CMake updates:Joerg Mayer1-2/+2
- build by default - update to 2.8.12.2 which actually builds on Mavericks Change-Id: I60b539613e13d2cdccbd083b28f641ff1ce363c4 Reviewed-on: https://code.wireshark.org/review/703 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16Add a #define for the stats block header length, and use it.Guy Harris1-14/+15
And rename to #define for the stats block trailer length to indicate that it's the length of the trailer, not the length of the stats block in its entirety. Change-Id: Iec82c971b32f2d3f4a604fe75a91633e1813ebd5 Reviewed-on: https://code.wireshark.org/review/701 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-16Make the avp_str available to sub dissectors and Let the subdissector haveAndersBroman2-2/+19
precedence filling in the avp_item string. Use that in a couple of places. Change-Id: I1af7a1ca4c14fb56ddeaab336202e6c2a18e556b Reviewed-on: https://code.wireshark.org/review/699 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16Small updates to the setup process documentationJoerg Mayer2-8/+22
Change-Id: Ie6dc3a8254e30495945155f058f1ef10a75c4745 Reviewed-on: https://code.wireshark.org/review/700 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16Remove Visual Studio solution and project files (and their existence from ↵Michael Mann22-3296/+1
Makefiles) There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git) Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0 Reviewed-on: https://code.wireshark.org/review/681 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16NFS: We need to pass data through to the dissect_rpc_list() callbackRonnie Sahlberg8-19/+26
Change-Id: Iace7c6dfb81f0a98bbae304346906a5e82c82812 Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> Reviewed-on: https://code.wireshark.org/review/679 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16[Automatic manuf, services and enterprise-numbers update for 2014-03-16]Gerald Combs3-11/+126
Change-Id: I714e82b9ea319c2937460978f6feb119917f56f9 Reviewed-on: https://code.wireshark.org/review/696 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-16Fix GTK3 detection (or more specific: the include paths) on WindowsJoerg Mayer1-2/+2
Change-Id: Ia0aef096849d1935ca4a6d1d31aabd099087cf29 Reviewed-on: https://code.wireshark.org/review/694 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16FixJoerg Mayer1-3/+3
[ 5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-umts_fp.c.o /home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c: In function ‘umts_fp_init_protocol’: /home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4526:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat] umts_fp_conversation_info->iface_type = uat_umts_fp_ep_and_ch_records[i].interface_type; ^ /home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4527:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat] umts_fp_conversation_info->division = uat_umts_fp_ep_and_ch_records[i].division; ^ /home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4533:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat] umts_fp_conversation_info->rlc_mode = uat_umts_fp_ep_and_ch_records[i].rlc_mode; ^ cc1: all warnings being treated as errors Change-Id: Ie783a261c40d26ffd105822d5f45bd0513aa1914 Reviewed-on: https://code.wireshark.org/review/693 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16And another warning fix.Guy Harris1-1/+2
Change-Id: Ibbf3366d0075f7b367383a2950c9f0bc54ae194c Reviewed-on: https://code.wireshark.org/review/692 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-16Squelch some warnings by narrowing or widening some variables.Guy Harris1-6/+9
Change-Id: If3ad60532e8b7e74272683b254582d86653c777e Reviewed-on: https://code.wireshark.org/review/691 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-16Get rid of unused #defines and no-longer-used structures.Guy Harris1-56/+3
The #defines came from Radiotap, but this isn't Radiotap (I see no presence bits here), and Radiotap has to handle stuff that this code doesn't (such as, for example, Atheros Wi-Fi adapters that, annoyingly, pad the space between the 802.11 header and the 802.11 payload when in monitor mode, hence the "datapad" flag). Change-Id: I87ca3539e0f9254ab94cc8897bdf69e4574f0525 Reviewed-on: https://code.wireshark.org/review/690 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-16Reorganize the code.Guy Harris1-375/+448
Pull the packet data copying code into the routines that parse the rest of the record data. Have those routines directly fill in the metadata headers in the packet data, without bothering to fill in a structure first. As a result, those routines no longer can set phdr->caplen to a value different from phdr->len, so don't set WTAP_HAS_CAP_LEN. Have the existing sanity checking code cause the read to fail if the checks fail, and add some additional sanity checking. Use #defines for some offsets into the statistics header and trailer. Change-Id: Ie936683b96888961d6e2598131cc0eb6146b37e9 Reviewed-on: https://code.wireshark.org/review/689 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-16Support to version 3.0 of netscaler packet wire format.Guy Harris6-11/+372
From shekhar.chandra@citrix.com. See bug 9280. Change-Id: If3abbc653bb1f127b151976d4183af4c4f1e71eb Reviewed-on: https://code.wireshark.org/review/658 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-16Add an UAT table to define endpoints and channel data to be able toAndersBroman1-1/+207
presetup conversations with FP dissection data. Change-Id: Ibced63bf944d7268751f8055095eb26477664be1 Reviewed-on: https://code.wireshark.org/review/643 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-15Clean up the setting of the len and caplen fields.Guy Harris1-48/+66
Always include the length of the metadata headers, as we're always copying them. Do a straightforward check to make sure the data length is >= 4 before subtracting out the FCS (which appears not to actually be an FCS; at least in the captures I've seen, it looks like random junk). Improve the comments for that code. Get rid of some tabs, in favor of spaces, while we're at it, and make the 3 sections of code where that's done more alike. Change-Id: Ica338cd492ac535833933a8b7cd5191217c5ab5b Reviewed-on: https://code.wireshark.org/review/685 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-06 15:50:21 +0000