summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-09-30Use macdeployqt to add the Qt bits to our bundle. Put our libraries inGerald Combs3-41/+14
Contents/Frameworks since that's what macdeployqt expects. Have osx-dmg.sh look at the correct executable. svn path=/trunk/; revision=52295
2013-09-30From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9160Evan Huus1-5/+146
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-30More Qt app bundle migration. Still doesn't work quite right.Gerald Combs2-5/+29
svn path=/trunk/; revision=52293
2013-09-30Start migrating the OS X app bundle to Qt. This will likely break theGerald Combs2-90/+151
installers. svn path=/trunk/; revision=52292
2013-09-30Deep copy needed (clang warning flagged by Alexis!)Martin Mathieson1-2/+2
svn path=/trunk/; revision=52291
2013-09-30Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+2
svn path=/trunk/; revision=52290
2013-09-30Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+3
svn path=/trunk/; revision=52289
2013-09-30Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=52288
2013-09-30Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
svn path=/trunk/; revision=52287
2013-09-30Fix indent (use 4 spaces)Alexis La Goutte1-96/+96
svn path=/trunk/; revision=52286
2013-09-30Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=52285
2013-09-30Fix compile when use gzip from make dist-gzip (Missing some images)Alexis La Goutte1-0/+2
svn path=/trunk/; revision=52284
2013-09-30Don't link qtshark against portaudioJörg Mayer1-1/+0
svn path=/trunk/; revision=52283
2013-09-30Strip out references to PortAudio. Qt has its own audio module (Phonon).Gerald Combs3-40/+1
We'll presumably use that. svn path=/trunk/; revision=52282
2013-09-30Use array_length macro in two places. Add modelines. Remove trailing whitespace.Evan Huus1-5/+18
svn path=/trunk/; revision=52281
2013-09-29For an EPB, write out an "end of options" option if we write out anyGuy Harris1-2/+8
other options. Eliminate duplicate comment. Fix indentation. svn path=/trunk/; revision=52280
2013-09-29Add a MBIM (Mobile Broadband Interface Model) dissectorPascal Quantin6-2/+5716
Still to be done: - fragmentation support - plug the MBIM dissector on USB dissector svn path=/trunk/; revision=52279
2013-09-29As pointed out in bug 9127, tcpdump dissects Juniper AttributesJörg Mayer1-16/+166
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-29Add a routine to return the length of a string option, given the string;Guy Harris1-90/+65
0 means "this option won't be written", and use it when writing pcap-ng blocks. svn path=/trunk/; revision=52277
2013-09-29Remove unused variable.Evan Huus1-3/+0
svn path=/trunk/; revision=52276
2013-09-29Rename routines that write pcap-ng files to "pcapng_xxx" rather thanGuy Harris4-312/+248
"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-29We always write to a FILE *, so:Guy Harris4-113/+102
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-29Use a common routine to write out string options.Guy Harris1-65/+43
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-29Convert several proto_tree_add_bytes_format calls to ↵Michael Mann15-65/+63
proto_tree_add_bytes_format_value. svn path=/trunk/; revision=52272
2013-09-29Removing the assignments to "str" was an error, as its value is returnedGuy Harris1-4/+8
from the functions. svn path=/trunk/; revision=52271
2013-09-29Cleanup some proto_tree_add_ipv4_format calls that shouldn't be.Michael Mann2-27/+34
svn path=/trunk/; revision=52270
2013-09-29Convert proto_tree_add_time_format to either proto_tree_add_time or ↵Michael Mann8-34/+23
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-29Convert proto_tree_add_ipxnet_format to proto_tree_add_ipxnet_format_value. ↵Michael Mann1-1/+1
Now proto_tree_add_ipxnet_format is currently unused. svn path=/trunk/; revision=52268
2013-09-29[Automatic manuf, services and enterprise-numbers update for 2013-09-29]Gerald Combs1-3/+29
svn path=/trunk/; revision=52265
2013-09-29Replace some val_to_str calls with the equivalent val_to_str_const calls (andEvan Huus3-8/+28
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-29Get rid of a redundant check - pcapng_read_packet_block() already checksGuy Harris1-89/+74
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-28Don't assert that the key to a wmem tree operation is short. If XMPP wants toEvan Huus1-4/+0
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-28From Peter Van Eynde viaEvan Huus1-6/+7
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-28Make the sample "The following bugs have been fixed:" entry match theGuy Harris1-1/+1
syntax used in actual release notes we've shipped (putting the buglist link in parentheses). svn path=/trunk/; revision=52257
2013-09-28Mention bug 9200 being fixed.Guy Harris1-0/+2
svn path=/trunk/; revision=52256
2013-09-28The pcap-ng spec says the captured length is the minimum of theGuy Harris1-23/+40
interface snapshot length and the packet length; make it so. svn path=/trunk/; revision=52253
2013-09-28Actually, the captured length must be the minimum of:Guy Harris1-8/+32
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-28Fix cut-and-pasteo.Guy Harris1-1/+1
Finishes the fix for bug 9200. svn path=/trunk/; revision=52247
2013-09-28Correctly calculate the captured length in a Simple Packet Block -Guy Harris1-3/+1
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-28In a Simple Packet Block, the captured length isn't the block lengthGuy Harris1-5/+7
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-28There's no interface ID in a Simple Packet Block.Guy Harris1-10/+16
Fixes one problem found by the file in bug 9200. svn path=/trunk/; revision=52238
2013-09-28Start dissect multipart messages.Anders Broman1-7/+81
svn path=/trunk/; revision=52237
2013-09-28Fix various warnings in (hopefully) the right ways.Evan Huus7-12/+5
svn path=/trunk/; revision=52236
2013-09-281. Remove PITEM_FINFO from add_tlv_subtree and add_protocol_subtree (as well ↵Michael Mann16-2017/+1427
as some other minor cleanup) and adjust the calling functions accordingly. 2. Converted several add_protocol_subtree calls to add_tlv_subtree to get true filterability. Many of the add_protocol_subtree are effectively being (ab)used as proto_tree_add_text with different highlighting. 3. Convert tvb_new_subset into tvb_new_subset_length. Still looks like some of the remaining "protocols" need more specific filters, and should just be regular FT_BYTES fields. svn path=/trunk/; revision=52235
2013-09-27Fix a typo (a missed replace)Jörg Mayer1-2/+2
svn path=/trunk/; revision=52234
2013-09-27Hack forJörg Mayer1-5/+74
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9127 With 6 unknown bytes leading to the two known values for the last two bytes this cannot yet be properly dissected. Dissect the one known case. More traces with additional properties required to get more sense into the first 6 bytes. svn path=/trunk/; revision=52233
2013-09-27And also where it is declared. Doesn't VSC++ warn about anything?Martin Mathieson1-1/+2
svn path=/trunk/; revision=52232
2013-09-27Temporarily make an uncalled function non-static, until it gets calledMartin Mathieson1-2/+2
svn path=/trunk/; revision=52231
2013-09-27Remove unused parameterMartin Mathieson1-2/+2
svn path=/trunk/; revision=52230
2013-09-27Another step towards DRX support in LTE MACMartin Mathieson1-67/+147
svn path=/trunk/; revision=52229