Commit Graph

49140 Commits

Author SHA1 Message Date
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
Evan Huus c1dd5d3882 Replace some val_to_str calls with the equivalent val_to_str_const calls (and
implement rval_to_str_const to do this). The format-strings didn't have any
parameter specifiers in them, so they were clearly never used (or they would
have blown up) but still a bug.

This is one of the first steps towards converting val_to_str and friends to
wmem. I'm honestly not sure what the best approach is for the API in this case:
the vast majority of usage is within dissectors, so just hard-coding packet
scope (the way they currently hard-code ep_ scope) doesn't look terrible, but
there are *some* uses in taps and other places that will need to be converted to
something else if we go that route. Adding a wmem_pool parameter just for the
uncommon case seems a bit like overkill, though perhaps it is the right thing to
do.

svn path=/trunk/; revision=52264
2013-09-29 12:44:50 +00:00
Guy Harris 640a45d707 Get rid of a redundant check - pcapng_read_packet_block() already checks
whether the (zero-based) interface ID is < the number of interface IDs,
so we don't need to do so in pcapng_read().

Unions are tricky - if the compiler doesn't ensure that the right
component of the union is being used at any given time, various problems
can happen.

Remove some members from the "data" union in the wtapng_block_t
structure, and use a local variable of the specified type.

svn path=/trunk/; revision=52262
2013-09-29 00:37:04 +00:00
Evan Huus dc0b7253e4 Don't assert that the key to a wmem tree operation is short. If XMPP wants to
use a 1500-byte string as a key, so be it. It will be slow, but at least it will
work.

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

svn path=/trunk/; revision=52261
2013-09-28 23:45:18 +00:00
Evan Huus dcbc510a4c From Peter Van Eynde via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9187

Fix some minor length calculation mistakes in the WCCP decoder.

svn path=/trunk/; revision=52260
2013-09-28 23:26:23 +00:00
Guy Harris 5cbfbf3e54 Make the sample "The following bugs have been fixed:" entry match the
syntax used in actual release notes we've shipped (putting the buglist
link in parentheses).

svn path=/trunk/; revision=52257
2013-09-28 21:29:11 +00:00
Guy Harris 18aea72a17 Mention bug 9200 being fixed.
svn path=/trunk/; revision=52256
2013-09-28 21:25:44 +00:00
Guy Harris 658a16285e The pcap-ng spec says the captured length is the minimum of the
interface snapshot length and the packet length; make it so.

svn path=/trunk/; revision=52253
2013-09-28 21:06:17 +00:00
Guy Harris d399dcb52a Actually, the captured length must be the minimum of:
the number of bytes available for packet data in the block;

	the packet length;

	*and* the snapshot length for the interface.

One more fix for bug 9200, so it should *now* be fixed.

svn path=/trunk/; revision=52250
2013-09-28 20:08:39 +00:00
Guy Harris 1d00d587b4 Fix cut-and-pasteo.
Finishes the fix for bug 9200.

svn path=/trunk/; revision=52247
2013-09-28 19:26:23 +00:00
Guy Harris bdd237863f Correctly calculate the captured length in a Simple Packet Block -
subtract out the minimum SPB size, which includes the length of
*everything* except for the packet data.

Fixes one problem found by the file in bug 9200.

svn path=/trunk/; revision=52244
2013-09-28 18:25:07 +00:00
Guy Harris a582b7201a In a Simple Packet Block, the captured length isn't the block length
minus the lengths of the two length fields and the packet length field,
it's the minimum of that and the packet length, as there might be
padding.

Fixes one problem found by the file in bug 9200.

While we're at it, pcapng_read_packet_block() and
pcapng_read_simple_packet_block() return an integer, not a Boolean;
return 0, not FALSE (they have the same value, but returning 0 makes it
clearer that the return value isn't restricted to TRUE or FALSE).

svn path=/trunk/; revision=52241
2013-09-28 18:03:20 +00:00
Guy Harris 12912b657b There's no interface ID in a Simple Packet Block.
Fixes one problem found by the file in bug 9200.

svn path=/trunk/; revision=52238
2013-09-28 17:44:50 +00:00
Anders Broman 8157963907 Start dissect multipart messages.
svn path=/trunk/; revision=52237
2013-09-28 08:58:06 +00:00
Evan Huus ca52337c43 Fix various warnings in (hopefully) the right ways.
svn path=/trunk/; revision=52236
2013-09-28 02:41:49 +00:00