Commit Graph

42601 Commits

Author SHA1 Message Date
Martin Mathieson f4edf2fa41 Add a new console wiretap program to reorder the frames within a capture
file.  This version has been tested with pcap and IxCatapult files.

Haven't got config/makefile changes quite right yet, will commit later.

svn path=/trunk/; revision=45023
2012-09-20 10:28:05 +00:00
Martin Mathieson 32ed74e83d Shouldn't set the time in seek_read() after all. At least the pcap
support doesn't.

svn path=/trunk/; revision=45022
2012-09-20 10:21:04 +00:00
Jeff Morriss 8f0d5f99c6 As suggested by Xavier Raynaud in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6425 :
scanner.c includes (depends on) grammar.h so mark it so in the Makefiles.

svn path=/trunk/; revision=45020
2012-09-20 03:04:48 +00:00
Evan Huus 5983528b69 Fix lemon build with cmake by defining _U_. I feel like there's a better
way than all the horrid escaping I had to do, but I don't know what it is.

svn path=/trunk/; revision=45019
2012-09-20 02:55:22 +00:00
Jeff Morriss 4501a9bc84 lemon is not compiled with HAVE_CONFIG_h so don't test for it nor try to include it.
svn path=/trunk/; revision=45018
2012-09-20 02:18:24 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jeff Morriss 3729335973 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45016
2012-09-20 01:48:30 +00:00
Jeff Morriss 3551a86c36 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45015
2012-09-20 01:29:52 +00:00
Gerald Combs 3e05236eff Add gzip support to the Win32 "Save As" dialog. Don't crash in the Win32
merge dialog if we cancel. Adjust the size and location of the controls
in the Win32 open and merge file templates.

svn path=/trunk/; revision=45014
2012-09-19 23:06:39 +00:00
Guy Harris b5d6160447 Try ServerVersion.plist first, and use ProductName as the OS name; that
means we report the server as such (and means that if Apple calls it
Shiny Happy Puppy X in the future, we'll report it as such...).

svn path=/trunk/; revision=45013
2012-09-19 22:41:11 +00:00
Jeff Morriss ace4a357aa Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7731 :
Allow the configured number of dfilters to be added to the drop-down list
(instead of limiting the list--on a freshly installed system with no recent
dfilters--to just 2).  Regression caused by r42439.

svn path=/trunk/; revision=45012
2012-09-19 21:29:31 +00:00
Jeff Morriss 300eb81514 Fix up some indentation and trailing white space.
svn path=/trunk/; revision=45009
2012-09-19 19:34:17 +00:00
Chris Maynard 4b5a9a2663 Since r41681, IPv6 sets pinfo->ip_ttl as the hop limit, so display that in the
INFO column, similar to how IPv4 displays the TTL.

svn path=/trunk/; revision=45008
2012-09-19 19:12:25 +00:00
Chris Maynard 86db174948 Fix request/response tracking with checksum corner case.
svn path=/trunk/; revision=45007
2012-09-19 17:57:54 +00:00
Martin Mathieson d729f21ad2 Revert r45005.
svn path=/trunk/; revision=45006
2012-09-19 16:56:59 +00:00
Martin Mathieson a232ae9242 Make proto_item_append_string() behave sanely, and use it in a few more
dissectors.

svn path=/trunk/; revision=45005
2012-09-19 11:58:32 +00:00
Pascal Quantin 0543f20a15 From LI Hai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7736 :
Fix dissection error of D-RELEASE and D-CONNECT in TETRA dissector

svn path=/trunk/; revision=45004
2012-09-19 11:02:19 +00:00
Martin Mathieson a59117bd87 Fix a couple of dumping issues seen while working on 'reorder'.
svn path=/trunk/; revision=45003
2012-09-19 09:24:11 +00:00
Jörg Mayer 30b7b74dde Remove #defines that provided backward source compatibility
for deprecated dissector add/remmove/... functions.

svn path=/trunk/; revision=45000
2012-09-19 07:20:49 +00:00
Ronnie Sahlberg bce733e4d8 SCSI: Dont show two reserved bytes in the decode pane for standard INQ page
svn path=/trunk/; revision=44999
2012-09-19 02:12:38 +00:00
Evan Huus bf976a10cb Use g_new instead of g_malloc to avoid manual C-style casting in C++ code.
svn path=/trunk/; revision=44998
2012-09-19 01:58:24 +00:00
Jeff Morriss 22b7086fb9 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=44997
2012-09-19 01:37:13 +00:00
Gerald Combs 4a57360291 Use guilibsdll and htmlhelp.lib in the Qt build.
svn path=/trunk/; revision=44996
2012-09-19 00:47:31 +00:00
Bill Meier 0a04950fe7 Add VC11 (VS2012) to an '#if _MSC_VER == 1500 || ...' test.
TBD: is really required.

svn path=/trunk/; revision=44995
2012-09-19 00:07:01 +00:00
Guy Harris 32603d204a Fix format string.
svn path=/trunk/; revision=44994
2012-09-18 23:52:45 +00:00
Gerald Combs 7d8330f50a Remove a debugging mesage.
svn path=/trunk/; revision=44993
2012-09-18 23:48:59 +00:00
Guy Harris f665fd4777 Fix call to g_filename_to_uri(), and do error checking.
svn path=/trunk/; revision=44992
2012-09-18 23:08:43 +00:00
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