Commit Graph

43340 Commits

Author SHA1 Message Date
Jakub Zawadzki ff03289b1a Remove const specifier from argument.
svn path=/trunk/; revision=45872
2012-11-02 11:44:50 +00:00
Anders Broman df1fe6422e Assign a default value to temp_tree;
svn path=/trunk/; revision=45871
2012-11-02 11:15:29 +00:00
Anders Broman 4d83f6f557 packet-ssl.c add a cast to build on Win64
pccket-lldp.c #if 0 out not used variables.

svn path=/trunk/; revision=45870
2012-11-02 10:04:38 +00:00
Anders Broman d54b681f84 From Jim Young and updated by Max Romanov:
The modification to acinclude.m4 adds a new test in the
AC_WIRESHARK_OSX_INTEGRATION_CHECK section to first look for the library
gtkmacintegration.  "gtkmacintegration" is the new internal name for GTK+ MAC
OSX library after the project was moved to www.gtk.org.  Previously this
library was known as igemacintegration.

The patches to the three gtk/*.c files update the conditional #include
<gtkmacintegration/gtkosxapplication.h> to use the new folder name.   The
Option 1 patch will break any build environment that expects to find the
gtkosapplication.h file in the older igemacintegration folder.  
In addition the patch includes updates to
gtk/main.c and gtk/main_menubar.c for a more standard looking App menu.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6702

svn path=/trunk/; revision=45869
2012-11-02 09:58:43 +00:00
Anders Broman a43acbd8c3 From Wido Kelling:
updated the TLVs for Profinet IEC 61158
updated the MRP decoding
wrong formattype changed to avoid fault in unknown subtype (atatched capture)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7757

svn path=/trunk/; revision=45868
2012-11-02 09:30:27 +00:00
Anders Broman e25f7c5a33 From Sho Amano:
Patch to update the decryption status right after the user updates
WEP/WPA keys in the UAT.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7921

svn path=/trunk/; revision=45867
2012-11-02 09:00:01 +00:00
Anders Broman ecbf47ff3a From Dirk:
This patch will print the information if an
invalid string was entered. It would be better to have a button to click on in
the UAT dialog to show valid values, but I don't know how I could do that with
the UAT system. So I'm simply printing it now in the error dialog, which should
be good enough.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7949

svn path=/trunk/; revision=45866
2012-11-02 08:48:13 +00:00
Anders Broman d3c2aa3199 From Dirk:
Print the GNUTLS error message upon import failure.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7948

svn path=/trunk/; revision=45865
2012-11-02 08:41:15 +00:00
Jörg Mayer 854ae179ef Fix ui/qt/print_dialog.cpp:228:23: error: variable ‘status’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=45864
2012-11-01 23:09:02 +00:00
Gerald Combs 66b13e2961 Enable and disable the File→Print and Go menu items as needed. Have the
print dialog cancel itself if we don't hand it a capture file.

svn path=/trunk/; revision=45863
2012-11-01 22:12:57 +00:00
Gerald Combs 606a7433ce Add changes missing from the last commit.
svn path=/trunk/; revision=45862
2012-11-01 21:17:29 +00:00
Gerald Combs abf7f1c724 Set SVN properties.
svn path=/trunk/; revision=45861
2012-11-01 20:58:30 +00:00
Gerald Combs e7c47148ea Add a print dialog to the Qt UI. Add support for null page element
callbacks in print.c. Clean up some other issues in print.c.

svn path=/trunk/; revision=45860
2012-11-01 20:57:45 +00:00
Gerald Combs e7c01324d9 Make sure we don't underrun the tree_is_expanded array.
svn path=/trunk/; revision=45859
2012-11-01 17:30:10 +00:00
Pascal Quantin e4f6a12b1a The APN is an SM IE
svn path=/trunk/; revision=45858
2012-11-01 10:10:55 +00:00
Anders Broman fb46fccec4 From LI Hai:
According to Table 161 in ETSI 392-2 standard, the Class of MS field in
U-LOCATION UPDATE DEMAND in tetra.asn is incorrect. the type of Class of MS
field should be Type 2, not Type 1, and the length should be 24 bits, not
32bits.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7946

svn path=/trunk/; revision=45857
2012-11-01 09:11:06 +00:00
Anders Broman 49307fcedc High light bytes including the first lenght byte in the APN name.
svn path=/trunk/; revision=45856
2012-11-01 08:24:08 +00:00
Martin Kaiser 3ac801d7bd make cor address and cor value filterable
svn path=/trunk/; revision=45855
2012-10-31 21:53:37 +00:00
Michael Mann 4b0a6ca955 Add CRC verification to Modbus RTU dissector. CRC algorithm is the same as the "crc16-plain" with a different initial CRC (0xFFFF instead of 0). Created crc16_plain_tvb_offset_seed to "replace" crc16_plain_tvb_offset, but didn't remove crc16_plain_tvb_offset for backwards compatibility worries. Updated only dissector that used crc16_plain_tvb_offset (profinet/packet-pn-rt.c) to use crc16_plain_tvb_offset_seed(..., 0)
svn path=/trunk/; revision=45854
2012-10-31 20:09:05 +00:00
Anders Broman 0c24f376ca The GTP dissector can't handle long APN names, max is 100.
Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932

svn path=/trunk/; revision=45852
2012-10-31 16:53:39 +00:00
Anders Broman b762b44048 Mark a parameter as unused.
svn path=/trunk/; revision=45851
2012-10-31 16:39:51 +00:00
Anders Broman 361adb3822 Make APN name a filterable item.
Fixes part of bug 7932.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7932

svn path=/trunk/; revision=45850
2012-10-31 16:19:46 +00:00
Gerald Combs 09945d2ac9 Set SVN properties.
svn path=/trunk/; revision=45849
2012-10-31 15:40:55 +00:00
Anders Broman bdfdec8492 Try to fix packet-uasip.c:486: warning: 'uasip_handle' may be used uninitialized in this function
svn path=/trunk/; revision=45848
2012-10-31 13:09:04 +00:00
Anders Broman be96ac69d7 The heuristic is to weak, add a preference if heuristics shoulld be used or not and default it to not used.
svn path=/trunk/; revision=45847
2012-10-31 12:47:24 +00:00
Anders Broman d27f07f6db Add a preference to disable the registration for media type
"application/octet-stream" default to OFF effectivly disabling the protocol as default as the use of this protocol should be limited
and false positives are seen.

svn path=/trunk/; revision=45846
2012-10-31 12:46:16 +00:00
Alexis La Goutte c07227bef3 From report of VinsWorldcom via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7938 IPv6 Option Pad1 Incorrect dissection
Wireshark 1.8.3 does not decode the IPv6 Option Pad1 (RFC 2460 Section 4.2)

RFC say : NOTE! the format of the Pad1 option is a special case -- it does not have length and value fields.

#BACKPORT(1.8)

svn path=/trunk/; revision=45843
2012-10-31 08:35:20 +00:00
Evan Huus ca3ec2a89e Remove unused variable.
svn path=/trunk/; revision=45842
2012-10-31 01:38:36 +00:00
Gerald Combs 101e9755c7 Try to speed up rendering.
svn path=/trunk/; revision=45841
2012-10-30 22:25:37 +00:00
Martin Kaiser 3a8b276c81 Card Information Structure (CIS) dissection
- restructure the existing code
- consistent filter names
- remove unnecessary if(tree) checks
- dissect the tpll_v1 and manfid tuples

svn path=/trunk/; revision=45840
2012-10-30 22:08:24 +00:00
Gerald Combs 12dfeadbbf Get rid of a couple of unused variables. Other minor cleanup.
svn path=/trunk/; revision=45839
2012-10-30 20:24:08 +00:00
Gerald Combs 0a28fb8f6a Update the Qt byte view widget to reflect the recent changes in the GTK+
byte view.

Move the packet_char_enc enum from packet.h to frame_data.h. Make the
encoding flag a packet_char_enc and make it one bit.

Get rid of the "cfile" global in a few places. C++-ize some of the font
code. Clean up some variable names.

svn path=/trunk/; revision=45838
2012-10-30 19:21:24 +00:00
Anders Broman 27b5d556cb Dissect Handover Initiate/Handover Acknowledge messages.
svn path=/trunk/; revision=45836
2012-10-30 13:06:03 +00:00
Anders Broman 7ac8c137d9 Fix Incorrect decoding of RSVP RECORD_ROUTE Object.
"in RSVP RESV message there incorrect
explanation of field "Flags" of Label subobject is appeared in Packet Details
section: value 0x01 of Flags field mistakenly defined as "Local Protection
Available" (I guess that this is borrowed from Flags field of IPv4 Address
subobject). Flags 0x01 in Label subobject means that particular label is global
(RFC 3209, Clause 4.4.1.3)."

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7876

svn path=/trunk/; revision=45835
2012-10-30 09:13:13 +00:00
Anders Broman 240789d01d See if this makes OSX buildbots happy
svn path=/trunk/; revision=45834
2012-10-30 06:28:59 +00:00
Evan Huus 9037787982 Add wmem readme to the appropriate build files.
svn path=/trunk/; revision=45833
2012-10-30 01:30:57 +00:00
Evan Huus 7588f12291 Some documentation for wmem.
svn path=/trunk/; revision=45832
2012-10-30 01:24:16 +00:00
Bill Meier 041fe5ef99 Add a comment noting that on Windows the
"use of window's own __try {} __finally {} and __except {}
mechanism" along with "macros based on kazlib's  exception code"
has problems and does not always work properly.

svn path=/trunk/; revision=45831
2012-10-29 20:12:28 +00:00
Bill Meier 25a1d9d667 Remove obsolete & incorrect comment:
/* Composite tvbuffs don't work at the moment -- tests commented out until
 * they do. */


svn path=/trunk/; revision=45830
2012-10-29 16:19:31 +00:00
Anders Broman 3d194979d6 Add IE/Options dissection.
svn path=/trunk/; revision=45829
2012-10-29 16:02:51 +00:00
Alexis La Goutte 4bb9ebb9e0 From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7768 IEEE802.11 dissector field size issue
There are a handful of fields in the IEEE802.11 dissector that are comprised of
a 16-bit value.  The hf array for these fields has the necessary masks to
correctly parse a 16-bit value, yet some of the fields were being added as 1
byte.  This patch corrects these fields with a proto_tree_add_item approach
(instead of proto_tree_add_[uint|boolean]).

svn path=/trunk/; revision=45828
2012-10-29 15:25:07 +00:00
Alexis La Goutte 02a97f92e2 From report of Sergio Garcia Murillo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7906 Nelly Mosser (Control: 0x66) at 11Khz incorrectly displayed as 8Khz
From me
Fix issue and add link to SWF documentation ( http://www.adobe.com/content/dam/Adobe/en/devnet/swf/pdf/swf_file_format_spec_v10.pdf )

svn path=/trunk/; revision=45827
2012-10-29 14:13:12 +00:00
Anders Broman 2ec15712c5 From Michal Labedzki:
[PATCH 18] Bluetooth: Add colofilter for ATT protocol

Add colofilter for ATT protocol. 
Why "green"? Looks good and ATT seems to be similar to SDP - use attributes.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639

svn path=/trunk/; revision=45826
2012-10-29 12:57:09 +00:00
Anders Broman 66ddbc8c5d Add dissection ofDTM ASSIGNMENT COMMAND and fix message types.
svn path=/trunk/; revision=45825
2012-10-29 12:49:45 +00:00
Alexis La Goutte 78ff79be82 From Jérôme LAFORGE via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7896 [DHCPv4] Implement RFC3004 for DHCP option 77
From me:
* Fix checkAPIs warning
* Add RFC3004 to the list of supported RFC

svn path=/trunk/; revision=45824
2012-10-29 11:10:26 +00:00
Pascal Quantin 79f67d319e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7790 :
Add missing offset increment after displaying minimum count

svn path=/trunk/; revision=45823
2012-10-28 20:59:04 +00:00
Evan Huus 4105ae6c6c Fix null-pointer dereference in mip6 dissector when optp is NULL because
we don't recognize the option.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7922

svn path=/trunk/; revision=45822
2012-10-28 20:23:06 +00:00
Bill Meier 953283a3d7 Changes:
- Remove 'if (tree)' around an indirect call to expert...();
- Create/use extended value strings as appropriate;
- Localize some variables;
- Remove unneeded initializers;
- Reformat hf[] array entries (use a consistent format);
- Use a consistent indentation and a consistent whitespace style.

svn path=/trunk/; revision=45821
2012-10-28 19:54:29 +00:00
Martin Kaiser 000f8eb62c fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7913
When we create a new color filter, we prepend the color filter list with
a default entry and launch an edit dialogue. If the user cancels, we
have to remove this _first_ entry from the list (not the last one).

svn path=/trunk/; revision=45820
2012-10-28 19:13:54 +00:00
Anders Broman 526f61a340 fix [-Werror=uninitialized]
svn path=/trunk/; revision=45819
2012-10-28 18:33:12 +00:00