summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-08Round two of wmem cleanup callbacks. While the emem tree behaviour will requireEvan Huus11-102/+265
recurring callbacks, I suspect most other potential uses will be once-only, so make that possible, and improve the documentation on the remaining issues. Also separate out the code into its own files and the testing into its own test case. svn path=/trunk/; revision=49209
2013-05-07add IDs for host license, play countMartin Kaiser1-0/+5
svn path=/trunk/; revision=49206
2013-05-07Add user callbacks to wmem. This feature is a generic way to transparently mimicEvan Huus7-8/+188
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-07Small optical changeJörg Mayer1-3/+0
svn path=/trunk/; revision=49204
2013-05-07Some moreJörg Mayer31-1/+992
svn path=/trunk/; revision=49203
2013-05-07From Christian Koenning via ↵Alexis La Goutte1-4/+4
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-07x721 and kerberos: Use standard Makefile.amJörg Mayer6-9/+13
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-07Small formatting changeJörg Mayer1-1/+2
svn path=/trunk/; revision=49199
2013-05-07Another hour gone, another set of protocols.Jörg Mayer10-0/+324
svn path=/trunk/; revision=49198
2013-05-07Another set of asn1 protocols can now be generated with cmakeJörg Mayer11-0/+447
svn path=/trunk/; revision=49197
2013-05-07Allow generating some more dissectors with cmake.Jörg Mayer8-0/+303
svn path=/trunk/; revision=49196
2013-05-07Make exports actaully workJörg Mayer3-15/+44
Add ansi_map as first generated file that uses exports (from gsm_map in this case). svn path=/trunk/; revision=49195
2013-05-07Move common code into UseAsn2Wrs.cmake.Jörg Mayer4-43/+136
Include the new file. Use the new file. Add cmake support to rebuild the gsm_map dissector. svn path=/trunk/; revision=49194
2013-05-07Build the first (and one of the easiest) of 99 asn1 dissectors withJörg Mayer1-0/+58
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-07Fix a c++ compat warning in the template and copy the resultingJörg Mayer2-5/+3
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-06Don't throw away UM re-assembly state when see MAC retx frame.Martin Mathieson1-2/+5
svn path=/trunk/; revision=49188
2013-05-06From Andreas SchultzMartin Kaiser1-2/+1
use correct PRF for DTLS 1.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8608 svn path=/trunk/; revision=49187
2013-05-06Fix compilation on -Werror compilesJörg Mayer1-3/+2
svn path=/trunk/; revision=49186
2013-05-06Add missing files.Anders Broman3-0/+33
svn path=/trunk/; revision=49185
2013-05-06Add a helper function to load tags, handle IP and port tags andAnders Broman4-13/+263
copy packet comments. svn path=/trunk/; revision=49184
2013-05-06Allow fix dissector to be found by name, which SSL needs for decryption. ↵Michael Mann1-0/+3
Bug 8625 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8625) svn path=/trunk/; revision=49183
2013-05-05#if 0 out some unused code that was causing latest GCC to complain.Evan Huus1-22/+24
Also fix indentation. svn path=/trunk/; revision=49182
2013-05-05C++ comments.Anders Broman1-8/+1
svn path=/trunk/; revision=49181
2013-05-05Make compiling export_pdu_dlg.c actually work:Jörg Mayer2-3/+4
- Fix some warnings about unused variables - Add to Cmake build svn path=/trunk/; revision=49180
2013-05-0584: warning: 'proto_name' may be used uninitialized in this functionAnders Broman1-1/+1
svn path=/trunk/; revision=49179
2013-05-0555:1: error: "/*" within commentAnders Broman1-1/+1
svn path=/trunk/; revision=49178
2013-05-05Add the abillity to export PDU:s to file using a USER_DLT adding meta data ↵Anders Broman5-0/+48
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-05Add the abillity to export PDU:s to file using a USER_DLT adding meta data ↵Anders Broman4-0/+650
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-05From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8567Evan Huus2-12/+633
[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-05From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8567Evan Huus1-0/+97
[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-05From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8567Evan Huus3-11/+93
[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-05From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8567Evan Huus2-13/+21
[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-05Remove an unnecessary header include.Martin Mathieson1-1/+0
svn path=/trunk/; revision=49171
2013-05-05Remove if (tree) so expert_info will always be called.Michael Mann1-67/+64
svn path=/trunk/; revision=49170
2013-05-05Revert 49166: It breaks compilation:Jörg Mayer1-1/+1
[ 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-05Update to cover Qt5 builds via cmake.Jörg Mayer1-0/+2
svn path=/trunk/; revision=49168
2013-05-05Just whitespace changesJörg Mayer88-193/+263
svn path=/trunk/; revision=49167
2013-05-05Really change display filter combo box's background color using GTK3Balint Reczey1-1/+1
svn path=/trunk/; revision=49166
2013-05-04Yet another protocol update viaJörg Mayer1-109/+341
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8616 svn path=/trunk/; revision=49165
2013-05-04Attempted fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8619Jörg Mayer1-1/+6
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-04Stub out the wmem test suite for older Glibs. This should restoreEvan Huus1-0/+14
compatibility with GLIB 2.14. svn path=/trunk/; revision=49161
2013-05-04From Joe McEachern via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8614Evan Huus1-15/+54
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-04Fix errors found by fix-encoding-args toolsAlexis La Goutte1-2/+2
svn path=/trunk/; revision=49158
2013-05-04Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
svn path=/trunk/; revision=49157
2013-05-04Fix indents (Use Spaces) Add ModelinesAlexis La Goutte2-227/+240
svn path=/trunk/; revision=49156
2013-05-04Add a dissector for the Ixia Anue encoding to CMakeList tooAlexis La Goutte1-0/+1
svn path=/trunk/; revision=49155
2013-05-04LISP control packet incorrectly identified as LISP data based when UDP ↵Michael Mann2-13/+19
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-04missed adding packet-ssl.h.Michael Mann1-0/+1
svn path=/trunk/; revision=49153
2013-05-04Decrypt Fix protocol over SSL. Bug 8625 ↵Michael Mann1-0/+2
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8625) svn path=/trunk/; revision=49152
2013-05-03Add WS_DLL_PUBLIC to all functions declared here.Guy Harris1-0/+6
svn path=/trunk/; revision=49150
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-07 09:49:38 +0000