Commit Graph

44118 Commits

Author SHA1 Message Date
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Guy Harris 8ede6b7dc0 bssmap_msg_fcn[] is a dense array, not a sparse array, so *every* entry
must be filled in - even if we don't happen to have dissectors for
particular message types.  Just put NULL in there, so we don't index
past the end of the array, grab a random location in memory's contents
as a function pointer, and crash when we call through that pointer.

svn path=/trunk/; revision=46747
2012-12-25 23:14:05 +00:00
Guy Harris 8432edcc72 More checks to make sure pinfo->private_data is not null.
svn path=/trunk/; revision=46746
2012-12-25 22:48:01 +00:00
Guy Harris ce5039c522 Add some additional sanity checks.
svn path=/trunk/; revision=46745
2012-12-25 22:39:11 +00:00
Michael Tüxen 22df071cef Add support for -D option. The preamble will start with
an I or O indicating the direction of the packet. This
will be stored in the generated file if the pcap-ng
format is used.
Thanks to Jaap for suggesting to integrate this into
the preamble!

svn path=/trunk/; revision=46744
2012-12-25 22:37:40 +00:00
Guy Harris c8f3c1d9a3 In dissect_bthci_evt_command_complete():
Make a loop counter a full-width integer, just to be sure.

Do *NOT* assume that pinfo->private_data is non-null; I have at least
one capture where it is null when dissect_bthci_evt_command_complete()
is captured.

svn path=/trunk/; revision=46743
2012-12-25 22:35:54 +00:00
Michael Tüxen 01d97c7ee1 Fix writing of PCAP-NG files when flags are provided.
svn path=/trunk/; revision=46742
2012-12-25 22:25:40 +00:00
Michael Tüxen 6329407d9a Remove current version of -D option, because:
* it is off by default
* not documented
* makes text2pcap to coredump when used
* its goal is not clear (to me).
I'm willing to reimplement it under a different option name
if I understand what it should do. Then I can fix and test it.


svn path=/trunk/; revision=46741
2012-12-25 19:53:04 +00:00
Michael Tüxen 05827f38ab Add some debug output regarding preamble processing.
svn path=/trunk/; revision=46740
2012-12-25 19:16:28 +00:00
Martin Kaiser 13a5f0b5da set the dtls record length for reassembly _before_ adding a fragment
this is a workaround for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8111
it does not fully fix the underlying issue

svn path=/trunk/; revision=46739
2012-12-25 18:44:14 +00:00
Michael Tüxen 4abfc13149 Clear preamble if no timespec is given.
svn path=/trunk/; revision=46738
2012-12-25 17:45:04 +00:00
Michael Tüxen f8d48662c8 Add support of -m option for SCTP.
svn path=/trunk/; revision=46737
2012-12-25 17:32:30 +00:00
Michael Tüxen dcd2b0614b Fix SCTP packet generation if DATA chunk headers need
to be generated.

svn path=/trunk/; revision=46736
2012-12-25 14:34:24 +00:00
Michael Tüxen 4aa19ce98f Fix bugs I introduced. Now
od -Ax -tx1 -v stream | text2pcap -m1460 -T1234,1234 - stream.pcap
does work again.

svn path=/trunk/; revision=46734
2012-12-25 12:02:39 +00:00
Guy Harris b98d44d71f If there's no packet data, there's nothing to check to see whether this
is an MPEG-2 transport packet, so don't treat it as one.

svn path=/trunk/; revision=46733
2012-12-25 12:00:32 +00:00
Guy Harris ceb69f1413 Show the Vines Fragmentation Protocol control flags field as bitflags,
rather than as a single field.  If bits other than the two defined bits
are set in the first byte of the packet, don't dissect UDP packets as
Vines FRP, so that other dissectors get a chance to look at the packet.

svn path=/trunk/; revision=46732
2012-12-25 11:57:03 +00:00
Michael Tüxen d6a70b809e Improve description.
svn path=/trunk/; revision=46731
2012-12-25 10:31:21 +00:00
Michael Tüxen 2daea0a310 Add option to suppress duplicate suppression.
svn path=/trunk/; revision=46730
2012-12-25 10:29:22 +00:00
Guy Harris 97937db263 The inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it. That
squelches some warnings.

svn path=/trunk/; revision=46729
2012-12-24 23:12:34 +00:00
Guy Harris da24fe83a0 The inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it (this
squelches some warnings).

svn path=/trunk/; revision=46728
2012-12-24 23:11:38 +00:00
Guy Harris d2a22e242d Cast away warnings implicit 64-bit-to-32-bit conversions. (We should
probably have routines that convert strings to numbers and do range
checks, and should also ignore values in the recent and preferences
files that are out of range.)

Cast a string to "char *" to squelch an otherwise-unavoidable warning
about qualifiers being ignored.

The media type for raw binary data is application/octet-stream, not
application octet_stream.

svn path=/trunk/; revision=46727
2012-12-24 23:10:18 +00:00
Alexis La Goutte 87c1df5ead From report of Elavarasan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8099 Named field for each item in Selected Registrar Config methods is not available
The structure of both the Config Methods and Selected Registrar Config Methods are  the same.

Display filters such as "wps.config_methods.pushbutton", "wps.config_methods.display", etc are available for the different methods in the Config methods whereas the display filters for the elements in the Selected Registrar Config methods are found to be the same as the Config method Display filters.

From me :
add new filter for selected_registrar config method bitmask (and also permitted config method)

svn path=/trunk/; revision=46725
2012-12-23 19:17:54 +00:00
Alexis La Goutte 6f7a757c04 Wireshark Aruba Dictionary is sync with FreeRadius Aruba Dictionary
svn path=/trunk/; revision=46724
2012-12-23 18:41:08 +00:00
Alexis La Goutte 267e5baf55 From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8128 Add TCP Fast Open
This patch provides
i) support for Shared Use of Experimental TCP Options (draft-ietf-tcpm-experimental-options-03)
ii) support for TCP Fast Open (draft-ietf-tcpm-fastopen-02).

A new 'TFO=R' string is appended at the column info in case a client sends a SYN packet with a Fast Open Cookie Request. Moreover, if the server responds with a SYN-ACK containing a Fast Open Cookie option a 'TFO=C' is shown (as well as in any subsequent client attempt to send SYN + DATA).

tcp.options.tfo display filter can be used in order to easily select the complete TFO three-way handshake.

Chrome (and I think also Firefox) has support for client-side TFO. Linux 3.7 got both client and server-side support.

svn path=/trunk/; revision=46723
2012-12-23 18:40:55 +00:00
Alexis La Goutte fc22650de4 Update Dictonary from FreeRadius(-server) Master branch https://github.com/FreeRADIUS/freeradius-server
Add RFC 5447 dictionary
9b98830314

Add RFC 6519 dictionary
383a997181

Add RFC 6572 dictionary
8cc6e5a04d

svn path=/trunk/; revision=46722
2012-12-23 18:40:40 +00:00
Gerald Combs 18e1080b28 [Automatic manuf, services and enterprise-numbers update for 2012-12-23]
svn path=/trunk/; revision=46719
2012-12-23 15:03:29 +00:00
Guy Harris 04a5398ab7 In nlsp_dissect_clvs(), count len down at the same time we increment the
offset, and do the bounds checking on the length before we count len
down.

svn path=/trunk/; revision=46718
2012-12-23 10:51:34 +00:00
Guy Harris 74f668444e Use the types that PortAudio specifies for values passed to or returned
from PortAudio; that squelches some implicit 64-bit-to-32-bit conversion
warnings.

Mark unused arguments with _U_ rather than adding fake usages for them.

svn path=/trunk/; revision=46717
2012-12-23 10:18:43 +00:00
Guy Harris e0ed1bddab More whitespace cleanups.
svn path=/trunk/; revision=46716
2012-12-23 09:54:05 +00:00
Michael Tüxen 644f8485da Add support for writing per packet comments when using pcapng.
Not actually used with this commit, which just brings in the
infrastructure.


svn path=/trunk/; revision=46715
2012-12-23 09:25:42 +00:00
Michael Tüxen b70c24ca79 When using pcapng, provide input file name as comment.
svn path=/trunk/; revision=46714
2012-12-23 09:00:55 +00:00
Michael Tüxen ef0282ee9c Fix syntax error showing up when using debug ouput.
svn path=/trunk/; revision=46713
2012-12-23 08:59:30 +00:00
Guy Harris bb846842f8 Fix indentation.
svn path=/trunk/; revision=46712
2012-12-23 06:52:50 +00:00
Gerald Combs 9a9fd20ece Add ui_packet_comment_dialog.h and ui_time_shift_dialog.h.
svn path=/trunk/; revision=46711
2012-12-23 05:11:49 +00:00
Gerald Combs b35f374ff5 Qt .ui files are XML. Set their SVN properties accordingly.
svn path=/trunk/; revision=46710
2012-12-23 04:39:33 +00:00
Gerald Combs a5d5162826 Qt: Implement packet comments. Fix packet detail updates.
GTK+: Shorten the packet comment menu item name.  Remove a couple of
unneeded includes.

Both: Add an arbitrary 20 MB limit when fetching all packet comments.
Use a color from the Tango palette for comments.

svn path=/trunk/; revision=46709
2012-12-23 04:37:58 +00:00
Gerald Combs aa347d504f Add the time shift dialog.
svn path=/trunk/; revision=46708
2012-12-23 03:45:35 +00:00
Martin Kaiser 594b0bb11f revert r46678
now that tvb_get_ephemeral_unicode_string() throws an exception for
invalid length parameters, there's no point in doing an explicit check
beforehand

(when I added the check, there were many places that I missed)

svn path=/trunk/; revision=46707
2012-12-22 23:56:50 +00:00
Martin Kaiser 3eb2a8644f trivial: clean up epan/strutil.c
replace TABs with spaces
   add editor modelines

svn path=/trunk/; revision=46706
2012-12-22 23:27:40 +00:00
Martin Kaiser 50945da41c check the length parameter for tvb_get_unicode_string() and
tvb_get_ephemeral_unicode_string(), throw an exception for invalid
lengths (including -1, but length==-1 does not work for other tvb string
functions either)

I believe this is the proper fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8112

svn path=/trunk/; revision=46705
2012-12-22 22:35:07 +00:00
Anders Broman 70f6c44703 Define GTK_SCHEMAS_DIR
svn path=/trunk/; revision=46704
2012-12-22 22:18:29 +00:00
Anders Broman 03282e6244 Put back the 'right' GTK3 bundles
svn path=/trunk/; revision=46703
2012-12-22 21:46:59 +00:00
Evan Huus 52aff57285 Remove unneeded initializations, and one redundant if condition.
svn path=/trunk/; revision=46702
2012-12-22 21:14:13 +00:00
Michael Tüxen d9cca759e5 Fox copy-and-paste error.
svn path=/trunk/; revision=46701
2012-12-22 20:56:58 +00:00
Evan Huus 2f63301d1f Remove one unneeded initializer and add one missing initializer, as found
by CppCheck.

svn path=/trunk/; revision=46700
2012-12-22 20:53:09 +00:00
Michael Tüxen 6af6ce5ee0 Add support for writing the packet block flags for pcapng.
While there, do some minor cleanup.

svn path=/trunk/; revision=46699
2012-12-22 20:38:08 +00:00
Michael Tüxen 1f2b8a904c Add support for displaying the Packet Block Flags Word of pcapng.
svn path=/trunk/; revision=46698
2012-12-22 19:48:17 +00:00
Pascal Quantin b591f54765 Update User Guide
svn path=/trunk/; revision=46697
2012-12-22 19:30:44 +00:00
Gerald Combs 896eeaf187 The Wireshark file icon makes more sense than a floppy disk[1]. Switch
back to it and name it "Save" instead of "File".

  [1] http://www.hanselman.com/blog/TheFloppyDiskMeansSaveAnd14OtherOldPeopleIconsThatDontMakeSenseAnymore.aspx

svn path=/trunk/; revision=46696
2012-12-22 17:41:40 +00:00
Jaap Keuter cd376e0ca8 From G.Gerrits:
Minor patch just adding the newer AR7400/INT7400 with dev_id==4 for decoding 
in the Homeplug AV "Get Device/SW Version Confirm (A001)" response.

svn path=/trunk/; revision=46695
2012-12-22 14:28:52 +00:00