aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-01-21Or maybe we should just act as if QMake didn't exist and just tryguy1-1/+6
letting Boring Old Make do it; I have that autotools+make working with a --with-qt option, albeit in a not-yet-ready-for-prime-time state. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40618 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-21Set next pointer to NULL to avoid chasing non-existent UEs in list.martinm1-0/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40617 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Avoid a potential infinite loop by stopping dissection when a message has no ↵cmaynard1-0/+4
tlvblock. Patch from Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6687 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40616 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Convert forward slashes in URI to backslashes if WIN32. Patch from Cal ↵cmaynard1-4/+10
Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5237 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40615 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Fix some duplicate display filter names.cmaynard2-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40614 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Change display filter name from "ldp.tlv...." to "ldp.msg.tlv...." to be ↵cmaynard1-3/+3
like the rest. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40613 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Fix some duplicate display filter names.cmaynard1-18/+12
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40612 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Fix some duplicate display filter names.cmaynard1-39/+39
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40611 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Fix Coverity CID 1366: MISSING BREAKcmaynard1-1/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40610 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Fix Coverity CID 1369: UNUSED_VALUE by deleting duplicate and unecessary ↵cmaynard1-13/+11
line of code. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40609 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Fix Coverity CID 1370: UNREACHABLE by deleting erroneous break;cmaynard1-8/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40608 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Add more configuration information to config.pri which lets us removegerald3-29/+32
more hard-coded definitions from QtShark.pro. Quote an error message to fix a Qt Creator complaint. Add ui\qt\config.pri to the top-level "all" nmake target. Update README.qt. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40607 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20As reported by hyphenated on #wireshark:jmayer1-1/+2
don't increase offset by 4 after two add_item(...,2 ,...) commands. Increase by 2 after each add_item instead. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40606 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Manually revert the changes to CMakeLists.txt from commit 40602 - they ↵jmayer1-2/+2
should not be necessary/are wrong git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40605 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20From Pascal Quantin:jake1-19/+21
Some test equipments can send weird Protocol Configuration Options IE in the Attach Accept message with an empty protocol identifier content. Wireshark will trigger an assert when dissecting those messages because it does not check the tvb length before calling the sub dissector. With checking the protocol identifier length before calling the sub dissector, the PCO is decoded correctly. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40604 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Fix Fix "bt-dht [..] NOT registered properly" as reported in Bug #6571.wmeier1-61/+119
"bt-dht [...] should also be common dissectors while not only heuristic ones. So we can use them with 'Decode As...' command." Essentially: -Register dissector handle so the dissector can be accessed via "decode-as". From me: 1. Given that the current heuristic is much too weak and causes 'false positives': Add a preference to allow enabling/disabling of heuristic dissection. The default is 'disabled' since the current heuristic is quite weak. (For example: The heuristic incorrectly dissects about 40 files in menagerie/public as being the BT-DHT protocol). Note: only heuristic dissection is disabled; 'decode-as' remains enabled. Also: 1. Fix some bugs wherein bytes in the hex pane were not highlighted when a field was selected in the details pane. 2. Do some minor re-formatting of the source code. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40603 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Bug 6448 says the embedded Python stuff does not really work.morriss3-9/+8
And if I run Valgrind with Python enabled, I get pages of errors related to it. So: disable Python by default. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40602 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Add 'heur_dissector_set_enabled()' to allow a dissector to enable/disable ↵wmeier2-153/+188
heuristic dissection; Rename some vars; Do some minor re-indentation and whitespace changes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40601 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Try copying our plugins to an accessible directory. This assumes you've setgerald2-15/+35
WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment. On Windows, generate a QMake include file (config.pri) from config.nmake. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40600 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-20Remove or mark unused variables.gerald3-9/+14
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40599 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Slightly more details on building the qt version on Linux.jmayer1-1/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40598 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Update abi-compliance-checker options to be compatible with 1.96.1rbalint1-2/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40597 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Update generated headers changed by last commitrbalint3-2/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40596 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19fix compile errors found by dumpabi targetrbalint20-9/+55
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40595 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19gtk moved to ui/ missed this file on checkinjmayer1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40594 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Fix:jmayer1-2/+2
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-rohc.c: In function ‘dissect_rohc_ir_rtp_profile_dynamic’: /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-rohc.c:775:21: error: variable ‘cc’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40593 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Fix some duplicate display filter names.cmaynard6-25/+15
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40592 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Fix some duplicate display filter names.cmaynard5-34/+34
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40591 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Fix some duplicate display filter names.cmaynard6-10/+10
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40590 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Update comments and dissection of comptessed listsetxrab1-8/+27
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40589 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Update a couple of asn1-generated dissectors.cmaynard2-5/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40588 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Fix a duplicate display filter name.cmaynard1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40587 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Fix some duplicate display filter names.cmaynard5-28/+28
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40586 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Localize a global variable; Do minor reformatting.wmeier3-51/+52
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40585 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Update list of deprecated GLib fcns;wmeier1-61/+85
Add comment about Wireshark build defines G_DISABLE_DEPRECATED. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40584 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Add icons for pipe interfaces. This allows for easiertuexen3-1/+77
testing the upcoming patch, which improves the infrastructure to handle interfaces for capturing. Obtained from Irene Ruengeler. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40583 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Comment out hf and ett - there is no need to register them while theymartinm1-0/+4
are empty. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40582 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Add casts and don't initialise empty hf array.martinm1-5/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40581 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-19Add a dissector "mac-lte-framed" that uses the same framing format asmartinm5-47/+186
the existing "mac-lte" UDP heuristic dissector. It is hoped that it will be possible to register a DLT for use with this format. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40580 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18Get rid of no-longer-applicable comments.guy1-8/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40579 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18Get rid of some redeclarations, include "ui/recent_utils.h" to get thoseguy2-17/+1
declarations. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40578 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18Another fix for the move of recent.h.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40577 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18Line up #define values.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40576 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18Tabs are not *ipso facto* 4 spaces.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40575 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18Following the move of recent.*alagoutte1-6/+6
Fix : No rule to make target « ../gtk/recent.c », needed for « recent.c ». Stop. Not need to copy recent.c in qt working directory and use the common recent.c file. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40574 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6743alagoutte1-67/+132
[PATCH] Enhance the Spice dissector to deal with mini headers Spice recently gained the ability to use smaller packet headers. This patch adds support to it, along with small other fixes/enhancements - none of which really interesting. From me : Fix a Clang Warning : packet-spice.c:1303:5: warning: Value stored to 'offset' is never read git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40573 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18Fix a typo; Remove a dup.wmeier1-3/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40572 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18From Tom Brezinski via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6746alagoutte2-0/+3
Adding support for Network Instruments 802.11 wireless captures Attaching very simple change to allow reading of Network Instruments Observer 802.11 wireless capture files. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40571 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18#include <epan/crypt/crypt-*.h> => #include <epan/crypt/*.h>cmaynard4-7/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40570 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-18Update:wmeier1-1518/+1558
- Mark GDK functions which aren't used as 'E' - Add GTK functions deprecated after GTK 2.20 - Add some comments about use of GTK_DISABLE_DEPRECATED - reformat ... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40569 f5534014-38df-0310-8fa8-9805f1628bb7