Commit Graph

16021 Commits

Author SHA1 Message Date
Pascal Quantin d66d8c44d2 Fix GSM 7-bit default alphabet decoding in ANSI IS-637-A
svn path=/trunk/; revision=46687
2012-12-21 21:03:31 +00:00
Pascal Quantin aae3c27307 Include packet-gsm_sms.h and remove extern declarations
svn path=/trunk/; revision=46686
2012-12-21 21:01:45 +00:00
Jeff Morriss 6406acc768 Use TVB_SET_ADDRESS_HF() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
and a couple of SET_ADDRESS()s.

Use proto_tree_add_item() instead of proto_tree_add_ether() called with a
pointer into the TVB.

Leave a comment for a place where a bunch of code in several case statements
could probably be collapsed into much less code.

svn path=/trunk/; revision=46682
2012-12-21 17:43:46 +00:00
Jeff Morriss 693a4d6483 Use TVB_SET_ADDRESS() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
and a couple of SET_ADDRESS()s.

svn path=/trunk/; revision=46681
2012-12-21 17:43:44 +00:00
Martin Kaiser 6a6bd89c54 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8112
by adding a range to the length that is passed to
tvb_get_ephemeral_unicode_string()

svn path=/trunk/; revision=46678
2012-12-21 15:52:42 +00:00
Guy Harris d7763299ae The KRB_RM_ #defines fit in 32 bits, so just make them unsigned, not
long.

dissect_krb5_Checksum() is declared in
epan/dissectors/packet-kerberos.h; don't declare it again here.

svn path=/trunk/; revision=46666
2012-12-21 11:37:54 +00:00
Guy Harris 8dbe2af621 Check whether something's too big before subtracting it from another
variable.

Adjust offset and len in parallel.

svn path=/trunk/; revision=46665
2012-12-21 11:12:23 +00:00
Guy Harris 954b90418a Squelch a qualifier-discard warning.
svn path=/trunk/; revision=46664
2012-12-21 11:04:10 +00:00
Guy Harris b1d5b64da6 Well, at least on my machine, packet-pres.c now compiles cleanly, with
the recent changes to pres.cnf to keep from generating some code.

svn path=/trunk/; revision=46663
2012-12-21 10:55:43 +00:00
Guy Harris 69270d1bea Get rid of unused routines for UDC-type.
svn path=/trunk/; revision=46662
2012-12-21 10:52:29 +00:00
Guy Harris 594e855738 Don't assume a pointer fits inside an unsigned long - it doesn't, in
LLP64 environments such as Windows.

Cast the result of a modulus op that causes the result to fit into an
int to int, to suppress implicit 64-bit-to-32-bit conversion warnings.

svn path=/trunk/; revision=46661
2012-12-21 10:26:52 +00:00
Guy Harris 81b8fd389e Get rid of duplicate declarations (so that -Wredundant-decls doesn't
complain).

svn path=/trunk/; revision=46660
2012-12-21 09:29:46 +00:00
Guy Harris 808c79a6b4 Everything else in the floating-point calculations is single-precision,
so make the constants single-precision, so we don't end up with warnings
about double-precision values being assigned to single-precision
variables.

svn path=/trunk/; revision=46658
2012-12-21 08:18:47 +00:00
Guy Harris be77dce42a Make some loop counters unsigned, so that we handle very large loop
counts by trying to iterate all over the items (and, presumably, failing
when we go past the end of the packet).

When assigning to the loop count, cast the value down, to avoid implicit
64-bit-to-32-bit conversion warnings.

Write those loops as for loops - it makes it a bit clearer what's going
on.

svn path=/trunk/; revision=46657
2012-12-21 08:16:12 +00:00
Guy Harris e2b61c828f Constify some character pointer variables to avoid warnings about
strings being assigned to them.

svn path=/trunk/; revision=46653
2012-12-21 05:34:38 +00:00
Pascal Quantin 79bde3d86a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8095 :
Fix dissection of GPRS-NS over Frame Relay over MPLS

svn path=/trunk/; revision=46644
2012-12-20 21:18:26 +00:00
Pascal Quantin d6f2abcbfd Revert r46595
svn path=/trunk/; revision=46643
2012-12-20 21:17:23 +00:00
Anders Broman 8a508ee3d9 Try to determine wether it is MEAS REP, EXT MEAS REP or ENH MEAS REP.
svn path=/trunk/; revision=46630
2012-12-20 12:53:38 +00:00
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