fixed dissector table
This commit is contained in:
parent
5929109706
commit
a0ea7fa728
21
wireshark-dissector-table.patch
Normal file
21
wireshark-dissector-table.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
+++ trunk/epan/dissectors/packet-dtls.c 2012/08/15 06:14:10 44511
|
||||||
|
@@ -2724,7 +2724,6 @@
|
||||||
|
|
||||||
|
register_dissector("dtls", dissect_dtls, proto_dtls);
|
||||||
|
dtls_handle = find_dissector("dtls");
|
||||||
|
- dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, dtls_handle);
|
||||||
|
dtls_associations = g_tree_new(ssl_association_cmp);
|
||||||
|
|
||||||
|
register_init_routine(dtls_init);
|
||||||
|
@@ -2750,8 +2749,10 @@
|
||||||
|
dtls_parse_uat();
|
||||||
|
dtls_parse_old_keys();
|
||||||
|
|
||||||
|
- if (initialized == FALSE)
|
||||||
|
+ if (initialized == FALSE) {
|
||||||
|
heur_dissector_add("udp", dissect_dtls_heur, proto_dtls);
|
||||||
|
+ dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, find_dissector("dtls"));
|
||||||
|
+ }
|
||||||
|
|
||||||
|
initialized = TRUE;
|
||||||
|
}
|
@ -21,7 +21,7 @@
|
|||||||
Summary: Network traffic analyzer
|
Summary: Network traffic analyzer
|
||||||
Name: wireshark
|
Name: wireshark
|
||||||
Version: 1.8.3
|
Version: 1.8.3
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPL+
|
License: GPL+
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
|
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
|
||||||
@ -40,6 +40,7 @@ Patch3: wireshark-libtool-pie.patch
|
|||||||
Patch4: wireshark-1.6.1-group-msg.patch
|
Patch4: wireshark-1.6.1-group-msg.patch
|
||||||
Patch5: wireshark-1.6.0-soname.patch
|
Patch5: wireshark-1.6.0-soname.patch
|
||||||
Patch6: wireshark-1.8.2-python-symbols.patch
|
Patch6: wireshark-1.8.2-python-symbols.patch
|
||||||
|
Patch7: wireshark-dissector-table.patch
|
||||||
|
|
||||||
Url: http://www.wireshark.org/
|
Url: http://www.wireshark.org/
|
||||||
BuildRequires: libpcap-devel >= 0.9
|
BuildRequires: libpcap-devel >= 0.9
|
||||||
@ -137,6 +138,7 @@ and plugins.
|
|||||||
%patch4 -p1 -b .group-msg
|
%patch4 -p1 -b .group-msg
|
||||||
%patch5 -p1 -b .soname
|
%patch5 -p1 -b .soname
|
||||||
%patch6 -p1 -b .python-symbols
|
%patch6 -p1 -b .python-symbols
|
||||||
|
%patch7 -p1 -b .dtls
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch s390 s390x sparcv9 sparc64
|
%ifarch s390 s390x sparcv9 sparc64
|
||||||
@ -362,6 +364,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
%{_datadir}/aclocal/*
|
%{_datadir}/aclocal/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 16 2012 Peter Hatina <phatina@redhat.com> - 1.8.3-2
|
||||||
|
- backport dissector table fix
|
||||||
|
- TODO: remove this after new release
|
||||||
|
|
||||||
* Thu Oct 11 2012 Peter Hatina <phatina@redhat.com> - 1.8.3-1
|
* Thu Oct 11 2012 Peter Hatina <phatina@redhat.com> - 1.8.3-1
|
||||||
- upgrade to 1.8.3
|
- upgrade to 1.8.3
|
||||||
- see http://www.wireshark.org/docs/relnotes/wireshark-1.8.3.html
|
- see http://www.wireshark.org/docs/relnotes/wireshark-1.8.3.html
|
||||||
|
Loading…
Reference in New Issue
Block a user