Commit graph

19860 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
Jakub Zawadzki
8909d38842 When comparing fvalue_t we don't modify them, make arguments const.
svn path=/trunk/; revision=45948
2012-11-06 13:28:59 +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
a6b7e3fba5 From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
airpdcap: For FromDS and ToDS both set use magic

All 802.11 data frames on the AMP link shall be sent with ToDS and FromDS
bits in the Frame Control field both set to one. Currently for this packets
we get different associations for the same EAPOL sequence since addr2 and
addr1 change.

svn path=/trunk/; revision=45923
2012-11-05 11:55:39 +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
45953625a5 From Andrei Emeltchenko:
Add 802.11 AMP LLC/SNAP header

Add LLC/SNAP header specified in BLUETOOTH SPECIFICATION Version 4.0 [Vol 5]
802.11 Protocol Adaptation Layer Functional Specification.
The SNAP header composed of the OUI of the Bluetooth SIG and the protocol
identifier given in spec mentioned shall be used to distinguish AMP 4-way handshake
messages from external security traffic. Decode this traffic as 802.1X authentication.

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

svn path=/trunk/; revision=45920
2012-11-05 10:02:07 +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
e57bf90ebe From Bill Parker:
code fails to check/test return value from select() 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7861

svn path=/trunk/; revision=45917
2012-11-05 09:18:43 +00:00
Anders Broman
f5226f1310 From Bill Parker:
Add error handler to munmap() failure in emem.c

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

svn path=/trunk/; revision=45915
2012-11-05 09:04:53 +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
Gerald Combs
b326845377 [Automatic manuf, services and enterprise-numbers update for 2012-11-04]
svn path=/trunk/; revision=45889
2012-11-04 15:03:51 +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
Jakub Zawadzki
bdcdec560c Manually revert r45669
svn path=/trunk/; revision=45884
2012-11-03 20:51:19 +00:00
Evan Huus
5d6b306391 Wmem stack implementation using the wmem slab implementation to allocate frames.
svn path=/trunk/; revision=45881
2012-11-03 17:34:28 +00:00
Evan Huus
2737b7b7d3 Add wmem scopes for packet and file lifetimes. The file lifetime scope isn't
yet initialized because I can't figure out where the enter() and leave() calls
should go - the obvious place in packet.c causes a lot of assertion errors.

svn path=/trunk/; revision=45879
2012-11-03 15:49:15 +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
Evan Huus
6ef55f30d8 Rename wmem_permanent_scope -> wmem_epan_scope to reflect the fact that it
is technically scoped to the library, not the process. It's also shorter :)

svn path=/trunk/; revision=45877
2012-11-03 15:08:00 +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
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
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
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
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
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
Gerald Combs
a3177785a5 [Automatic manuf, services and enterprise-numbers update for 2012-10-28]
svn path=/trunk/; revision=45815
2012-10-28 14:03:32 +00:00
Evan Huus
ee5a8dd17d Do free overwritten names when registering oids. There was a comment claiming
we couldn't since the name might not be on the heap, but it looks to me like
we're always careful to put it on the heap via a g_strdup if necessary.

Fixes some minor memory leaks.

svn path=/trunk/; revision=45814
2012-10-27 21:01:41 +00:00
Evan Huus
67f2dc0876 Don't leak memory when registering duplicate preferences subtree modules. Take
wmem_permanent copies of the substrings we actually need, and g_free the
temporary tokenized copy.

svn path=/trunk/; revision=45813
2012-10-27 20:41:58 +00:00
Evan Huus
b7ff007bbb There's no need to g_strdup our default prefs - setting them as literals
works just fine and doesn't leak any memory.

Use wmem_permanent_scope() for the one string we do have to copy, to ensure
it doesn't leak either.

svn path=/trunk/; revision=45812
2012-10-27 20:29:12 +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
a02e765e00 Experimental slab allocator logic for wmem.
Thanks to Sébastien Tandel for the idea.

svn path=/trunk/; revision=45809
2012-10-27 15:35:32 +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
Evan Huus
43fadb88cb Add comment explaining the addr->hf field to column-utils for future
reference. Those lines were already starting to look like magic and
it's only been 24 hours.

svn path=/trunk/; revision=45806
2012-10-27 02:48:45 +00:00
Evan Huus
b464dcd888 Create init and cleanup functions for wmem as a whole.
Call them from epan_init() and epan_cleanup().
Expose a permanent wmem scope for allocations that should only be freed when
epan is done (which is *not* necessarily when the program finishes).

svn path=/trunk/; revision=45805
2012-10-27 02:42:05 +00:00
Evan Huus
2ea364607a Make the allocator destructor part of wmem_allocator_t. This avoids two
potential bugs:
 - calling the wrong destroy function on an allocator
 - a pool allocator forgetting to call free_all on itself in the destructor

Also, fix potential typedef redefinition warning in wmem_allocator_glib.h

svn path=/trunk/; revision=45804
2012-10-27 02:29:46 +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
Bill Meier
c654a52e64 (Minor) Use correct description for tvb_find_guint8().
svn path=/trunk/; revision=45799
2012-10-26 16:09:01 +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
Evan Huus
e6639e035e Don't use g_slist_free_full() it needs a more recent GLIB than we officially
require.

svn path=/trunk/; revision=45781
2012-10-24 22:14:32 +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
Guy Harris
1340194a62 wmem_allocator_t is defined in wmem_core.h; redefining it elsewhere will
cause errors.

svn path=/trunk/; revision=45771
2012-10-24 18:38:55 +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
1bc158e695 Include wmem_core.h to define the wmem_allocator_t typedef.
svn path=/trunk/; revision=45753
2012-10-24 05:52:55 +00:00
Guy Harris
7079f979c3 We're no longer defining the structure in a typedef definition, so we
don't want the typedef name after the structure definition.

svn path=/trunk/; revision=45752
2012-10-24 05:37:15 +00:00
Guy Harris
3e1dae3c8d Make it a little more like the Makefile.am for the ftypes subdirectory.
Get rid of reference to non-existent Custom.common file.

svn path=/trunk/; revision=45751
2012-10-24 05:30:14 +00:00
Guy Harris
c1e2438551 Have wmem_core.h define the wmem_allocator_t typedef, with an incomplete
structure definition of struct _wmem_allocator_t; have wmem_allocator.h
give the complete structure definition.  That avoids complaints about
the typedef being redefined.

svn path=/trunk/; revision=45750
2012-10-24 05:21:43 +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
Evan Huus
4e3ddfc4c1 Fix autotools build - missed a few spots that needed updating for wmem.
svn path=/trunk/; revision=45748
2012-10-24 03:44:34 +00:00
Evan Huus
84cc3daa3b Basic skeleton for wmem.
https://www.wireshark.org/lists/wireshark-dev/201210/msg00178.html

svn path=/trunk/; revision=45746
2012-10-24 02:04:40 +00:00
Guy Harris
7044125704 Uniformly use spaces, not tabs, for the PI_ list (one had spaces, one
had 4-space tabs, and the others had 8-space tabs).

svn path=/trunk/; revision=45745
2012-10-24 00:04:17 +00:00
Guy Harris
8cb31ee512 Note why there's no AT_IEEE_802_15_4_LONG (that's AT_EUI64).
svn path=/trunk/; revision=45744
2012-10-23 23:27:29 +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
Anders Broman
52724813a6 Add a link to IANA.
svn path=/trunk/; revision=45712
2012-10-22 14:46:52 +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