Commit graph

20165 commits

Author SHA1 Message Date
Evan Huus
8331c0e495 Add a cast to pacify MSVC.
svn path=/trunk/; revision=46850
2012-12-29 21:34:57 +00:00
Evan Huus
563d64862a Implement wmem_strbuf_append_printf.
svn path=/trunk/; revision=46846
2012-12-29 20:37:53 +00:00
Evan Huus
45a77360ea Rename tcp.data -> tcp.segment_data and add a description field.
Should clear up the confusion from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8084

svn path=/trunk/; revision=46843
2012-12-29 18:08:11 +00:00
Pascal Quantin
0b20f855f0 Upgrade NAS disssectors to v11.5.0
svn path=/trunk/; revision=46842
2012-12-29 17:10:04 +00:00
Gerald Combs
5bd252c44f Remove some duplicate code from ui/profile.c and move in more code from
ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.

Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.

svn path=/trunk/; revision=46834
2012-12-29 01:39:02 +00:00
Bill Meier
c7dd6480e4 Minor fix when building with VS2012 (VC11):
Prevents warning:
cl : Command line warning D9002 : ignoring unknown option '/Zd'

svn path=/trunk/; revision=46832
2012-12-28 22:13:05 +00:00
Evan Huus
0c66691b92 Add a strict allocator that does canaries and various other things, for
platforms which don't have Valgrind.

Valgrind is still the better choice on platforms which support it.

svn path=/trunk/; revision=46828
2012-12-28 17:04:23 +00:00
Alexis La Goutte
5588d07faa Add missing new dissectors to CMake
* Media Independent handover (MIH) (Add in Revison 46802)
* RTCWeb Data Channel Protocol (Add in Revision 46809)

svn path=/trunk/; revision=46827
2012-12-28 14:38:27 +00:00
Alexis La Goutte
fee2b8b2b9 Tab => Spaces
svn path=/trunk/; revision=46826
2012-12-28 14:38:19 +00:00
Evan Huus
97ec82d02e Make the alignment amount for the wmem block allocator into a #define
and use what appears to be the sanest calculation for it that I can find.

svn path=/trunk/; revision=46820
2012-12-27 23:11:47 +00:00
Evan Huus
bb3b34d7bf Pre-declare just the enum, and not the typedef to avoid redefinition warnings.
svn path=/trunk/; revision=46818
2012-12-27 22:59:29 +00:00
Evan Huus
442b61d0a4 Change the format of the environment variable slightly to allow overriding
allocator choice to use any specific allocator, not just simple.

svn path=/trunk/; revision=46816
2012-12-27 22:51:33 +00:00
Evan Huus
dc98756ca4 Store the type of each wmem allocator.
svn path=/trunk/; revision=46814
2012-12-27 22:31:42 +00:00
Evan Huus
347a8a2115 Add full modelines and minor whitespace fixes.
svn path=/trunk/; revision=46812
2012-12-27 18:58:08 +00:00
Michael Tüxen
c541aa4ab5 Add initial support for
http://tools.ietf.org/html/draft-jesup-rtcweb-data-protocol-03
I'll improve the dissector as the ID evolves...


svn path=/trunk/; revision=46809
2012-12-27 17:11:24 +00:00
Anders Broman
93218a7c76 From Pawel Dziepak:dissect_rpc_array causes assertion fault when array is empty. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8145
svn path=/trunk/; revision=46805
2012-12-27 12:55:05 +00:00
Anders Broman
12317316ae From Ankith: Media Independent handover (MIH) protocol dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5881
svn path=/trunk/; revision=46802
2012-12-27 11:26:40 +00:00
Anders Broman
01432aaf5c Add Media Independent Handover Protocol ethertype
svn path=/trunk/; revision=46801
2012-12-27 11:19:46 +00:00
Guy Harris
f79410f0cd Tabs -> spaces.
svn path=/trunk/; revision=46800
2012-12-26 22:34:39 +00:00
Guy Harris
7df01d368e Update a comment.
svn path=/trunk/; revision=46799
2012-12-26 22:34:09 +00:00
Guy Harris
ab638bb6fc geoip_db_get_paths() is exported from libwireshark, so it has to exist
regardless of whether we have GeoIP or not.  However, regardless of
whether it's exported from GeoIP or not, it should return a g_mallocated
string.

svn path=/trunk/; revision=46798
2012-12-26 22:24:15 +00:00
Guy Harris
5c2a86ebc8 Update a comment.
svn path=/trunk/; revision=46795
2012-12-26 22:13:34 +00:00
Guy Harris
46e9f63fb2 Do array bounds checking.
svn path=/trunk/; revision=46793
2012-12-26 22:05:41 +00:00
Guy Harris
d4b622de36 Don't define geoip_db_get_paths() unless we have GeoIP - we don't use it
unless it's defined.

svn path=/trunk/; revision=46791
2012-12-26 20:37:50 +00:00
Anders Broman
07c92db36b From Michal Labedzki: To ensure that names are correct copy NULL too This fixes unknown characters sometimes show in src/dst columns, etc. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
svn path=/trunk/; revision=46789
2012-12-26 15:28:28 +00:00
Guy Harris
29acae89d9 OK, see if not using an enum gets rid of "implicit conversion shortens
64-bit value to 32 bits" warnings on 32-bit compilers.  According to
6.1.3.3 "Enumeration constants" of C90, "An identifier declared as an
enumeration constant has type int", so there may be signed vs. unsigned
issues.

svn path=/trunk/; revision=46772
2012-12-26 11:46:48 +00:00
Guy Harris
1cd57ad3c5 bytestring_to_str() now returns a const char *; assign its result to a
const char *, not a char *.

svn path=/trunk/; revision=46769
2012-12-26 10:54:03 +00:00
Guy Harris
544efd26a6 And another 64-bit-to-32-bit conversion on 32-bit platforms.
svn path=/trunk/; revision=46768
2012-12-26 10:49:05 +00:00
Guy Harris
852ee34955 Another 64-bit-to-32-bit warning that shows up in 32-bit environments.
svn path=/trunk/; revision=46766
2012-12-26 10:30:34 +00:00
Guy Harris
c1245c6b32 Change wireshark_gen.py to make the operation argument to routines a
"const char *", as it is now expected to be.  Regenerate the dissectors.

Update the URL for OmniOrb.

In README.parlay, use idl2wrs in the sample command.

svn path=/trunk/; revision=46765
2012-12-26 10:28:03 +00:00
Guy Harris
688b567111 And more 64-bit-to-32-bit time issues on 32-bit platforms.
svn path=/trunk/; revision=46763
2012-12-26 09:56:18 +00:00
Guy Harris
dd1505428c Another ILP32 Y2.038K warning.
svn path=/trunk/; revision=46758
2012-12-26 07:05:42 +00:00
Guy Harris
7f40879104 Squelch a (Y2.038K) warning.
svn path=/trunk/; revision=46756
2012-12-26 06:41:49 +00:00
Guy Harris
229ec8c545 OK, *this* isn't a possibly-infinite loop.
svn path=/trunk/; revision=46755
2012-12-26 06:39:53 +00:00
Guy Harris
34633f5fe3 Widen some loop variables, in the hopes that it'll squelch some loop
warnings.

svn path=/trunk/; revision=46754
2012-12-26 06:20:59 +00:00
Guy Harris
50102335a7 Eliminate multiple "const"s.
svn path=/trunk/; revision=46753
2012-12-26 06:16:39 +00:00
Guy Harris
b0d6fbcdeb OK, fine, maybe sometimes it's used; flag it with _U_ while we're at it.
svn path=/trunk/; revision=46750
2012-12-26 06:07:04 +00:00
Guy Harris
a9635c3b9c If a parameter might be unused, mark it with _U_; don't stick in a fake
usage.

svn path=/trunk/; revision=46749
2012-12-26 06:04:05 +00:00
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
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
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
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
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
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
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