Commit Graph

46586 Commits

Author SHA1 Message Date
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
Anders Broman ed0861abaa Add 3gpp2_type16.
svn path=/trunk/; revision=49147
2013-05-03 17:34:49 +00:00
Anders Broman 9b2e608670 Add doxygen comments.
svn path=/trunk/; revision=49146
2013-05-03 17:33:13 +00:00
Michael Mann ce537f6b94 Remove static packet_info *gpinfo and just use the packet_info provided by the function.
svn path=/trunk/; revision=49145
2013-05-03 14:54:39 +00:00
Jeff Morriss 2602490a2d From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8626 :
It is useful to see not only the minimal, maximum and average service time for
RPC procedures, but also the total time these took.


From me: add it to the man page.

svn path=/trunk/; revision=49144
2013-05-03 13:53:16 +00:00
Michael Mann b542526248 Remove global packet_info* current_pinfo
svn path=/trunk/; revision=49143
2013-05-03 02:43:43 +00:00
Evan Huus f25ebae549 Add some casts to hush the buildbots, and fix what I assume was a copy-pasto
to ensure that the return value of strlen is actually used as the length of the
string.

svn path=/trunk/; revision=49142
2013-05-03 01:37:27 +00:00
Michael Mann c83619a25a Remove unnecessary global variables
svn path=/trunk/; revision=49141
2013-05-03 00:39:14 +00:00
Michael Mann cd2d46ab21 Finish improving NTLM and PLAIN authentication. Bug 8600 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8600)
From Uli Heilmeier 

svn path=/trunk/; revision=49140
2013-05-03 00:04:36 +00:00
Gerald Combs ee26b25981 Add a link to the Survey of Commonly Available C System Header Files. It
looks like we might be able to get rid of a few header checks.

svn path=/trunk/; revision=49139
2013-05-02 15:17:46 +00:00
Jeff Morriss a52f0c61f3 As suggested by Evan:
Point users to https://code.google.com/p/pyreshark/ as an alternative to the
current Python support.

While we're in there, make it harder to enable Python: change it from
"--with-python" to "--with-broken-python" just to prevent people from enabling
unless they really mean it (are going to work on fixing it).

svn path=/trunk/; revision=49138
2013-05-02 14:55:33 +00:00
Michael Mann 31320e7271 Dissect SSID List element.
From Jouni Malinen, bug 8613 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8613)

svn path=/trunk/; revision=49137
2013-05-02 13:08:31 +00:00
Michael Mann ccf8013f95 Remove useless global variables
svn path=/trunk/; revision=49136
2013-05-02 13:03:45 +00:00
Michael Mann f52ecf47c8 Remove global variable g_pinfo.
svn path=/trunk/; revision=49135
2013-05-02 12:59:07 +00:00
Irene Rüngeler c3ad89879e Fix Bug 8615 concerning the active "Start" button when remote interfaces are added.
svn path=/trunk/; revision=49134
2013-05-02 11:47:09 +00:00
Anders Broman cacddebdb7 From Sandeep Dahiya:
Extend the value_string that show the platform from where the packet was captured.

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

svn path=/trunk/; revision=49133
2013-05-02 05:16:09 +00:00
Michael Mann 25e62daeb9 Add a subtree for P2P Client Info Descriptor. Part of bug 8613 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8613)
From Jouni Malinen

svn path=/trunk/; revision=49132
2013-05-02 02:09:08 +00:00
Michael Mann 5b416c8479 IEEE802.11 improvements:
1. ANQP Venue Name is a UTF-8 string
2. Dissect Hotspot 2.0 indication and ANQP elements
3. Dissect TFS Request/Response
4. Dissect WNM-Notification Request frames

svn path=/trunk/; revision=49131
2013-05-02 01:59:34 +00:00
Michael Mann f1d06a226b Fix P2P Group Info validation code for Device Name length field. Bug 8613 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8613)
From Jouni Malinen 

svn path=/trunk/; revision=49130
2013-05-02 01:51:02 +00:00
Michael Mann f1918b01e1 Add BSS Max Idle Period, WNM-Sleep Mode.
Fix and enhance TCLAS dissection.

From Jouni Malinen, bug 8613 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8613)

svn path=/trunk/; revision=49129
2013-05-02 01:15:25 +00:00
Michael Mann 195e87f3ea Protect a "divide by zero" operation. Bug 7359 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7359). This seems to have been generated through a corrupted UAT file switching between 1.8 and 1.10, but it's a good check to have regardless.
svn path=/trunk/; revision=49128
2013-05-01 23:59:16 +00:00
Gerald Combs 916c1c5c01 Add global profiles.
svn path=/trunk/; revision=49127
2013-05-01 23:17:30 +00:00
Gerald Combs a6cd9fdc44 Change the right title this time.
svn path=/trunk/; revision=49126
2013-05-01 22:22:10 +00:00
Gerald Combs b38556fa1e Use "Global" to match the other entries.
svn path=/trunk/; revision=49125
2013-05-01 22:14:48 +00:00