Commit Graph

42874 Commits

Author SHA1 Message Date
Gerald Combs c4d22dbe11 import_text_dialog.cpp: Use the common help URL routines.
main_window.cpp: QMessageBox::exec returns a StandardButton, not a ButtonRole.
help_dlg.c: Remove extra blank lines.

svn path=/trunk/; revision=44991
2012-09-18 22:52:34 +00:00
Gerald Combs 52746c60a0 Update configure.ac modifications to reflect r44986.
svn path=/trunk/; revision=44990
2012-09-18 22:14:12 +00:00
Gerald Combs 97fad5d945 Fix compilation on Windows.
svn path=/trunk/; revision=44989
2012-09-18 22:06:30 +00:00
Jeff Morriss d8a0279ea0 From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 :
Add VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO to the config.h on
Windows (actually Chris' patch included VERSION_BUILD and VERSION_EXTRA but
I've left those out to match what we have on *NIX now).

svn path=/trunk/; revision=44988
2012-09-18 21:52:00 +00:00
Gerald Combs 8967d312ad Move the UI-independent help URL code to ui/help_url.[ch].
svn path=/trunk/; revision=44987
2012-09-18 21:51:22 +00:00
Jeff Morriss 5ee932193f *NIX (autofoo and cmake) part of the fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 :

Make VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO available in config.h so
(e.g.) dissector writers can #if around them as necessary to make a piece of
code compile with different versions of Wireshark.  (Hopefully VERSION_MICRO
is not important in this respect!)

Windows also defines VERSION_EXTRA which can be used to help identify custom
builds; this is not done for these build methods (yet?).

svn path=/trunk/; revision=44986
2012-09-18 21:42:13 +00:00
Alexis La Goutte b6e0cc28a5 From Daniel via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7716
Adding VHT Radiotap fields support

Parsing and UI representation for recently adopted VHT Radiotap fields for
802.11ac specification
http://www.radiotap.org/defined-fields/VHT 

From me :
* Make checkAPIs happy
* Fix wrong last argument for some proto_tree_add_item
* Use proto_tree_add_item when it is possible

svn path=/trunk/; revision=44985
2012-09-18 20:46:05 +00:00
Jakub Zawadzki 90e68a72b9 Use g_malloc0
svn path=/trunk/; revision=44984
2012-09-18 20:07:06 +00:00
Chris Maynard 1c35b91296 Trivial typo/copy-and-paste comment fix.
svn path=/trunk/; revision=44983
2012-09-18 20:03:03 +00:00
Bill Meier d67f3341e5 Add stuff to config to build with VS2012. However: build currently fails.
svn path=/trunk/; revision=44982
2012-09-18 19:42:04 +00:00
Alexis La Goutte 2ce8b9bd7a Add ui/qt/console.lua to .gitignore
svn path=/trunk/; revision=44981
2012-09-18 19:31:29 +00:00
Jakub Zawadzki a016cd7740 Revert r44978: dissector_add_uint: Legalize formerly improper use of the API when calling it with pattern value of 0
dissector_add_uint() is *not only* used by tcp.port/udp.port dissector tables where 0 is not valid port number,
in some dissector tables 0 is valid protocol number, packet type, etc..

Sample dissectors using dissector_add_uint(.pattern = 0):
  packet-ansi_637.c:2348: dissector_add_uint("ansi_a.sms", 0, ansi_637_trans_handle);
  packet-cip.c:6017:      dissector_add_uint("cip.class.iface", 0, cip_class_generic_handle );
  packet-lon.c:723:       dissector_add_uint("cnip.protocol", 0, lon_handle);
  packet-q931.c:3599:     dissector_add_uint("lapd.sapi", LAPD_SAPI_Q931 /* 0 */, q931_handle);


svn path=/trunk/; revision=44980
2012-09-18 19:29:00 +00:00
Chris Maynard 6e81599840 If all ports are set to 0, then register the handle so "Decode As..." works.
svn path=/trunk/; revision=44979
2012-09-18 19:28:44 +00:00
Jörg Mayer ce7c79c0a3 dissector_add_uint:
Legalize formerly improper use of the API when calling it with
   pattern value of 0

svn path=/trunk/; revision=44978
2012-09-18 19:04:04 +00:00
Chris Maynard 183cbe9af1 Fix up proto_reg_handoff_hazelcast(), setting "initialized" to TRUE once initialized and also avoiding duplicate "tcp.port" registration.
svn path=/trunk/; revision=44977
2012-09-18 18:20:02 +00:00
Chris Maynard f870e83fb3 Don't register to udp port 0.
svn path=/trunk/; revision=44976
2012-09-18 18:15:21 +00:00
Chris Maynard e746d8091d Don't register to udp/tcp port 0, but use dissector_add_handle() instead.
svn path=/trunk/; revision=44975
2012-09-18 18:14:24 +00:00
Jeff Morriss 623720dc92 Add python cache and temporary files to the list of files to clean up.
svn path=/trunk/; revision=44974
2012-09-18 17:40:50 +00:00
Pascal Quantin cb5b915840 Fix dissection of Scheduling Information MAC Control Element when it is the only LCID in the MCH PDU
svn path=/trunk/; revision=44973
2012-09-18 17:26:00 +00:00
Jeff Morriss c7fa2f0b6f If we have PYTHON use make-tap-reg.py (in both autofoo and Windows): it's
slightly faster than the old shell-script version on *NIX and it seems
significantly faster on Windows.

svn path=/trunk/; revision=44972
2012-09-18 15:15:39 +00:00
Jeff Morriss a97731bbcb If we have PYTHON use make-tap-reg.py (like we do on Windows): it's slightly
faster than the old shell-script version (~150 msec instead of ~500 msec on
my system).

svn path=/trunk/; revision=44971
2012-09-18 14:48:28 +00:00
Michael Mann fd6b314416 parse nfsv4.1 SEQUENCE status flags (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7726)
svn path=/trunk/; revision=44970
2012-09-18 14:12:17 +00:00
Anders Broman f218d66053 Only provide the parameter data in the tvb used when calling subdissector for private extensions.
Add vendor ID to item.
Show flags in hex.

svn path=/trunk/; revision=44967
2012-09-18 07:39:14 +00:00
Evan Huus 15dca08b65 Fix uninitialized value warnings from GCC.
svn path=/trunk/; revision=44966
2012-09-18 02:17:24 +00:00
Bill Meier 7d31b63dbc Do some reformatting.
svn path=/trunk/; revision=44965
2012-09-18 01:34:08 +00:00
Bill Meier 07a1067f26 From Michael Lum: Fix typo.
svn path=/trunk/; revision=44964
2012-09-18 00:47:37 +00:00
Evan Huus 4b471d0ca6 Add Gerald's recent qt text-import work to CMake build.
svn path=/trunk/; revision=44963
2012-09-18 00:40:10 +00:00
Chris Maynard 048c68529c Initialize all hf's to -1, not 0.
svn path=/trunk/; revision=44962
2012-09-18 00:33:19 +00:00
Chris Maynard f8506c50c9 Two hf's were not initialized to -1. They are now.
svn path=/trunk/; revision=44961
2012-09-18 00:25:57 +00:00
Gerald Combs f6f174ffec Make the help button do something.
svn path=/trunk/; revision=44960
2012-09-18 00:17:04 +00:00
Chris Maynard 7334bc59e5 Initialize ett's and hf's to "-1", not "- 1".
svn path=/trunk/; revision=44959
2012-09-18 00:16:01 +00:00
Gerald Combs a7f1c30a57 Adjust the Import Text dialog size policy, although it's still not
quite right.

svn path=/trunk/; revision=44958
2012-09-18 00:05:55 +00:00
Gerald Combs 9e338509f5 Restore set_last_open_dir. We need it on Windows.
svn path=/trunk/; revision=44957
2012-09-17 23:59:50 +00:00
Gerald Combs 3069f22bd1 Add a text import dialog. Use libui.
svn path=/trunk/; revision=44956
2012-09-17 23:40:53 +00:00
Jeff Morriss 06499e6dd0 Put back the part of the regexp's that avoids finding function prototypes.
svn path=/trunk/; revision=44955
2012-09-17 21:56:52 +00:00
Jeff Morriss 211f791c6c Rather than reading the dissectors line by line and searching for the
registration and handoff routines in each line, read the whole file into
memory and then do one findall() search. Store the matches in sets to avoid
duplication.

(This also simplifies the number of regexps we're looking for.)

This speeds up the generation of register.c (when there is no cache)
significantly (on my system the time taken drops from ~32 seconds to ~5
seconds).

svn path=/trunk/; revision=44954
2012-09-17 21:30:24 +00:00
Jeff Morriss eb08c40b09 There is no proto_reg_handoff_data() so don't prototype it. Remove unnecessary include (glib.h).
svn path=/trunk/; revision=44953
2012-09-17 21:26:19 +00:00
Jeff Morriss 73c0fa86f9 Unique-ify the list of dissector registration and handoff functions while we
sort them.  Avoids the double registration problem discussed on -dev today.

Note: the sorted() call requires Python 2.4+ but I think that's OK now.

svn path=/trunk/; revision=44952
2012-09-17 20:37:39 +00:00
Bill Meier cc4e2d3566 #include <epan/prefs.h> not req'd.
svn path=/trunk/; revision=44951
2012-09-17 18:05:21 +00:00
Bill Meier 8a82b7a361 Cleanup:
- fix two cases of potential infinite loop while dissecting;
   [for (guint8 i; i <= guint8 end; i++)]
 - col_...() fcns should not be called under 'if (tree)'
 - remove unneeded initializers;
 - move proto_reg_handoff...() to the end of the file as per convention;
 - remove some boilerplate comments;
 - use consistent indentation and whitespace style;
 - remove some trailing whitespace.

svn path=/trunk/; revision=44950
2012-09-17 17:47:43 +00:00
Bill Meier b29ae79cf6 Cleanup:
- fix several instances of a potential infinte loop while dissecting TLVs;
  (it would be nice to have a valid capture file so this dissector can be fuzz-tested)
- move proto_reg_handoff...() to the end of the file as per convention;
- do find_dissector() only once in proto_reg_handoff...();
- reformat some long lines;
- replace some tabs by spaces and do other whitespace changes.

svn path=/trunk/; revision=44949
2012-09-17 16:05:43 +00:00
Pascal Quantin d530983a67 Update dissection of Request type IE
svn path=/trunk/; revision=44948
2012-09-17 16:04:36 +00:00
Anders Broman d3334cb21d Handle SDP_CRYPTO optional parameters better.
svn path=/trunk/; revision=44946
2012-09-17 15:37:28 +00:00
Alexis La Goutte 31c1f7d11d From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make DNSKEY type filterable

svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
Alexis La Goutte e057832c84 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make RRSIG type filterable

svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
Alexis La Goutte 0002fd11b5 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make TXT, SPF type filterable

svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
Alexis La Goutte 9e5e7b75df From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make MX filtereable

svn path=/trunk/; revision=44942
2012-09-17 15:17:48 +00:00
Alexis La Goutte c5826e292a From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make HINFO filtereable

svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
Anders Broman d41c249f91 callsinfo->stop_fd not set in all branches for UNISTIM.
svn path=/trunk/; revision=44940
2012-09-17 14:51:08 +00:00
Anders Broman 8e74cd8d16 Fix errors in the packet length checks.
svn path=/trunk/; revision=44939
2012-09-17 12:13:34 +00:00