Commit Graph

16003 Commits

Author SHA1 Message Date
Jeff Morriss 09221f45e4 When copying addresses, also copy the (new) hf field.
Use SET_ADDRESS in some dissectors that weren't using it (so that the hf field
is correctly initialized).

Introduce a COPY_ADDRESS_SHALLOW (which copies an address without copying the
contents of the data field).

svn path=/trunk/; revision=46602
2012-12-18 23:28:38 +00:00
Jeff Morriss 02a69849b7 Don't do proto_tree_add_ether(..., tvb_get_ptr(...)), just use proto_tree_add_item().
svn path=/trunk/; revision=46598
2012-12-18 22:29:11 +00:00
Pascal Quantin 4ffc5d699b From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8103 :
Add parsing of free_stateid, why_no_delegation, backchannel_ctl, secinfo_no_name and destroy_session fields to NFSv4.1 dissector

svn path=/trunk/; revision=46596
2012-12-18 20:58:01 +00:00
Pascal Quantin 8cbbff352e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8095 :
Add dissection of GPRS-NS protocol inside MPLS

svn path=/trunk/; revision=46595
2012-12-18 20:36:21 +00:00
Ronnie Sahlberg 38289963da SCSI: PERSISTENT_RESERVE_IN add names for service action 2/3 report capabilities/read full status
svn path=/trunk/; revision=46584
2012-12-18 04:02:57 +00:00
Evan Huus 7577443c0f Use pinfo-scoped memory for 6LoWPAN addresses.
Fixes at least part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7885

svn path=/trunk/; revision=46582
2012-12-18 03:15:23 +00:00
Jeff Morriss c858bd1452 Get rid of another tvb_get_ptr() abuse (just like r46577 but in a different
function).

svn path=/trunk/; revision=46579
2012-12-18 02:20:38 +00:00
Jeff Morriss b66af9eea7 Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7945
(or at least the complaints from Valgrind; I couldn't reproduce the crash).

What part of:

~~~
 * If you're thinking of using tvb_get_ptr, STOP WHAT YOU ARE DOING
 * IMMEDIATELY. Go take a break. Consider that tvb_get_ptr hands you
 * a raw, unprotected pointer that you can easily use to create a
 * security vulnerability or otherwise crash Wireshark. Then consider
 * that you can probably find a function elsewhere in this file that
 * does exactly what you want in a much more safe and robust manner.
~~~

did someone not read?

Use tvb_get_ephemeral_stringz() instead of adding (apparently not sufficiently
checked!) offsets to the result of tvb_get_ptr() and assuming that the result
is a) in bounds and b) a NULL-terminated string.

svn path=/trunk/; revision=46577
2012-12-18 02:02:28 +00:00
Martin Mathieson 9ab999a6f8 Fix a copy and paste error.
svn path=/trunk/; revision=46573
2012-12-17 14:39:59 +00:00
Pascal Quantin a7f5c35d1e From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8092 :
Add SSL segment data and SSL reassmebled data fields and improve readability of the hex/ASCII data blocks written to the SSL debug log

svn path=/trunk/; revision=46572
2012-12-16 20:30:42 +00:00
Jeff Morriss dcd8c7151f Followup to r46565 and r46568: don't even create the composite TVB if we're
not going to put anything into it.  And don't try to finalize the composite
if we didn't create it or put anything in it.

svn path=/trunk/; revision=46569
2012-12-16 19:22:00 +00:00
Jeff Morriss 72f5595125 Apply r46565 to another spot.
svn path=/trunk/; revision=46568
2012-12-16 18:32:50 +00:00
Jeff Morriss 142aaa9c5b Another part of the fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8097 :
Don't try to add a zero-length TVB to a composite TVB.

svn path=/trunk/; revision=46565
2012-12-16 16:40:36 +00:00
Alexis La Goutte 0d40765d08 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8074 SMB2 file_info_0f is actually FileFullEaInformation
[MS-FSCC].pdf section 2.4.15 gives us the correct format of the structure currently know and file_info_0f.

The unknown byte is actually the second byte of the EA Value Len.

svn path=/trunk/; revision=46562
2012-12-16 15:34:33 +00:00
Alexis La Goutte 553f751e01 From Simon Barber via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8094 Add support for RA and TA to all 802.11 frame formats
svn path=/trunk/; revision=46561
2012-12-16 15:34:23 +00:00
Alexis La Goutte 4c58eabc9a Remove unused ett_nfs_security_label variable
svn path=/trunk/; revision=46560
2012-12-16 15:34:13 +00:00
Pascal Quantin 9a2fbb1978 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8098 :
Incorrect dissection of SAC and RAC in 3GPP ULI AVP

svn path=/trunk/; revision=46556
2012-12-16 08:58:46 +00:00
Jeff Morriss d206dacb95 Initialize a variable to avoid a (false) may-be-used-uninitialized warning turned error.
svn path=/trunk/; revision=46555
2012-12-16 02:37:06 +00:00
Jeff Morriss fde266096c File missed in r46553.
svn path=/trunk/; revision=46554
2012-12-16 02:13:30 +00:00
Jeff Morriss 01fd357171 Handle hop-by-hop-id collisions (when matching requests and answers) better:
instead of storing the requests in an se_tree (keyed by hop-by-hop-id),
store an se_tree which is itself keyed by frame number.  When looking for
a matching request, first find the tree of pdus (by hop-by-hop-id) and then
look for the largest frame number less than or equal to the answer's frame
number.  Also verify that the end-to-end-id matches.

Move the conversation structure out of packet-diameter.h: it's only used in
packet-diameter.c

svn path=/trunk/; revision=46553
2012-12-16 01:12:59 +00:00
Pascal Quantin 2dbf4f6fff Strengthen BT-uTP heuristic dissector and add a preference to enable it (disabled by default)
svn path=/trunk/; revision=46551
2012-12-16 00:28:38 +00:00
Martin Mathieson b7e64d6571 Fix some clang warnings.
svn path=/trunk/; revision=46549
2012-12-16 00:15:26 +00:00
Martin Mathieson 76966a2cec Check that system frame number is in range.
svn path=/trunk/; revision=46548
2012-12-16 00:02:50 +00:00
Pascal Quantin d5c14b47db Add a missing ENC_ASCII
svn path=/trunk/; revision=46547
2012-12-15 20:12:17 +00:00
Michael Mann bb7217ab4b From bug 6123, Fix further dissection of data in TCP packets with the Riverbed Transparency options (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6123)
Allow Raw Data dissector to dissect TCP packets with Riverbed Transparency options if sport dissector (found only in Riverbed) is not found.

#BACKPORT

svn path=/trunk/; revision=46544
2012-12-15 04:28:41 +00:00
Anders Broman 39c816931c Copy-paste error.
svn path=/trunk/; revision=46538
2012-12-14 11:54:35 +00:00
Anders Broman eba8fb9328 From Martin Isaksson:
- Initiiate GTP header to zero.
- Dont' load TEID unconditionaly, it might not be present.

svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
Martin Kaiser 387323569d fix
packet-h248_3gpp.c: In function ‘dissect_3gcsd_plmnbc’:
packet-h248_3gpp.c:168: error: cast to pointer from integer of different size
make[5]: *** [libdissectors_la-packet-h248_3gpp.lo] Error 1

I guess the last parameter of dissect_3gcsd_plmnbc() is a pointer to a
boolean variable. Call it implicit_param, not implicit, as there's
already a global variable 'implicit'.

Feel free to correct the fix if I got it wrong.

svn path=/trunk/; revision=46534
2012-12-14 02:27:05 +00:00
Anders Broman ca01731e86 Revert back to the original patch which actuallly worked.
svn path=/trunk/; revision=46533
2012-12-13 20:29:46 +00:00
Anders Broman 4f6998a6a5 From John Batty:- the h248_3GCSD_properties_vals array was missing entry 0 that defines the package name. - the h248_package_3GCSD structure was missing entries for the signal and event definitions (which were already been defined) For the plmnbc decoder, I found an existing decoder de_bearer_cap that could decode this field, so added a small function to call through to that The 3gtfo package definition was also missing the package name. https://bugs.wireshark.org/bugzilla/process_bug.cgi I fixed up the call to dissect_ber_octet_string() to use sub_tvb.
svn path=/trunk/; revision=46531
2012-12-13 20:17:17 +00:00
Pascal Quantin e5fc8a400e Fix what seems to be a typo error
svn path=/trunk/; revision=46528
2012-12-13 17:57:37 +00:00
Pascal Quantin 53edadd49b From John Batty via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8087 :
H.248 MEGACO PkgName property is poorly formatted

svn path=/trunk/; revision=46526
2012-12-13 14:24:44 +00:00
Pascal Quantin 548313e656 From Ojab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8082 :
cisco-sm dissector enhancement

svn path=/trunk/; revision=46525
2012-12-13 09:59:20 +00:00
Stig Bjørlykke f6f46de2ca Moved users table lookup to find_oid_by_pres_ctx_id() so other
dissectors (acse, ros, rtse) can benefit from the configured settings.

svn path=/trunk/; revision=46520
2012-12-12 15:17:36 +00:00
Anders Broman 5c1bc94608 "Fill" a couple of value_string(ext)
svn path=/trunk/; revision=46518
2012-12-12 12:48:12 +00:00
Bill Meier 93fdffd70d General cleanup:
- Fix instance of offset changed under 'if (tree)' and used after 'if (tree)';
- Create/use some extended value strings;
- #if 0 an unused value_string array;
- Localize some variables & remove some uneeded initializers;
- Fix some whitespace & long lines.

svn path=/trunk/; revision=46516
2012-12-12 03:38:46 +00:00
Bill Meier 9bb7c0f6b9 From Adam Butcher: Add SAKKE support to MIKEY dissector
... adds support for ECCSI signature type, SAKKE payload,
MIKEY-TICKET ID Role types (required for MIKEY-SAKKE KMS
role identifiers) to the MIKEY dissector.

The related specifications are:
  http://tools.ietf.org/html/rfc6509    MIKEY-SAKKE
   (http://tools.ietf.org/html/rfc6507  ECCSI)
   (http://tools.ietf.org/html/rfc6508  SAKKE)
  http://tools.ietf.org/html/rfc6043    MIKEY-TICKET (ID Role types only)

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

svn path=/trunk/; revision=46511
2012-12-12 01:28:21 +00:00
Evan Huus 48c653481a Use the complete fragment length to reassembly SSL frames. The old method
of picking them up one at a time failed on jumbo frames.

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

svn path=/trunk/; revision=46510
2012-12-12 00:02:34 +00:00
Alexis La Goutte 2e8cb1c5cd Enhance BGP ORF (Make field filterable)
svn path=/trunk/; revision=46508
2012-12-11 23:24:02 +00:00
Alexis La Goutte cf6115367b Update IEEE Wireless Documentation links
IEEE Std 802.11(m)-2012 (pdf) is now available for free ! include with 10 amendements

* IEEE Std 802.11k™-2008: Radio Resource Measurement of Wireless LANs (Amendment 1)
* IEEE Std 802.11r™-2008: Fast Basic Service Set (BSS) Transition (Amendment 2)
* IEEE Std 802.11y™-2008: 3650–3700 MHz Operation in USA (Amendment 3)
* IEEE Std 802.11w™-2009: Protected Management Frames (Amendment 4)
* IEEE Std 802.11n™-2009: Enhancements for Higher Throughput (Amendment 5)
* IEEE Std 802.11p™-2010: Wireless Access in Vehicular Environments (Amendment 6)
* IEEE Std 802.11z™-2010: Extensions to Direct-Link Setup (DLS) (Amendment 7)
* IEEE Std 802.11v™-2011: IEEE 802.11 Wireless Network Management (Amendment 8)
* IEEE Std 802.11u™-2011: Interworking with External Networks (Amendment 9)
* IEEE Std 802.11s™-2011: Mesh Networking (Amendment 10)

svn path=/trunk/; revision=46507
2012-12-11 23:23:48 +00:00
Alexis La Goutte 293d44fca1 Enhance (minor) MPLS PW OAM Dissector Replace proto_tree_add_uint => proto_tree_add_item
svn path=/trunk/; revision=46506
2012-12-11 23:23:35 +00:00
Alexis La Goutte baf4a0ed5a From Steve Dickson via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8081
Added the Labled NFS protocol dissector for NFS v4.1

Signed-off-by: Steve Dickson <steved@redhat.com>

svn path=/trunk/; revision=46505
2012-12-11 23:23:20 +00:00
Pascal Quantin 70c283816b Dissect eMBMS MTCH LCIDs
svn path=/trunk/; revision=46504
2012-12-11 23:20:22 +00:00
Anders Broman 1ecfc445b8 From zhang lei:
Cause、RAB Context、PDU Numbers in packet-gtpv2.c are not dissected correctly. fixed in the patch.

The patch did not apply cleanly to trunk, applied by hand.

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

svn path=/trunk/; revision=46497
2012-12-11 09:39:15 +00:00
Anders Broman c5c24d2277 Only construct bit string if show internal per fields is set. Use tvb_get_bits
svn path=/trunk/; revision=46496
2012-12-11 07:01:43 +00:00
Jeff Morriss 70eecf2392 Move ett and hf arrays into proto_register routine.
Reindent some.

svn path=/trunk/; revision=46495
2012-12-11 02:26:44 +00:00
Bill Meier 4daca92053 Minor cleanup:
- Remove some uneeded initializers;
- Whitespace.

svn path=/trunk/; revision=46493
2012-12-10 23:23:01 +00:00
Bill Meier a98fa4f861 Minor cleanup:
- Localize some variables & remove some uneeded initializers;
- Fix a "set but unused" instance;
- Misc.

svn path=/trunk/; revision=46492
2012-12-10 23:20:05 +00:00
Bill Meier 6104b2f45e For the record: add comments about some duplicate values in a value_string array.
svn path=/trunk/; revision=46491
2012-12-10 20:10:30 +00:00
Bill Meier 3971e95140 Re-generate value_string array for MIBenum mapping char set names from latest IANA document;
Adds new values and fixes an incorrect value in the previous value_string array.

Note: names used as specified (with capitalization) in the document.
      (Previously all the names in the value_string array were lower case).

Also: rename the value_string array to have a less generic name.

svn path=/trunk/; revision=46490
2012-12-10 19:12:05 +00:00