Commit Graph

22310 Commits

Author SHA1 Message Date
Michael Mann a7a2d51fae Add display filters courtesy of convert_proto_tree_add_text.pl
svn path=/trunk/; revision=50924
2013-07-26 18:27:38 +00:00
Pascal Quantin 6b07d33130 Fix Frame Indicator analysis logic
svn path=/trunk/; revision=50920
2013-07-26 17:07:57 +00:00
Evan Huus c693d9c951 whitespace
svn path=/trunk/; revision=50919
2013-07-26 16:42:06 +00:00
Alexis La Goutte f15a20c9f0 Enhance BGP Update (Path Attribute)
Step 2 ! Make Path Attribute field filterable...

svn path=/trunk/; revision=50918
2013-07-26 16:26:29 +00:00
Alexis La Goutte 54fc4025e6 Enhance BGP Update
First step ! Remove ugly double switch(bgpa_type)... (use proto_item_append_text)

svn path=/trunk/; revision=50917
2013-07-26 16:26:21 +00:00
Anders Broman 22b3ead1c4 Add dissection of more IEs
svn path=/trunk/; revision=50912
2013-07-26 15:58:17 +00:00
Pascal Quantin 53ddabfe2e Align info column for AM/UM/TM PDUs
svn path=/trunk/; revision=50910
2013-07-26 10:39:23 +00:00
Pascal Quantin 373fde85bd Add Channel ID to MTCH PDUs
svn path=/trunk/; revision=50909
2013-07-26 10:21:05 +00:00
Alexis La Goutte 5988d137d8 From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8972 ieee80211: Dissect QoS Mapping information
This patch adds support for dissecting QoS Map Configure frame and QoS Map Set element per Interworking functionality that was added in IEEE 802.11u

svn path=/trunk/; revision=50908
2013-07-26 08:51:59 +00:00
Jeff Morriss 588bc03a5b From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8977 :
In SSH, the protocol version message is terminated by CR LF. Wireshark, in the
info column, strips out the LF, but not the CR.

Attaching a patch to rectify that.

Also, as requested, update the contributor's email address in AUTHORS.

svn path=/trunk/; revision=50902
2013-07-26 01:35:44 +00:00
Jeff Morriss 26197c1693 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8952 :
Microsoft describes a feature called Bind Time Feature Negotiation used in
DCE/RPC Bind/BindAck PDUs. See http://msdn.microsoft.com/en-us/library/cc243715.aspx

In the Bind PDU they encode 2 bits into the Transfer Syntax UUID. In the
BindAck PDU they encode 2 bits into the result code. The attached patch
dissects these two special bits. For the UUID I've simply added 4 UUIDs each
with the same name; this works best with the DCE/RPC UUID lookup code. If
Microsoft would ever introduce more bits we could change this to a better
handling, since the current solution obviously doesn't scale.

Apart from adding new hf_ and ett_ variables and using them, I've also renamed
"Transport Syntax" to "Transfer Syntax", since the specifications only use
"Transfer".

svn path=/trunk/; revision=50901
2013-07-26 01:18:34 +00:00
Jeff Morriss 1b278a3db0 From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8951 :
Currently, the only attribute that is dissected is attribute 82 in page 1.

The approach for dissecting an attribute requires defining a function that
processes the attribute-specific fields. However, most attributes consists of
a single field, and the only difference between attributes is because of their
length and format (that is already defined for the header field). The current
code also assumes that the attribute length is always correct (e.g. the
attribute has 8 bytes if the field is registered as FT_UINT64).

As a proof of concept, this patch adds support for 3 attributes in the Current
Command attributes page (see OSD2r4 section 7.1.3.31) and prepares a framework
for dissecting additional attributes (dissection of additional attributes will
be delivered in a separate patch).


From me:

Move the new length checking up to the caller rather than repeating it in
every attribute dissector.

Use proto_tree_add_expert_format() instead of proto_tree_add_text() plus
expert_add_info().

Fix checkfiltername.pl error:

    scsi_osd.scsi_osd_attribute_length.invalid duplicates PROTOABBREV of scsi_osd

Remove trailing white space and fix up some indentation.

svn path=/trunk/; revision=50900
2013-07-26 01:09:41 +00:00
Jeff Morriss effa86350a From Chen Li via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8949 :
Fix the dissection of the port number in announce_peers request in BTDHT.

svn path=/trunk/; revision=50899
2013-07-26 00:24:54 +00:00
Evan Huus 8441fff193 Use the pinfo pool for adding data sources in the h245 dissector. The packet
pool is freed before the packet is displayed or otherwise processed, so adding
data sources from it leads to use-after-free errors.

Not sure why this wasn't showing up in the fuzz-bot valgrind step, there
are lots of h245 captures in the menagerie...

svn path=/trunk/; revision=50897
2013-07-25 23:58:49 +00:00
Gerald Combs a05f55bffc Add a UAT dialog. Make UAT preferences uat_t * instead of void *.
C++-ize the UAT headers.

Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT
dialogs.

Update the Qt README.

svn path=/trunk/; revision=50896
2013-07-25 23:49:47 +00:00
Evan Huus 7b1aa04181 Fix a bug in the Kafka dissector handling PRODUCE requests with a RequiredAcks
field of 0 - we don't expect a response to them.

svn path=/trunk/; revision=50894
2013-07-25 22:45:02 +00:00
Michael Mann c1e75c8ff3 Add a few filters to keep checkAPIs.pl happy.
svn path=/trunk/; revision=50893
2013-07-25 19:11:31 +00:00
Jeff Morriss d58c13c363 As pointed out in https://www.wireshark.org/lists/wireshark-dev/201307/msg00153.html :
The fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3290 needs
to allow for giving a length of -1 for FT_STRINGZ's.

This is another fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8960
(in addition to r50836).  There's no point in reverting that revision, though,
since there was no need to use a length of -1 in that case.

svn path=/trunk/; revision=50892
2013-07-25 18:37:18 +00:00
Pascal Quantin a92ee76d3e Add a smarter UM analysis for MCCH/MTCH channels
svn path=/trunk/; revision=50891
2013-07-25 17:33:57 +00:00
Jakub Zawadzki 696a79707b Optimize proto_item_append_string()
- When old string empty just pass new one (like: frame.protocols)
- if not, use ep_strconcat()

svn path=/trunk/; revision=50890
2013-07-25 17:19:17 +00:00
Guy Harris 629ee9ed81 Fix some more bugs that caused compiler warnings.
svn path=/trunk/; revision=50887
2013-07-25 09:53:28 +00:00
Guy Harris 166eb4f53d Get rid of an unused variable (set, but not used).
Get rid of extra arguments to expert_add_info_format_text() - as with
any other printf-like routine, if the format string has no % items, you
don't need to pass any additional arguments after that - you don't have
to tack on a BASE_NONE just for the lulz.

svn path=/trunk/; revision=50886
2013-07-25 09:03:02 +00:00
Michael Mann 3b3ff69af7 1. MASSIVE conversion of proto_tree_add_text to proto_tree_add_item with the help of (and a few passes of) convert_proto_tree_add_text.pl. Tried to keep display filter names in line with existing filters.
2. Cleaned up a bunch of proto_tree_add_xxx that could really be proto_tree_add_item so "useless" local variables could be removed.

3. Bugfixed a few bitmask (probably) copy/pasteos.

4. Better standardized whitespace and added modelines.

5. Still think some of the "object" filters (with BASE_NONE) could be removed in favor of a single filter (value_string) with object ID number (BASE_DEC), but I'll leave that to someone more familiar with the protocol.

svn path=/trunk/; revision=50884
2013-07-25 03:16:43 +00:00
Guy Harris b524ecebd8 Don't cast away constness (except in cases where an API makes that
impossible).

svn path=/trunk/; revision=50856
2013-07-23 23:42:14 +00:00
Guy Harris 8e22ded7f8 Don't cast away constness.
svn path=/trunk/; revision=50855
2013-07-23 23:39:37 +00:00
Anders Broman bed8ebd289 Register BSSAP+ by name.
svn path=/trunk/; revision=50851
2013-07-23 19:51:14 +00:00
Jakub Zawadzki ac16425a1f Free all cloned tvbs, not only first one.
svn path=/trunk/; revision=50844
2013-07-23 17:31:39 +00:00
Jakub Zawadzki 761b763eae Move tvb_new_child_real_data() to tvbuff_real.c with some cleanup
svn path=/trunk/; revision=50843
2013-07-23 17:23:51 +00:00
Alexis La Goutte 3808dfc909 Add RFC6975 (Signaling Cryptographic Algorithm Understanding in DNS Security Extensions (DNSSEC)) support ( DAU, DHU and N3U OPT(ion))
svn path=/trunk/; revision=50840
2013-07-23 14:54:18 +00:00
Alexis La Goutte 4806972c5e Fix warning found by fix-encoding-args
svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
Alexis La Goutte 4aa7dab163 Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...)
svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
Pascal Quantin 802e7bed77 Try to differentiate a non filled private_data (pointer set to NULL) from an enum with value = 0
svn path=/trunk/; revision=50837
2013-07-23 14:34:46 +00:00
Jörg Mayer a74c3538fc Fix for Bug 8960 - All mongodb query show as [Malformed Packet: MONGO]
proto_tree_add_item doesn't link to be called with FT_STRINGZ and length -1.

svn path=/trunk/; revision=50836
2013-07-23 13:38:39 +00:00
Alexis La Goutte 99d0205c93 From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8963
packet-scsi.c add asc/ascq code 2C:0A

Add ASC/ASCQ code 2C:0Ah "PARTITION OR COLLECTION CONTAINS USER OBJECTS" (SPC-4

svn path=/trunk/; revision=50828
2013-07-23 10:37:01 +00:00
Alexis La Goutte d7095ca214 From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8965
Packet-scsi.c: fix subtree reference: ett_sense_osd_completed

The field hf_scsi_sns_osd_object_completed should be dissected under ett_sense_osd_completed instead of ett_sense_osd_not_initiated
(It was a copy-paste error in attachment 10967 from bug 8790)

svn path=/trunk/; revision=50827
2013-07-23 10:36:52 +00:00
Alexis La Goutte ad78694e76 From Thomas ERSFELD (GSoC13) Prepare inclusion of Follow (TCP/UDP/SSL) feature in Qtshark
svn path=/trunk/; revision=50819
2013-07-23 08:56:30 +00:00
Guy Harris efd6675cf6 collectd.data.severity is unsigned, so use proto_tree_add_uint64.
svn path=/trunk/; revision=50816
2013-07-23 05:19:44 +00:00
Anders Broman 2efa4fa8aa From Andreas Bachmann:
allows to display multiple TLVs and the bug of logInterMessagePeriod is fixed.

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

svn path=/trunk/; revision=50815
2013-07-23 04:47:18 +00:00
Anders Broman d91b6a1872 From Michal Labedzki:
HCI: Improve Class of Device dissection. 

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

svn path=/trunk/; revision=50814
2013-07-23 04:23:19 +00:00
Anders Broman 0bbb2cbbaf From Michal Labedzki:
HCI: Add latest Assigned Numbers 

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

svn path=/trunk/; revision=50813
2013-07-23 04:15:23 +00:00
Anders Broman 46eabdf34d From Michal Labedzki:
Add initial support for 3DS Profile.

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

svn path=/trunk/; revision=50812
2013-07-23 04:09:50 +00:00
Anders Broman 24a60b1d6c From Michal Labedzki:
ATT: remove trailing white characters.

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

svn path=/trunk/; revision=50811
2013-07-23 03:56:38 +00:00
Anders Broman 511757f96c From Michal Labedzki:
SDP: Add support for USB Forum ProductID names.

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

svn path=/trunk/; revision=50810
2013-07-23 03:54:04 +00:00
Anders Broman 93646d0981 From Javier Godoy:
Remove function osd_list_collection and update scsi_osd_svcaction.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8944#attach_11229

svn path=/trunk/; revision=50809
2013-07-23 03:49:44 +00:00
Guy Harris 8bd5a3649a Have get_uint_value() assume it's being passed an encoding value, which
isn't necessarily going to be zero if the item is big-endian.

The last argument to test_length() is an encoding, not a big-endian vs.
little-endian Boolean; name it appropriately.

This fixes bug 8953.

svn path=/trunk/; revision=50806
2013-07-22 23:11:07 +00:00
Guy Harris 9f66191681 The last argument to ptvcursor_add() is an encoding value; pass it one,
not a Boolean endianness value.

svn path=/trunk/; revision=50803
2013-07-22 23:01:30 +00:00
Jörg Mayer 545a84185e Fix for
[ 28%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-diameter_3gpp.c.o
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-diameter_3gpp.c:232:90: error: 
      unused parameter 'tree' [-Werror,-Wunused-parameter]
  ...*tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) 
                                               ^
1 error generated.
make[2]: *** [epan/CMakeFiles/epan.dir/dissectors/packet-diameter_3gpp.c.o] Error 1


svn path=/trunk/; revision=50799
2013-07-22 21:25:04 +00:00
Anders Broman 5e56e72953 Dissect S6 feature list.
svn path=/trunk/; revision=50796
2013-07-22 20:44:01 +00:00
Jakub Zawadzki 7ec1a78fe8 Abuse epan_t more: add callback to get interface name.
svn path=/trunk/; revision=50794
2013-07-22 19:38:38 +00:00
Guy Harris b0a94d2b98 ASes can now be 32-bits; make the fields for them 32-bit so that you can
filter on all possible values of them.

Fixes bug 8959.

#BACKPORT 1.10, 1.8

svn path=/trunk/; revision=50791
2013-07-22 16:56:56 +00:00
Gerald Combs ac22b33f4f Mark a parameter unused.
svn path=/trunk/; revision=50790
2013-07-22 15:41:46 +00:00
Pascal Quantin d5922fb41f Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8958 :
Highlight the right number of bytes for the PadN option data field

svn path=/trunk/; revision=50787
2013-07-22 14:19:04 +00:00
Pascal Quantin 4a84c0987e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8957 :
remove a copy /paste error triggering a malformed exception when dissecting IPv4 DHCP Support Mode option

svn path=/trunk/; revision=50786
2013-07-22 13:00:41 +00:00
Jörg Mayer fb5a3b90d1 Beginnings of Nintendo StreetProtocol support
svn path=/trunk/; revision=50783
2013-07-22 08:01:10 +00:00
Guy Harris 39518faa36 Squelch uninitialized variable warning.
svn path=/trunk/; revision=50782
2013-07-22 05:51:51 +00:00
Michael Mann c131f9a074 Make items more filterable
Apply consistent whitespace.
Remove unnecessary string.h

svn path=/trunk/; revision=50780
2013-07-22 00:39:30 +00:00
Evan Huus 60e25a2080 Commit real kafka dissector this time.
svn path=/trunk/; revision=50779
2013-07-22 00:12:42 +00:00
Evan Huus 76abdbc1cc Remove kafka dissector, accidentally committed symlink instead of real file.
svn path=/trunk/; revision=50778
2013-07-22 00:11:57 +00:00
Evan Huus fb6c9c3387 Skeleton dissector for Apache Kafka's new protocol:
https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol

All the core request/response matching necessary to actually decode is done, and
helpers exist for the common Kafka data types. Now it just remains to fill in
the rest of the fields.

svn path=/trunk/; revision=50777
2013-07-22 00:08:25 +00:00
Jakub Zawadzki c702e92121 Replace relative timestamp with reference frame number. Saves 16B per frame.
svn path=/trunk/; revision=50772
2013-07-21 23:07:33 +00:00
Guy Harris 74b6c59499 There are many types that eventually turn into "signed byte"; for calls
to g_strlcpy(), use the one of them that it's documented as using.

svn path=/trunk/; revision=50771
2013-07-21 22:01:22 +00:00
Evan Huus 037fc022da Add wmem queue 'implementation' by wrapping wmem_list and wmem_stack.
Also a bit of misc. refactoring of the stack while I was there, and doc tweaks.

svn path=/trunk/; revision=50769
2013-07-21 21:13:30 +00:00
Evan Huus 9e1b53539a Remove unused variable, fix comparison to use double-equals.
svn path=/trunk/; revision=50768
2013-07-21 21:10:13 +00:00
Jakub Zawadzki 5df324921d Fix: epan.c:155: warning: assignment discards qualifiers from pointer target type
svn path=/trunk/; revision=50767
2013-07-21 21:04:25 +00:00
Anders Broman df9bbb93a3 Interpretation of 3gpp_feature_list depends on Application Id.
svn path=/trunk/; revision=50766
2013-07-21 20:58:37 +00:00
Jakub Zawadzki 5d52e16734 Add helper function to epan_session which can be used to get absolute timestamp of given frame.
Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number.

This patch reduce size of frame_data by 8B (amd64)
This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13)

svn path=/trunk/; revision=50765
2013-07-21 20:48:30 +00:00
Jakub Zawadzki a66a717d46 Commit missing file.
svn path=/trunk/; revision=50764
2013-07-21 19:21:51 +00:00
Jakub Zawadzki 265dbadb68 try to fix: epan.c:141: error: invalid application of 'sizeof' to incomplete type 'epan_t'
svn path=/trunk/; revision=50763
2013-07-21 19:08:11 +00:00
Jakub Zawadzki 28e9dcc4a9 Some work on multi file dissection
- make init_dissection/cleanup_dissection private for libwireshark
- implement epan_new(), epan_free()
- pass epan_t to epan_dissect*

svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
Jörg Mayer 270cf97b25 Fix
/home/jmayer/work/wireshark/svn/trunk/epan/address_to_str.c:595:20: error: passing
      'const guint8 *' (aka 'const unsigned char *') to parameter of type
      'const gchar *' (aka 'const char *') converts between pointers to integer types
      with different sign [-Werror,-Wpointer-sign]
    g_strlcpy(buf, (const guint8 *)addr->data, buf_len);
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/glib-2.0/glib/gstrfuncs.h:110:20: note: passing argument to parameter 'src'
      here
                                        const gchar  *src,
                                                      ^

svn path=/trunk/; revision=50756
2013-07-21 14:28:08 +00:00
Michael Mann f1866064c3 Turn modifier field into a value_string.
svn path=/trunk/; revision=50748
2013-07-21 01:35:45 +00:00
Guy Harris 21609c54bb Don't report a syntax error if a preference name without a "." is
specified, report it as "no such preference" instead.  That should be
less confusing; see

   http://stackoverflow.com/questions/17757659/how-to-apply-and-override-preferences-with-tshark

for an example of confusion.

#BACKPORT 1.10, 1.8

svn path=/trunk/; revision=50745
2013-07-21 00:56:42 +00:00
Evan Huus 6635f5ef67 Replace wmem slist (singly-linked) with wmem list (doubly-linked).
The overhead is not large, and it makes append much faster (O(1) vs O(n)).

It also will make a queue easy to add, which I need for a dissector I'm
writing...

svn path=/trunk/; revision=50744
2013-07-20 20:33:38 +00:00
Michael Mann 19726260f1 make proto_tree_add_text calls filterable through hfs and expert info.
svn path=/trunk/; revision=50743
2013-07-20 02:33:34 +00:00
Pascal Quantin 57aebcf776 From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942 :
Fix segmentation fault when reading pref file

svn path=/trunk/; revision=50737
2013-07-19 08:04:58 +00:00
Jeff Morriss 23d9a348a1 Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8941 :
Storing 2 different structures on the fd proto_data (with the same key) isn't
safe: use different keys to keep them separate.  I do wonder if both are
really necessary...

This fix can be back-ported to trunk-1.10 but not trunk-1.8 (which lacks the
key identifier for proto_data's).

svn path=/trunk/; revision=50734
2013-07-18 23:34:48 +00:00
Michael Mann a0606ce0b2 Cleanup hf_ variables so they can be identified as such. "Array" of hf items not necessary and prevents "check" scripts from fully working.
Made ett array local to proto_register_pcep.

All this for preparing to use convert_proto_tree_add_text (which I thought should be its own patch/revision)

svn path=/trunk/; revision=50733
2013-07-18 20:13:42 +00:00
Jeff Morriss 38c4986b4b From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8926 :
A better fix for this bug (as compared to r50532): this version takes into
account the scaling factors.

svn path=/trunk/; revision=50732
2013-07-18 20:11:55 +00:00
Michael Mann b5cf7e1601 Add fencing for COL_INFO (which was the intent of the dissector until I accidentally removed it in rev 50730.)
svn path=/trunk/; revision=50731
2013-07-18 18:19:03 +00:00
Michael Mann ce4c06a47b Make filterable items from proto_tree_add_text.
svn path=/trunk/; revision=50730
2013-07-18 18:10:59 +00:00
Jakub Zawadzki c850c0bfc8 Fix memleak, base64_to_tvb() strdup passed string by its own.
svn path=/trunk/; revision=50729
2013-07-18 17:31:34 +00:00
Jeff Morriss 7d76eb0ad3 Catch exceptions from AVP subdissectors in case the AVPs following the one
that threw the exception are OK--this allows us to view as much of the message
as possible even when Wireshark doesn't like whatever was in a particular
AVP.

Instead of using the 'volatile' keyword to avoid variable-clobbering warnings,
put the exception-catching code in its own function with no local variables.

svn path=/trunk/; revision=50728
2013-07-18 15:08:15 +00:00
Pascal Quantin fdc867a4fc Temporarily disable offending code triggering a segmentation fault on Linux (see bug 8942)
svn path=/trunk/; revision=50725
2013-07-18 09:12:59 +00:00
Pascal Quantin 05d4b898a1 Fix various errors found by checkAPI.pl and fix-encoding-args.pl scripts
svn path=/trunk/; revision=50723
2013-07-18 07:09:31 +00:00
Pascal Quantin 7b71fa4782 Try to fix error: ignoring return value of 'fwrite', declared with attribute warn_unused_result
svn path=/trunk/; revision=50722
2013-07-18 07:01:02 +00:00
Pascal Quantin e006d816e5 Fix error: 'format' may be used uninitialized in this function
svn path=/trunk/; revision=50721
2013-07-18 06:38:51 +00:00
Anders Broman 6a19e6d9fd From Rupesh Patro:
Add dissection of MPLS Upstream Label Assignment for LDP [RFC 6389].

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

svn path=/trunk/; revision=50719
2013-07-18 04:50:36 +00:00
Anders Broman d312f171cd From Cal Turney:
Fix: If the FH length is not 32 or 40, the packet is decoded as "Unknown", a warning is displayed in Expert, and the rest of the packet is decoded. In addition, changed "Celerra" to "Celerra|VNX".

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

svn path=/trunk/; revision=50718
2013-07-18 04:40:03 +00:00
Anders Broman f85f12bf31 From Javier Godoy:
* Remove dissect_osd_list_collection and dissect LIST COLLECTION by calling dissect_osd_list.
 * Handle the few differences depending on the value of svcaction in extra data.
 * dissect_osd_collection_object_id now returns proto_item* instead of void.
 
The following field was added:
 * hf_scsi_osd_list_collection_flags_coltn
 
The following true_false_string array was added
 * list_coltn_tfs

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

svn path=/trunk/; revision=50717
2013-07-18 04:34:56 +00:00
Anders Broman 09c5152fa7 From Cal Turney:
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved.

If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved.  A "Continue without Saving" button is provided so that the user can save the profile under a different name.

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

svn path=/trunk/; revision=50716
2013-07-18 04:28:36 +00:00
Anders Broman 7dcafd67c0 Fix:
packet-l2tp.c: In function 'dissect_l2tp_cisco_avps':
packet-l2tp.c:1296: warning: unused variable 'pw_type'
packet-l2tp.c: In function 'process_control_avps':
packet-l2tp.c:1789: warning: unused variable 'pw_type'

svn path=/trunk/; revision=50715
2013-07-18 04:17:58 +00:00
Michael Mann 9736e08445 Convert proto_tree_add_text calls to proto_tree_add_item.
svn path=/trunk/; revision=50713
2013-07-18 02:42:06 +00:00
Jakub Zawadzki a18172147f Remove fragment_data, add fragment_head, fragment_item - for now alias it to the same structure.
This is begin of work to split fragment head and fragments items.

svn path=/trunk/; revision=50708
2013-07-17 21:12:24 +00:00
Jakub Zawadzki 8cefe3b406 Optimize print_line_text
- fill spaces[] array once
- use fwrite()

svn path=/trunk/; revision=50705
2013-07-17 20:13:54 +00:00
Anders Broman 2ee4339b9e Dissect new flags
svn path=/trunk/; revision=50701
2013-07-17 18:19:23 +00:00
Jakub Zawadzki 3845249a7f Optimize proto_tree_print_node() + fix possible memleak when -O is used
svn path=/trunk/; revision=50699
2013-07-17 17:16:22 +00:00
Jeff Morriss 33cf749c19 Fix up some indentation.
svn path=/trunk/; revision=50697
2013-07-17 14:01:47 +00:00
Alexis La Goutte ce4ad19204 Use "generic" tfs (tfs_supported_not_supported...)
Add Enforced / Not enforced to epan/tfs.[ch]

svn path=/trunk/; revision=50696
2013-07-17 10:44:35 +00:00
Alexis La Goutte e7316b7770 Move Do not clear / Clear & Confirmed / Unconfirmed TFS to epan/tfs.[ch]
svn path=/trunk/; revision=50695
2013-07-17 10:44:26 +00:00
Alexis La Goutte c00c0a15a3 Use "generic" tfs (tfs_set_notset...)
svn path=/trunk/; revision=50694
2013-07-17 10:44:18 +00:00
Alexis La Goutte 4d37db3fee Use "generic" tfs (tfs_set_notset, tfs_supported_not_supported...)
Add complete / Incomplete & Valid / Not Valid TFS

svn path=/trunk/; revision=50693
2013-07-17 10:44:08 +00:00
Alexis La Goutte 74fa541acf Use "generic" tfs (tfs_set_notset...)
svn path=/trunk/; revision=50692
2013-07-17 10:43:57 +00:00
Anders Broman e9d236ec0b Backing out r50690 (exept simple_dialog)
struct FILE is different on windows vs *nix


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

svn path=/trunk/; revision=50691
2013-07-17 05:52:51 +00:00
Anders Broman e0341f776c From Cal Turney:
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved.

If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved.  A "Continue without Saving" button is provided so that the user can save the profile under a different name.

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

svn path=/trunk/; revision=50690
2013-07-17 04:52:19 +00:00
Michael Mann 97ca781671 Convert proto_tree_add_tree calls to something filterable.
Remove "effectively useless" blurbs.

svn path=/trunk/; revision=50689
2013-07-17 03:13:07 +00:00
Jakub Zawadzki 547eabc949 Use label_fill also when boolean / bitfield.
svn path=/trunk/; revision=50682
2013-07-16 22:21:10 +00:00
Jakub Zawadzki 13e07be25f optimize: remove g_snprintf()'s from label_fill[_descr]
svn path=/trunk/; revision=50681
2013-07-16 22:09:29 +00:00
Michael Mann 73e2a75ced Make fields filterable through proto_tree_add_item (with the help of convert_proto_tree_add_text.pl) and expert info.
Do some whitespace cleanup and add modelines.

svn path=/trunk/; revision=50678
2013-07-16 20:53:02 +00:00
Michael Mann 7de40656b5 Convert some proto_tree_add_text into proto_tree_add_expert.
svn path=/trunk/; revision=50676
2013-07-16 19:14:26 +00:00
Jeff Morriss af793696a3 Replace some tabs with spaces.
svn path=/trunk/; revision=50674
2013-07-16 18:03:20 +00:00
Jeff Morriss 9bee5819f8 Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8940 :
Test whether idx is in range or not (by seeing if it was found in the
value_string) before using it as an index into any of the elem_var arrays.

This fuzz failure was in elem_telv() but apply the fix to all the elem_*()
functions.

svn path=/trunk/; revision=50672
2013-07-16 17:59:26 +00:00
Chris Maynard 91ecc2334f "man inet_pton" only says that it returns a negative value, zero or a postive value, and not specifically -1, 0, or 1, so even though we know that's what wsutil's inet_pton will return, we shouldn't test against those exact values.
svn path=/trunk/; revision=50670
2013-07-16 16:23:31 +00:00
Michael Mann bb05898720 Remove ADWIN_ADD_LE and ADWIN_ADD_BE macros as they don't add much to readability/code savings and they prevent the "check" scripts from doing their job.
svn path=/trunk/; revision=50669
2013-07-16 16:02:39 +00:00
Chris Maynard 02fa8a5d19 Fix Coverity CID 1050092: Dereference null return value.
svn path=/trunk/; revision=50667
2013-07-16 15:30:20 +00:00
Chris Maynard e93fdab447 Fix Coverity CID 1055436: Improper use of negative value.
svn path=/trunk/; revision=50666
2013-07-16 15:19:52 +00:00
Chris Maynard 1ece46dd80 Fix Coverity CID 1050089: "Explicit null dereferenced", by Move some lines of code into the if(tree != NULL) block.
svn path=/trunk/; revision=50665
2013-07-16 15:10:38 +00:00
Michael Mann 18ea28c45e Improve iec104 dissector. Bug 8849 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849)
1) Decoding type 70 - End of initialization
2) Decoding qualifier of interrogation for type 100
3) Table of data length for all object types => checking length on one place
4) Setting correct number of selected bytes for IOA

From Jiří Engelthaler

svn path=/trunk/; revision=50664
2013-07-16 14:01:45 +00:00
Pascal Quantin 3baf637267 Allow to perform sequence analysis when only RLC headers are logged
svn path=/trunk/; revision=50663
2013-07-16 12:28:33 +00:00
Chris Maynard 44e4c933de Fix warning: cannot optimize possibly infinite loops. There was no actual infinite loop, but the intended loop iteration count could have been wrong due to the implicit "mod 256" when previously assigning a value to a guint8.
svn path=/trunk/; revision=50661
2013-07-16 03:34:04 +00:00
Guy Harris 86147047f5 Fix one that got missed.
svn path=/trunk/; revision=50660
2013-07-16 03:16:26 +00:00
Chris Maynard 9d3cda266b Revert r50655 for this file.
svn path=/trunk/; revision=50659
2013-07-16 03:04:47 +00:00
Chris Maynard d331c33b4f This should fix warning: to be safe all intermediate pointers in cast from 'gchar **' to 'const char **' must be 'const' qualified.
svn path=/trunk/; revision=50655
2013-07-16 02:34:44 +00:00
Evan Huus a430b138e9 Replace glib memory with wmem. Fixes a substantial memory leak in the TCP
dissector (potentially several megabytes for a large capture).

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

svn path=/trunk/; revision=50652
2013-07-16 01:57:30 +00:00
Jeff Morriss 2d30d5beb1 Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific
there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).

svn path=/trunk/; revision=50650
2013-07-16 01:16:50 +00:00
Chris Maynard e4bb300667 A better method of avoiding the "ISO C restricts enumerator values to range of 'int'" warning.
svn path=/trunk/; revision=50649
2013-07-16 01:14:40 +00:00
Guy Harris 54ee8a0f9a Don't compare a guint32 against -1, compare it against 0xFFFFFFFFU.
svn path=/trunk/; revision=50643
2013-07-15 22:27:58 +00:00
Chris Maynard 42a3ceea66 Fix warning: ISO C restricts enumerator values to range of 'int'
svn path=/trunk/; revision=50641
2013-07-15 21:53:52 +00:00
Chris Maynard e37533ced7 Fix warnings: comma at end of enumerator list.
svn path=/trunk/; revision=50640
2013-07-15 21:37:55 +00:00
Chris Maynard 1c19a0d61e Fix warnings: format '%blah' expects argument of type 'foo', but argument 'i' has type 'bar' [-Wformat].
svn path=/trunk/; revision=50639
2013-07-15 21:22:34 +00:00
Chris Maynard f5f20fa8e3 Fix warning: ISO C does not allow extra ';' outside of a function.
svn path=/trunk/; revision=50638
2013-07-15 20:42:57 +00:00
Chris Maynard 49051b18d1 Fix warning: ISO C does not support %n$ operand number formats.
svn path=/trunk/; revision=50637
2013-07-15 20:29:36 +00:00
Jakub Zawadzki 49b642ab1c Fix bug #8934: Fuzz failure: seg-fault in tvb_new_proxy()
It is possible to have NULL reassembly data, support this case in tvb_new_proxy().

svn path=/trunk/; revision=50634
2013-07-15 18:59:42 +00:00
Jakub Zawadzki fec836d697 Fix bug #8936: Fuzz failure: attempt to allocate -1 bytes from packet-bacapp.c and/or tvb_generic_clone_offset_len()
Revert r50556: Add new function: validate_offset() which checks if offset is within bounds of tvb.

svn path=/trunk/; revision=50633
2013-07-15 18:32:11 +00:00
Alexis La Goutte 7c5b471584 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50632
2013-07-15 18:06:29 +00:00
Alexis La Goutte 4c34d30a35 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50631
2013-07-15 18:06:19 +00:00
Alexis La Goutte 208071629d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50630
2013-07-15 18:06:08 +00:00
Alexis La Goutte 9ddfede761 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50629
2013-07-15 18:05:57 +00:00
Alexis La Goutte b583443a75 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50628
2013-07-15 18:05:37 +00:00
Alexis La Goutte 58bf1dc4f7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50627
2013-07-15 18:05:27 +00:00
Alexis La Goutte f7f3b668ef Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50626
2013-07-15 18:05:14 +00:00
Alexis La Goutte e918ee63e4 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50625
2013-07-15 18:05:04 +00:00
Alexis La Goutte e48f3cd707 Use 2 Spaces indent and add modelines info
svn path=/trunk/; revision=50624
2013-07-15 18:04:53 +00:00
Alexis La Goutte c55d2bc057 Fix warnings found by fix-encoding-args tools.(and remove some tabs also)
svn path=/trunk/; revision=50623
2013-07-15 18:04:43 +00:00
Alexis La Goutte 7614891152 Use 4 Spaces indent and add modelines info
svn path=/trunk/; revision=50622
2013-07-15 18:04:33 +00:00
Alexis La Goutte 3dd52ea2da Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50621
2013-07-15 18:04:23 +00:00
Alexis La Goutte c39ca07c7e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50620
2013-07-15 18:04:14 +00:00
Alexis La Goutte 2aa451859a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50619
2013-07-15 18:04:03 +00:00
Alexis La Goutte cde1b3d4bb Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50618
2013-07-15 18:03:54 +00:00
Alexis La Goutte 779c37aa20 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50617
2013-07-15 18:03:43 +00:00
Alexis La Goutte 15a785c757 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50616
2013-07-15 18:03:33 +00:00