Commit Graph

46309 Commits

Author SHA1 Message Date
Evan Huus 2e92c6dfde Add user callbacks to wmem. This feature is a generic way to transparently mimic
the behaviour emem has for seasonal trees, which is that the master tree
structure is not actually seasonal - it is permanent. When the seasonal memory
pool is cleared, the root node pointer in all of these permanent trees is set
to NULL, and the pool takes care of actually freeing the nodes.

Wmem can now mimic this by allocating the tree header struct in epan_scope(),
allocating any node structs in file_scope(), and registering a callback on
file_scope() that NULLs the pointer in the epan_scope() header. Yes, this is
confusing, but it seemed simpler than adding manual callback registrations to
every single dissector that currently uses seasonal trees.

The callbacks may also be useful for other things that need cleanup (I'm
thinking resource handles stored in wmem memory that need to be fclosed or
what-have-you before they the handle is lost).

As indicated by the number of caveats in README.wmem, the implementation
probably needs a bit of work to make it safer/saner/more-useful. Thoughts
(or patches!) in this direction are more than welcome.

svn path=/trunk/; revision=49205
2013-05-07 19:23:10 +00:00
Jörg Mayer 572d68a33b Small optical change
svn path=/trunk/; revision=49204
2013-05-07 17:52:51 +00:00
Jörg Mayer 5fa9c90ffd Some more
svn path=/trunk/; revision=49203
2013-05-07 16:26:35 +00:00
Alexis La Goutte b53ac56b03 From Christian Koenning via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8631 RFC 6887 Port Control Protocol Response 96 bit reserved not 64 bit
As per RFC 6887 the response header has 96bit reserved bit, not 64.
Without the attached patch, the PCP Responses are parsed incorrectly

svn path=/trunk/; revision=49202
2013-05-07 13:41:52 +00:00
Jörg Mayer 7a58867626 x721 and kerberos: Use standard Makefile.am
idmp: remove an unused line
tetra, h460: Whitespace changes to be a "standard" Makefile.am
asn1/Makefile.am: don't try to build kerberos and x721 dissectors

svn path=/trunk/; revision=49201
2013-05-07 12:58:27 +00:00
Jörg Mayer 483d9d74ab Small formatting change
svn path=/trunk/; revision=49199
2013-05-07 11:55:50 +00:00
Jörg Mayer 84469a3216 Another hour gone, another set of protocols.
svn path=/trunk/; revision=49198
2013-05-07 11:31:26 +00:00
Jörg Mayer d18b094a55 Another set of asn1 protocols can now be generated with cmake
svn path=/trunk/; revision=49197
2013-05-07 10:50:47 +00:00
Jörg Mayer 369c7b75ee Allow generating some more dissectors with cmake.
svn path=/trunk/; revision=49196
2013-05-07 04:40:37 +00:00
Jörg Mayer 1d5891111e Make exports actaully work
Add ansi_map as first generated file that uses exports (from gsm_map in
  this case).

svn path=/trunk/; revision=49195
2013-05-07 03:59:29 +00:00
Jörg Mayer 5ba458916a Move common code into UseAsn2Wrs.cmake.
Include the new file.
Use the new file.
Add cmake support to rebuild the gsm_map dissector.

svn path=/trunk/; revision=49194
2013-05-07 03:25:49 +00:00
Jörg Mayer 1b6e8300a6 Build the first (and one of the easiest) of 99 asn1 dissectors with
cmake. Just do "make" inside either the asn1 directory to rebuild all
finished dissectors or inside the asn1/HI2Operations to just rebuild
the given dissector.

svn path=/trunk/; revision=49193
2013-05-07 02:02:19 +00:00
Jörg Mayer fe2f036bd9 Fix a c++ compat warning in the template and copy the resulting
file to packet-dcerpc-drsuapi.c
This seems to undo some (warning fix) changes made to the dissector
directly instead of fixing the template (or generator).

svn path=/trunk/; revision=49192
2013-05-07 01:52:33 +00:00
Martin Mathieson 2771af9851 Don't throw away UM re-assembly state when see MAC retx frame.
svn path=/trunk/; revision=49188
2013-05-06 21:52:49 +00:00
Martin Kaiser 754d4ac902 From Andreas Schultz
use correct PRF for DTLS 1.2

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8608

svn path=/trunk/; revision=49187
2013-05-06 20:00:59 +00:00
Jörg Mayer b0c0ab5345 Fix compilation on -Werror compiles
svn path=/trunk/; revision=49186
2013-05-06 18:24:11 +00:00
Anders Broman 05ed1f5199 Add missing files.
svn path=/trunk/; revision=49185
2013-05-06 16:31:29 +00:00
Anders Broman 1ab65e7146 Add a helper function to load tags, handle IP and port tags and
copy packet comments.

svn path=/trunk/; revision=49184
2013-05-06 15:59:16 +00:00
Michael Mann 880fc1ba7f Allow fix dissector to be found by name, which SSL needs for decryption. Bug 8625 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8625)
svn path=/trunk/; revision=49183
2013-05-06 13:58:36 +00:00
Evan Huus 55570724c3 #if 0 out some unused code that was causing latest GCC to complain.
Also fix indentation.

svn path=/trunk/; revision=49182
2013-05-05 22:56:52 +00:00
Anders Broman f26b36f2aa C++ comments.
svn path=/trunk/; revision=49181
2013-05-05 20:52:42 +00:00
Jörg Mayer 361bac10a8 Make compiling export_pdu_dlg.c actually work:
- Fix some warnings about unused variables
- Add to Cmake build

svn path=/trunk/; revision=49180
2013-05-05 20:45:08 +00:00
Anders Broman ea7a1ff3b7 84: warning: 'proto_name' may be used uninitialized in this function
svn path=/trunk/; revision=49179
2013-05-05 20:03:00 +00:00
Anders Broman 6409756fb8 55:1: error: "/*" within comment
svn path=/trunk/; revision=49178
2013-05-05 19:49:50 +00:00
Anders Broman a268bb6b94 Add the abillity to export PDU:s to file using a USER_DLT adding meta data before the actual protocol PDU. Some meta tags makes it possible for the dissector of the user DLT to call the correct PDU dissector.
This is prof-of-concept needs a bit of cleanup.

svn path=/trunk/; revision=49177
2013-05-05 19:37:51 +00:00
Anders Broman 44f48d0464 Add the abillity to export PDU:s to file using a USER_DLT adding meta data before the actual protocol PDU. Some meta tags makes it possible for the dissector of the user DLT to call the correct PDU dissector.
This is prof-of-concept needs a bit of cleanup.

svn path=/trunk/; revision=49176
2013-05-05 19:36:53 +00:00
Evan Huus 81ecf094f6 From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8567
[PATCH 7/8]
Dissect DTLS server key exchange

[PATCH 8/8]
Dissect DTLS client key exchange

[From me]
Clean up some field display names


svn path=/trunk/; revision=49175
2013-05-05 14:19:59 +00:00
Evan Huus ad3c91fb81 From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8567
[PATCH 5/8]
Dissect client key exchange for PSK

[PATCH 6/8]
Dissect client key exchange for RSA-PSK


svn path=/trunk/; revision=49174
2013-05-05 14:10:09 +00:00
Evan Huus 39abf7ca0a From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8567
[PATCH 3/8]
Detect PSK and RSA_PSK key exchange

[PATCH 4/8]
Dissect the identity hint for PSK and RSA_PSK key exchanges

[From me]
Using proto_tree_add_item instead of proto_tree_add_uint in one place

svn path=/trunk/; revision=49173
2013-05-05 14:01:11 +00:00
Evan Huus 79b3d4e32f From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8567
[PATCH 1/8]
Add a subtree for the random DTLS elements. This is what TLS already does, and
it makes more sense than prefixing their display names.

[PATCH 2/8]
Show the actual hex content of the cookie by just using proto_tree_add_item.
The cookie length has its own field, so there's no need to display it twice.

[From me]
Fix an @ in the AUTHORS file


svn path=/trunk/; revision=49172
2013-05-05 13:49:49 +00:00
Martin Mathieson 9d6d7f78c3 Remove an unnecessary header include.
svn path=/trunk/; revision=49171
2013-05-05 11:32:00 +00:00
Michael Mann 2a9201a34f Remove if (tree) so expert_info will always be called.
svn path=/trunk/; revision=49170
2013-05-05 11:02:42 +00:00
Jörg Mayer e13a0996ee Revert 49166: It breaks compilation:
[ 82%] Building C object ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c: In function ‘color_filter_te’:
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: enum conversion when passing argument 2 of ‘gtk_widget_modify_bg’ is invalid in C++ [-Werror=c++-compat]
     gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
     ^
In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
                 from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
                 from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
                 from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
                 from /usr/include/gtk-3.0/gtk/gtk.h:33,
                 from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
/usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘GtkStateType’ but argument is of type ‘int’
 void        gtk_widget_modify_bg          (GtkWidget            *widget,
             ^
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: passing argument 3 of ‘gtk_widget_modify_bg’ from incompatible pointer type [-Werror]
     gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
     ^
In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
                 from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
                 from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
                 from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
                 from /usr/include/gtk-3.0/gtk/gtk.h:33,
                 from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
/usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘const struct GdkColor *’ but argument is of type ‘struct GdkRGBA *’
 void        gtk_widget_modify_bg          (GtkWidget            *widget,
             ^
cc1: all warnings being treated as errors
make[2]: *** [ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o] Error 1


Also note that
https://developer.gnome.org/gtk3/3.6/GtkWidget.html#gtk-widget-modify-bg
states:
gtk_widget_modify_bg has been deprecated since version 3.0 and should not be used in newly-written code. Use gtk_widget_override_background_color() instead

Of course we are not the only ones who have problems with that replacement:
http://gtk.10911.n7.nabble.com/button-background-color-in-gtk3-td14268.html
which ends with a sort of ugly solution without the deprecated function.



svn path=/trunk/; revision=49169
2013-05-05 09:07:09 +00:00
Jörg Mayer e73e5f2d05 Update to cover Qt5 builds via cmake.
svn path=/trunk/; revision=49168
2013-05-05 08:52:47 +00:00
Jörg Mayer 243e9c0ba5 Just whitespace changes
svn path=/trunk/; revision=49167
2013-05-05 08:49:18 +00:00
Balint Reczey b0a2f8e76e Really change display filter combo box's background color using GTK3
svn path=/trunk/; revision=49166
2013-05-05 05:25:35 +00:00
Jörg Mayer e70f754cff Yet another protocol update via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8616

svn path=/trunk/; revision=49165
2013-05-04 23:37:02 +00:00
Jörg Mayer 6f872b0e17 Attempted fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8619
When there are several versions of lua installed, try to pick the library
version that matches the include file(s) we selected.

svn path=/trunk/; revision=49164
2013-05-04 23:06:15 +00:00
Evan Huus 60fe9f1b9e Stub out the wmem test suite for older Glibs. This should restore
compatibility with GLIB 2.14.

svn path=/trunk/; revision=49161
2013-05-04 12:42:28 +00:00
Evan Huus 23f134d48e From Joe McEachern via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8614
Add tcp.analysis.spurious_retransmission. Although RFC 793 does not define
spurious TCP retransmissions, TCP spurious retransmissions are referenced in
other RFCs and research.

svn path=/trunk/; revision=49160
2013-05-04 12:37:01 +00:00
Alexis La Goutte 648ac74b5e Fix errors found by fix-encoding-args tools
svn path=/trunk/; revision=49158
2013-05-04 08:12:50 +00:00
Alexis La Goutte f6fd237a35 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=49157
2013-05-04 08:12:36 +00:00
Alexis La Goutte 71f1f8b9d3 Fix indents (Use Spaces) Add Modelines
svn path=/trunk/; revision=49156
2013-05-04 08:12:25 +00:00
Alexis La Goutte c77607c466 Add a dissector for the Ixia Anue encoding to CMakeList too
svn path=/trunk/; revision=49155
2013-05-04 08:12:12 +00:00
Michael Mann e5fe6b1dca LISP control packet incorrectly identified as LISP data based when UDP source port is 4341. Bug 8627 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8627)
Also did some minor cleanup/improvements while I was there.

svn path=/trunk/; revision=49154
2013-05-04 02:20:59 +00:00
Michael Mann d9077264d6 missed adding packet-ssl.h.
svn path=/trunk/; revision=49153
2013-05-04 01:37:55 +00:00
Michael Mann 377470abe3 Decrypt Fix protocol over SSL. Bug 8625 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8625)
svn path=/trunk/; revision=49152
2013-05-04 01:27:33 +00:00
Guy Harris 04c02451aa Add WS_DLL_PUBLIC to all functions declared here.
svn path=/trunk/; revision=49150
2013-05-03 23:37:06 +00:00
Martin Mathieson 33e738bf97 Remove unnecessary lines from handoff function.
svn path=/trunk/; revision=49149
2013-05-03 18:28:58 +00:00
Martin Mathieson 9032963cf7 Add a dissector for the Ixia Anue encoding of timestamps in the ethernet
trailer.

svn path=/trunk/; revision=49148
2013-05-03 17:52:31 +00:00