Compatibility with wireshark revision 45655wip-wireshark-zafman

    Fix patch and update to use dissector_add_uint()
This builds, but hasn't been tested yet.

2 files changed, 41 insertions, 41 deletions

diff --git a/wireshark/ceph/packet-ceph.c b/wireshark/ceph/packet-ceph.c
index 08826fbfda8..0529f5fdf16 100644
--- a/wireshark/ceph/packet-ceph.c
+++ b/wireshark/ceph/packet-ceph.c
@@ -275,7 +275,7 @@ void proto_reg_handoff_ceph(void)
 		data_handle = find_dissector("data");
 		ceph_handle = create_dissector_handle(dissect_ceph, proto_ceph);
 		for (port = global_ceph_min_port; port <= global_ceph_max_port; port++)
-			dissector_add("tcp.port", port, ceph_handle);
+			dissector_add_uint("tcp.port", port, ceph_handle);
 	}
 
 }
diff --git a/wireshark/wireshark.patch b/wireshark/wireshark.patch
index cca5947b985..7086f36be9e 100644
--- a/wireshark/wireshark.patch
+++ b/wireshark/wireshark.patch
@@ -1,6 +1,30 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 45655)
++++ configure.ac	(working copy)
+@@ -2157,6 +2157,7 @@
+   packaging/svr4/pkginfo
+   plugins/Makefile
+   plugins/asn1/Makefile
++  plugins/ceph/Makefile
+   plugins/docsis/Makefile
+   plugins/ethercat/Makefile
+   plugins/gryphon/Makefile
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 45655)
++++ Makefile.am	(working copy)
+@@ -277,6 +277,7 @@
+ -include plugins/Custom.make
+ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
+ 	-dlopen plugins/asn1/asn1.la \
++	-dlopen plugins/ceph/ceph.la \
+ 	-dlopen plugins/docsis/docsis.la \
+ 	-dlopen plugins/ethercat/ethercat.la \
+ 	-dlopen plugins/gryphon/gryphon.la \
 Index: plugins/Makefile.nmake
 ===================================================================
---- plugins/Makefile.nmake	(revision 43768)
+--- plugins/Makefile.nmake	(revision 45655)
 +++ plugins/Makefile.nmake	(working copy)
 @@ -8,6 +8,7 @@
  
@@ -12,7 +36,7 @@ Index: plugins/Makefile.nmake
  	gryphon     \
 Index: plugins/Makefile.am
 ===================================================================
---- plugins/Makefile.am	(revision 43768)
+--- plugins/Makefile.am	(revision 45655)
 +++ plugins/Makefile.am	(working copy)
 @@ -24,6 +24,7 @@
  -include Custom.make
@@ -22,33 +46,21 @@ Index: plugins/Makefile.am
  	docsis \
  	ethercat \
  	gryphon \
-Index: configure.in
-===================================================================
---- configure.in	(revision 43768)
-+++ configure.in	(working copy)
-@@ -2150,6 +2150,7 @@
-   packaging/svr4/pkginfo
-   plugins/Makefile
-   plugins/asn1/Makefile
-+  plugins/ceph/Makefile
-   plugins/docsis/Makefile
-   plugins/ethercat/Makefile
-   plugins/gryphon/Makefile
-Index: Makefile.am
+Index: epan/Makefile.am
 ===================================================================
---- Makefile.am	(revision 43768)
-+++ Makefile.am	(working copy)
-@@ -273,6 +273,7 @@
- -include plugins/Custom.make
- plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
- 	-dlopen plugins/asn1/asn1.la \
-+	-dlopen plugins/ceph/ceph.la \
- 	-dlopen plugins/docsis/docsis.la \
- 	-dlopen plugins/ethercat/ethercat.la \
- 	-dlopen plugins/gryphon/gryphon.la \
+--- epan/Makefile.am	(revision 45655)
++++ epan/Makefile.am	(working copy)
+@@ -209,6 +209,7 @@
+ -include ../plugins/Custom.make
+ plugin_src = \
+ 	../plugins/asn1/packet-asn1.c \
++	../plugins/ceph/packet-ceph.c \
+ 	../plugins/docsis/packet-bintrngreq.c \
+ 	../plugins/docsis/packet-bpkmattr.c \
+ 	../plugins/docsis/packet-bpkmreq.c \
 Index: packaging/nsis/Makefile.nmake
 ===================================================================
---- packaging/nsis/Makefile.nmake	(revision 43768)
+--- packaging/nsis/Makefile.nmake	(revision 45655)
 +++ packaging/nsis/Makefile.nmake	(working copy)
 @@ -46,6 +46,7 @@
  
@@ -60,9 +72,9 @@ Index: packaging/nsis/Makefile.nmake
  	../../plugins/gryphon/gryphon.dll \
 Index: packaging/nsis/wireshark.nsi
 ===================================================================
---- packaging/nsis/wireshark.nsi	(revision 43768)
+--- packaging/nsis/wireshark.nsi	(revision 45655)
 +++ packaging/nsis/wireshark.nsi	(working copy)
-@@ -806,6 +806,7 @@
+@@ -852,6 +852,7 @@
  ;-------------------------------------------
  SetOutPath '$INSTDIR\plugins\${VERSION}'
  File "${STAGING_DIR}\plugins\${VERSION}\asn1.dll"
@@ -70,15 +82,3 @@ Index: packaging/nsis/wireshark.nsi
  File "${STAGING_DIR}\plugins\${VERSION}\docsis.dll"
  File "${STAGING_DIR}\plugins\${VERSION}\ethercat.dll"
  File "${STAGING_DIR}\plugins\${VERSION}\gryphon.dll"
-Index: epan/Makefile.am
-===================================================================
---- epan/Makefile.am	(revision 43768)
-+++ epan/Makefile.am	(working copy)
-@@ -209,6 +209,7 @@
- -include ../plugins/Custom.make
- plugin_src = \
- 	../plugins/asn1/packet-asn1.c \
-+	../plugins/ceph/packet-ceph.c \
- 	../plugins/docsis/packet-bintrngreq.c \
- 	../plugins/docsis/packet-bpkmattr.c \
- 	../plugins/docsis/packet-bpkmreq.c \