Commit graph

49254 commits

Author SHA1 Message Date
Michael Mann
12dd69e0b6 Remove check_col.
svn path=/trunk/; revision=52316
2013-10-01 15:14:59 +00:00
Pascal Quantin
df5848517f From Didier Gautheron via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9210 :
Add 'deflate' to SIP Content-Encoding

svn path=/trunk/; revision=52315
2013-10-01 14:49:01 +00:00
Pascal Quantin
8e2c3bad06 Add MPS extensions as found on http://compliance.usb.org/mbim/
svn path=/trunk/; revision=52314
2013-10-01 14:47:03 +00:00
Michael Mann
0334c5b425 Remove check_col from generated DCE/RPC dissectors. Bug 8804 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8804).
I still couldn't figure out how to generate the source, so I made the modifications to the generated dissectors "manually" (search/replace tool in VS) that would match the "PIDL source" included here.

I will be sending the "PIDL source" (non dissector files) to the samba team.

svn path=/trunk/; revision=52313
2013-10-01 14:45:03 +00:00
Evan Huus
c6371f0f6d Add cast.
svn path=/trunk/; revision=52312
2013-10-01 13:09:51 +00:00
Evan Huus
3955de8abf Add some additional checks around the radiotap iterator initialization, to fix
the invalid access errors in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9212

(also add modelines)

svn path=/trunk/; revision=52311
2013-10-01 13:07:25 +00:00
Michael Mann
55371ca87d Remove check_col for all non-generated DCE/RPC dissectors.
svn path=/trunk/; revision=52310
2013-10-01 13:02:12 +00:00
Pascal Quantin
233a6cd8b7 Sort alphabetically the list
svn path=/trunk/; revision=52309
2013-10-01 07:41:30 +00:00
Pascal Quantin
3c10ffd3d5 Plug MBIM dissector to USB one
With this change and the use of USBPcap, it becomes possible to dissect MBIM messages on Windows 8.1

svn path=/trunk/; revision=52308
2013-09-30 20:38:23 +00:00
Pascal Quantin
d837d9f82c Fix compilation warnings
svn path=/trunk/; revision=52307
2013-09-30 20:36:38 +00:00
Pascal Quantin
5cb299d39d Add basic request / response tracking
svn path=/trunk/; revision=52306
2013-09-30 20:16:58 +00:00
Pascal Quantin
5e641a636c Add identification of Windows 8.1 / Windows Server 2012 R2
svn path=/trunk/; revision=52305
2013-09-30 20:14:42 +00:00
Michael Mann
1e5ff9125a Add some expert info. The main reason for doing this was there were a bunch of proto_tree_add_bytes_format calls that were passing hf_ variables that weren't of type FT_BYTES, and I assume that should lead to a dissector assert/fuzzbot failure.
For consistency all places that "didn't have enough bytes", got an expert message, regardless of whether the upcoming field itself was a FT_BYTES type.

svn path=/trunk/; revision=52304
2013-09-30 18:02:32 +00:00
Gerald Combs
2d1b16fb26 The Qt executables shouldn't need any wrappers. Just copy them over
as-is.

svn path=/trunk/; revision=52303
2013-09-30 17:33:59 +00:00
Gerald Combs
5687b33b4e Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir
instead of top_srcdir. It shouldn't make any difference in our case but
it's more correct.

svn path=/trunk/; revision=52302
2013-09-30 17:19:48 +00:00
Michael Mann
c70b1a548b Convert proto_tree_add_int_format calls to proto_tree_add_int_format_value where appropriate.
svn path=/trunk/; revision=52301
2013-09-30 16:10:40 +00:00
Michael Mann
50fd09f99e Convert proto_tree_add_int64_format calls to proto_tree_add_int64_format_value where appropriate.
svn path=/trunk/; revision=52300
2013-09-30 15:59:27 +00:00
Michael Mann
ffaeb8a433 Convert proto_tree_add_uint64_format calls to proto_tree_add_uint64_format_value where appropriate.
svn path=/trunk/; revision=52299
2013-09-30 15:52:24 +00:00
Michael Mann
47bca84efb Convert proto_tree_add_double_format calls to proto_tree_add_double_format_value where appropriate.
svn path=/trunk/; revision=52298
2013-09-30 15:42:18 +00:00
Gerald Combs
097feb5a64 Be a little more verbose.
svn path=/trunk/; revision=52297
2013-09-30 15:37:11 +00:00
Michael Mann
cf80442912 Convert some proto_tree_add_string_format calls to something more appropriate.
There seem to be several cases of proto_tree_add_string_format where a "string" value/filter doesn't really make sense because it's always empty, and is just being used as a "filterable subtree header (placeholder)".  They appear to be more for "presense" than "value" and should probably be FT_NONE, although I'd almost argue for removing the filter in favor of  proto_tree_add_text.

svn path=/trunk/; revision=52296
2013-09-30 15:21:09 +00:00
Gerald Combs
2211ab0fba Use macdeployqt to add the Qt bits to our bundle. Put our libraries in
Contents/Frameworks since that's what macdeployqt expects. Have
osx-dmg.sh look at the correct executable.

svn path=/trunk/; revision=52295
2013-09-30 13:12:28 +00:00
Evan Huus
67da8b61fd From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9160
Extend the BPDU dissector in packet-bpdu.c so that it recognizes and displays
the PVID TLV in Cisco's PVST+/RPVST+ BPDUs.

svn path=/trunk/; revision=52294
2013-09-30 11:57:14 +00:00
Gerald Combs
2468b33cce More Qt app bundle migration. Still doesn't work quite right.
svn path=/trunk/; revision=52293
2013-09-30 11:29:58 +00:00
Gerald Combs
0a75c9d872 Start migrating the OS X app bundle to Qt. This will likely break the
installers.

svn path=/trunk/; revision=52292
2013-09-30 10:20:43 +00:00
Martin Mathieson
acf8fbb75d Deep copy needed (clang warning flagged by Alexis!)
svn path=/trunk/; revision=52291
2013-09-30 10:15:50 +00:00
Alexis La Goutte
88c79b03d9 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52290
2013-09-30 09:03:41 +00:00
Alexis La Goutte
37762701c4 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52289
2013-09-30 09:03:28 +00:00
Alexis La Goutte
bdd2350b2c Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52288
2013-09-30 09:03:16 +00:00
Alexis La Goutte
8a95992860 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52287
2013-09-30 09:03:06 +00:00
Alexis La Goutte
fe92d7a217 Fix indent (use 4 spaces)
svn path=/trunk/; revision=52286
2013-09-30 09:02:56 +00:00
Alexis La Goutte
2f3a181f67 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52285
2013-09-30 09:02:44 +00:00
Alexis La Goutte
098819b3bc Fix compile when use gzip from make dist-gzip (Missing some images)
svn path=/trunk/; revision=52284
2013-09-30 08:38:00 +00:00
Jörg Mayer
d5cd2f3ad9 Don't link qtshark against portaudio
svn path=/trunk/; revision=52283
2013-09-30 08:12:46 +00:00
Gerald Combs
a6f406ac5a Strip out references to PortAudio. Qt has its own audio module (Phonon).
We'll presumably use that.

svn path=/trunk/; revision=52282
2013-09-30 07:55:11 +00:00
Evan Huus
d1544e8311 Use array_length macro in two places. Add modelines. Remove trailing whitespace.
svn path=/trunk/; revision=52281
2013-09-30 00:05:43 +00:00
Guy Harris
9a0e88b3a5 For an EPB, write out an "end of options" option if we write out any
other options.

Eliminate duplicate comment.

Fix indentation.

svn path=/trunk/; revision=52280
2013-09-29 22:54:13 +00:00
Pascal Quantin
c8be3dcee2 Add a MBIM (Mobile Broadband Interface Model) dissector
Still to be done:
- fragmentation support
- plug the MBIM dissector on USB dissector

svn path=/trunk/; revision=52279
2013-09-29 22:50:27 +00:00
Jörg Mayer
5cd75ac8d5 As pointed out in bug 9127, tcpdump dissects Juniper Attributes
quite well - reimplement that in Wireshark.

There is room for improvement in this patch, e.g. use subtrees for
the subattributes.

svn path=/trunk/; revision=52278
2013-09-29 22:40:25 +00:00
Guy Harris
3a57abec44 Add a routine to return the length of a string option, given the string;
0 means "this option won't be written", and use it when writing pcap-ng
blocks.

svn path=/trunk/; revision=52277
2013-09-29 22:20:32 +00:00
Evan Huus
f3e28f33f0 Remove unused variable.
svn path=/trunk/; revision=52276
2013-09-29 21:06:44 +00:00
Guy Harris
b06876390d Rename routines that write pcap-ng files to "pcapng_xxx" rather than
"libpcap_xxx".

Rename the low-level write routine in pcapio.c to write_to_file(), as
it's used for both pcap and pcap-ng files.

svn path=/trunk/; revision=52275
2013-09-29 20:53:13 +00:00
Guy Harris
c42263f28a We always write to a FILE *, so:
make libpcap_write_to_file() static;

	don't pass it as an argument to write routines, just have them
	call it directly;

	make the handle argument a FILE *.

Make the data length argument to libpcap_write_to_file() a size_t, as
that's what, for example, fwrite() takes as a size argument.

svn path=/trunk/; revision=52274
2013-09-29 20:26:25 +00:00
Guy Harris
9b2ecdc9a7 Use a common routine to write out string options.
This fixes a problem noted in bug 9202, where the calculation of the
padding for the SHB_HARDWARE option was wrong.

svn path=/trunk/; revision=52273
2013-09-29 19:11:37 +00:00
Michael Mann
e6f1bd9056 Convert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value.
svn path=/trunk/; revision=52272
2013-09-29 18:19:29 +00:00
Guy Harris
33583f2c27 Removing the assignments to "str" was an error, as its value is returned
from the functions.

svn path=/trunk/; revision=52271
2013-09-29 18:07:33 +00:00
Michael Mann
33ae47f7ad Cleanup some proto_tree_add_ipv4_format calls that shouldn't be.
svn path=/trunk/; revision=52270
2013-09-29 17:18:56 +00:00
Michael Mann
e5846873f4 Convert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_time_format_value.
Only proto_tree_add_time_format calls remaining are in packet-ncp2222.inc, which may just need some additional filters.

svn path=/trunk/; revision=52269
2013-09-29 16:40:01 +00:00
Michael Mann
da2adc77a9 Convert proto_tree_add_ipxnet_format to proto_tree_add_ipxnet_format_value. Now proto_tree_add_ipxnet_format is currently unused.
svn path=/trunk/; revision=52268
2013-09-29 15:49:04 +00:00
Gerald Combs
afc96293da [Automatic manuf, services and enterprise-numbers update for 2013-09-29]
svn path=/trunk/; revision=52265
2013-09-29 14:03:41 +00:00