Commit Graph

52230 Commits

Author SHA1 Message Date
Pascal Quantin 7785dd00cd Please checkAPI.pl
Change-Id: I78e9d3781df81fd4edda7e9b20749cb096a05499
Reviewed-on: https://code.wireshark.org/review/861
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-28 22:51:50 +00:00
Hadriel Kaplan c39060a21c Update README.wslua with latest info.
Change-Id: I20ea6c374f791054f16f0aaba33967b869348ff5
Reviewed-on: https://code.wireshark.org/review/857
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-28 19:58:03 +00:00
Bill Meier a8562b2a66 Add handling of OSC over TCP; fix a bug in the UDP heuristic.
Bug Fixed: UDP heuristic wasn't properly setting the dissector
for the UDP conversation.

From https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9837#c3:

 I did a little survey about alternative OSC transmission, but UDP.

 As OSC is packet-based, it is tramitted raw via packet-oriented protocols (e.g. UDP).

 For reliable stream-based protocols (TCP, USB), the raw OSC packet is
 prefixed with the packets Int32 size as a packetization scheme.

 For unreliable stream-based protocols (RS232 and other serial lines),
 the raw OSC packet is SLIP and/or double SLIP encoded as packetization
 scheme.

 There was discussion in the past to make SLIP encoding the default for
 all stream-based protocols, but apparently it has never been adopted
 for any OSC via TCP implementation I've found in the web.

 As OSC is used in networked Audio, most implementations run with the
 Nagle algorithm disable, and send the prefixed length and the raw OSC
 packet separately.

Change-Id: Ife690cc5ea0575c65124a7b441431e1cc6ba5091
Reviewed-on: https://code.wireshark.org/review/858
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-28 18:00:41 +00:00
AndersBroman f7c62543f9 tvb_get_ascii_string is really expensive. On a large capture file which I
profiled in october Fetch cost has gone from 15,6M to 24,2M, changing
tvb_get_string() to tvb_get_string_enc() with ENC_UTF_8 where it seems
safe helps a bit and should be done any way.

Change-Id: I4d3e640bfde3304a991c09e2a30ad7dd132fc5ac
Reviewed-on: https://code.wireshark.org/review/855
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-28 14:05:29 +00:00
Pascal Quantin 3438243c1e Fix crash when calling "MAP Summary" dialog when no file is open
Fixes bug 9934

Change-Id: I2915d0715431cf983511fe7f5f036be99bbd2467
Reviewed-on: https://code.wireshark.org/review/853
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-28 12:48:50 +00:00
AndersBroman b2509f67b8 Deleted one line to much in previous chgange.
Change-Id: I19d1153558130356286bac55f6cb321d30a767b1
Reviewed-on: https://code.wireshark.org/review/852
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-28 05:48:20 +00:00
Hadriel Kaplan 2c1e673fa2 Allow chained calls with Lua TreeItem functions, and fix a couple of minor errors.
A common Lua idiom is to use chained calls, i.e. tree:foo():bar():choo(). This actually
works for tree:add() because it returns the new child tree item which is then the one
being applied to the next chained call. But it doesn't work beyond that for things like
set_generated() and so on.  So this commit fixes that.

This also fixes the Lua tree:add() function for the FT_BOOL type to let it be a Lua boolean value.
And it reverts a previous change to Struct.tohex() to allow coercion of the argument.

Change-Id: I10f819d363163914ba320c87d4bedebe5b50cacf
Reviewed-on: https://code.wireshark.org/review/851
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-28 04:27:43 +00:00
Martin Kaiser 0ffc690da4 dissect sRGB chunk
Change-Id: I5a9eefb7f5108de0e46b70453a4485b1cbc3983d
Reviewed-on: https://code.wireshark.org/review/850
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-27 21:42:23 +00:00
Martin Kaiser ca384a1324 use an expert info if a png chunk is too large for us
Change-Id: I6a06bf297ef68ca351deff2e08eec7cd12ba8fe0
Reviewed-on: https://code.wireshark.org/review/849
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-27 21:42:05 +00:00
Hadriel Kaplan ca9c160933 Fix bug9931 'Encapsulated ethernet packets sometimes show invalid FCS'
This fixes part-1 of bug9931: the uninitialized use of a wtap_pkthdr
struct. The second part of the bug deals with dissectors calling
the Ethernet dissector for ecnapsulated Ethernet packets but using
the wrong dissector handle to do so. That's unrelated to the issue this
commit addresses, so I'm splitting them up.

Change-Id: I87be7b736f82dd74d8c261062f88143372b5344c
Reviewed-on: https://code.wireshark.org/review/848
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27 21:39:57 +00:00
AndersBroman 9a977fc8d0 Add dissection of 3G Interface Type package and add some comments about
the usage of variables in the h248_package_t struct.

Change-Id: Ic5419ab5c20051e56963fe8ea1728d78f95538f0
Reviewed-on: https://code.wireshark.org/review/846
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27 16:54:05 +00:00
AndersBroman d1bef29125 Regenerate the dissector with the latest template.
Change-Id: Iefdd7122537108c37e71650ad2674418109d2f1b
Reviewed-on: https://code.wireshark.org/review/845
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27 14:09:23 +00:00
Pascal Quantin 418c3a7f62 NAS EPS: display also detach cause in case of network initiated procedure
Change-Id: I36fef9eb8a81b03f29c812f94524f4cdf056448b
Reviewed-on: https://code.wireshark.org/review/844
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-27 12:52:20 +00:00
Pascal Quantin 3dd4ef59bb MBIM: fix identification of DSS streams and add a way to register an external dissector for DSS
Change-Id: Ic7f5708b60ee5846d95725dbbd14d8958d43372e
Reviewed-on: https://code.wireshark.org/review/843
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-27 10:12:27 +00:00
AndersBroman 3584a21c87 From Martin Mathiesson: Display Detach Type in info col.
Change-Id: I33692ac93f60cbabec0804f6ee7e75a9d5b9497c
Reviewed-on: https://code.wireshark.org/review/842
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27 09:50:44 +00:00
Hadriel Kaplan f3fe29f0fc Add paths to Lua package.path so require works for user scripts
This adds the global and personal plugins directories to the
package.path setting in Lua, so doing 'require' will work
properly.

Change-Id: Iec33bc60cd7d41aa122da456db91d4ccc3085f82
Reviewed-on: https://code.wireshark.org/review/841
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27 05:03:39 +00:00
Martin Kaiser 09055f18a5 two more chunk names
Change-Id: I5a34a59c88a4119be2fac4acdd352d474ffc62cd
Reviewed-on: https://code.wireshark.org/review/840
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-26 22:24:44 +00:00
Martin Kaiser 949747697c add some more chunk names
Change-Id: I6d294a901af88f993ca6a44ababad194fb44a693
Reviewed-on: https://code.wireshark.org/review/839
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-26 22:16:40 +00:00
Martin Kaiser d5ddfed512 clean up the png dissector
use value_string instead of our own data type
read the type string in one go

Change-Id: I115c99c4636540702c1fd301f09a92a0dd466fcd
Reviewed-on: https://code.wireshark.org/review/838
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-26 22:16:22 +00:00
Martin Kaiser 436100c66a use the correct png chunk len
the parameter for proto_tree_add_text() is the length, not the end offset

Change-Id: Ie24d5982b7ff13363061fb087438dd714cae748a
Reviewed-on: https://code.wireshark.org/review/837
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-26 22:16:03 +00:00
AndersBroman 482a3cd1f1 More fiddling with heuristic.
Change-Id: I50b78cc38c6f529695ecd54ced0ed94e8a683534
Reviewed-on: https://code.wireshark.org/review/835
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26 14:57:14 +00:00
AndersBroman 873a96fab1 Fix off by one error
Change-Id: I24c9e988786a95489f918bed2c043e6eb23e4caa
Reviewed-on: https://code.wireshark.org/review/834
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26 12:11:39 +00:00
Balint Reczey 7fd2daaab3 Postpone replacing GTK+ stock icon usage
This prevents regressions observable on GTK+ 3.10 which caused
icons to disappear in some cases.

Change-Id: Ic971258807510dc038e30c6c64fb547f0529a3c2
Reviewed-on: https://code.wireshark.org/review/792
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-03-26 10:35:56 +00:00
Pascal Quantin 97ab466679 LTE RRC: add file forgotten in gb981173
Change-Id: I1727e56e678c32402f6331463c06c62072c954d8
Reviewed-on: https://code.wireshark.org/review/833
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-26 09:58:15 +00:00
Hadriel Kaplan 8c2bb80574 Add various functions for Lua directory handling and path info
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-26 07:37:34 +00:00
Hadriel Kaplan da1af6e549 Add filterable expert info for Lua
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-26 05:20:17 +00:00
Pascal Quantin b981173669 LTE RRC: fix dissection of SystemInfoListGERAN IE
Change-Id: I502f7cd97cf00822900b4cd09e183e3b491c1437
Reviewed-on: https://code.wireshark.org/review/831
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-25 23:14:50 +00:00
Pascal Quantin 38b5efd5cf MBIM: fix dissection of control packets when capturing with usbmon
Change-Id: Ie20fcb8d393a85d47ba78f6cb70de77fedda2587
Reviewed-on: https://code.wireshark.org/review/829
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-25 22:04:23 +00:00
Martin Kaiser 843054ce96 no need for if(tree)
Change-Id: If95ece8e2db1b650de5804465128020caf391956
Reviewed-on: https://code.wireshark.org/review/828
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-25 20:38:50 +00:00
Martin Kaiser 027ecfb658 use wmem_ascii_strdown()
Change-Id: Iaa7dfdc979e78f53b53f2b9a0b093873c9004f2d
Reviewed-on: https://code.wireshark.org/review/827
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-25 20:38:33 +00:00
Martin Kaiser 63b0d89574 if a .png file is sent on the application mmi resource, pass the file
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-25 20:09:20 +00:00
AndersBroman d6381c6fe6 Strengthen RANAP heuristic.
Change-Id: I8f6515d2716bb633f753243b7f86d371a22ebbad
Reviewed-on: https://code.wireshark.org/review/826
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25 17:20:48 +00:00
AndersBroman 86d65a0758 Introduce wmem_ascii_strdown()
Change-Id: Icdc5a0d5033f3ab709fbf19a33ab26f609d4b1f0
Reviewed-on: https://code.wireshark.org/review/824
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-25 16:10:43 +00:00
Michal Labedzki a99a0360c4 Bluetooth: Fix wrong recognized RFCOMM services
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-25 09:13:13 +00:00
Michal Labedzki ab42220b65 Bluetooth: AVDTP: Add option to disable Force Codec preference
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-25 09:08:58 +00:00
AndersBroman e90f660cb3 Don't register in the rtp.pt table if the pt value is set to zero.
Change-Id: I17c523da0fb57ed8591f409615fe56ab18977103
Reviewed-on: https://code.wireshark.org/review/823
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25 09:06:22 +00:00
Alexis La Goutte 03d982a7bb DHCP/BOOTP: Add specific 43 Option when Class is ArubaAP or ArubaInstantAP
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-25 08:22:23 +00:00
Hadriel Kaplan de441241ef Enhance Lua API doc generator and add more API info
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-25 05:30:11 +00:00
Guy Harris e4756ccacf Comment cleanups.
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-25 03:20:12 +00:00
Guy Harris 4038fa9b0a IEEE 802.11i is dead; long live IEEE 802.11-2012.
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-25 03:08:03 +00:00
Martin Kaiser 250c2b065d minor cleanup
- 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-24 21:58:55 +00:00
Martin Kaiser 9c2e374433 separate function to dissect File Acknowledge APDU
Change-Id: I1824407cae4cded0680b01e9dea1de6f0408c607
Reviewed-on: https://code.wireshark.org/review/817
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24 21:58:17 +00:00
Pascal Quantin d2ba47392e Upgrade LPPe dissector to V1_1-20140108-C
Change-Id: I1d5d4ed73825bb5cda0cc2e76e5000c38c50b601
Reviewed-on: https://code.wireshark.org/review/816
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-24 21:35:40 +00:00
Pascal Quantin 69f4610910 Add IEEE 1722a and Landis & Gyr Telegyr 8979 dissectors to release notes
Change-Id: I1785bd35f9fcd2624a97e6ba224f3dbafb673846
Reviewed-on: https://code.wireshark.org/review/815
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-24 21:25:17 +00:00
Clay Jones 8aaff81d76 Add the FNET_PRIVATE ppi extension.
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-24 19:14:23 +00:00
Graham Bloice 93d996ba38 Enhanced text2pcap so that if direction is specified on the command line, "-D",
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-24 15:52:16 +00:00
Martin Kaiser d04cddf6d3 no need for if(tree)
Change-Id: Ia6db5839a8bbbc79a5196406e3f8d59f7ce7498a
Reviewed-on: https://code.wireshark.org/review/814
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24 14:31:27 +00:00
AndersBroman d066376a74 Check API found: Found non-ASCII characters on line 248 ..253
Change-Id: I964690c6468f1b8cfdf63cb5784f26065d56a204
Reviewed-on: https://code.wireshark.org/review/813
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 13:37:55 +00:00
AndersBroman 3258588c1d Don't include voip_bg.xpm, it's not used any more.
Change-Id: I34fb5166afb7b1218cb7e011096c4a3455b364d3
Reviewed-on: https://code.wireshark.org/review/812
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 13:33:14 +00:00
AndersBroman d35a4e8284 Get rid of the background pixmap, set the background color directly.
Change-Id: I7b291892b041055fe4165abcbb2962a295aedce4
Reviewed-on: https://code.wireshark.org/review/811
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 12:44:25 +00:00