Commit Graph

17640 Commits

Author SHA1 Message Date
Alexis La Goutte 890da55c94 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50354
2013-07-03 16:43:58 +00:00
Alexis La Goutte 327ca65ae2 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50353
2013-07-03 16:43:49 +00:00
Alexis La Goutte a06cccbe25 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50352
2013-07-03 16:43:40 +00:00
Alexis La Goutte d58b0bf1a1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50351
2013-07-03 16:43:31 +00:00
Alexis La Goutte 82bef2abe7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50350
2013-07-03 16:43:21 +00:00
Alexis La Goutte 172b0237a3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50349
2013-07-03 16:43:12 +00:00
Alexis La Goutte 88211d30ae Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50348
2013-07-03 16:43:02 +00:00
Alexis La Goutte d34f4c3b53 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50347
2013-07-03 16:42:53 +00:00
Alexis La Goutte 58c328100d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50346
2013-07-03 16:42:44 +00:00
Alexis La Goutte fb9d8134c6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50345
2013-07-03 16:42:35 +00:00
Alexis La Goutte bfa7acca05 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50344
2013-07-03 16:42:25 +00:00
Alexis La Goutte d9b440a07a Fix typo (Missing CR)
svn path=/trunk/; revision=50342
2013-07-03 16:42:00 +00:00
Michael Mann 0bad33df96 Fix infinite loop in VTP dissector. Bug 8887 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8887)
svn path=/trunk/; revision=50340
2013-07-03 12:42:17 +00:00
Pascal Quantin b00abd1c43 Check actx->private_data validity before using it
svn path=/trunk/; revision=50339
2013-07-03 12:01:12 +00:00
Pascal Quantin b91b990a77 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8880 :
Check actx->private_data validity before using it

svn path=/trunk/; revision=50338
2013-07-03 08:53:47 +00:00
Michael Mann 98492c5619 expert_add_info + proto_tree_add_text = proto_tree_add_expert, where applicable
svn path=/trunk/; revision=50337
2013-07-03 02:59:31 +00:00
Evan Huus a3543e6050 From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8881
Follow-up to r50308: misc bug fixes and tweaks to OSD2 dissection.

svn path=/trunk/; revision=50333
2013-07-03 01:22:54 +00:00
Michael Mann a6acb73611 Make expert items filterable. First use of proto_tree_add_expert.
svn path=/trunk/; revision=50327
2013-07-02 21:16:10 +00:00
Michael Mann a19eaef617 Remove "global" proto_malformed and update some of the expert_info items that really aren't "malformed".
svn path=/trunk/; revision=50324
2013-07-02 20:25:14 +00:00
Michael Mann 090ddb6afc Remove dependency on proto_malformed as it should be encapsulated in expert info API (through show exception API)
svn path=/trunk/; revision=50315
2013-07-02 16:51:03 +00:00
Jeff Morriss 0643b22517 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8878 :
The final maintenance patch, after excessive testing of the dissection engine.
The last two bugs were:

- FindSafetyFrame did not recognize the correct CRC, which in itself did not
  lead to wrongly detected packages, but was inconsistent with the rest.

- CRC == 0 - because 0 is a valid result for the CRC value.

svn path=/trunk/; revision=50312
2013-07-02 14:15:40 +00:00
Michael Mann 14d105ee4c Make expert items filterable and a little cleanup.
Remove NULL tree check at start of dissection to ensure expert info is populated.

Overall I think the logic could be a little cleaner (length checking and its tie to expert info seems excessive), but I'm not familiar enough to be comfortable making the changes.

This dissector appears to be vulnerable to DOS attacks through its unsigned 16-bit length fields (just from static inspection).  Having the length be a signed 32-bit value even if the length in the protocol field is an unsigned 16-bit value could simplify some of the logic.

svn path=/trunk/; revision=50310
2013-07-01 23:59:05 +00:00
Evan Huus a0d874ae0a From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Misc. minor improvements to zigbee zcl.

svn path=/trunk/; revision=50309
2013-07-01 23:21:44 +00:00
Evan Huus be688c88f2 From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8832
Support for OSD-2/3 in the SCSI dissector.

svn path=/trunk/; revision=50308
2013-07-01 23:17:06 +00:00
Bill Meier 02a6c2b462 Do whitespace cleanup;
Reformat hf[] entries.

svn path=/trunk/; revision=50307
2013-07-01 20:54:15 +00:00
Evan Huus 8dfe279520 Remove unused parameters.
svn path=/trunk/; revision=50304
2013-07-01 19:55:39 +00:00
Michael Mann 71e6d4be77 Made an attempt at making all TCP expert info filterable. Many of the expert info "items" are shared with a FT_NONE (hf_ display) filter, so I replaced the FT_NONE filter used with proto_tree_add_none_format() and just went with an expert info "item" with the same display filter name. The text between the "text" item and the "expert info" item varied, so I'd tried to best merge the two.
"tcp.analysis.duplicate_ack" has both an hf_ and ei_ "item" so that the duplicate ack # and frame # can be assembled properly in the tree.  Since hf_tcp_analysis_duplicate_ack is of type FT_NONE, the duplicative display filter name is okay.

svn path=/trunk/; revision=50302
2013-07-01 16:32:52 +00:00
Bill Meier 828d4e89f6 Define certain 'const char *...' arrays as static.
(That is: Don't create the array on the stack each time
  the function is called).

 Reduces code memory usage and execution time.
 (See SVN #50271)


svn path=/trunk/; revision=50300
2013-07-01 15:41:05 +00:00
Chris Maynard 17772df943 Fix Coverity CID 1040373 (Dereference before null check). Minor whitespace changes come along for the ride on this one.
svn path=/trunk/; revision=50297
2013-07-01 15:09:56 +00:00
Jeff Morriss ee52f06db9 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8877 :
In my last patch (bug #8847), I overlooked a place where I had to check for
the old CRC as well, which led to packages that were not detected anymore.

This 4 lines fix it. As usual, the patch was tested and works.

svn path=/trunk/; revision=50294
2013-07-01 14:20:17 +00:00
Jeff Morriss 97b4bbcab7 Revert r50287: the P1 dissector isn't clean yet ('dissect_p1_T_report_type' defined but not used)
svn path=/trunk/; revision=50293
2013-07-01 14:09:26 +00:00
Bill Meier 8d5bbb4146 Define certain 'const char *...' arrays as static.
Reduces code memory usage and execution time.
(See SVN #50271)


svn path=/trunk/; revision=50292
2013-07-01 13:03:23 +00:00
Michael Mann 59e46d816b Fix typo in retrieving h263 dissector. Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)
From Michal Labedzki

svn path=/trunk/; revision=50291
2013-07-01 11:55:48 +00:00
Chris Maynard 6394e93dcb Fix Coverity CID 1025626 (Unintentional integer overflow) by declaring 1 as a 64-bit unsigned integer using G_GUINT64_CONSTANT().
svn path=/trunk/; revision=50289
2013-07-01 06:35:28 +00:00
Chris Maynard 997c6c7d8e Fix Coverity CID 712348 (Unused pointer value).
svn path=/trunk/; revision=50288
2013-07-01 06:15:37 +00:00
Guy Harris 48fdfdb9d3 packet-p1.c should now be clean.
svn path=/trunk/; revision=50287
2013-07-01 06:13:56 +00:00
Guy Harris 95daae2290 Squelch some warnings.
svn path=/trunk/; revision=50286
2013-07-01 06:13:21 +00:00
Chris Maynard 8bfc3f6865 Return from dissect_at_command() immediately if tvb_length_remaining() returns -1.
svn path=/trunk/; revision=50284
2013-07-01 05:58:41 +00:00
Chris Maynard bfcaf93bff Fix Coverity CID 1040372 (Printf arg count mismatch) by eliminating the double %'s.
svn path=/trunk/; revision=50283
2013-07-01 05:47:13 +00:00
Chris Maynard b1197f177a Fix Coverity CID 1040636 (Out-of-bounds read) by changing the loop termination condition from "i < ZBEE_ZCL_NUM_ATTR_ETT" to "i < ZBEE_ZCL_APPL_CTRL_NUM_FUNC_ETT". The former is defined as 64 while the latter is defined as 32 and ett_zbee_zcl_appl_ctrl_func[], which is indexed within the loop, has only 32 entries.
svn path=/trunk/; revision=50281
2013-07-01 03:44:41 +00:00
Chris Maynard 53d3514593 Fix Coverity CID's 1037112, 1037113 and 1040635 (Explicit null dereferenced).
svn path=/trunk/; revision=50280
2013-07-01 03:33:50 +00:00
Chris Maynard 50d79e872a A better fix than r50278.
svn path=/trunk/; revision=50279
2013-07-01 03:31:11 +00:00
Chris Maynard c12624f43b Realized that Coverity would have still complained about "explicit null dereferences", so add in some additional checks.
svn path=/trunk/; revision=50278
2013-07-01 03:01:59 +00:00
Guy Harris f426c3cd45 Consistently maintain the callState member of an iax2_info_t structure
as a voip_call_state value; don't have it sometimes a voip_call_state
and sometimes a frame subtype.

This should squelch some complaints from newer versions of Clang about
unnecessary array-bounds checks - the array-bounds checks are done on
frame subtypes, where they *are* necessary (nothing prevents an
untrustworthy IAX2 implementation or an untrustworthy capture file
writer from putting an arbitrary value in the packets), not on
voip_call_state values (where it was only necessary because the value
wasn't, in that case, a voip_call_state value, it was a frame subtype
cast to a voip_call_state).

svn path=/trunk/; revision=50277
2013-07-01 02:51:48 +00:00
Chris Maynard 3e0168d1c5 Use tvb_reported_length_remaining() instead of tvb_length_remaining().
svn path=/trunk/; revision=50276
2013-07-01 02:42:40 +00:00
Chris Maynard b2ed927a80 Fix Coverity CID 280550 (Dereference null return value) by checking that ieee_hints is not NULL before dereferencing it (as is done in all other cases).
svn path=/trunk/; revision=50275
2013-07-01 02:05:11 +00:00
Chris Maynard f435ace8aa Fix Coverity CID 1040370 (Explicit null dereferenced) by removing the if (tree) { ... } tests so that payload_tree is always assigned regardless of whether tree is NULL or not.
Fix Coverity CID 1040371 (Negative loop bound) by not assignin the return value of tvb_length_remaining() to an unsigned integer and then using that value for loop termination.  Instead, assign the return value to a signed integer and only if tvb_length_remaining() returns a value greater than zero do we even begin to loop.

In addition, use tvb_length_remaining() instead of tvb_length() to determine if more data exists, and then if it does, when displaying the payload bytes following the cmd_id, only pass the number of remaining bytes following the cmd_id rather than the entire length, which would include the 1 byte for the cmd_id itself.

Other minor changes.

svn path=/trunk/; revision=50274
2013-07-01 01:56:23 +00:00
Jeff Morriss e03edbf713 From David Richards via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8871 :
TLS decryption fails when trying to decrypt XMPP sessions using start_tls as
the port in the key list of the SSL preferences.

Looking at the code, the XMPP dissector has 2 issues:

1) The crude XML element detection for XMPP segmentation is run before
checking if the SSL dissector should be called.  As a result, the SSL dissector
is not called at the appropriate times.

2) The SSL dissector is called withoug resetting the desegment flags are not
manipulated as the SMTP dissector does so segmented SSL packets are not properly
reconstructed.  Generally this causes the server hello not to be detected.

A proposed patch to fix these issues is attached.

svn path=/trunk/; revision=50272
2013-06-30 23:25:37 +00:00
Michael Mann 5bbc26236a Batch of filterable expert infos.
Also added a note about deprecating expert_add_info_format

svn path=/trunk/; revision=50270
2013-06-30 22:19:37 +00:00
Jeff Morriss 2808e853ed Actually initialize the localhost ethernet address before setting
dl_src/dl_dst to it.

Fixes uninitialized-read warnings from Valgrind on the capture in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8827

svn path=/trunk/; revision=50268
2013-06-30 21:34:40 +00:00
Jeff Morriss e9c8d4119b Add a cast to squelch a warning.
svn path=/trunk/; revision=50267
2013-06-30 20:56:28 +00:00
Jeff Morriss bdd5588ed6 Fix up a mixup of the declaration of hf_vnc_auth_error_length and
hf_vnc_auth_error.

svn path=/trunk/; revision=50264
2013-06-30 20:06:05 +00:00
Jeff Morriss 7a767ed9c4 From Matthias Benesch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8869 :
This patch adds dissection of the following VNC extensions:
 - MirrorLink messages (http://mirrorlink.com/)
 - Context Information pseudo encoding (http://mirrorlink.com/)
 - Scan Line based Run-Length encoding (http://mirrorlink.com/)
 - LibVNCServer additions (http://libvncserver.sourceforge.net/)
 - H.264 encoding

From me: fix encoding arguments.

svn path=/trunk/; revision=50263
2013-06-30 20:04:10 +00:00
Michael Mann 8723265c1d Minor improvements to VTP dissector.
1. More items "filterable" through proto_tree_add_item and expert_add_info_format_text
2. Update protocol spec reference
3. Remove some length checks to allow for malformed packets within dissect_vlan_info since the entire "vlan info structure" is necessary. 

svn path=/trunk/; revision=50262
2013-06-30 18:03:43 +00:00
Jeff Morriss c3aab70dd8 Fix the infinite loop fuzz failure reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8875 :

Don't let a negative item_length decrement our offset.

svn path=/trunk/; revision=50258
2013-06-30 16:28:52 +00:00
Jeff Morriss df5c2548dd ip_proto.h now requires expert.h.
svn path=/trunk/; revision=50249
2013-06-30 11:06:32 +00:00
Michael Mann 4d18fdf67d Add expert info to dissect_ip_tcp_options(). The proto_tree_add_text seems a bit duplicative, but the byte highlighting over the whole option is nice.
svn path=/trunk/; revision=50248
2013-06-30 03:16:32 +00:00
Alexis La Goutte b6adc8798d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50247
2013-06-29 22:01:21 +00:00
Alexis La Goutte 1a364db097 Fix warning from fix-encoding-args
epan/dissectors/packet-scsi.c:  FT_BYTES:         proto_tree_add_item(tree, hf_scsi_report_opcodes_cdb_usage_data,                            tvb_v, offset_v+4, length, [[ENC_BIG_ENDIAN]-->[ENC_NA]]);

svn path=/trunk/; revision=50246
2013-06-29 22:01:13 +00:00
Alexis La Goutte 1dfecc041c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50244
2013-06-29 22:00:50 +00:00
Alexis La Goutte 70dde30fe9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50243
2013-06-29 22:00:42 +00:00
Alexis La Goutte 5da25f80b4 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50242
2013-06-29 22:00:31 +00:00
Alexis La Goutte 6680177541 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50241
2013-06-29 22:00:22 +00:00
Alexis La Goutte c18eb788c2 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50240
2013-06-29 22:00:13 +00:00
Alexis La Goutte e5d0603e0b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50239
2013-06-29 22:00:03 +00:00
Alexis La Goutte 43be7b67aa Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50238
2013-06-29 21:59:53 +00:00
Alexis La Goutte 391f902f44 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50237
2013-06-29 21:59:44 +00:00
Alexis La Goutte 484bf76753 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50236
2013-06-29 21:59:35 +00:00
Alexis La Goutte e0343b57c3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50235
2013-06-29 21:59:25 +00:00
Alexis La Goutte 229771bdc6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50234
2013-06-29 21:59:15 +00:00
Alexis La Goutte 64834ebbb5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50233
2013-06-29 21:59:06 +00:00
Michael Mann e5af2f55ee Separate IP option header fields for each dissector that uses dissect_ip_tcp_options(). Bug 8823 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8823)
svn path=/trunk/; revision=50230
2013-06-29 19:59:08 +00:00
Evan Huus 04f8906be3 From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Zigbee dissectors for the power profile cluster and the appliance control
cluster

svn path=/trunk/; revision=50229
2013-06-29 15:57:44 +00:00
Michael Mann 7c72e1c5ce Improvements for the KDSP dissector. Bug 8864 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8864)
From Yuri Schaeffer

It addresses the following issues:

- Payload was included for all CAPPACKET messages. Even when not flagged by bitmap (bug).
- Frame Checksum (FCS) was not read from bitmap all following data is off by 4. (bug)
- Headers indicated in bitmap could use own subtree
- Payload is malformed because it is assumed the span 'the rest of the packet'. In reality more commands can follow. (bug)

svn path=/trunk/; revision=50228
2013-06-29 02:54:58 +00:00
Evan Huus 487ff8806d Callers to dissect_ndr_* functions expect pdata to be initialized on return from
the function, so make sure it is even in error conditions and other anomaly
cases. Fixes the valgrind errors with the capture from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8828

svn path=/trunk/; revision=50226
2013-06-28 23:54:53 +00:00
Pascal Quantin b5187b496b Use newly assigned DLT for PDU export functionality
svn path=/trunk/; revision=50212
2013-06-28 13:05:12 +00:00
Jeff Morriss 8d29106ffb From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8850 :
The attached patch fixes the integer type of the WCCP identity mask value.
This is a bitmask which should be printed as hex, it doesn't make sense to
print it as an IPv4 address. See
http://tools.ietf.org/id/draft-wilson-wrec-wccp-v2-01.txt section 5.7.7 and
the attached capture file as an example.

The current draft http://tools.ietf.org/html/draft-mclaggan-wccp-v2rev1-00#section-6.15
doesn't mention "mask" in the names of the field any more, but the description
still describes them as mask values.

svn path=/trunk/; revision=50211
2013-06-28 13:04:01 +00:00
Jeff Morriss 0d75d64949 From Lorand Jakab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8852 :
The I and R flags in Map-Notify LISP control packets are shown at an incorrect
position.  The attached patch fixes the bug.

svn path=/trunk/; revision=50210
2013-06-28 12:52:19 +00:00
Michael Mann c1ddd6046d replace object_identifier_id with actx->external.direct_reference
svn path=/trunk/; revision=50209
2013-06-28 12:52:13 +00:00
Michael Mann 9009944d51 Remove all global variables in P1 dissector. Bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)
Added a "subtree context" structure to asn1_ctx_t. This should allow other ASN.1 dissector global variables to be replaced when only used for transferring data between fields in a subtree.

svn path=/trunk/; revision=50208
2013-06-28 12:43:29 +00:00
Jeff Morriss c29fb44886 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8861 :
Recent versions of GlusterFS have extended the RPC protocol with new
procedures. The RPC-program-version has not been updated (yet?).

The attached adds support dissecting the FREMOVEXATTR, FALLOCATE and
DISCARD procedures.

svn path=/trunk/; revision=50207
2013-06-28 12:42:41 +00:00
Evan Huus 10918860b6 From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

More zigbee dissection, adding the following clusters:
- appliance identification
- meter identification
- appliance statistics
- appliance events and alert

svn path=/trunk/; revision=50202
2013-06-28 01:47:18 +00:00
Pascal Quantin 9334a49cb1 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8857 :
Do not assume that we must have at least 1 character present before \r\n

svn path=/trunk/; revision=50185
2013-06-27 10:17:39 +00:00
Michael Mann 11cc4642a3 From Audric Schiltknecht, bug 8521 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8521)
According to ETSI TS 102 771 (GSE implementation guidelines), "mandatory extension headers" - when GSE's protocol type field is (strictly) less than 256 (0x100) - are of 'pre-defined length (and format) that must be known by all GSE receivers'.

svn path=/trunk/; revision=50180
2013-06-27 02:34:57 +00:00
Michael Mann 9672f3d6a4 Bugfix implementation of RFC 4379. Reported through bug 8835 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8835)
svn path=/trunk/; revision=50179
2013-06-27 01:15:24 +00:00
Pascal Quantin faecb6b9a8 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8853 :
Add a missing subtree initialization

svn path=/trunk/; revision=50171
2013-06-26 16:23:54 +00:00
Michael Mann 8da89ad091 Adjust when name_len offset is used. Part of bug 8776 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776)
From Dario Lombardo

svn path=/trunk/; revision=50169
2013-06-26 14:09:10 +00:00
Michael Mann 6e1f213fca openSAFETY: CRC Maintenance, new CRC, new expert interface implemented. Bug 8847 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8847)
From Roland Knall

svn path=/trunk/; revision=50166
2013-06-26 12:11:08 +00:00
Jeff Morriss a441793cba Move a couple of time-related modules into wsutil.
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
Pascal Quantin 9216d338f0 From Reinhard Speyerer via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8851:
ansi_637_tele dissector displays MSB as MBS for Call-Back Number

svn path=/trunk/; revision=50151
2013-06-25 21:05:28 +00:00
Michael Mann 1d5f640230 Bugfix iec104 dissector, bug 8849 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849)
From Jiří Engelthaler

1) Wrong bits definitions for SIQ.BL, SIQ.SB, SIQ.NT, SIQ.IV, QDS.BL, QDS.SB, QDS.NT, QDS.IV
2) Invalid field abbrev for VTI Transient
3) Wrong bit size for SCO.QU, DCO.QU, RCO.QU
4) Changes from BASE_DEC to BASE_HEX
5) Several code style changes

svn path=/trunk/; revision=50145
2013-06-25 19:32:39 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Evan Huus cf7a0dde68 Based on initial patch by Michal Labedzki
Don't return a negative value from get_type_length, it can get us into bad
loops. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8831

svn path=/trunk/; revision=50134
2013-06-24 23:26:56 +00:00
Evan Huus d65fa93218 From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

More zigbee dissection:
- illuminance measurement cluster
- temperature measurement cluster
- pressure measurement cluster
- relative humidity measurement cluster

svn path=/trunk/; revision=50133
2013-06-24 22:59:02 +00:00
Pascal Quantin d23f769c0d Add an option to dissect RRC-Container IE
svn path=/trunk/; revision=50130
2013-06-24 21:31:25 +00:00
Chris Maynard 93002cb9c5 A follow-up to r50127 to highlight the correct 4 bytes of the Ethernet FCS for the hf_eth_fcs_good and hf_eth_fcs_bad fields.
svn path=/trunk/; revision=50128
2013-06-24 19:27:47 +00:00
Guy Harris 00b1a9df1a The Ethernet FCS is 32 bits, not 16 bits.
svn path=/trunk/; revision=50127
2013-06-24 19:00:55 +00:00
Chris Maynard 16cd5cb653 Display RSSI in dB instead of dBm. Fixes the last remaining issue reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4507
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=50125
2013-06-24 14:30:00 +00:00
Alexis La Goutte 8765ad273d Make Authentification String filterable
svn path=/trunk/; revision=50124
2013-06-23 20:41:32 +00:00
Alexis La Goutte fde47f55a9 From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8837 Add support for VHT Transmit Power Envelope IE
Added support for VHT TPE IE and also tested it

Also fixed a small typo from "IEEE Stc" to "IEEE Std" for all 802.11ac references.

From me:
* Remove some trailing whitespace
* Fix bitmask PWR Info Unit
* Modify expert_info to display error in PWR Info Count
* Fix (possibility) loop
* Fix value_string (not need to have Reserved...)

svn path=/trunk/; revision=50123
2013-06-23 20:41:18 +00:00
Alexis La Goutte b818229a52 Enhance VRRP Dissector * Make checksum field filterable * Add also a checksum_bad filter and display a expert info when checksum is bad
svn path=/trunk/; revision=50122
2013-06-23 20:41:09 +00:00
Evan Huus a1eae659f0 Only do a tree lookup if we have a tree to look up in.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8833

svn path=/trunk/; revision=50116
2013-06-22 21:01:03 +00:00
Michael Mann 87eb22f464 More proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)) of global variables complained about in bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). Not sure if algorithm_id of x509af dissector could also be a actx->external.direct_reference, so left it alone.
svn path=/trunk/; revision=50113
2013-06-22 15:08:18 +00:00
Ronnie Sahlberg 707e2ce409 Make TCP segment length a generated field instead of a hidden field.
We should deprecate the use of hidden fields, at least for fields that arei
useful in filters. To make it easier for users to discover and use the fields.

Change the highly useful field for TCP segment payload length from
being a hidden field to be a generated field instead.



svn path=/trunk/; revision=50112
2013-06-22 02:00:03 +00:00
Stephen Fisher 0b56dc6a7b Cast away some errors of these types:
request for implicit conversion from 'gpointer' to 'char *' not permitted
    in C++ [-Werror=c++-compat]

and

    enum conversion when passing argument 3 of 'krb5_crypto_init' is invalid
    in C++ [-Werror=c++-compat]


svn path=/trunk/; revision=50108
2013-06-21 22:01:37 +00:00
Martin Kaiser 44882c4f14 rename packet-mp4.c to file-mp4.c
svn path=/trunk/; revision=50105
2013-06-21 05:18:45 +00:00
Martin Kaiser 35708dfd13 create libfiledissectors.a during the autotools build
svn path=/trunk/; revision=50097
2013-06-21 00:08:20 +00:00
Pascal Quantin de10bc6b5e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8799 :
Display certificate as UINT64 and add support for a 64bits unsigned value in BER dissector

svn path=/trunk/; revision=50096
2013-06-20 23:37:16 +00:00
Evan Huus 3258f1297e Save and restore private_data pointer instead of freeing the old one, since this
function can be called nestedly. Also use wmem memory so it doesn't leak.

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

svn path=/trunk/; revision=50094
2013-06-20 23:27:16 +00:00
Pascal Quantin 3307acc35f Regenerate DAP dissector that was changed in r50073 for some reason
svn path=/trunk/; revision=50093
2013-06-20 23:14:38 +00:00
Pascal Quantin d7856ef304 Fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8829 :
Prevent an out of bounds access in 802.11 Radiotap dissector

svn path=/trunk/; revision=50090
2013-06-20 22:21:24 +00:00
Evan Huus 176be6b481 From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Zigbee partition cluster dissector.

svn path=/trunk/; revision=50089
2013-06-20 21:52:22 +00:00
Evan Huus e6a902eb76 From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

New zigbee cluster dissectors added for Basic and Identify clusters.

svn path=/trunk/; revision=50086
2013-06-20 20:24:51 +00:00
Alexis La Goutte 8e4e4a3d76 From report of Alexander Okonnikov and Patch of Matt Texier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8802 Incorrect decoding of Layer2 Info Extended Community
Within BGP Update message for BGP VPLS (RFC 4761) some parts of Extended Community "Layer2 Info" are incorrectly decoded:

1. Encapsulation - Unknown (0x13). Per RFC 4761 encap type 0x13 is "VPLS" (clause 3.2.4);

2. Control Flags - per RFC 4761 (clause 3.2.4) two least-significant bits (6 and 7) are defined as:
"C" (bit 6, Control Word): value 1 - Control Word is required - and value 0 - Control Word is not required; decoding is correct (at least for value 0);
"S" (bit 7, Sequence delivery): value 1 - Sequence delivery is required - and value 0 - Sequence delivery is not required; decoding is incorrect, because for value 0 (sequence delivery is not required) you provide description that "Sequence delivery  is required".

Also, there is description (at the same string) "F Flag (reserved) set. IETF document draft-ietf-l2vpn-vpls-multihoming (clause 3.3.1) updates RFC 4761 and defines two additional bits within Control Flags byte - D (bit 0, "Down") and F (bit 2, "Flush"). You provide description that "F Flag (reserved) set" when this flag actually is not set (value 0). Furthermore, you don't provide description about status of flag D (in attached dump in the first packet flag D is set and unset in the second packet).

svn path=/trunk/; revision=50085
2013-06-20 20:17:25 +00:00
Alexis La Goutte 0a249bf647 Fix errors found by fix-encoding-args script
epan/dissectors/packet-dhcpv6.c:  FT_IPv6:          proto_tree_add_item(pkt_s_tree, hf_packetcable_cccV6_prov_srv_ipv6, tvb, suboptoff+1, 4, [[ENC_BIG_ENDIAN]-->[ENC_NA]]);
epan/dissectors/packet-dhcpv6.c:  FT_BYTES:         proto_tree_add_item(subtree2, hf_capabilities_encoding_bytes, tvb, tlv5_cap_index, tlv5_cap_len, [[ENC_BIG_ENDIAN]-->[ENC_NA]]);

svn path=/trunk/; revision=50084
2013-06-20 20:17:21 +00:00
Martin Mathieson 64e15853fc Fix for bug 8826.
The global variable 'address_item' was not always being set to NULL
before the dissection of a new frame.  Do more to set it in the general
case, and in the particular case of an MTSBindResult_PDU, which was
triggering an error in the supplied capture.

There may be other entry points where this still safely isn't being
set.

svn path=/trunk/; revision=50083
2013-06-20 18:54:58 +00:00
Alexis La Goutte dc82f1cc93 Fix packet-dhcpv6.c: In function 'dhcpv6_option': packet-dhcpv6.c:1826:36: error: 'ti' may be used uninitialized in this function [-Werror=maybe-uninitialized]
svn path=/trunk/; revision=50082
2013-06-20 18:32:18 +00:00
Evan Huus 6c65dd2b30 Add a few of our headers to code generated by pycrc (their faq says we can do
basically whatever we want with it, and this cleans up a couple of licensecheck
errors).

Fix FSF address in one dissector.

svn path=/trunk/; revision=50080
2013-06-20 16:54:13 +00:00
Evan Huus 1a5b5a331c From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Move zbee-on-off to zbee-general in preparation to avoid an enormous number of
small files when adding dissection for more zbee cluster types.

svn path=/trunk/; revision=50078
2013-06-20 16:42:17 +00:00
Evan Huus 5d53d63cd7 From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8824

Convert bluetooth emem trees to wmem trees.
Add modelines and fix indentation.
Correct typo in wmem_tree.h that still referred to emem.

svn path=/trunk/; revision=50076
2013-06-20 16:31:53 +00:00
Evan Huus 612d14c883 From Brian Otte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8592
Numerous fixes and improvements to DHCPv6 Cable Television Labs vendor-specific
information dissection.

svn path=/trunk/; revision=50075
2013-06-20 16:22:53 +00:00
Evan Huus 7c8530539c Ldap still needs to include wmem.h since it uses wmem during normal dissection,
just not for UAT purposes.

svn path=/trunk/; revision=50074
2013-06-20 14:01:54 +00:00
Evan Huus d63bd5330f Back out some of the wmem conversions (r50063 and r50057).
These dissectors allocate ephemeral or seasonal memory in UAT callbacks, which
really makes no sense because UAT callbacks can occur when there is no packet or
file in scope, making this effectively a leak if the user is fiddling with their
UAT and never opens a capture.

Emem let you get away with this, wmem forces an assertion. Back out the changes
so that the UATs are usable until the code can be properly fixed to not use
out-of-scope allocators.

svn path=/trunk/; revision=50073
2013-06-20 06:26:03 +00:00
Evan Huus 0d3718b467 Add some missing wmem includes that apparently only show up on Windows.
svn path=/trunk/; revision=50071
2013-06-19 23:53:25 +00:00
Evan Huus 3a614b161f Based on patch from gyanesh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8268
Clarify display of the overload bit in multi-topology supported TLV for SPB.

svn path=/trunk/; revision=50068
2013-06-19 23:30:29 +00:00
Evan Huus 8b0f1addd9 Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Evan Huus b1e12ec925 Convert the rest of the ASN1 dissectors from emem to wmem.
svn path=/trunk/; revision=50063
2013-06-19 22:47:36 +00:00
Jeff Morriss 8e7abd9871 From Anders:
Check Header CRC of SYNC protocol.

svn path=/trunk/; revision=50062
2013-06-19 22:28:58 +00:00
Martin Kaiser 52f1140931 support extended size boxes, 2nd attempt
put up an expert info if the extended size does not fit into a gint

svn path=/trunk/; revision=50061
2013-06-19 22:26:12 +00:00
Pascal Quantin 014e2deec6 Add export of SS7 OPC/DPC
svn path=/trunk/; revision=50060
2013-06-19 21:49:12 +00:00
Guy Harris 19d2f6dac4 Fix display of "(correct)"/"(incorrect)" indication for the CRC.
svn path=/trunk/; revision=50058
2013-06-19 21:07:22 +00:00
Evan Huus 9fa4a8e6b6 Convert a batch of asn1 dissectors from emem to wmem.
svn path=/trunk/; revision=50057
2013-06-19 20:43:03 +00:00
Jeff Morriss a7bb5e1835 Rework the change from r15595 a bit: when creating a TVB subset, always give
the same captured and reported lengths so that we don't end up throwing
BoundsErrors ("Packet size limited during capture") when the packet is simply
malformed.

This fixes one of the issues reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8816

svn path=/trunk/; revision=50055
2013-06-19 19:31:40 +00:00
Jeff Morriss f3dfe6b4df One of the unused hf's commented out in r47389 was not used due to a
cut-n-pasteo.  Fix that cut-n-pasteo and reinstate the hf.

svn path=/trunk/; revision=50049
2013-06-19 18:38:41 +00:00
Jörg Mayer b77119aca7 Remove traling whitespace.
svn path=/trunk/; revision=50048
2013-06-19 18:33:49 +00:00
Martin Kaiser d8c2f03573 revert the extended size box changes for now,
this needs some more work to make things portable

svn path=/trunk/; revision=50044
2013-06-19 18:10:41 +00:00
Martin Kaiser df74ddb9e3 explicitly use 64bit variables, g(u)int is not 64bit everywhere
svn path=/trunk/; revision=50042
2013-06-19 17:51:59 +00:00
Evan Huus 451e4b878b Convert DNS dissector to wmem, including first actual usage of wmem's red-black
tree.

svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
Martin Kaiser 86c30e2abe support extended size boxes, general cleanup
svn path=/trunk/; revision=50040
2013-06-19 17:34:43 +00:00
Pascal Quantin 2eec913a4d Fet rid of a global variable
svn path=/trunk/; revision=50034
2013-06-19 07:16:14 +00:00
Pascal Quantin 830ebed406 Get rid of global variables
svn path=/trunk/; revision=50032
2013-06-19 06:44:39 +00:00
Pascal Quantin 7a0245d747 Regenerate dissector
svn path=/trunk/; revision=50031
2013-06-19 06:23:51 +00:00
Jörg Mayer 32b98e8524 Fix CID 1033205: Dead default in switch (DEADCODE)
svn path=/trunk/; revision=50030
2013-06-19 03:30:06 +00:00
Jörg Mayer d9b5210c61 Fix CID 712341: Dereference null return value (NULL_RETURNS)
Well, not really. Just catch that case and error out.

svn path=/trunk/; revision=50029
2013-06-19 03:23:31 +00:00
Jörg Mayer 2bb61fc8ce Fix CID 1034293: Missing break in switch (MISSING_BREAK)
svn path=/trunk/; revision=50028
2013-06-19 02:54:45 +00:00
Martin Mathieson b4c6e0eb1c Add an option (switched off) to decode the Contention Resolution body as
an RRC UL CCCH PDU.

svn path=/trunk/; revision=50024
2013-06-18 23:36:35 +00:00
Jeff Morriss e872569fde From Anders: Fix the highlighted length, add PDU description as a comment.
svn path=/trunk/; revision=50023
2013-06-18 23:33:00 +00:00
Pascal Quantin d09ffee44e Add ability to export decrypted IPsec PDUs
svn path=/trunk/; revision=50022
2013-06-18 23:01:46 +00:00
Martin Mathieson 2cf27a92a6 Set PDCP SN length for DRBs for separate RRC element.
svn path=/trunk/; revision=50021
2013-06-18 22:38:54 +00:00
Martin Mathieson 868f74d628 Also signal value of PDCP SN (only used if enabled by RLC preferences).
svn path=/trunk/; revision=50019
2013-06-18 21:44:48 +00:00
Martin Mathieson ece132a5ce Configure MAC LCID -> RLC channel settings from RRC.
svn path=/trunk/; revision=50016
2013-06-18 21:02:00 +00:00
Pascal Quantin 458dcb7ea2 Add ability to export decrypted SSL/DTLS PDUs
svn path=/trunk/; revision=50001
2013-06-18 01:13:07 +00:00
Jeff Morriss 3d1115c2bd From Anders:
Use integers intead of strings for hf_sync_timestamp
And hf_sync_packet_nr.
Ad ref. to specification.

svn path=/trunk/; revision=50000
2013-06-18 01:08:17 +00:00
Evan Huus eba26b89a4 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8810
Use value_string array names_nfs4_operation_ext for nfs.main_opname, just like
nfs.opname does.

svn path=/trunk/; revision=49992
2013-06-17 22:41:43 +00:00
Evan Huus 3398ae2aea Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8809
The LLRP Standard 1.0.1 defines the ProtocolID Parameter as 8 bit value (see
LLRP Standard 1.0.1 document, page 138, AccessSpecParameter) but Wireshark
treats it as 16 bit value and therefore doesn't recognize the
EPCGlobalClass1Gen2 protocol type and marks the whole packet afterwards as
invalid.

svn path=/trunk/; revision=49991
2013-06-17 22:22:17 +00:00
Pascal Quantin 24623bdff3 More PDU export work:
- add automatic export of port type when exporting a source / destination port
- add export of SCTP PPID (usefulness to be checked)
- fix some field size

svn path=/trunk/; revision=49989
2013-06-17 21:54:21 +00:00
Pascal Quantin 20de5f1a9a Fix 7bit ASCII / IA5 SMS dissection broken in r49910
svn path=/trunk/; revision=49986
2013-06-17 19:52:01 +00:00
Evan Huus 3098636502 Ensure that the length parameter to dissect_per_length_determinant is
initialized even in cases where we error or otherwise fail to dissect.

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

Thanks to Pascal for his help digging through this one.

svn path=/trunk/; revision=49985
2013-06-17 19:25:45 +00:00
Pascal Quantin eecfb7c423 Apply r49983 to other dissectors
svn path=/trunk/; revision=49984
2013-06-17 18:44:19 +00:00
Chris Maynard d3c38473b9 tvb_length_remaining() can return -1 so don't cast its return value to an unsigned type when performing integer comparisons. Instead, cast strlen()'s return value to a signed type and perform the comparison that way.
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=49983
2013-06-17 15:39:56 +00:00
Evan Huus b777bc825e Misc tweaks to packet-http-urlencoded.c
- add modelines
- convert emem to wmem
- add cast to satisfy my version of GCC

svn path=/trunk/; revision=49982
2013-06-17 14:18:23 +00:00
Jakub Zawadzki f2f2f13db3 Fix for previous commit, don't use string if get_form_key_value() failed.
svn path=/trunk/; revision=49978
2013-06-17 07:41:48 +00:00
Jakub Zawadzki 6dd022f14f Add small dissector for application/x-www-form-urlencoded
svn path=/trunk/; revision=49977
2013-06-17 07:35:30 +00:00
Pascal Quantin 17fa61c36e Use a more compact display for the status bitmap
svn path=/trunk/; revision=49974
2013-06-17 04:26:16 +00:00
Pascal Quantin 503f7daaa9 Remove preceding zeroes
svn path=/trunk/; revision=49973
2013-06-17 04:22:45 +00:00
Martin Kaiser 27598e20a2 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8806
assign the return values of decode_...() functions to a signed int
check for negative return values

svn path=/trunk/; revision=49963
2013-06-16 15:29:14 +00:00
Martin Mathieson f4b3cb0917 Clarify interface/test for DL HARQ id, and remove a trailing comma from
an enum.

svn path=/trunk/; revision=49961
2013-06-16 15:11:21 +00:00
Martin Mathieson 562a126ddc Improve the way PDCP status PDUs are shown.
For the bitmap, present and missing SNs are both
interesting, but only until the last received SN 
(i.e. the last byte of the bitmap will be padded
out with zero bits).

It would be possible to use existing sequence analysis
info, where available, to decide if any zeros beyond the last
received SN are interesting...

svn path=/trunk/; revision=49959
2013-06-16 14:24:47 +00:00
Martin Kaiser 69f08fd281 display some more box names
svn path=/trunk/; revision=49955
2013-06-16 02:52:01 +00:00
Michael Mann 3846abe34d Replace if-else-if with switch statements
svn path=/trunk/; revision=49948
2013-06-16 00:14:07 +00:00
Michael Mann f42e5bc9c0 Remove check_col() and the occasional tree.
This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory.  A small handful of check_col() calls remain outside of the dissectors.

svn path=/trunk/; revision=49941
2013-06-14 19:46:54 +00:00
Chris Maynard dd7b71e384 Fix IEEE802a OUI lookups.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3123
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=49939
2013-06-14 17:57:08 +00:00
Michael Mann de68fd6eea Removed check_col() and the occasional tree.
svn path=/trunk/; revision=49938
2013-06-14 17:49:53 +00:00
Martin Kaiser 48dccb60ad remove some unnecessary check_col() calls
svn path=/trunk/; revision=49936
2013-06-14 15:53:52 +00:00
Martin Kaiser 2de0e97d65 add editor modelines
svn path=/trunk/; revision=49935
2013-06-14 15:50:20 +00:00
Martin Kaiser 3fe6a50c03 new dissector for the MP4/ISOBMFF file format
svn path=/trunk/; revision=49934
2013-06-14 15:33:58 +00:00
Martin Kaiser b19c7d5537 make line endings consistent
add svn properties

svn path=/trunk/; revision=49933
2013-06-14 15:08:10 +00:00
Evan Huus 101af7fa2d Mark unused params as such.
svn path=/trunk/; revision=49932
2013-06-14 14:56:00 +00:00
Michael Mann 66f10eec2e Add Common Address Redundancy Protocol (CARP) dissector, bug 8633 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8633)
From Uli Heilmeier

CARP shares the same protocol ID as VRRP (and VRRP's is IANA registered), so heuristics are provided.  VRRP and CARP are very similar, so I'm not sure having heuristics for both dissectors will help CARP.

svn path=/trunk/; revision=49931
2013-06-14 14:35:34 +00:00
Michael Mann cfc133ddb6 Add heuristic capabilities to the IP dissector. The motivating factor was the CARP dissector, bug 8633 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8633)
This should allow the ugly IPIP/TAPA hack to be replaced with a proper heuristic, but I don't see any sample TAPA traces to feel confident in making the change myself.


svn path=/trunk/; revision=49930
2013-06-14 14:13:28 +00:00
Jeff Morriss 9c26c32645 Add parentheses around assignment used as truth value.
svn path=/trunk/; revision=49929
2013-06-14 13:20:41 +00:00
Michael Mann 2dbf6c59a2 Remove check_col() from ASN.1 dissectors
svn path=/trunk/; revision=49927
2013-06-14 12:44:50 +00:00
Martin Kaiser 0d6110e2a4 try_val_to_str() may return NULL
although this is nearly impossible here,
use val_to_str_const() anyway to be on the safe side

svn path=/trunk/; revision=49924
2013-06-14 04:01:21 +00:00
Michael Mann dfa2156e30 Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49923
2013-06-14 02:50:46 +00:00
Jeff Morriss e9a5b16a09 From Katrina Zhang via Anders (manually applied by me): dissect node features.
From me: remove some tabs and trailing white space.

svn path=/trunk/; revision=49922
2013-06-14 02:44:15 +00:00
Michael Mann fa5b45834b Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
2013-06-14 01:56:28 +00:00
Michael Mann 0f0c111119 Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
Pascal Quantin 285bc53826 Fix typo error
svn path=/trunk/; revision=49918
2013-06-13 14:20:20 +00:00
Pascal Quantin 53c658bb19 Add basic dissection of Prefix Exclude option
svn path=/trunk/; revision=49917
2013-06-13 14:18:10 +00:00
Jeff Morriss 5fa16b2008 From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8794 :
Display the value of unknown sense descriptor codes in the tree item.
Also fix the length of the subtree.

svn path=/trunk/; revision=49916
2013-06-13 13:51:19 +00:00
Pascal Quantin 32bec58892 From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8791 :
Improve dissection of GSM SIM payloads in USB CCID packets

svn path=/trunk/; revision=49915
2013-06-13 10:52:34 +00:00
Michael Mann e1b7a26463 Adding support of BGP flow spec RFC 5575.
From Matt Texier, bug 8691 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8691)

svn path=/trunk/; revision=49914
2013-06-13 02:35:23 +00:00
Michael Mann 53290ee17c Updated the rsync dissector to make it able to parse the newer variants of the protocol, treat binary data consistently and clearly differentiate packets of the client and the server.
From Benoit Daloze, bug 8743 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8743)

svn path=/trunk/; revision=49913
2013-06-13 01:06:31 +00:00
Guy Harris 3dbf3b975a Give somewhat more precise names for character encodings ("Unicode"
doesn't specify a single way to encode characters in an octet stream -
there's UTF-8 and UTF-16BE/LE, as well as UCS-2BE/LE for a subset of
Unicode, and "Latin" really means "ISO 8859-1" a/k/a "ISO Latin 1".

svn path=/trunk/; revision=49912
2013-06-12 18:17:15 +00:00
Pascal Quantin 41647faaba Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3289 :
dissector ansi_637 does not have unicode encoding in user data parameter

svn path=/trunk/; revision=49911
2013-06-12 17:25:04 +00:00
Pascal Quantin 0975d03e8d Fix dissection of 3GPP2 SMS messages when the User Data Header field is present (for fragmented SMS)
svn path=/trunk/; revision=49910
2013-06-12 16:59:59 +00:00
Martin Kaiser 7e9d283c15 no need for check_col()
svn path=/trunk/; revision=49906
2013-06-12 15:15:26 +00:00
Anders Broman 82e220f2bd Pretify dissection of date and Time.
svn path=/trunk/; revision=49905
2013-06-12 15:08:08 +00:00
Martin Kaiser 6de25d3897 simplify the subdissector call
svn path=/trunk/; revision=49904
2013-06-12 14:56:37 +00:00
Martin Kaiser 7a82d35280 TABs -> spaces
add modelines

svn path=/trunk/; revision=49903
2013-06-12 14:55:37 +00:00
Martin Kaiser 80046abfcb no expert infos under if(tree)
simplify the code a bit

svn path=/trunk/; revision=49902
2013-06-12 14:54:13 +00:00
Martin Kaiser 346117c265 From Javier Godoy
dissect SCSI OSD error identification sense data descriptor 

from me
- TABs -> spaces
- fix compiler errors about unused return values
- don't use another subtree within the descriptor payload

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

svn path=/trunk/; revision=49901
2013-06-12 14:20:36 +00:00
Martin Kaiser e94463b0df fix compiler warning
(gcc version 4.4.5 (Debian 4.4.5-8))

cc1: warnings being treated as errors
packet-bthfp.c: In function ‘dissect_at_command’:
packet-bthfp.c:875: error: ‘col_str’ may be used uninitialized in this function

svn path=/trunk/; revision=49900
2013-06-12 12:20:50 +00:00
Tomas Kukosa 822c02b5d0 Fix wrong offset in H.235 tokens causing malformed packet exception
svn path=/trunk/; revision=49899
2013-06-12 09:03:21 +00:00
Martin Kaiser 2e8347a964 no need for check_col()
svn path=/trunk/; revision=49898
2013-06-12 08:24:54 +00:00
Martin Kaiser 4131f8fa31 TABs -> spaces
add modelines

svn path=/trunk/; revision=49897
2013-06-12 08:15:46 +00:00
Martin Kaiser a8c1a87662 CID 280301: add a NULL check before dereferencing the pointer
svn path=/trunk/; revision=49896
2013-06-12 07:59:27 +00:00
Anders Broman ddd78fbd78 From Javier Godoy:
dissect SCSI field pointer sense key specific information

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

svn path=/trunk/; revision=49895
2013-06-12 05:15:45 +00:00
Anders Broman 03a322661f Fix a crash when oid_info->value_typem is NULL
svn path=/trunk/; revision=49894
2013-06-12 04:21:40 +00:00
Michael Mann 93be0fb393 Batch of filterable expert infos with some minor cleanup I noticed while doing the filter conversions.
svn path=/trunk/; revision=49893
2013-06-12 03:33:44 +00:00
Martin Kaiser 5b38f1d6e4 TABs -> spaces
add editor modelines

svn path=/trunk/; revision=49891
2013-06-11 21:33:48 +00:00
Martin Kaiser 6f6e265cf3 From Javier Godoy
dissect SCSI descriptor format sense data

from me
- replace TABs with spaces
- delete unused variable "flags"
- set format string for proto_tree_add_text()
- use val_to_str_const()

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

svn path=/trunk/; revision=49890
2013-06-11 21:22:58 +00:00
Pascal Quantin 3a0fbea070 Add PDC and TETRA
svn path=/trunk/; revision=49889
2013-06-11 18:07:15 +00:00
Jeff Morriss 15adc6a3cd From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8788 :
ETSI TS 102 221 V8.2.0 (2009-06)
(http://www.etsi.org/deliver/etsi_ts/102200_102299/102221/08.02.00_60/ts_102221v080200p.pdf)
says that file ID 0x7F31 is reserved for use by iDEN network operators (e.g.
Nextel in the USA).

The attached patch updates the GSM SIM dissector's table of recognised FIDs accordingly.

svn path=/trunk/; revision=49888
2013-06-11 18:05:41 +00:00
Anders Broman bbb5aacd42 Show DisplayString as a string.
svn path=/trunk/; revision=49887
2013-06-11 16:35:06 +00:00
Evan Huus 2a1ad7683c From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8740
Improve Bluetooth HFP dissection.

svn path=/trunk/; revision=49886
2013-06-11 14:05:48 +00:00
Anders Broman a51e384818 Remove blurbs not adding any value.
svn path=/trunk/; revision=49885
2013-06-11 05:41:51 +00:00
Anders Broman cd643e745e From Hauke Mehrtens:
There were some problems which prevented wireshark from showing the
payload.

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

svn path=/trunk/; revision=49884
2013-06-11 05:37:17 +00:00
Anders Broman ed0f343d8b From Hauke Mehrtens:
In some places String and byte were mixed up which caused problems.

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

svn path=/trunk/; revision=49883
2013-06-11 05:34:33 +00:00
Anders Broman cda44b2966 From Hauke Mehrtens:
There were some changes in how to specify the length or give a bigger
option delta. This is now implemented how it is specified in CoAP draft
17.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8780

svn path=/trunk/; revision=49882
2013-06-11 05:31:10 +00:00
Anders Broman a9933bf603 From Hauke Mehrtens:
There is no option length attribute any more there is just the end of
options marker.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8780

svn path=/trunk/; revision=49881
2013-06-11 05:27:47 +00:00
Anders Broman ae868938aa From Hauke Mehrtens:
The field named Transaction ID is named Message ID in the RFC draft
version 17
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8780

svn path=/trunk/; revision=49880
2013-06-11 05:23:52 +00:00
Anders Broman 482221763b From Hauke Mehrtens:
The token is not an option any more, but it is now in the main header.
This was done between CoAP draft 12 and 13 and still exists in CoAP
draft 17.

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

svn path=/trunk/; revision=49879
2013-06-11 05:20:33 +00:00
Anders Broman 5bc74bdeaf From: Hauke Mehrtens
DTLS 1.2 adds a supported_signature_algorithms attribute to the CertificateRequest which was not parsed in DTLS.

This code was copied from the ssl code.

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

svn path=/trunk/; revision=49878
2013-06-11 05:11:42 +00:00
Anders Broman 3f896af42c From Javier Godoy:
update SCSI version descriptors defined in SPC-4 revision 36g (scsi_verdesc_val).

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

svn path=/trunk/; revision=49877
2013-06-11 05:06:36 +00:00
Gerald Combs 62d87b6cad tools/lemon/lemon.c: Fix an integer shortening issue. (CMake enables
-Werror here but Autotools doesn't. Which is correct?)

epan/dissectors/dcerpc: idl2wrs isn't an installed executable in
Autotools so don't make it one in CMake.

svn path=/trunk/; revision=49871
2013-06-10 18:55:03 +00:00
Michael Mann 2ee48f150d Batch of filterable expert infos.
svn path=/trunk/; revision=49868
2013-06-10 02:18:55 +00:00
Anders Broman 0d936038c1 From Javier Godoy:
SCSI (SPC) sense key specific information field must not include SKSV.

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

#Backport 1.10 1.8

svn path=/trunk/; revision=49863
2013-06-09 16:51:42 +00:00
Evan Huus bd62949918 Convince the compiler that a DNS name won't be longer than 2^32 characters,
even on 64-bit systems.

svn path=/trunk/; revision=49858
2013-06-09 14:02:22 +00:00
Evan Huus edd3dfd6f8 From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776
Two new DNS tree items: dns.count.labels and dns.qry.name.len.

svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
Michael Mann 2d37ec3cb0 Batch of filterable expert infos.
svn path=/trunk/; revision=49853
2013-06-09 03:28:05 +00:00
Michael Mann 6229ab6266 Batch of filterable expert infos.
svn path=/trunk/; revision=49845
2013-06-08 02:06:24 +00:00
Sake Blok f3ba09b543 Mark retransmitted SYN and FIN packets as retransmissions.
svn path=/trunk/; revision=49829
2013-06-07 06:49:15 +00:00
Pascal Quantin 506b417907 From Mark C. Brown via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8777 :
Add support for 10Gbe HP-UX drivers IOCXGBE and IQXGBE

svn path=/trunk/; revision=49820
2013-06-06 20:55:00 +00:00
Pascal Quantin f5f6293d28 From Andreas Bachmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6126 :
Add dissection of PTP Signaling TLV types Request unicast transmission, Grant unicast transmission, Cancel unicast transmission and Acknowledge cancel unicast transmission

svn path=/trunk/; revision=49816
2013-06-06 19:50:55 +00:00
Alexis La Goutte 727f37e804 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=49810
2013-06-06 16:24:33 +00:00
Alexis La Goutte 0dca89c4f2 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=49809
2013-06-06 16:24:25 +00:00
Alexis La Goutte 96e874b4c3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=49808
2013-06-06 16:24:16 +00:00
Alexis La Goutte 2a89034b06 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=49807
2013-06-06 16:24:07 +00:00
Alexis La Goutte 8b52c9b2e5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=49806
2013-06-06 16:23:59 +00:00
Alexis La Goutte 3eb44c5934 Fix typo (double include epan/ipproto.h)
svn path=/trunk/; revision=49805
2013-06-06 16:23:50 +00:00
Evan Huus de3f2847f1 From myself and Julian Cable via (and fixing)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8717

Don't add a DCP-ETSI fragment for reassembly if the length is wrong.


svn path=/trunk/; revision=49802
2013-06-06 02:53:36 +00:00
Michael Mann 57fc882623 Simplify the "bad length" expert info into a single filterable item with formatting determining the particulars because the filter names just didn't make much sense to separate.
svn path=/trunk/; revision=49801
2013-06-06 02:10:22 +00:00
Gerald Combs c891784de7 Quick fix for bug 8768. For now assume that only three logical channels
are valid. If we run into more add expert item and cap the channel
count.

svn path=/trunk/; revision=49787
2013-06-05 16:38:20 +00:00
Chris Maynard bb35c1c375 From Peter Van Eynde via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8635: Fix bugs found by Coverity: CID's 1026572-1026574 and 1026572.
From me: Dissector was a mix of tabs and spaces.  Replace tabs with spaces and set modelines to match.

svn path=/trunk/; revision=49785
2013-06-05 15:06:20 +00:00
Jeff Morriss 2a3013fbe1 wccp_version_val is not an extended value string; don't use BASE_EXT_STRING. Fixes a crash I got during fuzz testing.
svn path=/trunk/; revision=49783
2013-06-05 13:55:22 +00:00
Pascal Quantin 1bb2081fd2 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8746 :
Add procedure numbers to C12.22 dissection

svn path=/trunk/; revision=49775
2013-06-04 20:21:17 +00:00
Anders Broman 3bfeaff546 Add subdissection of:
- SNMPv2-MIB sysDescr
-  SNMPv2-MIB::sysName

svn path=/trunk/; revision=49774
2013-06-04 20:05:16 +00:00
Pascal Quantin f37f79b107 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8747 :
Remove padding characters from CBS page content display

svn path=/trunk/; revision=49756
2013-06-04 07:09:42 +00:00
Anders Broman 94ff9552c2 From Anthony Coddington:
SDH dissector calculation fixes.

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

svn path=/trunk/; revision=49750
2013-06-04 04:19:52 +00:00