Commit Graph

50515 Commits

Author SHA1 Message Date
Jakub Zawadzki fa01b39f33 Add more LINUX_AF_* values, create value_string_ext for them. Use it in netlink, nflog.
svn path=/trunk/; revision=53852
2013-12-08 12:42:10 +00:00
Jakub Zawadzki 4af107edfe Make VALUE_STRING_EXT_INIT use G_N_ELEMENTS macro instead of array_length.
array_length() requires including packet.h

svn path=/trunk/; revision=53851
2013-12-08 12:34:56 +00:00
Jakub Zawadzki 6e928c41d9 Add initial dissectors for netlink, and netlink route subsystem.
svn path=/trunk/; revision=53850
2013-12-08 12:01:32 +00:00
Alexis La Goutte 5ed31d2de1 From David Ameiss via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9509
qtshark Flow Graph displays wrong information in comments column

In qtshark, the flow graph is displaying the the frame label in the comments field. A simple fix, the patch is attached.

svn path=/trunk/; revision=53849
2013-12-08 11:10:04 +00:00
Alexis La Goutte 006f84a565 From Deon van der Westhuysen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452
Patch: Stats_tree enhancements for sorting, averages and burst rate

Add sort, save-as and new columns to Qt ui, remove old functions

stats_tree.c / stats_tree_priv.h: Make all columns sortable. Remove unneeded functions stats_tree_get_strs_from_node, stats_tree_branch_to_str and stats_tree_is_sortable_column.

stats_tree_stat.c: Set all columns sortable.

stats_tree_dialog.cpp / stats_tree_dialog.h: Add new stats_tree columns. Make columns sortable. Remove copy to csv and copy to yaml buttons. Add copy to clipboard as plain text and save as buttons.

stats_tree_dialog.ui: Remove copy to csv and copy to yaml buttons. Add copy to clipboard as plain text and save as buttons. Only define one column in ui, rest are added dynmically.

From me : fix trailing whitespace

svn path=/trunk/; revision=53848
2013-12-08 11:09:54 +00:00
Alexis La Goutte 4ed05f22b8 Remove trailing whitespace
svn path=/trunk/; revision=53847
2013-12-08 11:09:43 +00:00
Alexis La Goutte 4a33c88940 Fix indent (use 4 spaces) and add modelines
svn path=/trunk/; revision=53846
2013-12-08 11:09:30 +00:00
Michael Mann 34ac4010c5 RLC dissector cannot assemble PDUs with SNs skipped and wrap-arounded. Bug 9505 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9505)
From Nobuyuki Tsushima

svn path=/trunk/; revision=53845
2013-12-08 02:48:24 +00:00
Michael Mann 30b49ceb50 IPsec ESP: add AES-GCM decryption. Bug 8395 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8395)
Insert Any 64bit authnetication option so AES-GCM with 8 byte ICV

From Alexandru Juncu

svn path=/trunk/; revision=53844
2013-12-08 02:27:52 +00:00
Michael Mann 6c5a93d7d1 Fix invalid read and correct PSK upper bound. Bug 9512 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9512)
From Peter Wu.

svn path=/trunk/; revision=53843
2013-12-08 02:12:48 +00:00
Michael Mann 21ca76a3ad dtls: fix buffer overflow in mac check. Bug 9512 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9512)
From Hauke Mehrtens

svn path=/trunk/; revision=53842
2013-12-08 01:52:02 +00:00
Michael Mann 20e0d853ce Fix signed/insigned mismatch in ErlDP dissector. Bug 9525 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9525)
From Peter Lemenkov

svn path=/trunk/; revision=53841
2013-12-08 01:35:39 +00:00
Guy Harris e1c994f55f It's ISO 8859-1, not "ISO 18859-1", at least according to ANSI/ASHRAE
Standard 135-2004.

Use tvb_get_string_enc() wherever possible.

svn path=/trunk/; revision=53840
2013-12-08 01:28:00 +00:00
Guy Harris b4b18b314a Expand a comment.
svn path=/trunk/; revision=53839
2013-12-08 01:21:58 +00:00
Michael Mann 5c4a125202 Correctly update the data length of the SCSI payload within ISCSI. Bug 9521 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9521)
From Yaniv Kaul

svn path=/trunk/; revision=53838
2013-12-08 01:15:55 +00:00
Guy Harris 562348fbb8 Add ENC_ISO_8859_1.
Move the Wikipedia links for the code page layouts in front of the
tables whose contents reflect the code page layouts.

svn path=/trunk/; revision=53837
2013-12-08 01:05:35 +00:00
Michael Mann 0f05597ab1 DTLS decryption enhancements. Bug 9499 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9499)
From Hauke Mehrtens

1. dtls: set ssl_set_server() in DTLS dissector so wireshark knows if this is client or server
2. SSL: add decrypt support for CCM and CCM_8 Ciphers per rfc 6655
3. dtls: add psk decrypt support

svn path=/trunk/; revision=53836
2013-12-08 00:58:06 +00:00
Chris Maynard 7d10a416a3 Reject the packet if data is NULL.
svn path=/trunk/; revision=53835
2013-12-07 23:27:36 +00:00
Jakub Zawadzki 4904620661 Add WTAP_ENCAP_NETLINK which maps to DLT_NETLINK /253/
svn path=/trunk/; revision=53834
2013-12-07 23:25:36 +00:00
Guy Harris 3c2bd00ccf Note what the two new character encoding tables in charsets.c are.
svn path=/trunk/; revision=53833
2013-12-07 22:45:37 +00:00
Jakub Zawadzki c193f9c9e4 Use strutil xml_escape() function
svn path=/trunk/; revision=53832
2013-12-07 19:46:05 +00:00
Guy Harris a2b9f02e59 Fix some cases where STR_UNICODE was used with FT_DOUBLE.
svn path=/trunk/; revision=53831
2013-12-07 19:43:59 +00:00
Martin Kaiser f38af18c2c add a decryption test for DVB-CI to the testsuite
svn path=/trunk/; revision=53830
2013-12-07 17:56:39 +00:00
Jakub Zawadzki 333fea4fb9 Add missing consts.
svn path=/trunk/; revision=53829
2013-12-07 17:49:41 +00:00
Martin Kaiser fa5083e8af make SAC message padding filterable
svn path=/trunk/; revision=53828
2013-12-07 17:40:02 +00:00
Jakub Zawadzki 7ab18667e5 Drop proto_tree_add_unicode_string() from IP, IPv6, JSON dissectors.
Set .display to STR_UNICODE (instead of STR_ASCII).

svn path=/trunk/; revision=53827
2013-12-07 15:48:35 +00:00
Jakub Zawadzki 0e5bc8a49c Add string encoding for ISO/IEC 8859-2 (ENC_ISO_8859_2)
svn path=/trunk/; revision=53826
2013-12-07 15:02:55 +00:00
Pascal Quantin e67762e343 From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9524 :
Fix typo in erldp dissector

svn path=/trunk/; revision=53825
2013-12-07 14:38:16 +00:00
Pascal Quantin cff7d45f85 From Mathias Guettler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9523 :
Fix ISO 10747 (IDRP) incorrect handling of data in IDRP ERROR PDU's

svn path=/trunk/; revision=53824
2013-12-07 14:36:54 +00:00
Jakub Zawadzki 1560949e4d gadu-gadu: use STR_UNICODE display instead of proto_tree_add_unicode_string().
svn path=/trunk/; revision=53823
2013-12-07 11:55:22 +00:00
Jakub Zawadzki ffb4e79de9 Add STR_ASCII, STR_UNICODE as possible displays for field_display_e
svn path=/trunk/; revision=53822
2013-12-07 11:50:43 +00:00
Anders Broman eb252d2d34 - Make local functions static.
- Forward declaration of register functions.

svn path=/trunk/; revision=53821
2013-12-07 11:37:58 +00:00
Jakub Zawadzki c67d38cf15 Rename base_display_* to field_display
This is preparation to support ->display for FT_STRING values.

svn path=/trunk/; revision=53820
2013-12-07 10:41:42 +00:00
Jakub Zawadzki 113b078a4d Add new string proto encoding for windows-1250 (ENC_WINDOWS_1250)
- Move windows-1250 to unicode encoding table to charset.c
- Add tvb_get_string_unichar2, tvb_get_stringz_unichar2 functions which recode tvb-string to UTF-8.

svn path=/trunk/; revision=53819
2013-12-07 10:10:03 +00:00
Jakub Zawadzki b3c93326bc Remove #if 0 inverse_bit_mask8 array.
It was only used by tvb_get_bits_buf (removed in r53183).

svn path=/trunk/; revision=53818
2013-12-07 09:14:35 +00:00
Anders Broman cc71d217a6 - Make local functions static.
- Forward declaration of register function.

svn path=/trunk/; revision=53817
2013-12-07 08:34:39 +00:00
Michael Mann cc5543f824 Bluetooth enhancements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
Bluetooth: SCO: Add Source/Destination addresses 
Bluetooth: HCRP: Use information from SDP to decoding PSM payload

From Michal Labedzki

svn path=/trunk/; revision=53816
2013-12-07 01:01:31 +00:00
Jakub Zawadzki c1ef044de5 Move tvb_uncompress() to tvbuff_zlib.c
svn path=/trunk/; revision=53815
2013-12-06 23:23:44 +00:00
Alexis La Goutte 895f83b37d Fix indent (use 4 spaces) Remove trailing whitespace Add Modelines
svn path=/trunk/; revision=53814
2013-12-06 16:41:05 +00:00
Alexis La Goutte e820340996 Add Modelines info
svn path=/trunk/; revision=53813
2013-12-06 16:40:55 +00:00
Alexis La Goutte d5c3c081d9 Fix (-W)unused-const-variable error found by Clang
svn path=/trunk/; revision=53812
2013-12-06 16:40:44 +00:00
Pascal Quantin 138cb0e1f1 Update svn properties
svn path=/trunk/; revision=53811
2013-12-06 16:37:20 +00:00
Irene Rüngeler ae37302c39 Add assoc_index to the properties that can be filtered.
Find the association for each packet.

svn path=/trunk/; revision=53810
2013-12-06 14:45:06 +00:00
Alexis La Goutte d1e904b518 From Thomas ERSFELD (GSoC13)
Hiding monitor column when not available

svn path=/trunk/; revision=53809
2013-12-06 10:24:58 +00:00
Alexis La Goutte f9c27ac0d8 Fix warning when launch Qt Port
QMetaObject::connectSlotsByName: No matching signal for on_tbInterfaces_hideEvent(QHideEvent*)
QMetaObject::connectSlotsByName: No matching signal for on_tbInterfaces_showEvent(QShowEvent*)
Object::connect: No such slot CaptureInterfacesDialog::tableItemPressed(QTableWidgetItem *)
Object::connect:  (sender name:   'tbInterfaces')
Object::connect:  (receiver name: 'CaptureInterfacesDialog')

svn path=/trunk/; revision=53808
2013-12-06 10:24:50 +00:00
Alexis La Goutte 8cfb238ad4 Fix ui/qt/capture_interfaces_dialog.ui: Warning: The name 'layoutWidget' (QWidget) is already in use
svn path=/trunk/; revision=53807
2013-12-06 10:24:41 +00:00
Alexis La Goutte 7a5cf63f04 Fix wireshark/epan/dissectors/packet-j1939.c:313: multiple definition of `proto_register_devicenet'
svn path=/trunk/; revision=53806
2013-12-06 08:37:48 +00:00
Alexis La Goutte 04a8ed2140 Fix packet-j1939.c:160:42: error: declaration of 'address' shadows a global declaration [-Werror=shadow]
svn path=/trunk/; revision=53805
2013-12-06 08:09:56 +00:00
Alexis La Goutte f5136e3753 Fix unused parameter 'pinfo'
svn path=/trunk/; revision=53804
2013-12-06 08:04:09 +00:00
Michael Mann 643f9efce2 Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment)
svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00