Commit Graph

16021 Commits

Author SHA1 Message Date
Anders Broman 664ae6add7 From Wim Leflere:
Updated the APS dissection and improved the dissection information.

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

svn path=/trunk/; revision=45959
2012-11-07 14:02:15 +00:00
Jörg Mayer 2bed64d973 Fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7963

RSN IEs were required to have length 20, but I have an AP that works
with RSNs of length 18. Reduce the required length to 18.

svn path=/trunk/; revision=45958
2012-11-07 12:46:59 +00:00
Pascal Quantin 6d044f3281 Avoid accessing a no more valid tvbuff
svn path=/trunk/; revision=45957
2012-11-07 00:00:57 +00:00
Jeff Morriss 5d6e03f71b Add expert infos (PI_ERROR) for chunks and parameters that are not padded to
a multiple of 4 bytes.

Move an existing expert info outside if(tree).

svn path=/trunk/; revision=45952
2012-11-06 21:00:40 +00:00
Anders Broman fa3cca29dd Add ETHERTYPE_ATMOE
svn path=/trunk/; revision=45951
2012-11-06 19:56:37 +00:00
Pascal Quantin d7d1840e67 Fix dissection of NAS security parameters to/from E-UTRA
svn path=/trunk/; revision=45950
2012-11-06 19:33:27 +00:00
Anders Broman 9bdaeafabf Dissect lat. long and Uncertainty-Code.
svn path=/trunk/; revision=45946
2012-11-06 09:22:29 +00:00
Stig Bjørlykke 04054fae80 Corrected a printf format
svn path=/trunk/; revision=45945
2012-11-06 08:43:10 +00:00
Stig Bjørlykke 192372726b Corrected a (guint32) cast
svn path=/trunk/; revision=45944
2012-11-06 08:42:48 +00:00
Stig Bjørlykke 1e355c77d3 Removed double parentheses in a while
svn path=/trunk/; revision=45943
2012-11-06 08:40:40 +00:00
Anders Broman 4ceb76265a Dissect the positioning data.
svn path=/trunk/; revision=45932
2012-11-05 16:28:53 +00:00
Anders Broman f88ffd78f3 Use little endian MNC encoding.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7952

svn path=/trunk/; revision=45931
2012-11-05 15:15:54 +00:00
Anders Broman 416fe3bb5b From Steve Magnani:
Add display of (bInterfaceNumber.bAlternateSetting) and bInterfaceClass to the
root item of INTERFACE descriptor subtrees.

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

svn path=/trunk/; revision=45930
2012-11-05 15:03:15 +00:00
Jeff Morriss 96d2ba5d53 Eliminate 'set but not used' warning turned error.
svn path=/trunk/; revision=45929
2012-11-05 14:58:54 +00:00
Anders Broman 892ff116c9 From Michal Labedzki:
Add support for AVDTP/A2DP/VDP and SBC

Part of 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893

svn path=/trunk/; revision=45921
2012-11-05 11:42:10 +00:00
Anders Broman d50c587316 From Andrei Emeltchenko:
Makes L2CAP be independent from acl_data

When L2CAP is transferred through wireless it has no ACL incapsulation.
The patch makes it possible to chain L2CAP dissector based on LLC
bluetooth pid.

Part of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7633

svn path=/trunk/; revision=45918
2012-11-05 09:36:00 +00:00
Anders Broman 120dab634e From Michal Labedzki:
"Decode By" for Bluetooth support decoding by L2CAP service, L2CAP CID,
L2CAP PSM, RFCOMM service and RFCOMM channel.

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

svn path=/trunk/; revision=45913
2012-11-05 08:39:51 +00:00
Michael Mann 9f84a8d340 Add a few more expert_add_info_format calls to giop dissector which requires packet_info* structure and proto_item* to be filtered down through the generated functions.
Also removed some excessive whitespace.

svn path=/trunk/; revision=45911
2012-11-05 03:36:07 +00:00
Anders Broman db6feef877 Use a define for max number of characters and use that for the array size
svn path=/trunk/; revision=45904
2012-11-04 17:17:39 +00:00
Alexis La Goutte c66efd679c From Jérôme LAFORGE via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7942
[BOOTP] Implement option 119 : RFC3397 RFC3396 RFC1035

svn path=/trunk/; revision=45900
2012-11-04 16:29:15 +00:00
Alexis La Goutte ecd2324583 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7953 Improve COL_INFO output for DCE/RPC dissector
The attached patch contains some improvements to the COL_INFO output of the
DCE/RPC dissector. The changes are:

- separate the informations by commas
- make output of Context ID always use "Ctx: %u"
- print names of RPC over HTTP PDUs on the protocol tree line (in addition to
COL_INFO)

svn path=/trunk/; revision=45888
2012-11-04 14:58:55 +00:00
Anders Broman 8004ecccde From Andrei Emeltchenko: Add OUI_BLUETOOTH part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7633 bt-oui: Add decoding Bluetooth High Speed over wireless
svn path=/trunk/; revision=45887
2012-11-04 12:47:02 +00:00
Anders Broman b117383961 Make it compil by adding a cast, not sure if payload_length = (int)tvb_get_ntoh64(tvb, 2); can overflow
svn path=/trunk/; revision=45878
2012-11-03 15:36:09 +00:00
Alexis La Goutte 1deb8ffc1e Try to fix Windows XP/7 buildbot
svn path=/trunk/; revision=45876
2012-11-02 21:09:52 +00:00
Alexis La Goutte 94ae27661e From vanviegen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7934 WebSocket dissector improvements
- Now works for WebSocket packets not aligned with IP packets.
- Support subdissectors.

From me :
- Fix checkAPIs warning (about comments)
- Remove some whitespace

svn path=/trunk/; revision=45875
2012-11-02 20:35:24 +00:00
Alexis La Goutte 84e8345c82 From Tomasz Mon via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7809 Add USBAudio and MIDI System Exclusive dissectors.
USBAudio dissector can reassemble SysEx commands.
MIDI SysEx dissector can (partially) dissect DigiTech protocol.

From me :
Fix a wrong encoding type found by fix-encoding-args tools
Add Modelines info

svn path=/trunk/; revision=45873
2012-11-02 15:35:28 +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 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
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
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
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
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
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
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 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
Anders Broman 526f61a340 fix [-Werror=uninitialized]
svn path=/trunk/; revision=45819
2012-10-28 18:33:12 +00:00
Anders Broman 6266e87f84 Only add a subtree if optp->subtree_index is non NULL. should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7920
svn path=/trunk/; revision=45818
2012-10-28 18:04:45 +00:00
Pascal Quantin 51e45c8da9 From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7911 :
Fix dissection of some GSM RR IEs which include length octet

From me:
Keep displaying those IEs as TLV to keep coherency with other TLV IEs
Fix dissection of Dynamic ARFCN Mapping

svn path=/trunk/; revision=45811
2012-10-27 17:03:12 +00:00
Evan Huus 0ed00c491d Update openSafety dissector with new Modbus dissector table name.
Fixes
> OOPS: dissector table "mbtcp.modbus.data" doesn't exist
> Protocol being registered is "openSAFETY"
introduced in revision 45793.

svn path=/trunk/; revision=45807
2012-10-27 02:53:29 +00:00
Bill Meier 84f5f91022 Fix [-Wunused-but-set-variable] warnings.
svn path=/trunk/; revision=45803
2012-10-26 21:47:02 +00:00
Bill Meier 31b1b3780c General cleanup (No changes in dissection):
- rename variables to fix all "shadowed variable" warnings;
- remove certain 'if(tree)' statements;
   (A new-style dissector) should return the same
    'bytes processed' whether or not 'tree == NULL');
- simplify code in numerous places (including removing
   redundant/repeated code);
- fix remaining uses of FALSE as 'encoding' arg;
- use consistent indentation and formatting.

ToDo: Changes to fix apparent cases of incorrect
      dissection.

svn path=/trunk/; revision=45802
2012-10-26 21:17:33 +00:00
Anders Broman a579e9875b Prepare to dissect 3GPP options.
svn path=/trunk/; revision=45797
2012-10-26 15:35:41 +00:00
Anders Broman b3572877da More options dissecton.
svn path=/trunk/; revision=45796
2012-10-26 13:29:02 +00:00
Pascal Quantin 1ac326467c Fix copy/paste error
svn path=/trunk/; revision=45795
2012-10-26 05:50:57 +00:00
Anders Broman 0b645cf006 Fix [-Werror=sign-compare] [-Wunused-but-set-variable]
svn path=/trunk/; revision=45794
2012-10-26 05:46:56 +00:00
Michael Mann 1fe105a5ab Improve Modbus/TCP dissector, Part 1
This is a portion of the patch supplied in bug 7902 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7902).  Breaking the functionality up into smaller chunks.

This definitively breaks the Modbus dissection into 3 dissectors:
Modbus - real protocol PDU
Modbus/TCP - Encapsulation of Modbus over TCP (with a small header before PDU)
Modbus RTU - Originally an encapsulation of Modbus over serial (with smaller header + CRC), but can also be sent over TCP.

General cleanup/refactoring (including display filter names) based on the 3 dissectors.
Also included:
1. Enhanced dissection to include preferences for register data to be dissected as UINT16, UINT32 or FLOAT
2. Dynamic port registration
3. Additional fields now filterable

svn path=/trunk/; revision=45793
2012-10-26 02:15:20 +00:00
Evan Huus 361aedec1f Create SET_ADDRESS_HF that takes an additional hf_ value that can be
used to override the filter generated from the address column.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728 (again).

svn path=/trunk/; revision=45792
2012-10-26 01:59:17 +00:00
Evan Huus c6b522bc70 Revert revision 44921.
See discussion on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728

svn path=/trunk/; revision=45791
2012-10-26 00:42:34 +00:00
Jeff Morriss d97b4ec325 Fix problem where NTP times with the high-bit set to 0 (which RFC 2030
chapter 3 has redefined to mean years *after* 2036) were being represented as
times prior to 1968.

This has been broken since r35840 (apparently not many people see NTP
timestamps beyond 2036 :-)): apparently I over-optimized packet-ntp's code
while copying it into proto.c: that temporary variable is necessary for the
unsigned math to happen correctly before assigning the result to the (signed)
time_t.

Leave a comment in the code indicating why the temporary variable is needed.
Copy that comment to packet-ntp.c.

Fix the same problem in ntp_to_nstime(): it also did not use the temporary variable.

svn path=/trunk/; revision=45790
2012-10-25 22:26:52 +00:00
Pascal Quantin 4518ece9f9 From Umberto Corponi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7912 :
Allow dissection of ESM messages with integrity protection and EEA0 ciphering

From me:
Tighten heuristic to check for allowed EPS bearer identity values

svn path=/trunk/; revision=45789
2012-10-25 21:37:12 +00:00
Jeff Morriss e6d6d7272a Create and start using macros for MTP3 network indicators.
pinfo has a match_uint field: use it instead of passing the SI of the message
to subdissectors in private_data.

svn path=/trunk/; revision=45788
2012-10-25 20:25:06 +00:00
Jeff Morriss 827312f886 Mark a couple of parameters as unused. Fix up indentation (replace 4-space tabs with spaces) and trailing white space.
svn path=/trunk/; revision=45787
2012-10-25 16:15:58 +00:00
Jeff Morriss 95094bf420 Fix cut-n-pasteo.
svn path=/trunk/; revision=45786
2012-10-25 16:03:38 +00:00
Anders Broman 59234a6b5e - Pretify output a bit more.
svn path=/trunk/; revision=45785
2012-10-25 15:57:05 +00:00
Jeff Morriss d407ce0d36 Create and start using macros for MTP3 network indicators.
Export the network indicator value_string and use it in M3UA.

svn path=/trunk/; revision=45784
2012-10-25 15:34:57 +00:00
Anders Broman ae4115bcdb - Dissect more options.
- Correct a Timestamp bug.
- Try to pretify the options dissection.

svn path=/trunk/; revision=45783
2012-10-25 12:54:37 +00:00
Anders Broman 2c38e9b1dc Add application/ccmp+xml
svn path=/trunk/; revision=45782
2012-10-25 10:16:09 +00:00
Martin Kaiser bbe9e06964 fix compliation on Win64
svn path=/trunk/; revision=45780
2012-10-24 21:45:50 +00:00
Martin Kaiser b60c69dc14 From Alexander Koeppe
parse EPSV response

from me
- no expert info under if(tree)
- use hf_ftp_epsv_port instead of hf_ftp_pasv_port
- don't use isdigit(), this is C99
- use temporary variable for IPv4 address

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

svn path=/trunk/; revision=45778
2012-10-24 20:59:27 +00:00
Chris Maynard a753eaaea0 Use tvb_reported_length to skip past all the bytes in the tvb.
svn path=/trunk/; revision=45777
2012-10-24 20:31:09 +00:00
Chris Maynard a121a30f7c tabs -> spaces, indentation fixups.
tvb_length_remaining -> tvb_reported_length_remaining.
Check return value of tvb_reported_length_remaining > 0.
Use tvb_reported_length to skip past all the bytes in the tvb.

svn path=/trunk/; revision=45776
2012-10-24 19:32:59 +00:00
Chris Maynard 6a4eed57f2 To indicate that all bytes in the tvb were consumed, just return tvb_reported_length().
svn path=/trunk/; revision=45775
2012-10-24 19:13:54 +00:00
Chris Maynard 2e701abf3a tvb_length_remaining() -> tvb_reported_length_remaining(). To indicate that all bytes in the tvb were consumed, just use tvb_reported_length().
svn path=/trunk/; revision=45774
2012-10-24 18:59:34 +00:00
Chris Maynard 58a6e4b253 Use tvb_reported_length() to skip past all bytes in the tvb.
svn path=/trunk/; revision=45773
2012-10-24 18:52:06 +00:00
Chris Maynard cacea3f59b No need to increment offset past bytes in tvb; just return instead.
svn path=/trunk/; revision=45772
2012-10-24 18:42:11 +00:00
Pascal Quantin 6d99fb6a9f Add dissection of ENVELOPE 3GPP SMS-PP Download
svn path=/trunk/; revision=45768
2012-10-24 16:05:50 +00:00
Anders Broman 1d1575aae7 Mark unused parameter.
svn path=/trunk/; revision=45757
2012-10-24 14:08:47 +00:00
Anders Broman 7787c20c6b Add dissection of a number of options.
svn path=/trunk/; revision=45756
2012-10-24 13:44:25 +00:00
Anders Broman b0ee8f3403 Mark optlen as unused.
svn path=/trunk/; revision=45755
2012-10-24 07:08:39 +00:00
Anders Broman 5c86ab07dc Highlight the correct number of bytes for hf_mip6_acoa_acoa
svn path=/trunk/; revision=45754
2012-10-24 06:07:34 +00:00
Guy Harris 3ceef88b49 No, it's not necessarily the case that a malformed frame will only occur
during fuzz testing or randpkt testing; somebody might be putting bad
packets on the wire to try to, for example, crash or break into your
protocol implementation.

svn path=/trunk/; revision=45749
2012-10-24 04:03:58 +00:00
Guy Harris 7c76ad78d3 Add an AT_ value for 802.15.4 short addresses.
Note that, if you want EUI-64's to resolve the OUI in the display,
hacking individual dissectors to do it themselves and use AT_STRINGZ is
*not* the right way to do it.

svn path=/trunk/; revision=45743
2012-10-23 21:19:02 +00:00
Martin Kaiser 31f7fee054 From Steve Magnani
fix USB descriptor parsing

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

svn path=/trunk/; revision=45742
2012-10-23 21:02:28 +00:00
Chris Maynard f05cc88f6f Don't bother to check if cdata is NULL; it has already been dereferenced.
Fixes Coverity CID 719420: Dereference before null check.

svn path=/trunk/; revision=45741
2012-10-23 21:00:34 +00:00
Martin Kaiser c9b7d8c3c2 j should also be guint16 to prevent overflows in the while-loops
svn path=/trunk/; revision=45740
2012-10-23 20:35:19 +00:00
Pascal Quantin 67fdfbbcde From Allan M. Madsen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7905 :
Fix infinite loop in bthci_evt eir data handling

svn path=/trunk/; revision=45739
2012-10-23 20:27:57 +00:00
Anders Broman afc96b6276 Add B flag to Proxy Binding messages.
svn path=/trunk/; revision=45738
2012-10-23 16:06:57 +00:00
Anders Broman 9887b09f88 Mark unused parameters.
svn path=/trunk/; revision=45737
2012-10-23 12:18:25 +00:00
Anders Broman b70e8b63ff Allways use sminmpec_values_ext to print the vendor id regardless if we have it in the database or not.
svn path=/trunk/; revision=45736
2012-10-23 11:49:19 +00:00
Anders Broman 4c792b7214 - Use mip6_mh_types to build the INFO_COL string rather than a fixed string in the subroutines.
- Use proto_add_item for ipproto.
- extend an enum and use definse for new messages.

svn path=/trunk/; revision=45735
2012-10-23 11:47:57 +00:00
Evan Huus 8987cd4bd7 From Tim Hentenaar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7860
Add a dissector for the America Online protocol (not the AIM protocol).

From me: always use ENC_NA for FT_UINT8 types.

svn path=/trunk/; revision=45731
2012-10-22 23:22:00 +00:00
Bill Meier 78494ccbbf Fix some encoding args; (still more to do).
svn path=/trunk/; revision=45730
2012-10-22 21:40:06 +00:00
Bill Meier 19d2c33091 Cleanup:
- Ethereal --> Wireshark;
- gerald@ethereal.com --> gerald@wireshark.org;
- update FSF address;
- remove unneeded #includes;
- Fix ENC args for proto_tree_add_item() & etc;
- simplify/remove proto_reg_handoff...() as appropriate;
- remove some boilerplate comments;
- move proto_register...() and proto_reg_handoff...() to
   the end of the file as per convention;
- remove some unneeded initializers.
- simplify some code;
- replace "" in hf[] blurb by NULL.


svn path=/trunk/; revision=45728
2012-10-22 20:46:47 +00:00
Bill Meier 3b4260cfe0 ethereal --> wireshark
svn path=/trunk/; revision=45727
2012-10-22 19:58:15 +00:00
Bill Meier ecb3783318 Minor cleanup:
- Ethereal -> Wireshark;
- remove unneeded #include.

svn path=/trunk/; revision=45726
2012-10-22 19:55:20 +00:00
Jakub Zawadzki b03dda64d8 Comment more cases where static allocation is used with SET_ADDRESS.
svn path=/trunk/; revision=45721
2012-10-22 18:14:54 +00:00
Jakub Zawadzki 9680c9a9d9 Memory for address->data store in pinfo can no longer be ep_ allocated.
svn path=/trunk/; revision=45720
2012-10-22 18:14:17 +00:00
Jakub Zawadzki 0bf9560cb0 Fix bug #7892: Buildbot crash output: fuzz-2012-10-21-27120.pcap
Memory for address->data store in pinfo can no longer be ep_ allocated.

svn path=/trunk/; revision=45718
2012-10-22 17:59:22 +00:00
Chris Maynard e6983eb890 Avoid potential infinite loops. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7879
#BACKPORT (1.8, 1.6)

svn path=/trunk/; revision=45717
2012-10-22 16:22:21 +00:00
Pascal Quantin bbadc4134e Add missing newline at end of file
svn path=/trunk/; revision=45716
2012-10-22 16:12:37 +00:00
Anders Broman 3ae4bcd596 Extend value_strings with entries from IANA.
svn path=/trunk/; revision=45713
2012-10-22 14:47:44 +00:00
Jörg Mayer c0d20887f0 Fix
wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2611:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format]
wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2617:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format]


svn path=/trunk/; revision=45711
2012-10-22 14:02:10 +00:00
Anders Broman 0eefbb4b09 Fix
../../../epan/dissectors/packet-btatt.c:299:25: error: too many arguments for format [-Werror=format-extra-args]
../../../epan/dissectors/packet-btatt.c:254:12: error: unused variable 'col_info' [-Werror=unused-variable]

svn path=/trunk/; revision=45710
2012-10-22 13:23:42 +00:00
Anders Broman 576b37ddd8 from Allan M. Madsen:
Add support for HCI 3.0+HS and v4.0, Bluetooth Low Energy. This includes
dissection of additional HCI commands and events, Attribute Protocol and
Security Manager Protocol.

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

svn path=/trunk/; revision=45709
2012-10-22 12:49:04 +00:00
Anders Broman 007a0b28ae From Matthias St. Pierre:
Add full rfc4868 support to both dissectors.

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

svn path=/trunk/; revision=45708
2012-10-22 12:34:01 +00:00
Michael Mann ca6eea0923 Bug 7884 - replace proto_tree_add_text with expert_info for packet-mpls-echo.c (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7884)
svn path=/trunk/; revision=45703
2012-10-22 02:41:19 +00:00
Pascal Quantin b5bc45b118 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7675 :
Fix improper use of negative value in AVCTP

svn path=/trunk/; revision=45699
2012-10-21 21:44:57 +00:00
Pascal Quantin 392a956822 Fix a few errors found by checkhf.pl and fix-encoding-args.pl
svn path=/trunk/; revision=45698
2012-10-21 21:32:58 +00:00
Pascal Quantin 89e9dde138 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7740 :
Fix deadcode areas and improper use of negative value in AVRCP

svn path=/trunk/; revision=45697
2012-10-21 21:17:27 +00:00
Pascal Quantin ccc0d6bd2a From Sho Amano via https://www.wireshark.org/lists/wireshark-dev/201210/msg00186.html:
Fix WLAN decryption when using a WPA PSK key

svn path=/trunk/; revision=45696
2012-10-21 20:52:39 +00:00
Alexis La Goutte 1d4bd1cb33 Make Windows Buildbot happy
svn path=/trunk/; revision=45691
2012-10-21 16:37:45 +00:00
Anders Broman 8d178187e3 AddressString can have a size of 1, fixes Bug 7882 -GSM_MAP show malformed Packets when two IMSI https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7882
svn path=/trunk/; revision=45687
2012-10-21 15:01:23 +00:00
Alexis La Goutte 1ae6c353e7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45686
2012-10-21 14:54:11 +00:00
Alexis La Goutte 5d448950f8 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45685
2012-10-21 14:54:01 +00:00
Alexis La Goutte 55356782db Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45684
2012-10-21 14:53:51 +00:00
Alexis La Goutte 732a735429 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45683
2012-10-21 14:53:38 +00:00
Alexis La Goutte 0baa7413a9 Fix Passed-by-value struct argument contains uninitialized data Warning found by Clang
svn path=/trunk/; revision=45682
2012-10-21 14:53:29 +00:00
Alexis La Goutte 2ce9037866 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45681
2012-10-21 14:53:20 +00:00
Alexis La Goutte 523417a5ca Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45680
2012-10-21 14:53:10 +00:00
Alexis La Goutte 8e0fc436f9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45679
2012-10-21 14:53:01 +00:00
Chris Maynard 43ebecad9a 1) Use tvb_reported_length_remaining instead of tvb_reported_length_remaining.
2) Use proto_item_append_text instead of proto_item_set_text, since this is
   called within a loop.
3) Increment the offset correctly using blocklen-4 instead of
   tvb_length_remaining, which makes no sense.

svn path=/trunk/; revision=45657
2012-10-19 13:50:23 +00:00
Bill Meier 8f8775800b Minor Updates:
- #if 0 unused typedef (found by cppcheck);
- create/use extended value strings as appropriate;
- reformat hf[] entries;
- whitespace.

svn path=/trunk/; revision=45652
2012-10-18 23:01:47 +00:00
Bill Meier 8e9db03197 Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back;
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];

svn path=/trunk/; revision=45651
2012-10-18 22:22:25 +00:00
Martin Kaiser 05c1e47f68 (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7871
increment offset to point to the first byte after the options
(the code used to set an absolute position, if that was 0, we were stuck
 in an endless loop)

svn path=/trunk/; revision=45646
2012-10-18 20:57:02 +00:00
Martin Kaiser 8bf29e8efe minor cleanup of packet-wtp.c
- replace TABs with spaces
- add modelines
- reformat some parts
- use glib data types

svn path=/trunk/; revision=45645
2012-10-18 20:37:10 +00:00
Bill Meier 2c0019b9b5 (Trivial)
-  1 --> TRUE;
-  whitespace and formatting changes.

svn path=/trunk/; revision=45644
2012-10-18 20:27:53 +00:00
Martin Kaiser 93343248cb add CC datatype IDs for the SRM protocol
svn path=/trunk/; revision=45643
2012-10-18 20:12:46 +00:00
Bill Meier 727844442e Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (9 instances);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];
- remove some unneeded initializers;
- unsigned --> guint;
- remove unneeded #includes.
- whitespace changes.

svn path=/trunk/; revision=45642
2012-10-18 20:10:53 +00:00
Bill Meier e7ccdde01e Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (10 instances);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];
- Remove unneeded #includes;
- whitespace (e.g., use consistent indentation).

svn path=/trunk/; revision=45641
2012-10-18 19:05:45 +00:00
Bill Meier 2b1f1e611d Minor cleanup:
- Fix incorrect use of ENC_BIG_ENDIAN instead
  of FALSE (3 instances);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];
- use proper ENC arg for a proto_tree_add_item();
- whitespace.

svn path=/trunk/; revision=45640
2012-10-18 18:11:56 +00:00
Chris Maynard bbfa21cc02 Don't mark used arguments with _U_. Whitespace: tabs -> spaces.
svn path=/trunk/; revision=45639
2012-10-18 18:03:04 +00:00
Bill Meier 93d3fa2257 Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (10 instances);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined ad 0x0000000];
- create/use extended value strings as appropriate;
- remove unneeded initializers;
- reformat hf[] entries;
- whitespace.

svn path=/trunk/; revision=45638
2012-10-18 17:39:45 +00:00
Chris Maynard b29f57e4e0 Fix Coverity CID 739070: Unused pointer value.
svn path=/trunk/; revision=45636
2012-10-18 16:50:49 +00:00
Bill Meier 3da84159eb Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (3 cases);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined ad 0x0000000];
- Remove 'if(tree)' around calls to subdissector;
- whitespace & formatting.

svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
Bill Meier 9193e7a8b1 Minor cleanup:
- create/use extended value strings as appropriate;
- unsigned --> guint;
- whitespace;

svn path=/trunk/; revision=45634
2012-10-18 16:27:11 +00:00
Pascal Quantin 83c9334e37 Dissect additional information parameters for Result object
svn path=/trunk/; revision=45633
2012-10-18 16:14:13 +00:00
Chris Maynard 559c54ea37 tvb_reported_length_remaining() can return -1, so don't assign the return value to a guint16. Fixes Coverity CID 728017: Negative loop bound.
svn path=/trunk/; revision=45632
2012-10-18 15:55:52 +00:00
Bill Meier ed11d058a1 General cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
   done a while back (2 cases);
   [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined ad 0x0000000];
- use proto_tree_add_item() instead of proto_tree_add_uint() when appropriate;
- move proto_register...() to just before proto_reg_handoff..()
   as per convention;
- proto_reg_handoff...() doesn't need 'if (!initialized)'
- remove unneeded #includes;
- remove some "boilerplate" comments;
- remove unneeded forward declaration;
- whitespace.

svn path=/trunk/; revision=45631
2012-10-18 15:17:25 +00:00
Anders Broman 5b80615885 From Matthias St. Pierre:
Add authentication methods HMAC-SHA2-256-96 and HMAC-SHA2-256-128 to isakmp dissector

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

svn path=/trunk/; revision=45630
2012-10-18 14:43:42 +00:00
Pascal Quantin 19f194813f Add a few EUTRAN related elementary files and reorder some value_string arrays
svn path=/trunk/; revision=45629
2012-10-18 11:01:44 +00:00
Bill Meier f498c3a172 Reformat for readability:
indentation, whitespace, long-lines, etc.
Also;
- replace two usages of fprintf(stderr,...) by g_warning();
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back (2 cases);
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined ad 0x0000000]

svn path=/trunk/; revision=45625
2012-10-18 02:33:11 +00:00
Bill Meier e2956a39a2 Cleanup:
- Revmove 'if (tree...)'; col_...() shouldn't be called under same;
- Add an XXX comment;
- Remove not req'd #include <epan/prefs.h>;
- Address cppcheck msg: "Clarify calculation precedence for >> and ?";
- Localize certain variables & remove unneeded initializers;
- Do some whitespace changes.

svn path=/trunk/; revision=45617
2012-10-17 17:16:56 +00:00
Martin Kaiser 0b4e3b9936 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7869
make tpiLen a guint such that it can store 2 + tvb_get_guint8(...)
without overflow

svn path=/trunk/; revision=45614
2012-10-17 07:44:33 +00:00
Martin Mathieson bfdfd004cb Fix some UM sequence analysis issues.
svn path=/trunk/; revision=45613
2012-10-17 04:01:01 +00:00
Guy Harris a060ba4973 The first 4 bytes of the Prism header are, apparently, a "message code",
and it apparently either has the value 0x00000044 or 0x00000041.  If
those bytes aren't the magic number for an AVS header and aren't one of
those "message code" values, assume there's no Prism header, just an
802.11 frame - that fixes at least one capture where some packets have
AVS radio headers and other packets have no radio header.

Note that this might also let us handle big-endian Prism headers (see
which byte order the message code is in, and assume everything else is
in the same byte order).

Display the message code in hex, not decimal.

svn path=/trunk/; revision=45609
2012-10-17 01:23:13 +00:00
Pascal Quantin d7ae273d7a Add dissection of ENVELOPE event download and timer expiration
svn path=/trunk/; revision=45600
2012-10-16 21:30:24 +00:00
Martin Kaiser 304639682f fix some more cases where tvb_length_remaining() is assigned
to an unsigned int

svn path=/trunk/; revision=45599
2012-10-16 21:19:58 +00:00
Martin Kaiser 4cd75a3ce9 make the variable that holds tvb_length_remaining() a signed integer
svn path=/trunk/; revision=45598
2012-10-16 21:07:59 +00:00
Pascal Quantin 442e486442 Dissect a few more command qualifiers
svn path=/trunk/; revision=45597
2012-10-16 20:44:02 +00:00
Pascal Quantin 16bb2a67ba Fix dissection of BER-TLV and COMPREHENSION-TLV length and COMPREHENSION-TLV tag
svn path=/trunk/; revision=45595
2012-10-16 20:25:46 +00:00
Bill Meier 52b516cfa9 General cleanup:
- Calls to expert...() and col_...() should not be under 'if (tree)'
- Move proto_reg_handoff...() to the end of the file as per convention;
- Localize a few variables
- Fix some whitespace (e.g., convert what appear to be '4 space tabs' to spaces)

svn path=/trunk/; revision=45591
2012-10-16 19:05:49 +00:00
Pascal Quantin 5bcb56b21c Fix a copy/paste error
svn path=/trunk/; revision=45588
2012-10-16 17:36:22 +00:00
Pascal Quantin 8edaf50408 Add value_string for PDP Type
svn path=/trunk/; revision=45587
2012-10-16 14:54:08 +00:00
Anders Broman 13c9bcad82 From "msp":
'*' wildcard in the 'Src IP' or 'Dest IP' field of the ESP SA dialog does not work

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

svn path=/trunk/; revision=45585
2012-10-16 14:31:14 +00:00
Michael Mann 0d5d45cf9f Enhancements to DNP3.0 Control Code Dissection (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7865)
minor updates to checked in patch (from rev 45583)

svn path=/trunk/; revision=45584
2012-10-16 14:21:05 +00:00
Anders Broman 3134b7d7f8 From Benjamin Stocks:
Enhancements to DNP3.0 Control Code Dissection.

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

svn path=/trunk/; revision=45583
2012-10-16 14:15:11 +00:00
Pascal Quantin 5e93cf566b Fix dissection of Text String data object
svn path=/trunk/; revision=45577
2012-10-16 08:43:39 +00:00
Anders Broman 3a5c028a0b Remove spurious trailing '%' in format [-Werror=format]
svn path=/trunk/; revision=45573
2012-10-16 05:14:25 +00:00
Michael Mann 7fb78ec5b9 replace proto_tree_add_text with filterable items and expert info to get a few dissectors off of the checkAPIs.pl "naughty" list
svn path=/trunk/; revision=45572
2012-10-16 03:07:06 +00:00
Martin Kaiser be4c14ff77 (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7862
tvb_length_remaining() may return -1
if that happens in dissect_rdp_fields(), return an error
the caller that calls dissect_rdp_fields() from a for loop detects the error
 and exits (others should handle the error as well, this is missing for now)

svn path=/trunk/; revision=45566
2012-10-15 22:34:41 +00:00
Martin Kaiser c44fadc3a8 From Alexander Koeppe
use inet_pton() for address parsing in FTP's EPRT command
support IPv6 addresses

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

svn path=/trunk/; revision=45565
2012-10-15 20:48:22 +00:00
Pascal Quantin 4ee129c341 Dissect more Application Toolkit commands
svn path=/trunk/; revision=45563
2012-10-15 18:13:20 +00:00
Anders Broman 606542f4e7 From Rakesh Kumar:
Error in AUXILIARY SECURITY HEADER Parsing for 802.15.4 in dissect_ieee802154_common function.
Offset should be +8 not +4

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

svn path=/trunk/; revision=45559
2012-10-15 15:59:47 +00:00
Anders Broman 92160cde38 Try to get rid of some of the" pedantic" warnings.
svn path=/trunk/; revision=45553
2012-10-15 08:05:32 +00:00
Guy Harris 85b3da7c63 Clean up the "round up to a multiple of 4" code a bit.
svn path=/trunk/; revision=45548
2012-10-14 22:53:25 +00:00
Guy Harris 26ddc4c04f According to
http://home.martin.cc/linux/prism

there's a set of DID type values different from the ones we were using,
and there are captures out there that use values from both sets. 
Support both sets.

That page also says that a "status" value of 0 means "supplied"; treat
zero as meaning "supplied", and, if it's not zero for a field, don't
include it.

The "Mac Time" is, according to that page, the lower 32 bits of the MAC
timestamp; report it as such.

Fix some field names that were copied-and-pasted but not changed.

The RSSI and signal quality values are numbers, so show them in decimal.

The "signal" and "noise" values appear to be signed numbers, so make
them signed rather than unsigned and show them in decimal.

Show the data rate in the same style as it's shown in the radiotap
dissector.

Show the frame length in decimal; we probably have relatively few users
with 16 fingers.

svn path=/trunk/; revision=45545
2012-10-14 22:38:58 +00:00
Guy Harris ac6341f361 The strings added to the value_string table for X11 opcodes for
extensions were incorrectly made ephemeral, rather than seasonal, in
r44662.  They need to be seasonal, as they're used for dissecting all
packets in the X session.

Redo a couple of loops as for loops to make it a little clearer what
they're doing.

svn path=/trunk/; revision=45539
2012-10-14 18:18:37 +00:00
Bill Meier 6e135fb693 Fix compile error.
svn path=/trunk/; revision=45538
2012-10-14 16:24:17 +00:00
Bill Meier be2e4d238f Minor changes:
- Init COL_PROTOCOL before fetching from tvb;
- Remove some unneeded variable initializers;
- Localize some variables;
- Misc including whitespace revisions.


svn path=/trunk/; revision=45537
2012-10-14 16:18:05 +00:00
Bill Meier 301b185cf4 remove unused variable; fixes compile error.
svn path=/trunk/; revision=45536
2012-10-14 15:31:44 +00:00
Michael Mann 8856e1a03a convert proto_tree_add_text to proto_tree_add_item and expert_add_info_format for packet-dhcpv6.c and packet-dhcp-failover.c
"Refactor" value_string in ARP dissector

svn path=/trunk/; revision=45535
2012-10-14 15:27:52 +00:00
Bill Meier 6cf76e38bf From Yaniv Kaul: Spice protocol fixes and enhancements
- Dissection of monitors config message (SPICE_DISPLAY_MONITORS_CONFIG message)
- Better dissection of capabilities (added several more capabilities for main
  and display channels)

From me:
- Remove (now) unused variables.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7859

svn path=/trunk/; revision=45534
2012-10-14 15:12:03 +00:00
Guy Harris 09e4e205c7 Some of the changes claimed to be in the previous checkin weren't there.
Label the data sources for reassembled fragments as "Reassembled
6LoWPAN". 

Fix the capitalization of "6LoWPAN".

Also, label the data sources for decompressed fragments as "Decompressed
6LoWPAN xxx".

svn path=/trunk/; revision=45529
2012-10-14 02:54:25 +00:00
Guy Harris 395dd4a88e *Always* create a new data source when we decompress an IPv6 header.
Label the data sources for them as "6LoWPAN xxx", where "xxx" is the
type of compression, and label the data sources for reassembled
fragments as "Reassembled 6LoWPAN".

Fix the capitalization of "6LoWPAN".

Note that if reassembly fails, continuing dissection is not the right
thing to do, at least not if it failed because we don't *yet* have all
the fragments.

svn path=/trunk/; revision=45527
2012-10-14 02:33:26 +00:00
Guy Harris 7ac57a8411 The Interface Name field of the Interface Name sub-object of the
Interface Information object for ICMP is *NOT* null-terminated.  Use
tvb_format_text() for now, to properly null-terminate the display string
and to cope with non-ASCII data.  (It should ultimately be a named field
with an encoding of UTF-8.)

svn path=/trunk/; revision=45525
2012-10-13 22:20:34 +00:00
Evan Huus e2c898959c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7858
Use a full 32-bit literal instead of just a 16-bit one. Fixes case where
the value we're &-ing with just slips over 2^16, making us get stuck
in an infinite loop.

I'm not sure this matches the iscsi spec anymore, the comment in the code
about padding bytes is ambiguous as to whether they're leading or trailing.

svn path=/trunk/; revision=45524
2012-10-13 22:12:52 +00:00
Pascal Quantin fa57420e74 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7857 :
Fix an infinite loop in WaveAgent dissector

svn path=/trunk/; revision=45523
2012-10-13 20:59:14 +00:00
Guy Harris 4fdfccd56d Don't add FT_UINTn values with proto_tree_add_int(). (The fields in
question are 4-byte header fields containing bitfields, so "unsigned" is
appropriate here.)

svn path=/trunk/; revision=45521
2012-10-13 17:57:13 +00:00
Pascal Quantin c5e0d7ce32 Do not use private_data from caller dissector as IKEv2 decryption parameters
svn path=/trunk/; revision=45510
2012-10-12 21:06:27 +00:00
Bill Meier 58c859dd90 Move proto_register...() and proto_reg_handoff...() to the end of the file as per convention;
Do minor whitespace changes.

svn path=/trunk/; revision=45503
2012-10-12 19:59:56 +00:00
Bill Meier 96f708abd5 Fix (what appears to be) a minor "off by one" bug in 'for' loop.
svn path=/trunk/; revision=45500
2012-10-12 18:31:31 +00:00
Anders Broman 8527d3912c From Andrei Emeltchenko:
Register eapol dissector.

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

svn path=/trunk/; revision=45498
2012-10-12 12:52:36 +00:00
Martin Mathieson fa79b7580a When configuring DRB mappings (from signalling channel), create a
separate table for each UE.

svn path=/trunk/; revision=45494
2012-10-12 03:00:38 +00:00
Alexis La Goutte 29862fd1a1 Reorder 80211 dissector code (put value_string/true_false_string in top of file not in proto_register_...
svn path=/trunk/; revision=45491
2012-10-11 21:37:37 +00:00
Pascal Quantin 5f4f0b2637 Enhance dissection of Terminal Profile
svn path=/trunk/; revision=45490
2012-10-11 21:29:01 +00:00
Alexis La Goutte 969dcb9475 Small enhance following patch about 802.11ac (VHT)
svn path=/trunk/; revision=45489
2012-10-11 21:18:23 +00:00
Bill Meier d9c189e2d8 Correction to SVN #45476
svn path=/trunk/; revision=45486
2012-10-11 21:01:51 +00:00
Alexis La Goutte b34abdc943 From Alex Badea via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7849
IPsec ESP: allow filtering by ICV verification result

Add hf_esp_icv_good and hf_esp_icv_bad (similar to IP checksums), to allow
filtering based on the ICV check results.

svn path=/trunk/; revision=45483
2012-10-11 20:38:39 +00:00
Alexis La Goutte b0b96f7f07 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7840
packet-smb.c does not handle truncated frames well when dealing with TRANS2 FIND_{FIRST/NEXT} responses

The current code simply throws an exception if any of the expected data is
missing, even though there might be several file's worth of data available.

I will attach a patch that does a better job of handling truncated frames in
such cases.

svn path=/trunk/; revision=45480
2012-10-11 20:09:44 +00:00
Alexis La Goutte a6c72491e4 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7838
packet-smb.c does not correctly dissect INFO_QUERY_EAS_FROM_LIST

[MS-CIFS].pdf makes it clear that, contrary to what packet-smb.c says, handling
the response to a TRANS2/FIND_{FIRST,NEXT} with a level of
INFO_QUERY_EAS_FROM_LIST is not the same as handling INFO_QUERY_EA_SIZE.


svn path=/trunk/; revision=45479
2012-10-11 20:01:37 +00:00
Bill Meier 82d40100d2 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Done on general principles altho upon inspection
none of the cases changed would have actually
resulted in an infinite loop.



svn path=/trunk/; revision=45478
2012-10-11 19:39:32 +00:00
Bill Meier ad0219d033 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)
The changes fix definite problems or
are done "just in case" for cases not esily determined
to be a problem by quick inspection.

Note: in some cases for loop index variables have been renamed
      to ensure  all required codes changes detected.

##backport

svn path=/trunk/; revision=45477
2012-10-11 19:20:21 +00:00
Bill Meier b2cb4007e3 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'.
The changes fix possibly problematical cases
 (not clear upon quick inspection).

Also: fix several bugs wherein an inner 'for' loop used
the same index variable name as an outer loop thus
messing up the outerloop.

##backport


svn path=/trunk/; revision=45476
2012-10-11 19:14:29 +00:00
Anders Broman 94374cb6d7 Fix:
../../../epan/dissectors/packet-giop.c: In function 'get_CDR_typeCode':
../../../epan/dissectors/packet-giop.c:3341:15: warning: variable 'ti' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'decode_ServiceContextList':
../../../epan/dissectors/packet-giop.c:3871:7: warning: variable 'temp_offset' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'dissect_giop_request_1_2':
../../../epan/dissectors/packet-giop.c:4443:10: warning: variable 'response_flags' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'get_giop_pdu_len':
../../../epan/dissectors/packet-giop.c:4837:81: error: unused parameter 'offset' [-Werror=unused-parameter]

svn path=/trunk/; revision=45473
2012-10-11 15:04:09 +00:00
Michael Mann a5d56d30b4 Make idl2wrs dissectors filterable - Part 1
Updated wireshark_gen.py to generate hf_ variables for all of the IDL "types".  The "simple" types use proto_tree_add_* (not text), while the "complex" types use the GIOP dissector API.  checkhf.pl generates some warnings because (some of) the hf_ variables are being generated for the "complex" types, but are not being used.  That will be done in Part 2.

expert_add_info_format now linked to a real item instead of being attached to a duplicative proto_tree_add_text().  This cleaned up literally thousands of unnecessary proto_tree_add_text()s

svn path=/trunk/; revision=45472
2012-10-11 14:42:33 +00:00
Michael Mann e258b8e353 Should have been part of r45470, changing format of "magic number"
svn path=/trunk/; revision=45471
2012-10-11 14:22:13 +00:00
Michael Mann 756a564fff General cleanup, made more items filterable. Checking in now to get a new baseline for some idl2wrs improvements involving getting more items filterable (see bug 7822)
svn path=/trunk/; revision=45470
2012-10-11 14:16:25 +00:00
Michael Mann 552e411031 Fix infinite loop in HART/IP dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7845)
I also did a small bit of cleanup dissection while I was there, but it could definitely use more.  I just want to fix the fuzztest crash I discovered before the buildbots get a hold of it.

svn path=/trunk/; revision=45469
2012-10-11 14:05:27 +00:00
Anders Broman d88e1202a5 From Bartosz Brachaczek:
Make the SSL dissector work with GnuTLS compiled with nettle.

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

#BACKPORT

svn path=/trunk/; revision=45465
2012-10-11 08:28:57 +00:00
Guy Harris dda0e94161 hf_isup_cic is now BASE_DEC, so there's no reason to use
proto_tree_add_uint_format() to make it display in decimal -
proto_tree_add_uint() suffices.

svn path=/trunk/; revision=45464
2012-10-11 08:23:29 +00:00
Anders Broman f6914a05af "Prepare/Apply a filter" on ISUP CIC should make a filter with decimal CIC number, not hex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7848

svn path=/trunk/; revision=45463
2012-10-11 08:12:41 +00:00
Bill Meier 38f3198b2b Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Done on general principles altho none of the cases
changed would have actually resulted in an infinite
loop because a Bounds error would eventually occur.

svn path=/trunk/; revision=45462
2012-10-11 03:55:33 +00:00
Guy Harris f154882eb5 The usual idiom in C for "do this N times" is "for (i = 0; i < N; i++)",
not "for (i = 1; i < N+1; i++)".

Even if it weren't the idiom, it'd be safer, at least for unsigned
values, as, if i and N are the same width, and N has the maximum
possible value for that width, the first of those runs i from 0 to N-1,
all of which fit in a variable of that width, and the second of those
runs i from 1 to N, the latter of which doesn't fit into a variable of
that width, so modulo arithmetic turns it into 0 and the loop keeps
running forever.

Fixes bug 7844.

svn path=/trunk/; revision=45459
2012-10-11 00:02:14 +00:00
Martin Mathieson dbca2e7d8f Get rid of an outdated format
svn path=/trunk/; revision=45450
2012-10-10 16:39:51 +00:00
Martin Mathieson d8fa6d9c9a Update to format of string that indicates SR failure.
svn path=/trunk/; revision=45448
2012-10-10 15:18:52 +00:00
Greg Morris 9ea1ab416e Provide ability to find previous request packets in NCP hash table.
svn path=/trunk/; revision=45447
2012-10-10 13:55:18 +00:00
Chris Maynard a50e1a98ae Apply Ronnie Sahlberg's ICMP request/response tracking improvements from r45343 to ICMPv6. (Tested using captures from bug 5810).
svn path=/trunk/; revision=45439
2012-10-09 22:34:40 +00:00
Jaap Keuter 7a1e74398d From Mark Phillips:
I have added support for the 11ac VHT Capabilities and Operation IEs.

svn path=/trunk/; revision=45438
2012-10-09 21:29:09 +00:00
Pascal Quantin d0b892f450 Add another check for command APDU dissection
svn path=/trunk/; revision=45435
2012-10-09 20:11:48 +00:00
Pascal Quantin b126c01738 Fix dissection of more instructions when having only the command APDU
svn path=/trunk/; revision=45433
2012-10-09 17:49:14 +00:00
Alexis La Goutte 635554cc51 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7820
wlan_mgt.ht.capabilities bits 8-15 incorrectly decoded (from wrong packet offset)

The bug is that the code defines the bit fields as 16 bit, but increments the
offset in-between decoding B0-B7 and B8-B15 which causes the wrong bits to be
decoded.

Also fix to change "Capability" to "Capabilities" to match spec

From me : Fix wrong length for A-MPDU


svn path=/trunk/; revision=45431
2012-10-09 17:17:22 +00:00
Anders Broman 9d37b98748 Set fence after finishing writing to the info col in order to show
info from more than one (SIP) message in the frame.

svn path=/trunk/; revision=45429
2012-10-09 15:07:46 +00:00
Anders Broman cba1bb8278 As ths SDP dissector adds /SDP to the protocol column I think that
col_append_str(pinfo->cinfo, COL_INFO, ", with session description"); is redundant if some one has a different opinion fel free to revert.

svn path=/trunk/; revision=45428
2012-10-09 15:00:39 +00:00
Anders Broman 76c746b16d From Andrew Kampjes:
Correcting a few fields in SDH dissector.

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

svn path=/trunk/; revision=45426
2012-10-09 10:57:04 +00:00
Pascal Quantin 00e6a66e4d Fix dissection of Get Response when not in SIMtrace mode
svn path=/trunk/; revision=45425
2012-10-09 10:48:59 +00:00
Anders Broman 8dec6cccb9 From Michal Labedzki:
[PATCH 17] Bluetooth: Add GNSS services to SDP

Based on https://www.bluetooth.org/Technical/AssignedNumbers/home.htm

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

svn path=/trunk/; revision=45424
2012-10-09 10:45:14 +00:00
Anders Broman c75bca343a From Michal Labedzki:
[PATCH 16] Bluetooth: Add SYNC and BPP service handles to OBEX
Also fix typo.

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

svn path=/trunk/; revision=45423
2012-10-09 10:41:30 +00:00
Anders Broman 3805f354a4 From Michal Labedzki:
[PATCH 15] Bluetooth: Add modelines 

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

svn path=/trunk/; revision=45422
2012-10-09 10:36:04 +00:00
Anders Broman 4209300f48 Replace non ASCII chars.
svn path=/trunk/; revision=45421
2012-10-09 10:26:43 +00:00
Anders Broman 5f9709ad8c Comment out unused variable remoce C++ style comments etc.
svn path=/trunk/; revision=45420
2012-10-09 10:24:15 +00:00
Anders Broman de222a1b5a From Chris Wulff:
Minor bugfixes to packet-msrp.c and packet-mrp-mvrp.c

Major updates to packet-ieee17221.c

Changes to ieee17221.c update dissector from draft revision 18 / 19 code to
draft revision 21.

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

svn path=/trunk/; revision=45419
2012-10-09 08:49:40 +00:00
Anders Broman eb618abad9 From Bill Parker:
Explicitly declare/cast 'unsigned <variable>' as 'unsigned int <variable>'

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

svn path=/trunk/; revision=45418
2012-10-09 08:40:02 +00:00
Pascal Quantin 41ad59d6a7 Fix dissection of Bearer parameters for E-UTRAN / mapped UTRAN packet service
svn path=/trunk/; revision=45417
2012-10-09 07:40:06 +00:00
Jaap Keuter d08697130f Add initial support for three new RTCP packet types: AVB, RSI and TOKEN.
svn path=/trunk/; revision=45416
2012-10-09 06:41:32 +00:00
Pascal Quantin f8b81a6f5f Check if Bearer Parameters field is present before displaying it
svn path=/trunk/; revision=45415
2012-10-09 05:34:48 +00:00
Pascal Quantin 924f9663fd Enhance dissection of Open Channel proactive command
svn path=/trunk/; revision=45413
2012-10-08 22:30:47 +00:00
Pascal Quantin 1bed23e6d0 Add "gsm_sim.command" and "gsm_sim.response" dissectors and call them in btsap dissector
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7715

svn path=/trunk/; revision=45411
2012-10-08 21:46:30 +00:00
Martin Kaiser 5ff09963ab fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7800
use correct data types in eigrp dissector to prevent overflow

svn path=/trunk/; revision=45408
2012-10-08 20:43:06 +00:00
Evan Huus d0183357dc From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7796
Add summary information to USB isodesc trees to make interesting descriptors
obvious to the user.

svn path=/trunk/; revision=45403
2012-10-08 19:31:17 +00:00
Evan Huus 3c57a48598 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7807
Fix dissection of some GlusterFS procedures.

From me:

Use TRUE/FALSE instead of 1/0 for boolean literals.

svn path=/trunk/; revision=45401
2012-10-08 19:23:50 +00:00
Alexis La Goutte 3e602ee281 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45398
2012-10-08 17:55:12 +00:00
Alexis La Goutte 8d6260628e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45397
2012-10-08 17:54:39 +00:00
Anders Broman 2c181db864 Fix unused parameters.
svn path=/trunk/; revision=45387
2012-10-08 15:10:24 +00:00
Anders Broman 4856bcfd40 Let ISUP national settings be valid for BICC too.
Extend dissection of Japan ISUP.

svn path=/trunk/; revision=45386
2012-10-08 14:22:24 +00:00
Jakub Zawadzki bf77a26b3f Patch from Florian Fainelli via bug #7772
Cleans up the mask used for the "High" part of the sub-carrier modulation 
to match (modulus the 4-bits shifting) the one used for the "Low" part.

svn path=/trunk/; revision=45382
2012-10-08 12:06:16 +00:00
Jakub Zawadzki cef1e32ede Patch from Florian Fainelli
Fix bug #7772: dissect only the number of active HomePlug AV subcarriers

The dissector currently dissects all 1156 sub-carriers available in the Tone
Map Characteristisc Confirmation frame no matter what is the number of active
ones. 

This is not valid, because the frame only contains the number of active
sub-carriers, even though it is padded to 1156 sub-carriers. This is also an
issue for newest HomePlug AV devices with a 500Mbits/sec PHY rate, because
those will have up to 2690 sub-carriers, and we would only dissect the first
1156 active ones.


svn path=/trunk/; revision=45381
2012-10-08 12:05:14 +00:00
Jakub Zawadzki da00b4089e Continuation of r43335
- ipv6.traffic_class.dscp use ext string so and need BASE_EXT_STRING flag (fix SIGSEGV)
- dscp_vals was removed from .h file, so make it static
- export dscp_vals_ext

svn path=/trunk/; revision=45380
2012-10-08 09:50:47 +00:00
Jakub Zawadzki d6d3e59660 RFC 4627 allows upper case hex digits as well
svn path=/trunk/; revision=45379
2012-10-08 09:48:38 +00:00
Anders Broman d0c2bc2232 From Martin Isaksson:
Preparattions for GTP tap.

svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
Chris Maynard b44dcac8ba Fix a couple of typos.
svn path=/trunk/; revision=45375
2012-10-07 20:36:12 +00:00
Jakub Zawadzki 9baaa74218 +10 ;|
svn path=/trunk/; revision=45374
2012-10-07 20:13:11 +00:00
Jakub Zawadzki ac4419071b Unescape JSON strings.
svn path=/trunk/; revision=45373
2012-10-07 19:57:21 +00:00
Jakub Zawadzki cb12df2ca8 Fix bug #7805: application/json HTTP packets sometimes isn't decoded
tvbparse_quoted() don't support well JSON string escaping, use our own tvbparse rule.

svn path=/trunk/; revision=45372
2012-10-07 19:33:47 +00:00
Evan Huus c8308c7c40 From Tomofumi Hayashi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7806
Update MPLS-Echo to support part of rfc6425.

svn path=/trunk/; revision=45369
2012-10-07 16:13:40 +00:00
Martin Mathieson af71608df6 Use GPOINTER_TO_UINT macro.
svn path=/trunk/; revision=45368
2012-10-07 15:59:26 +00:00
Martin Mathieson 96386ec1da Make the channel state key fit into the gpointer to avoid allocations.
Don't fetch the first byte of the payload length multiple times.

svn path=/trunk/; revision=45367
2012-10-07 15:14:44 +00:00
Jaap Keuter 4a502ac864 From Роман Донченко:
Currently, when Wireshark encounters the first entropy-coded segment in a JPEG
file it stops dissection.
However, the design of the JPEG format allows to find the next marker even if
the entropy-coded segment is not decoded. Thus, a better strategy for Wireshark
would be to skip the entropy-coded segment and continue dissection at the next
marker.

svn path=/trunk/; revision=45363
2012-10-07 09:48:30 +00:00
Evan Huus 8bcc1ed05c Add modelines to packet-radius, and fix a bit of indentation.
svn path=/trunk/; revision=45358
2012-10-06 23:52:02 +00:00
Pascal Quantin fa9484715c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7802 :
Avoid an infinite loop when number_of_dup_tsns is equal to 65535

svn path=/trunk/; revision=45355
2012-10-06 21:07:34 +00:00
Bill Meier add85b1cbb Remove unneeded code ("[set_but_unused]").
svn path=/trunk/; revision=45347
2012-10-06 15:56:08 +00:00
Ronnie Sahlberg cde73df2e7 ICMP: Icmp was a mad mix of different indentation styles.
indent -kr -i8   for now to make it use a consistent style
No code changes, only formatting in this patch


svn path=/trunk/; revision=45346
2012-10-06 15:53:01 +00:00
Bill Meier 4f578199b5 Minor changes:
- proto_reg_handoff...() called only once: simplify;
- move proto_register...() to just before proto_reg_handoff...() as per convention;
- misc.

svn path=/trunk/; revision=45345
2012-10-06 15:52:14 +00:00
Ronnie Sahlberg 1693627478 ICMP request/response matching fixes
Change icmp request/response matching to be more aligned to other matching
strategies and use two tables. One table for first time we visit a packet
and a second table to track all confirmed matches.


svn path=/trunk/; revision=45343
2012-10-06 15:06:00 +00:00
Martin Mathieson 62d83ed0c8 Give up trying to parse those lines - the format has changed and its too
complicated now.

svn path=/trunk/; revision=45342
2012-10-06 15:00:38 +00:00
Martin Mathieson 5bd351fb32 Look up once and store the RLC and PDCP dissectors.
svn path=/trunk/; revision=45341
2012-10-06 14:59:51 +00:00
Evan Huus dfd86092f2 Fix error caught by valgrind where we were running off the end of a
variable because we were passing the address of a single guint8 as a
char*. Work around it by making the guint8 an array and filling the last
element with 0 as if it were a null-terminated string.

svn path=/trunk/; revision=45339
2012-10-06 14:23:44 +00:00
Pascal Quantin 062ad6bad1 pinfo is now used
svn path=/trunk/; revision=45338
2012-10-06 10:03:41 +00:00
Pascal Quantin 75dd452b24 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7801 :
Ensure that the sub-type length is at least 2 (for sub-type and length fields).
Prevents an infinite loop when the length equals 0.

svn path=/trunk/; revision=45337
2012-10-06 10:01:59 +00:00
Gerald Combs dec2d034b0 Try to describe icmp.resp_in and icmp.resp_to more clearly.
svn path=/trunk/; revision=45332
2012-10-05 16:04:04 +00:00
Pascal Quantin 9bcae55a34 Fix copy/paste error
svn path=/trunk/; revision=45330
2012-10-05 04:48:51 +00:00
Guy Harris f569edbcef The sFlow specification says there's an address type "unknown", with an
address type value of 0, and with zero bytes of address; handle it
explicitly, and don't treat it as an error.

In the sFlow dissectors, do all the checks for "is this an sFlow
packet?" *before* we do anything to the columns and the protocol tree.

svn path=/trunk/; revision=45329
2012-10-05 01:17:33 +00:00
Pascal Quantin 04ba20fa0e Upgrade NAS dissector to v11.4.0 (Release 11)
svn path=/trunk/; revision=45325
2012-10-04 21:23:06 +00:00
Martin Kaiser 6afaa3ed63 fix fuzz test failures in sflow
in dissect_sflow_245_address_type(), don't reset the offset to 0 when
the address family is unkown
bring up an expert info instead and increment offset by the number of
bytes processed

svn path=/trunk/; revision=45324
2012-10-04 19:51:00 +00:00
Jaap Keuter 4bcc01b5bd From Sven Eckelmann:
Fix dissection of IEEE 802.11 Channel Switch Announcement element.

svn path=/trunk/; revision=45321
2012-10-04 19:30:15 +00:00
Martin Kaiser a0ce1f8fc2 try to fix usb-related fuzz test crashes
in dissect_usb_interface_descriptor() and
dissect_usb_endpoint_descriptor, the offset should be incremented
depending on the number of bytes we dissected, not based on the len
field (len field==0 would then cause an endless loop)

also fixed one occurrence of old_offset-offset, that's probably a typo,
the values will always be negative...

svn path=/trunk/; revision=45310
2012-10-04 15:37:38 +00:00
Martin Kaiser e8205fb955 From Alexander Koeppe
support for EPRT command as defined in RFC 2428 (IPv4 addresses only)

from me
simplify the code, expert info must not be under if(tree)

based on the submission in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7729

svn path=/trunk/; revision=45308
2012-10-04 14:35:09 +00:00
Pascal Quantin 191dd647a1 Display the raw PFI next to the translated one (as a value string array would do) so as to reduce a bit confusion
svn path=/trunk/; revision=45295
2012-10-03 18:09:04 +00:00
Pascal Quantin 88324e39bb Use a value string array for EPS Bearer Identity and remove useless de_esm_lnkd_eps_bearer_id function
svn path=/trunk/; revision=45267
2012-10-02 20:44:36 +00:00
Pascal Quantin 64272873f0 The Packet Filter Identifier range is [1;16] according to 3GPP 27.007 chapter 10.1.3
svn path=/trunk/; revision=45266
2012-10-02 20:17:08 +00:00
Pascal Quantin ff3bd58b74 Upgrade NAS EPS dissector to v11.4.0 (Release 11)
svn path=/trunk/; revision=45253
2012-10-02 12:46:21 +00:00
Pascal Quantin dc1788a98e According to 3GPP 24.011, information element name is RP-Originator Address, not RP-Origination Address
svn path=/trunk/; revision=45252
2012-10-02 10:58:36 +00:00
Pascal Quantin 4afd80511e Fix hf_me (it is a 2 bits long field, not a boolean)
svn path=/trunk/; revision=45249
2012-10-02 07:20:31 +00:00
Jaap Keuter 34e3d6d1f3 Make protocol 5 octets long and cut down code clutter,
svn path=/trunk/; revision=45242
2012-10-01 21:43:34 +00:00
Pascal Quantin 5ec061bf0c Add options to dissect MCCH from LTE MAC/RLC dissectors
svn path=/trunk/; revision=45239
2012-10-01 19:51:07 +00:00
Martin Kaiser 1ca75014ae dvb-ci: display cc item's name in the subtree title
svn path=/trunk/; revision=45224
2012-09-30 17:58:45 +00:00
Alexis La Goutte 7c59618e8d From Olivier Benghozi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7734
Enhance Route Refresh Capability : Add draft-ietf-idr-bgp-enhanced-route-refresh-02

Not yet support new NOTIFICATION error code : ROUTE-REFRESH Message Error (Value To Be Defined)

From me :
* Make some Route Refresh fields filterable 

svn path=/trunk/; revision=45217
2012-09-30 10:38:37 +00:00
Alexis La Goutte cd519e450c From Olivier Benghozi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7734
BGP bad decoding for Graceful Restart Capability with only helper support

BGP Capability in OPEN message: Graceful restart capability (64).

So when the length of the capability value is smaller that 6 (6 meaning full
support of GR capa, with significants elements and at least one AFI/SAFI), the
code interprets it as erroneous.

However,as described in RFC4724: " When a sender of this capability does not
include any <AFI, SAFI> in the capability, it means that the sender is not
capable of preserving its forwarding state during BGP restart, but supports
procedures for the Receiving Speaker (as defined in Section 4.2 of this
document). In that case, the value of the Restart Time field advertised by the
sender is irrelevant".

So, length of exactly 2 is valid but has to be interpreted with a particular
meaning.

In the dissector code, a length of 2 should be a special case for this capa,
decoding as "Graceful Restart helper mode only" or something like that, and
maybe also displaying an expert message if the Restart flag is not 0 in this
case, since here it's not expected to be possible.

svn path=/trunk/; revision=45216
2012-09-30 10:05:18 +00:00
Pascal Quantin 1b3fd6e7e1 Upgrade LTE RRC dissector to v11.1.0
svn path=/trunk/; revision=45215
2012-09-30 08:06:50 +00:00
Evan Huus d908cf1132 From Andrew Kampjes via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7750
Pull SDH level out of ERF header if the user hasn't manually set the preference.

svn path=/trunk/; revision=45207
2012-09-29 13:44:45 +00:00
Pascal Quantin 99e7a5b4dc From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615 :
Fix minor bug in dissection of "e" bit and add value strings for remaining data block header fields

svn path=/trunk/; revision=45206
2012-09-29 08:34:00 +00:00
Alexis La Goutte 0bddabb63b From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7767
Add the FeliCa Plug System Code

Fairly recently, Sony introduced the "FeliCa Plug" (AKA "NFC Dynamic Tag")
product - which also has a unique System Code value (0xFEE1) associated with
it, according to
http://www.sony.net/Products/felica/business/tech-support/data/fp_usmnl_1.11.pdf

svn path=/trunk/; revision=45205
2012-09-29 07:47:19 +00:00
Pascal Quantin 99d2b14706 Remove a duplicate hf
svn path=/trunk/; revision=45200
2012-09-28 21:20:29 +00:00
Pascal Quantin 12c71b2ff1 Remove a duplicate hf
svn path=/trunk/; revision=45198
2012-09-28 20:36:03 +00:00
Bill Meier f8a2fd3010 Fix another "set but unused" compiler warning...
svn path=/trunk/; revision=45197
2012-09-28 19:59:52 +00:00
Bill Meier daab50bc27 Fix "set but unused" compiler error.
svn path=/trunk/; revision=45196
2012-09-28 19:56:16 +00:00
Bill Meier 562c890560 Cleanup:
packet-mpls.c:
  - refactor dissect_pw_ach();
  - create/uer value_string_ext as appropriate;
  - use call_dissector() rather than direct dissector call in one cse;

 all:
  - use 'LABEL' prefix for a set of rather generic enum identifiers;
  - fix some cases of calling expert...() or sub-dissectors under 'if(tree)';
  - reformat some hf[] entries;
  - do some whitespace changes.

svn path=/trunk/; revision=45195
2012-09-28 19:50:49 +00:00
Pascal Quantin da4b39e720 Revert r21471: previous decoding of APN was matching 3GPP 23.003 chapter 9.1 and the pcap file attached to bug 1543 is not valid
svn path=/trunk/; revision=45194
2012-09-28 16:31:08 +00:00
Pascal Quantin 559a26361a Upgrade LTE Positioning Protocol to V11.0.0
svn path=/trunk/; revision=45193
2012-09-28 15:40:14 +00:00
Jörg Mayer 7ebba8f64d Get rid of HAVE_CONFIG_H for cmake. Fix one case where it was still used.
svn path=/trunk/; revision=45191
2012-09-28 14:24:52 +00:00
Guy Harris f7030c6940 Get rid of unused variable.
svn path=/trunk/; revision=45179
2012-09-27 19:35:23 +00:00
Greg Morris a039953b6e Fix for buildbot warning on OSX-10.6-x64
svn path=/trunk/; revision=45178
2012-09-27 18:04:09 +00:00
Greg Morris 247040590d Added additional server information in NCP 23/17 reply structure for OES Linux.
Fixed GTKHash table being overwritten when number of NCP packets exceeds 255. Sequence numbers wrap so this was causing the request value table to be overwritten and subsequent malformed NCP packets.

Fixed buid_expert_data for file open reporting to correctly convert to Hex value so proper lookup in val table will succeed.

Added additional OES Linux values to build_expert_data for server entries.

svn path=/trunk/; revision=45177
2012-09-27 17:47:10 +00:00
Michael Mann 99d0404b73 replaced decode_enumerated_bitfield calls with itemized filters
svn path=/trunk/; revision=45176
2012-09-27 16:49:31 +00:00
Chris Maynard d003cdf66e Allow dissection of partial jpegs by a modification of the heuristics.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6230
#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=45174
2012-09-27 14:02:37 +00:00
Jakub Zawadzki a23c3aae3c Fix duplicated field: nmpi.name_flags
svn path=/trunk/; revision=45170
2012-09-27 10:42:03 +00:00
Michael Mann 65ef9e9d6b replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything.
svn path=/trunk/; revision=45166
2012-09-27 04:36:40 +00:00
Michael Mann 0063cc00c8 remove decode_numeric_bitfield + cleanup.
I wanted to just remove the decode_numeric_bitfield calls, but the dissector needs some MAJOR work. Cleaned up some with the power of value_strings, but I just got overwhelmed.  There has got to be existing APIs to make this dissection simpler (besides being more filterable).

svn path=/trunk/; revision=45165
2012-09-27 04:05:01 +00:00
Guy Harris 9636d1655d Put the individual property flags under the properties item, rather than
at the top level.

svn path=/trunk/; revision=45159
2012-09-26 20:43:58 +00:00
Guy Harris 141200fa86 Show the PID field of the transport feedback NACK as "RTCP Transport
Feedback NACK PID", not just as "RTCP Transport Feedback NACK", and give
the field a name for that.

Use it in the protocol tree for the bits of the BLP field, rather than
making it a hidden field there.

Clean up the tags appended to the BLP field.

svn path=/trunk/; revision=45157
2012-09-26 20:19:20 +00:00
Guy Harris 0ac06207ce Just append the ": " to the generic NACK BLP item, don't replace its
text.

Don't put empty items into the bitfield tree.

Show the BLP field as hex, as it's a bitfield.

(What should *really* happen is that it should display each 1 bit in the
usual fashion, with the ".... ...1 .... ...." display, but have that bit
be an *integral* field with the appropriate PID for the NACKed packet -
i.e., display hf_rtcp_rtpfb_nack_pid, with the value
rtcp_rtpfb_nack_pid + i + 1, and with the bitfield stuff in the
displayed representation.)

svn path=/trunk/; revision=45155
2012-09-26 19:23:33 +00:00
Michael Mann 97c808c75c replaced decode_boolean_bitfield calls with itemized filters
svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
Michael Mann 2edc3c1822 minor endian bugfix
svn path=/trunk/; revision=45151
2012-09-26 18:09:04 +00:00
Chris Maynard 60626e8fd2 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 ...
#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=45150
2012-09-26 16:48:20 +00:00
Martin Mathieson 0b194f98ad Control the heuristic dissector with a preference. It is only a 7-bit
CRC, so was firing too readily...

svn path=/trunk/; revision=45147
2012-09-26 10:10:27 +00:00
Guy Harris be0a9dcfa2 Note that it's a smart card standard.
svn path=/trunk/; revision=45141
2012-09-25 21:00:10 +00:00
Martin Kaiser 82f78f6ed6 trival: replaced tabs with spaces, added modelines
svn path=/trunk/; revision=45138
2012-09-25 19:57:10 +00:00
Martin Kaiser 7da8dfc0b8 From Michal Labedzki
make ISO 7816 Answer To Reset (ATR) a separate dissector
call it from Bluetooth SAP

from me
- change protocol name to iso7816.atr to be consistent with existing
  filter names
- subtree for atr
- always call atr dissector via handle
- reject the packet if it has no valid init char
- don't use boolean data parameter, fill the info column with the data
  required by Bluetooth SAP

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


svn path=/trunk/; revision=45137
2012-09-25 19:46:10 +00:00
Michael Mann 5cb75e808d replaced decode_boolean_bitfield, decode_numeric_bitfield, and decode_enumerated_bitfield calls with itemized filters
svn path=/trunk/; revision=45135
2012-09-25 18:41:41 +00:00
Jörg Mayer edf882913e Decode some more elements.
svn path=/trunk/; revision=45119
2012-09-25 01:21:19 +00:00
Michael Mann 4f9707469d replaced decode_boolean_bitfield calls with itemized filters
added tfs_no_yes to tfs.[ch]

svn path=/trunk/; revision=45115
2012-09-25 01:00:41 +00:00
Pascal Quantin 3f16280e9b From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7753 :
Fix display of WRITE BUFFER and SEND DIAGNOSTIC fields in SCSI dissector

svn path=/trunk/; revision=45111
2012-09-24 19:42:12 +00:00
Jakub Zawadzki 7a9d27c33f Regenerate asn.1 dissectors.
svn path=/trunk/; revision=45110
2012-09-24 19:38:46 +00:00
Jörg Mayer 8499871d96 Beginnings of the Foundry Discovery Protocol (FDP) dissector.
While FDP is (mostly) deprecated, it is still in use.

svn path=/trunk/; revision=45103
2012-09-24 16:20:31 +00:00
Anders Broman 0bbd6d4616 Try to passify the buildbots by:
- Using G_GINT64_CONSTANT for 64 bit constants.
- Using guint64 and G_GINT64_MODIFIER where apropriate
- set individual struct members.
-  cast time_t to guint i two places.

svn path=/trunk/; revision=45101
2012-09-24 13:54:45 +00:00
Anders Broman 44e5ddb9c9 packet-btavctp.c:107: warning: 'number_of_packets' may be used uninitialized in this function
packet-btavctp.c:105: warning: 'pid' may be used uninitialized in this function

svn path=/trunk/; revision=45100
2012-09-24 12:51:34 +00:00
Anders Broman 3bc8e5ff68 From Michal Labedzki:
Add Bluetooth Profile AVRCP. Supported version: 1.5.

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

svn path=/trunk/; revision=45099
2012-09-24 12:46:30 +00:00
Anders Broman 577dec01c5 From Michal Labedzki:
Add Bluetooth Protocol AVCTP. Supported version: 1.4.


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

svn path=/trunk/; revision=45097
2012-09-24 12:30:30 +00:00
Martin Mathieson 516f0c6e5c Also avoid some unnecessary calls to strcmp() here, where the release
number at the end isn't important to know.

svn path=/trunk/; revision=45092
2012-09-24 10:34:27 +00:00
Anders Broman ef4ecaa38b Use proto_tree_add_item() and value_strings in a couple of more places.
svn path=/trunk/; revision=45087
2012-09-24 08:38:45 +00:00
Michael Mann 88ee7291cf replaced decode_boolean_bitfield calls with itemized filters
svn path=/trunk/; revision=45082
2012-09-24 01:59:34 +00:00
Evan Huus 69905db57c Move potential dereference until *after* the null-check.
Caught by cppcheck.

svn path=/trunk/; revision=45081
2012-09-23 21:02:32 +00:00
Pascal Quantin 7dd916459e Let's be consistent and display lte_rrc root for all LTE RRC messages
svn path=/trunk/; revision=45080
2012-09-23 21:01:05 +00:00
Bill Meier c4d449cbff expert_add...() shouldn't be called under 'if (tree)'.
svn path=/trunk/; revision=45072
2012-09-23 18:15:09 +00:00
Jakub Zawadzki 72ca9d0e61 Store pointers to previously displayed and captured packet, not nstime_t deltas.
This commit reduces size (from 144B to 128B on AMD64) of frame_data structure.

Part of bug 5821: Reduce per-packet memory requirements.

svn path=/trunk/; revision=45071
2012-09-23 16:25:28 +00:00
Evan Huus a9bb9186dd Fix some unused variable warnings from GCC.
svn path=/trunk/; revision=45064
2012-09-23 12:45:03 +00:00
Michael Mann b89a06a3e1 replaced decode_boolean_bitfield calls with itemized filters
svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
Chris Maynard 6b3b90bde7 Fixup vlan_flags bug introduced with r45054
svn path=/trunk/; revision=45055
2012-09-22 18:47:11 +00:00
Michael Mann 6516edc022 replaced decode_boolean_bitfield calls with itemized filters
svn path=/trunk/; revision=45054
2012-09-22 17:41:07 +00:00
Guy Harris ad32e468bf Note that Banyan don't exist any more, so you can't order a dead-tree
version of the VINES documentation from them.  However, there appear to
be online versions available; give the URLs for them.

svn path=/trunk/; revision=45052
2012-09-22 10:28:21 +00:00
Guy Harris a5d1394953 Remove incorrect extra hf_vines_ip_length - what's being constructed
there is the Transport Control field and subfields thereof, not the
packet length field.

Update some URLs.

svn path=/trunk/; revision=45051
2012-09-22 10:21:05 +00:00
Pascal Quantin 006f022fea Upgrade PDCP LTE dissector to v11.0.0
svn path=/trunk/; revision=45049
2012-09-21 20:12:32 +00:00
Pascal Quantin a8f9cd6593 Upgrade MAC LTE dissector to v11.0.0
svn path=/trunk/; revision=45048
2012-09-21 20:11:11 +00:00
Pascal Quantin 8b6bc1630a Dissect Update UE Location Information message
svn path=/trunk/; revision=45047
2012-09-21 20:00:12 +00:00
Pascal Quantin 6dedc6628b Test Procedures messages should be also integrity protected
svn path=/trunk/; revision=45046
2012-09-21 19:58:34 +00:00
Anders Broman 201380fd33 Detected typos in speech codec value.
- Refactored code to use proto_tree_add_item() and use a value string.

svn path=/trunk/; revision=45044
2012-09-21 13:36:07 +00:00
Anders Broman 467976f37f Assuming transport_protocol is a guint8.
svn path=/trunk/; revision=45042
2012-09-21 11:54:30 +00:00
Anders Broman ff1a7d93bf From Michal Labedzki:
Bluetooth: Provide PSM for higher layers

This is needed by AVRCP, HCRP and AVDTP to recognize other substreams.

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

svn path=/trunk/; revision=45041
2012-09-21 11:30:53 +00:00
Anders Broman 1684c38d44 From Michal Labedzki:
Add SAP dissector

Add Bluetooth Profile SAP. Supported version: 1.1.

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

svn path=/trunk/; revision=45040
2012-09-21 11:14:33 +00:00