Commit Graph

37207 Commits

Author SHA1 Message Date
Graeme Lunt 9db6d40656 Basic RDP dissection, which can dissect the connection sequence.
A work in progress.
Can be used with the SSL dissector to decrypt Enhanced RDP Security SSL.
With Standard RDP Security (e.g those on Wiki), the PDUs are all encrypted 
after the SecurityExchange PDU.
Wiki to be updated with an example SSL protected capture and associated
key material.

svn path=/trunk/; revision=39066
2011-09-21 07:35:51 +00:00
Guy Harris 3e7c0390d7 From Frank Lahm: Complete dissection of AFP FPSpotlightRPC function.
From me: don't use global variables in FPSpotlightRPC dissection.

svn path=/trunk/; revision=39065
2011-09-20 19:24:07 +00:00
Guy Harris 0989347195 Add an ENC_ASCII; right now, it's the same as ENC_UTF_8, but it should
eventually cause all bytes with the 8th bit set to be displayed as error
indications.

svn path=/trunk/; revision=39064
2011-09-20 17:42:27 +00:00
Guy Harris 98bbf4578d Use ENC_ values in proto_tree_add_item() calls. Use ENC_UTF_8 for
strings, and note that, for older AFP clients and servers, we might need
a way to say to use some Mac encoding instead.

Use tvb_strsize() rather than tvb_get_ephemeral_stringz() to just get
the length of a null-terminated string.

Use FT_GUID for UUIDs.

The low-order bit in the MessageBitmap in the FPGetSrvrMsg reply does
not, at least according to the current AFP spec, specify whether there's
a message at all, it specifies whether it's a server message or a login
message.  The spec *does* now mention the "message is UTF-8" bit; use
it.

Fix a blurb.

svn path=/trunk/; revision=39063
2011-09-20 17:23:16 +00:00
Chris Maynard 283a957ee0 Add DeCount for his contribution in bug 6362.
svn path=/trunk/; revision=39062
2011-09-20 16:42:22 +00:00
Chris Maynard 46ded6ec8f From DeCount via bug 6362: Increase maximum allowable number of duplicate filesi from 10 to 1000. I modified his patch to avoid appending anything to the first filename, and other minor changes.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6362

svn path=/trunk/; revision=39061
2011-09-20 16:28:21 +00:00
Anders Broman ec41ae8a1b From Sylvain Munaut:
Add support for signed types in _proto_tree_add_bits_ret_val

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

svn path=/trunk/; revision=39060
2011-09-20 11:29:53 +00:00
Stig Bjørlykke 0554530407 From Dirk via bug 6361:
Use File/Directory Dialog as a field type for UAT preferences.

svn path=/trunk/; revision=39059
2011-09-20 10:15:09 +00:00
Stig Bjørlykke c3cb0e6dd9 From Dirk via bug 6361:
Add a File/Directory Dialog as a field type for UAT preferences.

svn path=/trunk/; revision=39058
2011-09-20 10:14:58 +00:00
Chris Maynard e672fdc60f Since the call to expert_add_info_format() was commented out, 'ti' isn't needed, so get rid of it. Fixes Coverity CID's 1260 and 1261.
svn path=/trunk/; revision=39057
2011-09-19 20:49:28 +00:00
Chris Maynard 9059904629 Don't assign the return value of proto_tree_add_text() if it's not going to be used. Fixes Coverity CID 1232.
svn path=/trunk/; revision=39056
2011-09-19 20:41:17 +00:00
Chris Maynard fb19d6ab0f Since the call to proto_tree_add_text() was #if 0'd out, there's no need to assign the return value of tvb_new_subset to wlan_tvb. Actually, there's probably no need to call tvb_new_subset() in the first place, but for now let's just tackle the unused value warning and leave the FIXME for someone who knows more about this. Fixes Coverity CID 864.
svn path=/trunk/; revision=39055
2011-09-19 20:37:20 +00:00
Chris Maynard a4d1ae6547 Don't assign return value of proto_tree_add_text() to rrsc_item if it's not going to be used. Fixes Coverity CID 863.
svn path=/trunk/; revision=39054
2011-09-19 20:28:10 +00:00
Chris Maynard 5b85e16735 Move the return out of the for() loop so all values are freed. Fixes Coverity CID 1277 (loop increment j++ is unreachable).
svn path=/trunk/; revision=39053
2011-09-19 20:19:43 +00:00
Chris Maynard 7012c496c9 The change in r37371 fixed the clv_tree unused assignment and pointless use, but caused another unused assignment to 'ti'. Fixed. (Coverity CID 1233)
svn path=/trunk/; revision=39052
2011-09-19 20:09:31 +00:00
Chris Maynard bbc7a98ea6 Don't assign the return value of proto_tree_add_item() if it's not going to be used. Fixes Coverity CID's 1278-1280 (UNUSED VALUE).
svn path=/trunk/; revision=39051
2011-09-19 19:59:00 +00:00
Chris Maynard 417e8f7469 Delete duplicate line of code. Fixes Coverity CID 1281 (UNUSED VALUE).
svn path=/trunk/; revision=39050
2011-09-19 19:49:06 +00:00
Chris Maynard f47ccd73c1 Close fp before checking if private_key is NULL to avoid memory leak. Fixes Coverity 597.
svn path=/trunk/; revision=39049
2011-09-19 19:32:46 +00:00
Chris Maynard eead84d53a Fix static overrun bug introduced in r37506. Fixes Coverity CID 1216.
svn path=/trunk/; revision=39048
2011-09-19 19:14:41 +00:00
Bill Meier 49822d9dae Various Cleanups...
- Don't use 'l' as a variable name;
- Use 'tvb_strsize();proto_tree_add_item();' iso 'tvb_get_ephemeral_stringz(); proto_tree_add_string();'
- Use ENC_NA/ENC_BIG_ENDIAN iso FALSE as appropriate for proto_tree_add_item().

svn path=/trunk/; revision=39047
2011-09-19 19:13:34 +00:00
Bill Meier 099624f319 Fix compile error: just link to expert_group_vals[] in expert.c (no need for a copy in tap-expert.c).
svn path=/trunk/; revision=39046
2011-09-19 17:59:20 +00:00
Martin Mathieson c34335ebef Add expert 'Group' to output.
svn path=/trunk/; revision=39045
2011-09-19 13:53:29 +00:00
Guy Harris 59eb943780 Use ENC_NA and ENC_BIG_ENDIAN rather than FALSE in proto_tree_add_item()
calls and tvb_get_guid() calls.

For strings, add ENC_UTF_8.

svn path=/trunk/; revision=39044
2011-09-19 11:02:35 +00:00
Michael Tüxen fbe6cdc5db Fix a crash when zooming into a TSN plot.
Provided by Irene Ruengeler.
From me: remove tailing whitespaces.

svn path=/trunk/; revision=39043
2011-09-19 10:23:36 +00:00
Guy Harris 0bb00a2e64 RFC 4282 says the NAI is UTF-8.
svn path=/trunk/; revision=39042
2011-09-19 10:17:27 +00:00
Guy Harris 5f854948d4 Use ENC_NA and ENC_LITTLE_ENDIAN rather than TRUE or FALSE in
proto_tree_add_item() calls.

For strings, add ENC_UTF_8.  (Yes, the byte order is irrelevant for
those - but they should arguably be FT_UINT_STRING, as they're counted
strings, and the byte order *is* relevant for FT_UINT_STRING.)

svn path=/trunk/; revision=39041
2011-09-19 10:10:14 +00:00
Guy Harris 38b78a16a3 Some probably-erroneous TRUEs as the last argument to
proto_tree_add_item(); the items were one byte long, so the byte order
is irrelevant.

svn path=/trunk/; revision=39040
2011-09-19 09:55:36 +00:00
Guy Harris b117a8ba32 Use ENC_BIG_ENDIAN instead of FALSE in proto_tree_add_item() calls for
integral values.

For the Network Access Identifier, use ENC_UTF_8.

svn path=/trunk/; revision=39039
2011-09-19 09:52:37 +00:00
Anders Broman ea6df29d7f Move stuff inside if(tree)
svn path=/trunk/; revision=39038
2011-09-19 08:37:59 +00:00
Anders Broman b859833c05 From Martin Kaiser:
DVB-CI / CI+ Application MMI version 2

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

svn path=/trunk/; revision=39037
2011-09-19 08:37:10 +00:00
Anders Broman 5d82ea810d Make it possiblwe to creare a trime string from frame data.
svn path=/trunk/; revision=39036
2011-09-19 05:15:58 +00:00
Anders Broman a7a7d01191 Remove debug code.
svn path=/trunk/; revision=39035
2011-09-19 05:13:06 +00:00
Gerald Combs f2dd639bf1 [Automatic manuf, services and enterprise-numbers update for 2011-09-18]
svn path=/trunk/; revision=39032
2011-09-18 14:03:28 +00:00
Chris Maynard 994e1f698b Update sub-object types of XRO to match RFC 5521. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3778.
svn path=/trunk/; revision=39031
2011-09-17 03:58:41 +00:00
Bill Meier 3f3bb6b95a From Pierre-Marie de Rodat: PostgreSQL Startup message not properly supported by the PostgreSQL dissector.
"The PostgreSQL dissector do not fully support the frontend StartupMessage (see
"StartupMessage" in
http://developer.postgresql.org/pgdocs/postgres/protocol-message-formats.html).
The couples parameter name/parameter value in this kind of message are reported
as a block of text ("name: value") by the dissector whereas reporting them as
parameter name/parameter value would be more appropriate.

I've fixed it, so now the username and the database sent by the frontend can be
handled in, for instance, the CSV output of TShark.

I've also added a "val_count" field to contain the number of values (row
descriptions or row data) included in RowDescription/DataRow messages. This
information is useful when analyzing the CSV of TShark since in a CSV row, many
row descriptions or row data may be packed together."


Patch changes from me:
- No need to fetch ephemeral string anymore so just use tvb_strsize()
  to get string length;
- Change field-filtername from pgsql.val.count to pgsql.field.count

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


svn path=/trunk/; revision=39030
2011-09-16 20:08:46 +00:00
Chris Maynard afb6549467 Add dissection of router address(R) flag. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6350.
svn path=/trunk/; revision=39029
2011-09-16 19:23:26 +00:00
Michael Tüxen 207297d913 Fix a crash when analysing SCTP TSNs.
Provided by Irene Ruengeler.

svn path=/trunk/; revision=39028
2011-09-16 15:32:28 +00:00
Anders Broman bd87f77148 set_abs_time and friends always return 1.
svn path=/trunk/; revision=39027
2011-09-16 14:25:50 +00:00
Anders Broman 54dc8d1f54 From Sylvain Munaut:
proto: Use fill_label_xxx helpers in _proto_tree_add_bits_ret_val

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

svn path=/trunk/; revision=39026
2011-09-16 06:12:12 +00:00
Anders Broman 1bbb078af3 Change encoding type from TRUE/FALSE to ENC_LITTLE_ENDIAN/ ENC_BIG_ENDIAN
svn path=/trunk/; revision=39025
2011-09-16 05:36:48 +00:00
Anders Broman 94f97bb95f From Jouni Malinen:
If the GAS Query Request/Response Length field is incorrect, the
dissector function may return a value that is larger than the remaining
packet buffer. This results in a Tagged parameters item being added with
-1 byte length since tvb_reported_length_remaining() reports -1 once the
offset goes beyond the end of the packet. Clicking on that item results
in Wireshark dying on Gtk-ERROR. Note: this does not show up in tshark
and as such, cannot apparently be triggered with fuzz-test.sh.

Fix this by refusing to dissect GAS frames that have too large length
field value. In addition, verify that tvb_reported_length_remaining() is
returning a value larger than 0 instead of non-zero (which could be -1)
to make the IEEE 802.11 dissector more robust against this type of
issues.

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

svn path=/trunk/; revision=39024
2011-09-16 05:16:18 +00:00
Anders Broman 00363155e7 From Jouni Malinen:
- Dissect ANQP Network Authentication Type
- Dissect ANQP Domain Name List
- Dissect Interworking element
- Dissect Roaming Consortium element
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6339

svn path=/trunk/; revision=39023
2011-09-16 05:10:37 +00:00
Anders Broman e12440d3d0 From Liam Sharp:
In VoIP calls flow/graph display replace GR/GI etc with presentationTokenRequest/Response etc

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

svn path=/trunk/; revision=39022
2011-09-16 04:55:58 +00:00
Guy Harris 8526fa4086 wsdg_graphics/toolbar is a directory; fix the rules that weren't already
fixed to cope with that.

svn path=/trunk/; revision=39021
2011-09-16 00:21:21 +00:00
Guy Harris 657ee65b0f Well, that wasn't it. Put the dummy file back.
svn path=/trunk/; revision=39020
2011-09-16 00:13:08 +00:00
Guy Harris 8db80d317d Delete a dummy file to see if it makes building the docbook stuff with
nmake on Windows work again.

svn path=/trunk/; revision=39019
2011-09-15 23:32:44 +00:00
Anders Broman b1972828b8 From Pierre-Marie de Rodat:
MySQL’s response for a “prepare statement” command not supported by the MySQL dissector

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

svn path=/trunk/; revision=39018
2011-09-15 20:11:12 +00:00
Anders Broman f7b214378b From Pascal Quantin:
Incorrect decoding of BIT STRING type

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

svn path=/trunk/; revision=39017
2011-09-15 20:02:19 +00:00
Anders Broman 9f15951f5b From Jouni Malinen:
-Dissect ANQP Roaming Consortium list
-Dissect ANQP IP Address Type Availability
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6339

svn path=/trunk/; revision=39016
2011-09-15 19:54:02 +00:00
Anders Broman e6713b5664 From Jouni Malinen:
Dissect ANQP Capability List
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6339

svn path=/trunk/; revision=39015
2011-09-15 19:49:37 +00:00