aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-03-26Add various functions for Lua directory handling and path infoHadriel Kaplan16-197/+688
This adds new functions to get plugins path info, find out if a directory exists, make a new one, remove one, etc. It also creates a file environment for user-supplied Lua scripts, to prevent global variable contamination as well as supply the script-specific file name. Some other minor cleanup was done as I found them. A new testsuite was added to test the existing and new directory functions. Change-Id: I19bd587b5e8a73d89b8521af73670e023314fb33 Reviewed-on: https://code.wireshark.org/review/832 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26Add filterable expert info for LuaHadriel Kaplan13-63/+671
This adds the ability for a Lua script to register expert info fields, similar to C-code dissectors. This change also removes the need for the expert_add_info_format_internal() function. Existing Lua scripts do not have to change, because the existing expert info function uses the internal "_ws.lua" protocol instead of nothing; but using the new functionality provides more benefits since it correctly registers the expert info fields to the dissector's protocol. The test suite was amended to generate both old and new forms. Change-Id: Ib5ae74e927cfa81312baf7b04ff4104b0b4f936e Reviewed-on: https://code.wireshark.org/review/830 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25LTE RRC: fix dissection of SystemInfoListGERAN IEPascal Quantin1-1/+8
Change-Id: I502f7cd97cf00822900b4cd09e183e3b491c1437 Reviewed-on: https://code.wireshark.org/review/831 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-25MBIM: fix dissection of control packets when capturing with usbmonPascal Quantin5-18/+32
Change-Id: Ie20fcb8d393a85d47ba78f6cb70de77fedda2587 Reviewed-on: https://code.wireshark.org/review/829 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-25no need for if(tree)Martin Kaiser1-72/+55
Change-Id: If95ece8e2db1b650de5804465128020caf391956 Reviewed-on: https://code.wireshark.org/review/828 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-25use wmem_ascii_strdown()Martin Kaiser1-6/+4
Change-Id: Iaa7dfdc979e78f53b53f2b9a0b093873c9004f2d Reviewed-on: https://code.wireshark.org/review/827 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-25if a .png file is sent on the application mmi resource, pass the fileMartin Kaiser1-2/+22
data to the png dissector Change-Id: I112733f97ba35d9ec497b427c64b2f5ea99fd963 Reviewed-on: https://code.wireshark.org/review/818 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-25Strengthen RANAP heuristic.AndersBroman2-5/+23
Change-Id: I8f6515d2716bb633f753243b7f86d371a22ebbad Reviewed-on: https://code.wireshark.org/review/826 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25Introduce wmem_ascii_strdown()AndersBroman3-0/+44
Change-Id: Icdc5a0d5033f3ab709fbf19a33ab26f609d4b1f0 Reviewed-on: https://code.wireshark.org/review/824 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-25Bluetooth: Fix wrong recognized RFCOMM servicesMichal Labedzki2-32/+105
It seems that RFCOMM service can be dynamically changed while connection is still alive. In other words: host can connect to remote device and set one RFCOMM service (remote service), but later remote device can change service to one of host service without any disconnection. This patch add support for this case. Also improve searching for useful UUID service through SDP. Change-Id: I9e03b9b965d6b0d9761b4a451cdeb4a1a33ca017 Reviewed-on: https://code.wireshark.org/review/808 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25Bluetooth: AVDTP: Add option to disable Force Codec preferenceMichal Labedzki1-3/+5
In real option "SBC" was Default/Off, now user can choose between Default and Force SBC Codec. Change-Id: I605320d89fade11dc7172793bc0492bc4b319e9c Reviewed-on: https://code.wireshark.org/review/822 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25Don't register in the rtp.pt table if the pt value is set to zero.AndersBroman1-3/+4
Change-Id: I17c523da0fb57ed8591f409615fe56ab18977103 Reviewed-on: https://code.wireshark.org/review/823 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25DHCP/BOOTP: Add specific 43 Option when Class is ArubaAP or ArubaInstantAPAlexis La Goutte1-0/+46
Change-Id: I77d898af2b6b6f413f3698bb24f4c6280898da1a Reviewed-on: https://code.wireshark.org/review/775 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-25Enhance Lua API doc generator and add more API infoHadriel Kaplan15-1286/+2046
This enhances the Lua API doc generator Perl script to handle meta-information in description comments, such as bold, italics, raw code, version info, etc. The supported markup and codes are documented in make-wsluarm.pl. It's not beautiful Perl code (I don't know Perl), and I'd rather do it using Lua, but I think keeping it Perl makes more sense in the long run. Change-Id: I477b3ebe770075dcea9ec52708e2d6fb5758d2f4 Reviewed-on: https://code.wireshark.org/review/802 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25Comment cleanups.Guy Harris1-3/+3
Remove some more 802.11i references, and replace a reference to the "WEP" bit with a reference to the "Protected" bit. Change-Id: I77b50af2b34e2bdc4c21af29b54627ed19219090 Reviewed-on: https://code.wireshark.org/review/821 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-25IEEE 802.11i is dead; long live IEEE 802.11-2012.Guy Harris1-98/+106
802.11i was absorbed into a revision of the 802.11 spec, so speak of "IEEE 802.11 RSNA EAPOL"/"wlan_rsna_eapol" until somebody comes up with a better name for it. Also, add in one more key flags bit that's in 802.11-2012 but not 802.11i-2004. Change-Id: Ia825f7466f3b3d159706eb681546b5bbb4e066bf Reviewed-on: https://code.wireshark.org/review/820 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-24minor cleanupMartin Kaiser1-282/+280
- replace TABs with spaces - add editor modelines - remove unnecessary NULL checks Change-Id: Ic6024fc4b6aec56c8cafd39c707e20485fa6cca7 Reviewed-on: https://code.wireshark.org/review/819 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24separate function to dissect File Acknowledge APDUMartin Kaiser1-67/+77
Change-Id: I1824407cae4cded0680b01e9dea1de6f0408c607 Reviewed-on: https://code.wireshark.org/review/817 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24Upgrade LPPe dissector to V1_1-20140108-CPascal Quantin7-4195/+7155
Change-Id: I1d5d4ed73825bb5cda0cc2e76e5000c38c50b601 Reviewed-on: https://code.wireshark.org/review/816 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-24Add IEEE 1722a and Landis & Gyr Telegyr 8979 dissectors to release notesPascal Quantin1-0/+2
Change-Id: I1785bd35f9fcd2624a97e6ba224f3dbafb673846 Reviewed-on: https://code.wireshark.org/review/815 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-24Add the FNET_PRIVATE ppi extension.Clay Jones1-0/+18
Look for a dissector for "ppi_fnet" and use it if found, otherwise just display the fnet tag on the data. Change-Id: I07009215faa8faad0e6a82468bad33f266778426 Reviewed-on: https://code.wireshark.org/review/778 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Enhanced text2pcap so that if direction is specified on the command line, "-D",Graham Bloice1-16/+54
and a direction indicator added to the start of each packet in the text file, "I" or "O", then the ip source and destination addresses and udp, tcp and sctp ports are swapped for an inbound packet. Tcp sequence numbers and ack sequence numbers are updated accordingly. Change-Id: Iec2c0fd68d80aad8842b7513fdd30bae6806b96a Reviewed-on: https://code.wireshark.org/review/801 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-24no need for if(tree)Martin Kaiser1-9/+7
Change-Id: Ia6db5839a8bbbc79a5196406e3f8d59f7ce7498a Reviewed-on: https://code.wireshark.org/review/814 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24Check API found: Found non-ASCII characters on line 248 ..253AndersBroman1-6/+6
Change-Id: I964690c6468f1b8cfdf63cb5784f26065d56a204 Reviewed-on: https://code.wireshark.org/review/813 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Don't include voip_bg.xpm, it's not used any more.AndersBroman2-3/+0
Change-Id: I34fb5166afb7b1218cb7e011096c4a3455b364d3 Reviewed-on: https://code.wireshark.org/review/812 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Get rid of the background pixmap, set the background color directly.AndersBroman1-17/+8
Change-Id: I7b291892b041055fe4165abcbb2962a295aedce4 Reviewed-on: https://code.wireshark.org/review/811 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24USB: Fix comments about dissector tables used in "Decode As"Michal Labedzki1-2/+2
Issue requested by Tomasz Mon, thanks. Change-Id: I9931f561294ef34573c6426f17a299c8929a2341 Reviewed-on: https://code.wireshark.org/review/810 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Use tabs instead of spacesMichal Labedzki1-6/+5
Change-Id: I16086216ffcac0a457c8fcdabfc0458d4e701ea0 Reviewed-on: https://code.wireshark.org/review/809 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Bluetooth: L2CAP: Fix disconnection CIDsMichal Labedzki1-5/+10
CID has two roles: Source CID and Destination CID. This two roles have another two different meanings: one if frame is received, another if frame is sent (SCID is "DCID", etc). Then using information that PDU is "request" or "response" we can correctly recognize CID. This should fix unrecognized L2CAP payload while there were no valid Disconnection Request. Change-Id: Ibcbbb9e6966873b6af12c1e3c65c6a3983aa4163 Reviewed-on: https://code.wireshark.org/review/807 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Bluetooth: L2CAP: A little update to Core 4.1Michal Labedzki1-12/+120
Add some command codes seen in Core 4.1 specification. Also add some missing fields. Change-Id: If3761744b1ada185027a560bceb66804d7eea8ec Reviewed-on: https://code.wireshark.org/review/806 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Bluetooth: AVDTP: Use full name for MPF fieldMichal Labedzki1-1/+1
Change-Id: I25d359926fa5790383624378a6826c8fd5a9bd5c Reviewed-on: https://code.wireshark.org/review/805 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Bluetooth: AVDTP: Improve filteringMichal Labedzki1-8/+8
A few more filtering name separated by "." for convention. Change-Id: Ie1ceb0ba807e033085c43826c334933c6b178389 Reviewed-on: https://code.wireshark.org/review/804 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Bluetooth: Add Member "Company" UUIDsMichal Labedzki1-0/+19
Change-Id: I8f455f12eeeaa51a0699e4cc1ee639d7031ce2c6 Reviewed-on: https://code.wireshark.org/review/803 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Fix Argument with 'nonnull' attribute passed null found by ClangAlexis La Goutte1-5/+9
Change-Id: I5c84e4813d03b734afaf2a7cb3205773324f049d Reviewed-on: https://code.wireshark.org/review/798 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-24Fix Argument with 'nonnull' attribute passed null found by ClangAlexis La Goutte1-1/+1
Change-Id: Ie27fb4c5067c35237a5027ce6428b6cfed40b141 Reviewed-on: https://code.wireshark.org/review/797 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-23Add a dissector table for EAPOL Key Descriptor types.Guy Harris5-300/+448
Instead of having a switch statement in the EAPOL dissector for Key Descriptor types, have a dissector table, and: have the EAPOL dissector register with a dissector for the RC4 type; have the 802.11 dissector register with dissectors for WPA and RSN types. This means that ieee_80211_add_tagged_parameters() no longer needs to be public; make it static. Change-Id: I68e0592c3ea055c693d6d5d5a9eb88634ea37a95 Reviewed-on: https://code.wireshark.org/review/800 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-23Clean up white space.Guy Harris1-3/+5
This makes the code's if/then/else bracketing clearer. Make the if/then/else style more consistent in one case, which also helps. Change-Id: I7c765b761d92c6710461181b3e3ccd77d2a40f83 Reviewed-on: https://code.wireshark.org/review/799 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-23DHCP/bootp: Always display by default value of Option 43 (Vendor-Specfic)Alexis La Goutte1-0/+3
Change-Id: I91b711a11865ce8d31d3585b93b11923e25a12d3 Reviewed-on: https://code.wireshark.org/review/774 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-23[Automatic manuf, services and enterprise-numbers update for 2014-03-23]Gerald Combs3-6/+152
Change-Id: I33cecc1f3c4e66f5758eeb8cbba77cde97a06ae5 Reviewed-on: https://code.wireshark.org/review/793 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-23Note that the EAPOL-Key Key Data this dissects is for 802.11.Guy Harris1-0/+3
Change-Id: Id012c468da8619108ec41ad3ae43564f4fa636aa Reviewed-on: https://code.wireshark.org/review/791 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-23Update to QCustomPlot 1.2.0Alexis La Goutte2-3771/+6960
Reapply remove trailing whitespace and some spelling fixes MSCV warning are already fixed Fix also a not ASCII caracter in qcustomplot.h Change-Id: Ied6b0a4ad7397caea6b75fa56f4f2d6ea91d0472 Reviewed-on: https://code.wireshark.org/review/787 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-23Add Lua Struct.values() function, and prevent coercion in all Struct functionsHadriel Kaplan4-26/+101
This adds a Struct.values() function to get the number of values needed/returned with Struct.pack/unpack. It also changes the existing Struct functions such that they don't coerce a non-string argument into a string. (not preventing it confused a user on ask.wireshark.org) Change-Id: I93d5846105e55b67680e1c276a7286535c77b039 Reviewed-on: https://code.wireshark.org/review/790 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-23Add missing modelines infoAlexis La Goutte1-0/+13
Change-Id: Ic0f83eb469442b386d6389c08860b0faaae2e324 Reviewed-on: https://code.wireshark.org/review/785 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-22Fix spelling mistakes in Lua test scriptsHadriel Kaplan4-28/+28
Change-Id: I8671eb3d3b46ec5c723a6545451ecbb33a10c807 Reviewed-on: https://code.wireshark.org/review/788 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-22Fix Bug 9915 'GIOP dissector prints non-UTF-8 to Info column'Hadriel Kaplan1-2/+5
When the capture file in Bug 9915 is opened in wireshark with GTK2, the console prints out 'Pango-WARNING **: Invalid UTF-8' warnings. This capture file was a subset of the one in fuzzbot crash bug 9883. I believe it is what's causing the crash in 9883, because GTK is finicky about such things. But my system doesn't crash for bug 9883, so perhaps it's not the same root cause. Change-Id: Ifaaed9157f9abd34014001c954647f7db51d650b Reviewed-on: https://code.wireshark.org/review/786 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-22Fix request for implicit conversion from 'gpointer' to 'struct file_priv_t ↵AndersBroman1-2/+2
*' not permitted in C++ Change-Id: If88c65fa70d38d6b447a060a19d2681aa7166217 Reviewed-on: https://code.wireshark.org/review/783 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-22Add way for Lua file reader to save state per file read/write opsHadriel Kaplan4-280/+811
Lua can create a file reader/writer, to open new capture file formats or write to new ones. To save local state, it can save things in Lua itself; but since there can be multiple open files at the same time (for example during a reload), the Lua script won't know for which file and state its read/write functions are being invoked for. To remedy this, and also provide a convenient way to store such state, this commit adds the ability for a Lua script to store a Lua table in the wtap/wtap_dumper's priv data member, just like C-code-based reader/writers do. Change-Id: Ifc9e0d5f0379accee56f2a04b6080238670fec52 Reviewed-on: https://code.wireshark.org/review/766 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-22Fix Bug 9909 Buildbot crash correctlyHadriel Kaplan1-6/+2
Fixed a null de-reference in packet-ieee80211.c caused by change-id I742726027bcab7d25ca4a9ce3a406518db6d272f, commit g4b8b83407ac744d114462235a8bcca0d480954c7. See Bug 9909 for details. Change-Id: I7189476faee3ae6ab34fb52c1564ac668496679a Reviewed-on: https://code.wireshark.org/review/780 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21Enhance Neighbor reportAlexis La Goutte1-129/+187
Closed-bug: 9724 Change-Id: Id6aefcddf5bd8bd490296e84351152808c03004a Reviewed-on: https://code.wireshark.org/review/731 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21Fix indexcap toolsAlexis La Goutte1-1/+1
Change-Id: Ib77af11975873106b7db7ac1bcd12f4a0800b59e TypeError: extract_protos_from_file() takes exactly 6 arguments (7 given) Reviewed-on: https://code.wireshark.org/review/779 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>