alagoutte [Mon, 18 Apr 2011 17:38:08 +0000 (17:38 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36700
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Mon, 18 Apr 2011 17:35:25 +0000 (17:35 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36699
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 18 Apr 2011 15:29:25 +0000 (15:29 +0000)]
Removed some unneeded assignments.
Found by clang.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36698
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 18 Apr 2011 15:27:27 +0000 (15:27 +0000)]
Make it build.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36697
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 18 Apr 2011 14:38:18 +0000 (14:38 +0000)]
Start merging from packet-pdcp-lte.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36696
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Mon, 18 Apr 2011 02:16:36 +0000 (02:16 +0000)]
Update Motonori Shindo's email address at the author's request. Fixes bug 5840.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36695
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Sun, 17 Apr 2011 21:43:20 +0000 (21:43 +0000)]
Retire a preference that can be always on now.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36693
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Sun, 17 Apr 2011 21:34:47 +0000 (21:34 +0000)]
Allow signaling protocol (e.g. RRC) to set number of SN bits
PDCP should use for DRB channels.
Not yet called by RRC.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36692
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Sun, 17 Apr 2011 19:37:46 +0000 (19:37 +0000)]
Decode the SI value in DATA messages correclty.
This fixes bug 5834.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36691
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 17 Apr 2011 19:17:46 +0000 (19:17 +0000)]
One more unused argument.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36690
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 17 Apr 2011 19:07:17 +0000 (19:07 +0000)]
Removed unneeded assignments.
Found by clang.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36689
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 17 Apr 2011 19:04:54 +0000 (19:04 +0000)]
Mark unused arguments with _U_.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36688
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 17 Apr 2011 19:01:26 +0000 (19:01 +0000)]
Removed unneeded assignments to self.
Found by clang.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36687
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 17 Apr 2011 18:59:17 +0000 (18:59 +0000)]
Removed an unneeded assignment, they are both always 0.
Found by clang.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36686
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 17 Apr 2011 18:49:58 +0000 (18:49 +0000)]
Corrected equality check in frag_equal().
Found by clang.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36685
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 17 Apr 2011 18:10:08 +0000 (18:10 +0000)]
Coverity UNUSED_VALUE
CID 1141
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36684
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 17 Apr 2011 18:00:14 +0000 (18:00 +0000)]
Coverity UNUSED_VALUE
CID 1142,1143,1147
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36683
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 17 Apr 2011 17:49:02 +0000 (17:49 +0000)]
Mark err as unused in k12text_dump_open().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36682
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 17 Apr 2011 17:47:39 +0000 (17:47 +0000)]
Check for valid docsis_handle, and use data_handle if not.
This fixes bug 5839.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36681
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sun, 17 Apr 2011 17:20:58 +0000 (17:20 +0000)]
Add QoS Capability element (46) and Extended Supported Rates element (50)
Enhance RSN Info (48), Extended Capabilities information element (127)
* Replace proto_tree_add_uint*/boolean/text by proto_tree_add_item
* use ENC_* macro for encoding
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36680
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 17 Apr 2011 15:03:50 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-04-17]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36677
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Sun, 17 Apr 2011 11:22:03 +0000 (11:22 +0000)]
Add a way for configuration protocol (e.g. RRC) to configure MAC-> RLC mappings, and add a preference to use this or the static UAT.
API is not yet called by RRC.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36676
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 17 Apr 2011 09:34:38 +0000 (09:34 +0000)]
Fix Unused varaiable warnings.
CID 1163 - 1166
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36675
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sun, 17 Apr 2011 08:58:15 +0000 (08:58 +0000)]
Using the routing subtree (Miss in my last patch)
Fix a typo error (shoubl => should)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36674
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sat, 16 Apr 2011 22:02:14 +0000 (22:02 +0000)]
Remove another unneeded NULL check. Fixes Coverity CID 605.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36673
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sat, 16 Apr 2011 21:46:15 +0000 (21:46 +0000)]
Fix Coverity CIDs 603 & 604.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36672
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sat, 16 Apr 2011 21:38:21 +0000 (21:38 +0000)]
Fix the warnings in Coverity CIDs 606-608.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36671
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sat, 16 Apr 2011 21:25:34 +0000 (21:25 +0000)]
Add NULL checks. Fixes Coverity CIDs 509 and 510.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36670
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 16 Apr 2011 17:32:30 +0000 (17:32 +0000)]
Try to make the OSX buildbot happy.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36669
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sat, 16 Apr 2011 17:14:39 +0000 (17:14 +0000)]
Convert ICMPv6 dissector to "new-style" dissector
Fix Dead Store Warning ( warning: Value stored to '*offset*' is never read )
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36668
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sat, 16 Apr 2011 16:45:38 +0000 (16:45 +0000)]
From Edwin Groothuis via bug 5813:
In the explanation of TCP Option 78 (Riverbed Transparency), the labels
are "CSH IP Addr/Port" and "SSH IP Addr/Port". This should be "Src SH IP
Addr/Port" and "Dst SH IP Addr/Port".
The filter keys for these labels are correct.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36667
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sat, 16 Apr 2011 16:37:53 +0000 (16:37 +0000)]
Initialize feedback_data_len to avoid a compiler warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36666
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 16 Apr 2011 16:00:02 +0000 (16:00 +0000)]
From Dirk:
The attachted patch cleans up the output of DCE/RPC fragment information in the
dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5772
From me get rid of check_col()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36665
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sat, 16 Apr 2011 15:33:24 +0000 (15:33 +0000)]
Fix compilation errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36664
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 16 Apr 2011 12:28:03 +0000 (12:28 +0000)]
Fix:
packet-rohc.c: In function 'dissect_rohc_ir_rtp_profile_dynamic':
packet-rohc.c:285: warning: 'val_len' may be used uninitialized in this function
packet-rohc.c:186: warning: 'num_bits' may be used uninitialized in this function
packet-rohc.c:186: note: 'num_bits' was declared here
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36663
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 16 Apr 2011 12:22:16 +0000 (12:22 +0000)]
From Neil Piercy:
Adds BMC protocol, including adding support for MAC and RLC CTCH channels to carry it.
From me:
Removed hf blurbs = def and removed check_col added tp CMakeList.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36662
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 16 Apr 2011 12:03:50 +0000 (12:03 +0000)]
From Motonori Shindo:
Current NetFlow V9/IPFIX dissector treats IN_BYTES (IE=1) and
IN_PERMANENT_BYTES (IE=85) exactly in the same way. The same applies to IN_PKTS
(IE=2) and IN_PERMANENT_PKTS (IE=86). However, IN_BYTES/IN_PKTS and
IN_PERMANENT_BYTES/IN_PERMANENT_PKTS have different semantics so they should be
distinguishable when they are displayed or specified in a filter. Please find
attached the patch
which does that.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5807
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36661
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 16 Apr 2011 11:49:51 +0000 (11:49 +0000)]
Add rohc
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36660
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 16 Apr 2011 11:44:05 +0000 (11:44 +0000)]
Add a basic ROCH dissector.
Limitations:
- Small CID
- RTP profile
- IPv4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36659
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Sat, 16 Apr 2011 10:56:18 +0000 (10:56 +0000)]
Show max UEs/TTI in MAC stats window (UL/DL separately).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36658
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Fri, 15 Apr 2011 23:32:44 +0000 (23:32 +0000)]
Keep track of how many UL/DL UEs in a TTI, and attach this info to each UL-SCH/DL-SCH frame..
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36657
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Fri, 15 Apr 2011 17:53:23 +0000 (17:53 +0000)]
From Edwin Groothuis via bug #5833: Make number of bits in Frame header
optional
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36652
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Fri, 15 Apr 2011 12:53:20 +0000 (12:53 +0000)]
Remove more unnecessary assignments. Coverity 1022 (again).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36649
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 15 Apr 2011 07:27:03 +0000 (07:27 +0000)]
Return ENOMEM if we run out of memory. (We're either running on UN*X,
in which case ENOMEM is the right error, or we're running on Windows but
using UN*Xy routines, in which case ENOMEM is the right error; unlike
zlib, we don't have to run on a whole pile of OSes.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36648
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 14 Apr 2011 16:17:09 +0000 (16:17 +0000)]
From Andrew Feren via bug 5774: Make V9TEMPLATE_MAX_FIELDS a user preference.
From me: Use lower-case v9template_max_fields instead of upper-case to avoid
any confusion with that variable being a define. Use STRINGIFY() so we always
keep the default and the displayed default the same. Fix bug introduced by
Andrew's patch where option_scope_field_count was inadvertently changed to
option_field_count. Append "Maximum value can be adjusted ..." message to all
relevant expert infos.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36643
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 14 Apr 2011 13:58:40 +0000 (13:58 +0000)]
Revert r24047. Fixes bug 5822.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36642
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Thu, 14 Apr 2011 09:40:07 +0000 (09:40 +0000)]
Update to last IANA parameters (2011-04-08)
Update to last RPL Draft (19)
Add new ICMPv6 Option: Proxy Signature (PS) draft-ietf-csi-proxy-send-05
Fix 2 Clang Warning (unused variable):
packet-icmpv6.c:2755:9: warning: Value stored to 'oplength' is never read
oplength = tvb_get_guint8(tvb, rr_offset);
packet-icmpv6.c:2916:5: warning: Value stored to 'nb_mcast_records' is never read
nb_mcast_records = tvb_get_ntohs(tvb, mldr_offset);
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36641
f5534014-38df-0310-8fa8-
9805f1628bb7
kukosa [Thu, 14 Apr 2011 09:02:01 +0000 (09:02 +0000)]
Export new file_...() functions from libwiretap.dll
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36640
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 14 Apr 2011 06:28:25 +0000 (06:28 +0000)]
Zero is zero is zero, as Gertrude Stein didn't say.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36639
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 14 Apr 2011 06:07:42 +0000 (06:07 +0000)]
From Mathieu Parent:
- use 4-bytes hex for messages ids
- reorder skinny messages ids
- remove obsolete C-comments about status
- rewrite field names (from camel case to plain words)
From me:
Replaced meaningless hf blurbs with NULL
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5824
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36638
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 14 Apr 2011 05:37:58 +0000 (05:37 +0000)]
From Mathieu Parent:
packet-skinny:Add DialedPhoneBookMessage and DialedPhoneBookAckMessage
Replaced meaningless hf blurbs with NULL
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5823
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36637
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 14 Apr 2011 02:53:18 +0000 (02:53 +0000)]
Check for _setmode() failing, Just In Case. Squelches some MSVC static
analyzer warnings.
Return an actual error if we're failing because we're trying to write to
the standard output in compressed mode.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36636
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 14 Apr 2011 02:49:20 +0000 (02:49 +0000)]
Check for pkg-config's path as well, just in case it's installed
somewhere other than GLib (or if GLib isn't installed at all; that
configure script will fail in that case, but that's better than failing
because PKG_CHECK_MODULES wasn't defined, as that's a confusing failure
mode).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36635
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 14 Apr 2011 02:16:39 +0000 (02:16 +0000)]
Mention that tshark can now display ICMP and ICMPv6 service response times.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36634
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 14 Apr 2011 02:08:19 +0000 (02:08 +0000)]
Via bug5774, Andrew Feren requested V9TEMPLATE_MAX_FIELDS be increased to 100.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36633
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 13 Apr 2011 22:07:53 +0000 (22:07 +0000)]
From Solomon Peachy:Fix "Missing indication that we recognize the Radiotap MCS header field."
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5827
The radiotap header has a pile of optional fields, and uses a bitmask field to
indicate which fields are present. Wireshark marks the fields it decodes, and
then decodes the payload.
The recently-added MCS field is decoded now, but the bit is not displayed as
recognized. This was presumably an oversight, as this bit is recognized and the
field decoded properly.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36632
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 13 Apr 2011 21:27:08 +0000 (21:27 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 1054-1056.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36631
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 13 Apr 2011 21:00:44 +0000 (21:00 +0000)]
Comment out code to create a subtree since it's (currently ?) unused: Coverity 1039;
Don't assign to a proto_item * if the value won't be used: Coverity 1040 & 1041.
Remove some unneede #includes;
Do some minor indentation & whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36630
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Wed, 13 Apr 2011 18:15:41 +0000 (18:15 +0000)]
Allow TCP segment data to be filterable via "tcp.data".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36629
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 13 Apr 2011 17:53:28 +0000 (17:53 +0000)]
Update to reflect recent changes in epan/strutil.[ch].
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36628
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 13 Apr 2011 16:56:24 +0000 (16:56 +0000)]
Change ws_strdup_escape_underscore() function to be more general, by
accepting any character as the escaped character. Change existing
uses to use '_' for the underscore escaping.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36627
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 13 Apr 2011 16:05:11 +0000 (16:05 +0000)]
capinfos and editcap need PYTHON_DIR when we have Python enabled.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36626
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 13 Apr 2011 15:59:22 +0000 (15:59 +0000)]
Add Tag Quiet (40) and IBSS DFS (41)
Enhance Tag ERP Information (42), TS Delay (43), TCLAS Processing (44)
* Replace proto_tree_add_uint*/boolean/text by proto_tree_add_item
* use ENC_* macro for encoding
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36625
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 13 Apr 2011 15:48:24 +0000 (15:48 +0000)]
Rollback r36614 and change dissect_SMUX_PDUs_PDU() to use previously
unused smux_tree instead of tree. Per suggestion from Stig on -dev.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36624
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 13 Apr 2011 15:46:39 +0000 (15:46 +0000)]
Ok let's try GTK 2.22 on Win64 too - fix a typo.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36623
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 13 Apr 2011 15:36:05 +0000 (15:36 +0000)]
Based on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c2 :
Move the setting of debug environment variables out of the while loop.
Export MALLOC_OPTIONS=AJ to increase memory allocation debug on FreeBSD (and
others).
Export a number of environment variables that MacOS looks at.
(I don't have easy access to either of these OS so this has not been tested.)
Add a comments for each entry explaining which OS uses it and what it does.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36622
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 13 Apr 2011 15:16:41 +0000 (15:16 +0000)]
+ Fix bug listed in CID 1182:
Move test out of switch statement.
Remove unused variable.
Remove trailing whitespace.
Whitespace in that file is a mess.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36621
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 13 Apr 2011 14:38:58 +0000 (14:38 +0000)]
Ok let's try GTK 2.22 on Win64 too.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36620
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 13 Apr 2011 13:42:41 +0000 (13:42 +0000)]
Try out GTK 2.22
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36619
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 13 Apr 2011 05:43:07 +0000 (05:43 +0000)]
Restore defaults
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36618
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 13 Apr 2011 04:53:02 +0000 (04:53 +0000)]
Cast away size_t warnings on win64.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36617
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 13 Apr 2011 04:47:38 +0000 (04:47 +0000)]
Build win64 with a modified zlib (google is your friend).
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0
First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51:
set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
(info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36616
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Tue, 12 Apr 2011 22:23:03 +0000 (22:23 +0000)]
Fix Coverity 524: NEGATIVE_RETURNS
Coverity sees that two calls to tvb_length_remaining() with an offset
of 0 may return -1 (for an "out of bounds" condition), which would lead
to an assignment of -1 to an unsigned variable and then passing it
to functions further down that cannot accept negative values.
Use tvb_ensure_length_remaining() to throw an exception in a case of
out of bounds access (though unlikely with an offset of 0) instead of
tvb_length_remaining(), which would return -1.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36615
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Tue, 12 Apr 2011 22:12:05 +0000 (22:12 +0000)]
Fix Coverity 1047: UNUSED_VALUE in dissect_smux
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36614
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 12 Apr 2011 21:09:34 +0000 (21:09 +0000)]
Use the new label(It will still break on zlib as zlib 1.2.5 isn't used yet).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36611
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 12 Apr 2011 21:00:26 +0000 (21:00 +0000)]
Cleanup ProcessError().
Coverity 865.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36610
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 12 Apr 2011 20:45:25 +0000 (20:45 +0000)]
Regenerate more ASN.1 dissectors for Coverity.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36609
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 12 Apr 2011 20:39:48 +0000 (20:39 +0000)]
Add x509if_frame_end() which is passed to register_frame_end_routine()
and which resets our global variables. Remove a boolean which was used
to track a char *; just check if the pointer is NULL instead. Fixes bugs
5754 and 5793, hopefully without breaking anything.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36608
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Tue, 12 Apr 2011 20:29:42 +0000 (20:29 +0000)]
Put back in one of the includes removed in r36606: ctype.h for isdigit()
function.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36607
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 20:19:10 +0000 (20:19 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 1034;
Comment out two calls to tvb_)get_ephemeral_string since the result is never used: Coverity 1035;
Also:
Remove some unneeded #includes;
Use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36606
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 12 Apr 2011 20:03:21 +0000 (20:03 +0000)]
Added a FALLTHRU comment to avoid a missing break warning.
Coverity 437.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36605
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 19:59:26 +0000 (19:59 +0000)]
Don't assign to a variable if the value won't be used: Coverity 1002 & 1003.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36604
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 19:41:26 +0000 (19:41 +0000)]
Fix two instances of apparent use of incorrect tree: Coverity 982 & 983;
Remove an uneeded line of code: Coverity 984;
#include <string.h> not needed;
Use consistent indentation & do other whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36603
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 12 Apr 2011 19:06:51 +0000 (19:06 +0000)]
Removed some unused variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36602
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 12 Apr 2011 18:43:44 +0000 (18:43 +0000)]
Don't bother to strcpy() an empty string; just set buf[0] = '\0': Coverity 626
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36601
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 12 Apr 2011 18:29:52 +0000 (18:29 +0000)]
Use g_snprintf instead of sprintf: (Part of) Covertiy 665.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36600
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 12 Apr 2011 18:21:05 +0000 (18:21 +0000)]
#if 0 out some unused variables; we may make use of them later, but this
keeps GCC 4.6.0 from complaining about them and failing to build with
-Werror, and may also squelch some Coverity (and other static analyzer)
complaints.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36599
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 12 Apr 2011 18:16:55 +0000 (18:16 +0000)]
Use g_strlcat instead of strcat: Coverity 632.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36598
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 12 Apr 2011 17:57:22 +0000 (17:57 +0000)]
Use g_snprintf instead of sprintf and g_strlcat instead of strcat: Coverity 698
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36597
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 17:53:23 +0000 (17:53 +0000)]
Fix nasm pathname: nasm-2.09-08\nasm.exe ==> nasm-2.09.08\nasm.exe
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36596
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 12 Apr 2011 17:52:52 +0000 (17:52 +0000)]
Use g_snprintf instead of sprintf: Coverity 622.
Use g_strlcpy instead of strcpy: Coverity 632.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36595
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 17:44:22 +0000 (17:44 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 978;
Use what appears to be the intended correct tree for various proto_add...: Coverity 979;
Minor indentation cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36594
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 12 Apr 2011 17:37:05 +0000 (17:37 +0000)]
Now that wtap_read() checks for delayed errors on EOF, there's no need
to check for it on close.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36593
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 16:48:58 +0000 (16:48 +0000)]
Comment out some (currently ?) unused code: Coverity 969-971;
Fix up whitespace & indentation (e.g., "4 space tabs").
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36592
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 12 Apr 2011 16:31:16 +0000 (16:31 +0000)]
From Jakub Zawadski: some small fixes.
From me: small indentation fix (use spaces rather than tabs in all lines
in that routine).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36591
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 12 Apr 2011 16:21:14 +0000 (16:21 +0000)]
Update and expand some comments.
In the end-of-stream code, when we're checking the CRC and length, don't
check the CRC or length if we failed to read them, and don't check the
length if the CRC is bad.
We define O_BINARY as 0 on UN*X in <wsutil/file_util.h>, so we don't
need to avoid using it on UN*X.
In file_gets(), check for delayed errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36590
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 16:12:03 +0000 (16:12 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 954 & 955;
Remove some unneeded #includes;
Minor whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36589
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 16:00:28 +0000 (16:00 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 933;
Fix apparent use of incorrect tree: Coverity 934.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36588
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 12 Apr 2011 15:49:29 +0000 (15:49 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 916-918;
Also: use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36587
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 12 Apr 2011 15:44:05 +0000 (15:44 +0000)]
Build with zlib-1.2.5 for win32
zlib for GTK hasd this comment:
/* LFS conventions have no meaning on Windows. Looking for feature
* macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is
* wrong. So make sure any such macros misguidedly defined by the
* user have no effect. Windows has large file support, but the
* official zlib DLL has not been built to provide the 64-bit offset
* APIs, sigh. So we have just patched out the 64-bit offset API
* from this header file.
*/
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36586
f5534014-38df-0310-8fa8-
9805f1628bb7