Commit Graph

51617 Commits

Author SHA1 Message Date
Stefan Metzmacher 7feac74603 Revert "In get_unicode_or_ascii_string(), check if the length is odd/even, not the offset. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - Volume label field ... is not displayed correctly ..."
This is wrong it breaks all sort of things. The "Volume label field"
is a special case, which can be fixed by using nopad=TRUE.

Change-Id: I3cd3f30ff0076d5e31a735391b175fd68e5fa142
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/26
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31 16:38:21 +00:00
Stefan Metzmacher 505af30e01 packet-smb.c: real fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778
Change-Id: I33308c44791b487844f23db07d152897380d7cf1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/25
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31 16:36:25 +00:00
Hadriel Kaplan 3d59ff9e95 Fix for Bug-9711 Lua: the Lua stack is growing slightly during initialization.
Change-Id: I689319c0071fdb42583e8bd7633d8f0660c92f1b
Reviewed-on: https://code.wireshark.org/review/51
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-01-31 16:31:59 +00:00
Hadriel Kaplan a94d127b77 Fix for Bug-9709 Lua: class attribute descriptions in API docs don't say if an attribute is read/write/both.
Also added some minor text to README.wslua for developers.

Change-Id: I50b36f06710da6920ad98be6dde27d6091d91d54
Reviewed-on: https://code.wireshark.org/review/50
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-01-31 16:30:22 +00:00
Alexis La Goutte b84d5ac17e Enhance / Update ICMPv6 dissector
* Update to the last IANA icmpv6-parameters (2014-01-30)
* Update to final draft (for RFC 6743 and RFC 6775)
* Add RFC 7112 (Implications of Oversized IPv6 Header Chains) support (Add new Parameter Problem code)
* Fix a encoding arg

Change-Id: I90f65dfc54e5c0aff21a0e7ec2c937304aced02d
Reviewed-on: https://code.wireshark.org/review/62
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31 16:08:23 +00:00
Alexis La Goutte b4f90d96a5 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Id7bab3a69514f159eda8d1285ca7f8f2d42e34ad
Reviewed-on: https://code.wireshark.org/review/61
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31 15:56:33 +00:00
Alexis La Goutte 2516e54202 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I695824b95f5e8978c2b58c4e98471d1ed204d686
Reviewed-on: https://code.wireshark.org/review/60
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31 15:56:18 +00:00
Stefan Metzmacher 848546ece8 packet-smb2: dissect SMBDirect Buffer Descriptors
Change-Id: Ie91c19078a92f36044b4eee55c3228e3257bf45d
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/53
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31 14:25:52 +00:00
Hadriel Kaplan 764cc74628 Fix for Bug-9712 Lua: changes to WTAP_FILE_ #define names prevents them being in init.lua
Change-Id: I0a2ccd686a89ffbc918a7b8b6af4a0ba8a5ab097
Reviewed-on: https://code.wireshark.org/review/52
Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
Tested-by: Gilbert Ramirez <gram@alumni.rice.edu>
2014-01-31 13:28:10 +00:00
Hadriel Kaplan 5c7d57a1e2 In .gitignore: added dylib and sublimetext file types to be ignored, plus init.lua from anywhere, and removed the dir-specific entries for it.
Change-Id: I4b1f9b1603dcbf1e895944a4ccf382ad6ee309b0
Reviewed-on: https://code.wireshark.org/review/49
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-01-30 22:47:51 +00:00
Evan Huus 21e0a63b29 Add remove_last_data_source and fix bug 9169
The OP asked 9169 to be reopened because the capture was spewing ~40GB of output
when dissected with tshark. Investigation showed this was because the HTTP
dissector was requesting ONE_MORE_PACKET reassembly a lot, and TCP was adding
each step as a data-source which was being printed by tshark's hex dump. This
was leading to O(n^2) of output.

To fix, introduce function remove_last_data_source which removes the most recent
data source from the list. If the subdissector in TCP reassembly asks for
ONE_MORE_PACKET, assume it hasn't added any tree items (since it shouldn't have)
and remove the data source since it is unnecessary.

This may break dissectors which add tree items and *then* return
ONE_MORE_PACKET, since they will have their data source removed out from under
them. I believe those cases should be fixed to not add tree items until they're
sure they have enough data.

Change-Id: Iff07f959b8b8bd1acda9bff03f7c8684901ba8aa
Reviewed-on: https://code.wireshark.org/review/38
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-01-30 22:11:41 +00:00
Jiri Engelthaler 458b835683 IEC60870-5-104: Added decoding of integrated totals without time tag, fixed inverted logic of "Overflow" and "Adjusted" bits, some minor code style changes.
Change-Id: I76af5eabfd08f312f37547bcc10e3ffe10b17f2a
2014-01-30 12:00:46 +00:00
Alexis La Goutte 40c459e759 Merge "openSAFETY: Fixing field / byte assignment" 2014-01-30 10:36:25 +00:00
Roland Knall 88e82bd69b openSAFETY: Fixing field / byte assignment
- SNMT messages where presented in a way, where the value of the
   field was not pointing to the correct bytes where it came from
 - Sender / Receiver where renamed to be better understandable
 - SN send to (Receiver) now comes first as it does in the byte
   stream

Change-Id: I364cb248bed9489c0cf9c7bf9fbd37b0225dbd78
2014-01-30 10:50:57 +01:00
Stig Bjørlykke 436fe9c85e Lua: Improved running in build directory.
Load system init.lua from build-directory/epan/wslua
Set Lua datafile_path to source-directory/epan/wslua
Made dofile() search in source-directory/epan/wslua

Change-Id: I009234eb8193c1ed3260455b245c256c9747930f
2014-01-30 07:53:18 +00:00
Gerald Combs 7daae6d214 Fix Juan Antonio Montesinos' name.
Change-Id: Ifb948839e92c2228addfbdcb19ed94fc38624bdd
2014-01-29 17:15:25 -08:00
Evan Huus 45fea8e2d7 Add missing gitignore entries
Change-Id: Icfdde6bad4aed8dfd5c0b14a04c37395dfbf0395
2014-01-29 23:10:59 +00:00
Martin Kaiser 5f91002cf5 replace spaces with a TAB
Change-Id: I8340b4af524b5c4ffb1a10b0eccd809f1d6b1e9f
2014-01-29 23:24:47 +01:00
Martin Kaiser 1c09d044cb Merge "MIME: Rename image dissectors to file dissectors." 2014-01-29 22:20:47 +00:00
Michal Labedzki 2c28c5d93f MIME: Rename image dissectors to file dissectors.
Change-Id: Ie160733ceeed23ff96ddccfbf0ca2e7694789ff8
2014-01-29 23:17:33 +01:00
Pascal Quantin 8f15d3aa8d Fix display of right arrow in CSV export
Changeset 1d8a895fa4 introduced the use of UTF-8 righ arrow to indicate the direction in TCP dissector.
While it displays nicely in Wireshark GUI or in a text export of packets, an export to CSV results in an escaped string.
This patch is a naive attempt to display the right arrow in a more friendly way when exporting to CSV.
Any smarter fix is welcome.

Change-Id: Ife787268696fa69dafc24a5cf9706af4c4832831
2014-01-29 21:32:31 +01:00
Gerald Combs d1fb81722f Merge "We have a usable tag now. There's no need to fake a version number." 2014-01-29 19:56:48 +00:00
Hadriel Kaplan f97d6f397c Fix for Bug 9707 'Lua: init.lua has multiple 'MENU_STAT_TELEPHONY' values'
Change-Id: If4ee1906aa60dd37366cf2ef9bc4168e0ea024b6
2014-01-29 19:53:59 +00:00
Gerald Combs 82c5bfd6f1 We have a usable tag now. There's no need to fake a version number.
Change-Id: Ic6a704013b38e9be130be40098e9293e9196bfec
2014-01-29 11:53:04 -08:00
Stig Bjørlykke 60a1931beb Merge "Lua: Added a utility function file_exists()." 2014-01-29 18:29:59 +00:00
Alexis La Goutte 5982c6179b Merge "Apply layouts in Qt Creator. Fix a tooltip." 2014-01-29 17:44:54 +00:00
Stefan Metzmacher 6167a0f6ed packet-smb2: fix lease epoch fields
Bug: 9703

Change-Id: I1955360adaee53846f084434c59180d715e19fcd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2014-01-29 17:42:51 +00:00
Alexis La Goutte cac3024d70 Merge "smb2: Lease Epoch is only 16 bit" 2014-01-29 17:42:10 +00:00
Volker Lendecke fc216102e3 smb2: Lease Epoch is only 16 bit
See [MS-SMB2] 2.2.14.2.12

Bug: 9703

Change-Id: Ia9c9c658bd5020e0dad84fc74617fed60ce7df06
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-29 17:41:31 +00:00
Alexis La Goutte a5b2a9c93c Merge "smb2: Fix a typo" 2014-01-29 17:39:22 +00:00
Stig Bjørlykke e4a140c7f0 Lua: Added a utility function file_exists().
This function can be used to check for files before calling dofile(),
which will fail for non-existing files.

Change-Id: Iae7b7ef6d8eb6e0e18f98fee7c740d2a5705eef3
2014-01-29 16:05:48 +01:00
Gilbert Ramirez a20d788da3 Add newlines at end of files that are missing them.
gcc 4.1.2 complained with:
    No newline at end of file

Change-Id: I813af88737e725a328713eea4a7096d28942f9b2
2014-01-29 05:11:10 -08:00
Volker Lendecke 05a7306482 smb2: Fix a typo
Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9703

Change-Id: I8ebb20a48e1131fcf14ee55e5e1822a8dcd713d2
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-29 11:34:47 +01:00
Martin Kaiser 447c96304e tree variables don't have to be initialized
Change-Id: Ic87133b143170d0146cd3a8fb23f8d0b33ec6502
2014-01-28 20:31:01 +00:00
Gerald Combs 221878bc1b Merge "[Automatic manuf, services and enterprise-numbers update for 2014-01-26]" 2014-01-28 19:13:40 +00:00
Bill Meier 58bb4726a8 Comment out a lot more hf[] entries and related.
(Found by checkhf).

Note: There's quite a large amount of hf[] entries which are
      commented out. I wonder if there are "top-level" entries
      missing from the "parse-tree" arrays ?


svn path=/trunk/; revision=54990
2014-01-28 03:09:03 +00:00
Bill Meier 9d0207ed90 Comment out unused hf[] entries and related found by checkhf.
svn path=/trunk/; revision=54989
2014-01-28 03:06:03 +00:00
Bill Meier c1e53e7359 Re-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain.
svn path=/trunk/; revision=54988
2014-01-28 03:02:37 +00:00
Evan Huus 953d54b120 From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9697

Architectural support for multiple version of the same Asterix categories.
Includes implementation of CAT064 v.0.17.

svn path=/trunk/; revision=54987
2014-01-28 00:48:23 +00:00
Anders Broman a40f824e0e Make it easier to try GTK 3.6
svn path=/trunk/; revision=54986
2014-01-27 19:22:10 +00:00
Gerald Combs 257e301696 Convert the quick setup chapter to AsciiDoc and start converting its
content to Git.

svn path=/trunk/; revision=54985
2014-01-27 18:43:57 +00:00
Bill Meier 5c9c6cd8fb Fix hf[] entries with refs to range_string arrays
to add missing BASE_RANGE_STRING and to use RVALS instead of VALS.

Fixes crashes in 'tshark -G values' and presumably also fixes
 crashes when used in a dissection.

Introduced in SVN #54449.

(I suspect that ' convert_proto_tree_add_text.pl' may need some work
 to handle range_strings).



svn path=/trunk/; revision=54984
2014-01-27 18:22:39 +00:00
Bill Meier 80b5c57713 Fix: value string specified as a BASE_VAL64_STRING in
an hf[] entry but defined as a 'value_string' intead of
 as a 'val64_string'.

Caused 'tshark -G values' to crash
 (and presumably would also cause a crash when the value-string
  is referenced in a dissection):

Introduced in svn #54728

(Note: There's still another 'tshark -G values' crash to to found & fixed)


svn path=/trunk/; revision=54983
2014-01-27 17:20:44 +00:00
Bill Meier dfb3d167b3 (Trivial) Fix spellling in a comment.
svn path=/trunk/; revision=54982
2014-01-27 14:33:54 +00:00
Evan Huus dab27680cd From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612
Fix possibly-uninitialized variable caught by valgrind fuzzing in AMQP.

svn path=/trunk/; revision=54981
2014-01-27 13:42:34 +00:00
Evan Huus 2338fdea0f Add missing cast.
svn path=/trunk/; revision=54980
2014-01-27 13:12:59 +00:00
Martin Mathieson 9416835735 Revert part of previous change
svn path=/trunk/; revision=54979
2014-01-27 12:54:34 +00:00
Martin Mathieson f903141d65 Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting
svn path=/trunk/; revision=54978
2014-01-27 12:06:46 +00:00
Stig Bjørlykke 3abb51aa67 Do not handle BER bitstring as ASCII string, because this will fail
when the first bit is set.

svn path=/trunk/; revision=54977
2014-01-27 09:57:24 +00:00
Stig Bjørlykke fbaff1f081 Add back the fix from revision 54693.
svn path=/trunk/; revision=54976
2014-01-27 09:55:46 +00:00